Fix using within expression with complex filter

src/style-spec/feature_filter/index.js

@@ -77,15 +77,13 @@ function createFilter(filter: any): FeatureFilter {
         return {filter: () => true, needGeometry: false};
     }
 
-    if (!isExpressionFilter(filter)) {
-        filter = convertFilter(filter);
-    }
+    filter = convertFilter(filter);
 
     const compiled = createExpression(filter, filterSpec);
     if (compiled.result === 'error') {
         throw new Error(compiled.value.map(err => `${err.key}: ${err.message}`).join(', '));
     } else {
-        const needGeometry = Array.isArray(filter) && filter.length !== 0 && filter[0] === 'within';
+        const needGeometry = geometryNeeded(filter);
         return {filter: (globalProperties: GlobalProperties, feature: Feature, canonical?: CanonicalTileID) => compiled.value.evaluate(globalProperties, feature, {}, canonical),
             needGeometry};
     }
@@ -96,7 +94,19 @@ function compare(a, b) {
     return a < b ? -1 : a > b ? 1 : 0;
 }
 
+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');
+    }
+    return needed;
+}
+
 function convertFilter(filter: ?Array<any>): mixed {
+    if (isExpressionFilter(filter)) return filter;
     if (!filter) return true;
     const op = filter[0];
     if (filter.length <= 1) return (op !== 'any');

src/style-spec/reference/v8.json

@@ -2443,6 +2443,9 @@
       },
       "!has": {
         "doc": "`[\"!has\", key]` `feature[key]` does not exist"
+      },
+      "within": {
+        "doc": "`[\"within\", object]` feature geometry is within object geometry"
       }
     },
     "doc": "The filter operator."

src/style-spec/validate/validate_filter.js

@@ -104,8 +104,14 @@ function validateNonExpressionFilter(options) {
             errors.push(new ValidationError(`${key}[1]`, value[1], `string expected, ${type} found`));
         }
         break;
-
+    case 'within':
+        type = getType(value[1]);
+        if (value.length !== 2) {
+            errors.push(new ValidationError(key, value, `filter array for "${value[0]}" operator must have 2 elements`));
+        } else if (type !== 'object') {
+            errors.push(new ValidationError(`${key}[1]`, value[1], `object expected, ${type} found`));
+        }
+        break;
     }
-
     return errors;
 }

test/integration/render-tests/within/within-in-complex-filter/style.json

@@ -0,0 +1,102 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "zoom": 3,
+  "center": [2.5, 2.5],
+  "sources": {
+    "points": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+              "name": "ABC"
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                  1.9775390625,
+                  2.3284603685731593
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+              "name": "ABC"
+            },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                  1.7138671875,
+                  -1.7136116598836224
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "polygon": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+              "type": "Feature",
+              "properties": {},
+              "geometry": {
+                "type": "Polygon",
+                "coordinates": [
+                  [[0, 0],
+                   [0, 5],
+                   [5, 5],
+                   [5, 0],
+                   [0, 0]]
+                ]
+              }
+            }
+          ]
+        }
+      }
+  },
+  "layers": [
+    {
+      "id": "border",
+      "type": "fill",
+      "source": "polygon",
+      "paint": {
+          "fill-color": "black",
+          "fill-opacity": 0.5
+      }
+    },
+    {
+      "id": "circle",
+      "type": "circle",
+      "source": "points",
+      "filter": ["all",  ["in", "ABC", ["get", "name"]], ["within", {
+                  "type": "Polygon",
+                  "coordinates": [
+                      [
+                          [0, 0],
+                          [0, 5],
+                          [5, 5],
+                          [5, 0],
+                          [0, 0]
+                      ]
+                    ]
+                  }]
+                ],
+      "paint": {
+        "circle-radius": 5,
+        "circle-color": "red"
+      }
+    } 
+  ]
+}