diff options
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/source_impl.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/source_impl.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/style.hpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index fdacb00b4c..f83579d0d0 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -206,7 +206,7 @@ void Source::Impl::reloadTiles() { std::unordered_map<std::string, std::vector<Feature>> Source::Impl::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const QueryOptions& options) const { + const RenderedQueryOptions& options) const { std::unordered_map<std::string, std::vector<Feature>> result; if (renderTiles.empty() || geometry.empty()) { return result; diff --git a/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp index 54af93c04f..6e16a31e5a 100644 --- a/src/mbgl/style/source_impl.hpp +++ b/src/mbgl/style/source_impl.hpp @@ -24,6 +24,7 @@ class Painter; class FileSource; class TransformState; class RenderTile; +class RenderedQueryOptions; namespace algorithm { class ClipIDGenerator; @@ -32,7 +33,6 @@ class ClipIDGenerator; namespace style { class UpdateParameters; -class QueryParameters; class SourceObserver; class Source::Impl : public TileObserver, private util::noncopyable { @@ -68,7 +68,7 @@ public: std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const QueryOptions& options) const; + const RenderedQueryOptions& options) const; void setCacheSize(size_t); void onLowMemory(); diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 5b45ca27ef..ac3d83b5cd 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -505,7 +505,7 @@ RenderData Style::getRenderData(MapDebugOptions debugOptions, float angle) const std::vector<Feature> Style::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const QueryOptions& options) const { + const RenderedQueryOptions& options) const { std::unordered_set<std::string> sourceFilter; if (options.layerIDs) { diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 5246f6877d..36ccd1f30e 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -29,7 +29,7 @@ class SpriteAtlas; class LineAtlas; class RenderData; class TransformState; -class QueryOptions; +class RenderedQueryOptions; namespace style { @@ -99,8 +99,8 @@ public: std::vector<Feature> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const QueryOptions& options) const; - + const RenderedQueryOptions& options) const; + float getQueryRadius() const; void setSourceTileCacheSize(size_t); |