From b222689de835a8b83c387aff5e5f500ce17768e5 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 14 Jun 2016 10:39:40 -0700
Subject: [core] Pass geojsonvt only to GeoJSONSource

---
 test/style/source.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/style/source.cpp')

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);
-- 
cgit v1.2.1