Changeset 9719 in josm

Timestamp:

2016-02-03T00:27:12+01:00 (8 years ago)

Author:

Don-vip

Message:

DownloadWmsAlongTrackAction: add new unit test, error logs, fix infinite loop when tile loading errors occur (for example, with a bad TMS URL)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (modified) (4 diffs)
• test/data/minimal.gpx (added)
• test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1690 +1690 @@
                         TMSCachedTileLoader.getNewThreadPoolExecutor("Precache downloader"));
             }
-
         }
 
@@ -1718 +1717 @@
         @Override
         public void tileLoadingFinished(Tile tile, boolean success) {
+            int processed = this.processedCount.incrementAndGet();
             if (success) {
-                int processed = this.processedCount.incrementAndGet();
                 this.progressMonitor.worked(1);
                 this.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", processed, totalCount));
+            } else {
+                Main.warn("Tile loading failure: " + tile + " - " + tile.getErrorMessage());
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java

@@ -36 +36 @@
 
 /**
- * Class downloading WMS and TMS along the GPX track
- *
+ * Class downloading WMS and TMS along the GPX track.
+ * @since 5715
  */
 public class DownloadWmsAlongTrackAction extends AbstractAction {
@@ -51 +51 @@
     }
 
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        final List<LatLon> points = new ArrayList<>();
+    static class PrecacheWmsTask extends PleaseWaitRunnable {
+
+        private final AbstractTileSourceLayer layer;
+        private final List<LatLon> points;
+        private PrecacheTask precacheTask;
+
+        protected PrecacheWmsTask(AbstractTileSourceLayer layer, List<LatLon> points) {
+            super(tr("Precaching WMS"));
+            this.layer = layer;
+            this.points = points;
+        }
+
+        @Override
+        protected void realRun() throws SAXException, IOException, OsmTransferException {
+            precacheTask = layer.new PrecacheTask(progressMonitor);
+            layer.downloadAreaToCache(precacheTask, points, 0, 0);
+            while (!precacheTask.isFinished() && !progressMonitor.isCanceled()) {
+                synchronized (this) {
+                    try {
+                        wait(200);
+                    } catch (InterruptedException ex) {
+                        Main.warn("InterruptedException in "+getClass().getSimpleName()+" while precaching WMS");
+                    }
+                }
+            }
+        }
+
+        @Override
+        protected void finish() {
+            // Do nothing
+        }
+
+        @Override
+        protected void cancel() {
+            precacheTask.cancel();
+        }
+
+        @Override
+        public ProgressTaskId canRunInBackground() {
+            return ProgressTaskIds.PRECACHE_WMS;
+        }
+    }
+
+    PrecacheWmsTask createTask() {
+        List<LatLon> points = new ArrayList<>();
         for (GpxTrack trk : data.tracks) {
             for (GpxTrackSegment segment : trk.getSegments()) {
@@ -64 +106 @@
             points.add(p.getCoor());
         }
-        final AbstractTileSourceLayer layer = askedLayer();
-        if (layer != null) {
-            PleaseWaitRunnable task = new PleaseWaitRunnable(tr("Precaching WMS")) {
-                private PrecacheTask precacheTask;
+        AbstractTileSourceLayer layer = askedLayer();
+        return layer != null ? new PrecacheWmsTask(layer, points) : null;
+    }
 
-                @Override
-                protected void realRun() throws SAXException, IOException, OsmTransferException {
-                    precacheTask = layer.new PrecacheTask(progressMonitor);
-                    layer.downloadAreaToCache(precacheTask, points, 0, 0);
-                    while (!precacheTask.isFinished() && !progressMonitor.isCanceled()) {
-                        synchronized (this) {
-                            try {
-                                wait(200);
-                            } catch (InterruptedException ex) {
-                                Main.warn("InterruptedException in "+getClass().getSimpleName()+" while precaching WMS");
-                            }
-                        }
-                    }
-                }
-
-                @Override
-                protected void finish() {
-                }
-
-                @Override
-                protected void cancel() {
-                    precacheTask.cancel();
-                }
-
-                @Override
-                public ProgressTaskId canRunInBackground() {
-                    return ProgressTaskIds.PRECACHE_WMS;
-                }
-            };
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        PrecacheWmsTask task = createTask();
+        if (task != null) {
             Main.worker.execute(task);
         }
@@ -103 +119 @@
 
     protected AbstractTileSourceLayer askedLayer() {
+        if (!Main.isDisplayingMapView()) {
+            return null;
+        }
         List<AbstractTileSourceLayer> targetLayers = Main.map.mapView.getLayersOfType(AbstractTileSourceLayer.class);
         if (targetLayers.isEmpty()) {