Changeset 5350 in josm for trunk/src

Timestamp:

2012-07-19T00:52:15+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7847 - Reset nodes/members to null when deleting a way/relation during a data set merge operation

File:

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

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

@@ -188 +188 @@
                 List<OsmPrimitive> referrers = target.getReferrers();
                 if (referrers.isEmpty()) {
+                    resetPrimitive(target);
+                    target.mergeFrom(source);
                     target.setDeleted(true);
-                    target.mergeFrom(source);
                     it.remove();
                     flag = true;
@@ -212 +213 @@
             // This can be because of cross-referenced relations.
             for (OsmPrimitive osm: objectsToDelete) {
-                if (osm instanceof Way) {
-                    ((Way) osm).setNodes(null);
-                } else if (osm instanceof Relation) {
-                    ((Relation) osm).setMembers(null);
-                }
+                resetPrimitive(osm);
             }
             for (OsmPrimitive osm: objectsToDelete) {
@@ -222 +219 @@
                 osm.mergeFrom(sourceDataSet.getPrimitiveById(osm.getPrimitiveId()));
             }
+        }
+    }
+    
+    private final void resetPrimitive(OsmPrimitive osm) {
+        if (osm instanceof Way) {
+            ((Way) osm).setNodes(null);
+        } else if (osm instanceof Relation) {
+            ((Relation) osm).setMembers(null);
         }
     }