Changeset 19034 in josm for trunk/src

Timestamp:

2024-04-06T10:03:50+02:00 (10 months ago)

Author:

GerdP

Message:

fix #9304: fix #9304: in validator, check for intersecting roads in different layers

• exclude highway areas with layer != 0 from test
• add one more test case with a bridge that is split (code coverage)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

@@ -311 +311 @@
     private void testDifferentLayers(Node connection) {
         List<Way> ways = connection.getParentWays();
-        ways.removeIf(w -> !w.hasTag("highway") || w.hasTag("highway", "steps"));
+        ways.removeIf(w -> !w.hasTag("highway") || w.hasTag("highway", "steps") || isSpecialArea(w));
         if (ways.size() < 2 || ways.stream().noneMatch(w -> w.hasKey("layer")))
             return;
@@ -339 +339 @@
 
     /**
+     * Check if way is an area on a layer above or below 0.
+     * @param w the way
+     * @return true if way is an area on a layer above or below 0
+     */
+    private static boolean isSpecialArea(Way w) {
+        return w.hasAreaTags() && OsmUtils.getLayer(w) != null;
+    }
+
+    /**
      * 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