Changeset 5062 in josm for trunk/src/org

Timestamp:

2012-03-09T21:29:57+01:00 (13 years ago)

Author:

Don-vip

Message:

Fix DataSet.mergeFrom() not working with nested relations

File:

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

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

@@ -1167 +1167 @@
     public void mergeFrom(DataSet from) {
         if (from != null) {
-            for (Node n : from.getNodes()) {
-                from.removePrimitive(n);
-                addPrimitive(n);
-            }
-            for (Way w : from.getWays()) {
-                from.removePrimitive(w);
-                addPrimitive(w);
-            }
-            for (Relation r : from.getRelations()) {
-                from.removePrimitive(r);
-                addPrimitive(r);
-            }
+            new DataSetMerger(this, from).merge();
             dataSources.addAll(from.dataSources);
             from.dataSources.clear();