Changeset 24763 in osm for applications/viewer

Timestamp:

2010-12-15T18:27:25+01:00 (14 years ago)

Author:

upliner

Message:

jmapviewer: don't show Bing tiles until the attribution data is loaded

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• BingAerialTileSource.java (modified) (5 diffs)
• OsmFileCacheTileLoader.java (modified) (3 diffs)
• OsmTileSource.java (modified) (3 diffs)
• Tile.java (modified) (3 diffs)
• interfaces/TileSource.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/BingAerialTileSource.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import javax.imageio.ImageIO;
@@ -19 +22 @@
 public class BingAerialTileSource extends OsmTileSource.AbstractOsmTileSource {
     private static String API_KEY = "Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU";
-    private static List<Attribution> attributions;
+    private static Future<List<Attribution>> attributions;
 
     public BingAerialTileSource() {
@@ -25 +28 @@
 
         if (attributions == null) {
-            Thread t = new Thread(new Runnable() {
+            attributions = Executors.newSingleThreadExecutor().submit(new Callable<List<Attribution>>() {
                 @Override
-                public void run() {
-                    attributions = loadAttributionText();
+                public List<Attribution> call() throws Exception {
+                    return loadAttributionText();
                 }
             });
-            t.setDaemon(true);
-            t.start();
         }
     }
@@ -130 +131 @@
 
     @Override
-    public String getTilePath(int zoom, int tilex, int tiley) {
-        String quadtree = computeQuadTree(zoom, tilex, tiley);
-        return "/tiles/a" + quadtree + "." + getExtension() + "?g=587";
+    public String getTilePath(int zoom, int tilex, int tiley) throws IOException {
+        try {
+            if (attributions.get() == null)
+                throw new IOException("Cannot load Bing attribution");
+            String quadtree = computeQuadTree(zoom, tilex, tiley);
+            return "/tiles/a" + quadtree + "." + getExtension() + "?g=587";
+        } catch (Exception e) {
+            throw new IOException("Cannot load Bing attribution", e);
+        }
     }
 
@@ -169 +176 @@
     @Override
     public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
-        if (attributions == null)
-            // TODO: don't show Bing tiles until attribution data is loaded
-            return "";
-        StringBuilder a = new StringBuilder();
-        for (Attribution attr : attributions) {
-            if(zoom <= attr.maxZoom && zoom >= attr.minZoom) {
-                if(topLeft.getLon() < attr.max.getLon()
-                        && botRight.getLon() > attr.min.getLon()
-                        && topLeft.getLat() > attr.min.getLat()
-                        && botRight.getLat() < attr.max.getLat()) {
-                    a.append(attr.attribution);
-                    a.append(" ");
+        try {
+            if (!attributions.isDone())
+                return "Loading Bing attribution data...";
+            if (attributions.get() == null)
+                return "Error loading Bing attribution data";
+            StringBuilder a = new StringBuilder();
+            for (Attribution attr : attributions.get()) {
+                if(zoom <= attr.maxZoom && zoom >= attr.minZoom) {
+                    if(topLeft.getLon() < attr.max.getLon()
+                            && botRight.getLon() > attr.min.getLon()
+                            && topLeft.getLat() > attr.min.getLat()
+                            && botRight.getLat() < attr.max.getLat()) {
+                        a.append(attr.attribution);
+                        a.append(" ");
+                    }
                 }
             }
-        }
-        return a.toString();
+            return a.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "Error loading Bing attribution data";
     }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java

@@ -63 +63 @@
             log.log(Level.WARNING,
                     "Failed to access system property ''java.io.tmpdir'' for security reasons. Exception was: "
-                            + e.toString());
+                    + e.toString());
             throw e; // rethrow
         }
@@ -73 +73 @@
                 // On Linux/Unix systems we do not have a per user tmp directory.
                 // Therefore we add the user name for getting a unique dir name.
-                if (userName != null && userName.length() > 0)
+                if (userName != null && userName.length() > 0) {
                     subDirName += "_" + userName;
+                }
                 cacheDir = new File(tempDir, subDirName);
             }
@@ -208 +209 @@
             } catch (Exception e) {
                 tile.setImage(Tile.ERROR_IMAGE);
+                tile.error = true;
                 listener.tileLoadingFinished(tile, false);
                 if (input == null) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileSource.java

@@ -2 +2 @@
 
 import java.awt.Image;
+import java.io.IOException;
 
 import javax.swing.ImageIcon;
@@ -48 +49 @@
         }
 
-        public String getTilePath(int zoom, int tilex, int tiley) {
+        /**
+         * @throws IOException when subclass cannot return the tile URL
+         */
+        public String getTilePath(int zoom, int tilex, int tiley) throws IOException {
             return "/" + zoom + "/" + tilex + "/" + tiley + "." + getExtension();
         }
@@ -56 +60 @@
         }
 
-        public String getTileUrl(int zoom, int tilex, int tiley) {
+        public String getTileUrl(int zoom, int tilex, int tiley) throws IOException {
             return this.getBaseUrl() + getTilePath(zoom, tilex, tiley);
         }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java

@@ -184 +184 @@
     }
 
-    public String getUrl() {
+    public String getUrl() throws IOException {
         return source.getTileUrl(zoom, xtile, ytile);
     }
@@ -254 +254 @@
     public String getStatus() {
         String status = "new";
+        if (this.error) {
+            status = "error";
+        }
         if (this.loading) {
             status = "loading";
@@ -260 +263 @@
             status = "loaded";
         }
-        if (this.error) {
-            status = "error";
-        }
         return status;
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

@@ -2 +2 @@
 
 import java.awt.Image;
+import java.io.IOException;
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
@@ -80 +81 @@
      * @return fully qualified url for downloading the specified tile image
      */
-    public String getTileUrl(int zoom, int tilex, int tiley);
+    public String getTileUrl(int zoom, int tilex, int tiley) throws IOException;
 
     /**