Ticket #20514: 20514-2.patch

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

@@ -60 +60 @@
     private MapCSSStyleIndex indexData;
     private final Map<MapCSSRule, MapCSSTagCheckerAndRule> ruleToCheckMap = new HashMap<>();
     private static final Map<IPrimitive, Area> mpAreaCache = new HashMap<>();
+    private static final Set<IPrimitive> toMatchForSurrounding = new HashSet<>();
     static final boolean ALL_TESTS = true;
     static final boolean ONLY_SELECTED_TESTS = false;
 
@@ -160 +161 @@
             indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverity, ALL_TESTS);
         }
 
-        Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null);
+        final Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null);
         env.mpAreaCache = mpAreaCache;
+        env.toMatchForSurrounding = toMatchForSurrounding;
 
         Iterator<MapCSSRule> candidates = indexData.getRuleCandidates(p);
         while (candidates.hasNext()) {
@@ -219 +221 @@
         final List<TestError> r = new ArrayList<>();
         final Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null);
         env.mpAreaCache = mpAreaCache;
+        env.toMatchForSurrounding = toMatchForSurrounding;
         for (Set<MapCSSTagCheckerRule> schecks : checksCol) {
             for (MapCSSTagCheckerRule check : schecks) {
                 boolean ignoreError = Severity.OTHER == check.getSeverity() && !includeOtherSeverity;
@@ -368 +371 @@
         // always clear the cache to make sure that we catch changes in geometry
         mpAreaCache.clear();
         ruleToCheckMap.clear();
+        toMatchForSurrounding.clear();
         super.endTest();
     }
 
@@ -387 +391 @@
         }
 
         mpAreaCache.clear();
+        toMatchForSurrounding.clear();
 
         Set<OsmPrimitive> surrounding = new HashSet<>();
         for (Entry<String, Set<MapCSSTagCheckerRule>> entry : checks.entrySet()) {
@@ -467 +472 @@
             }
         }
 
+        toMatchForSurrounding.clear();
+        toMatchForSurrounding.addAll(tested);
         for (OsmPrimitive p : surrounding) {
             if (tested.contains(p))
                 continue;

src/org/openstreetmap/josm/gui/mappaint/Environment.java

@@ -88 +88 @@
     public Map<IPrimitive, Area> mpAreaCache;
 
     /**
+     * Can be null, may contain primitives when surrounding objects of the primitives are tested
+     */
+    public Set<IPrimitive> toMatchForSurrounding;
+
+    /**
      * Creates a new uninitialized environment.
      */
     public Environment() {
@@ -140 +145 @@
         this.intersections = other.intersections;
         this.crossingWaysMap = other.crossingWaysMap;
         this.mpAreaCache = other.mpAreaCache;
+        this.toMatchForSurrounding = other.toMatchForSurrounding;
     }
 
     /**

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

@@ -377 +377 @@
                 } else {
                     toIgnore = null;
                 }
-
+                boolean filterWithTested = e.toMatchForSurrounding != null && !e.toMatchForSurrounding.isEmpty();
                 for (IPrimitive p : primitives) {
+                    if (filterWithTested && !e.toMatchForSurrounding.contains(p))
+                        continue;
                     if (isPrimitiveUsable(p) && Objects.equals(layer, OsmUtils.getLayer(p))
                             && left.matches(new Environment(p).withParent(e.osm)) && isArea(p)
                             && (toIgnore == null || !toIgnore.contains(p))) {