diff --git a/src/mbgl/tile/raster_tile_data.cpp b/src/mbgl/tile/raster_tile_data.cpp index cc48b3e15..67cf1a089 100644 --- a/src/mbgl/tile/raster_tile_data.cpp +++ b/src/mbgl/tile/raster_tile_data.cpp @@ -70,7 +70,3 @@ void RasterTileData::setNecessity(Necessity necessity) { void RasterTileData::cancel() { workRequest.reset(); } - -std::shared_ptr RasterTileData::parseData(std::shared_ptr data) { - return data; -} diff --git a/src/mbgl/tile/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp index bbd033230..ef9e29c0d 100644 --- a/src/mbgl/tile/raster_tile_data.hpp +++ b/src/mbgl/tile/raster_tile_data.hpp @@ -34,8 +34,6 @@ public: void cancel() override; Bucket* getBucket(const style::Layer&) override; - static std::shared_ptr parseData(std::shared_ptr); - private: gl::TexturePool& texturePool; Worker& worker; diff --git a/src/mbgl/tile/tile_source_impl.hpp b/src/mbgl/tile/tile_source_impl.hpp index b5a48a97b..625a0e202 100644 --- a/src/mbgl/tile/tile_source_impl.hpp +++ b/src/mbgl/tile/tile_source_impl.hpp @@ -95,8 +95,7 @@ void TileSource::loadedData(const Response& res) { resource.priorModified = res.modified; resource.priorExpires = res.expires; resource.priorEtag = res.etag; - tileData.setData(res.noContent ? nullptr : T::parseData(res.data), res.modified, - res.expires); + tileData.setData(res.noContent ? nullptr : res.data, res.modified, res.expires); } } diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp index 6961d31bd..b2bb5e211 100644 --- a/src/mbgl/tile/vector_tile_data.cpp +++ b/src/mbgl/tile/vector_tile_data.cpp @@ -21,8 +21,10 @@ void VectorTileData::setNecessity(Necessity necessity) { tileSource.setNecessity(static_cast::Necessity>(necessity)); } -std::unique_ptr VectorTileData::parseData(std::shared_ptr data) { - return data ? std::make_unique(data) : nullptr; +void VectorTileData::setData(std::shared_ptr data, + optional modified, + optional expires) { + GeometryTileData::setData(data ? std::make_unique(data) : nullptr, modified, expires); } } // namespace mbgl diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp index 8e653386b..a9ea08674 100644 --- a/src/mbgl/tile/vector_tile_data.hpp +++ b/src/mbgl/tile/vector_tile_data.hpp @@ -21,8 +21,9 @@ public: ~VectorTileData(); void setNecessity(Necessity) final; - - static std::unique_ptr parseData(std::shared_ptr); + void setData(std::shared_ptr data, + optional modified, + optional expires); private: TileSource tileSource;