diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index d0a002dd7..7e012727d 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -19,11 +20,6 @@ #include #include -#include -#include -#include -#include - #include #include #include @@ -194,49 +190,13 @@ std::unique_ptr Source::createTile(const OverscaledTileID& overscaledT const UpdateParameters& parameters) { // If we don't find working tile data, we're just going to load it. if (type == SourceType::Raster) { - assert(!tileset->tiles.empty()); - const auto resource = Resource::tile( - tileset->tiles.at(0), parameters.pixelRatio, overscaledTileID.canonical.x, - overscaledTileID.canonical.y, overscaledTileID.canonical.z); - auto data = std::make_unique(overscaledTileID, parameters.texturePool, - parameters.worker); - data->setTileSource( - std::make_unique(*data, resource, parameters.fileSource)); - - // Need a std::move here to create a std::unique_ptr from - // std::unique_ptr. - return std::move(data); + return std::make_unique(overscaledTileID, parameters, *tileset); } else if (type == SourceType::Vector) { - assert(!tileset->tiles.empty()); - const auto resource = Resource::tile( - tileset->tiles.at(0), parameters.pixelRatio, overscaledTileID.canonical.x, - overscaledTileID.canonical.y, overscaledTileID.canonical.z); - auto data = std::make_unique(overscaledTileID, id, parameters.style, - parameters.mode); - data->setTileSource( - std::make_unique(*data, resource, parameters.fileSource)); - - // Need a std::move here to create a std::unique_ptr from - // std::unique_ptr. - return std::move(data); + return std::make_unique(overscaledTileID, id, parameters, *tileset); } else if (type == SourceType::Annotations) { - auto data = std::make_unique(overscaledTileID, id, parameters.style, - parameters.mode); - data->setTileSource(std::make_unique( - *data, overscaledTileID, parameters.annotationManager)); - - // Need a std::move here to create a std::unique_ptr from - // std::unique_ptr. - return std::move(data); + return std::make_unique(overscaledTileID, id, parameters); } else if (type == SourceType::GeoJSON) { - auto data = std::make_unique(overscaledTileID, id, parameters.style, - parameters.mode); - data->setTileSource( - std::make_unique(*data, geojsonvt.get(), overscaledTileID)); - - // Need a std::move here to create a std::unique_ptr from - // std::unique_ptr. - return std::move(data); + return std::make_unique(overscaledTileID, id, parameters, geojsonvt.get()); } else { Log::Warning(Event::Style, "Source type '%s' is not implemented", SourceTypeClass(type).c_str()); diff --git a/src/mbgl/tile/annotation_tile_data.cpp b/src/mbgl/tile/annotation_tile_data.cpp new file mode 100644 index 000000000..5d23a35b2 --- /dev/null +++ b/src/mbgl/tile/annotation_tile_data.cpp @@ -0,0 +1,15 @@ +#include +#include +#include + +namespace mbgl { + +AnnotationTileData::AnnotationTileData(const OverscaledTileID& overscaledTileID, + std::string sourceID, + const style::UpdateParameters& parameters) + : GeometryTileData(overscaledTileID, sourceID, parameters.style, parameters.mode) { + setTileSource(std::make_unique( + *this, overscaledTileID, parameters.annotationManager)); +} + +} // namespace mbgl diff --git a/src/mbgl/tile/annotation_tile_data.hpp b/src/mbgl/tile/annotation_tile_data.hpp index fdd6dde6b..4d8357eab 100644 --- a/src/mbgl/tile/annotation_tile_data.hpp +++ b/src/mbgl/tile/annotation_tile_data.hpp @@ -4,9 +4,15 @@ namespace mbgl { +namespace style { +class UpdateParameters; +} + class AnnotationTileData : public GeometryTileData { public: - using GeometryTileData::GeometryTileData; + AnnotationTileData(const OverscaledTileID&, + std::string sourceID, + const style::UpdateParameters&); }; } // namespace mbgl diff --git a/src/mbgl/tile/geojson_tile_data.cpp b/src/mbgl/tile/geojson_tile_data.cpp new file mode 100644 index 000000000..4464ae34b --- /dev/null +++ b/src/mbgl/tile/geojson_tile_data.cpp @@ -0,0 +1,17 @@ +#include +#include +#include + +namespace mbgl { + +GeoJSONTileData::GeoJSONTileData(const OverscaledTileID& overscaledTileID, + std::string sourceID, + const style::UpdateParameters& parameters, + mapbox::geojsonvt::GeoJSONVT* geojsonvt) + : GeometryTileData(overscaledTileID, sourceID, parameters.style, parameters.mode) { + setTileSource( + std::make_unique(*this, geojsonvt, overscaledTileID)); +} + + +} // namespace mbgl diff --git a/src/mbgl/tile/geojson_tile_data.hpp b/src/mbgl/tile/geojson_tile_data.hpp index be1a38abe..63a0b1b65 100644 --- a/src/mbgl/tile/geojson_tile_data.hpp +++ b/src/mbgl/tile/geojson_tile_data.hpp @@ -2,11 +2,24 @@ #include +namespace mapbox { +namespace geojsonvt { +class GeoJSONVT; +} // namespace geojsonvt +} // namespace mapbox + namespace mbgl { +namespace style { +class UpdateParameters; +} + class GeoJSONTileData : public GeometryTileData { public: - using GeometryTileData::GeometryTileData; + GeoJSONTileData(const OverscaledTileID&, + std::string sourceID, + const style::UpdateParameters&, + mapbox::geojsonvt::GeoJSONVT*); }; } // namespace mbgl diff --git a/src/mbgl/tile/raster_tile_data.cpp b/src/mbgl/tile/raster_tile_data.cpp index dade0357c..0d388181c 100644 --- a/src/mbgl/tile/raster_tile_data.cpp +++ b/src/mbgl/tile/raster_tile_data.cpp @@ -1,6 +1,8 @@ #include #include +#include #include +#include #include #include #include @@ -10,11 +12,17 @@ using namespace mbgl; RasterTileData::RasterTileData(const OverscaledTileID& id_, - gl::TexturePool& texturePool_, - Worker& worker_) + const style::UpdateParameters& parameters, + const Tileset& tileset) : TileData(id_), - texturePool(texturePool_), - worker(worker_) { + texturePool(parameters.texturePool), + worker(parameters.worker) { + assert(!tileset.tiles.empty()); + const auto resource = Resource::tile( + tileset.tiles.at(0), parameters.pixelRatio, id_.canonical.x, + id_.canonical.y, id_.canonical.z); + setTileSource( + std::make_unique(*this, resource, parameters.fileSource)); } void RasterTileData::setError(std::exception_ptr err) { diff --git a/src/mbgl/tile/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp index f5c82d4e0..5f2478745 100644 --- a/src/mbgl/tile/raster_tile_data.hpp +++ b/src/mbgl/tile/raster_tile_data.hpp @@ -7,18 +7,20 @@ namespace mbgl { class RasterTileSource; class AsyncRequest; +class Tileset; namespace gl { class TexturePool; } namespace style { class Layer; +class UpdateParameters; } class RasterTileData : public TileData { public: RasterTileData(const OverscaledTileID&, - gl::TexturePool&, - Worker&); + const style::UpdateParameters&, + const Tileset&); ~RasterTileData(); void setError(std::exception_ptr err); diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp new file mode 100644 index 000000000..58d528a8f --- /dev/null +++ b/src/mbgl/tile/vector_tile_data.cpp @@ -0,0 +1,22 @@ +#include +#include +#include +#include +#include + +namespace mbgl { + +VectorTileData::VectorTileData(const OverscaledTileID& overscaledTileID, + 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); + setTileSource( + std::make_unique(*this, resource, parameters.fileSource)); +} + +} // namespace mbgl diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp index 67aadb8a7..739d1b9e7 100644 --- a/src/mbgl/tile/vector_tile_data.hpp +++ b/src/mbgl/tile/vector_tile_data.hpp @@ -4,9 +4,18 @@ namespace mbgl { +class Tileset; + +namespace style { +class UpdateParameters; +} + class VectorTileData : public GeometryTileData { public: - using GeometryTileData::GeometryTileData; + VectorTileData(const OverscaledTileID&, + std::string sourceID, + const style::UpdateParameters&, + const Tileset&); }; } // namespace mbgl