diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 10:41:33 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 11:25:45 -0700 |
commit | 55abb76f6840642c9734f19cb493d9efaf5329e3 (patch) | |
tree | 291d164603beedda4c43b1956e0fbaf70152c52d /src/mbgl | |
parent | f74c5d8abd8f2f4a3921786507d121ffac05e17a (diff) | |
download | qtlocation-mapboxgl-55abb76f6840642c9734f19cb493d9efaf5329e3.tar.gz |
[core] Vector source tileSize is constant
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/style/parser.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/sources/vector_source.hpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp index a2ce5d2422..670a5dbd92 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<VectorSource>(id, url, tileSize, std::move(tileset)); + source = std::make_unique<VectorSource>(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 2c283057df..e6adb9bb9f 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>&& 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 c9fdd55a64..08ab9a461e 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<Tileset>&&); }; |