[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

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