diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-05-19 15:34:08 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-06-10 12:42:14 +0200 |
commit | e8d8f52d2ea8b788a0dbe859549ec86fc0732df3 (patch) | |
tree | 80e8d41f1bbd8de633e851086be523860b8979db /src/mbgl/style/source.cpp | |
parent | 6998479d05497baf57eb264e92807d327920f7d6 (diff) | |
download | qtlocation-mapboxgl-e8d8f52d2ea8b788a0dbe859549ec86fc0732df3.tar.gz |
[core] *TileMonitor => *TileSource
Diffstat (limited to 'src/mbgl/style/source.cpp')
-rw-r--r-- | src/mbgl/style/source.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index 8e5973f412..701fc2c8cc 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -22,6 +22,10 @@ #include <mbgl/util/string.hpp> #include <mbgl/util/tile_cover.hpp> +#include <mbgl/tile/vector_tile_source.hpp> +#include <mbgl/tile/geojson_tile_source.hpp> +#include <mbgl/tile/annotation_tile_source.hpp> + #include <mbgl/tile/vector_tile_data.hpp> #include <mbgl/tile/raster_tile_data.hpp> #include <mbgl/style/parser.hpp> @@ -202,14 +206,14 @@ std::unique_ptr<TileData> Source::createTile(const OverscaledTileID& overscaledT tileset->tiles.at(0), parameters.texturePool, parameters.worker, parameters.fileSource, callback); } else { - std::unique_ptr<GeometryTileMonitor> monitor; + std::unique_ptr<GeometryTileSource> monitor; if (type == SourceType::Vector) { - monitor = std::make_unique<VectorTileMonitor>(overscaledTileID, parameters.pixelRatio, tileset->tiles.at(0), parameters.fileSource); + monitor = std::make_unique<VectorTileSource>(overscaledTileID, parameters.pixelRatio, tileset->tiles.at(0), parameters.fileSource); } else if (type == SourceType::Annotations) { - monitor = std::make_unique<AnnotationTileMonitor>(overscaledTileID, parameters.annotationManager); + monitor = std::make_unique<AnnotationTileSource>(overscaledTileID, parameters.annotationManager); } else if (type == SourceType::GeoJSON) { - monitor = std::make_unique<GeoJSONTileMonitor>(geojsonvt.get(), overscaledTileID); + monitor = std::make_unique<GeoJSONTileSource>(geojsonvt.get(), overscaledTileID); } else { Log::Warning(Event::Style, "Source type '%s' is not implemented", SourceTypeClass(type).c_str()); return nullptr; |