generate minimal cartocss, closes #37

This commit is contained in:
javi 2014-02-27 08:16:38 +01:00
parent de2f1f972a
commit ff972a36b0

View File

@ -183,8 +183,18 @@
}; };
}, },
setCartoCSS: function(c) { /*setCartoCSS: function(c) {
this.options.cartocss = c; this.options.cartocss = c;
},*/
setSteps: function(steps, opt) {
opt = opt || {};
if (this.options.steps !== steps) {
this.options.steps = steps;
this.options.step = (this.options.end - this.options.start)/this.getSteps();
this.options.step = this.options.step || 1;
if (!opt.silent) this.reload();
}
}, },
setOptions: function(opt) { setOptions: function(opt) {
@ -343,6 +353,21 @@
return h; return h;
}, },
_generateCartoCSS: function() {
var attr = {
'-torque-frame-count': this.options.steps,
'-torque-resolution': this.options.resolution,
'-torque-aggregation-function': "'" + this.options.countby + "'",
'-torque-time-attribute': "'" + this.options.column + "'",
'-torque-data-aggregation': this.options.cumulative ? 'cumulative': 'linear',
};
var st = 'Map{';
for (var k in attr) {
st += k + ":" + attr[k] + ";";
}
return st + "}";
},
_fetchMap: function(callback) { _fetchMap: function(callback) {
var self = this; var self = this;
var layergroup = {}; var layergroup = {};
@ -361,7 +386,7 @@
"type": "torque", "type": "torque",
"options": { "options": {
"cartocss_version": "1.0.0", "cartocss_version": "1.0.0",
"cartocss": this.options.cartocss, "cartocss": this._generateCartoCSS(),
"sql": this.getSQL() "sql": this.getSQL()
} }
}] }]