diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-12 11:20:49 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-24 13:06:23 -0700 |
| commit | e706ed4b2ee8d73e17146b33b2c91463b7186777 (patch) | |
| tree | 76375e15c031d169474a864b2dfa13c7485727be /src/mbgl/annotation | |
| parent | 3d3648387bd3cfc8e330a0a729decd68ae37f96e (diff) | |
| download | qtlocation-mapboxgl-e706ed4b2ee8d73e17146b33b2c91463b7186777.tar.gz | |
[core] Avoid RenderStyle dependency in query code
Diffstat (limited to 'src/mbgl/annotation')
| -rw-r--r-- | src/mbgl/annotation/render_annotation_source.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/annotation/render_annotation_source.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp index c2e6191d1d..34fb576727 100644 --- a/src/mbgl/annotation/render_annotation_source.cpp +++ b/src/mbgl/annotation/render_annotation_source.cpp @@ -60,9 +60,9 @@ std::vector<std::reference_wrapper<RenderTile>> RenderAnnotationSource::getRende std::unordered_map<std::string, std::vector<Feature>> RenderAnnotationSource::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const RenderStyle& style, + const std::vector<const RenderLayer*>& layers, const RenderedQueryOptions& options) const { - return tilePyramid.queryRenderedFeatures(geometry, transformState, style, options); + return tilePyramid.queryRenderedFeatures(geometry, transformState, layers, options); } std::vector<Feature> RenderAnnotationSource::querySourceFeatures(const SourceQueryOptions&) const { diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index 4000c4b04a..9536b2e101 100644 --- a/src/mbgl/annotation/render_annotation_source.hpp +++ b/src/mbgl/annotation/render_annotation_source.hpp @@ -26,7 +26,7 @@ public: std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const RenderStyle& style, + const std::vector<const RenderLayer*>& layers, const RenderedQueryOptions& options) const final; std::vector<Feature> |