summaryrefslogtreecommitdiff
path: root/src/mbgl/annotation
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-05-29 14:43:35 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-06-05 19:38:08 -0700
commit32589c271c6f4885dadb6291c4bf637b72659a9f (patch)
tree52e71d7222aa96dc14d2774e6acd8676b10b1183 /src/mbgl/annotation
parent41d2496c07e54a8dad70aea4610c7200711983e5 (diff)
downloadqtlocation-mapboxgl-32589c271c6f4885dadb6291c4bf637b72659a9f.tar.gz
[core] Thread Style parameter through queryRenderedFeatures
Diffstat (limited to 'src/mbgl/annotation')
-rw-r--r--src/mbgl/annotation/render_annotation_source.cpp7
-rw-r--r--src/mbgl/annotation/render_annotation_source.hpp1
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp
index 718f7a16e6..dfb78fb8b1 100644
--- a/src/mbgl/annotation/render_annotation_source.cpp
+++ b/src/mbgl/annotation/render_annotation_source.cpp
@@ -59,9 +59,10 @@ void RenderAnnotationSource::reloadTiles() {
std::unordered_map<std::string, std::vector<Feature>>
RenderAnnotationSource::queryRenderedFeatures(const ScreenLineString& geometry,
- const TransformState& transformState,
- const RenderedQueryOptions& options) const {
- return tilePyramid.queryRenderedFeatures(geometry, transformState, options);
+ const TransformState& transformState,
+ const style::Style& style,
+ const RenderedQueryOptions& options) const {
+ return tilePyramid.queryRenderedFeatures(geometry, transformState, style, 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 980d9d27e9..c93cfbd7d7 100644
--- a/src/mbgl/annotation/render_annotation_source.hpp
+++ b/src/mbgl/annotation/render_annotation_source.hpp
@@ -37,6 +37,7 @@ public:
std::unordered_map<std::string, std::vector<Feature>>
queryRenderedFeatures(const ScreenLineString& geometry,
const TransformState& transformState,
+ const style::Style& style,
const RenderedQueryOptions& options) const final;
std::vector<Feature>