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

Timestamp:

2014-05-14T09:05:56+02:00 (11 years ago)

Author:

simon04

Message:

fix #9889 - Follow line should stop on ambiguous junctions

File:

• trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -84 +84 @@
 
         Node newPoint = null;
-        for (OsmPrimitive referrer : referrers) {
-            if (!referrer.getType().equals(OsmPrimitiveType.WAY)) { // Can't follow points or relations
-                continue;
-            }
-            Way toFollow = (Way) referrer;
+        for (final Way toFollow : Utils.filteredCollection(referrers, Way.class)) {
             if (toFollow.equals(follower)) {
                 continue;
             }
             Set<Node> points = toFollow.getNeighbours(last);
-            if (!points.remove(prev) || points.isEmpty())
+            points.remove(prev);
+            if (points.isEmpty())     // No candidate -> consider next way
                 continue;
             if (points.size() > 1)    // Ambiguous junction?
                 return;
 
+            // points contains exactly one element
             Node newPointCandidate = points.iterator().next();