Changeset 2998 in josm for trunk/src/org

Timestamp:

2010-02-16T20:36:17+01:00 (14 years ago)

Author:

mjulius

Message:

fixes #4539 - Exception copying layer
in DataSet.clone() substitute way nodes and relation members before adding to the new dataset

File:

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

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

@@ -559 +559 @@
     @Override public DataSet clone() {
         DataSet ds = new DataSet();
+        HashMap<OsmPrimitive, OsmPrimitive> primitivesMap = new HashMap<OsmPrimitive, OsmPrimitive>();
         for (Node n : nodes) {
-            ds.addPrimitive(new Node(n));
+            Node newNode = new Node(n);
+            primitivesMap.put(n, newNode);
+            ds.addPrimitive(newNode);
         }
         for (Way w : ways) {
-            ds.addPrimitive(new Way(w));
-        }
-        for (Relation e : relations) {
-            ds.addPrimitive(new Relation(e));
+            Way newWay = new Way(w);
+            primitivesMap.put(w, newWay);
+            List<Node> newNodes = new ArrayList<Node>();
+            for (Node n: w.getNodes()) {
+                newNodes.add((Node)primitivesMap.get(n));
+            }
+            newWay.setNodes(newNodes);
+            ds.addPrimitive(newWay);
+        }
+        // Because relations can have other relations as members we first clone all relations
+        // and then get the cloned members
+        for (Relation r : relations) {
+            Relation newRelation = new Relation(r);
+            primitivesMap.put(r, newRelation);
+        }
+        for (Relation r : relations) {
+            Relation newRelation = (Relation)primitivesMap.get(r);
+            List<RelationMember> newMembers = new ArrayList<RelationMember>();
+            for (RelationMember rm: r.getMembers()) {
+                newMembers.add(new RelationMember(rm.getRole(), primitivesMap.get(rm.getMember())));
+            }
+            newRelation.setMembers(newMembers);
+            ds.addPrimitive(newRelation);
         }
         for (DataSource source : dataSources) {