Changeset 7816 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-12-17T01:49:45+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #10860 - set initial viewport correctly when mapview is opened

File:

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

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -250 +251 @@
         }
 
-        protected void computeBboxAndCenterScale(Bounds bounds) {
+        protected ProjectionBounds computeBbox(Bounds bounds) {
             BoundingXYVisitor v = new BoundingXYVisitor();
             if (bounds != null) {
@@ -257 +258 @@
                 v.computeBoundingBox(dataSet.getNodes());
             }
+            return v.getBounds();
+        }
+
+        protected void computeBboxAndCenterScale(Bounds bounds) {
+            ProjectionBounds pb = computeBbox(bounds);
+            BoundingXYVisitor v = new BoundingXYVisitor();
+            v.visit(pb);
             Main.map.mapView.recalculateCenterScale(v);
         }
@@ -267 +275 @@
                 //
                 final OsmDataLayer layer = createNewLayer(newLayerName);
-                final boolean isDisplayingMapView = Main.isDisplayingMapView();
-
-                Main.main.addLayer(layer);
-
-                // If the mapView is not there yet, we cannot calculate the bounds (see constructor of MapView).
-                // Otherwise jump to the current download.
-                if (isDisplayingMapView) {
-                    computeBboxAndCenterScale(bounds);
-                }
+                Main.main.addLayer(layer, computeBbox(bounds));
                 return layer;
             }