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

Timestamp:

03.12.2009 19:02:25 (2 years ago)

Author:

Gubaer

Message:

fixed #3400: relation editor: improvement to highlight an element
fixed #3873: Feature request: download selected elements in relation editor
New: Dbl-Click in member table to set the map selection to this member
New: Ctrl-Dbl-Clik in member table to add the member to the the map selection
New: Download selected incomplete members only

File:

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

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.io.InputStream;
@@ -308 +309 @@
         progressMonitor.subTask(tr("Downloading OSM data..."));
         try {
-
-            merge(
-                    OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false))
-            );
+            DataSet loaded = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            rememberNodesOfIncompleteWaysToLoad(loaded);
+            merge(loaded);
         } catch(Exception e) {
             throw new OsmTransferException(e);
@@ -333 +333 @@
         progressMonitor.subTask(tr("Downloading OSM data..."));
         try {
-            merge(
-                    OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false))
-            );
+            DataSet loaded = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            rememberNodesOfIncompleteWaysToLoad(loaded);
+            merge(loaded);
         } catch(Exception e) {
             throw new OsmTransferException(e);
@@ -376 +376 @@
     }
 
+    protected void rememberNodesOfIncompleteWaysToLoad(DataSet from) {
+        for (Way w: from.getWays()) {
+            if (w.incomplete) {
+                for (Node n: w.getNodes()) {
+                    if (n.incomplete) {
+                        nodes.add(n.getId());
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * merges the dataset <code>from</code> to {@see #outputDataSet}.
@@ -401 +413 @@
         case RELATION:  msg = tr("Fetching a package of relations from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
         }
-        progressMonitor.setCustomText(msg);
+        progressMonitor.indeterminateSubTask(msg);
         Set<Long> toFetch = new HashSet<Long>(ids);
         toFetch.addAll(ids);
@@ -428 +440 @@
      * found on  the server (the server response code was 404)
      *
-     * Invoke {@see #getSkippedWay()} to get a list of ways which this reader could not build from
-     * the fetched data because the ways refer to nodes which don't exist on the server.
-     *
      * @return the parsed data
      * @exception OsmTransferException thrown if an error occurs while communicating with the API server
      * @see #getMissingPrimitives()
-     * @see #getSkippedWays()
-     *
-
+     *
      */
     @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
-        progressMonitor.beginTask("");
+        int n = nodes.size() + ways.size() + relations.size();
+        progressMonitor.beginTask(trn("Downloading {0} object from ''{1}''", "Downloading {0} objects from ''{1}''", n, n, OsmApi.getOsmApi().getBaseUrl()));
         try {
             missingPrimitives = new HashSet<Long>();
             if (isCanceled())return null;
+            fetchPrimitives(ways,OsmPrimitiveType.WAY, progressMonitor);
+            if (isCanceled())return null;
             fetchPrimitives(nodes,OsmPrimitiveType.NODE, progressMonitor);
-            if (isCanceled())return null;
-            fetchPrimitives(ways,OsmPrimitiveType.WAY, progressMonitor);
             if (isCanceled())return null;
             fetchPrimitives(relations,OsmPrimitiveType.RELATION, progressMonitor);