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

harmonises iso and point renderers

Browse Source
This commit is contained in:
Francisco Dans 2015-08-20 14:23:21 +02:00
parent 595c254dbe
commit 26653967ac
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/torque/leaflet/torque.js
View File

@ -218,6 +218,7 @@ L.TorqueLayer = L.CanvasLayer.extend({
var ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
var self = this; var self = this;
if (Object.keys(this._tiles).length > 0){ if (Object.keys(this._tiles).length > 0){
if (this.options.renderer === "iso"){
var min = {q: Infinity, w: new Set(), h: new Set()}; var min = {q: Infinity, w: new Set(), h: new Set()};
for(var key in this._tiles){ for(var key in this._tiles){
var coord = this._tiles[key].coord; var coord = this._tiles[key].coord;
@ -236,7 +237,7 @@ L.TorqueLayer = L.CanvasLayer.extend({
for (var i = 0; i < this.renderer.globalGrid.length; i++){ for (var i = 0; i < this.renderer.globalGrid.length; i++){
this.renderer.globalGrid[i] = Array.apply(null, Array(this.renderer.tileDimensions.w * valsPerTile)).map(Number.prototype.valueOf,0); this.renderer.globalGrid[i] = Array.apply(null, Array(this.renderer.tileDimensions.w * valsPerTile)).map(Number.prototype.valueOf,0);
} }
}
for(t in this._tiles) { for(t in this._tiles) {
tile = this._tiles[t]; tile = this._tiles[t];
if (tile) { if (tile) {
@ -246,6 +247,9 @@ L.TorqueLayer = L.CanvasLayer.extend({
} }
pos = this.getTilePos(tile.coord); pos = this.getTilePos(tile.coord);
if(this.options.renderer !== "iso"){
ctx.setTransform(1, 0, 0, 1, pos.x, pos.y);
}
if (tile._tileCache) { if (tile._tileCache) {
// when the tile has a cached image just render it and avoid to render // when the tile has a cached image just render it and avoid to render
@ -253,13 +257,15 @@ L.TorqueLayer = L.CanvasLayer.extend({
ctx.setTransform(1, 0, 0, 1, pos.x, pos.y); ctx.setTransform(1, 0, 0, 1, pos.x, pos.y);
this.renderer._ctx.drawImage(tile._tileCache, 0, 0); this.renderer._ctx.drawImage(tile._tileCache, 0, 0);
} else { } else {
if(this.options.renderer === "iso"){
ctx.setTransform(1, 0, 0, 1, this.renderer.firstTileCoords.pos.x, this.renderer.firstTileCoords.pos.y); ctx.setTransform(1, 0, 0, 1, this.renderer.firstTileCoords.pos.x, this.renderer.firstTileCoords.pos.y);
}
this.renderer.renderTile(tile, this.key, pos); this.renderer.renderTile(tile, this.key, pos);
} }
} }
} }
if (!tile._tileCache){ if (!tile._tileCache){
this.renderer.applyFilters(); this.renderer.postProcess();
} }
} }