- Timestamp:
- 2015-12-27T23:30:14+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java
r8393 r9183 49 49 } 50 50 for (Relation r : ds.getRelations()) { 51 if (r.isUsable() && r.isMultipolygon() ) {51 if (r.isUsable() && r.isMultipolygon() && r.isSelectable()) { 52 52 if (Geometry.isNodeInsideMultiPolygon(n, r, null)) { 53 53 for (RelationMember m : r.getMembers()) { … … 68 68 return found.values(); 69 69 } 70 71 70 72 71 /** -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r9078 r9183 2 2 package org.openstreetmap.josm.gui; 3 3 4 import static org.openstreetmap.josm.data.osm.OsmPrimitive.isSelectablePredicate; 5 import static org.openstreetmap.josm.data.osm.OsmPrimitive.isUsablePredicate; 4 6 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 5 7 import static org.openstreetmap.josm.tools.I18n.marktr; … … 73 75 import org.openstreetmap.josm.tools.GBC; 74 76 import org.openstreetmap.josm.tools.ImageProvider; 77 import org.openstreetmap.josm.tools.Predicate; 75 78 76 79 /** … … 285 288 // display them if the middle mouse button is pressed and keep them until the mouse is moved 286 289 if (middleMouseDown || isAtOldPosition) { 287 Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos, OsmPrimitive.isUsablePredicate); 290 Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos, new Predicate<OsmPrimitive>() { 291 @Override 292 public boolean evaluate(OsmPrimitive o) { 293 return isUsablePredicate.evaluate(o) && isSelectablePredicate.evaluate(o); 294 } 295 }); 288 296 289 297 final JPanel c = new JPanel(new GridBagLayout()); … … 432 440 */ 433 441 private void statusBarElementUpdate(MouseState ms) { 434 final OsmPrimitive osmNearest = mv.getNearestNodeOrWay(ms.mousePos, OsmPrimitive.isUsablePredicate, false);442 final OsmPrimitive osmNearest = mv.getNearestNodeOrWay(ms.mousePos, isUsablePredicate, false); 435 443 if (osmNearest != null) { 436 444 nameText.setText(osmNearest.getDisplayName(DefaultNameFormatter.getInstance()));
Note:
See TracChangeset
for help on using the changeset viewer.