From 55abb76f6840642c9734f19cb493d9efaf5329e3 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 14 Jun 2016 10:41:33 -0700 Subject: [PATCH] [core] Vector source tileSize is constant --- src/mbgl/style/parser.cpp | 2 +- src/mbgl/style/sources/vector_source.cpp | 3 +-- src/mbgl/style/sources/vector_source.hpp | 1 - test/style/source.cpp | 12 ++++++------ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp index a2ce5d242..670a5dbd9 100644 --- a/src/mbgl/style/parser.cpp +++ b/src/mbgl/style/parser.cpp @@ -216,7 +216,7 @@ void Parser::parseSources(const JSValue& value) { break; case SourceType::Vector: - source = std::make_unique(id, url, tileSize, std::move(tileset)); + source = std::make_unique(id, url, std::move(tileset)); break; case SourceType::GeoJSON: diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp index 2c283057d..e6adb9bb9 100644 --- a/src/mbgl/style/sources/vector_source.cpp +++ b/src/mbgl/style/sources/vector_source.cpp @@ -5,9 +5,8 @@ namespace style { VectorSource::VectorSource(std::string id_, std::string url_, - uint16_t tileSize_, std::unique_ptr&& tileset_) - : Source(SourceType::Vector, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) { + : Source(SourceType::Vector, std::move(id_), std::move(url_), util::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 c9fdd55a6..08ab9a461 100644 --- a/src/mbgl/style/sources/vector_source.hpp +++ b/src/mbgl/style/sources/vector_source.hpp @@ -9,7 +9,6 @@ class VectorSource : public Source { public: VectorSource(std::string id, std::string url, - uint16_t tileSize, std::unique_ptr&&); }; diff --git a/test/style/source.cpp b/test/style/source.cpp index 8b7404283..4348dbc7e 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); + VectorSource source("source", "url", nullptr); source.setObserver(&test.observer); source.load(test.fileSource); @@ -109,7 +109,7 @@ TEST(Source, LoadingCorrupt) { test.end(); }; - VectorSource source("source", "url", 512, nullptr); + VectorSource source("source", "url", nullptr); source.setObserver(&test.observer); source.load(test.fileSource); @@ -166,7 +166,7 @@ TEST(Source, VectorTileEmpty) { auto tileset = std::make_unique(); tileset->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset)); + VectorSource source("source", "", 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->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset)); + VectorSource source("source", "", 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->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset)); + VectorSource source("source", "", 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->tiles = { "tiles" }; - VectorSource source("source", "", 512, std::move(tileset)); + VectorSource source("source", "", std::move(tileset)); source.setObserver(&test.observer); source.load(test.fileSource); source.update(test.updateParameters);