summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2018-03-14 12:08:24 -0400
committerJason Wray <jason@mapbox.com>2018-03-14 12:48:30 -0400
commit11d506f8034c02103bc33e06ae8913be7908a877 (patch)
tree45aca5ceffc6547a61c5f9818dec8deb65ba133e /src
parentd7bc36db6f3aa46246bc1aae1c5c63c56b5ce262 (diff)
parent4544b7aae9ab96ff89f3e46a1ee38ce0af95054f (diff)
downloadqtlocation-mapboxgl-11d506f8034c02103bc33e06ae8913be7908a877.tar.gz
Merge tag 'ios-v3.7.6' into master
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/conversion/tileset.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/style/conversion/tileset.cpp b/src/mbgl/style/conversion/tileset.cpp
index 6d89cef944..a2c4aa80b3 100644
--- a/src/mbgl/style/conversion/tileset.cpp
+++ b/src/mbgl/style/conversion/tileset.cpp
@@ -103,6 +103,8 @@ optional<Tileset> Converter<Tileset>::operator()(const Convertible& value, Error
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 });
}