Changeset 18275 in josm for trunk/src/org

Timestamp:

2021-10-13T15:26:32+02:00 (3 years ago)

Author:

GerdP

Message:

fix #20514: Possible poor performance when validating selection

• Improve performance of validator when a small selection is tested (selected objects or on upload) and there are objects with large bboxes which cover a lot of objects

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (6 diffs)
• gui/mappaint/Environment.java (modified) (2 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (1 diff)

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

@@ -61 +61 @@
     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;
@@ -161 +162 @@
         }
 
-        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);
@@ -220 +222 @@
         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) {
@@ -369 +372 @@
         mpAreaCache.clear();
         ruleToCheckMap.clear();
+        toMatchForSurrounding.clear();
         super.endTest();
     }
@@ -388 +392 @@
 
         mpAreaCache.clear();
+        toMatchForSurrounding.clear();
 
         Set<OsmPrimitive> surrounding = new HashSet<>();
@@ -468 +473 @@
         }
 
+        toMatchForSurrounding.clear();
+        toMatchForSurrounding.addAll(tested);
         for (OsmPrimitive p : surrounding) {
             if (tested.contains(p))

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

@@ -87 +87 @@
      */
     public Map<IPrimitive, Area> mpAreaCache;
+
+    /**
+     * Can be null, may contain primitives when surrounding objects of the primitives are tested
+     */
+    public Set<IPrimitive> toMatchForSurrounding;
 
     /**
@@ -141 +146 @@
         this.crossingWaysMap = other.crossingWaysMap;
         this.mpAreaCache = other.mpAreaCache;
+        this.toMatchForSurrounding = other.toMatchForSurrounding;
     }
 

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

@@ -378 +378 @@
                     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)