Changeset 2935 in josm for trunk/src

Timestamp:

2010-02-04T15:34:15+01:00 (14 years ago)

Author:

mjulius

Message:

fixes #4476 - Deleted nodes cause an conflict if the data is redownloaded
Now, the conflict is only created if the referrer is not already part of the target dataset.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -306 +306 @@
             // same version, but target is deleted. Assume target takes precedence
             // otherwise too many conflicts when refreshing from the server
-            // but, if source has referrers there is a conflict
-            if (!source.getReferrers().isEmpty()) {
-                conflicts.add(target, source);
+            // but, if source has a referrer that is not in the target dataset there is a conflict
+            for (OsmPrimitive referrer: source.getReferrers()) {
+                if (targetDataSet.getPrimitiveById(referrer.getPrimitiveId()) == null) {
+                    conflicts.add(target, source);
+                    break;
+                }
             }
         } else if (target.isDeleted() != source.isDeleted()) {