Changeset 24967 in osm for applications/viewer

Timestamp:

2011-01-04T16:00:17+01:00 (14 years ago)

Author:

upliner

Message:

jmapviewer: implement detection of Bing zoomlevel and don't store dummy tiles in cache

Location:

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

Files:

• OsmFileCacheTileLoader.java (modified) (7 diffs)
• OsmTileLoader.java (modified) (2 diffs)
• Tile.java (modified) (2 diffs)

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

@@ -203 +203 @@
                 saveTagsToFile();
 
-                byte[] buffer = loadTileInBuffer(urlConn);
+                byte[] buffer = null;
+                if ("no-tile".equals(tile.getValue("tile-info")))
+                {
+                    tile.setError("No tile at this zoom level");
+                } else {
+                    buffer = loadTileInBuffer(urlConn);
+                }
                 if (buffer != null) {
                     tile.loadImage(new ByteArrayInputStream(buffer));
@@ -209 +215 @@
                     listener.tileLoadingFinished(tile, true);
                     saveTileToFile(buffer);
-                } else {
-                    tile.setLoaded(true);
                 }
             } catch (Exception e) {
-                tile.setImage(Tile.ERROR_IMAGE);
-                tile.error = true;
+                tile.setError(e.getMessage());
                 listener.tileLoadingFinished(tile, false);
                 if (input == null) {
@@ -229 +232 @@
             try {
                 tileFile = getTileFile();
-                fin = new FileInputStream(tileFile);
-                if (fin.available() == 0)
-                    throw new IOException("File empty");
-                tile.loadImage(fin);
-                fin.close();
-
                 loadTagsFromFile();
+                if ("no-tile".equals(tile.getValue("tile-info")))
+                {
+                    tile.setError("No tile at this zoom level");
+                    if (tileFile.exists()) {
+                        tileFile.delete();
+                    }
+                    tileFile = getTagsFile();
+                } else {
+                    fin = new FileInputStream(tileFile);
+                    if (fin.available() == 0)
+                        throw new IOException("File empty");
+                    tile.loadImage(fin);
+                    fin.close();
+                }
 
                 fileAge = tileFile.lastModified();
@@ -333 +344 @@
         }
 
+        protected File getTagsFile() {
+            return new File(tileCacheDir + "/" + tile.getZoom() + "_" + tile.getXtile() + "_" + tile.getYtile()
+                    + TAGS_FILE_EXT);
+        }
+
         protected void saveTileToFile(byte[] rawData) {
             try {
@@ -346 +362 @@
 
         protected void saveTagsToFile() {
-            File tagsFile = new File(tileCacheDir, tile.getZoom() + "_"
-                    + tile.getXtile() + "_" + tile.getYtile() + TAGS_FILE_EXT);
+            File tagsFile = getTagsFile();
             if (tile.getMetadata() == null) {
                 tagsFile.delete();
@@ -353 +368 @@
             }
             try {
-                final PrintWriter f = new PrintWriter(new OutputStreamWriter(new FileOutputStream(tagsFile)));
+                final PrintWriter f = new PrintWriter(new OutputStreamWriter(new FileOutputStream(tagsFile),
+                        TAGS_CHARSET));
                 for (Entry<String, String> entry : tile.getMetadata().entrySet()) {
                     f.println(entry.getKey() + "=" + entry.getValue());
@@ -385 +401 @@
         protected void loadTagsFromFile() {
             loadOldETagfromFile();
-            File tagsFile = new File(tileCacheDir, tile.getZoom() + "_"
-                    + tile.getXtile() + "_" + tile.getYtile() + TAGS_FILE_EXT);
-            try {
-                final BufferedReader f = new BufferedReader(new InputStreamReader(new FileInputStream(tagsFile)));
+            File tagsFile = getTagsFile();
+            try {
+                final BufferedReader f = new BufferedReader(new InputStreamReader(new FileInputStream(tagsFile),
+                        TAGS_CHARSET));
                 for (String line = f.readLine(); line != null; line = f.readLine()) {
                     final int i = line.indexOf('=');

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

@@ -52 +52 @@
                     URLConnection conn = loadTileFromOsm(tile);
                     loadTileMetadata(tile, conn);
-                    input = conn.getInputStream();
-                    tile.loadImage(input);
+                    if ("no-tile".equals(tile.getValue("tile-info"))) {
+                        tile.setError("No tile at this zoom level");
+                    } else {
+                        input = conn.getInputStream();
+                        tile.loadImage(input);
+                        input.close();
+                        input = null;
+                    }
                     tile.setLoaded(true);
                     listener.tileLoadingFinished(tile, true);
-                    input.close();
-                    input = null;
                 } catch (Exception e) {
-                    tile.setImage(Tile.ERROR_IMAGE);
-                    tile.error = true;
+                    tile.setError(e.getMessage());
                     listener.tileLoadingFinished(tile, false);
                     if (input == null) {
@@ -86 +89 @@
 
     protected void loadTileMetadata(Tile tile, URLConnection urlConn) {
-        String bing_capturedate = urlConn.getHeaderField("X-VE-TILEMETA-CaptureDatesRange");
-        if (bing_capturedate != null) {
-            tile.putValue("capture-date", bing_capturedate);
+        String str = urlConn.getHeaderField("X-VE-TILEMETA-CaptureDatesRange");
+        if (str != null) {
+            tile.putValue("capture-date", str);
+        }
+        str = urlConn.getHeaderField("X-VE-Tile-Info");
+        if (str != null) {
+            tile.putValue("tile-info", str);
         }
     }

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

@@ -50 +50 @@
     protected boolean loading = false;
     protected boolean error = false;
+    protected String error_message;
 
     /** TileLoader-specific tile metadata */
@@ -271 +272 @@
     }
 
+    public String getErrorMessage() {
+        return error_message;
+    }
+
+    public void setError(String message) {
+        error = true;
+        setImage(ERROR_IMAGE);
+        error_message = message;
+    }
+
     public void putValue(String key, String value) {
         if (value == null || "".equals(value)) {