Changeset 15021 in josm for trunk/src/org

Timestamp:

2019-04-26T16:45:26+02:00 (6 years ago)

Author:

GerdP

Message:

fix #17652: Method Geometry.isPolygonInsideMultiPolygon returns wrong result

• don't allow polygon to cross the outer way
• performance improvement: only check if inner is inside outer when polygon is inside inner. Matters for complex mp with many inners.
• add unit test which shows error #17652 with old code

File:

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

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

@@ -12 +12 @@
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -1003 +1002 @@
             if (nodes.size() == 1
                     ? nodeInsidePolygon(nodes.get(0), out.getNodes())
-                    : EnumSet.of(PolygonIntersection.FIRST_INSIDE_SECOND, PolygonIntersection.CROSSING).contains(
-                            polygonIntersection(nodes, out.getNodes()))) {
+                    : PolygonIntersection.FIRST_INSIDE_SECOND == polygonIntersection(nodes, out.getNodes())) {
                 boolean insideInner = false;
                 // If inside an outer, check it is not inside an inner
                 for (JoinedPolygon in : outerInner.b) {
-                    if (polygonIntersection(in.getNodes(), out.getNodes()) == PolygonIntersection.FIRST_INSIDE_SECOND
-                            && (nodes.size() == 1
-                            ? nodeInsidePolygon(nodes.get(0), in.getNodes())
-                            : polygonIntersection(nodes, in.getNodes()) == PolygonIntersection.FIRST_INSIDE_SECOND)) {
+                    if (nodes.size() == 1 ? nodeInsidePolygon(nodes.get(0), in.getNodes())
+                            : polygonIntersection(nodes, in.getNodes()) == PolygonIntersection.FIRST_INSIDE_SECOND
+                                    && polygonIntersection(in.getNodes(),
+                                            out.getNodes()) == PolygonIntersection.FIRST_INSIDE_SECOND) {
                         insideInner = true;
                         break;