Changeset 5490 in josm for trunk/src/org

Timestamp:

2012-09-01T19:01:03+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8015 - proper warnings for closed ways with area-style keys that do not denote an area

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/Way.java (modified) (2 diffs)
• validation/tests/DuplicateWay.java (modified) (1 diff)
• validation/tests/MultipolygonTest.java (modified) (1 diff)
• validation/tests/OverlappingAreas.java (modified) (1 diff)
• validation/tests/UnclosedWays.java (modified) (1 diff)

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

@@ -471 +471 @@
         return nodes.length >= 3 && nodes[nodes.length-1] == nodes[0];
     }
+    
+    /**
+     * Determines if this way denotes an area (closed way with at least three distinct nodes).
+     * @return {@code true} if this way is closed and contains at least three distinct nodes
+     * @see #isClosed
+     * @since 5490
+     */
+    public boolean isArea() {
+        if (this.nodes.length >= 4 && isClosed()) {
+            Node distinctNode = null;
+            for (int i=1; i<nodes.length-1; i++) {
+                if (distinctNode == null && nodes[i] != nodes[0]) {
+                    distinctNode = nodes[i];
+                } else if (distinctNode != null && nodes[i] != nodes[0] && nodes[i] != distinctNode) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
     /**
@@ -627 +647 @@
             if (lastN != null) {
                 LatLon lastNcoor = lastN.getCoor();
-                LatLon coor = n.getCoor();
+                LatLon coor = n.getCoor();
                 if (lastNcoor != null && coor != null) {
                     length += coor.greatCircleDistance(lastNcoor);

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

@@ -177 +177 @@
             }
             wNodesToUse.add(wNodes.get(lowestIndex));
+        } else {
+                wNodesToUse.addAll(wNodes);
         }
         // Build the list of lat/lon

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

@@ -116 +116 @@
     @Override
     public void visit(Way w) {
-        if (!w.isClosed() && ElemStyles.hasAreaElemStyle(w, false)) {
+        if (!w.isArea() && ElemStyles.hasAreaElemStyle(w, false)) {
             List<Node> nodes = w.getNodes();
             if (nodes.size()<1) return; // fix zero nodes bug

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

@@ -27 +27 @@
     @Override
     public void visit(Way w) {
-        if (w.isUsable() && w.isClosed() && ElemStyles.hasAreaElemStyle(w, false)) {
+        if (w.isUsable() && w.isArea() && ElemStyles.hasAreaElemStyle(w, false)) {
             index.add(w);
         }

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

@@ -107 +107 @@
         }
 
-        if (type != null && !w.isClosed()) {
+        if (type != null && !w.isArea()) {
             for (OsmPrimitive parent: w.getReferrers()) {
                 if (parent instanceof Relation && ((Relation)parent).isMultipolygon())