Merge remote-tracking branch 'origin/master' into upgrade-mocka

mapbox · Oct 14, 2020 · 63b6ea7 · 63b6ea7
2 parents fe53195 + 8d79a4f
commit 63b6ea7
Show file tree

Hide file tree

Showing 4 changed files with 486 additions and 762 deletions.
diff --git a/lib/carto/tree/rule.js b/lib/carto/tree/rule.js
@@ -37,7 +37,7 @@ tree.Rule.prototype.updateID = function() {
 };
 
 tree.Rule.prototype.toString = function() {
-    return '[' + tree.Zoom.toString(this.zoom) + '] ' + this.name + ': ' + this.value;
+    return '[' + (this.zoom ? this.zoom.toString() : (new tree.Zoom()).toString()) + '] ' + this.name + ': ' + this.value;
 };
 
 tree.Rule.prototype.validate = function (env) {