Changeset 14427 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx

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

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (modified) (1 diff)

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 {