Changeset 5016 in josm

Timestamp:

Feb 22, 2012 2:38:02 PM (15 months ago)

Author:

akks

Message:

Patch by JoshDoe [Faster relation selection with Alt+click and middle-click], fix #7314, #7317

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -605 +605 @@
                 }
             } else {
-                if (osm instanceof Node) {
-                    cycleList = new LinkedList<OsmPrimitive>(mv.getNearestNodes(p, OsmPrimitive.isSelectablePredicate));
-                } else if (osm instanceof Way) {
-                    cycleList = new LinkedList<OsmPrimitive>(mv.getNearestWays(p, OsmPrimitive.isSelectablePredicate));
-                }
+                cycleList = mv.getAllNearest(p, OsmPrimitive.isSelectablePredicate);
 
                 if (cycleList.size() > 1) {

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

@@ -36 +36 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
@@ -1091 +1092 @@
         Set<Way> wset = new HashSet<Way>();
 
+        // add nearby ways
         for (List<WaySegment> wss : getNearestWaySegmentsImpl(p, predicate).values()) {
             for (WaySegment ws : wss) {
@@ -1098 +1100 @@
             }
         }
+        
+        // add nearby nodes
         for (List<Node> nlist : getNearestNodesImpl(p, predicate).values()) {
             nearestList.addAll(nlist);
         }
+        
+        // add parent relations of nearby nodes and ways
+        Set<OsmPrimitive> parentRelations = new HashSet<OsmPrimitive>();
+        for (OsmPrimitive o : nearestList) {
+            for (OsmPrimitive r : o.getReferrers()) {
+                if (r instanceof Relation && predicate.evaluate(r)) {
+                    parentRelations.add(r);
+                }
+            }
+        }
+        nearestList.addAll(parentRelations);
+        
         if (ignore != null) {
             nearestList.removeAll(ignore);