Make "to-number" of null behave as documented

mapbox · Sep 12, 2018 · a1dca3c · a1dca3c
1 parent bb5806e
commit a1dca3c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/style-spec/expression/definitions/coercion.js b/src/style-spec/expression/definitions/coercion.js
@@ -90,7 +90,7 @@ class Coercion implements Expression {
             let value = null;
             for (const arg of this.args) {
                 value = arg.evaluate(ctx);
-                if (value === null) continue;
+                if (value === null) return 0;
                 const num = Number(value);
                 if (isNaN(num)) continue;
                 return num;

diff --git a/test/integration/expression-tests/to-number/2-ary/test.json b/test/integration/expression-tests/to-number/2-ary/test.json
@@ -23,11 +23,11 @@
       1,
       6.02e-23,
       -1,
+      0,
       -1,
       -1,
-      -1,
-      -1,
-      {"error": "Could not convert \"bad fallback\" to number."}
+      0,
+      0
     ],
     "serialized": ["to-number", ["get", "x"], ["get", "y"]]
   }

diff --git a/test/integration/expression-tests/to-number/basic/test.json b/test/integration/expression-tests/to-number/basic/test.json
@@ -21,7 +21,7 @@
       1,
       6.02e-23,
       {"error": "Could not convert \"Not a number\" to number."},
-      {"error": "Could not convert null to number."},
+      0,
       {"error": "Could not convert [1,2] to number."},
       {"error": "Could not convert {\"y\":1} to number."}
     ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,11 +23,11 @@ @@
 ,
 .02e-23,
           -1,
+,
           -1,
           -1,
-          -1,
-          -1,
-          {"error": "Could not convert \"bad fallback\" to number."}
+,
         ],
         "serialized": ["to-number", ["get", "x"], ["get", "y"]]
       }
@@ Expand Down @@