fix #471 regression, correct fix for #411 and amend test case to test…

… for strings that begin with a number, but shouldn't be treated as one
mapbox · May 1, 2017 · 81c4e1d · 81c4e1d
1 parent 862d639
commit 81c4e1d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/lib/carto/tree/filterset.js b/lib/carto/tree/filterset.js
@@ -1,5 +1,4 @@
-var tree = require('../tree'),
-    _ = require('lodash');
+var tree = require('../tree');
 
 tree.Filterset = function Filterset() {
     this.filters = {};
@@ -102,7 +101,7 @@ tree.Filterset.prototype.addable = function(filter) {
         value = filter.val.toString(),
         valueIsNull = filter.val.is == 'keyword' && value == 'null';
 
-    if (!_.isNaN(parseFloat(value))) {
+    if (value.match(/^[+-]?[0-9]+(\.[0-9]*)?([e|E][+-]?[0-9]+)?$/)) {
         value = parseFloat(value);
     }
 

diff --git a/test/rendering/issue_411.mss b/test/rendering/issue_411.mss
@@ -8,4 +8,10 @@
         text-fill: #ff0000;
         text-face-name: 'Arial';
     }
+    [zoom >= 3][render = '1_outline'] {
+        text-name: "[name]";
+        text-size: 12;
+        text-fill: #ff0000;
+        text-face-name: 'Arial';
+    }
 }
diff --git a/test/rendering/issue_411.result b/test/rendering/issue_411.result
@@ -15,6 +15,11 @@
     <Filter>([way_pixels] > 1e-7) and ([way_pixels] < 0.000036)</Filter>
     <TextSymbolizer face-name="Arial" size="10" text="[name]" fill="#ff0000"/>
   </Rule>
+  <Rule>
+    <MaxScaleDenominator>100000000</MaxScaleDenominator>
+    <Filter>([render] = '1_outline')</Filter>
+    <TextSymbolizer face-name="Arial" size="12" text="[name]" fill="#ff0000"/>
+  </Rule>
 </Style>
 <Layer
       name="test"