diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-07 15:26:21 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-13 10:57:46 -0700 |
commit | 13d0a8b81592125ecdddc1f25c785bca0ab8b5a5 (patch) | |
tree | dd52a0e5468dfcd142b5cb3a121d863e0c9ef5e5 | |
parent | 078392eda96e5232d7f4e9e486ee33782ed4487e (diff) | |
download | qtlocation-mapboxgl-13d0a8b81592125ecdddc1f25c785bca0ab8b5a5.tar.gz |
[core] Merge vector_tile_data.{hpp,cpp} into vector_tile.{hpp,cpp}
-rw-r--r-- | src/mbgl/style/source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile.cpp | 25 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile.hpp | 26 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile_data.cpp | 28 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile_data.hpp | 31 |
5 files changed, 47 insertions, 65 deletions
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index ace4e25e3e..2df35c6c3a 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -21,7 +21,7 @@ #include <mbgl/tile/raster_tile_data.hpp> #include <mbgl/tile/geojson_tile.hpp> -#include <mbgl/tile/vector_tile_data.hpp> +#include <mbgl/tile/vector_tile.hpp> #include <mbgl/annotation/annotation_tile.hpp> #include <mbgl/style/parser.hpp> #include <mbgl/gl/debugging.hpp> diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index 0a59bafecd..fc37363dda 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -1,14 +1,29 @@ #include <mbgl/tile/vector_tile.hpp> -#include <mbgl/style/source.hpp> -#include <mbgl/storage/resource.hpp> -#include <mbgl/storage/response.hpp> -#include <mbgl/storage/file_source.hpp> -#include <mbgl/util/url.hpp> +#include <mbgl/tile/tile_source_impl.hpp> +#include <mbgl/style/update_parameters.hpp> #include <utility> namespace mbgl { +VectorTileData::VectorTileData(const OverscaledTileID& id_, + std::string sourceID, + const style::UpdateParameters& parameters, + const Tileset& tileset) + : GeometryTileData(id_, sourceID, parameters.style, parameters.mode), + tileSource(*this, id_, parameters, tileset) { +} + +void VectorTileData::setNecessity(Necessity necessity) { + tileSource.setNecessity(static_cast<TileSource<VectorTileData>::Necessity>(necessity)); +} + +void VectorTileData::setData(std::shared_ptr<const std::string> data, + optional<Timestamp> modified, + optional<Timestamp> expires) { + GeometryTileData::setData(data ? std::make_unique<VectorTile>(data) : nullptr, modified, expires); +} + Value parseValue(protozero::pbf_reader data) { while (data.next()) { diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp index 636cd233ab..1484dd0a61 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -1,7 +1,10 @@ #pragma once #include <mbgl/tile/geometry_tile.hpp> +#include <mbgl/tile/geometry_tile_data.hpp> #include <mbgl/tile/tile_id.hpp> +#include <mbgl/tile/tile_source.hpp> + #include <protozero/pbf_reader.hpp> #include <map> @@ -10,6 +13,29 @@ namespace mbgl { +class Tileset; +class GeometryTile; + +namespace style { +class UpdateParameters; +} + +class VectorTileData : public GeometryTileData { +public: + VectorTileData(const OverscaledTileID&, + std::string sourceID, + const style::UpdateParameters&, + const Tileset&); + + void setNecessity(Necessity) final; + void setData(std::shared_ptr<const std::string> data, + optional<Timestamp> modified, + optional<Timestamp> expires); + +private: + TileSource<VectorTileData> tileSource; +}; + class VectorTileLayer; using pbf_iter_type = protozero::pbf_reader::const_uint32_iterator; diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp deleted file mode 100644 index e113054af1..0000000000 --- a/src/mbgl/tile/vector_tile_data.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include <mbgl/tile/vector_tile_data.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> - -namespace mbgl { - -VectorTileData::VectorTileData(const OverscaledTileID& id_, - std::string sourceID, - const style::UpdateParameters& parameters, - const Tileset& tileset) - : GeometryTileData(id_, sourceID, parameters.style, parameters.mode), - tileSource(*this, id_, parameters, tileset) { -} - -void VectorTileData::setNecessity(Necessity necessity) { - tileSource.setNecessity(static_cast<TileSource<VectorTileData>::Necessity>(necessity)); -} - -void VectorTileData::setData(std::shared_ptr<const std::string> data, - optional<Timestamp> modified, - optional<Timestamp> expires) { - GeometryTileData::setData(data ? std::make_unique<VectorTile>(data) : nullptr, modified, expires); -} - -} // namespace mbgl diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp deleted file mode 100644 index 1d44abaec3..0000000000 --- a/src/mbgl/tile/vector_tile_data.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include <mbgl/tile/geometry_tile_data.hpp> -#include <mbgl/tile/tile_source.hpp> - -namespace mbgl { - -class Tileset; -class GeometryTile; - -namespace style { -class UpdateParameters; -} - -class VectorTileData : public GeometryTileData { -public: - VectorTileData(const OverscaledTileID&, - std::string sourceID, - const style::UpdateParameters&, - const Tileset&); - - void setNecessity(Necessity) final; - void setData(std::shared_ptr<const std::string> data, - optional<Timestamp> modified, - optional<Timestamp> expires); - -private: - TileSource<VectorTileData> tileSource; -}; - -} // namespace mbgl |