Fix qRF for several layers per bucket (internal-2047)

mapbox · Dec 9, 2024 · 8ea0639 · 8ea0639
1 parent f87d3ff
commit 8ea0639
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 1 deletion.
diff --git a/src/data/feature_index.ts b/src/data/feature_index.ts
@@ -205,7 +205,7 @@ class FeatureIndex {
         for (let l = 0; l < layerIDs.length; l++) {
             const layerId = layerIDs[l];
 
-            if (!queryLayers[layerId]) return;
+            if (!queryLayers[layerId]) continue;
             const {styleLayer, targets} = queryLayers[layerId];
 
             let featureState: FeatureState = {};

diff --git a/test/integration/query-tests/options/layers-not-first/expected.json b/test/integration/query-tests/options/layers-not-first/expected.json
@@ -0,0 +1,17 @@
+[
+  {
+    "geometry": {
+      "type": "Point",
+      "coordinates": [
+        0,
+        0
+      ]
+    },
+    "type": "Feature",
+    "properties": {
+      "key": "value"
+    },
+    "source": "geojson",
+    "state": {}
+  }
+]
diff --git a/test/integration/query-tests/options/layers-not-first/style.json b/test/integration/query-tests/options/layers-not-first/style.json
@@ -0,0 +1,46 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64,
+      "queryGeometry": [
+        32,
+        32
+      ],
+      "queryOptions": {
+        "layers": ["b"]
+      }
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Feature",
+        "geometry": {
+          "type": "Point",
+          "coordinates": [
+            0,
+            0
+          ]
+        },
+        "properties": {
+          "key": "value"
+        }
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "a",
+      "type": "circle",
+      "source": "geojson"
+    },
+    {
+      "id": "b",
+      "type": "circle",
+      "source": "geojson"
+    }
+  ]
+}