Changeset 19452 in josm for trunk/src

Timestamp:

2026-01-04T09:10:13+01:00 (8 days ago)

Author:

GerdP

Message:

fix #24572: "Crossing waterways" validator produces many false positives with waterway=fairway

• ignore crossing ways with waterway=fairway
• ignore a fairway crossing a linear waterway (river,stream,canal,drain,ditch)

File:

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

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

@@ -134 +134 @@
                     || w1.hasTag(RAILWAY, "halt") != w2.hasTag(RAILWAY, "halt")))
                 return true;  // see #20089, #21541
-            return (w1.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterArea(w2))
-                    || (w2.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterArea(w1));
+            if (w1.hasTag(WATERWAY, "fairway") && w2.hasTag(WATERWAY, "fairway"))
+                return true; // see #24572
+            return (w1.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterAreaOrFairway(w2))
+                    || (w2.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterAreaOrFairway(w1));
         }
 
@@ -363 +365 @@
     }
 
+    static boolean isWaterAreaOrFairway(OsmPrimitive w) {
+        return isWaterArea(w) || w.hasTag(WATERWAY, "fairway");
+    }
+
     static boolean isHighway(OsmPrimitive w) {
         return w.hasTagDifferent(HIGHWAY, "rest_area", "services", "bus_stop", "platform");