Changeset 3177 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2010-04-11T15:29:02+02:00 (16 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.)

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (15 diffs)

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.tools.Predicate;
 
 /**
@@ -426 +427 @@
     }
 
-    /**
-     * Return the nearest point to the screen point given.
-     * If a node within snapDistance pixel is found, the nearest node is returned.
-     */
+    @Deprecated
     public final Node getNearestNode(Point p) {
+        return getNearestNode(p, OsmPrimitive.isUsablePredicate);
+    }
+
+    /**
+     * Return the nearest node to the screen point given.
+     * If more then one node within snapDistance pixel is found,
+     * the nearest node is returned.
+     * @param p the screen point
+     * @param predicate this parameter imposes a condition on the returned object, e.g.
+     *        give the nearest node that is tagged.
+     */
+    public final Node getNearestNode(Point p, Predicate<OsmPrimitive> predicate) {
         DataSet ds = getCurrentDataSet();
         if (ds == null)
@@ -438 +448 @@
         Node minPrimitive = null;
         for (Node n : ds.searchNodes(getSnapDistanceBBox(p))) {
-            if (!n.isUsable()) {
+            if (! predicate.evaluate(n))
                 continue;
-            }
             Point sp = getPoint(n);
             double dist = p.distanceSq(sp);
@@ -462 +471 @@
      *
      * @param p the point for which to search the nearest segment.
-     */
-    public final List<WaySegment> getNearestWaySegments(Point p) {
+     * @param predicate the returned objects have to fulfill certain properties.
+     */
+    public final List<WaySegment> getNearestWaySegments(Point p, Predicate<OsmPrimitive> predicate) {
         TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>();
         DataSet ds = getCurrentDataSet();
@@ -470 +480 @@
 
         for (Way w : ds.searchWays(getSnapDistanceBBox(p))) {
-            if (!w.isUsable()) {
+            if (!predicate.evaluate(w))
                 continue;
-            }
             Node lastN = null;
             int i = -2;
             for (Node n : w.getNodes()) {
                 i++;
-                if (n.isDeleted() || n.isIncomplete()) {
+                if (n.isDeleted() || n.isIncomplete()) {//FIXME: This shouldn't happen, raise exception?
                     continue;
                 }
@@ -521 +530 @@
      * @param p the point for which to search the nearest segment.
      * @param ignore a collection of segments which are not to be returned.
+     * @param predicate the returned object has to fulfill certain properties.
      * May be null.
      */
-    public final WaySegment getNearestWaySegment(Point p, Collection<WaySegment> ignore) {
-        List<WaySegment> nearest = getNearestWaySegments(p);
+    public final WaySegment getNearestWaySegment
+                                    (Point p, Collection<WaySegment> ignore, Predicate<OsmPrimitive> predicate) {
+        List<WaySegment> nearest = getNearestWaySegments(p, predicate);
         if(nearest == null)
             return null;
@@ -536 +547 @@
      * @return the nearest way segment to the screen point given.
      */
-    public final WaySegment getNearestWaySegment(Point p) {
-        return getNearestWaySegment(p, null);
+    public final WaySegment getNearestWaySegment(Point p, Predicate<OsmPrimitive> predicate) {
+        return getNearestWaySegment(p, null, predicate);
+    }
+
+    @Deprecated
+    public final Way getNearestWay(Point p) {
+        return getNearestWay(p, OsmPrimitive.isUsablePredicate);
     }
 
@@ -543 +559 @@
      * @return the nearest way to the screen point given.
      */
-    public final Way getNearestWay(Point p) {
-        WaySegment nearestWaySeg = getNearestWaySegment(p);
+    public final Way getNearestWay(Point p, Predicate<OsmPrimitive> predicate) {
+        WaySegment nearestWaySeg = getNearestWaySegment(p, predicate);
         return nearestWaySeg == null ? null : nearestWaySeg.way;
     }
@@ -559 +575 @@
      *
      * @param p The point on screen.
+     * @param predicate the returned object has to fulfill certain properties.
      * @return  The primitive that is nearest to the point p.
      */
-    public OsmPrimitive getNearest(Point p) {
-        OsmPrimitive osm = getNearestNode(p);
+    public OsmPrimitive getNearest(Point p, Predicate<OsmPrimitive> predicate) {
+        OsmPrimitive osm = getNearestNode(p, predicate);
         if (osm == null)
         {
-            osm = getNearestWay(p);
+            osm = getNearestWay(p, predicate);
         }
         return osm;
@@ -573 +590 @@
      * Returns a singleton of the nearest object, or else an empty collection.
      */
-    public Collection<OsmPrimitive> getNearestCollection(Point p) {
-        OsmPrimitive osm = getNearest(p);
+    public Collection<OsmPrimitive> getNearestCollection(Point p, Predicate<OsmPrimitive> predicate) {
+        OsmPrimitive osm = getNearest(p, predicate);
         if (osm == null)
             return Collections.emptySet();
@@ -588 +605 @@
      *      list is never empty.
      */
-    public Collection<OsmPrimitive> getAllNearest(Point p) {
+    public Collection<OsmPrimitive> getAllNearest(Point p, Predicate<OsmPrimitive> predicate) {
         Collection<OsmPrimitive> nearest = new HashSet<OsmPrimitive>();
         DataSet ds = getCurrentDataSet();
@@ -594 +611 @@
             return null;
         for (Way w : ds.searchWays(getSnapDistanceBBox(p))) {
-            if (!w.isUsable()) {
+            if (!predicate.evaluate(w))
                 continue;
-            }
             Node lastN = null;
             for (Node n : w.getNodes()) {
-                if (!n.isUsable()) {
+                if (!predicate.evaluate(n))
                     continue;
-                }
                 if (lastN == null) {
                     lastN = n;
@@ -636 +651 @@
      *      list is never empty.
      */
-    public Collection<Node> getNearestNodes(Point p) {
+    public Collection<Node> getNearestNodes(Point p, Predicate<OsmPrimitive> predicate) {
         Collection<Node> nearest = new HashSet<Node>();
         DataSet ds = getCurrentDataSet();
@@ -643 +658 @@
 
         for (Node n : ds.searchNodes(getSnapDistanceBBox(p))) {
-            if (n.isUsable()
-                    && getPoint(n).distanceSq(p) < snapDistanceSq) {
+            if (!predicate.evaluate(n))
+                continue;
+            if (getPoint(n).distanceSq(p) < snapDistanceSq) {
                 nearest.add(n);
             }
@@ -657 +673 @@
      * @param p the point for which to search the nearest segment.
      * @param ignore a collection of nodes which are not to be returned.
+     * @param predicate the returned objects have to fulfill certain properties.
      * May be null.
      */
-    public final Collection<Node> getNearestNodes(Point p, Collection<Node> ignore) {
-        Collection<Node> nearest = getNearestNodes(p);
+    public final Collection<Node> getNearestNodes(Point p, Collection<Node> ignore, Predicate<OsmPrimitive> predicate) {
+        Collection<Node> nearest = getNearestNodes(p, predicate);
         if (nearest == null) return null;
         if (ignore != null) {