Allow null as a filter operand

mapbox · Feb 22, 2016 · 12c2e1f · 12c2e1f
1 parent a3a26b4
commit 12c2e1f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/lib/validate/validate_filter.js b/lib/validate/validate_filter.js
@@ -66,8 +66,8 @@ module.exports = function validateFilter(options) {
                     }));
                 } else if (type === 'string' && value[i][0] === '@') {
                     errors.push(new ValidationError(key + '[' + i + ']', value[i], 'filter value cannot be a constant'));
-                } else if (type !== 'string' && type !== 'number' && type !== 'boolean') {
-                    errors.push(new ValidationError(key + '[' + i + ']', value[i], 'string, number, or boolean expected, %s found', type));
+                } else if (type !== 'string' && type !== 'number' && type !== 'boolean' && value[i] !== null) {
+                    errors.push(new ValidationError(key + '[' + i + ']', value[i], 'string, number, boolean, or null expected, %s found', type));
                 }
             }
             break;

diff --git a/test/fixture/filters.input.json b/test/fixture/filters.input.json
@@ -124,6 +124,17 @@
         "any",
         []
       ]
+    },
+    {
+      "id": "value-null",
+      "type": "line",
+      "source": "source",
+      "source-layer": "source-layer",
+      "filter": [
+        "==",
+        "mapbox",
+        null
+      ]
     }
   ]
 }
diff --git a/test/fixture/filters.output.json b/test/fixture/filters.output.json
@@ -24,7 +24,7 @@
     "line": 59
   },
   {
-    "message": "layers[6].filter[2]: string, number, or boolean expected, array found",
+    "message": "layers[6].filter[2]: string, number, boolean, or null expected, array found",
     "line": 71
   },
   {