Changeset 3039 in josm for trunk

Timestamp:

2010-02-25T00:09:13+01:00 (15 years ago)

Author:

mjulius

Message:

fixes #4522 - Merging between layers throws unnecessary conflicts for objects with placeholder IDs

ignore deleted new primitives when merging

File:

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

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

@@ -88 +88 @@
             //    return;
         } else {
+            // ignore deleted primitives from source
+            if (source.isDeleted()) return;
+
             // try to merge onto a primitive  which has no id assigned
             // yet but which is equal in its semantic attributes
@@ -99 +102 @@
             }
             for (OsmPrimitive target : candidates) {
-                if (!target.isNew()) {
+                if (!target.isNew() || target.isDeleted()) {
                     continue;
                 }
                 if (target.hasEqualSemanticAttributes(source)) {
                     mergedMap.put(source.getUniqueId(), target.getUniqueId());
-                    if (target.isDeleted() != source.isDeleted()) {
-                        // differences in deleted state have to be merged manually
-                        //
-                        conflicts.add(target, source);
-                    } else {
-                        // copy the technical attributes from other
-                        // version
-                        target.setVisible(source.isVisible());
-                        target.setUser(source.getUser());
-                        target.setTimestamp(source.getTimestamp());
-                        target.setModified(source.isModified());
-                        objectsWithChildrenToMerge.add(source.getPrimitiveId());
-                    }
+                    // copy the technical attributes from other
+                    // version
+                    target.setVisible(source.isVisible());
+                    target.setUser(source.getUser());
+                    target.setTimestamp(source.getTimestamp());
+                    target.setModified(source.isModified());
+                    objectsWithChildrenToMerge.add(source.getPrimitiveId());
                     return;
                 }