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

Timestamp:

28.12.2011 22:51:11 (5 months ago)

Author:

Don-vip

Message:

see #7034 - building inside building false positives

File:

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

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

@@ -6 +6 @@
 import java.util.LinkedList;
 import java.util.List;
+
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -46 +48 @@
     }
 
+    /**
+     * Return true if w is in polygon.
+     */
     private static boolean isInPolygon(Way w, List<Node> polygon) {
+        // Check that all nodes of w are in polygon
         for (Node n : w.getNodes()) {
             if (!isInPolygon(n, polygon)) {
+                return false;
+            }
+        }
+        // All nodes can be inside polygon and still, w outside:
+        //            +-------------+
+        //           /|             |
+        //          / |             |
+        //         /  |             |
+        //        / w |             |
+        //  +----+----+             |
+        //  |       polygon         |
+        //  |_______________________|
+        //
+        for (int i=0; i<w.getNodesCount(); i++) {
+            LatLon center = null;
+            if (i > 0) {
+                center = w.getNode(i).getCoor().getCenter(w.getNode(i-1).getCoor());
+            } else if (w.isClosed()) {
+                center = w.getNode(i).getCoor().getCenter(w.getNode(w.getNodesCount()-2).getCoor());
+            }
+            if (center != null && !isInPolygon(new Node(center), polygon)) {
                 return false;
             }
@@ -66 +93 @@
                         return false;
                     } else if (p instanceof Node) {
-                        return isInPolygon((Node) p, object.getNodes()) || object.getNodes().contains((Node) p);
+                        return isInPolygon((Node) p, object.getNodes()) || object.getNodes().contains(p);
                     } else if (p instanceof Way) {
                         return isInPolygon((Way) p, object.getNodes());