summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2017-02-17 12:09:30 +0100
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-02-20 16:52:18 -0800
commita0992f05504ae093b5f770a5e5324307a12fc002 (patch)
treebd883e0b8c48ec592390f063b6195e162af5d064 /platform/android
parent55804f827316804a84eb10df1235f0a05501f1c3 (diff)
downloadqtlocation-mapboxgl-a0992f05504ae093b5f770a5e5324307a12fc002.tar.gz
[core] - allow moveBy to use AnimationOptions
[android] - update jni bindings for moveBy with an interpolator
Diffstat (limited to 'platform/android')
-rwxr-xr-xplatform/android/src/jni.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index a0ec21eb9f..3f5f48561b 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -488,7 +488,14 @@ void nativeMoveBy(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jdoubl
jlong duration) {
assert(nativeMapViewPtr != 0);
NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
- nativeMapView->getMap().moveBy({dx, dy}, mbgl::Milliseconds(duration));
+
+ mbgl::AnimationOptions animationOptions;
+ if (duration > 0) {
+ animationOptions.duration.emplace(mbgl::Milliseconds(duration));
+ animationOptions.easing.emplace(mbgl::util::UnitBezier { 0, 0.3, 0.6, 1.0 });
+ }
+
+ nativeMapView->getMap().moveBy({dx, dy}, animationOptions);
}
void nativeSetLatLng(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jdouble latitude, jdouble longitude, jlong duration) {