From 300ebbfe82e4514547ef8cc4d04ac107df9015cf Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 11 May 2017 11:49:18 -0700 Subject: [PATCH] Tracking tile loading separately from tile drawing --- src/tiledimage.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/tiledimage.js b/src/tiledimage.js index f4178c8d..3914b206 100644 --- a/src/tiledimage.js +++ b/src/tiledimage.js @@ -146,7 +146,8 @@ $.TiledImage = function( options ) { //internal state properties viewer: null, tilesMatrix: {}, // A '3d' dictionary [level][x][y] --> Tile. - coverage: {}, // A '3d' dictionary [level][x][y] --> Boolean. + coverage: {}, // A '3d' dictionary [level][x][y] --> Boolean; shows what areas have been drawn. + loadingCoverage: {}, // A '3d' dictionary [level][x][y] --> Boolean; shows what areas are loaded or are being loaded/blended. lastDrawn: [], // An unordered list of Tiles drawn last frame. lastResetTime: 0, // Last time for which the tiledImage was reset. _midDraw: false, // Is the tiledImage currently updating the viewport? @@ -1122,6 +1123,7 @@ function updateLevel(tiledImage, haveDrawn, drawLevel, level, levelOpacity, } resetCoverage(tiledImage.coverage, level); + resetCoverage(tiledImage.loadingCoverage, level); //OK, a new drawing so do your calculations var cornerTiles = tiledImage._getCornerTiles(level, topLeftBound, bottomRightBound); @@ -1216,6 +1218,9 @@ function updateTile( tiledImage, haveDrawn, drawLevel, x, y, level, levelOpacity setCoverage( tiledImage.coverage, level, x, y, false ); + var loadingCoverage = tile.loaded || tile.loading || isCovered(tiledImage.loadingCoverage, level, x, y); + setCoverage(tiledImage.loadingCoverage, level, x, y, loadingCoverage); + if ( !tile.exists ) { return best; } @@ -1269,7 +1274,7 @@ function updateTile( tiledImage, haveDrawn, drawLevel, x, y, level, levelOpacity } else if ( tile.loading ) { // the tile is already in the download queue tiledImage._tilesLoading++; - } else { + } else if (!loadingCoverage) { best = compareTiles( best, tile ); }