From 683753f9e5e2c63447504a37693497850ed7d28d Mon Sep 17 00:00:00 2001 From: Julian Rex Date: Fri, 23 Aug 2019 16:07:05 -0400 Subject: [core] pass finish function instead of options (as that would make jumpTo the same as easeTo) --- src/mbgl/map/transform.cpp | 4 ++-- src/mbgl/map/transform.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index 495aacd9bd..8667265278 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -72,8 +72,8 @@ CameraOptions Transform::getCameraOptions(const EdgeInsets& padding) const { * a transition. The map will retain the current values for any options * not included in `options`. */ - void Transform::jumpTo(const CameraOptions& camera, const AnimationOptions& animation) { - easeTo(camera, animation); +void Transform::jumpTo(const CameraOptions& camera, std::function finish) { + easeTo(camera, finish); } /** diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index 8fdfb333f3..7813d8aa5b 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -32,7 +32,7 @@ public: CameraOptions getCameraOptions(const EdgeInsets&) const; /** Instantaneously, synchronously applies the given camera options. */ - void jumpTo(const CameraOptions&, const AnimationOptions& = {}); + void jumpTo(const CameraOptions&, std::function finish = nullptr); /** Asynchronously transitions all specified camera options linearly along an optional time curve. However, center coordinate is not transitioned linearly as, instead, ground speed is kept linear.*/ -- cgit v1.2.1