Fix ["has", "$id"] filter and "!has" filters in general

mapbox · Feb 8, 2017 · 14ec9f5 · 14ec9f5
1 parent cf031a6
commit 14ec9f5
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 2 deletions.
diff --git a/src/style-spec/feature_filter/index.js b/src/style-spec/feature_filter/index.js
@@ -34,7 +34,7 @@ function compile(filter) {
         op === 'in' ? compileInOp(filter[1], filter.slice(2)) :
         op === '!in' ? compileNegation(compileInOp(filter[1], filter.slice(2))) :
         op === 'has' ? compileHasOp(filter[1]) :
-        op === '!has' ? compileNegation(compileHasOp([filter[1]])) :
+        op === '!has' ? compileNegation(compileHasOp(filter[1])) :
         'true';
     return `(${str})`;
 }
@@ -72,7 +72,7 @@ function compileInOp(property, values) {
 }
 
 function compileHasOp(property) {
-    return `${JSON.stringify(property)} in p`;
+    return property === '$id' ? '"id" in f' : `${JSON.stringify(property)} in p`;
 }
 
 function compileNegation(expression) {

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#4235/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#4235/expected.png
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#4235/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#4235/style.json
@@ -0,0 +1,70 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {},
+            "id": "a",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                -10,
+                0
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+              "$id": "b"
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                10,
+                0
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "a",
+      "type": "circle",
+      "source": "geojson",
+      "filter": [
+        "has",
+        "$id"
+      ],
+      "paint": {
+        "circle-color": "red"
+      }
+    },
+    {
+      "id": "b",
+      "type": "circle",
+      "source": "geojson",
+      "filter": [
+        "!has",
+        "$id"
+      ],
+      "paint": {
+        "circle-color": "blue"
+      }
+    }
+  ]
+}