Changeset 2599 in josm for trunk/src/org/openstreetmap/josm/io

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• Capabilities.java (modified) (2 diffs)
• ChangesetClosedException.java (modified) (3 diffs)
• MultiFetchServerObjectReader.java (modified) (6 diffs)
• OsmApi.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.HashMap;
@@ -71 +73 @@
     }
 
+    /**
+     * Replies the max number of objects in a changeset. -1 if either the capabilities
+     * don't include this parameter or if the parameter value is illegal (not a number,
+     * a negative number)
+     * 
+     * @return the max number of objects in a changeset
+     */
+    public int getMaxChangsetSize() {
+        String v = get("changesets", "maximum_elements");
+        if (v == null) return -1;
+        try {
+            int n = Integer.parseInt(v);
+            if (n <= 0) {
+                System.err.println(tr("Warning: illegal value of attribute '{0}'' of element ''{1}'' in server capabilities. Got ''{2}", "changesets", "maximum_elements", n ));
+                return -1;
+            }
+            return n;
+        } catch(NumberFormatException e) {
+            System.err.println(tr("Warning: illegal value of attribute '{0}'' of element ''{1}'' in server capabilities. Got ''{2}", "changesets", "maximum_elements", v ));
+            return -1;
+        }
+    }
 }

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

@@ -31 +31 @@
     final static public String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)";
 
-    static enum Source {
+    public static enum Source {
         /**
          * The exception was thrown when a changeset was updated. This most likely means
@@ -114 +114 @@
 
     /**
+     * Creates the exception
+     * 
+     * @param changesetId the id if the closed changeset
+     * @param closedOn the date the changeset was closed on
+     * @param source the source for the exception
+     */
+    public ChangesetClosedException(long changesetId, Date closedOn, Source source) {
+        super("");
+        this.source = source == null ? Source.UNSPECIFIED : source;
+        this.changesetId = changesetId;
+        this.closedOn = closedOn;
+    }
+
+    /**
      * Replies the id of the changeset which was closed
      * 
@@ -139 +153 @@
         return source;
     }
+
+    public void setSource(Source source) {
+        this.source = source == null ? Source.UNSPECIFIED : source;
+    }
 }

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)) {

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

@@ -80 +80 @@
         String serverUrl = Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api");
         if (serverUrl == null)
-            throw new IllegalStateException(tr("Preference ''{0}'' missing. Can't initialize OsmApi.", "osm-server.url"));
+            throw new IllegalStateException(tr("Preference ''{0}'' missing. Can''t initialize OsmApi.", "osm-server.url"));
         return getOsmApi(serverUrl);
     }
@@ -342 +342 @@
                     monitor
             );
+        } catch(ChangesetClosedException e) {
+            e.setSource(ChangesetClosedException.Source.UPDATE_CHANGESET);
+            throw e;
         } catch(OsmApiException e) {
             if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT && ChangesetClosedException.errorHeaderMatchesPattern(e.getErrorHeader()))

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

@@ -149 +149 @@
             while(it.hasNext()) {
                 i++;
-                progressMonitor.setCustomText(tr("({0}/{1}) Uploading {2} objects...", i,numChunks,chunkSize));
                 if (canceled) return;
                 int j = 0;
@@ -158 +157 @@
                     chunk.add(it.next());
                 }
+                progressMonitor.setCustomText(tr("({0}/{1}) Uploading {2} objects...", i,numChunks,chunk.size()));
                 processed.addAll(api.uploadDiff(chunk, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
             }