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

improved tile loading

Browse Source
This commit is contained in:
javi 2014-02-25 08:11:16 +01:00
parent ee5cf66c12
commit c3f1918820
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/torque/gmaps/gmaps_tileloader_mixin.js
View File

@ -12,6 +12,7 @@ GMapsTileLoader.prototype = {
this._map = map;
this._projection = projection;
this._tiles = {};
this._tilesLoading = {};
this._tilesToLoad = 0;
this._updateTiles = this._updateTiles.bind(this);
this._listeners = [];
@ -100,15 +101,23 @@ GMapsTileLoader.prototype = {
_removeTile: function (key) {
this.onTileRemoved && this.onTileRemoved(this._tiles[key]);
delete this._tiles[key];
delete this._tilesLoading[key];
},
_tileKey: function(tilePoint) {
return tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom;
},
_tileShouldBeLoaded: function (tilePoint) {
return !((tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom) in this._tiles);
var k = this._tileKey(tilePoint);
return !(k in this._tiles) && !(k in this._tilesLoading);
},
_tileLoaded: function(tilePoint, tileData) {
this._tilesToLoad--;
this._tiles[tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom] = tileData;
var k = tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom
this._tiles[k] = tileData;
delete this._tilesLoading[k];
if(this._tilesToLoad === 0) {
this.onTilesLoaded && this.onTilesLoaded();
}
@ -182,11 +191,17 @@ GMapsTileLoader.prototype = {
this._tilesToLoad += tilesToLoad;
if (this.onTileAdded) {
for (i = 0; i < tilesToLoad; i++) {
this.onTileAdded(queue[i]);
var t = queue[i];
var k = this._tileKey(t);
this._tilesLoading[k] = t;
// events
if (this.onTileAdded) {
this.onTileAdded(t);
}
}
this.onTilesLoading && this.onTilesLoading();
}
}

19
lib/torque/leaflet/leaflet_tileloader_mixin.js
View File

@ -4,6 +4,7 @@ L.Mixin.TileLoader = {
_initTileLoader: function() {
this._tiles = {}
this._tilesLoading = {};
this._tilesToLoad = 0;
this._map.on({
'moveend': this._updateTiles
@ -77,15 +78,23 @@ L.Mixin.TileLoader = {
_removeTile: function (key) {
this.fire('tileRemoved', this._tiles[key]);
delete this._tiles[key];
delete this._tilesLoading[key];
},
_tileKey: function(tilePoint) {
return tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom;
},
_tileShouldBeLoaded: function (tilePoint) {
return !((tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom) in this._tiles);
var k = this._tileKey(tilePoint);
return !(k in this._tiles) && !(k in this._tilesLoading);
},
_tileLoaded: function(tilePoint, tileData) {
this._tilesToLoad--;
this._tiles[tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom] = tileData;
var k = tilePoint.x + ':' + tilePoint.y + ':' + tilePoint.zoom
this._tiles[k] = tileData;
delete this._tilesLoading[k];
if(this._tilesToLoad === 0) {
this.fire("tilesLoaded");
}
@ -129,8 +138,12 @@ L.Mixin.TileLoader = {
this._tilesToLoad += tilesToLoad;
for (i = 0; i < tilesToLoad; i++) {
this.fire('tileAdded', queue[i]);
var t = queue[i];
var k = this._tileKey(t);
this._tilesLoading[k] = t;
this.fire('tileAdded', t);
}
this.fire("tilesLoading");
}
}