update test to trigger the bug, fix #411, by not using simplified reg…

…ex to parse floats
mapbox · Dec 26, 2016 · 9be4e86 · 9be4e86
1 parent 40e4533
commit 9be4e86
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/lib/carto/tree/filterset.js b/lib/carto/tree/filterset.js
@@ -1,4 +1,5 @@
-var tree = require('../tree');
+var tree = require('../tree'),
+    _ = require('lodash');
 
 tree.Filterset = function Filterset() {
     this.filters = {};
@@ -100,7 +101,9 @@ tree.Filterset.prototype.addable = function(filter) {
     var key = filter.key.toString(),
         value = filter.val.toString();
 
-    if (value.match(/^[+-]?[0-9]+(\.[0-9]*)?$/)) value = parseFloat(value);
+    if (!_.isNaN(parseFloat(value))) {
+        value = parseFloat(value);
+    }
 
     switch (filter.op) {
         case '=':

diff --git a/test/rendering/issue_411.mss b/test/rendering/issue_411.mss
@@ -1,7 +1,11 @@
 #test {
     [zoom >= 3][way_pixels > 0.00000010000][way_pixels < 0.00003600000] {
-        text-face-name: "Arial";
         text-name: "[name]";
         text-size: 10;
+        [zoom >= 4] {
+          text-size: 11;
+        }
+        text-fill: #ff0000;
+        text-face-name: 'Arial';
     }
 }
diff --git a/test/rendering/issue_411.result b/test/rendering/issue_411.result
@@ -4,10 +4,16 @@
 
 
 <Style name="test" filter-mode="first">
+  <Rule>
+    <MaxScaleDenominator>50000000</MaxScaleDenominator>
+    <Filter>([way_pixels] > 1e-7) and ([way_pixels] < 0.000036)</Filter>
+    <TextSymbolizer face-name="Arial" size="11" text="[name]" fill="#ff0000"/>
+  </Rule>
   <Rule>
     <MaxScaleDenominator>100000000</MaxScaleDenominator>
+    <MinScaleDenominator>50000000</MinScaleDenominator>
     <Filter>([way_pixels] > 1e-7) and ([way_pixels] < 0.000036)</Filter>
-    <TextSymbolizer face-name="Arial" size="10" text="[name]"/>
+    <TextSymbolizer face-name="Arial" size="10" text="[name]" fill="#ff0000"/>
   </Rule>
 </Style>
 <Layer