Changeset 26508 in osm for applications/viewer/jmapviewer/src/org/openstreetmap/gui

Timestamp:

2011-08-10T16:50:46+02:00 (13 years ago)

Author:

stoecker

Message:

support reload in case of errors

Location:

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

Files:

• OsmFileCacheTileLoader.java (modified) (6 diffs)
• OsmTileLoader.java (modified) (1 diff)

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

@@ -15 +15 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.lang.Thread;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -20 +21 @@
 import java.nio.charset.Charset;
 import java.util.Map.Entry;
+import java.util.Random;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -132 +134 @@
             synchronized (cache) {
                 tile = cache.getTile(source, tilex, tiley, zoom);
-                if (tile == null || tile.isLoaded() || tile.loading)
+                if (tile == null || (tile.isLoaded() && !tile.hasError()) || tile.loading)
                     return;
+                tile.loaded = false;
+                tile.error = false;
                 tile.loading = true;
             }
@@ -156 +160 @@
 
         protected void loadOrUpdateTile() {
-
             try {
                 // log.finest("Loading tile from OSM: " + tile);
@@ -210 +213 @@
                     listener.tileLoadingFinished(tile, true);
                 } else {
-                    byte[] buffer = loadTileInBuffer(urlConn);
-                    if (buffer != null) {
-                        tile.loadImage(new ByteArrayInputStream(buffer));
-                        tile.setLoaded(true);
-                        listener.tileLoadingFinished(tile, true);
-                        saveTileToFile(buffer);
+                    for(int i = 0; i < 5; ++i) {
+                        if (urlConn instanceof HttpURLConnection && ((HttpURLConnection)urlConn).getResponseCode() == 503) {
+                            Thread.sleep(5000+(new Random()).nextInt(5000));
+                            continue;
+                        }
+                        byte[] buffer = loadTileInBuffer(urlConn);
+                        if (buffer != null) {
+                            tile.loadImage(new ByteArrayInputStream(buffer));
+                            tile.setLoaded(true);
+                            listener.tileLoadingFinished(tile, true);
+                            saveTileToFile(buffer);
+                            break;
+                        }
                     }
                 }
@@ -252 +262 @@
                 fileAge = tileFile.lastModified();
                 boolean oldTile = System.currentTimeMillis() - fileAge > maxCacheFileAge;
-                // System.out.println("Loaded from file: " + tile);
                 if (!oldTile) {
                     tile.setLoaded(true);

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

@@ -44 +44 @@
                 synchronized (cache) {
                     tile = cache.getTile(source, tilex, tiley, zoom);
-                    if (tile == null || tile.isLoaded() || tile.loading)
+                    if (tile == null || (tile.isLoaded() && !tile.hasError()) || tile.loading)
                         return;
+                    tile.loaded = false;
+                    tile.error = false;
                     tile.loading = true;
                 }