summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2019-02-11 14:44:11 +0100
committertobrun <tobrun.van.nuland@gmail.com>2019-02-11 15:08:35 +0100
commitf52b4d2b621c00623d22ecbaee19cfecb6cc88bc (patch)
treeedeae01af82d5552a10a6e8a20b49032072e5974
parent7acaa3b467552e952354b17bd39b913a02a90167 (diff)
downloadqtlocation-mapboxgl-upstream/tvn-bounds-check.tar.gz
[core] - change easeTo logic for constrained boundsupstream/tvn-bounds-check
-rw-r--r--src/mbgl/map/transform.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index 5854eaea37..ea426e8b17 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -83,7 +83,7 @@ void Transform::jumpTo(const CameraOptions& camera) {
*/
void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& animation) {
const LatLng unwrappedLatLng = camera.center.value_or(getLatLng());
- const LatLng latLng = unwrappedLatLng.wrapped();
+ const LatLng latLng = state.bounds ? unwrappedLatLng : unwrappedLatLng.wrapped();
double zoom = camera.zoom.value_or(getZoom());
double angle = camera.angle ? -*camera.angle * util::DEG2RAD : getAngle();
double pitch = camera.pitch ? *camera.pitch * util::DEG2RAD : getPitch();