Changeset 11832 in josm for trunk

Timestamp:

2017-04-03T20:31:17+02:00 (7 years ago)

Author:

bastiK

Message:

see #7427 - remove the tile.loadPlaceholderFromCache mechanism from AbstractTileSourceLayer

There are 2 systems to display replacement tiles from other zoom levels, when the current
tile is not available (yet). This commit turns off one of these systems and relies fully on
the code in AbstractTileSourceLayer.drawInViewArea / paintTileImages.

File:

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

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

@@ -935 +935 @@
     }
 
-    /*
-     * We use these for quick, hackish calculations. They are temporary only and intentionally not inserted into the tileCache.
-     */
-    private Tile tempCornerTile(Tile t) {
-        int x = t.getXtile() + 1;
-        int y = t.getYtile() + 1;
-        int zoom = t.getZoom();
-        Tile tile = getTile(x, y, zoom);
-        if (tile != null)
-            return tile;
-        return new Tile(tileSource, x, y, zoom);
-    }
-
     private Tile getOrCreateTile(TilePosition tilePosition) {
         return getOrCreateTile(tilePosition.getX(), tilePosition.getY(), tilePosition.getZoom());
@@ -957 +944 @@
             tile = new Tile(tileSource, x, y, zoom);
             tileCache.addTile(tile);
-        }
-
-        if (!tile.isLoaded()) {
-            tile.loadPlaceholderFromCache(tileCache);
         }
         return tile;
@@ -1117 +1100 @@
         List<TilePosition> missed = Collections.synchronizedList(new ArrayList<>());
         ts.visitTiles(tile -> {
-            Image img = getLoadedTileImage(tile);
-            if (img == null) {
+            boolean miss = false;
+            Image img = null;
+            if (!tile.isLoaded() || tile.hasError()) {
+                miss = true;
+            } else {
+                img = getLoadedTileImage(tile);
+                if (img == null) {
+                    miss = true;
+                }
+            }
+            if (miss) {
                 missed.add(new TilePosition(tile));
                 return;
@@ -1148 +1140 @@
         // However, we need to return *all* tiles to the callers, so force creation here.
         for (Tile tile : ts.allTilesCreate()) {
-            Image img = getLoadedTileImage(tile);
-            if (img == null || tile.hasError()) {
-                if (Main.isDebugEnabled()) {
-                    Main.debug("missed tile: " + tile);
-                }
+            boolean miss = false;
+            Image img = null;
+            if (!tile.isLoaded()|| tile.hasError()) {
+                miss = true;
+            } else {
+                img = getLoadedTileImage(tile);
+                if (img == null) {
+                    miss = true;
+                }
+            }
+            if (miss) {
                 missedTiles.add(tile);
                 continue;