Changeset 11082 in josm for trunk

Timestamp:

2016-10-06T12:43:24+02:00 (8 years ago)

Author:

simon04

Message:

fix #13763 - ImproveWayAccuracy sometimes creates way with 1 node

File:

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

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

@@ -15 +15 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -479 +480 @@
                     nodes.remove(candidateNode);
                     newWay.setNodes(nodes);
-                    Main.main.undoRedo.add(new ChangeCommand(targetWay, newWay));
+                    if (nodes.size() < 2) {
+                        final Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), Collections.singleton(targetWay), true);
+                        if (deleteCmd != null) {
+                            Main.main.undoRedo.add(deleteCmd);
+                        }
+                    } else {
+                        Main.main.undoRedo.add(new ChangeCommand(targetWay, newWay));
+                    }
                 } else if (candidateNode.isTagged()) {
                     JOptionPane.showMessageDialog(Main.parent,
@@ -485 +493 @@
                             tr("Error"), JOptionPane.ERROR_MESSAGE);
                 } else {
-                    List<Node> nodeList = new ArrayList<>();
-                    nodeList.add(candidateNode);
-                    Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), nodeList, true);
+                    final Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), Collections.singleton(candidateNode), true);
                     if (deleteCmd != null) {
                         Main.main.undoRedo.add(deleteCmd);