Changeset 2599 in josm for trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

Timestamp:

2009-12-09T21:25:40+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #4130: Chunked upload mode counter is wrong
fixed #4118: Upload dialog too complicated
fixed #4129: Hide the new "Upload data in one request/chunks/individually" behind an expanding "Upload method" box
fixed #2075: API 0.6: don't upload more than 50K edits at once
fixed #4044: Huge uploads never end [should be solved with chunked upload mode]
fixed #4110: Upload dialog spacing wrong
fixed #3386: Upload dialog has empty areas when the changeset doesn't include all of add/modify/delete operations
see #3369: bulk import helper [JOSM now supports multi changesets uploads]

See online help for more details.

Completes r2598

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (6 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -76 +77 @@
 
     /**
-     * remembers an {@see OsmPrimitive}'s id and its type. The id will
+     * Remembers an {@see OsmPrimitive}'s id. The id will
      * later be fetched as part of a Multi Get request.
      *
-     * Ignore the id if it id <= 0.
+     * Ignore the id if it represents a new primitives.
      *
      * @param id  the id
-     * @param type  the type
-     */
-    protected void remember(long id, OsmPrimitiveType type) {
-        if (id <= 0) return;
-        if (type.equals(OsmPrimitiveType.NODE)) {
-            nodes.add(id);
-        } else if (type.equals(OsmPrimitiveType.WAY)) {
-            ways.add(id);
-        } if (type.equals(OsmPrimitiveType.RELATION)) {
-            relations.add(id);
+     */
+    protected void remember(PrimitiveId id) {
+        if (id.isNew()) return;
+        switch(id.getType()) {
+        case NODE: nodes.add(id.getUniqueId()); break;
+        case WAY: ways.add(id.getUniqueId()); break;
+        case RELATION: relations.add(id.getUniqueId()); break;
         }
     }
@@ -115 +113 @@
         if (primitive == null)
             throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can't infer primitive type.", id));
-        remember(id, OsmPrimitiveType.from(primitive));
+        remember(primitive.getPrimitiveId());
         return;
     }
@@ -153 +151 @@
     public MultiFetchServerObjectReader append(Node node) {
         if (node == null) return this;
-        if (node.isNew()) return this;
-        remember(node.getId(), OsmPrimitiveType.NODE);
+        remember(node.getPrimitiveId());
         return this;
     }
@@ -170 +167 @@
         for (Node node: way.getNodes()) {
             if (!node.isNew()) {
-                remember(node.getId(), OsmPrimitiveType.NODE);
-            }
-        }
-        remember(way.getId(), OsmPrimitiveType.WAY);
+                remember(node.getPrimitiveId());
+            }
+        }
+        remember(way.getPrimitiveId());
         return this;
     }
@@ -187 +184 @@
         if (relation == null) return this;
         if (relation.isNew()) return this;
-        remember(relation.getId(), OsmPrimitiveType.RELATION);
+        remember(relation.getPrimitiveId());
         for (RelationMember member : relation.getMembers()) {
             if (OsmPrimitiveType.from(member.getMember()).equals(OsmPrimitiveType.RELATION)) {