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

6
platform/android/src/map/camera_position.cpp
View File

@@ -14,7 +14,7 @@ jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mb
// convert bearing, measured in radians counterclockwise from true north.
// Wrapped to [−π rad, π rad). Android binding from 0 to 360 degrees
double bearing_degrees = -options.angle.value_or(0) * util::RAD2DEG;
double bearing_degrees = options.angle.value_or(0);
while (bearing_degrees > 360) {
bearing_degrees -= 360;
}
@@ -23,7 +23,7 @@ jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mb
}
// convert tilt, core ranges from [0 rad, 1,0472 rad], android ranges from 0 to 60
double tilt_degrees = options.pitch.value_or(0) * util::RAD2DEG;
double tilt_degrees = options.pitch.value_or(0);
return javaClass.New(env, constructor, LatLng::New(env, center), options.zoom.value_or(0), tilt_degrees, bearing_degrees);
}
@@ -42,7 +42,7 @@ mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, const jni
{},
{},
position.Get(env, zoom),
position.Get(env, bearing) * util::DEG2RAD,
position.Get(env, bearing),
position.Get(env, tilt)
};
}