tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Vector source tileSize is constant

Browse Source
This commit is contained in:
John Firebaugh
2016-06-14 10:41:33 -07:00
parent f74c5d8abd
commit 55abb76f68
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/style/parser.cpp
View File

@@ -216,7 +216,7 @@ void Parser::parseSources(const JSValue& value) {
break;
case SourceType::Vector:
source = std::make_unique<VectorSource>(id, url, tileSize, std::move(tileset));
source = std::make_unique<VectorSource>(id, url, std::move(tileset));
break;
case SourceType::GeoJSON:

3
src/mbgl/style/sources/vector_source.cpp
View File

@@ -5,9 +5,8 @@ namespace style {
VectorSource::VectorSource(std::string id_,
std::string url_,
uint16_t tileSize_,
std::unique_ptr<Tileset>&& 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

1
src/mbgl/style/sources/vector_source.hpp
View File

@@ -9,7 +9,6 @@ class VectorSource : public Source {
public:
VectorSource(std::string id,
std::string url,
uint16_t tileSize,
std::unique_ptr<Tileset>&&);
};

12
test/style/source.cpp
View File

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