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

Timestamp:

2019-05-09T10:13:10+02:00 (5 years ago)

Author:

GerdP

Message:

fix #12627,#14287,#14289,#17695

• let CrossingFinder and ContainsFinder find all objects instead of stopping at first match
• if objects are selected, make sure that ContainsFinder is called for enclosing objects which are not in the selection
• enable corresponding unit tests

Draw back: MapCSSTagChecker is a bit slower.

File:

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

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

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -258 +259 @@
                 return !e.osm.equals(p) && p.isUsable();
             }
+
+            protected void addToChildren(Environment e, IPrimitive p) {
+                if (e.children == null) {
+                    e.children = new LinkedHashSet<>();
+                }
+                e.children.add(p);
+            }
         }
 
@@ -299 +307 @@
             @Override
             public void visit(IWay<?> w) {
-                if (e.child == null && Objects.equals(layer, OsmUtils.getLayer(w))
+                if (Objects.equals(layer, OsmUtils.getLayer(w))
                     && left.matches(new Environment(w).withParent(e.osm))
                     && e.osm instanceof IWay && Geometry.PolygonIntersection.CROSSING.equals(
                             Geometry.polygonIntersection(w.getNodes(), ((IWay<?>) e.osm).getNodes()))) {
-                    e.child = w;
+                    addToChildren(e, w);
                 }
             }
@@ -316 +324 @@
             @Override
             public void visit(INode n) {
-                if (e.child == null && left.matches(new Environment(n).withParent(e.osm))
+                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)))) {
-                    e.child = n;
+                    addToChildren(e, n);
                 }
             }
@@ -326 +334 @@
             @Override
             public void visit(IWay<?> w) {
-                if (e.child == null && left.matches(new Environment(w).withParent(e.osm))
+                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())))
@@ -332 +340 @@
                                     (Relation) e.osm).isMultipolygon()
                                     && Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null)))) {
-                    e.child = w;
+                    addToChildren(e, w);
                 }
             }
@@ -388 +396 @@
                 }
 
-                return e.child != null;
+                return e.children != null;
 
             } else if (ChildOrParentSelectorType.CROSSING == type && e.osm instanceof IWay) {
                 e.parent = e.osm;
-                final CrossingFinder crossingFinder = new CrossingFinder(e);
                 if (right instanceof OptimizedGeneralSelector
                         && ((OptimizedGeneralSelector) right).matchesBase(OsmPrimitiveType.WAY)) {
+                    final CrossingFinder crossingFinder = new CrossingFinder(e);
                     crossingFinder.visit(e.osm.getDataSet().searchWays(e.osm.getBBox()));
                 }
-                return e.child != null;
+                return e.children != null;
             } else if (ChildOrParentSelectorType.SIBLING == type) {
                 if (e.osm instanceof INode) {