cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup tile removal, make unloadInvisibleTiles work again

Browse Source
This commit is contained in:
Vladimir Agafonkin 2014-03-20 14:55:58 -07:00
parent 29a0eaef0f
commit 683cc4534c
2 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/layer/tile/GridLayer.js
View File

@ -39,7 +39,6 @@ L.GridLayer = L.Layer.extend({
this._tiles = {};
this._tilesToLoad = 0;
this._tilesTotal = 0;
this._reset();
this._update();
@ -177,13 +176,7 @@ L.GridLayer = L.Layer.extend({
var zoom = this._tileZoom;
for (var z in this._levels) {
z = parseInt(z, 10);
if (z > zoom + 2 || z < zoom - 2) {
this._destroyLevel(this._levels[z]);
delete this._levels[z];
} else {
this._levels[z].el.style.zIndex = -Math.abs(zoom - z);
}
this._levels[z].el.style.zIndex = -Math.abs(zoom - z);
}
var level = this._levels[zoom],
@ -201,14 +194,12 @@ L.GridLayer = L.Layer.extend({
}
this._level = level;
return level;
},
_destroyLevel: function (level) {
for (var i in level.tiles) {
level.tiles[i].onload = null;
}
L.DomUtil.remove(level.el);
_pruneTiles: function () {
// prune tiles
},
_reset: function (e) {
@ -243,20 +234,6 @@ L.GridLayer = L.Layer.extend({
L.DomUtil.setTransform(level.el, translate, scale);
},
_clearTiles: function () {
for (var key in this._tiles) {
this.fire('tileunload', {
tile: this._tiles[key]
});
}
this._tiles = {};
this._tilesToLoad = 0;
this._tilesTotal = 0;
L.DomUtil.empty(this._tileContainer);
},
_resetGrid: function () {
var map = this._map,
crs = map.options.crs,
@ -293,9 +270,9 @@ L.GridLayer = L.Layer.extend({
var tileRange = this._getTileRange(this._map.getBounds(), this._tileZoom);
// if (this.options.unloadInvisibleTiles) {
// this._removeOtherTiles(tileRange);
// }
if (this.options.unloadInvisibleTiles) {
this._removeOtherTiles(tileRange);
}
this._addTiles(tileRange);
},
@ -338,7 +315,6 @@ L.GridLayer = L.Layer.extend({
}
this._tilesToLoad += tilesToLoad;
this._tilesTotal += tilesToLoad;
// sort tile queue to load tiles in order of their distance to center
queue.sort(function (a, b) {
@ -405,21 +381,21 @@ L.GridLayer = L.Layer.extend({
},
// remove any present tiles that are off the specified bounds
_removeOtherTiles: function (bounds) {
for (var key in this._tiles) {
if (!bounds.contains(this._keyToTileCoords(key))) {
this._removeTile(key);
_removeOtherTiles: function (tileRange) {
for (var key in this._level.tiles) {
var coords = this._keyToTileCoords(key);
if (!tileRange.contains(coords)) {
this._removeTile(key, coords.z);
}
}
},
_removeTile: function (key) {
var tile = this._tiles[key];
_removeTile: function (key, zoom) {
var tiles = this._levels[zoom].tiles,
tile = tiles[key];
L.DomUtil.remove(tile);
delete this._tiles[key];
delete tiles[key];
this.fire('tileunload', {tile: tile});
},

1
src/layer/tile/TileLayer.js
View File

@ -114,7 +114,6 @@ L.TileLayer = L.GridLayer.extend({
_onTileRemove: function (e) {
e.tile.onload = null;
e.tile.src = L.Util.emptyImageUrl;
console.log('hello');
},
_getZoomForUrl: function () {