[core] TileJSON conversion clamps bounds longitude to [-180,180], per…

… spec
mapbox · Mar 8, 2018 · 7df451d · 7df451d
1 parent c54035a
commit 7df451d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/include/mbgl/style/conversion/tileset.hpp b/include/mbgl/style/conversion/tileset.hpp
@@ -100,6 +100,8 @@ struct Converter<Tileset> {
                 error = { "bounds left longitude should be less than right longitude" };
                 return {};
             }
+            *left = util::max(-180.0, *left);
+            *right = util::min(180.0, *right);
             result.bounds = LatLngBounds::hull({ *bottom, *left }, { *top, *right });
         }
 

diff --git 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, BoundsAreClamped) {
+    Error error;
+    mbgl::optional<Tileset> converted = convertJSON<Tileset>(R"JSON({
+        "tiles": ["http://mytiles"],
+        "bounds": [-181.0000005,-90,180.00000000000006,90]
+    })JSON", error);
+    EXPECT_TRUE((bool) converted);
+    EXPECT_EQ(converted->bounds, LatLngBounds::hull({90, -180}, {-90, 180}));
+}
+
 TEST(Tileset, FullConversion) {
     Error error;
     Tileset converted = *convertJSON<Tileset>(R"JSON({