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

Timestamp:

2012-11-18T13:57:36+01:00 (11 years ago)

Author:

bastiK

Message:

drop unnecessary properties for upload to the OSM API in order to save bandwidth

The properties are: user, uid, visible, action and timestamp. In addition drop lat & lon for deleted nodes. (To undelete a primitive, it suffices to include it in a <modify> section, the 'visible' property is ignored by the server.)

File:

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

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

@@ -40 +40 @@
     private boolean osmConform;
     private boolean withBody = true;
+    private boolean isOsmChange;
     private String version;
     private Changeset changeset;
@@ -55 +56 @@
         this.withBody = wb;
     }
+
+    public void setIsOsmChange(boolean isOsmChange) {
+        this.isOsmChange = isOsmChange;
+    }
+
     public void setChangeset(Changeset cs) {
         this.changeset = cs;
@@ -136 +142 @@
         if (n.isIncomplete()) return;
         addCommon(n, "node");
-        if (n.getCoor() != null) { 
-            out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
-        } 
         if (!withBody) {
             out.println("/>");
         } else {
+            if (n.getCoor() != null) {
+                out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
+            }
             addTags(n, "node", true);
         }
@@ -240 +246 @@
         } else
             throw new IllegalStateException(tr("Unexpected id 0 for osm primitive found"));
-        if (!osmConform) {
-            String action = null;
-            if (osm.isDeleted()) {
-                action = "delete";
-            } else if (osm.isModified()) {
-                action = "modify";
-            }
-            if (action != null) {
-                out.print(" action='"+action+"'");
-            }
-        }
-        if (!osm.isTimestampEmpty()) {
-            out.print(" timestamp='"+DateUtils.fromDate(osm.getTimestamp())+"'");
-        }
-        // user and visible added with 0.4 API
-        if (osm.getUser() != null) {
-            if(osm.getUser().isLocalUser()) {
-                out.print(" user='"+XmlWriter.encode(osm.getUser().getName())+"'");
-            } else if (osm.getUser().isOsmUser()) {
-                // uid added with 0.6
-                out.print(" uid='"+ osm.getUser().getId()+"'");
-                out.print(" user='"+XmlWriter.encode(osm.getUser().getName())+"'");
-            }
-        }
-        out.print(" visible='"+osm.isVisible()+"'");
+        if (!isOsmChange) {
+            if (!osmConform) {
+                String action = null;
+                if (osm.isDeleted()) {
+                    action = "delete";
+                } else if (osm.isModified()) {
+                    action = "modify";
+                }
+                if (action != null) {
+                    out.print(" action='"+action+"'");
+                }
+            }
+            if (!osm.isTimestampEmpty()) {
+                out.print(" timestamp='"+DateUtils.fromDate(osm.getTimestamp())+"'");
+            }
+            // user and visible added with 0.4 API
+            if (osm.getUser() != null) {
+                if(osm.getUser().isLocalUser()) {
+                    out.print(" user='"+XmlWriter.encode(osm.getUser().getName())+"'");
+                } else if (osm.getUser().isOsmUser()) {
+                    // uid added with 0.6
+                    out.print(" uid='"+ osm.getUser().getId()+"'");
+                    out.print(" user='"+XmlWriter.encode(osm.getUser().getName())+"'");
+                }
+            }
+            out.print(" visible='"+osm.isVisible()+"'");
+        }
         if (osm.getVersion() != 0) {
             out.print(" version='"+osm.getVersion()+"'");