diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-30 13:58:59 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-05 19:38:08 -0700 |
| commit | 74af076d405a089fac70a47e41fe92d04d97fc50 (patch) | |
| tree | 29e4a76538da9a9455f711a25e7d5ddc1dece625 /src/mbgl/annotation | |
| parent | 1cf46d93b944095726396acf84649519e2fd96ad (diff) | |
| download | qtlocation-mapboxgl-74af076d405a089fac70a47e41fe92d04d97fc50.tar.gz | |
[core] Split RenderStyle from Style
Diffstat (limited to 'src/mbgl/annotation')
| -rw-r--r-- | src/mbgl/annotation/render_annotation_source.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/annotation/render_annotation_source.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp index dce2914e7f..4618761273 100644 --- a/src/mbgl/annotation/render_annotation_source.cpp +++ b/src/mbgl/annotation/render_annotation_source.cpp @@ -59,7 +59,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderAnnotationSource::getRenderTiles() std::unordered_map<std::string, std::vector<Feature>> RenderAnnotationSource::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const style::Style& style, + const RenderStyle& style, const RenderedQueryOptions& options) const { return tilePyramid.queryRenderedFeatures(geometry, transformState, style, options); } diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index ed30e62381..e0c9018e17 100644 --- a/src/mbgl/annotation/render_annotation_source.hpp +++ b/src/mbgl/annotation/render_annotation_source.hpp @@ -29,7 +29,7 @@ public: std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const style::Style& style, + const RenderStyle& style, const RenderedQueryOptions& options) const final; std::vector<Feature> |