From cfca379651622e73e5cf78396b7edbf23a6c44d5 Mon Sep 17 00:00:00 2001
From: Tobrun Van Nuland <tobrun.van.nuland@gmail.com>
Date: Mon, 6 Jun 2016 12:37:06 +0200
Subject: [android] #5241 -float rotation on markerview

---
 .../com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java     | 6 +++---
 .../java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java    | 4 ++--
 .../testapp/model/annotations/CountryMarkerViewOptions.java         | 6 +++---
 .../mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'platform')

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));
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java
index 49016fe627..abf5f19aca 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java
@@ -23,8 +23,8 @@ public class CountryMarkerViewOptions extends BaseMarkerViewOptions<CountryMarke
         title(in.readString());
         flat(in.readByte() != 0);
         anchor(in.readFloat(), in.readFloat());
-        infoWindowAnchor(in.readFloat(), in.readFloat());
-        rotation(in.readInt());
+        selected = in.readByte() != 0;
+        rotation(in.readFloat());
         if (in.readByte() != 0) {
             // this means we have an icon
             String iconId = in.readString();
@@ -56,8 +56,8 @@ public class CountryMarkerViewOptions extends BaseMarkerViewOptions<CountryMarke
         out.writeFloat(getAnchorV());
         out.writeFloat(getInfoWindowAnchorU());
         out.writeFloat(getInfoWindowAnchorV());
-        out.writeInt(getRotation());
         out.writeByte((byte) (selected ? 1 : 0));
+        out.writeFloat(getRotation());
         Icon icon = getIcon();
         out.writeByte((byte) (icon != null ? 1 : 0));
         if (icon != null) {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java
index 1cef749807..0b2a365e5d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java
@@ -23,7 +23,7 @@ public class TextMarkerViewOptions extends BaseMarkerViewOptions<TextMarkerView,
         flat(in.readByte() != 0);
         anchor(in.readFloat(), in.readFloat());
         infoWindowAnchor(in.readFloat(), in.readFloat());
-        rotation(in.readInt());
+        rotation(in.readFloat());
         if (in.readByte() != 0) {
             // this means we have an icon
             String iconId = in.readString();
@@ -54,7 +54,7 @@ public class TextMarkerViewOptions extends BaseMarkerViewOptions<TextMarkerView,
         out.writeFloat(getAnchorV());
         out.writeFloat(getInfoWindowAnchorU());
         out.writeFloat(getInfoWindowAnchorV());
-        out.writeInt(getRotation());
+        out.writeFloat(getRotation());
         Icon icon = getIcon();
         out.writeByte((byte) (icon != null ? 1 : 0));
         if (icon != null) {
-- 
cgit v1.2.1