Changeset 19272 in josm for trunk/src/org

Timestamp:

2024-12-19T22:13:29+01:00 (3 weeks ago)

Author:

taylor.smock

Message:

See #24046: Reduce cost of Geometry#filterInsidePolygon when a primitive is a relation

This was done by checking that the bounds of the polygon contain the bounds of
the multipolygon ring before creating an area from the multipolygon ring.

If the polygon does not contain the bounds of the ring, then at least part
of the ring is outside the polygon, and thus is not inside the polygon.

Measurements using validators at (57.5183581,-75.0512982),(57.2181217,-73.9434821):

• CPU: -87%
• Memory: -62%

Please note that the test area is still very expensive in
Geometry#filterInsideMultipolygon (note the Multipolygon).

File:

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

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

@@ -705 +705 @@
         inter.intersect(a2);
 
+        // Note: Area has an equals method that takes Area; it does _not_ override the Object.equals method.
         if (inter.isEmpty() || !checkIntersection(inter, eps)) {
             return new Pair<>(PolygonIntersection.OUTSIDE, inter);
@@ -1196 +1197 @@
                 for (PolyData outer : mp.getOuterPolygons()) {
                     if (!outer.isClosed()
+                            || !polygonArea.getBounds2D().contains(outer.getBounds())
                             || PolygonIntersection.FIRST_INSIDE_SECOND != polygonIntersection(getArea(outer.getNodes()),
                                     polygonArea)) {