Changeset 15107 in josm

Timestamp:

2019-05-25T07:23:25+02:00 (5 years ago)

Author:

GerdP

Message:

see #17745: ignore unclosed ways and multipolygons with unclosed outer rings in methods Geometry.filterInsidePolygon() and Geometry.filterInsideMultipolygon()
TODO: implement correct algorithm for unclosed ways

File:

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

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

@@ -1043 +1043 @@
     /**
      * 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
@@ -1061 +1062 @@
                 }
             } else if (p instanceof IWay) {
-                if (polygonArea == null) {
-                    polygonArea = getArea(polygon.getNodes());
-                }
-                if (PolygonIntersection.FIRST_INSIDE_SECOND == polygonIntersection(getArea(((IWay<?>) p).getNodes()),
-                        polygonArea)) {
-                    res.add(p);
+                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);
+                    }
                 }
             } else if (p.isMultipolygon()) {
@@ -1076 +1079 @@
                 // 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;
@@ -1092 +1096 @@
     /**
      * 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
@@ -1121 +1125 @@
                 }
             } 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);
                 }
@@ -1129 +1133 @@
                 // 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;