Merge

CHANGELOG.md

@@ -1,16 +1,26 @@
 ## Changelog
 
-## 0.9.0
+## 0.8.0
 
 * Adds the modulus operator `%` as an option
 * Adds a new field-type like `[FIELD]` instead of "[FIELD"
-
-### 0.8.0
-
 * Supports function syntax for transforms, optionally with variables and arguments.
 
+### 0.7.1
+
+* Updated mapnik-reference to `~2.2.1`
+
+* Added support for `status` parameter on layers.
+
+* Command line `carto` program gained `--nosymlink` option to pass to millstone to use absolute paths instead of symlinking files.
+
+* Removed unsupported mixin code.
+>>>>>>> b165c2080d0b876278222078fa322450e148cc41
+
 ### 0.7.0
 
+* Updated mapnik-reference to `~2.1.0`
+
 * Support an `opacity` property on any style that is a style-level property
 
 ### 0.6.0

lib/carto/tree/layer.js

@@ -2,7 +2,6 @@
 
 tree.Layer = function Layer(obj) {
     this.name = obj.name;
-    if (typeof obj.status === 'undefined') obj.status = true;
     this.status = obj.status;
     this.styles = obj.styles;
     this.properties = obj.properties  || {};
@@ -25,7 +24,7 @@ tree.Layer.prototype.toXML = function() {
     return '<Layer' +
         ' name="' + this.name + '"\n' +
         prop_string +
-        '  status="' + this.status + '"\n' +
+        ((typeof this.status === 'undefined') ? '' : '  status="' + this.status + '"\n') +
         '  srs="' + this.srs + '">\n    ' +
         this.styles.reverse().map(function(s) {
             return '<StyleName>' + s + '</StyleName>';