diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-24 15:58:52 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-24 15:58:52 -0400 |
| commit | 3dec4933a9525b74c06d739adc4fdd9050b3f25f (patch) | |
| tree | a28f772fabbb9ef5ccf95f56131ff5420f256add /include | |
| parent | 9b6cff43011f7a9bb8ff19a28aa549126e96e160 (diff) | |
| parent | 8a19896c3a0e450ba498281b8879eb86060fa0cb (diff) | |
| download | qtlocation-mapboxgl-3dec4933a9525b74c06d739adc4fdd9050b3f25f.tar.gz | |
Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
Conflicts:
common/headless_view.cpp
test/headless.cpp
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/source.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/map/tile.hpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp index 4bc4c86dd0..cb069db272 100644 --- a/include/mbgl/map/source.hpp +++ b/include/mbgl/map/source.hpp @@ -44,7 +44,8 @@ public: private: bool findLoadedChildren(const Tile::ID& id, int32_t maxCoveringZoom, std::forward_list<Tile::ID>& retain); bool findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::forward_list<Tile::ID>& retain); - std::forward_list<Tile::ID> covering_tiles(const TransformState &state, int32_t clamped_zoom, const box& points); + int32_t coveringZoomLevel(const TransformState&) const; + std::forward_list<Tile::ID> coveringTiles(const TransformState&) const; bool updateTiles(Map &map); diff --git a/include/mbgl/map/tile.hpp b/include/mbgl/map/tile.hpp index 24845c81a0..75ced7e384 100644 --- a/include/mbgl/map/tile.hpp +++ b/include/mbgl/map/tile.hpp @@ -16,6 +16,7 @@ namespace mbgl { class TileData; +struct box; struct ClipID { inline ClipID() {} @@ -68,6 +69,8 @@ public: bool isChildOf(const Tile::ID &id) const; }; + static std::forward_list<Tile::ID> cover(int8_t z, const box& bounds); + public: explicit Tile(const ID& id); |