Changeset 11837 in josm for trunk/src/org

Timestamp:

2017-04-04T15:29:07+02:00 (8 years ago)

Author:

GerdP

Message:

improve MultipolygonTest to fix #13307, add special case to unit test input file

Use complex Geometry.polygonIntersection test if simple tests cannot find a result.
This is very unlikely so it should not happen often.

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (1 diff)

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

@@ -833 +833 @@
                     continue;
                 }
-
-                Node unsharedNode = getNonIntersectingNode(outerCandidate, inner);
-                if (unsharedNode != null) {
-                    if (checkIfNodeIsInsidePolygon(unsharedNode, outerCandidate)) {
+                boolean useIntersectionTest = false;
+                Node unsharedOuterNode = null;
+                Node unsharedInnerNode = getNonIntersectingNode(outerCandidate, inner);
+                if (unsharedInnerNode != null) {
+                    if (checkIfNodeIsInsidePolygon(unsharedInnerNode, outerCandidate)) {
                         innerCandidates.add(inner);
                     } else {
                         // inner is not inside outerCandidate, check if it contains outerCandidate
-                        unsharedNode = getNonIntersectingNode(inner, outerCandidate);
-                        if (unsharedNode != null) {
-                            if (checkIfNodeIsInsidePolygon(unsharedNode, inner)) {
-                                return null;
+                        unsharedOuterNode = getNonIntersectingNode(inner, outerCandidate);
+                        if (unsharedOuterNode != null) {
+                            if (checkIfNodeIsInsidePolygon(unsharedOuterNode, inner)) {
+                                return null; // outer is inside inner
                             }
                         } else {
-                            return null; // polygons have only common nodes
+                            useIntersectionTest = true;
                         }
                     }
                 } else {
                     // all nodes of inner are also nodes of outerCandidate
-                    unsharedNode = getNonIntersectingNode(inner, outerCandidate);
-                    if (unsharedNode == null) {
+                    unsharedOuterNode = getNonIntersectingNode(inner, outerCandidate);
+                    if (unsharedOuterNode == null) {
+                        return null; // all nodes shared -> same ways, maybe different direction
+                    } else {
+                        if (checkIfNodeIsInsidePolygon(unsharedOuterNode, inner)) {
+                            return null; // outer is inside inner
+                        } else {
+                            useIntersectionTest = true;
+                        }
+                    }
+                }
+                if (useIntersectionTest) {
+                    Main.warn("using complex test ");
+                    PolygonIntersection res = Geometry.polygonIntersection(inner.getNodes(), outerCandidate.getNodes());
+                    if (res == PolygonIntersection.FIRST_INSIDE_SECOND)
+                        innerCandidates.add(inner);
+                    else if (res == PolygonIntersection.SECOND_INSIDE_FIRST)
                         return null;
-                    } else {
-                        innerCandidates.add(inner);
-                    }
                 }
             }