Changeset 19167 in josm for trunk/src

Timestamp:

2024-08-05T21:18:00+02:00 (3 months ago)

Author:

taylor.smock

Message:

Fix #23830: Slow selection when there is a lot of data

We were previously iterating through all nodes and ways when making a selection.
We don't have to do that since we have a way to efficiently find objects in a
bbox.

File:

• trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -20 +20 @@
 import org.openstreetmap.josm.actions.SelectByInternalPointAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -383 +384 @@
             }
         } else if (ds != null) {
+            final BBox bbox = nc.getLatLonBounds(bounding).toBBox();
             // nodes
-            for (Node n : ds.getNodes()) {
+            for (Node n : ds.searchNodes(bbox)) {
                 if (n.isSelectable() && selectionResult.contains(nc.getPoint2D(n))) {
                     selection.add(n);
@@ -391 +393 @@
 
             // ways
-            for (Way w : ds.getWays()) {
+            for (Way w : ds.searchWays(bbox)) {
                 if (!w.isSelectable() || w.isEmpty()) {
                     continue;