Changeset 15069 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

Timestamp:

2019-05-11T11:15:49+02:00 (6 years ago)

Author:

GerdP

Message:

fix #17695

• add support to find multipolygon inside polygon or multipolygon with ContainsFinder
• add some unit tests
• performance_1: improve isPolygonInsideMultiPolygon() by using the areas calculated

in MultipolygonBuilder.joinWays() instead of calling getArea() again.

• performance_2: improve isPolygonInsideMultiPolygon() by first checking bounding boxes (helps with complex MP containing many inners as it avoids the Area.intersect() method)
• performance_3: implement new methods to reuse result of complex method MultipolygonBuilder.joinWays() in ContainsFinder

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -5 +5 @@
 
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -313 +314 @@
 
         private class ContainsFinder extends AbstractFinder {
+            protected List<IPrimitive> toCheck;
+
             protected ContainsFinder(Environment e) {
                 super(e);
@@ -319 +322 @@
 
             @Override
-            public void visit(INode n) {
-                if (left.matches(new Environment(n).withParent(e.osm))
-                    && ((e.osm instanceof IWay && Geometry.nodeInsidePolygon(n, ((IWay<?>) e.osm).getNodes()))
-                            || (e.osm instanceof Relation && (
-                                    (Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null)))) {
-                    addToChildren(e, n);
-                }
-            }
-
-            @Override
-            public void visit(IWay<?> w) {
-                if (left.matches(new Environment(w).withParent(e.osm))
-                    && ((e.osm instanceof IWay && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
-                            Geometry.polygonIntersection(w.getNodes(), ((IWay<?>) e.osm).getNodes())))
-                            || (e.osm instanceof Relation && (
-                                    (Relation) e.osm).isMultipolygon()
-                                    && Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null)))) {
-                    addToChildren(e, w);
+            public void visit(Collection<? extends IPrimitive> primitives) {
+                for (IPrimitive p : primitives) {
+                    if (p != e.osm && isPrimitiveUsable(p) && left.matches(new Environment(p).withParent(e.osm))) {
+                        if (toCheck == null) {
+                            toCheck = new ArrayList<>();
+                        }
+                        toCheck.add(p);
+                    }
+                }
+            }
+
+            void execGeometryTests() {
+                if (toCheck == null || toCheck.isEmpty())
+                    return;
+
+                if (e.osm instanceof IWay) {
+                    for (IPrimitive p : Geometry.filterInsidePolygon(toCheck, (IWay<?>) e.osm)) {
+                        addToChildren(e, p);
+                    }
+                } else if (e.osm instanceof Relation) {
+                    for (IPrimitive p : Geometry.filterInsideMultipolygon(toCheck, (Relation) e.osm)) {
+                        addToChildren(e, p);
+                    }
                 }
             }
@@ -364 +372 @@
                         containsFinder.visit(e.osm.getDataSet().searchWays(e.osm.getBBox()));
                     }
+                    if (((OptimizedGeneralSelector) left).matchesBase(OsmPrimitiveType.RELATION)) {
+                        containsFinder.visit(e.osm.getDataSet().searchRelations(e.osm.getBBox()));
+                    }
                 } else {
                     // use slow test
                     containsFinder.visit(e.osm.getDataSet().allPrimitives());
                 }
-
+                containsFinder.execGeometryTests();
                 return e.children != null;