diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-25 12:56:59 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-02 08:45:09 -0700 |
| commit | c2b00378b78b55d50968a9b11ed75bb4edf62ec9 (patch) | |
| tree | 12a164d821dcdeb84d8a88dc231b3f2f9bef8ffd /src/mbgl/style | |
| parent | a2350320988bd881e261f92930b2d3359ff2071e (diff) | |
| download | qtlocation-mapboxgl-c2b00378b78b55d50968a9b11ed75bb4edf62ec9.tar.gz | |
[all] Push querySourceFeatures back out to Map
Once Source and RendererSource are split, Source will no longer have access to tiles.
Diffstat (limited to 'src/mbgl/style')
| -rw-r--r-- | src/mbgl/style/source.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/style/source_impl.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/style/source_impl.hpp | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index f10fc6916b..51863f8eba 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -22,9 +22,5 @@ optional<Range<uint8_t>> Source::getZoomRange() const { return baseImpl->getZoomRange(); } -std::vector<Feature> Source::querySourceFeatures(const SourceQueryOptions& options) { - return baseImpl->querySourceFeatures(options); -} - } // namespace style } // namespace mbgl diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index 7a65dd1ded..19138bd781 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -10,7 +10,6 @@ #include <mbgl/util/tile_cover.hpp> #include <mbgl/util/enum.hpp> #include <mbgl/map/query.hpp> -#include <mbgl/style/query.hpp> #include <mbgl/algorithm/update_renderables.hpp> #include <mbgl/algorithm/generate_clip_ids.hpp> diff --git a/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp index 387428ec59..132d1b97f8 100644 --- a/src/mbgl/style/source_impl.hpp +++ b/src/mbgl/style/source_impl.hpp @@ -7,7 +7,7 @@ #include <mbgl/tile/tile.hpp> #include <mbgl/tile/tile_cache.hpp> #include <mbgl/style/types.hpp> -#include <mbgl/style/query.hpp> +#include <mbgl/map/query.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/mat4.hpp> |