Fix filter operator checking for nested condition

mapbox · Apr 22, 2020 · 69b4c2e · 69b4c2e
1 parent 12fe07b
commit 69b4c2e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/style-spec/feature_filter/index.js b/src/style-spec/feature_filter/index.js
@@ -96,13 +96,11 @@ function compare(a, b) {
 
 function geometryNeeded(filter) {
     if (!Array.isArray(filter)) return false;
-    let needed = false;
-    for (let index = 0; index < filter.length; index++) {
-        const val = filter[index];
-        const op = Array.isArray(val) ? val[0] : val;
-        needed = needed || (op === 'within');
+    if (filter[0] === 'within') return true;
+    for (let index = 1; index < filter.length; index++) {
+        if (geometryNeeded(filter[index])) return true;
     }
-    return needed;
+    return false;
 }
 
 function convertFilter(filter: ?Array<any>): mixed {

diff --git a/test/integration/render-tests/within/within-in-complex-filter/style.json b/test/integration/render-tests/within/within-in-complex-filter/style.json
@@ -17,7 +17,7 @@
           {
             "type": "Feature",
             "properties": {
-              "name": "ABC"
+              "number": [5]
             },
             "geometry": {
               "type": "Point",
@@ -30,7 +30,7 @@
           {
             "type": "Feature",
             "properties": {
-              "name": "ABC"
+              "number": [5]
             },
             "geometry": {
               "type": "Point",
@@ -80,7 +80,7 @@
       "id": "circle",
       "type": "circle",
       "source": "points",
-      "filter": ["all",  ["in", "ABC", ["get", "name"]], ["within", {
+      "filter": ["all",  ["in", 5, ["get", "number"]], ["==", ["within", {
                   "type": "Polygon",
                   "coordinates": [
                       [
@@ -91,7 +91,7 @@
                           [0, 0]
                       ]
                     ]
-                  }]
+                  }], true]
                 ],
       "paint": {
         "circle-radius": 5,