Changeset 2604 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.java

Timestamp:

2009-12-10T18:42:41+01:00 (14 years ago)

Author:

Gubaer

Message:

New: JOSM reading, writing, merging changeset attribute
fixed #4090: Add changeset:* search option to JOSM's search engine

File:

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

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

@@ -19 +19 @@
 import java.net.URL;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -30 +29 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.visitor.CreateOsmChangeVisitor;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -240 +238 @@
             ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/create", toXml(osm, true),monitor);
             osm.setOsmId(Long.parseLong(ret.trim()), 1);
+            osm.setChangesetId(getChangeset().getId());
         } catch(NumberFormatException e){
             throw new OsmTransferException(tr("Unexpected format of ID replied by the server. Got ''{0}''.", ret));
@@ -260 +259 @@
             ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.getId(), toXml(osm, true), monitor);
             osm.setOsmId(osm.getId(), Integer.parseInt(ret.trim()));
+            osm.setChangesetId(getChangeset().getId());
         } catch(NumberFormatException e) {
             throw new OsmTransferException(tr("Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''.", osm.getId(), ret));
@@ -301 +301 @@
             try {
                 ret = sendRequest("PUT", "changeset/create", toXml(changeset),progressMonitor);
-                changeset.setId(Long.parseLong(ret.trim()));
+                changeset.setId(Integer.parseInt(ret.trim()));
                 changeset.setOpen(true);
             } catch(NumberFormatException e){
@@ -398 +398 @@
 
             initialize(monitor);
-            final ArrayList<OsmPrimitive> processed = new ArrayList<OsmPrimitive>();
-
-            CreateOsmChangeVisitor duv = new CreateOsmChangeVisitor(changeset, OsmApi.this);
-
-            monitor.subTask(tr("Preparing..."));
-            for (OsmPrimitive osm : list) {
-                osm.visit(duv);
-                monitor.worked(1);
-            }
-            monitor.indeterminateSubTask(tr("Uploading..."));
-
-            String diff = duv.getDocument();
-            String diffresult = sendRequest("POST", "changeset/" + changeset.getId() + "/upload", diff,monitor);
-            DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(),
-                    monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-            return processed;
+
+            // prepare upload request
+            //
+            OsmChangeBuilder changeBuilder = new OsmChangeBuilder(changeset);
+            monitor.subTask(tr("Preparing upload request..."));
+            changeBuilder.start();
+            changeBuilder.append(list);
+            changeBuilder.finish();
+            String diffUploadRequest = changeBuilder.getDocument();
+
+            // Upload to the server
+            //
+            monitor.indeterminateSubTask(tr("Uploading {0} objects...", list.size()));
+            String diffUploadResponse = sendRequest("POST", "changeset/" + changeset.getId() + "/upload", diffUploadRequest,monitor);
+
+            // Process the response from the server
+            //
+            DiffResultProcessor reader = new DiffResultProcessor(list);
+            reader.parse(diffUploadResponse, monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            return reader.postProcess(
+                    getChangeset(),
+                    monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)
+            );
         } catch(OsmTransferException e) {
             throw e;
-        } catch(Exception e) {
+        } catch(OsmDataParsingException e) {
             throw new OsmTransferException(e);
         } finally {