Changeset 7389 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-08-13T23:07:06+02:00 (10 years ago)

Author:

bastiK

Message:

see #10363 - you cannot click on object that is not visible on the map

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (6 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)

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

@@ -233 +233 @@
     private boolean giveUserFeedback(MouseEvent e, int modifiers) {
         Collection<OsmPrimitive> c = asColl(
-                mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true));
+                mv.getNearestNodeOrWay(e.getPoint(), mv.isSelectablePredicate, true));
 
         updateKeyModifiers(modifiers);
@@ -406 +406 @@
         // primitives under cursor are stored in c collection
 
-        OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true);
+        OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(e.getPoint(), mv.isSelectablePredicate, true);
 
         determineMapMode(nearestPrimitive!=null);
@@ -687 +687 @@
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelectedNodesAndWays();
         if (selection.isEmpty()) { // if nothing was selected to drag, just select nearest node/way to the cursor
-            OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(mv.getPoint(startEN), OsmPrimitive.isSelectablePredicate, true);
+            OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(mv.getPoint(startEN), mv.isSelectablePredicate, true);
             getCurrentDataSet().setSelected(nearestPrimitive);
         }
@@ -858 +858 @@
         Collection<Node> target = mv.getNearestNodes(p,
                 getCurrentDataSet().getSelectedNodes(),
-                OsmPrimitive.isSelectablePredicate);
+                mv.isSelectablePredicate);
         return target.isEmpty() ? null : target.iterator().next();
     }
@@ -964 +964 @@
                     if (waitForMouseUpParameter) {
                         // prefer a selected nearest node or way, if possible
-                        osm = mv.getNearestNodeOrWay(p, OsmPrimitive.isSelectablePredicate, true);
+                        osm = mv.getNearestNodeOrWay(p, mv.isSelectablePredicate, true);
                     }
                 } else {
                     // Alt + left mouse button pressed: we need to build cycle list
-                    cycleList = mv.getAllNearest(p, OsmPrimitive.isSelectablePredicate);
+                    cycleList = mv.getAllNearest(p, mv.isSelectablePredicate);
 
                     if (cycleList.size() > 1) {
@@ -1104 +1104 @@
 
                 Way w = null;
-                for (WaySegment ws : mv.getNearestWaySegments(p, OsmPrimitive.isSelectablePredicate)) {
+                for (WaySegment ws : mv.getNearestWaySegments(p, mv.isSelectablePredicate)) {
                     w = ws.way;
 

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

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.Predicate;
@@ -83 +84 @@
         void systemOfMeasurementChanged(String oldSoM, String newSoM);
     }
+
+    public Predicate<OsmPrimitive> isSelectablePredicate = new Predicate<OsmPrimitive>() {
+        @Override
+        public boolean evaluate(OsmPrimitive prim) {
+            if (!prim.isSelectable()) return false;
+            // if it isn't displayed on screen, you cannot click on it
+            return !MapPaintStyles.getStyles().get(prim, getDist100Pixel(), NavigatableComponent.this).isEmpty();
+        }
+    };
 
     public static final IntegerProperty PROP_SNAP_DISTANCE = new IntegerProperty("mappaint.node.snap-distance", 10);