Changeset 7145 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-05-19T18:03:52+02:00 (9 years ago)

Author:

simon04

Message:

see #10037 - Improve node-inside-multipolygon matching by handling rings consisting of several ways correctly

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.MultipolygonCreate;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.NodePositionComparator;
@@ -860 +861 @@
     public static boolean isPolygonInsideMultiPolygon(List<Node> nodes, Relation multiPolygon, Predicate<Way> isOuterWayAMatch) {
         // Extract outer/inner members from multipolygon
-        MultiPolygonMembers mpm = new MultiPolygonMembers(multiPolygon);
+        final MultiPolygonMembers mpm = new MultiPolygonMembers(multiPolygon);
+        // Construct complete rings for the inner/outer members
+        final List<MultipolygonCreate.JoinedPolygon> outerRings;
+        final List<MultipolygonCreate.JoinedPolygon> innerRings;
+        try {
+            outerRings = MultipolygonCreate.joinWays(mpm.outers);
+            innerRings = MultipolygonCreate.joinWays(mpm.inners);
+        } catch (MultipolygonCreate.JoinedPolygonCreationException ex) {
+            Main.debug("Invalid multipolygon " + multiPolygon);
+            return false;
+        }
         // Test if object is inside an outer member
-        for (Way out : mpm.outers) {
+        for (MultipolygonCreate.JoinedPolygon out : outerRings) {
             if (nodes.size() == 1
                     ? nodeInsidePolygon(nodes.get(0), out.getNodes())
@@ -868 +879 @@
                 boolean insideInner = false;
                 // If inside an outer, check it is not inside an inner
-                for (Way in : mpm.inners) {
+                for (MultipolygonCreate.JoinedPolygon in : innerRings) {
                     if (polygonIntersection(in.getNodes(), out.getNodes()) == PolygonIntersection.FIRST_INSIDE_SECOND
                             && (nodes.size() == 1
@@ -880 +891 @@
                 if (!insideInner) {
                     // Final check using predicate
-                    if (isOuterWayAMatch == null || isOuterWayAMatch.evaluate(out)) {
+                    if (isOuterWayAMatch == null || isOuterWayAMatch.evaluate(out.ways.get(0) /* TODO give a better representation of the outer ring to the predicate */)) {
                         return true;
                     }