Changeset 11774 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

2017-03-25T17:33:06+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #13922 - zoom only once when downloading several data types

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -175 +176 @@
     }
 
+    @Override
+    public ProjectionBounds getDownloadProjectionBounds() {
+        return downloadTask != null ? downloadTask.computeBbox(currentBounds) : null;
+    }
+
     /**
      * Superclass of internal download task.
@@ -253 +259 @@
         }
 
-        protected void computeBboxAndCenterScale(Bounds bounds) {
-            ProjectionBounds pb = computeBbox(bounds);
-            BoundingXYVisitor v = new BoundingXYVisitor();
-            v.visit(pb);
-            Main.map.mapView.zoomTo(v);
-        }
-
         protected OsmDataLayer addNewLayerIfRequired(String newLayerName) {
             int numDataLayers = getNumDataLayers();
@@ -268 +267 @@
                 final OsmDataLayer layer = createNewLayer(newLayerName);
                 if (Main.main != null)
-                    Main.getLayerManager().addLayer(layer);
+                    Main.getLayerManager().addLayer(layer, zoomAfterDownload);
                 return layer;
             }
@@ -280 +279 @@
                 Collection<OsmPrimitive> primitivesToUpdate = searchPrimitivesToUpdate(bounds, layer.data);
                 layer.mergeFrom(dataSet);
-                if (zoomAfterDownload) {
-                    computeBboxAndCenterScale(bounds);
+                if (Main.map != null && zoomAfterDownload) {
+                    Main.map.mapView.zoomTo(new ViewportData(computeBbox(bounds)));
                 }
                 if (!primitivesToUpdate.isEmpty()) {