diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-18 17:56:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-18 17:56:39 +0200 |
commit | 0ccc7f51ba1d3377b93b4dddc3a4a03d0fda2260 (patch) | |
tree | 2cc139be5b37b03e6731d236fd85020b7242ca92 /platform/android/src/jni.cpp | |
parent | 87885008a670739addcc633202c93fc0b7d28684 (diff) | |
download | qtlocation-mapboxgl-0ccc7f51ba1d3377b93b4dddc3a4a03d0fda2260.tar.gz |
[android] - fixup MyLocationView heading (#6671)
[android] - convert angles to radiants in jni, correct follow animation for MyLocationView
do not sanitise input when recreating from other camera object, input is already sanitised before
cleanup mylocationview, made animation bit more smooth, improved UX when switching between tracking modes
cleanup CameraUpdateFactory, hide internally used api.
only invalidate position if required, remove outdated comments
correct camera position values
made zoom activity a bit more interesting
made dynamic marker activity a bit more interesting
FIXUP
Diffstat (limited to 'platform/android/src/jni.cpp')
-rwxr-xr-x | platform/android/src/jni.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index 4313b19323..19981c0ea7 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -512,7 +512,7 @@ jdoubleArray nativeGetCameraValues(JNIEnv *env, jni::jobject* obj, jlong nativeM jdouble buf[5]; buf[0] = latLng.latitude; buf[1] = latLng.longitude; - buf[2] = nativeMapView->getMap().getBearing(); + buf[2] = -(nativeMapView->getMap().getBearing()-360); buf[3] = nativeMapView->getMap().getPitch(); buf[4] = nativeMapView->getMap().getZoom(); env->SetDoubleArrayRegion(output, start, leng, buf); @@ -1057,12 +1057,12 @@ void nativeJumpTo(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jdoubl mbgl::CameraOptions options; if (angle != -1) { - options.angle = angle; + options.angle = angle * M_PI / 180; } options.center = mbgl::LatLng(latitude, longitude); options.padding = nativeMapView->getInsets(); if (pitch != -1) { - options.pitch = pitch; + options.pitch = pitch * M_PI / 180; } if (zoom != -1) { options.zoom = zoom; @@ -1077,12 +1077,12 @@ void nativeEaseTo(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jdoubl mbgl::CameraOptions cameraOptions; if (angle != -1) { - cameraOptions.angle = angle; + cameraOptions.angle = angle * M_PI / 180; } cameraOptions.center = mbgl::LatLng(latitude, longitude); cameraOptions.padding = nativeMapView->getInsets(); if (pitch != -1) { - cameraOptions.pitch = pitch; + cameraOptions.pitch = pitch * M_PI / 180; } if (zoom != -1) { cameraOptions.zoom = zoom; @@ -1110,12 +1110,12 @@ void nativeFlyTo(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jdouble mbgl::CameraOptions cameraOptions; if (angle != -1) { - cameraOptions.angle = angle; + cameraOptions.angle = angle * M_PI / 180 ; } cameraOptions.center = mbgl::LatLng(latitude, longitude); cameraOptions.padding = nativeMapView->getInsets(); if (pitch != -1) { - cameraOptions.pitch = pitch; + cameraOptions.pitch = pitch * M_PI / 180; } if (zoom != -1) { cameraOptions.zoom = zoom; |