Fix TileJSON conversion to allow single point bounds

2 files changed, 17 insertions, 6 deletions

diff --git a/src/mbgl/style/conversion/tileset.cpp b/src/mbgl/style/conversion/tileset.cpp
index fe3254b149..f302fc782f 100644
--- a/src/mbgl/style/conversion/tileset.cpp
+++ b/src/mbgl/style/conversion/tileset.cpp
@@ -95,14 +95,15 @@ 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){
-            error = { "bounds bottom latitude must be smaller than top latitude" };
-            return {};
+
+        if (*top < *bottom){
+            error.message = "bounds bottom latitude must be smaller than top latitude";
+            return nullopt;
         }
 
-        if(*left >= *right) {
-            error = { "bounds left longitude should be less than right longitude" };
-            return {};
+        if(*left > *right) {
+            error.message = "bounds left longitude should be less than right longitude";
+            return nullopt;
         }
         left = util::max(-180.0, *left);
         right = util::min(180.0, *right);
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({