From f4f3bfd68304f82904d2acaf471810fe2cb6b508 Mon Sep 17 00:00:00 2001
From: Asheem Mamoowala <Asheemm@gmail.com>
Date: Mon, 12 Feb 2018 12:17:57 -0800
Subject: TileJSON Bounds allows values inclusive of world extents

---
 src/mbgl/style/conversion/tileset.cpp  |  2 +-
 test/style/conversion/tileset.test.cpp | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/mbgl/style/conversion/tileset.cpp b/src/mbgl/style/conversion/tileset.cpp
index 6e559c0cac..88e78b1a83 100644
--- a/src/mbgl/style/conversion/tileset.cpp
+++ b/src/mbgl/style/conversion/tileset.cpp
@@ -6,7 +6,7 @@ namespace style {
 namespace conversion {
 
 bool validateLatitude(const double lat) {
-    return lat < 90 && lat > -90;
+    return lat <= 90 && lat >= -90;
 }
 
 optional<Tileset> Converter<Tileset>::operator()(const Convertible& value, Error& error) const {
diff --git a/test/style/conversion/tileset.test.cpp b/test/style/conversion/tileset.test.cpp
index 8002cd038f..9487277cca 100644
--- a/test/style/conversion/tileset.test.cpp
+++ b/test/style/conversion/tileset.test.cpp
@@ -52,6 +52,16 @@ TEST(Tileset, InvalidBounds) {
     }
 }
 
+TEST(Tileset, ValidWorldBounds) {
+    Error error;
+    mbgl::optional<Tileset> converted = convertJSON<Tileset>(R"JSON({
+        "tiles": ["http://mytiles"],
+        "bounds": [-180, -90, 180, 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({
-- 
cgit v1.2.1