[Pkg-javascript-commits] [SCM] Mapnik stylesheet compiler branch, upstream, updated. upstream/0.4.2+ds1-1-g4926068

David Paleino dapal at debian.org
Wed Nov 16 21:24:54 UTC 2011


The following commit has been merged in the upstream branch:
commit 492606804779c1c8723740dbc1512e5ee049858b
Author: David Paleino <dapal at debian.org>
Date:   Wed Nov 16 22:02:09 2011 +0100

    Imported Upstream version 0.4.3+ds1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c0fadd..46348fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+### 0.4.3
+
+* Fixes serialization bug with invalid selectors.
+
 ### 0.4.0
 
 * Switches text-symbolizer syntax to new-style for Mapnik 2.0
diff --git a/lib/carto/index.js b/lib/carto/index.js
index d89559e..08c8eec 100644
--- a/lib/carto/index.js
+++ b/lib/carto/index.js
@@ -1,11 +1,10 @@
 var sys = require('sys');
 var carto = {
-    version: [0, 4, 2],
+    version: [0, 4, 3],
     Parser: require('./parser').Parser,
     Renderer: require('./renderer').Renderer,
     tree: require('./tree'),
 
-
     // @TODO
     writeError: function(ctx, options) {
         var message = '';
diff --git a/lib/carto/tree/definition.js b/lib/carto/tree/definition.js
index e190d9f..3a443ab 100644
--- a/lib/carto/tree/definition.js
+++ b/lib/carto/tree/definition.js
@@ -108,7 +108,7 @@ tree.Definition.prototype.symbolizersToXML = function(env, symbolizers, zoom) {
         xml += '    <' + name + ' ';
         for (var key in attributes) {
             var x = tree.Reference.selector(attributes[key].name);
-            if (x.serialization && x.serialization === 'content') {
+            if (x && x.serialization && x.serialization === 'content') {
                 selfclosing = false;
                 tagcontent = attributes[key].eval(env).toXML(env, true);
             } else {
diff --git a/package.json b/package.json
index cbefe71..d9a2ebe 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "Konstantin Käfer",
     "Alexis Sellier <self at cloudhead.net>"
   ],
-  "version": "0.4.2",
+  "version": "0.4.3",
   "licenses": [{
     "type": "Apache"
   }],

-- 
Mapnik stylesheet compiler



More information about the Pkg-javascript-commits mailing list