diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 10:39:40 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 11:25:45 -0700 |
commit | b222689de835a8b83c387aff5e5f500ce17768e5 (patch) | |
tree | 2d2d381b11f6e69aa0659a6cbab36e3d878d8b22 | |
parent | 9b0093e32dece62abc6fd7add789613871252a58 (diff) | |
download | qtlocation-mapboxgl-b222689de835a8b83c387aff5e5f500ce17768e5.tar.gz |
[core] Pass geojsonvt only to GeoJSONSource
-rw-r--r-- | src/mbgl/annotation/annotation_manager.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/annotation/annotation_source.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/annotation/annotation_source.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/parser.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/source.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/source.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/style/sources/geojson_source.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/style/sources/raster_source.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/style/sources/raster_source.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source.hpp | 3 | ||||
-rw-r--r-- | test/style/source.cpp | 20 |
12 files changed, 30 insertions, 34 deletions
diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index 71dca16359..2ca32aaa36 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -107,7 +107,7 @@ std::unique_ptr<AnnotationTileData> AnnotationManager::getTileData(const Canonic void AnnotationManager::updateStyle(Style& style) { // Create annotation source, point layer, and point bucket if (!style.getSource(SourceID)) { - std::unique_ptr<Source> source = std::make_unique<AnnotationSource>(SourceID, "", util::tileSize, std::make_unique<Tileset>(), nullptr); + std::unique_ptr<Source> source = std::make_unique<AnnotationSource>(SourceID, "", util::tileSize, std::make_unique<Tileset>()); source->enabled = true; style.addSource(std::move(source)); diff --git a/src/mbgl/annotation/annotation_source.cpp b/src/mbgl/annotation/annotation_source.cpp index 8e2a5b22eb..024bd4be98 100644 --- a/src/mbgl/annotation/annotation_source.cpp +++ b/src/mbgl/annotation/annotation_source.cpp @@ -5,9 +5,8 @@ namespace mbgl { AnnotationSource::AnnotationSource(std::string id_, std::string url_, uint16_t tileSize_, - std::unique_ptr<Tileset>&& tileset_, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_) - : Source(SourceType::Annotations, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) { + std::unique_ptr<Tileset>&& tileset_) + : Source(SourceType::Annotations, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) { } } // namespace mbgl diff --git a/src/mbgl/annotation/annotation_source.hpp b/src/mbgl/annotation/annotation_source.hpp index 6af38f76b4..358e94688d 100644 --- a/src/mbgl/annotation/annotation_source.hpp +++ b/src/mbgl/annotation/annotation_source.hpp @@ -9,8 +9,7 @@ public: AnnotationSource(std::string id, std::string url, uint16_t tileSize, - std::unique_ptr<Tileset>&&, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&); + std::unique_ptr<Tileset>&&); }; } // namespace mbgl diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp index 0a11d6f978..a2ce5d2422 100644 --- a/src/mbgl/style/parser.cpp +++ b/src/mbgl/style/parser.cpp @@ -212,11 +212,11 @@ void Parser::parseSources(const JSValue& value) { } } - source = std::make_unique<RasterSource>(id, url, tileSize, std::move(tileset), std::move(geojsonvt)); + source = std::make_unique<RasterSource>(id, url, tileSize, std::move(tileset)); break; case SourceType::Vector: - source = std::make_unique<VectorSource>(id, url, tileSize, std::move(tileset), std::move(geojsonvt)); + source = std::make_unique<VectorSource>(id, url, tileSize, std::move(tileset)); break; case SourceType::GeoJSON: diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index bffb6a8fcc..d806e3140e 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -47,14 +47,12 @@ Source::Source(SourceType type_, std::string id_, std::string url_, uint16_t tileSize_, - std::unique_ptr<Tileset>&& tileset_, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_) + std::unique_ptr<Tileset>&& tileset_) : type(type_), id(std::move(id_)), url(std::move(url_)), tileSize(tileSize_), tileset(std::move(tileset_)), - geojsonvt(std::move(geojsonvt_)), observer(&nullObserver) { } diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp index 91fc6514c8..45feadf2fe 100644 --- a/src/mbgl/style/source.hpp +++ b/src/mbgl/style/source.hpp @@ -44,8 +44,7 @@ public: std::string id, std::string url, uint16_t tileSize, - std::unique_ptr<Tileset>&&, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&); + std::unique_ptr<Tileset>&&); ~Source() override; bool loaded = false; @@ -99,8 +98,10 @@ private: private: std::unique_ptr<const Tileset> tileset; +protected: std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> geojsonvt; +private: // Stores the time when this source was most recently updated. TimePoint updated = TimePoint::min(); diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp index 785c8a3eb0..8a573becfe 100644 --- a/src/mbgl/style/sources/geojson_source.cpp +++ b/src/mbgl/style/sources/geojson_source.cpp @@ -1,5 +1,7 @@ #include <mbgl/style/sources/geojson_source.hpp> +#include <mapbox/geojsonvt.hpp> + namespace mbgl { namespace style { @@ -8,7 +10,8 @@ GeoJSONSource::GeoJSONSource(std::string id_, uint16_t tileSize_, std::unique_ptr<Tileset>&& tileset_, std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_) - : Source(SourceType::GeoJSON, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) { + : Source(SourceType::GeoJSON, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) { + geojsonvt = std::move(geojsonvt_); } } // namespace style diff --git a/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp index d0f525894a..868d3f7f88 100644 --- a/src/mbgl/style/sources/raster_source.cpp +++ b/src/mbgl/style/sources/raster_source.cpp @@ -6,9 +6,8 @@ namespace style { RasterSource::RasterSource(std::string id_, std::string url_, uint16_t tileSize_, - std::unique_ptr<Tileset>&& tileset_, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_) - : Source(SourceType::Raster, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) { + std::unique_ptr<Tileset>&& tileset_) + : Source(SourceType::Raster, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) { } } // namespace style diff --git a/src/mbgl/style/sources/raster_source.hpp b/src/mbgl/style/sources/raster_source.hpp index 1b04865464..0e062c14f8 100644 --- a/src/mbgl/style/sources/raster_source.hpp +++ b/src/mbgl/style/sources/raster_source.hpp @@ -10,8 +10,7 @@ public: RasterSource(std::string id, std::string url, uint16_t tileSize, - std::unique_ptr<Tileset>&&, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&); + std::unique_ptr<Tileset>&&); }; } // namespace style diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp index 6cbb667c40..2c283057df 100644 --- a/src/mbgl/style/sources/vector_source.cpp +++ b/src/mbgl/style/sources/vector_source.cpp @@ -6,9 +6,8 @@ namespace style { VectorSource::VectorSource(std::string id_, std::string url_, uint16_t tileSize_, - std::unique_ptr<Tileset>&& tileset_, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_) - : Source(SourceType::Vector, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) { + std::unique_ptr<Tileset>&& tileset_) + : Source(SourceType::Vector, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) { } } // namespace style diff --git a/src/mbgl/style/sources/vector_source.hpp b/src/mbgl/style/sources/vector_source.hpp index e3a14a7531..c9fdd55a64 100644 --- a/src/mbgl/style/sources/vector_source.hpp +++ b/src/mbgl/style/sources/vector_source.hpp @@ -10,8 +10,7 @@ public: VectorSource(std::string id, std::string url, uint16_t tileSize, - std::unique_ptr<Tileset>&&, - std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&); + std::unique_ptr<Tileset>&&); }; } // namespace style diff --git a/test/style/source.cpp b/test/style/source.cpp index 6828042c6a..8b74042837 100644 --- a/test/style/source.cpp +++ b/test/style/source.cpp @@ -86,7 +86,7 @@ TEST(Source, LoadingFail) { test.end(); }; - VectorSource source("source", "url", 512, nullptr, nullptr); + VectorSource source("source", "url", 512, nullptr); source.setObserver(&test.observer); source.load(test.fileSource); @@ -109,7 +109,7 @@ TEST(Source, LoadingCorrupt) { test.end(); }; - VectorSource source("source", "url", 512, nullptr, nullptr); + VectorSource source("source", "url", 512, nullptr); source.setObserver(&test.observer); source.load(test.fileSource); @@ -137,7 +137,7 @@ TEST(Source, RasterTileEmpty) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - RasterSource source("source", "", 512, std::move(tileset), nullptr); + RasterSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); @@ -166,7 +166,7 @@ TEST(Source, VectorTileEmpty) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset), nullptr); + VectorSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); @@ -195,7 +195,7 @@ TEST(Source, RasterTileFail) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - RasterSource source("source", "", 512, std::move(tileset), nullptr); + RasterSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); @@ -224,7 +224,7 @@ TEST(Source, VectorTileFail) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset), nullptr); + VectorSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); @@ -252,7 +252,7 @@ TEST(Source, RasterTileCorrupt) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - RasterSource source("source", "", 512, std::move(tileset), nullptr); + RasterSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); @@ -284,7 +284,7 @@ TEST(Source, VectorTileCorrupt) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset), nullptr); + VectorSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); @@ -311,7 +311,7 @@ TEST(Source, RasterTileCancel) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - RasterSource source("source", "", 512, std::move(tileset), nullptr); + RasterSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); @@ -338,7 +338,7 @@ TEST(Source, VectorTileCancel) { auto tileset = std::make_unique<Tileset>(); tileset->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset), nullptr); + VectorSource source("source", "", 512, std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters); |