Changeset 17447 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2021-01-07T11:05:39+01:00 (3 years ago)

Author:

GerdP

Message:

fix #20352: Incorrect validation warning on waterway crossing of adjacent water areas
Commit 20352.patch to

• treat waterway=riverbank as water area
• ignore crossing waterways and water areas

File:

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

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

@@ -129 +129 @@
                 return true; // see #20089
             }
-            return (w1.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && w2.hasTag(WATERWAY, "riverbank"))
-                    || (w2.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && w1.hasTag(WATERWAY, "riverbank"));
+            return (w1.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterArea(w2))
+                    || (w2.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterArea(w1));
         }
 
@@ -315 +315 @@
 
     static boolean isWaterArea(OsmPrimitive w) {
-        return w.hasTag("natural", "water") || w.hasTag(LANDUSE, "reservoir");
+        return w.hasTag("natural", "water") || w.hasTag("waterway", "riverbank") || w.hasTag(LANDUSE, "reservoir");
     }