|
|
|
@ -188,7 +188,7 @@ var Filters = require('./torque_filters');
|
|
|
|
|
//
|
|
|
|
|
// renders all the layers (and frames for each layer) from cartocss
|
|
|
|
|
//
|
|
|
|
|
renderTile: function(tile, keys, pos) {
|
|
|
|
|
renderTile: function(tile, keys, callback) {
|
|
|
|
|
if (this._iconsToLoad > 0) {
|
|
|
|
|
this.on('allIconsLoaded', function() {
|
|
|
|
|
this.renderTile.apply(this, [tile, keys, callback]);
|
|
|
|
@ -212,13 +212,15 @@ var Filters = require('./torque_filters');
|
|
|
|
|
var frame = layer.frames()[fr];
|
|
|
|
|
var fr_sprites = sprites[frame] || (sprites[frame] = []);
|
|
|
|
|
for (var k = 0, len = keys.length; k < len; k++) {
|
|
|
|
|
this._renderTile(tile, keys[k] - frame, frame, fr_sprites, layer, undefined, pos);
|
|
|
|
|
this._renderTile(tile, keys[k] - frame, frame, fr_sprites, layer);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prof.end(true);
|
|
|
|
|
|
|
|
|
|
return callback && callback(null);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
_createCanvas: function() {
|
|
|
|
@ -262,7 +264,7 @@ var Filters = require('./torque_filters');
|
|
|
|
|
// renders a tile in the canvas for key defined in
|
|
|
|
|
// the torque tile
|
|
|
|
|
//
|
|
|
|
|
_renderTile: function(tile, key, frame_offset, sprites, shader, shaderVars, pos) {
|
|
|
|
|
_renderTile: function(tile, key, frame_offset, sprites, shader, shaderVars) {
|
|
|
|
|
if (!this._canvas) return;
|
|
|
|
|
|
|
|
|
|
var prof = Profiler.metric('torque.renderer.point.renderTile').start();
|
|
|
|
@ -292,7 +294,6 @@ var Filters = require('./torque_filters');
|
|
|
|
|
var x = tile.x[posIdx]- (sp.width >> 1) + anchor;
|
|
|
|
|
var y = tileMax - tile.y[posIdx] + anchor; // flip mercator
|
|
|
|
|
ctx.drawImage(sp, x, y - (sp.height >> 1));
|
|
|
|
|
this.fire("pointAdded", {x: pos.x + x, y: pos.y + y, value: c});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|