Changeset 4090 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-05-20T11:03:51+02:00 (14 years ago)

Author:

bastiK

Message:

applied #6251 (patch by akks) - download relatin members along with relation; zoom to download

File:

• trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

@@ -13 +13 @@
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSetMerger;
@@ -84 +85 @@
             public void run() {
                 layer.mergeFrom(ds);
+                AutoScaleAction.zoomTo(ds.allPrimitives());
                 layer.onPostDownloadFromServer();
             }
@@ -140 +142 @@
             DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
             merger.merge();
+            
+            // if incomplete relation members exist, download them too
+            for (Relation r : ds.getRelations()) {
+                if (canceled) return;
+                if (r.hasIncompleteMembers()) {
+                    synchronized(this) {
+                        if (canceled) return;
+                        objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, true /* full */);
+                    }
+                    theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+                    synchronized (this) {
+                        objectReader = null;
+                    }
+                    merger = new DataSetMerger(ds, theirDataSet);
+                    merger.merge();
+                }
+            }
+
             // a way loaded with MultiFetch may have incomplete nodes because at least one of its
             // nodes isn't present in the local data set. We therefore fully load all