Ticket #17695: 17695.patch

src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -41 +41 @@
 import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.IWay;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -69 +70 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource.MapCSSRuleIndex;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.AbstractSelector;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelector;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelectorType;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.OptimizedGeneralSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
@@ -854 +857 @@
         while (candidates.hasNext()) {
             MapCSSRule r = candidates.next();
             env.clearSelectorMatchingInformation();
+            if (partialSelection && r.selector instanceof Selector.ChildOrParentSelector) {
+                ChildOrParentSelector sel = (Selector.ChildOrParentSelector) r.selector;
+                if (sel.type == ChildOrParentSelectorType.ELEMENT_OF && p instanceof Node && p.getDataSet() != null) {
+                    List<OsmPrimitive> toCheck = new ArrayList<>();
+                    toCheck.addAll(p.getDataSet().searchWays(p.getBBox()));
+                    toCheck.addAll(p.getDataSet().searchRelations(p.getBBox()));
+                    toCheck.removeIf(OsmPrimitive::isSelected);
+                    Set<Set<TagCheck>> checksCol = Collections.singleton(Collections.singleton(indexData.getCheck(r)));
+                    toCheck.forEach(p2 -> res.addAll(getErrorsForPrimitive(p2, includeOtherSeverity, checksCol)));
+                }
+            }
             if (r.selector.matches(env)) { // as side effect env.parent will be set (if s is a child selector)
                 TagCheck check = indexData.getCheck(r);
                 if (check != null) {