Changeset 10964 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

Timestamp:

2016-09-05T22:47:14+02:00 (8 years ago)

Author:

wiktorn

Message:

Load tiles from lower zoom levels if not all of them are loaded

Closes: #13535

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (4 diffs)

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

@@ -1547 +1547 @@
         public boolean hasOverzoomedTiles;
         public boolean hasLoadingTiles;
+        public boolean hasAllLoadedTiles;
     }
 
@@ -1557 +1558 @@
                 result.hasOverzoomedTiles = true;
             }
+            result.hasAllLoadedTiles &= t.isLoaded();
 
             if (t.isLoaded()) {
@@ -1670 +1672 @@
         // Too many tiles... refuse to download
         if (!ts.tooLarge()) {
-            //Main.debug("size: " + ts.size() + " spanned: " + ts.tilesSpanned());
+            // try to load tiles from desired zoom level, no matter what we will show (for example, tiles from previous zoom level
+            // on zoom in)
             ts.loadAllTiles(false);
         }
@@ -1676 +1679 @@
         if (displayZoomLevel != zoom) {
             ts = dts.getTileSet(displayZoomLevel);
+            if (!dts.getTileSetInfo(displayZoomLevel).hasAllLoadedTiles && displayZoomLevel < zoom) {
+                /*
+                 * if we are showing tiles from lower zoom level, ensure that all tiles are loaded
+                 * as they are few, and should not trash the tile cache
+                 * This is especially needed when dts.getTileSet(zoom).tooLarge() is true and we are
+                 * not loading tiles
+                 */
+                ts.loadAllTiles(false);
+            }
         }