diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-06 18:54:47 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-06-10 12:42:14 +0200 |
commit | 94cfb1eb5aae9df9de128bfd57d2e934bb9b7e90 (patch) | |
tree | 0af59e84765166e5b6335743afb2ab9658da21c1 /src/mbgl/tile/vector_tile_data.cpp | |
parent | a1d1bb0c6dc63757abc3dbcab9ff1c4bacca7ba7 (diff) | |
download | qtlocation-mapboxgl-94cfb1eb5aae9df9de128bfd57d2e934bb9b7e90.tar.gz |
[core] Factor common code into FileBasedTileSource
Diffstat (limited to 'src/mbgl/tile/vector_tile_data.cpp')
-rw-r--r-- | src/mbgl/tile/vector_tile_data.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp index dc5c536e6f..e07d210f43 100644 --- a/src/mbgl/tile/vector_tile_data.cpp +++ b/src/mbgl/tile/vector_tile_data.cpp @@ -4,22 +4,16 @@ #include <mbgl/tile/tile_source.hpp> #include <mbgl/tile/vector_tile.hpp> #include <mbgl/style/update_parameters.hpp> -#include <mbgl/util/tileset.hpp> #include <mbgl/util/async_request.hpp> namespace mbgl { -VectorTileData::VectorTileData(const OverscaledTileID& overscaledTileID, +VectorTileData::VectorTileData(const OverscaledTileID& id_, std::string sourceID, const style::UpdateParameters& parameters, const Tileset& tileset) - : GeometryTileData(overscaledTileID, sourceID, parameters.style, parameters.mode) { - assert(!tileset.tiles.empty()); - const auto resource = Resource::tile( - tileset.tiles.at(0), parameters.pixelRatio, overscaledTileID.canonical.x, - overscaledTileID.canonical.y, overscaledTileID.canonical.z); - tileSource = std::make_unique<FileBasedTileSource<VectorTileData>>( - *this, resource, parameters.fileSource); + : GeometryTileData(id_, sourceID, parameters.style, parameters.mode), + tileSource(std::make_unique<FileBasedTileSource<VectorTileData>>(*this, id_, parameters, tileset)) { } VectorTileData::~VectorTileData() = default; |