Changeset 11774 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.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/DownloadNotesTask.java (modified) (4 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.notes.Note;
@@ -40 +41 @@
 
     private DownloadTask downloadTask;
+    private NoteLayer noteLayer;
 
     /**
@@ -96 +98 @@
     }
 
+    @Override
+    public ProjectionBounds getDownloadProjectionBounds() {
+        return noteLayer != null ? noteLayer.getViewProjectionBounds() : null;
+    }
+
     abstract class DownloadTask extends PleaseWaitRunnable {
         protected OsmServerReader reader;
@@ -117 +124 @@
             List<NoteLayer> noteLayers = Main.getLayerManager().getLayersOfType(NoteLayer.class);
             if (!noteLayers.isEmpty()) {
-                noteLayers.get(0).getNoteData().addNotes(notesData);
+                noteLayer = noteLayers.get(0);
+                noteLayer.getNoteData().addNotes(notesData);
                 if (Main.map != null && zoomAfterDownload) {
-                    Main.map.mapView.scheduleZoomTo(new ViewportData(noteLayers.get(0).getViewProjectionBounds()));
+                    Main.map.mapView.scheduleZoomTo(new ViewportData(noteLayer.getViewProjectionBounds()));
                 }
             } else {
-                Main.getLayerManager().addLayer(new NoteLayer(notesData, tr("Notes")));
+                Main.getLayerManager().addLayer(new NoteLayer(notesData, tr("Notes")), zoomAfterDownload);
             }
         }