summaryrefslogtreecommitdiff
path: root/src/mbgl/tile/vector_tile_data.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-06 19:05:32 -0700
committerKonstantin Käfer <mail@kkaefer.com>2016-06-10 12:42:14 +0200
commit49120b1974edf744939f7801068dde612d79a4d7 (patch)
treed75181adb98fb849958a25c4816a95fefc772ec2 /src/mbgl/tile/vector_tile_data.cpp
parent94cfb1eb5aae9df9de128bfd57d2e934bb9b7e90 (diff)
downloadqtlocation-mapboxgl-49120b1974edf744939f7801068dde612d79a4d7.tar.gz
[core] Merge FileBasedTileSource and TileSource
Diffstat (limited to 'src/mbgl/tile/vector_tile_data.cpp')
-rw-r--r--src/mbgl/tile/vector_tile_data.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp
index e07d210f43..6961d31bd2 100644
--- a/src/mbgl/tile/vector_tile_data.cpp
+++ b/src/mbgl/tile/vector_tile_data.cpp
@@ -1,7 +1,6 @@
#include <mbgl/tile/vector_tile_data.hpp>
-#include <mbgl/tile/file_based_tile_source.hpp>
-#include <mbgl/tile/file_based_tile_source_impl.hpp>
#include <mbgl/tile/tile_source.hpp>
+#include <mbgl/tile/tile_source_impl.hpp>
#include <mbgl/tile/vector_tile.hpp>
#include <mbgl/style/update_parameters.hpp>
#include <mbgl/util/async_request.hpp>
@@ -13,13 +12,13 @@ VectorTileData::VectorTileData(const OverscaledTileID& id_,
const style::UpdateParameters& parameters,
const Tileset& tileset)
: GeometryTileData(id_, sourceID, parameters.style, parameters.mode),
- tileSource(std::make_unique<FileBasedTileSource<VectorTileData>>(*this, id_, parameters, tileset)) {
+ tileSource(*this, id_, parameters, tileset) {
}
VectorTileData::~VectorTileData() = default;
void VectorTileData::setNecessity(Necessity necessity) {
- tileSource->setNecessity(static_cast<TileSource::Necessity>(necessity));
+ tileSource.setNecessity(static_cast<TileSource<VectorTileData>::Necessity>(necessity));
}
std::unique_ptr<GeometryTile> VectorTileData::parseData(std::shared_ptr<const std::string> data) {