Changeset 49 in josm for src/org/openstreetmap/josm/io/OsmWriter.java

Timestamp:

2006-02-09T23:46:27+01:00 (20 years ago)

Author:

imi

Message:

• added JUnit test cases src tree
• fixed save/reload of GPX and OSM data of new object ids
• GPX load does not merge nodes if JOSM namespace is found

File:

• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (7 diffs)

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -4 +4 @@
 import java.io.Writer;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -39 +40 @@
          */
         private long newIdCounter = -1;
+        /**
+         * All newly created ids and their primitive that uses it. This is a back reference
+         * map to allow references to use the correnct primitives.
+         */
+        private HashMap<OsmPrimitive, Long> usedNewIds = new HashMap<OsmPrimitive, Long>();
 
         /**
@@ -72 +78 @@
                 Collection<Element> allDeleted = deleted.getChildren();
                 for (OsmPrimitive osm : ds.allPrimitives()) {
-                        if (osm.isDeleted()) {
+                        if (osm.isDeleted() && osm.id != 0) {
                                 osm.visit(this);
                                 allDeleted.add(element);
@@ -103 +109 @@
         private void addProperties(Element e, OsmPrimitive osm) {
                 long id = osm.id;
-                if (id == 0)
+                if (id == 0) {
                         id = newIdCounter--;
+                        usedNewIds.put(osm, id);
+                }
                 e.setAttribute("uid", ""+id);
                 if (osm.keys != null)
@@ -127 +135 @@
                 element = new Element("segment");
                 addProperties(element, ls);
-                element.setAttribute("from", ""+ls.start.id);
-                element.setAttribute("to", ""+ls.end.id);
+                element.setAttribute("from", ""+getUsedId(ls.start));
+                element.setAttribute("to", ""+getUsedId(ls.end));
+        }
+
+        /**
+         * Return the id for the given osm primitive (may access the usedId map)
+         */
+        private Long getUsedId(OsmPrimitive osm) {
+                return osm.id == 0 ? usedNewIds.get(osm) : osm.id;
         }
 
@@ -139 +154 @@
                 addProperties(element, t);
                 for (LineSegment ls : t.segments)
-                        element.getChildren().add(new Element("segment").setAttribute("uid", ""+ls.id));
+                        element.getChildren().add(new Element("segment").setAttribute("uid", ""+getUsedId(ls)));
         }
 
@@ -147 +162 @@
         }
 }
-