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

Timestamp:

2015-12-27T23:30:14+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12239 - filtered multipolygon relations could be selected by double-clicking and ways by middle-clicking

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SelectByInternalPointAction.java (modified) (2 diffs)
• gui/MapStatus.java (modified) (4 diffs)

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

@@ -49 +49 @@
         }
         for (Relation r : ds.getRelations()) {
-            if (r.isUsable() && r.isMultipolygon()) {
+            if (r.isUsable() && r.isMultipolygon() && r.isSelectable()) {
                 if (Geometry.isNodeInsideMultiPolygon(n, r, null)) {
                     for (RelationMember m : r.getMembers()) {
@@ -68 +68 @@
         return found.values();
     }
-
 
     /**

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
+import static org.openstreetmap.josm.data.osm.OsmPrimitive.isSelectablePredicate;
+import static org.openstreetmap.josm.data.osm.OsmPrimitive.isUsablePredicate;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -73 +75 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Predicate;
 
 /**
@@ -285 +288 @@
                     // display them if the middle mouse button is pressed and keep them until the mouse is moved
                     if (middleMouseDown || isAtOldPosition) {
-                        Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos, OsmPrimitive.isUsablePredicate);
+                        Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos, new Predicate<OsmPrimitive>() {
+                            @Override
+                            public boolean evaluate(OsmPrimitive o) {
+                                return isUsablePredicate.evaluate(o) && isSelectablePredicate.evaluate(o);
+                            }
+                        });
 
                         final JPanel c = new JPanel(new GridBagLayout());
@@ -432 +440 @@
          */
         private void statusBarElementUpdate(MouseState ms) {
-            final OsmPrimitive osmNearest = mv.getNearestNodeOrWay(ms.mousePos, OsmPrimitive.isUsablePredicate, false);
+            final OsmPrimitive osmNearest = mv.getNearestNodeOrWay(ms.mousePos, isUsablePredicate, false);
             if (osmNearest != null) {
                 nameText.setText(osmNearest.getDisplayName(DefaultNameFormatter.getInstance()));