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

Timestamp:

2013-10-06T18:10:24+02:00 (11 years ago)

Author:

Don-vip

Message:

see #4582, see #7236 - Fix validator false positive "overlapping ways" for adjacent multipolygons

File:

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

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
@@ -54 +55 @@
     }
 
+    private boolean concernsArea(OsmPrimitive p) {
+        return p.get("landuse") != null
+                || "riverbank".equals(p.get("waterway"))
+                || p.get("natural") != null
+                || p.get("amenity") != null
+                || p.get("leisure") != null
+                || p.get("building") != null;
+    }
+    
+    private boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
+        for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
+            if (r.isMultipolygon() && concernsArea(r) ) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
     @Override
     public void endTest() {
@@ -79 +98 @@
                         area++;
                     }
-                    if (ws.way.get("landuse") != null
-                            || "riverbank".equals(ws.way.get("waterway"))
-                            || ws.way.get("natural") != null
-                            || ws.way.get("amenity") != null
-                            || ws.way.get("leisure") != null
-                            || ws.way.get("building") != null) {
+                    if (concernsArea(ws.way) || parentMultipolygonConcernsArea(ws.way)) {
                         area++;
                         ways--;