Changeset 17430 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-01-02T09:37:50+01:00 (3 years ago)

Author:

GerdP

Message:

fix #20330: Crossing landuse=residential and natural=water should not produce a warning

• ignore crossing ways when one is landuse=residential and the other is natural=water or landuse=reservoir

(both should be implemented in mapcss rules if wanted)

• add unit test

File:

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

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

@@ -119 +119 @@
             if (isBuilding(w1) && isBuilding(w2))
                 return true; // handled by mapcss tests
-            if (((isResidentialArea(w1) || w1.hasKey(BARRIER, HIGHWAY, RAILWAY, WATERWAY)) && isResidentialArea(w2))
-             || ((isResidentialArea(w2) || w2.hasKey(BARRIER, HIGHWAY, RAILWAY, WATERWAY)) && isResidentialArea(w1)))
+            if (((isResidentialArea(w1) || w1.hasKey(BARRIER, HIGHWAY, RAILWAY, WATERWAY) || isWaterArea(w1))
+                    && isResidentialArea(w2))
+                    || ((isResidentialArea(w2) || w2.hasKey(BARRIER, HIGHWAY, RAILWAY, WATERWAY) || isWaterArea(w2))
+                            && isResidentialArea(w1)))
                 return true;
             if (isWaterArea(w1) && isWaterArea(w2))