Changeset 29627 in osm for applications


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

    r29559 r29627  
    9494        for (Node sourceNode : source.getNodes()) {
    9595            Node targetNode = (Node)getMergeTarget(sourceNode);
    96             if (targetNode.isDeleted() && sourceNode.isIncomplete()
     96            if (!targetNode.isDeleted()) {
     97                newNodes.add(targetNode);
     98            } else if (sourceNode.isIncomplete()
    9799                    && !conflicts.hasConflictForMy(targetNode)) {
    98100                conflicts.add(new Conflict<OsmPrimitive>(targetNode, sourceNode, true));
     
    101103                addChangeCommandIfNotEquals(targetNode,undeletedTargetNode);
    102104            }
    103             newNodes.add(targetNode);
    104105        }
    105106        Way newTarget = new Way(target);
Note: See TracChangeset for help on using the changeset viewer.