From 908f3f083244dc264e8e6a6869c543d456b2b13c Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 6 Jun 2016 16:19:28 -0700 Subject: [PATCH] [core] Introduce GeometryTileData subclasses --- src/mbgl/style/source.cpp | 10 ++++++---- src/mbgl/tile/annotation_tile_data.hpp | 12 ++++++++++++ src/mbgl/tile/geojson_tile_data.hpp | 12 ++++++++++++ src/mbgl/tile/vector_tile_data.hpp | 12 ++++++++++++ 4 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 src/mbgl/tile/annotation_tile_data.hpp create mode 100644 src/mbgl/tile/geojson_tile_data.hpp create mode 100644 src/mbgl/tile/vector_tile_data.hpp diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index 7d785e34a..d0a002dd7 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -24,8 +24,10 @@ #include #include -#include #include +#include +#include +#include #include #include @@ -209,7 +211,7 @@ std::unique_ptr Source::createTile(const OverscaledTileID& overscaledT 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, + auto data = std::make_unique(overscaledTileID, id, parameters.style, parameters.mode); data->setTileSource( std::make_unique(*data, resource, parameters.fileSource)); @@ -218,7 +220,7 @@ std::unique_ptr Source::createTile(const OverscaledTileID& overscaledT // std::unique_ptr. return std::move(data); } else if (type == SourceType::Annotations) { - auto data = std::make_unique(overscaledTileID, id, parameters.style, + auto data = std::make_unique(overscaledTileID, id, parameters.style, parameters.mode); data->setTileSource(std::make_unique( *data, overscaledTileID, parameters.annotationManager)); @@ -227,7 +229,7 @@ std::unique_ptr Source::createTile(const OverscaledTileID& overscaledT // std::unique_ptr. return std::move(data); } else if (type == SourceType::GeoJSON) { - auto data = std::make_unique(overscaledTileID, id, parameters.style, + auto data = std::make_unique(overscaledTileID, id, parameters.style, parameters.mode); data->setTileSource( std::make_unique(*data, geojsonvt.get(), overscaledTileID)); diff --git a/src/mbgl/tile/annotation_tile_data.hpp b/src/mbgl/tile/annotation_tile_data.hpp new file mode 100644 index 000000000..fdd6dde6b --- /dev/null +++ b/src/mbgl/tile/annotation_tile_data.hpp @@ -0,0 +1,12 @@ +#pragma once + +#include + +namespace mbgl { + +class AnnotationTileData : public GeometryTileData { +public: + using GeometryTileData::GeometryTileData; +}; + +} // namespace mbgl diff --git a/src/mbgl/tile/geojson_tile_data.hpp b/src/mbgl/tile/geojson_tile_data.hpp new file mode 100644 index 000000000..be1a38abe --- /dev/null +++ b/src/mbgl/tile/geojson_tile_data.hpp @@ -0,0 +1,12 @@ +#pragma once + +#include + +namespace mbgl { + +class GeoJSONTileData : public GeometryTileData { +public: + using GeometryTileData::GeometryTileData; +}; + +} // namespace mbgl diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp new file mode 100644 index 000000000..67aadb8a7 --- /dev/null +++ b/src/mbgl/tile/vector_tile_data.hpp @@ -0,0 +1,12 @@ +#pragma once + +#include + +namespace mbgl { + +class VectorTileData : public GeometryTileData { +public: + using GeometryTileData::GeometryTileData; +}; + +} // namespace mbgl