From 52cce7925d32181a20a79978479c5552fa6ae810 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 23 Nov 2018 22:47:40 +0200 Subject: [core] Camera center and anchor points are mutually exclusive --- src/mbgl/map/transform.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index 0d633499cf..03a1e117f7 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -561,7 +561,9 @@ void Transform::startTransition(const CameraOptions& camera, observer.onCameraWillChange(isAnimated ? MapObserver::CameraChangeMode::Animated : MapObserver::CameraChangeMode::Immediate); // Associate the anchor, if given, with a coordinate. - optional anchor = camera.anchor; + // Anchor and center points are mutually exclusive, with preference for the + // center point when both are set. + optional anchor = camera.center ? nullopt : camera.anchor; LatLng anchorLatLng; if (anchor) { anchor->y = state.size.height - anchor->y; -- cgit v1.2.1