Changeset 3064 in josm for trunk/src/org

Timestamp:

2010-03-01T21:26:51+01:00 (14 years ago)

Author:

mjulius

Message:

in DownloadOsmTask zoom to downloaded primitives when there was not bbox given

File:

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

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

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
@@ -64 +63 @@
                 new OsmServerLocationReader(url),
                 progressMonitor);
-        currentBounds = new Bounds(new LatLon(0,0), new LatLon(0,0));
+        //currentBounds = new Bounds(new LatLon(0,0), new LatLon(0,0));
+        currentBounds = null;
         return Main.worker.submit(downloadTask);
     }
@@ -139 +139 @@
             if (dataSet == null)
                 return; // user canceled download or error occurred
-            if (currentBounds == null)
-                return; // no data retrieved
+            //if (currentBounds == null)
+            //  return; // no data retrieved
             if (dataSet.allPrimitives().isEmpty()) {
                 rememberErrorMessage(tr("No data found in this area."));
@@ -156 +156 @@
                 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
                 final boolean isDisplayingMapView = Main.isDisplayingMapView();
-                
+
                 Main.main.addLayer(layer);
 
@@ -163 +163 @@
                 if (isDisplayingMapView) {
                     BoundingXYVisitor v = new BoundingXYVisitor();
-                    v.visit(currentBounds);
+                    if (currentBounds != null) {
+                        v.visit(currentBounds);
+                    } else {
+                        v.computeBoundingBox(dataSet.getNodes());
+                    }
                     Main.map.mapView.recalculateCenterScale(v);
                 }
@@ -174 +178 @@
                 target.mergeFrom(dataSet);
                 BoundingXYVisitor v = new BoundingXYVisitor();
-                v.visit(currentBounds);
+                if (currentBounds != null) {
+                    v.visit(currentBounds);
+                } else {
+                    v.computeBoundingBox(dataSet.getNodes());
+                }
                 Main.map.mapView.recalculateCenterScale(v);
                 target.onPostDownloadFromServer();