Index: trunk/nodist/data/direction-nodes.osm
===================================================================
--- trunk/nodist/data/direction-nodes.osm (revision 17411)
+++ trunk/nodist/data/direction-nodes.osm (revision 17411)
@@ -0,0 +1,388 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DirectionNodes.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DirectionNodes.java (revision 17410)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DirectionNodes.java (revision 17411)
@@ -8,4 +8,5 @@
import java.util.List;
import java.util.Map.Entry;
+import java.util.stream.Collectors;
import org.openstreetmap.josm.data.osm.Node;
@@ -25,6 +26,8 @@
private static final int END_NODE_CODE = 4001;
private static final int NO_WAY_CODE = 4002;
+ private static final int NO_SUITABLE_WAY = 4003;
- private static final String DIR_VERIF_PROBLEM_MSG = tr("Invalid usage of direction on node");
+ private static final String INVALID_USE_MSG = tr("Invalid usage of direction on node");
+ private static final String DISPUTED_USE_MSG = tr("Disputed usage of direction on node");
/**
@@ -54,26 +57,41 @@
final List ways = new ArrayList<>();
int count = 0;
+ int countHighWays = 0;
for (Way w : n.getParentWays()) {
if (isSuitableParentWay(w)) {
ways.add(w);
+ if (w.hasKey("highway"))
+ countHighWays++;
}
count++;
}
- boolean needsParentWays = n.isNew() || (!n.isOutsideDownloadArea() && n.getDataSet().getDataSourceArea() != null);
+
+ // ignore minor highways (footway, path etc) if a major highway is found
+ if (countHighWays > 1 && (n.hasKey("highway") || n.hasTag("traffic_sign", "city_limit"))) {
+ List minor = ways.stream().filter(w -> !w.hasTag("highway", Highways.CLASSIFIED_HIGHWAYS))
+ .collect(Collectors.toList());
+ if (minor.size() != countHighWays) {
+ ways.removeAll(minor);
+ }
+ }
+ boolean needsParentWays = n.isNew()
+ || (!n.isOutsideDownloadArea() && n.getDataSet().getDataSourceArea() != null);
TestError.Builder builder = null;
if (ways.isEmpty() && needsParentWays) {
if (count == 0) {
- builder = TestError.builder(this, Severity.WARNING, NO_WAY_CODE).message(DIR_VERIF_PROBLEM_MSG,
- marktr("Unconnected node with {0}"), tag);
+ builder = TestError.builder(this, Severity.ERROR, NO_WAY_CODE).message(INVALID_USE_MSG,
+ marktr("Unconnected node with {0}. Use angle or cardinal direction"), tag);
+ } else {
+ builder = TestError.builder(this, Severity.WARNING, NO_SUITABLE_WAY).message(INVALID_USE_MSG,
+ marktr("Node with {0} should be connected to a linear way"), tag);
}
-
} else if (ways.size() == 1) {
Way w = ways.get(0);
if (w.firstNode() == n || w.lastNode() == n) {
- builder = TestError.builder(this, Severity.WARNING, END_NODE_CODE).message(DIR_VERIF_PROBLEM_MSG,
+ builder = TestError.builder(this, Severity.OTHER, END_NODE_CODE).message(DISPUTED_USE_MSG,
marktr("Node with {0} on end of way"), tag);
}
} else if (ways.size() > 1) {
- builder = TestError.builder(this, Severity.WARNING, MULTIPLE_WAYS_CODE).message(DIR_VERIF_PROBLEM_MSG,
+ builder = TestError.builder(this, Severity.OTHER, MULTIPLE_WAYS_CODE).message(DISPUTED_USE_MSG,
marktr("Node with {0} on a connection of multiple ways"), tag);
}
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 17410)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 17411)
@@ -46,5 +46,5 @@
*/
// CHECKSTYLE.OFF: SingleSpaceSeparator
- private static final List CLASSIFIED_HIGHWAYS = Arrays.asList(
+ static final List CLASSIFIED_HIGHWAYS = Arrays.asList(
"motorway", "motorway_link",
"trunk", "trunk_link",
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java (revision 17411)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java (revision 17411)
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * JUnit Test of Multipolygon validation test.
+ */
+class DirectionNodesTest {
+
+
+ /**
+ * Setup test.
+ */
+ @RegisterExtension
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Test all error cases manually created in direction-nodes.osm.
+ * @throws Exception in case of error
+ */
+ @Test
+ void testMultipolygonFile() throws Exception {
+ final DirectionNodes test = new DirectionNodes();
+ ValidatorTestUtils.testSampleFile("nodist/data/direction-nodes.osm",
+ ds -> ds.getNodes().stream().filter(OsmPrimitive::hasKeys).collect(Collectors.toList()),
+ null, test);
+
+ }
+
+}