diff options
author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-08-02 11:35:38 -0700 |
---|---|---|
committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-08-02 12:16:37 -0700 |
commit | a5fea5febf908c8cc94222bdbccf53afafc0c1dd (patch) | |
tree | 68fb4646b16c294aee26bd1b2573c803f5dd17e0 | |
parent | 1a840281b5dc9486400974bceddf99a92f6138af (diff) | |
download | qtlocation-mapboxgl-a5fea5febf908c8cc94222bdbccf53afafc0c1dd.tar.gz |
Fix TileJSON conversion to allow single point bounds
-rw-r--r-- | src/mbgl/style/conversion/tileset.cpp | 4 | ||||
-rw-r--r-- | test/style/conversion/tileset.test.cpp | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/mbgl/style/conversion/tileset.cpp b/src/mbgl/style/conversion/tileset.cpp index fb2ae6c6a0..b566af0a18 100644 --- a/src/mbgl/style/conversion/tileset.cpp +++ b/src/mbgl/style/conversion/tileset.cpp @@ -95,12 +95,12 @@ optional<Tileset> Converter<Tileset>::operator()(const Convertible& value, Error bottom = util::clamp(*bottom, -90.0, 90.0); top = util::clamp(*top, -90.0, 90.0); - if (top <= bottom){ + if (*top < *bottom){ error.message = "bounds bottom latitude must be smaller than top latitude"; return nullopt; } - if(*left >= *right) { + if(*left > *right) { error.message = "bounds left longitude should be less than right longitude"; return nullopt; } diff --git a/test/style/conversion/tileset.test.cpp b/test/style/conversion/tileset.test.cpp index f405fb1361..f92ed46786 100644 --- a/test/style/conversion/tileset.test.cpp +++ b/test/style/conversion/tileset.test.cpp @@ -62,6 +62,16 @@ TEST(Tileset, ValidWorldBounds) { EXPECT_EQ(converted->bounds, LatLngBounds::hull({90, -180}, {-90, 180})); } +TEST(Tileset, PointBounds) { + Error error; + mbgl::optional<Tileset> converted = convertJSON<Tileset>(R"JSON({ + "tiles": ["http://mytiles"], + "bounds": [0, 0, 0, 0] + })JSON", error); + EXPECT_TRUE((bool) converted); + EXPECT_EQ(converted->bounds, LatLngBounds::hull({0, 0}, {0, 0})); +} + TEST(Tileset, BoundsAreClamped) { Error error; mbgl::optional<Tileset> converted = convertJSON<Tileset>(R"JSON({ |