summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-11-09 10:51:40 +0100
committerGitHub <noreply@github.com>2016-11-09 10:51:40 +0100
commit4030e86c33c8863c4c255201e6a7f3ff447000ed (patch)
treef384b1764c38cd2969372bb144dafffcfaef8690 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
parent772324e8f2a316bf82774732dd60bb7af5acdb18 (diff)
downloadqtlocation-mapboxgl-4030e86c33c8863c4c255201e6a7f3ff447000ed.tar.gz
[android] - fix inconsistency of float usage in CameraPosition and CameraUpdateFactory (#6941)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
index 300804c468..15733eb93c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
@@ -92,8 +92,8 @@ public class MyLocationView extends View {
private PointF screenLocation;
// camera vars
- private float bearing;
- private float tilt;
+ private double bearing;
+ private double tilt;
// Controls the compass update rate in milliseconds
private static final int COMPASS_UPDATE_RATE_MS = 500;
@@ -266,7 +266,7 @@ public class MyLocationView extends View {
// put camera in position
camera.save();
- camera.rotate(tilt, 0, 0);
+ camera.rotate((float) tilt, 0, 0);
camera.getMatrix(matrix);
if (myBearingTrackingMode != MyBearingTracking.NONE && directionAnimator != null) {
@@ -306,14 +306,14 @@ public class MyLocationView extends View {
}
public void setTilt(@FloatRange(from = 0, to = 60.0f) double tilt) {
- this.tilt = (float) tilt;
+ this.tilt = tilt;
if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) {
mapboxMap.getUiSettings().setFocalPoint(new PointF(getCenterX(), getCenterY()));
}
}
public void setBearing(double bearing) {
- this.bearing = (float) bearing;
+ this.bearing = bearing;
}
public void setCameraPosition(CameraPosition position) {
@@ -385,7 +385,7 @@ public class MyLocationView extends View {
protected Parcelable onSaveInstanceState() {
Bundle bundle = new Bundle();
bundle.putParcelable("superState", super.onSaveInstanceState());
- bundle.putFloat("tilt", tilt);
+ bundle.putDouble("tilt", tilt);
return bundle;
}
@@ -475,7 +475,7 @@ public class MyLocationView extends View {
invalidate();
}
- private void setCompass(float bearing) {
+ private void setCompass(double bearing) {
float oldDir = previousDirection;
if (directionAnimator != null) {
oldDir = (Float) directionAnimator.getAnimatedValue();
@@ -483,7 +483,7 @@ public class MyLocationView extends View {
directionAnimator = null;
}
- float newDir = bearing;
+ float newDir = (float) bearing;
float diff = oldDir - newDir;
if (diff > 180.0f) {
newDir += 360.0f;