Changeset 19271 in josm

Timestamp:

2024-12-18T23:36:23+01:00 (30 hours ago)

Author:

taylor.smock

Message:

Fix a performance issue when working with large datasets

The primary issue is that the collection passed to the resetTiles method is a
filtered collection with no defined size. In order to calculate the size, it must
iterate through the collection which becomes expensive with large datasets.

The fix for this is to remove the dependency on the size of the dataset, and just
look at the number of primitives passed in.

In addition, if the current renderer is not StyledTiledMapRenderer, clear the cache and return.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1250 +1250 @@
 
     private void resetTiles(Collection<? extends IPrimitive> primitives) {
-        if (primitives.size() >= this.data.allNonDeletedCompletePrimitives().size() || primitives.size() > 100) {
+        // Clear the cache if we aren't using tiles. And return.
+        if (!MapRendererFactory.getInstance().isMapRendererActive(StyledTiledMapRenderer.class)) {
+            this.cache.clear();
+            return;
+        }
+        // Don't use anything that uses filtered collections. It becomes slow at large datasets.
+        if (primitives.size() > 100) {
             dirtyAll();
             return;