From e706ed4b2ee8d73e17146b33b2c91463b7186777 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Sat, 12 Aug 2017 11:20:49 -0700 Subject: [core] Avoid RenderStyle dependency in query code --- src/mbgl/annotation/render_annotation_source.cpp | 4 ++-- src/mbgl/annotation/render_annotation_source.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mbgl/annotation') 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> RenderAnnotationSource::getRende std::unordered_map> RenderAnnotationSource::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const RenderStyle& style, + const std::vector& layers, const RenderedQueryOptions& options) const { - return tilePyramid.queryRenderedFeatures(geometry, transformState, style, options); + return tilePyramid.queryRenderedFeatures(geometry, transformState, layers, options); } std::vector 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> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const RenderStyle& style, + const std::vector& layers, const RenderedQueryOptions& options) const final; std::vector -- cgit v1.2.1