diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 14:47:58 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 17:56:48 -0800 |
commit | 9b62661b07e86fc1d64e308fde3e15527c1cd8c8 (patch) | |
tree | c27b37e3f94b53d4fdd5855d1eb68868ce803bae /platform | |
parent | 48cced9e311d5c1cf2a98937eeaf638c94456c8d (diff) | |
download | qtlocation-mapboxgl-9b62661b07e86fc1d64e308fde3e15527c1cd8c8.tar.gz |
[core] Use experimental optional instead of mapbox::util::optional
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/jni.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index e8d68170a2..8157820d70 100644 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -1297,9 +1297,9 @@ void JNICALL nativeSetVisibleCoordinateBounds(JNIEnv *env, jobject obj, jlong na } mbgl::AnimationOptions animationOptions; if (duration > 0) { - animationOptions.duration = std::chrono::milliseconds(duration); + animationOptions.duration = mbgl::Duration(std::chrono::milliseconds(duration)); // equivalent to kCAMediaTimingFunctionDefault in iOS - animationOptions.easing = {0.25, 0.1, 0.25, 0.1}; + animationOptions.easing = mbgl::util::UnitBezier(0.25, 0.1, 0.25, 0.1); } nativeMapView->getMap().easeTo(cameraOptions, animationOptions); |