Ticket #9304: 9304-v2.patch

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

@@ -11 +11 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -38 +39 @@
     protected static final int SOURCE_MAXSPEED_CONTEXT_MISMATCH_VS_MAXSPEED = 2705;
     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 +92 @@
                 // as maxspeed is not set on highways here but on signs, speed cameras, etc.
                 testSourceMaxspeed(n, false);
             }
+            if (n.isReferredByWays(2)) {
+                testDifferentLayers(n);
+            }
         }
     }
 
@@ -298 +303 @@
             }
         }
     }
+
+    private void testDifferentLayers(Node connection) {
+        List<Way> 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<String, List<Way>> 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<String, List<Way>> 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<Way> ways) {
+        int count = 0;
+        for (Way w : ways) {
+            if (!w.isFirstLastNode(connection))
+                return true; // connection node has two neighbouring nodes
+            count++;
+        }
+        return count > 1;
+    }
 }