Changeset 14427 in josm for trunk/src/org

Timestamp:

2018-11-16T21:51:56+01:00 (6 years ago)

Author:

wiktorn

Message:

Fix canceling precaching imageries along GPX track

• when GPX is big it was possibile to cancel task before precacheTask was set in

PrecacheWmsTask.realRun(). This caused NPE and prevented cleaning download
queue

• PrecacheTask.tileLoadingFinished updated progress monitor even if task was

already cancelled and this led to invalid state exception in ProgressMonitor,
as there are many download tasks run in parallel and we do not cancel them if
they already started. Now, after download is cancelled, no updates are issued

Closes: #16966

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (5 diffs)
• gpx/DownloadWmsAlongTrackAction.java (modified) (1 diff)

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

@@ -1770 +1770 @@
     public class PrecacheTask implements TileLoaderListener {
         private final ProgressMonitor progressMonitor;
-        private int totalCount;
+        private final int totalCount;
         private final AtomicInteger processedCount = new AtomicInteger(0);
         private final TileLoader tileLoader;
+        private final Set<Tile> requestedTiles;
 
         /**
          * @param progressMonitor that will be notified about progess of the task
+         * @param bufferY
+         * @param bufferX
+         * @param points
          */
-        public PrecacheTask(ProgressMonitor progressMonitor) {
+        public PrecacheTask(ProgressMonitor progressMonitor, List<LatLon> points, double bufferX, double bufferY) {
             this.progressMonitor = progressMonitor;
             this.tileLoader = getTileLoaderFactory().makeTileLoader(this, getHeaders(tileSource), minimumTileExpire);
@@ -1784 +1788 @@
                         TMSCachedTileLoader.getNewThreadPoolExecutor("Precache downloader"));
             }
+            requestedTiles = new ConcurrentSkipListSet<>(
+                    (o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getKey(), o2.getKey()));
+            for (LatLon point: points) {
+                TileXY minTile = tileSource.latLonToTileXY(point.lat() - bufferY, point.lon() - bufferX, currentZoomLevel);
+                TileXY curTile = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(point), currentZoomLevel);
+                TileXY maxTile = tileSource.latLonToTileXY(point.lat() + bufferY, point.lon() + bufferX, currentZoomLevel);
+
+                // take at least one tile of buffer
+                int minY = Math.min(curTile.getYIndex() - 1, minTile.getYIndex());
+                int maxY = Math.max(curTile.getYIndex() + 1, maxTile.getYIndex());
+                int minX = Math.min(curTile.getXIndex() - 1, minTile.getXIndex());
+                int maxX = Math.max(curTile.getXIndex() + 1, maxTile.getXIndex());
+
+                for (int x = minX; x <= maxX; x++) {
+                    for (int y = minY; y <= maxY; y++) {
+                        requestedTiles.add(new Tile(tileSource, x, y, currentZoomLevel));
+                    }
+                }
+            }
+
+            this.totalCount = requestedTiles.size();
+            this.progressMonitor.setTicksCount(requestedTiles.size());
+
         }
 
@@ -1813 +1840 @@
             int processed = this.processedCount.incrementAndGet();
             if (success) {
-                this.progressMonitor.worked(1);
-                this.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", processed, totalCount));
+                synchronized (progressMonitor) {
+                    if (!this.progressMonitor.isCanceled()) {
+                        this.progressMonitor.worked(1);
+                        this.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", processed, totalCount));
+                    }
+                }
             } else {
                 Logging.warn("Tile loading failure: " + tile + " - " + tile.getErrorMessage());
@@ -1825 +1856 @@
         public TileLoader getTileLoader() {
             return tileLoader;
+        }
+
+        /**
+         * Execute the download
+         */
+        public void run() {
+            TileLoader loader = getTileLoader();
+            for (Tile t: requestedTiles) {
+                if (!progressMonitor.isCanceled()) {
+                    loader.createTileLoaderJob(t).submit();
+                }
+            }
+
         }
     }
@@ -1840 +1884 @@
      * @return precache task representing download task
      */
-    public AbstractTileSourceLayer<T>.PrecacheTask downloadAreaToCache(final ProgressMonitor progressMonitor, List<LatLon> points,
+    public AbstractTileSourceLayer<T>.PrecacheTask getDownloadAreaToCacheTask(final ProgressMonitor progressMonitor, List<LatLon> points,
             double bufferX, double bufferY) {
-        PrecacheTask precacheTask = new PrecacheTask(progressMonitor);
-        final Set<Tile> requestedTiles = new ConcurrentSkipListSet<>(
-                (o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getKey(), o2.getKey()));
-        for (LatLon point: points) {
-            TileXY minTile = tileSource.latLonToTileXY(point.lat() - bufferY, point.lon() - bufferX, currentZoomLevel);
-            TileXY curTile = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(point), currentZoomLevel);
-            TileXY maxTile = tileSource.latLonToTileXY(point.lat() + bufferY, point.lon() + bufferX, currentZoomLevel);
-
-            // take at least one tile of buffer
-            int minY = Math.min(curTile.getYIndex() - 1, minTile.getYIndex());
-            int maxY = Math.max(curTile.getYIndex() + 1, maxTile.getYIndex());
-            int minX = Math.min(curTile.getXIndex() - 1, minTile.getXIndex());
-            int maxX = Math.max(curTile.getXIndex() + 1, maxTile.getXIndex());
-
-            for (int x = minX; x <= maxX; x++) {
-                for (int y = minY; y <= maxY; y++) {
-                    requestedTiles.add(new Tile(tileSource, x, y, currentZoomLevel));
-                }
-            }
-        }
-
-        precacheTask.totalCount = requestedTiles.size();
-        precacheTask.progressMonitor.setTicksCount(requestedTiles.size());
-
-        TileLoader loader = precacheTask.getTileLoader();
-        for (Tile t: requestedTiles) {
-            loader.createTileLoaderJob(t).submit();
-        }
+        PrecacheTask precacheTask = new PrecacheTask(progressMonitor, points, bufferX, bufferY);
+
         return precacheTask;
     }

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

@@ -60 +60 @@
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
-            precacheTask = layer.downloadAreaToCache(progressMonitor, points, 0, 0);
+            precacheTask = layer.getDownloadAreaToCacheTask(progressMonitor, points, 0, 0);
+            precacheTask.run();
             synchronized (this) {
                 try {