Compare commits

...

6 Commits

Author SHA1 Message Date
Sandro Santilli 5fd9f02b7d Update version to 0.8.2-cdb-dev-3
12 years ago
Sandro Santilli e990d04bc7 Catch parser exception in the correct scope
12 years ago
Sandro Santilli 692e11da37 Set version to "0.8.2-cdb-dev-2"
12 years ago
Sandro Santilli 07ca2dad27 Catch parser exceptions (it does throw!)
12 years ago
Sandro Santilli a04ad1c388 Set version to 0.8.2-cdb-dev
12 years ago
Sandro Santilli 92a170d08d Accept mapnik-reference ~4.0.3 too
12 years ago

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

@ -1,6 +1,6 @@
{ {
"name": "carto", "name": "carto",
"version": "0.8.1", "version": "0.8.2-cdb-dev-3",
"description": "Mapnik Stylesheet Compiler", "description": "Mapnik Stylesheet Compiler",
"url": "https://github.com/mapbox/carto", "url": "https://github.com/mapbox/carto",
"repositories": [{ "repositories": [{
@ -36,7 +36,7 @@
}, },
"dependencies": { "dependencies": {
"underscore": "~1.3.3", "underscore": "~1.3.3",
"mapnik-reference": "~3.1.0", "mapnik-reference": "~3.1.0 || ~4.0.3",
"xml2js": "~0.1.13" "xml2js": "~0.1.13"
}, },
"devDependencies": { "devDependencies": {

Loading…
Cancel
Save