Compare commits

...

2 Commits

Author SHA1 Message Date
Sandro Santilli 6a040acd07 Catch parser exception in the correct scope
12 years ago
Sandro Santilli 381806c7c7 Catch parser exceptions (it does throw!)
12 years ago

@ -29,14 +29,14 @@ carto.Renderer.prototype.render = function render(m, callback) {
var output = [];
// Transform stylesheets into rulesets.
try { // Parser may throw
var rulesets = _(m.Stylesheet).chain()
.map(function(s) {
// Passing the environment from stylesheet to stylesheet,
// allows frames and effects to be maintained.
env = _(env).extend({filename:s.id});
// @TODO try/catch?
var time = +new Date(),
var time = +new Date();
root = (carto.Parser(env)).parse(s.data);
if (env.benchmark)
console.warn('Parsing time: ' + (new Date() - time) + 'ms');
@ -44,6 +44,7 @@ carto.Renderer.prototype.render = function render(m, callback) {
})
.flatten()
.value();
} catch (err) { callback(err, null); return; }
// Iterate through layers and create styles custom-built
// for each of them, and apply those styles to the layers.

Loading…
Cancel
Save