|
|
|
@ -57,6 +57,12 @@ var CartoDatasource = require('./datasource');
|
|
|
|
|
return COMP_OP_TO_CANVAS[compop] || compop;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Take an input cartocss that may contain comments and remove them
|
|
|
|
|
var COMMENTS_RE = /\/\*.*?\*\/\n?/mg;
|
|
|
|
|
function stripComments(cartocss) {
|
|
|
|
|
return cartocss.replace(COMMENTS_RE, '');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// this renderer just render points depending of the value
|
|
|
|
|
//
|
|
|
|
@ -73,8 +79,7 @@ var CartoDatasource = require('./datasource');
|
|
|
|
|
this._icons = {};
|
|
|
|
|
this._iconsToLoad = 0;
|
|
|
|
|
this._filters = new Filters(this._canvas, {canvasClass: options.canvasClass});
|
|
|
|
|
this.style = this.options.cartocss || DEFAULT_CARTOCSS;
|
|
|
|
|
this.setCartoCSS(this.style);
|
|
|
|
|
this.setCartoCSS(this.options.cartocss || DEFAULT_CARTOCSS);
|
|
|
|
|
this.TILE_SIZE = 256;
|
|
|
|
|
this._style = null;
|
|
|
|
|
this._gradients = {};
|
|
|
|
@ -116,11 +121,11 @@ var CartoDatasource = require('./datasource');
|
|
|
|
|
setCartoCSS: function(cartocss, callback) {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
this.style = cartocss;
|
|
|
|
|
this.style = stripComments(cartocss);
|
|
|
|
|
|
|
|
|
|
if (PointRenderer.isTurboCarto(cartocss)) {
|
|
|
|
|
if (PointRenderer.isTurboCarto(this.style)) {
|
|
|
|
|
var datasource = new CartoDatasource(self.layer._tiles);
|
|
|
|
|
turbocarto(cartocss, datasource, function (err, parsedCartoCSS) {
|
|
|
|
|
turbocarto(this.style, datasource, function (err, parsedCartoCSS) {
|
|
|
|
|
if (err) {
|
|
|
|
|
return callback(err, null);
|
|
|
|
|
}
|
|
|
|
@ -131,7 +136,7 @@ var CartoDatasource = require('./datasource');
|
|
|
|
|
callback && callback();
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
self.setShader(new carto.RendererJS().render(cartocss));
|
|
|
|
|
self.setShader(new carto.RendererJS().render(this.style));
|
|
|
|
|
callback && callback();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|