ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-use ol.TileRange objects

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -201,6 +201,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
tilesToDrawByZ, getTileIfLoaded); tilesToDrawByZ, getTileIfLoaded);
var allTilesLoaded = true; var allTilesLoaded = true;
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
var childTileRange, fullyLoaded, tile, tileState, x, y; var childTileRange, fullyLoaded, tile, tileState, x, y;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) { for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
for (y = tileRange.minY; y <= tileRange.maxY; ++y) { for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
@@ -216,9 +217,10 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
allTilesLoaded = false; allTilesLoaded = false;
fullyLoaded = tileGrid.forEachTileCoordParentTileRange( fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
tile.tileCoord, findLoadedTiles); tile.tileCoord, findLoadedTiles, null, tmpTileRange);
if (!fullyLoaded) { if (!fullyLoaded) {
childTileRange = tileGrid.getTileCoordChildTileRange(tile.tileCoord); childTileRange = tileGrid.getTileCoordChildTileRange(
tile.tileCoord, tmpTileRange);
if (!goog.isNull(childTileRange)) { if (!goog.isNull(childTileRange)) {
findLoadedTiles(z + 1, childTileRange); findLoadedTiles(z + 1, childTileRange);
} }
@@ -276,7 +278,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
context.drawImage(tile.getImage(), x, y, width, height); context.drawImage(tile.getImage(), x, y, width, height);
} }
interimTileRange = interimTileRange =
tileGrid.getTileRangeForExtentAndZ(tileExtent, z); tileGrid.getTileRangeForExtentAndZ(tileExtent, z, tmpTileRange);
minX = Math.max(interimTileRange.minX, canvasTileRange.minX); minX = Math.max(interimTileRange.minX, canvasTileRange.minX);
maxX = Math.min(interimTileRange.maxX, canvasTileRange.maxX); maxX = Math.min(interimTileRange.maxX, canvasTileRange.maxX);
minY = Math.max(interimTileRange.minY, canvasTileRange.minY); minY = Math.max(interimTileRange.minY, canvasTileRange.minY);

16
src/ol/renderer/dom/domtilelayerrenderer.js
View File

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

6
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -199,6 +199,7 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
tilesToDrawByZ, getTileIfLoaded); tilesToDrawByZ, getTileIfLoaded);
var allTilesLoaded = true; var allTilesLoaded = true;
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
var childTileRange, fullyLoaded, tile, tileState, x, y; var childTileRange, fullyLoaded, tile, tileState, x, y;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) { for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
for (y = tileRange.minY; y <= tileRange.maxY; ++y) { for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
@@ -217,9 +218,10 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
allTilesLoaded = false; allTilesLoaded = false;
fullyLoaded = tileGrid.forEachTileCoordParentTileRange( fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
tile.tileCoord, findLoadedTiles); tile.tileCoord, findLoadedTiles, null, tmpTileRange);
if (!fullyLoaded) { if (!fullyLoaded) {
childTileRange = tileGrid.getTileCoordChildTileRange(tile.tileCoord); childTileRange = tileGrid.getTileCoordChildTileRange(
tile.tileCoord, tmpTileRange);
if (!goog.isNull(childTileRange)) { if (!goog.isNull(childTileRange)) {
findLoadedTiles(z + 1, childTileRange); findLoadedTiles(z + 1, childTileRange);
} }