Changeset 4580 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2011-11-06T15:00:56+01:00 (14 years ago)

Author:

Don-vip

Message:

see #2212 - Allow JOSM to download data crossing the 180th meridian

File:

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

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

@@ -1175 +1175 @@
         return ret;
     }
+    
+    /**
+     * Moves all primitives and datasources from DataSet "from" to this DataSet
+     * @param from The source DataSet
+     */
+    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);
+            }
+            dataSources.addAll(from.dataSources);
+            from.dataSources.clear();
+        }
+    }
 
     /* --------------------------------------------------------------------------------- */