Changeset 35055 in osm

Timestamp:

2019-07-08T08:05:22+02:00 (6 years ago)

Author:

the111

Message:

The current strategy of retrieving the Future of attribution data ensures that at map load time the first few tiles will fail, since the attribution request has not yet completed (and the only way to refresh the failed tiles is to change the viewport). There's nothing positive bought by the immediate timeout, since we refuse to load tiles anyway before attribution data is ready. Because of that requirement, there is no reason to not wait indefinitely on that Future, since by definition we can't do anything until it's done. This change ensures the initial map load will have all tiles succeed (barring other exceptional circumstances).

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (1 diff)

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

@@ -276 +276 @@
         }
         try {
-            return attributions.get(0, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException ex) {
-            LOG.log(Level.WARNING, "Bing: attribution data is not yet loaded.");
+            return attributions.get();
         } catch (ExecutionException ex) {
             throw new RuntimeException(ex.getCause());