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

Timestamp:

2013-12-18T16:04:13+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9440 - Consistent definition of ways treated as areas

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/Node.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (1 diff)
• osm/Relation.java (modified) (1 diff)
• osm/Way.java (modified) (2 diffs)
• validation/tests/OverlappingWays.java (modified) (3 diffs)
• validation/tests/UnconnectedWays.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -331 +331 @@
         this.north = Double.NaN;
     }
+
+    @Override
+    public boolean concernsArea() {
+        // A node cannot be an area
+        return false;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -1312 +1312 @@
         return ret;
     }
+
+    /**
+     * Determines if this primitive has tags denoting an area.
+     * @return {@code true} if this primitive has tags denoting an area, {@code false} otherwise.
+     * @since 6491
+     */
+    public final boolean hasAreaTags() {
+        return hasKey("landuse")
+                || "yes".equals(get("area"))
+                || "riverbank".equals(get("waterway"))
+                || hasKey("natural")
+                || hasKey("amenity")
+                || hasKey("leisure")
+                || hasKey("building")
+                || hasKey("building:part");
+    }
+
+    /**
+     * Determines if this primitive semantically concerns an area.
+     * @return {@code true} if this primitive semantically concerns an area, according to its type, geometry and tags, {@code false} otherwise.
+     * @since 6491
+     */
+    public abstract boolean concernsArea();
 }

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -548 +548 @@
         }
     }
+
+    @Override
+    public boolean concernsArea() {
+        return isMultipolygon() && hasAreaTags();
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.HashSet;
 
 import org.openstreetmap.josm.Main;
@@ -721 +721 @@
         return !respectOneway || isOneway() != -1 ? lastNode() : firstNode();
     }
+
+    @Override
+    public boolean concernsArea() {
+        return hasAreaTags();
+    }
 }

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

@@ -55 +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
-                || p.get("building:part") != null;
-    }
-    
     private boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
         for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
-            if (r.isMultipolygon() && concernsArea(r) ) {
+            if (r.concernsArea() ) {
                 return true;
             }
@@ -73 +63 @@
         return false;
     }
-    
+
+    @SuppressWarnings("null")
     @Override
     public void endTest() {
@@ -99 +90 @@
                         area++;
                     }
-                    if (concernsArea(ws.way) || parentMultipolygonConcernsArea(ws.way)) {
+                    if (ws.way.concernsArea() || parentMultipolygonConcernsArea(ws.way)) {
                         area++;
                         ways--;

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

@@ -112 +112 @@
                 return;
             for (Node en : s.nearbyNodes(mindist)) {
-                if (endnodes_highway.contains(en) && !s.highway && !s.isArea()) {
-                    map.put(en, s.w);
-                } else if (endnodes.contains(en) && !s.isArea()) {
+                if (endnodes_highway.contains(en) && !s.highway && !s.w.concernsArea()) {
+                    map.put(en, s.w);
+                } else if (endnodes.contains(en) && !s.w.concernsArea()) {
                     map.put(en, s.w);
                 }
@@ -294 +294 @@
             }
             return nearbyNodeCache;
-        }
-
-        public boolean isArea() {
-            return w.hasKey("landuse")
-                    || w.hasKey("leisure")
-                    || w.hasKey("amenity")
-                    || w.hasKey("building");
         }
     }