Re-use ol.TileRange objects

This commit is contained in:
Tom Payne
2013-04-09 16:04:04 +02:00
parent e30109913e
commit e556c87a7c
3 changed files with 19 additions and 11 deletions

View File

@@ -14,6 +14,7 @@ goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Tile');
goog.require('ol.TileCoord');
goog.require('ol.TileRange');
goog.require('ol.TileState');
goog.require('ol.ViewHint');
goog.require('ol.dom');
@@ -115,6 +116,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
tilesToDrawByZ, getTileIfLoaded);
var allTilesLoaded = true;
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
var childTileRange, fullyLoaded, tile, tileState, x, y;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
@@ -131,9 +133,10 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
allTilesLoaded = false;
fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
tile.tileCoord, findLoadedTiles);
tile.tileCoord, findLoadedTiles, null, tmpTileRange);
if (!fullyLoaded) {
childTileRange = tileGrid.getTileCoordChildTileRange(tile.tileCoord);
childTileRange = tileGrid.getTileCoordChildTileRange(
tile.tileCoord, tmpTileRange);
if (!goog.isNull(childTileRange)) {
findLoadedTiles(z + 1, childTileRange);
}
@@ -212,7 +215,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
} else {
if (!frameState.viewHints[ol.ViewHint.ANIMATING] &&
!frameState.viewHints[ol.ViewHint.INTERACTING]) {
tileLayerZ.removeTilesOutsideExtent(extent);
tileLayerZ.removeTilesOutsideExtent(extent, tmpTileRange);
}
}
}
@@ -351,11 +354,12 @@ ol.renderer.dom.TileLayerZ_.prototype.getResolution = function() {
/**
* @param {ol.Extent} extent Extent.
* @param {ol.TileRange=} opt_tileRange Temporary ol.TileRange object.
*/
ol.renderer.dom.TileLayerZ_.prototype.removeTilesOutsideExtent =
function(extent) {
var tileRange =
this.tileGrid_.getTileRangeForExtentAndZ(extent, this.tileCoordOrigin_.z);
function(extent, opt_tileRange) {
var tileRange = this.tileGrid_.getTileRangeForExtentAndZ(
extent, this.tileCoordOrigin_.z, opt_tileRange);
var tilesToRemove = [];
var tile, tileCoordKey;
for (tileCoordKey in this.tiles_) {