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

Timestamp:

2025-02-25T17:29:20+01:00 (14 months ago)

Author:

stoecker

Message:

fix #24046 - improve speed of multipolygon validator - patch by taylor.smock

File:

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

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

@@ -18 +18 @@
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -33 +34 @@
 import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
@@ -1192 +1194 @@
                     polygonArea = getArea(polygon.getNodes());
                 }
-                Multipolygon mp = new Multipolygon((Relation) p);
+                Multipolygon mp = p.getDataSet() != null ? MultipolygonCache.getInstance().get((Relation) p) : new Multipolygon((Relation) p);
                 boolean inside = true;
                 // a (valid) multipolygon is inside the polygon if all outer rings are inside
@@ -1221 +1223 @@
      */
     public static List<IPrimitive> filterInsideMultipolygon(Collection<IPrimitive> primitives, Relation multiPolygon) {
+        return filterInsideMultipolygon(primitives, multiPolygon, null);
+    }
+
+    /**
+     * Find all primitives in the given collection which are inside the given multipolygon. Members of the multipolygon are
+     * ignored. Unclosed ways and multipolygon relations with unclosed outer rings are ignored.
+     * @param primitives the primitives
+     * @param multiPolygon the multipolygon relation
+     * @param cache The cache to avoid calculating joined inner/outer ways multiple times (see {@link MultipolygonBuilder#joinWays(Relation)})
+     * @return a new list containing the found primitives, empty if multipolygon is invalid or nothing was found.
+     * @since xxx
+     */
+    public static List<IPrimitive> filterInsideMultipolygon(Collection<IPrimitive> primitives, Relation multiPolygon,
+                                                            Map<IRelation<?>, Pair<List<JoinedPolygon>, List<JoinedPolygon>>> cache) {
         List<IPrimitive> res = new ArrayList<>();
         if (primitives.isEmpty())
@@ -1227 +1243 @@
         final Pair<List<JoinedPolygon>, List<JoinedPolygon>> outerInner;
         try {
-            outerInner = MultipolygonBuilder.joinWays(multiPolygon);
+            outerInner = MultipolygonBuilder.joinWays(cache, multiPolygon);
         } catch (MultipolygonBuilder.JoinedPolygonCreationException ex) {
             Logging.trace(ex);