Changeset 24660 in osm for applications/editors/josm

Timestamp:

2010-12-08T22:16:23+01:00 (14 years ago)

Author:

upliner

Message:

imagery: make attribution data loading asynchronous

File:

• applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/BingAerialTileSource.java (modified) (4 diffs)

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/BingAerialTileSource.java

@@ -6 +6 @@
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
@@ -26 +25 @@
     public BingAerialTileSource() {
         super("Bing Aerial Maps", "http://ecn.t2.tiles.virtualearth.net/tiles/");
+
+        if (attributions == null) {
+            Thread t = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    attributions = loadAttributionText();
+                    System.err.println("Added " + attributions.size() + " attributions.");
+                }
+            });
+            t.setDaemon(true);
+            t.run();
+        }
     }
 
@@ -105 +116 @@
             e.printStackTrace();
         }
-        return Collections.emptyList();
+        return null;
     }
 
@@ -155 +166 @@
     public String getAttributionText(int zoom, LatLon topLeft, LatLon botRight) {
         if (attributions == null) {
-            attributions = loadAttributionText();
-            System.err.println("Added " + attributions.size() + " attributions.");
+            // TODO: don't show Bing tiles until attribution data is loaded
+            return "";
         }
         Bounds windowBounds = new Bounds(topLeft, botRight);