mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 13:16:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1193 from openseadragon/ig-loading

Browse Source 
No longer loading too many tiles
This commit is contained in:
Ian Gilman 2017-07-12 15:59:15 -07:00 committed by GitHub
commit 969faaab23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tiledimage.js
View File

@ -146,7 +146,8 @@ $.TiledImage = function( options ) {
//internal state properties //internal state properties
viewer: null, viewer: null,
tilesMatrix: {}, // A '3d' dictionary [level][x][y] --> Tile. 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. lastDrawn: [], // An unordered list of Tiles drawn last frame.
lastResetTime: 0, // Last time for which the tiledImage was reset. lastResetTime: 0, // Last time for which the tiledImage was reset.
_midDraw: false, // Is the tiledImage currently updating the viewport? _midDraw: false, // Is the tiledImage currently updating the viewport?
@ -960,6 +961,7 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
_updateViewport: function() { _updateViewport: function() {
this._needsDraw = false; this._needsDraw = false;
this._tilesLoading = 0; this._tilesLoading = 0;
this.loadingCoverage = {};
// Reset tile's internal drawn state // Reset tile's internal drawn state
while (this.lastDrawn.length > 0) { while (this.lastDrawn.length > 0) {
@ -1158,6 +1160,7 @@ function updateLevel(tiledImage, haveDrawn, drawLevel, level, levelOpacity,
} }
resetCoverage(tiledImage.coverage, level); resetCoverage(tiledImage.coverage, level);
resetCoverage(tiledImage.loadingCoverage, level);
//OK, a new drawing so do your calculations //OK, a new drawing so do your calculations
var cornerTiles = tiledImage._getCornerTiles(level, topLeftBound, bottomRightBound); var cornerTiles = tiledImage._getCornerTiles(level, topLeftBound, bottomRightBound);
@ -1252,6 +1255,9 @@ function updateTile( tiledImage, haveDrawn, drawLevel, x, y, level, levelOpacity
setCoverage( tiledImage.coverage, level, x, y, false ); 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 ) { if ( !tile.exists ) {
return best; return best;
} }
@ -1305,7 +1311,7 @@ function updateTile( tiledImage, haveDrawn, drawLevel, x, y, level, levelOpacity
} else if ( tile.loading ) { } else if ( tile.loading ) {
// the tile is already in the download queue // the tile is already in the download queue
tiledImage._tilesLoading++; tiledImage._tilesLoading++;
} else { } else if (!loadingCoverage) {
best = compareTiles( best, tile ); best = compareTiles( best, tile );
} }