Changeset 35188 in osm

Timestamp:

2019-10-12T23:34:58+02:00 (5 years ago)

Author:

donvip

Message:

Fix #josm18221 - handle “zoom to download”

Location:

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download

Files:

• CadastreDownloadSource.java (modified) (1 diff)
• CadastreDownloadTask.java (modified) (5 diffs)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadSource.java

@@ -24 +24 @@
     public void doDownload(CadastreDownloadData data, DownloadSettings settings) {
         if (settings.getDownloadBounds().isPresent()) {
-            new CadastreDownloadTask(data).download(
+            new CadastreDownloadTask(data, settings.zoomToData()).download(
                     new DownloadParams().withUploadPolicy(UploadPolicy.BLOCKED).withNewLayer(settings.asNewLayer()),
                     settings.getDownloadBounds().get(), null);

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java

@@ -43 +43 @@
      */
     public CadastreDownloadTask() {
-        this(new CadastreDownloadData(true, true, true, true, true, true, true, true, true));
+        this(new CadastreDownloadData(true, true, true, true, true, true, true, true, true), true);
     }
 
@@ -49 +49 @@
      * Constructs a new {@code CadastreDownloadTask} with parameterizable behaviour.
      * @param data defines which data has to be downloaded
+     * @param zoomToData if true, the map view will zoom to download area after download
      */
-    public CadastreDownloadTask(CadastreDownloadData data) {
+    public CadastreDownloadTask(CadastreDownloadData data, boolean zoomToData) {
         this.data = Objects.requireNonNull(data);
+        setZoomAfterDownload(zoomToData);
     }
 
@@ -60 +62 @@
             for (String id : CadastreAPI.getSheets(downloadArea)) {
                 String url = String.join("/", CADASTRE_URL, id.substring(0, 2), id.substring(0, 5), "edigeo-"+id+".tar.bz2");
-                tasks.add(MainApplication.worker.submit(new InternalDownloadTask(settings, url, progressMonitor)));
+                tasks.add(MainApplication.worker.submit(new InternalDownloadTask(settings, url, progressMonitor, zoomAfterDownload)));
             }
         } catch (IOException e) {
@@ -80 +82 @@
     @Override
     public Future<?> loadUrl(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
-        downloadTask = new InternalDownloadTask(settings, url, progressMonitor);
+        downloadTask = new InternalDownloadTask(settings, url, progressMonitor, zoomAfterDownload);
         currentBounds = null;
         return MainApplication.worker.submit(downloadTask);
@@ -106 +108 @@
         private final String url;
 
-        InternalDownloadTask(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
-            super(settings, new CadastreServerReader(url, data), progressMonitor);
+        InternalDownloadTask(DownloadParams settings, String url, ProgressMonitor progressMonitor, boolean zoom) {
+            super(settings, new CadastreServerReader(url, data), progressMonitor, zoom);
             this.url = url;
         }