diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-08-23 11:30:59 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-08-26 10:30:55 -0700 |
commit | 8ac03f3870f3aa40edaaa05e1b97344a9e16733f (patch) | |
tree | f60667d1807f7070f96cff84844050a835b75b12 | |
parent | f996558bc20a0a55e5b2aa27fe93689758174c20 (diff) | |
download | qtlocation-mapboxgl-8ac03f3870f3aa40edaaa05e1b97344a9e16733f.tar.gz |
[core] Inline Source::Impl::getTile
-rw-r--r-- | src/mbgl/style/source_impl.cpp | 14 | ||||
-rw-r--r-- | src/mbgl/style/source_impl.hpp | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index 95363ca699..9cdabe847f 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -77,15 +77,6 @@ const std::map<UnwrappedTileID, RenderTile>& Source::Impl::getRenderTiles() cons return renderTiles; } -Tile* Source::Impl::getTile(const OverscaledTileID& overscaledTileID) const { - auto it = tiles.find(overscaledTileID); - if (it != tiles.end()) { - return it->second.get(); - } else { - return nullptr; - } -} - bool Source::Impl::update(const UpdateParameters& parameters) { bool allTilesUpdated = true; @@ -123,8 +114,9 @@ bool Source::Impl::update(const UpdateParameters& parameters) { tile.setNecessity(required ? Tile::Necessity::Required : Tile::Necessity::Optional); }; - auto getTileFn = [this](const OverscaledTileID& dataTileID) -> Tile* { - return getTile(dataTileID); + auto getTileFn = [this](const OverscaledTileID& tileID) -> Tile* { + auto it = tiles.find(tileID); + return it == tiles.end() ? nullptr : it->second.get(); }; auto createTileFn = [this, ¶meters](const OverscaledTileID& dataTileID) -> Tile* { std::unique_ptr<Tile> data = cache.get(dataTileID); diff --git a/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp index 64651d7e3f..2602c02eb9 100644 --- a/src/mbgl/style/source_impl.hpp +++ b/src/mbgl/style/source_impl.hpp @@ -56,8 +56,6 @@ public: const std::map<UnwrappedTileID, RenderTile>& getRenderTiles() const; - Tile* getTile(const OverscaledTileID&) const; - std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures(const QueryParameters&) const; |