tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] CameraOptions receives and outputs angle and pitch as degrees, not radians

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2018-10-16 15:53:27 +02:00
parent 0c6b1629ef
commit 98c36fc06e
11 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/android/src/native_map_view.cpp
View File

@@ -257,12 +257,12 @@ void NativeMapView::moveBy(jni::JNIEnv&, jni::jdouble dx, jni::jdouble dy, jni::
void NativeMapView::jumpTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jdouble pitch, jni::jdouble zoom) {
mbgl::CameraOptions options;
if (angle != -1) {
options.angle = -angle * util::DEG2RAD;
options.angle = angle;
}
options.center = mbgl::LatLng(latitude, longitude);
options.padding = insets;
if (pitch != -1) {
options.pitch = pitch * util::DEG2RAD;
options.pitch = pitch;
}
if (zoom != -1) {
options.zoom = zoom;
@@ -274,12 +274,12 @@ void NativeMapView::jumpTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu
void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom, jni::jboolean easing) {
mbgl::CameraOptions cameraOptions;
if (angle != -1) {
cameraOptions.angle = -angle * util::DEG2RAD;
cameraOptions.angle = angle;
}
cameraOptions.center = mbgl::LatLng(latitude, longitude);
cameraOptions.padding = insets;
if (pitch != -1) {
cameraOptions.pitch = pitch * util::DEG2RAD;
cameraOptions.pitch = pitch;
}
if (zoom != -1) {
cameraOptions.zoom = zoom;
@@ -298,12 +298,12 @@ void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu
void NativeMapView::flyTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom) {
mbgl::CameraOptions cameraOptions;
if (angle != -1) {
cameraOptions.angle = -angle * util::DEG2RAD;
cameraOptions.angle = angle;
}
cameraOptions.center = mbgl::LatLng(latitude, longitude);
cameraOptions.padding = insets;
if (pitch != -1) {
cameraOptions.pitch = pitch * util::DEG2RAD;
cameraOptions.pitch = pitch;
}
if (zoom != -1) {
cameraOptions.zoom = zoom;
@@ -416,8 +416,7 @@ void NativeMapView::setVisibleCoordinateBounds(JNIEnv& env, const jni::Array<jni
mbgl::EdgeInsets mbglInsets = { RectF::getTop(env, padding), RectF::getLeft(env, padding), RectF::getBottom(env, padding), RectF::getRight(env, padding) };
mbgl::CameraOptions cameraOptions = map->cameraForLatLngs(latLngs, mbglInsets);
if (direction >= 0) {
// convert from degrees to radians
cameraOptions.angle = (-direction * M_PI) / 180;
cameraOptions.angle = direction;
}
mbgl::AnimationOptions animationOptions;