Changeset 6027 in josm for trunk

Timestamp:

2013-06-26T14:06:56+02:00 (11 years ago)

Author:

akks

Message:

see #8591: do not allow creating ways with duplicate nodes in Draw mode, even with Ctrl pressed

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (1 diff)

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

@@ -428 +428 @@
         Node n = null;
 
-        if (!ctrl) {
-            n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
+        n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
+        if (ctrl) {
+            Iterator<Way> it = getCurrentDataSet().getSelectedWays().iterator();
+            if (it.hasNext()) {
+                // ctrl-click on node of selected way = reuse node despite of ctrl
+                if (!it.next().containsNode(n)) n = null;
+            } else {
+                n=null; // ctrl-click + no selected way = new node
+            }
         }