summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@mapbox.com>2019-08-23 16:07:05 -0400
committerJulian Rex <julian.rex@mapbox.com>2019-08-26 08:09:00 -0400
commit683753f9e5e2c63447504a37693497850ed7d28d (patch)
treeaf83a55723b967791597d29f750c3b0c75a8ce95
parent8f568f32d617a5851d2cc8740ae482c238671f7c (diff)
downloadqtlocation-mapboxgl-683753f9e5e2c63447504a37693497850ed7d28d.tar.gz
[core] pass finish function instead of options (as that would make jumpTo the same as easeTo)
-rw-r--r--src/mbgl/map/transform.cpp4
-rw-r--r--src/mbgl/map/transform.hpp2
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<void()> 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<void()> 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.*/