Changeset 8714 in josm for trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

Timestamp:

2015-09-01T22:57:30+02:00 (11 years ago)

Author:

wiktorn

Message:

Do not block in EDT thread, when waiting for attribution download. Closes: #11821

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.imagery.CachedAttributionBingAerialTileSource;
@@ -67 +68 @@
     @Override
     protected AbstractTMSTileSource getTileSource(ImageryInfo info) throws IllegalArgumentException {
-        return getTileSourceStatic(info);
+        return getTileSourceStatic(info, new Runnable() {
+            @Override
+            public void run() {
+                Main.debug("Attribution loaded, running loadAllErrorTiles");
+                TMSLayer.this.loadAllErrorTiles(true);
+            }
+        });
     }
 
@@ -97 +104 @@
      */
     public static AbstractTMSTileSource getTileSourceStatic(ImageryInfo info) throws IllegalArgumentException {
+        return getTileSourceStatic(info, null);
+    }
+
+    /**
+     * Creates and returns a new TileSource instance depending on the {@link ImageryType}
+     * of the passed ImageryInfo object.
+     *
+     * If no appropriate TileSource is found, null is returned.
+     * Currently supported ImageryType are {@link ImageryType#TMS},
+     * {@link ImageryType#BING}, {@link ImageryType#SCANEX}.
+     *
+     * @param info imagery info
+     * @param attributionLoadedTask task to be run once attribution is loaded, might be null, if nothing special shall happen
+     * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
+     * @throws IllegalArgumentException if url from imagery info is null or invalid
+     */
+    public static AbstractTMSTileSource getTileSourceStatic(ImageryInfo info, Runnable attributionLoadedTask) throws IllegalArgumentException {
         if (info.getImageryType() == ImageryType.TMS) {
             TemplatedTMSTileSource.checkUrl(info.getUrl());
@@ -103 +127 @@
             return t;
         } else if (info.getImageryType() == ImageryType.BING)
-            return new CachedAttributionBingAerialTileSource(info);
+            return new CachedAttributionBingAerialTileSource(info, attributionLoadedTask);
         else if (info.getImageryType() == ImageryType.SCANEX) {
             return new ScanexTileSource(info);