X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapTileManager.java;h=f7a281b1022ca8059a02e4fe9aef004431b464fc;hp=9f1fbfe70f8ccde2ca78d87240dc48fb51ef923a;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hpb=eebbb64b5d63f9eea43a0dff908c30361a376768 diff --git a/tim/prune/gui/map/MapTileManager.java b/tim/prune/gui/map/MapTileManager.java index 9f1fbfe..f7a281b 100644 --- a/tim/prune/gui/map/MapTileManager.java +++ b/tim/prune/gui/map/MapTileManager.java @@ -126,7 +126,8 @@ public class MapTileManager implements ImageObserver if (useDisk) { tile = DiskTileCacher.getTile(diskCachePath, _mapSource.makeFilePath(inLayer, _zoom, inX, inY), onlineMode); - if (tile != null) { + if (tile != null) + { // Pass tile to memory cache tempCache.setTile(tile, inX, inY); if (tile.getWidth(this) > 0) {return tile;} @@ -139,11 +140,13 @@ public class MapTileManager implements ImageObserver try { URL tileUrl = new URL(_mapSource.makeURL(inLayer, _zoom, inX, inY)); - if (useDisk) { - // Copy image directly from URL stream to disk cache - DiskTileCacher.saveTile(tileUrl, diskCachePath, _mapSource.makeFilePath(inLayer, _zoom, inX, inY), this); + if (useDisk && DiskTileCacher.saveTile(tileUrl, diskCachePath, + _mapSource.makeFilePath(inLayer, _zoom, inX, inY), this)) + { + // Image now copied directly from URL stream to disk cache } - else { + else + { // Load image asynchronously, using observer tile = Toolkit.getDefaultToolkit().createImage(tileUrl); // Pass to memory cache