Ticket #17745: 17745.patch

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

@@ -1042 +1042 @@
 
     /**
      * Find all primitives in the given collection which are inside the given polygon.
+     * Unclosed ways and multipolygon relations with unclosed outer rings are ignored.
      * @param primitives the primitives
      * @param polygon the polygon
      * @return a new list containing the found primitives, empty if polygon is invalid or nothing was found.
@@ -1060 +1061 @@
                     res.add(p);
                 }
             } else if (p instanceof IWay) {
-                if (polygonArea == null) {
-                    polygonArea = getArea(polygon.getNodes());
+                if (((IWay<?>) p).isClosed()) {
+                    if (polygonArea == null) {
+                        polygonArea = getArea(polygon.getNodes());
+                    }
+                    if (PolygonIntersection.FIRST_INSIDE_SECOND == polygonIntersection(getArea(((IWay<?>) p).getNodes()),
+                            polygonArea)) {
+                        res.add(p);
+                    }
                 }
-                if (PolygonIntersection.FIRST_INSIDE_SECOND == polygonIntersection(getArea(((IWay<?>) p).getNodes()),
-                        polygonArea)) {
-                    res.add(p);
-                }
             } else if (p.isMultipolygon()) {
                 if (polygonArea == null) {
                     polygonArea = getArea(polygon.getNodes());
@@ -1075 +1078 @@
                 boolean inside = true;
                 // a (valid) multipolygon is inside the polygon if all outer rings are inside
                 for (PolyData outer : mp.getOuterPolygons()) {
-                    if (PolygonIntersection.FIRST_INSIDE_SECOND != polygonIntersection(getArea(outer.getNodes()),
-                            polygonArea)) {
+                    if (!outer.isClosed()
+                            || PolygonIntersection.FIRST_INSIDE_SECOND != polygonIntersection(getArea(outer.getNodes()),
+                                    polygonArea)) {
                         inside = false;
                         break;
                     }
@@ -1091 +1095 @@
 
     /**
      * Find all primitives in the given collection which are inside the given multipolygon. Members of the multipolygon are
-     * ignored.
+     * ignored. Unclosed ways and multipolygon relations with unclosed outer rings are ignored.
      * @param primitives the primitives
      * @param multiPolygon the multipolygon relation
      * @return a new list containing the found primitives, empty if multipolygon is invalid or nothing was found.
@@ -1120 +1124 @@
                     res.add(p);
                 }
             } else if (p instanceof Way) {
-                if (isPolygonInsideMultiPolygon(((Way) p).getNodes(), outerInner, null)) {
+                if (((IWay<?>) p).isClosed() && isPolygonInsideMultiPolygon(((Way) p).getNodes(), outerInner, null)) {
                     res.add(p);
                 }
             } else if (p.isMultipolygon()) {
@@ -1128 +1132 @@
                 boolean inside = true;
                 // a (valid) multipolygon is inside multiPolygon if all outer rings are inside
                 for (PolyData outer : mp.getOuterPolygons()) {
-                    if (!isPolygonInsideMultiPolygon(outer.getNodes(), outerInner, null)) {
+                    if (!outer.isClosed() || !isPolygonInsideMultiPolygon(outer.getNodes(), outerInner, null)) {
                         inside = false;
                         break;
                     }