Changeset 29627 in osm for applications

Timestamp:

2013-06-06T02:33:33+02:00 (11 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm8766 - Do not add deleted nodes to reverted ways

File:

• applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ -94 +94 @@
         for (Node sourceNode : source.getNodes()) {
             Node targetNode = (Node)getMergeTarget(sourceNode);
-            if (targetNode.isDeleted() && sourceNode.isIncomplete()
+            if (!targetNode.isDeleted()) {
+                newNodes.add(targetNode);
+            } else if (sourceNode.isIncomplete()
                     && !conflicts.hasConflictForMy(targetNode)) {
                 conflicts.add(new Conflict<OsmPrimitive>(targetNode, sourceNode, true));
@@ -101 +103 @@
                 addChangeCommandIfNotEquals(targetNode,undeletedTargetNode);
             }
-            newNodes.add(targetNode);
         }
         Way newTarget = new Way(target);