Changeset 3643 in josm for trunk

Timestamp:

2010-10-28T16:54:32+02:00 (14 years ago)

Author:

bastiK

Message:

applied #5590 (patch by bilbo) - Allow Join node to way with multiple nodes

File:

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

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

@@ -12 +12 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -37 +38 @@
             return;
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
-        if (sel.size() != 1 || !(sel.iterator().next() instanceof Node)) return;
-        Node node = (Node) sel.iterator().next();
+        if (sel.size() < 1) return;
 
-        List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
-                Main.map.mapView.getPoint(node), OsmPrimitive.isSelectablePredicate);
-        HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
-        for (WaySegment ws : wss) {
-            List<Integer> is;
-            if (insertPoints.containsKey(ws.way)) {
-                is = insertPoints.get(ws.way);
-            } else {
-                is = new ArrayList<Integer>();
-                insertPoints.put(ws.way, is);
+        Collection<Command> cmds = new LinkedList<Command>();
+
+        for (OsmPrimitive osm : sel) {
+            if (!(osm instanceof Node)) continue;
+            Node node = (Node) osm;
+
+            List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
+                    Main.map.mapView.getPoint(node), OsmPrimitive.isSelectablePredicate);
+            HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
+            for (WaySegment ws : wss) {
+                List<Integer> is;
+                if (insertPoints.containsKey(ws.way)) {
+                    is = insertPoints.get(ws.way);
+                } else {
+                    is = new ArrayList<Integer>();
+                    insertPoints.put(ws.way, is);
+                }
+
+                if (ws.way.getNode(ws.lowerIndex) != node
+                        && ws.way.getNode(ws.lowerIndex+1) != node) {
+                    is.add(ws.lowerIndex);
+                }
             }
 
-            if (ws.way.getNode(ws.lowerIndex) != node
-                    && ws.way.getNode(ws.lowerIndex+1) != node) {
-                is.add(ws.lowerIndex);
+            for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
+                List<Integer> is = insertPoint.getValue();
+                if (is.size() == 0)
+                    continue;
+
+                Way w = insertPoint.getKey();
+                List<Node> nodesToAdd = w.getNodes();
+                pruneSuccsAndReverse(is);
+                for (int i : is) {
+                    nodesToAdd.add(i+1, node);
+                }
+                Way wnew = new Way(w);
+                wnew.setNodes(nodesToAdd);
+                cmds.add(new ChangeCommand(w, wnew));
             }
         }
-
-        Collection<Command> cmds = new LinkedList<Command>();
-        for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
-            List<Integer> is = insertPoint.getValue();
-            if (is.size() == 0)
-                continue;
-
-            Way w = insertPoint.getKey();
-            List<Node> nodesToAdd = w.getNodes();
-            pruneSuccsAndReverse(is);
-            for (int i : is) {
-                nodesToAdd.add(i+1, node);
-            }
-            Way wnew = new Way(w);
-            wnew.setNodes(nodesToAdd);
-            cmds.add(new ChangeCommand(w, wnew));
-        }
-
-        if (cmds.size() == 0)
-            return;
-
+        if (cmds.size() == 0) return;
         Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds));
         Main.map.repaint();