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

Timestamp:

2009-09-05T11:00:10+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3398: Changeset tags should be editable in subsequent uploads

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (1 diff)
• OsmServerWriter.java (modified) (4 diffs)

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

@@ -325 +325 @@
 
     /**
+     * Update a changeset on the server.
+     *
+     * @param changeset the changeset to update
+     * @param progressMonitor the progress monitor
+     * 
+     * @throws OsmTransferException if something goes wrong.
+     */
+    public void updateChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException {
+        try {
+            progressMonitor.beginTask(tr("Updating changeset..."));
+            initialize(progressMonitor);
+            if (this.changeset != null && this.changeset.getId() > 0) {
+                if (this.changeset.hasEqualSemanticAttributes(changeset)) {
+                    progressMonitor.setCustomText(tr("Changeset {0} is unchanged. Skipping update.", changeset.getId()));
+                    return;
+                }
+                changeset.id = this.changeset.getId();
+                this.changeset.cloneFrom(changeset);
+                progressMonitor.setCustomText(tr("Updating changeset {0}...", changeset.getId()));
+                sendRequest(
+                        "PUT",
+                        OsmPrimitiveType.from(changeset).getAPIName() + "/" + changeset.getId(),
+                        toXml(changeset, true),
+                        progressMonitor
+                );
+                this.changeset = changeset;
+            } else
+                throw new OsmTransferException(tr("Failed to update changeset. Either there is no current changeset or the id of the current changeset is 0"));
+        } finally {
+            progressMonitor.finishTask();
+        }
+    }
+
+    /**
      * Closes a changeset on the server.
      *

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

@@ -91 +91 @@
         try {
             progressMonitor.setTicksCount(primitives.size());
-            api.createChangeset(changeset, changesetProcessingType,progressMonitor.createSubTaskMonitor(0, false));
+            if (changesetProcessingType.isUseNew()) {
+                api.createChangeset(changeset, changesetProcessingType,progressMonitor.createSubTaskMonitor(0, false));
+            } else {
+                api.updateChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
+            }
             uploadStartTime = System.currentTimeMillis();
             for (OsmPrimitive osm : primitives) {
@@ -98 +102 @@
                 String msg = "";
                 switch(OsmPrimitiveType.from(osm)) {
-                    case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
-                    case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
-                    case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
+                case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
+                case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
+                case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
                 }
                 progressMonitor.subTask(
@@ -146 +150 @@
         //
         try {
-            api.createChangeset(changeset, changesetProcessingType, progressMonitor.createSubTaskMonitor(0, false));
+            if (changesetProcessingType.isUseNew()) {
+                api.createChangeset(changeset, changesetProcessingType,progressMonitor.createSubTaskMonitor(0, false));
+            } else {
+                api.updateChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
+            }
             processed.addAll(api.uploadDiff(primitives, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
         } catch(OsmTransferException e) {
@@ -173 +181 @@
 
         api.initialize(progressMonitor);
-
         try {
             // check whether we can use diff upload