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/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model | |
| parent | eb5ff35d6e37f1d1453c4d270043fab6e14c945d (diff) | |
| download | qtlocation-mapboxgl-cfca379651622e73e5cf78396b7edbf23a6c44d5.tar.gz | |
[android] #5241 -float rotation on markerview
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model')
2 files changed, 5 insertions, 5 deletions
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) { |