Changeset 3952 in josm

Timestamp:

Mar 4, 2011 10:58:42 PM (2 years ago)

Author:

stoecker

Message:

fix #5909 - remove deleted nodes from selection after simplify way call - maybe we should additionally modify DeleteAction directly?

File:

• trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.Node;
@@ -138 +139 @@
 
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-
-        List<Bounds> bounds = getCurrentEditBounds();
-        for (OsmPrimitive prim : selection) {
-            if (! (prim instanceof Way)) {
-                continue;
-            }
-            if (bounds.size() > 0) {
-                Way way = (Way) prim;
-                // We check if each node of each way is at least in one download
-                // bounding box. Otherwise nodes may get deleted that are necessary by
-                // unloaded ways (see Ticket #1594)
-                for (Node node : way.getNodes()) {
-                    if (!isInBounds(node, bounds)) {
-                        if (!confirmWayWithNodesOutsideBoundingBox())
-                            return;
-                        break;
+        DataSet ds = getCurrentDataSet();
+        ds.beginUpdate();
+        try
+        {
+            Collection<OsmPrimitive> selection = ds.getSelected();
+
+            List<Bounds> bounds = getCurrentEditBounds();
+            for (OsmPrimitive prim : selection) {
+                if (! (prim instanceof Way)) {
+                    continue;
+                }
+                if (bounds.size() > 0) {
+                    Way way = (Way) prim;
+                    // We check if each node of each way is at least in one download
+                    // bounding box. Otherwise nodes may get deleted that are necessary by
+                    // unloaded ways (see Ticket #1594)
+                    for (Node node : way.getNodes()) {
+                        if (!isInBounds(node, bounds)) {
+                            if (!confirmWayWithNodesOutsideBoundingBox())
+                                return;
+                            break;
+                        }
                     }
                 }
             }
-        }
-        List<Way> ways = OsmPrimitive.getFilteredList(selection, Way.class);
-        if (ways.isEmpty()) {
-            alertSelectAtLeastOneWay();
-            return;
-        } else if (ways.size() > 10) {
-            if (!confirmSimplifyManyWays(ways.size()))
+            List<Way> ways = OsmPrimitive.getFilteredList(selection, Way.class);
+            if (ways.isEmpty()) {
+                alertSelectAtLeastOneWay();
                 return;
-        }
-
-        Collection<Command> allCommands = new LinkedList<Command>();
-        for (Way way: ways) {
-            SequenceCommand simplifyCommand = simplifyWay(way);
-            if (simplifyCommand == null) {
-                continue;
-            }
-            allCommands.add(simplifyCommand);
-        }
-        if (allCommands.isEmpty()) return;
-        SequenceCommand rootCommand = new SequenceCommand(
-                trn("Simplify {0} way", "Simplify {0} ways", allCommands.size(), allCommands.size()),
-                allCommands
-        );
-        Main.main.undoRedo.add(rootCommand);
+            } else if (ways.size() > 10) {
+                if (!confirmSimplifyManyWays(ways.size()))
+                    return;
+            }
+
+            Collection<Command> allCommands = new LinkedList<Command>();
+            for (Way way: ways) {
+                SequenceCommand simplifyCommand = simplifyWay(way, ds);
+                if (simplifyCommand == null) {
+                    continue;
+                }
+                allCommands.add(simplifyCommand);
+            }
+            if (allCommands.isEmpty()) return;
+            SequenceCommand rootCommand = new SequenceCommand(
+                    trn("Simplify {0} way", "Simplify {0} ways", allCommands.size(), allCommands.size()),
+                    allCommands
+            );
+            Main.main.undoRedo.add(rootCommand);
+        } finally {
+            ds.endUpdate();
+        }
         Main.map.repaint();
     }
@@ -213 +221 @@
      * @param w the way to simplify
      */
-    public SequenceCommand simplifyWay(Way w) {
+    public SequenceCommand simplifyWay(Way w, DataSet ds) {
         double threshold = Double.parseDouble(Main.pref.get("simplify-way.max-error", "3"));
         int lower = 0;
@@ -249 +257 @@
         cmds.add(new ChangeCommand(w, newWay));
         cmds.add(new DeleteCommand(delNodes));
+        ds.clearSelection(delNodes);
         return new SequenceCommand(trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds);
     }