Changeset 10528 in josm for trunk/src

Timestamp:

2016-07-13T00:04:04+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13069 - "Crossing waterways" reported for waterway=stream + waterway=riverbank (patch by Klumbumbus)

File:

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

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

@@ -83 +83 @@
                 return true;
             }
-            if ((w1.hasTag(WATERWAY, "river") && w2.hasTag(WATERWAY, "riverbank"))
-                    || (w2.hasTag(WATERWAY, "river") && w1.hasTag(WATERWAY, "riverbank"))) {
+            if ((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 true;
             }