Changeset 5589 in josm for trunk/src/org/openstreetmap/josm/data/APIDataSet.java

Timestamp:

2012-11-18T13:57:36+01:00 (12 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/data/APIDataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -55 +55 @@
     public void init(DataSet ds) {
         if (ds == null) return;
+        init(ds.allPrimitives());
+    }
+
+    public void init(Collection<OsmPrimitive> primitives) {
         toAdd.clear();
         toUpdate.clear();
         toDelete.clear();
 
-        for (OsmPrimitive osm :ds.allPrimitives()) {
+        for (OsmPrimitive osm :primitives) {
             if (osm.get("josm/ignore") != null) {
                 continue;
@@ -140 +144 @@
     public APIDataSet(Collection<OsmPrimitive> primitives) {
         this();
-        toAdd.clear();
-        toUpdate.clear();
-        toDelete.clear();
-        for (OsmPrimitive osm: primitives) {
-            if (osm.isNewOrUndeleted() && !osm.isDeleted()) {
-                toAdd.addLast(osm);
-            } else if (osm.isModified() && !osm.isDeleted()) {
-                toUpdate.addLast(osm);
-            } else if (osm.isDeleted() && !osm.isNew() && osm.isModified() && osm.isVisible()) {
-                toDelete.addFirst(osm);
-            }
-        }
-        OsmPrimitiveComparator c = new OsmPrimitiveComparator();
-        c.relationsFirst = true;
-        Collections.sort(toDelete, c);
-        Collections.sort(toAdd, c);
-        Collections.sort(toUpdate, c);
+        init(primitives);
     }