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

build

Browse Source
This commit is contained in:
Carlos Matallín 2017-11-14 12:12:47 +01:00
parent 9c9c7253ba
commit c3f25b08de
4 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dist/torque.full.js vendored
View File

File diff suppressed because one or more lines are too long

50
dist/torque.full.uncompressed.js vendored
View File

@ -1774,20 +1774,24 @@ GMapsTorqueLayer.prototype = torque.extend({},
// for each tile shown on the map request the data // for each tile shown on the map request the data
onTileAdded: function(t) { onTileAdded: function(t) {
var self = this; var self = this;
var successCallback = function (tileData) { var callback = function (tileData, error) {
// don't load tiles that are not being shown // don't load tiles that are not being shown
if (t.zoom !== self.map.getZoom()) return; if (t.zoom !== self.map.getZoom()) return;
self._tileLoaded(t, tileData); self._tileLoaded(t, tileData);
self.fire('tileLoaded');
if (tileData) { if (tileData) {
self.redraw(); self.redraw();
} }
};
var errorCallback = function (error) { self.fire('tileLoaded');
self.fire('tileError', error);
if (error) {
self.fire('tileError', error);
}
} }
this.provider.getTileData(t, t.zoom, successCallback, errorCallback); this.provider.getTileData(t, t.zoom, callback);
}, },
clear: function() { clear: function() {
@ -2669,31 +2673,27 @@ L.TorqueLayer = L.CanvasLayer.extend({
// for each tile shown on the map request the data // for each tile shown on the map request the data
this.on('tileAdded', function(t) { this.on('tileAdded', function(t) {
var callback = function (tileData, error) { var callback = function (tileData, error) {
self._onTileAdded(t, tileData); // don't load tiles that are not being shown
if (t.zoom !== self._map.getZoom()) return;
self._tileLoaded(t, tileData);
self._clearTileCaches();
if (tileData) {
self.redraw();
}
self.fire('tileLoaded');
if (error) { if (error) {
self.fire('tileError', error); self.fire('tileError', error);
} }
self.fire('tileLoaded');
}; };
var tileData = this.provider.getTileData(t, t.zoom, callback); var tileData = this.provider.getTileData(t, t.zoom, callback);
}, this); }, this);
}, },
_onTileAdded: function(t, tileData) {
// don't load tiles that are not being shown
if (t.zoom !== this._map.getZoom()) return;
this._tileLoaded(t, tileData);
this._clearTileCaches();
if (tileData) {
this.redraw();
}
},
_clearTileCaches: function() { _clearTileCaches: function() {
var t, tile; var t, tile;
for(t in this._tiles) { for(t in this._tiles) {
@ -5548,11 +5548,11 @@ var Profiler = require('../profiler');
return null; return null;
}, },
getTileData: function(coord, zoom, successCallback, errorCallback) { getTileData: function(coord, zoom, callback) {
if(!this._ready) { if(!this._ready) {
this._tileQueue.push([coord, zoom, successCallback, errorCallback]); this._tileQueue.push([coord, zoom, callback]);
} else { } else {
this._getTileData(coord, zoom, successCallback, errorCallback); this._getTileData(coord, zoom, callback);
} }
}, },
@ -5601,7 +5601,7 @@ var Profiler = require('../profiler');
} }
} else { } else {
Profiler.metric('torque.provider.windshaft.tile.error').inc(); Profiler.metric('torque.provider.windshaft.tile.error').inc();
successCallback(null); callback(null);
} }
}); });
}, },

8
dist/torque.js vendored
View File

File diff suppressed because one or more lines are too long

50
dist/torque.uncompressed.js vendored
View File

@ -1781,20 +1781,24 @@ GMapsTorqueLayer.prototype = torque.extend({},
// for each tile shown on the map request the data // for each tile shown on the map request the data
onTileAdded: function(t) { onTileAdded: function(t) {
var self = this; var self = this;
var successCallback = function (tileData) { var callback = function (tileData, error) {
// don't load tiles that are not being shown // don't load tiles that are not being shown
if (t.zoom !== self.map.getZoom()) return; if (t.zoom !== self.map.getZoom()) return;
self._tileLoaded(t, tileData); self._tileLoaded(t, tileData);
self.fire('tileLoaded');
if (tileData) { if (tileData) {
self.redraw(); self.redraw();
} }
};
var errorCallback = function (error) { self.fire('tileLoaded');
self.fire('tileError', error);
if (error) {
self.fire('tileError', error);
}
} }
this.provider.getTileData(t, t.zoom, successCallback, errorCallback); this.provider.getTileData(t, t.zoom, callback);
}, },
clear: function() { clear: function() {
@ -2676,31 +2680,27 @@ L.TorqueLayer = L.CanvasLayer.extend({
// for each tile shown on the map request the data // for each tile shown on the map request the data
this.on('tileAdded', function(t) { this.on('tileAdded', function(t) {
var callback = function (tileData, error) { var callback = function (tileData, error) {
self._onTileAdded(t, tileData); // don't load tiles that are not being shown
if (t.zoom !== self._map.getZoom()) return;
self._tileLoaded(t, tileData);
self._clearTileCaches();
if (tileData) {
self.redraw();
}
self.fire('tileLoaded');
if (error) { if (error) {
self.fire('tileError', error); self.fire('tileError', error);
} }
self.fire('tileLoaded');
}; };
var tileData = this.provider.getTileData(t, t.zoom, callback); var tileData = this.provider.getTileData(t, t.zoom, callback);
}, this); }, this);
}, },
_onTileAdded: function(t, tileData) {
// don't load tiles that are not being shown
if (t.zoom !== this._map.getZoom()) return;
this._tileLoaded(t, tileData);
this._clearTileCaches();
if (tileData) {
this.redraw();
}
},
_clearTileCaches: function() { _clearTileCaches: function() {
var t, tile; var t, tile;
for(t in this._tiles) { for(t in this._tiles) {
@ -5555,11 +5555,11 @@ var Profiler = require('../profiler');
return null; return null;
}, },
getTileData: function(coord, zoom, successCallback, errorCallback) { getTileData: function(coord, zoom, callback) {
if(!this._ready) { if(!this._ready) {
this._tileQueue.push([coord, zoom, successCallback, errorCallback]); this._tileQueue.push([coord, zoom, callback]);
} else { } else {
this._getTileData(coord, zoom, successCallback, errorCallback); this._getTileData(coord, zoom, callback);
} }
}, },
@ -5608,7 +5608,7 @@ var Profiler = require('../profiler');
} }
} else { } else {
Profiler.metric('torque.provider.windshaft.tile.error').inc(); Profiler.metric('torque.provider.windshaft.tile.error').inc();
successCallback(null); callback(null);
} }
}); });
}, },