Changeset 35608 in osm for applications/editors/josm

Timestamp:

2020-10-22T17:56:17+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19979 Circle arc behaves like merge

• fix collection of parent ways when only a way is selected
• fix memory leak

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
@@ -177 +177 @@
         Set<Way> targetWays = new HashSet<>();
         if (!selectedWays.isEmpty()) {
-            orig.forEach(n -> targetWays.addAll(n.getParentWays()));
+            for (int i = pos1 + 1; i < pos3; i++) {
+                targetWays.addAll(nodes.get(i).getParentWays());
+            }
         } else {
             targetWays.add(w);
@@ -366 +368 @@
             }
             if (twWasChanged) {
-                cmds.add(new ChangeCommand(ds, originalTw, tw));
-            }
+                cmds.add(new ChangeNodesCommand(ds, originalTw, new ArrayList<>(tw.getNodes())));
+            }
+            tw.setNodes(null); // see #19885
         }
     }