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

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

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

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -25 +26 @@
 
     public final String DEFAULT_API_VERSION = "0.6";
-    
+
     /**
      * The counter for newly created objects. Starts at -1 and goes down.
      */
     private long newIdCounter = -1;
- 
+
     /**
      * All newly created ids and their primitive that uses it. This is a back reference
@@ -41 +42 @@
     private String version;
     private Changeset changeset;
-    
+
     public OsmWriter(PrintWriter out, boolean osmConform, String version) {
         super(out);
@@ -47 +48 @@
         this.version = (version == null ? DEFAULT_API_VERSION : version);
     }
-    
+
     public void setWithBody(boolean wb) {
         this.withBody = wb;
@@ -57 +58 @@
         this.version = v;
     }
-    
+
     public void header() {
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
@@ -70 +71 @@
     public void writeContent(DataSet ds) {
         for (Node n : ds.nodes)
-            if (shouldWrite(n))
+            if (shouldWrite(n)) {
                 visit(n);
+            }
         for (Way w : ds.ways)
-            if (shouldWrite(w))
+            if (shouldWrite(w)) {
                 visit(w);
+            }
         for (Relation e : ds.relations)
-            if (shouldWrite(e))
+            if (shouldWrite(e)) {
                 visit(e);
+            }
     }
 
@@ -100 +104 @@
         out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
         if (!withBody) {
-            out.println("/>");  
+            out.println("/>");
         } else {
             addTags(n, "node", true);
@@ -110 +114 @@
         addCommon(w, "way");
         if (!withBody) {
-            out.println("/>");  
+            out.println("/>");
         } else {
             out.println(">");
-            for (Node n : w.nodes)
+            for (Node n : w.nodes) {
                 out.println("    <nd ref='"+getUsedId(n)+"' />");
+            }
             addTags(w, "way", false);
         }
@@ -123 +128 @@
         addCommon(e, "relation");
         if (!withBody) {
-            out.println("/>");  
+            out.println("/>");
         } else {
             out.println(">");
             for (RelationMember em : e.members) {
                 out.print("    <member type='");
-                out.print(OsmApi.which(em.member));
+                out.print(OsmPrimitiveType.from(em.member).getAPIName());
                 out.println("' ref='"+getUsedId(em.member)+"' role='" +
                         XmlWriter.encode(em.role == null ? "" : em.role) + "' />");
@@ -160 +165 @@
     private void addTags(OsmPrimitive osm, String tagname, boolean tagOpen) {
         if (osm.keys != null) {
-            if (tagOpen)
+            if (tagOpen) {
                 out.println(">");
-            for (Entry<String, String> e : osm.keys.entrySet())
+            }
+            for (Entry<String, String> e : osm.keys.entrySet()) {
                 out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
                         "' v='"+XmlWriter.encode(e.getValue())+ "' />");
+            }
             out.println("  </" + tagname + ">");
-        } else if (tagOpen)
+        } else if (tagOpen) {
             out.println(" />");
-        else
+        } else {
             out.println("  </" + tagname + ">");
+        }
     }
 
@@ -180 +188 @@
         out.print("  <"+tagname);
         if (id != 0) {
-             out.print(" id='"+getUsedId(osm)+"'");
+            out.print(" id='"+getUsedId(osm)+"'");
         }
         if (!osmConform) {
             String action = null;
-            if (osm.deleted)
+            if (osm.deleted) {
                 action = "delete";
-            else if (osm.modified)
+            } else if (osm.modified) {
                 action = "modify";
-            if (action != null)
+            }
+            if (action != null) {
                 out.print(" action='"+action+"'");
+            }
         }
         if (!osm.isTimestampEmpty()) {
@@ -199 +209 @@
         }
         out.print(" visible='"+osm.visible+"'");
-        if (osm.version != -1)
+        if (osm.version != -1) {
             out.print(" version='"+osm.version+"'");
-        if (this.changeset != null && this.changeset.id != 0)
+        }
+        if (this.changeset != null && this.changeset.id != 0) {
             out.print(" changeset='"+this.changeset.id+"'" );
-    }
-    
+        }
+    }
+
     public void close() {
         out.close();
     }
-    
+
     public void flush() {
         out.flush();