Changeset 2933 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Timestamp:

04.02.2010 05:09:34 (2 years ago)

Author:

mjulius

Message:

fixes #4467 - Don't silently drop locally deleted member primitives from downloaded ways and relation
conflicts are created instead

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (5 diffs)

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

@@ -218 +218 @@
             Node targetNode = (Node)getMergeTarget(sourceNode);
             if (targetNode != null) {
-                if (!targetNode.isDeleted() && targetNode.isVisible()) {
+                if (targetNode.isVisible()) {
                     newNodes.add(targetNode);
                 } else {
@@ -245 +245 @@
             if (targetMember == null)
                 throw new IllegalStateException(tr("Missing merge target of type {0} with id {1}", sourceMember.getType(), sourceMember.getUniqueId()));
-            if (! targetMember.isDeleted() && targetMember.isVisible()) {
+            if (targetMember.isVisible()) {
                 RelationMember newMember = new RelationMember(sourceMember.getRole(), targetMember);
                 newMembers.add(newMember);
@@ -275 +275 @@
         if (! target.isVisible() && source.isVisible()) {
             // should not happen
-            //
+            // FIXME: this message does not make sense, source version can not be lower than
+            //        target version at this point
             logger.warning(tr("Target object with id {0} and version {1} is visible although "
                     + "source object with lower version {2} is not visible. "
@@ -305 +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);
+            }
         } else if (target.isDeleted() != source.isDeleted()) {
             // differences in deleted state have to be resolved manually. This can
@@ -313 +318 @@
             // target not modified. We can assume that source is the most recent version.
             // clone it into target. But check first, whether source is deleted. if so,
-            // make sure that target is not referenced any more in myDataSet.
-            //
+            // make sure that target is not referenced any more in myDataSet. If it is there
+            // is a conflict
             if (source.isDeleted()) {
-                deletedObjectsToUnlink.add(source);
-            }
-            target.mergeFrom(source);
-            objectsWithChildrenToMerge.add(source.getPrimitiveId());
+                if (!target.getReferrers().isEmpty()) {
+                    conflicts.add(target, source);
+                }
+            } else {
+                target.mergeFrom(source);
+                objectsWithChildrenToMerge.add(source.getPrimitiveId());
+            }
         } else if (! target.isModified() && !source.isModified() && target.getVersion() == source.getVersion()) {
             // both not modified. Merge nevertheless.