Index: /trunk/nodist/data/9304-examples.osm
===================================================================
--- /trunk/nodist/data/9304-examples.osm (revision 19029)
+++ /trunk/nodist/data/9304-examples.osm (revision 19029)
@@ -0,0 +1,282 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 19028)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 19029)
@@ -12,4 +12,5 @@
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.stream.Collectors;
@@ -39,4 +40,5 @@
protected static final int SOURCE_MAXSPEED_CONTEXT_MISMATCH_VS_HIGHWAY = 2706;
protected static final int SOURCE_WRONG_LINK = 2707;
+ protected static final int DIFFERENT_LAYERS = 2708;
protected static final String SOURCE_MAXSPEED = "source:maxspeed";
@@ -90,4 +92,7 @@
// as maxspeed is not set on highways here but on signs, speed cameras, etc.
testSourceMaxspeed(n, false);
+ }
+ if (n.isReferredByWays(2)) {
+ testDifferentLayers(n);
}
}
@@ -299,3 +304,53 @@
}
}
+
+ /**
+ * See #9304: Find Highways connected to bridges or tunnels at the wrong place.
+ * @param connection the connection node of two or more different ways
+ */
+ private void testDifferentLayers(Node connection) {
+ List ways = connection.getParentWays();
+ ways.removeIf(w -> !w.hasTag("highway") || w.hasTag("highway", "steps"));
+ if (ways.size() < 2 || ways.stream().noneMatch(w -> w.hasKey("layer")))
+ return;
+ // check if connection has ways with different layers
+ Map> layerCount = new HashMap<>();
+ for (Way w : ways) {
+ String layer = w.get("layer");
+ if (layer == null)
+ layer = "0";
+ layerCount.computeIfAbsent(layer, k-> new ArrayList<>()).add(w);
+ }
+ if (layerCount.size() == 1)
+ return; // all on the same layer
+
+ for (Entry> entry : layerCount.entrySet()) {
+ if ("0".equals(entry.getKey()))
+ continue;
+ if (checkLayer(connection, entry.getValue())) {
+ errors.add(TestError.builder(this, Severity.WARNING, DIFFERENT_LAYERS)
+ .message(tr("Node connects highways on different layers"))
+ .primitives(connection)
+ .build());
+ return;
+ }
+ }
+ }
+
+ /**
+ * Check if there are at least two neighbouring nodes on the given ways.
+ * If so, the connection node can be considered to be at a specific layer, else it marks the end of such a layer
+ * @param connection the connection node
+ * @param ways the ways with the same layer attribute connected to that node
+ * @return true if the node can be considered to be at a specific layer
+ */
+ private static boolean checkLayer(Node connection, List ways) {
+ int count = 0;
+ for (Way w : ways) {
+ if (!w.isFirstLastNode(connection))
+ return true; // connection node has two neighbouring nodes
+ count++;
+ }
+ return count > 1;
+ }
}
Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java (revision 19028)
+++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java (revision 19029)
@@ -115,3 +115,14 @@
}
}
+
+ /**
+ * Test all error cases manually created in data.osm.
+ * @throws Exception in case of error
+ */
+ @Test
+ void testTicket9304() throws Exception {
+ final Highways test = new Highways();
+ ValidatorTestUtils.testSampleFile("nodist/data/9304-examples.osm", DataSet::getNodes, null, test);
+ }
+
}