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

Merge branch 'master' of github.com:openlayers/ol3 into animation-frame

Browse Source
This commit is contained in:
Tim Schaub
2012-10-07 23:52:00 -06:00
parent f46cdb4ce9 2c2d40a53c
commit 7b99004a4e
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ol/renderer/dom/tilelayer.js
View File

@@ -34,10 +34,10 @@ ol.renderer.dom.TileLayer = function(mapRenderer, tileLayer, target) {
this.renderedMapResolution_ = undefined;
/**
* @type {ol.TileRange|undefined}
* @type {ol.Extent}
* @private
*/
this.renderedTileRange_ = undefined;
this.renderedExtent_ = null;
/**
* @type {number|undefined}
@@ -82,7 +82,6 @@ ol.renderer.dom.TileLayer.prototype.getTileOffset_ = function(z, resolution) {
* @private
*/
ol.renderer.dom.TileLayer.prototype.removeAltZTiles_ = function() {
var tileRange = this.renderedTileRange_;
var z = this.renderedZ_;
var key, tileCoord, tile;
for (key in this.renderedTiles_) {
@@ -97,26 +96,20 @@ ol.renderer.dom.TileLayer.prototype.removeAltZTiles_ = function() {
/**
* Get rid of tiles outside the rendered extent. Only removes tiles at the
* currently rendered z.
* Get rid of tiles outside the rendered extent.
* @private
*/
ol.renderer.dom.TileLayer.prototype.removeOutOfRangeTiles_ = function() {
var tileRange = this.renderedTileRange_;
var z = this.renderedZ_;
var key, tileCoord, prune, tile;
var mapExtent = this.renderedExtent_;
var grid = this.getLayer().getTileSource().getTileGrid();
var key, tileCoord, tileExtent, tile;
for (key in this.renderedTiles_) {
tileCoord = ol.TileCoord.createFromString(key);
if (tileCoord.z === z) {
prune = tileCoord.x < tileRange.minX ||
tileCoord.x > tileRange.maxX ||
tileCoord.y < tileRange.minY ||
tileCoord.y > tileRange.maxY;
if (prune) {
tile = this.renderedTiles_[key];
delete this.renderedTiles_[key];
goog.dom.removeNode(tile.getImage(this));
}
tileExtent = grid.getTileCoordExtent(tileCoord);
if (!tileExtent.intersects(mapExtent)) {
tile = this.renderedTiles_[key];
delete this.renderedTiles_[key];
goog.dom.removeNode(tile.getImage(this));
}
}
};
@@ -268,7 +261,7 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
goog.dom.appendChild(this.target, fragment);
}
this.renderedTileRange_ = tileRange;
this.renderedExtent_ = mapExtent;
this.renderedZ_ = z;
this.renderedMapResolution_ = mapResolution;