diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 12:46:29 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-15 11:28:34 -0700 |
commit | d48333f26d9111d8f4f8420b477c36cece0d14a5 (patch) | |
tree | 24d70308b51e9ab29622a402e5f21925780ad1d5 /src | |
parent | 41760b5696e71c3d201d94d5c8b2423c1f348446 (diff) | |
download | qtlocation-mapboxgl-d48333f26d9111d8f4f8420b477c36cece0d14a5.tar.gz |
[core] Remove unused and mis-parsed properties from Tileset
latitude and longitude were reversed. Fortunately they were not used.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/style/tile_source.cpp | 28 | ||||
-rw-r--r-- | src/mbgl/util/tileset.hpp | 8 |
2 files changed, 2 insertions, 34 deletions
diff --git a/src/mbgl/style/tile_source.cpp b/src/mbgl/style/tile_source.cpp index 022693f499..0824693331 100644 --- a/src/mbgl/style/tile_source.cpp +++ b/src/mbgl/style/tile_source.cpp @@ -68,27 +68,6 @@ void parseTileJSONMember(const JSValue& value, uint8_t& target, const char* name target = uint; } -void parseTileJSONMember(const JSValue& value, std::array<double, 4>& target, const char* name) { - if (!value.HasMember(name)) { - return; - } - - const JSValue& property = value[name]; - if (!property.IsArray() || property.Size() > 4) { - return; - } - - for (rapidjson::SizeType i = 0; i < property.Size(); i++) { - if (!property[i].IsNumber()) { - return; - } - } - - for (rapidjson::SizeType i = 0; i < property.Size(); i++) { - target[i] = property[i].GetDouble(); - } -} - Tileset parseTileJSON(const JSValue& value) { Tileset result; @@ -97,13 +76,6 @@ Tileset parseTileJSON(const JSValue& value) { parseTileJSONMember(value, result.zoomRange.max, "maxzoom"); parseTileJSONMember(value, result.attribution, "attribution"); - std::array<double, 4> array; - parseTileJSONMember(value, array, "center"); - result.center = { array[0], array[1] }; - result.zoom = array[2]; - parseTileJSONMember(value, array, "bounds"); - result.bounds = LatLngBounds::hull({ array[0], array[1] }, { array[2], array[3] }); - return result; } diff --git a/src/mbgl/util/tileset.hpp b/src/mbgl/util/tileset.hpp index 7e53850dfe..8a7fbe9b73 100644 --- a/src/mbgl/util/tileset.hpp +++ b/src/mbgl/util/tileset.hpp @@ -1,10 +1,7 @@ #pragma once -#include <mbgl/util/constants.hpp> #include <mbgl/util/range.hpp> -#include <mbgl/util/geo.hpp> -#include <array> #include <vector> #include <string> #include <cstdint> @@ -16,9 +13,8 @@ public: std::vector<std::string> tiles; Range<uint8_t> zoomRange { 0, 22 }; std::string attribution; - LatLng center; - double zoom = 0; - LatLngBounds bounds = LatLngBounds::world(); + + // TileJSON also includes center, zoom, and bounds, but they are not used by mbgl. }; } // namespace mbgl |