Changeset 5713 in josm for trunk/src/org

Timestamp:

2013-02-12T23:31:18+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8403 - Show combined length of selected ways in status bar (up to 250 ways to prevent potential performance issue)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -74 +74 @@
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -590 +591 @@
             remember(selection);
             double dist = -1;
-            if(this.selection.size() == 1) {
-                OsmPrimitive o = this.selection.get(0);
-                if(o instanceof Way)
-                   dist = ((Way)o).getLength();
+            SubclassFilteredCollection<OsmPrimitive, Way> ways = new SubclassFilteredCollection<OsmPrimitive, Way>(selection, OsmPrimitive.wayPredicate);
+            // Compute total length of selected way(s) until an arbitrary limit set to 250 ways
+            // in order to prevent performance issue if a large number of ways are selected (old behaviour kept in that case, see #8403)
+            if (!ways.isEmpty() && ways.size() < 250) {
+                for (Way w : ways) {
+                    dist += w.getLength();
+                }
             }
             Main.map.statusLine.setDist(dist);