diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-06-06 12:37:06 +0200 |
---|---|---|
committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-06-06 13:58:04 +0200 |
commit | cfca379651622e73e5cf78396b7edbf23a6c44d5 (patch) | |
tree | 3a80a91257803348a4355ffb7d7d28e4bf959170 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations | |
parent | eb5ff35d6e37f1d1453c4d270043fab6e14c945d (diff) | |
download | qtlocation-mapboxgl-cfca379651622e73e5cf78396b7edbf23a6c44d5.tar.gz |
[android] #5241 -float rotation on markerview
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations')
2 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java index 9a771147f5..c3fba55c58 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java @@ -25,7 +25,7 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base protected float anchorV = 1f; protected float infoWindowAnchorU = 0.5f; protected float infoWindowAnchorV = 0.0f; - protected int rotation; + protected float rotation; protected boolean visible = true; protected boolean selected; @@ -122,7 +122,7 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base * @param rotation the rotation value * @return the object for which the method was called */ - public T rotation(int rotation) { + public T rotation(float rotation) { this.rotation = rotation; return getThis(); } @@ -224,7 +224,7 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base * * @return the rotation value */ - public int getRotation() { + public float getRotation() { return rotation; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java index 5340169421..c6735a3c8d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java @@ -28,7 +28,7 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV flat(in.readByte() != 0); anchor(in.readFloat(), in.readFloat()); infoWindowAnchor(in.readFloat(), in.readFloat()); - rotation(in.readInt()); + rotation(in.readFloat()); visible(in.readByte() != 0); if (in.readByte() != 0) { // this means we have an icon @@ -59,7 +59,7 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV out.writeFloat(getAnchorV()); out.writeFloat(getInfoWindowAnchorU()); out.writeFloat(getInfoWindowAnchorV()); - out.writeInt(getRotation()); + out.writeFloat(getRotation()); out.writeByte((byte) (isVisible() ? 1 : 0)); Icon icon = getIcon(); out.writeByte((byte) (icon != null ? 1 : 0)); |