diff options
| author | danswick <dan.swick@gmail.com> | 2019-09-18 11:39:43 -0700 |
|---|---|---|
| committer | danswick <dan.swick@gmail.com> | 2019-09-18 11:39:43 -0700 |
| commit | 46914ecff8b3f2a1945b33358a879c2aac074f17 (patch) | |
| tree | 697cf276a43ae4c18c0ad7029c00e7d771448822 /src/mbgl/renderer/tile_pyramid.hpp | |
| parent | 47ea84ad1a5fed3431d026c5765c17c507d4623e (diff) | |
| parent | 8805defe57aa0d8886c7828d39b1b9b1f17f21b8 (diff) | |
| download | qtlocation-mapboxgl-upstream/android-docs-automation.tar.gz | |
Merge branch 'master' into android-docs-automationupstream/android-docs-automation
Diffstat (limited to 'src/mbgl/renderer/tile_pyramid.hpp')
| -rw-r--r-- | src/mbgl/renderer/tile_pyramid.hpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp index f80eb0db78..3b5cab5d6c 100644 --- a/src/mbgl/renderer/tile_pyramid.hpp +++ b/src/mbgl/renderer/tile_pyramid.hpp @@ -49,12 +49,10 @@ public: void handleWrapJump(float lng); - std::unordered_map<std::string, std::vector<Feature>> - queryRenderedFeatures(const ScreenLineString& geometry, - const TransformState& transformState, - const std::unordered_map<std::string, const RenderLayer*>&, - const RenderedQueryOptions& options, - const mat4& projMatrix) const; + std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures( + const ScreenLineString& geometry, const TransformState& transformState, + const std::unordered_map<std::string, const RenderLayer*>&, const RenderedQueryOptions& options, + const mat4& projMatrix, const mbgl::SourceFeatureState& featureState) const; std::vector<Feature> querySourceFeatures(const SourceQueryOptions&) const; |