Changeset 8673 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-08-20T23:01:54+02:00 (9 years ago)

Author:

wiktorn

Message:

Bing fixes.

• Pass and handle error on url creation (attribution not loaded yet). Closes: #11776
• Properly identify "no tiles at this zoom level" situation in tile sets. This tiles are never marked as loaded. Closes: #11785

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/HostLimitQueue.java (modified) (3 diffs)
• data/cache/ICachedLoaderJob.java (modified) (3 diffs)
• data/cache/JCSCachedTileLoaderJob.java (modified) (13 diffs)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.cache;
 
+import java.io.IOException;
+import java.net.URL;
 import java.util.Iterator;
 import java.util.Map;
@@ -57 +59 @@
                     }
                 } else {
-                    Main.info("TMS - Skipping job {0} because host limit reached", job.getUrl());
+                    URL url = null;
+                    try {
+                        url = job.getUrl();
+                    } catch (IOException e) {
+                    }
+                    Main.info("TMS - Skipping job {0} because host limit reached", url);
                 }
             }
@@ -91 +98 @@
 
     private  Semaphore getSemaphore(JCSCachedTileLoaderJob<?, ?> job) {
-        String host = job.getUrl().getHost();
+        String host;
+        try {
+            host = job.getUrl().getHost();
+        } catch (IOException e) {
+            // do not pass me illegal URL's
+            throw new IllegalArgumentException(e);
+        }
         Semaphore limit = hostSemaphores.get(host);
         if (limit == null) {

trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.cache;
 
+import java.io.IOException;
 import java.net.URL;
 
@@ -21 +22 @@
      * method to get download URL for Job
      * @return URL that should be fetched
+     * @throws IOException when could not determine the URL of the tile
      *
      */
-    URL getUrl();
+    URL getUrl() throws IOException;
 
     /**
@@ -42 +44 @@
      * @param listener cache loader listener
      * @param force true if the load should skip all the caches (local & remote)
+     * @throws IOException on failure from getUrl() call
      */
-    void submit(ICachedLoaderListener listener, boolean force);
+    void submit(ICachedLoaderListener listener, boolean force) throws IOException;
 }

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -149 +149 @@
 
     @Override
-    public void submit(ICachedLoaderListener listener, boolean force) {
+    public void submit(ICachedLoaderListener listener, boolean force) throws IOException {
         this.force = force;
         boolean first = false;
@@ -160 +160 @@
         if (deduplicationKey == null) {
             log.log(Level.WARNING, "No url returned for: {0}, skipping", getCacheKey());
-            return;
+            throw new IllegalArgumentException("No url returned");
         }
         synchronized (inProgress) {
@@ -173 +173 @@
 
         if (first || force) {
-            ensureCacheElement();
             // submit all jobs to separate thread, so calling thread is not blocked with IO when loading from disk
             downloadJobExecutor.execute(this);
@@ -214 +213 @@
      */
     protected String getServerKey() {
-        return getUrl().getHost();
+        return getUrlNoException().getHost();
     }
 
@@ -221 +220 @@
         final Thread currentThread = Thread.currentThread();
         final String oldName = currentThread.getName();
-        currentThread.setName("JCS Downloading: " + getUrl());
+        currentThread.setName("JCS Downloading: " + getUrlNoException());
+        ensureCacheElement();
         try {
             // try to fetch from cache
@@ -239 +239 @@
                     // try to get stale entry in cache
                     finishLoading(LoadResult.SUCCESS);
-                    log.log(Level.FINE, "JCS - found stale object in cache: {0}", getUrl());
+                    log.log(Level.FINE, "JCS - found stale object in cache: {0}", getUrlNoException());
                 } else {
                     // failed completely
@@ -254 +254 @@
         Set<ICachedLoaderListener> listeners = null;
         synchronized (inProgress) {
-            listeners = inProgress.remove(getUrl().toString());
+            listeners = inProgress.remove(getUrlNoException().toString());
         }
         if (listeners == null) {
-            log.log(Level.WARNING, "Listener not found for URL: {0}. Listener not notified!", getUrl());
+            log.log(Level.WARNING, "Listener not found for URL: {0}. Listener not notified!", getUrlNoException());
             return;
         }
@@ -275 +275 @@
             if (now > expires) {
                 log.log(Level.FINE, "JCS - Object {0} has expired -> valid to {1}, now is: {2}",
-                        new Object[]{getUrl(), Long.toString(expires), Long.toString(now)});
+                        new Object[]{getUrlNoException(), Long.toString(expires), Long.toString(now)});
                 return false;
             }
@@ -281 +281 @@
                 now - attributes.getLastModification() > DEFAULT_EXPIRE_TIME) {
             // check by file modification date
-            log.log(Level.FINE, "JCS - Object has expired, maximum file age reached {0}", getUrl());
+            log.log(Level.FINE, "JCS - Object has expired, maximum file age reached {0}", getUrlNoException());
             return false;
         } else if (now - attributes.getCreateTime() > DEFAULT_EXPIRE_TIME) {
-            log.log(Level.FINE, "JCS - Object has expired, maximum time since object creation reached {0}", getUrl());
+            log.log(Level.FINE, "JCS - Object has expired, maximum time since object creation reached {0}", getUrlNoException());
             return false;
         }
@@ -380 +380 @@
             }
         } catch (FileNotFoundException e) {
-            log.log(Level.FINE, "JCS - Caching empty object as server returned 404 for: {0}", getUrl());
+            log.log(Level.FINE, "JCS - Caching empty object as server returned 404 for: {0}", getUrlNoException());
             attributes.setResponseCode(404);
             attributes.setErrorMessage(e.toString());
@@ -390 +390 @@
             return doCache;
         } catch (IOException e) {
-            log.log(Level.FINE, "JCS - IOExecption during communication with server for: {0}", getUrl());
+            log.log(Level.FINE, "JCS - IOExecption during communication with server for: {0}", getUrlNoException());
             attributes.setErrorMessage(e.toString());
             attributes.setResponseCode(499); // set dummy error code
@@ -401 +401 @@
         } catch (Exception e) {
             attributes.setErrorMessage(e.toString());
-            log.log(Level.WARNING, "JCS - Exception during download {0}",  getUrl());
+            log.log(Level.WARNING, "JCS - Exception during download {0}",  getUrlNoException());
             Main.warn(e);
         }
-        log.log(Level.WARNING, "JCS - Silent failure during download: {0}", getUrl());
+        log.log(Level.WARNING, "JCS - Silent failure during download: {0}", getUrlNoException());
         return false;
 
@@ -517 +517 @@
         finishLoading(LoadResult.CANCELED);
     }
+
+    private URL getUrlNoException() {
+        try {
+            return getUrl();
+        } catch (IOException e) {
+            return null;
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -106 +106 @@
      */
     @Override
-    public URL getUrl() {
+    public URL getUrl() throws IOException {
         if (url == null) {
-            try {
-                synchronized (this) {
-                    if (url == null)
-                        url = new URL(tile.getUrl());
-                }
-            } catch (IOException e) {
-                LOG.log(Level.WARNING, "JCS TMS Cache - error creating URL for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
-                LOG.log(Level.INFO, "Exception: ", e);
+            synchronized (this) {
+                if (url == null)
+                    url = new URL(tile.getUrl());
             }
         }
@@ -152 +147 @@
     public void submit(boolean force) {
         tile.initLoading();
-        super.submit(this, force);
+        try {
+            super.submit(this, force);
+        } catch (Exception e) {
+            // if we fail to submit the job, mark tile as loaded and set error message
+            tile.finishLoading();
+            tile.setError(e.getMessage());
+        }
     }
 

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

@@ -1305 +1305 @@
         result.hasLoadingTiles = allTiles.size() < ts.size();
         for (Tile t : allTiles) {
+            if ("no-tile".equals(t.getValue("tile-info"))) {
+                result.hasOverzoomedTiles = true;
+            }
+
             if (t.isLoaded()) {
                 if (!t.hasError()) {
                     result.hasVisibleTiles = true;
                 }
-                if ("no-tile".equals(t.getValue("tile-info"))) {
-                    result.hasOverzoomedTiles = true;
-                }
-            } else {
+            } else if (t.isLoading()) {
                 result.hasLoadingTiles = true;
             }
@@ -1410 +1411 @@
             // If all tiles at displayZoomLevel is loaded, load all tiles at next zoom level
             // to make sure there're really no more zoom levels
+            // loading is done in the next if section
             if (zoom == displayZoomLevel && !tsi.hasLoadingTiles && zoom < dts.maxZoom) {
                 zoom++;
@@ -1416 +1418 @@
             // When we have overzoomed tiles and all tiles at current zoomlevel is loaded,
             // load tiles at previovus zoomlevels until we have all tiles on screen is loaded.
+            // loading is done in the next if section
             while (zoom > dts.minZoom && tsi.hasOverzoomedTiles && !tsi.hasLoadingTiles) {
                 zoom--;