summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-09-30 13:31:54 +0200
committerGitHub <noreply@github.com>2016-09-30 13:31:54 +0200
commit2879b36a43126260e043f35adeb362807168a564 (patch)
treebd9065efe77e3033ba34034d4cd2f217978d6e3d
parent8c4da72d09e585bd10d030129c99e1e609a2d2f9 (diff)
downloadqtlocation-mapboxgl-2879b36a43126260e043f35adeb362807168a564.tar.gz
[android] - convert bearing value coming from core to degrees (#6526)
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java2
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
index e1a464bcdf..4253ff23d7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
@@ -199,7 +199,7 @@ public final class CameraPosition implements Parcelable {
super();
if (values != null && values.length == 5) {
this.target = new LatLng(values[0], values[1]);
- this.bearing = (float) values[2];
+ this.bearing = Math.toDegrees(values[2]);
this.tilt = Math.toRadians(values[3]);
this.zoom = (float) values[4];
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
index 56310be86e..c3ae63a692 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
@@ -72,7 +72,7 @@ public class CameraPositionTest {
double[] cameraVars = new double[]{latitude, longitude, bearing, tilt, zoom};
CameraPosition cameraPosition = new CameraPosition.Builder(cameraVars).build();
- assertEquals("bearing should match", bearing, cameraPosition.bearing, DELTA);
+ assertEquals("bearing should match", Math.toDegrees(bearing), cameraPosition.bearing, DELTA);
assertEquals("latlng should match", new LatLng(latitude, longitude), cameraPosition.target);
assertEquals("tilt should match", Math.toRadians(tilt), cameraPosition.tilt, DELTA);
assertEquals("zoom should match", zoom, cameraPosition.zoom, DELTA);