Changeset 14374 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-10-27T16:31:51+02:00 (5 years ago)

Author:

simon04

Message:

fix #16879, see #14831 - Fix zoom to downloaded data

File:

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

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

@@ -200 +200 @@
     @Override
     public ProjectionBounds getDownloadProjectionBounds() {
-        return downloadTask != null ? downloadTask.computeBbox(currentBounds) : null;
+        return downloadTask != null ? downloadTask.computeBbox(currentBounds).orElse(null) : null;
     }
 
@@ -346 +346 @@
         }
 
-        protected ProjectionBounds computeBbox(Bounds bounds) {
+        protected Optional<ProjectionBounds> computeBbox(Bounds bounds) {
             BoundingXYVisitor v = new BoundingXYVisitor();
             if (bounds != null) {
@@ -353 +353 @@
                 v.computeBoundingBox(dataSet.getNodes());
             }
-            return v.getBounds();
+            return Optional.ofNullable(v.getBounds());
         }
 
@@ -378 +378 @@
                 layer.mergeFrom(dataSet);
                 MapFrame map = MainApplication.getMap();
-                if (map != null && zoomAfterDownload && bounds != null) {
-                    map.mapView.zoomTo(new ViewportData(computeBbox(bounds)));
+                if (map != null && zoomAfterDownload) {
+                    computeBbox(bounds).map(ViewportData::new).ifPresent(map.mapView::zoomTo);
                 }
                 if (!primitivesToUpdate.isEmpty()) {