Changeset 15557 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-12-03T17:28:19+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18386: DataIntegrityProblemException in parallel way mode

File:

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

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

@@ -191 +191 @@
     private List<Command> makeAddWayAndNodesCommandList() {
         DataSet ds = OsmDataManager.getInstance().getEditDataSet();
+
         List<Command> commands = new ArrayList<>(sortedNodes.size() + ways.size());
+        Set<Node> dupCheck = new HashSet<>();
         for (int i = 0; i < sortedNodes.size() - (isClosedPath() ? 1 : 0); i++) {
-            commands.add(new AddCommand(ds, sortedNodes.get(i)));
+            Node n = sortedNodes.get(i);
+            // don't add the same node twice, see #18386
+            if (dupCheck.add(n)) {
+                commands.add(new AddCommand(ds, n));
+            }
         }
         for (Way w : ways) {