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

error management, an exception is thrown when there is a parse error

Browse Source
This commit is contained in:
javi 2013-07-29 13:55:31 +02:00
parent bc9d67b328
commit 4f963b8bb3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/carto/renderer_js.js
View File

@ -131,7 +131,8 @@ CartoCSS.renderers['canvas-2d'] = {
'line-opacity': 'globalAlpha', 'line-opacity': 'globalAlpha',
// polygon // polygon
'polygon-fill': 'fillStyle', 'polygon-fill': 'fillStyle',
'polygon-opacity': 'globalAlpha' 'polygon-opacity': 'globalAlpha',
'comp-op': 'comp-op'
}, },
transform: function(src) { transform: function(src) {
@ -218,6 +219,9 @@ CartoCSS.prototype = {
setStyle: function(style) { setStyle: function(style) {
var layers = this.parse(style); var layers = this.parse(style);
if(!layers) {
throw new Error(this.parse_env.errors);
}
this.layers = layers.map(function(shader) { this.layers = layers.map(function(shader) {
return new CartoCSS.Layer(shader); return new CartoCSS.Layer(shader);
}); });
@ -229,6 +233,7 @@ CartoCSS.prototype = {
_createFn: function(ops) { _createFn: function(ops) {
var body = ops.join('\n'); var body = ops.join('\n');
console.log(body);
return Function("data","ctx", "var _value = null; " + body + "; return _value; "); return Function("data","ctx", "var _value = null; " + body + "; return _value; ");
}, },