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

fixed cartocss updating for windshaft provider

Browse Source
This commit is contained in:
javi 2014-02-25 09:32:30 +01:00
parent 3db6aad219
commit 6eb7028a61
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/torque/gmaps/torque.js
View File

@ -252,6 +252,7 @@ GMapsTorqueLayer.prototype = _.extend({},
// provider options
var options = torque.common.TorqueLayer.optionsFromLayer(shader.findLayer({ name: 'Map' }));
this.provider.setCartoCSS && this.provider.setCartoCSS(cartocss);
if(this.provider && this.provider.setOptions(options)) {
this._reloadTiles();
}

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

@ -236,9 +236,11 @@ L.TorqueLayer = L.CanvasLayer.extend({
// provider options
var options = torque.common.TorqueLayer.optionsFromLayer(shader.findLayer({ name: 'Map' }));
this.provider.setCartoCSS && this.provider.setCartoCSS(cartocss);
if(this.provider.setOptions(options)) {
this._reloadTiles();
}
_.extend(this.options, options);
// animator options

6
lib/torque/provider.windshaft.js
View File

@ -183,6 +183,10 @@
};
},
setCartoCSS: function(c) {
this.options.cartocss = c;
},
setOptions: function(opt) {
var refresh = false;
@ -354,7 +358,7 @@
"layers": [{
"type": "torque",
"options": {
"cartocss_version": "2.1.1",
"cartocss_version": "1.0.0",
"cartocss": this.options.cartocss,
"sql": this.getSQL()
}