Changeset 29561 in osm for applications/editors

Timestamp:

2013-05-06T03:28:50+02:00 (12 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm8660 - False positive conflict detection with nodes

File:

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

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

@@ -282 +282 @@
     }
 
-    private static boolean hasEqualSemanticAttributes(OsmPrimitive current,HistoryOsmPrimitive history) {
+    private boolean hasEqualSemanticAttributes(OsmPrimitive current,HistoryOsmPrimitive history) {
         if (!current.getKeys().equals(history.getTags())) return false;
         switch (current.getType()) {
@@ -288 +288 @@
             LatLon currentCoor = ((Node)current).getCoor();
             LatLon historyCoor = ((HistoryNode)history).getCoords();
-            return currentCoor == historyCoor || (currentCoor != null && historyCoor != null && currentCoor.equals(historyCoor));
+            if (currentCoor == historyCoor || (currentCoor != null && historyCoor != null && currentCoor.equals(historyCoor)))
+                return true;
+            // Handle case where a deleted note has been restored to avoid false conflicts (fix #josm8660)
+            if (currentCoor != null && historyCoor == null) {
+                LatLon previousCoor = ((Node)nds.getPrimitiveById(history.getPrimitiveId())).getCoor();
+                return previousCoor != null && previousCoor.equals(currentCoor);
+            }
+            return false; 
         case CLOSEDWAY:
         case WAY: