summaryrefslogtreecommitdiff
path: root/platform/android/src/native_map_view.cpp
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2017-03-30 13:25:42 +0200
committerGitHub <noreply@github.com>2017-03-30 13:25:42 +0200
commit152b48fd92f9c7c33b45b4b1974da43c55d35d42 (patch)
tree28b999bbc8f21e672e3b63baeaee7c6f26e4327f /platform/android/src/native_map_view.cpp
parent93706c65a55a89b8ecea5bf8f850ca10a9601b92 (diff)
downloadqtlocation-mapboxgl-152b48fd92f9c7c33b45b4b1974da43c55d35d42.tar.gz
[android] - consitent use of ms unit for time in java code, unit conversion always happens in cpp code (#8578)
Diffstat (limited to 'platform/android/src/native_map_view.cpp')
-rwxr-xr-xplatform/android/src/native_map_view.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index f1345c01f9..dd4cadbcfb 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -397,7 +397,7 @@ void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu
}
mbgl::AnimationOptions animationOptions;
- animationOptions.duration.emplace(mbgl::Duration(duration));
+ animationOptions.duration.emplace(mbgl::Milliseconds(duration));
if (!easing) {
// add a linear interpolator instead of easing
animationOptions.easing.emplace(mbgl::util::UnitBezier { 0, 0, 1, 1 });
@@ -421,7 +421,7 @@ void NativeMapView::flyTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitud
}
mbgl::AnimationOptions animationOptions;
- animationOptions.duration.emplace(mbgl::Duration(duration));
+ animationOptions.duration.emplace(mbgl::Milliseconds(duration));
map->flyTo(cameraOptions, animationOptions);
}