Changeset 351 in josm for trunk

Timestamp:

2007-10-07T22:43:56+02:00 (17 years ago)

Author:

gebner

Message:

Make add node and connect more often reuse ways.

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

@@ -150 +150 @@
                                         return;
                         } 
-                        // If ALT is held, instead of creating a new node, re-use an existing
+                        // If SHIFT is held, instead of creating a new node, re-use an existing
                         // node (making this action identical to AddSegmentAction with the
                         // small difference that the node used will then be selected to allow
@@ -191 +191 @@
                                         cmds.add(new AddCommand(way));
                                 } else {
-                                        if (insertInto != null && way == insertInto.way) {
-                                                way = newInsertInto;
+                                        if (insertInto != null) {
+                                                if (way == insertInto.way) {
+                                                        way = newInsertInto;
+                                                }
                                         } else {
                                                 Way wnew = new Way(way);
@@ -222 +224 @@
                 Way way = null;
                 for (Way w : Main.ds.ways) {
+                        if (w.nodes.size() < 1) continue;
                         int i = w.nodes.indexOf(n);
-                        if (i == -1) continue;
-                        if (i == 0 || i == w.nodes.size() - 1) {
-                                        if (way != null)
-                                                return null;
-                                        way = w;
-                                }
+                        if (w.nodes.get(0) == n || w.nodes.get(w.nodes.size() - 1) == n) {
+                                if (way != null)
+                                        return null;
+                                way = w;
                         }
+                }
                 return way;
         }