[core] Thread Style parameter through queryRenderedFeatures

4 files changed, 11 insertions, 1 deletions

diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index d25d93d6b8..df58294e90 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -181,6 +181,7 @@ void GeometryTile::queryRenderedFeatures(
     std::unordered_map<std::string, std::vector<Feature>>& result,
     const GeometryCoordinates& queryGeometry,
     const TransformState& transformState,
+    const style::Style& style_,
     const RenderedQueryOptions& options) {
 
     if (!featureIndex || !data) return;
@@ -193,7 +194,7 @@ void GeometryTile::queryRenderedFeatures(
                         options,
                         *data,
                         id.canonical,
-                        style,
+                        style_,
                         collisionTile.get(),
                         *this);
 }
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 6e4c29d723..807c8474de 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -55,6 +55,7 @@ public:
             std::unordered_map<std::string, std::vector<Feature>>& result,
             const GeometryCoordinates& queryGeometry,
             const TransformState&,
+            const style::Style&,
             const RenderedQueryOptions& options) override;
 
     void querySourceFeatures(
@@ -92,6 +93,8 @@ private:
     void invokePlacement();
 
     const std::string sourceID;
+
+    // TODO: remove
     style::Style& style;
 
     // Used to signal the worker that it should abandon parsing this tile as soon as possible.
diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp
index d731b8d111..ec8fe66eec 100644
--- a/src/mbgl/tile/tile.cpp
+++ b/src/mbgl/tile/tile.cpp
@@ -33,6 +33,7 @@ void Tile::queryRenderedFeatures(
         std::unordered_map<std::string, std::vector<Feature>>&,
         const GeometryCoordinates&,
         const TransformState&,
+        const style::Style&,
         const RenderedQueryOptions&) {}
 
 void Tile::querySourceFeatures(
diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 544717e2b8..dfd35cde9a 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -25,6 +25,10 @@ class PlacementConfig;
 class RenderedQueryOptions;
 class SourceQueryOptions;
 
+namespace style {
+class Style;
+} // namespace style
+
 class Tile : private util::noncopyable {
 public:
     Tile(OverscaledTileID);
@@ -53,6 +57,7 @@ public:
             std::unordered_map<std::string, std::vector<Feature>>& result,
             const GeometryCoordinates& queryGeometry,
             const TransformState&,
+            const style::Style&,
             const RenderedQueryOptions& options);
 
     virtual void querySourceFeatures(