diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-17 15:52:39 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-17 15:52:39 -0700 |
commit | 9ed0ca59832ed59ea8f391a8e1db1c6b9406b453 (patch) | |
tree | f9360ef8da3fc9c015eaf6e773be13e64f8b10ac /include/mbgl | |
parent | 3141b8b1f744f414da28d73a1a695e113a3d06f2 (diff) | |
download | qtlocation-mapboxgl-9ed0ca59832ed59ea8f391a8e1db1c6b9406b453.tar.gz |
pass SourceInfo object to TileData so that we can not skip buckets that appear later than the source maxzoom
Diffstat (limited to 'include/mbgl')
-rw-r--r-- | include/mbgl/map/raster_tile_data.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/map/tile_data.hpp | 8 | ||||
-rw-r--r-- | include/mbgl/map/vector_tile_data.hpp | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/include/mbgl/map/raster_tile_data.hpp b/include/mbgl/map/raster_tile_data.hpp index 976faa91bc..23f0979727 100644 --- a/include/mbgl/map/raster_tile_data.hpp +++ b/include/mbgl/map/raster_tile_data.hpp @@ -12,7 +12,7 @@ class RasterTileData : public TileData { friend class TileParser; public: - RasterTileData(Tile::ID id, Map &map, const std::string url); + RasterTileData(Tile::ID id, Map &map, const SourceInfo &source); ~RasterTileData(); virtual void parse(); diff --git a/include/mbgl/map/tile_data.hpp b/include/mbgl/map/tile_data.hpp index a4b73c339f..416a29d2a5 100644 --- a/include/mbgl/map/tile_data.hpp +++ b/include/mbgl/map/tile_data.hpp @@ -17,6 +17,7 @@ namespace mbgl { class Map; class Painter; class StyleLayer; +class SourceInfo; class TileData : public std::enable_shared_from_this<TileData>, private util::noncopyable { @@ -37,7 +38,7 @@ public: }; public: - TileData(Tile::ID id, Map &map, const std::string url); + TileData(Tile::ID id, Map &map, const SourceInfo &source); ~TileData(); void request(); @@ -60,8 +61,13 @@ public: protected: Map ↦ +public: + const SourceInfo &source; + // Request-related information. const std::string url; + +protected: std::weak_ptr<platform::Request> req; std::string data; diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp index dd55e8dae1..dc67b92512 100644 --- a/include/mbgl/map/vector_tile_data.hpp +++ b/include/mbgl/map/vector_tile_data.hpp @@ -23,7 +23,7 @@ class VectorTileData : public TileData { friend class TileParser; public: - VectorTileData(Tile::ID id, Map &map, const std::string url); + VectorTileData(Tile::ID id, Map &map, const SourceInfo &source); ~VectorTileData(); virtual void beforeParse(); |