diff --git a/src/mbgl/style/tile_source.cpp b/src/mbgl/style/tile_source.cpp index 022693f49..082469333 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& 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 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 7e53850df..8a7fbe9b7 100644 --- a/src/mbgl/util/tileset.hpp +++ b/src/mbgl/util/tileset.hpp @@ -1,10 +1,7 @@ #pragma once -#include #include -#include -#include #include #include #include @@ -16,9 +13,8 @@ public: std::vector tiles; Range 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