[core] Pass geojsonvt only to GeoJSONSource

This commit is contained in:
John Firebaugh
2016-06-14 10:39:40 -07:00
parent 9b0093e32d
commit b222689de8
12 changed files with 30 additions and 34 deletions

View File

@@ -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));

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -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) {
}

View File

@@ -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();

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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);