Changeset 3177 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-04-11T15:29:02+02:00 (14 years ago)

Author:

bastiK

Message:

Filter: improved selection handling. (Don't allow to select filtered or disabled objects by clicking on them. Don't connect to hidden ways in add mode.)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• JoinNodeWayAction.java (modified) (1 diff)
• mapmode/DeleteAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (5 diffs)
• mapmode/ExtrudeAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -41 +41 @@
 
         List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
-                Main.map.mapView.getPoint(node));
+                Main.map.mapView.getPoint(node), OsmPrimitive.isSelectablePredicate);
         HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
         for (WaySegment ws : wss) {

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

@@ -19 +19 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 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.WaySegment;
@@ -286 +287 @@
         DeleteParameters result = new DeleteParameters();
 
-        result.nearestNode = Main.map.mapView.getNearestNode(e.getPoint());
+        result.nearestNode = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive.isSelectablePredicate);
         if (result.nearestNode == null) {
-            result.nearestSegment = Main.map.mapView.getNearestWaySegment(e.getPoint());
+            result.nearestSegment = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive.isSelectablePredicate);
             if (result.nearestSegment != null) {
                 if (shift) {

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

@@ -164 +164 @@
         if (mouseOnExistingNode == null && getCurrentDataSet().getSelected().size() == 0
                 && mousePos != null) {
-            mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos);
+            mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         }
 
@@ -332 +332 @@
 
         if (!ctrl) {
-            n = Main.map.mapView.getNearestNode(mousePos);
+            n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         }
 
@@ -366 +366 @@
             if (!ctrl) {
                 // Insert the node into all the nearby way segments
-                List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint());
+                List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint(), OsmPrimitive.isSelectablePredicate);
                 Map<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
                 for (WaySegment ws : wss) {
@@ -681 +681 @@
 
         if (!ctrl && mousePos != null) {
-            currentMouseNode = mv.getNearestNode(mousePos);
+            currentMouseNode = mv.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         }
 
@@ -687 +687 @@
         // *and* there is no node nearby (because nodes beat ways when re-using)
         if(!ctrl && currentMouseNode == null) {
-            List<WaySegment> wss = mv.getNearestWaySegments(mousePos);
+            List<WaySegment> wss = mv.getNearestWaySegments(mousePos, OsmPrimitive.isSelectablePredicate);
             for(WaySegment ws : wss) {
                 mouseOnExistingWays.add(ws.way);

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

@@ -308 +308 @@
         // boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
 
-        selectedSegment = Main.map.mapView.getNearestWaySegment(e.getPoint());
+        selectedSegment = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive.isSelectablePredicate);
 
         if (selectedSegment == null) {

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

@@ -285 +285 @@
         int snapDistance = Main.pref.getInteger("mappaint.node.virtual-snap-distance", 8);
         snapDistance *= snapDistance;
-        OsmPrimitive osm = c.getNearestNode(p);
+        OsmPrimitive osm = c.getNearestNode(p, OsmPrimitive.isSelectablePredicate);
         virtualWays.clear();
         virtualNode = null;
@@ -293 +293 @@
         {
             Collection<WaySegment> nearestWaySegs = allSegements
-            ? c.getNearestWaySegments(p)
-                    : Collections.singleton(c.getNearestWaySegment(p));
+            ? c.getNearestWaySegments(p, OsmPrimitive.isSelectablePredicate)
+                    : Collections.singleton(c.getNearestWaySegment(p, OsmPrimitive.isSelectablePredicate));
 
             for(WaySegment nearestWS : nearestWaySegs) {
@@ -435 +435 @@
             if (!didMove) {
                 selectPrims(
-                        Main.map.mapView.getNearestCollection(e.getPoint()),
+                        Main.map.mapView.getNearestCollection(e.getPoint(), OsmPrimitive.isSelectablePredicate),
                         shift, ctrl, true, false);
 
@@ -485 +485 @@
                 if (ctrl) {
                     Collection<Node> affectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
-                    Collection<Node> nn = Main.map.mapView.getNearestNodes(e.getPoint(), affectedNodes);
+                    Collection<Node> nn = Main.map.mapView.getNearestNodes(e.getPoint(), affectedNodes, OsmPrimitive.isSelectablePredicate);
                     if (nn != null) {
                         Node targetNode = nn.iterator().next();