[all] Push querySourceFeatures back out to Map

Once Source and RendererSource are split, Source will no longer have access to tiles.

6 files changed, 9 insertions, 11 deletions

diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index 00e10d148a..f989bc2ce6 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/tile/geojson_tile.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
-#include <mbgl/style/query.hpp>
+#include <mbgl/map/query.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/update_parameters.hpp>
 
@@ -98,7 +98,7 @@ void GeoJSONTile::setNecessity(Necessity) {}
     
 void GeoJSONTile::querySourceFeatures(
     std::vector<Feature>& result,
-    const style::SourceQueryOptions& options) {
+    const SourceQueryOptions& options) {
     
     // Ignore the sourceLayer, there is only one
     auto layer = getData()->getLayer({});
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp
index e1d269a9a7..f8cde75106 100644
--- a/src/mbgl/tile/geojson_tile.hpp
+++ b/src/mbgl/tile/geojson_tile.hpp
@@ -21,7 +21,7 @@ public:
     
     void querySourceFeatures(
         std::vector<Feature>& result,
-        const style::SourceQueryOptions&) override;
+        const SourceQueryOptions&) override;
 };
 
 } // namespace mbgl
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 6b768d9d5b..6ac4a2e3aa 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -18,7 +18,6 @@
 #include <mbgl/map/query.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/style/filter_evaluator.hpp>
-#include <mbgl/style/query.hpp>
 #include <mbgl/util/logging.hpp>
 
 #include <iostream>
@@ -191,7 +190,7 @@ void GeometryTile::queryRenderedFeatures(
 
 void GeometryTile::querySourceFeatures(
     std::vector<Feature>& result,
-    const style::SourceQueryOptions& options) {
+    const SourceQueryOptions& options) {
 
     // Data not yet available
     if (!data) {
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 8aedd67060..227e774e9d 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -19,11 +19,11 @@ class GeometryTileData;
 class FeatureIndex;
 class CollisionTile;
 class RenderLayer;
+class SourceQueryOptions;
 
 namespace style {
 class Style;
 class UpdateParameters;
-class SourceQueryOptions;
 } // namespace style
 
 class GeometryTile : public Tile, public GlyphRequestor, IconRequestor {
@@ -58,7 +58,7 @@ public:
 
     void querySourceFeatures(
         std::vector<Feature>& result,
-        const style::SourceQueryOptions&) override;
+        const SourceQueryOptions&) override;
 
     void cancel() override;
 
diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp
index 4fb8331aeb..0adc151a64 100644
--- a/src/mbgl/tile/tile.cpp
+++ b/src/mbgl/tile/tile.cpp
@@ -4,7 +4,6 @@
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/logging.hpp>
 #include <mbgl/map/query.hpp>
-#include <mbgl/style/query.hpp>
 
 namespace mbgl {
 
@@ -38,6 +37,6 @@ void Tile::queryRenderedFeatures(
 
 void Tile::querySourceFeatures(
         std::vector<Feature>&,
-        const style::SourceQueryOptions&) {}
+        const SourceQueryOptions&) {}
 
 } // namespace mbgl
diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 6c2c78967f..795fd62140 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -22,10 +22,10 @@ class TransformState;
 class TileObserver;
 class PlacementConfig;
 class RenderedQueryOptions;
+class SourceQueryOptions;
 class RenderLayer;
 
 namespace style {
-class SourceQueryOptions;
 } // namespace style
 
 class Tile : private util::noncopyable {
@@ -60,7 +60,7 @@ public:
 
     virtual void querySourceFeatures(
             std::vector<Feature>& result,
-            const style::SourceQueryOptions&);
+            const SourceQueryOptions&);
 
     void setTriedOptional();