[core] Add feature state support to queryRenderedFeatures API

4 files changed, 11 insertions, 5 deletions

diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 8f624f21dc..2076c73337 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -308,7 +308,8 @@ void GeometryTile::queryRenderedFeatures(
     const TransformState& transformState,
     const std::unordered_map<std::string, const RenderLayer*>& layers,
     const RenderedQueryOptions& options,
-    const mat4& projMatrix) {
+    const mat4& projMatrix,
+    const SourceFeatureState& featureState) {
 
     if (!getData()) return;
 
@@ -327,7 +328,8 @@ void GeometryTile::queryRenderedFeatures(
                               options,
                               id.toUnwrapped(),
                               layers,
-                              queryPadding * transformState.maxPitchScaleFactor());
+                              queryPadding * transformState.maxPitchScaleFactor(),
+                              featureState);
 }
 
 void GeometryTile::querySourceFeatures(
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index ca9e33218c..4415e0a1fa 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -54,7 +54,8 @@ public:
             const TransformState&,
             const std::unordered_map<std::string, const RenderLayer*>& layers,
             const RenderedQueryOptions& options,
-            const mat4& projMatrix) override;
+            const mat4& projMatrix,
+            const SourceFeatureState& featureState) override;
 
     void querySourceFeatures(
         std::vector<Feature>& result,
diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp
index 2f342c092d..87223c7933 100644
--- a/src/mbgl/tile/tile.cpp
+++ b/src/mbgl/tile/tile.cpp
@@ -45,7 +45,8 @@ void Tile::queryRenderedFeatures(
         const TransformState&,
         const std::unordered_map<std::string, const RenderLayer*>&,
         const RenderedQueryOptions&,
-        const mat4&) {}
+        const mat4&,
+        const SourceFeatureState&) {}
 
 float Tile::getQueryPadding(const std::unordered_map<std::string, const RenderLayer*>&) {
     return 0;
diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 65bff305a3..eda4667027 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -28,6 +28,7 @@ class TileRenderData;
 class RenderedQueryOptions;
 class SourceQueryOptions;
 class CollisionIndex;
+class SourceFeatureState;
 
 namespace gfx {
 class UploadPass;
@@ -73,7 +74,8 @@ public:
             const TransformState&,
             const std::unordered_map<std::string, const RenderLayer*>&,
             const RenderedQueryOptions& options,
-            const mat4& projMatrix);
+            const mat4& projMatrix,
+            const SourceFeatureState& featureState);
 
     virtual void querySourceFeatures(
             std::vector<Feature>& result,