diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-05-25 11:59:21 +0200 |
---|---|---|
committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-05-25 14:07:45 +0200 |
commit | 75dbbcdcc03a7a4c613b2e49e07d4c975eef0f1b (patch) | |
tree | 226ddb19eeb96ff8af9a2bfc26ec10e4bdb2f477 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java | |
parent | 621bb018454d2edd9e5367fb150045d59def4166 (diff) | |
download | qtlocation-mapboxgl-75dbbcdcc03a7a4c613b2e49e07d4c975eef0f1b.tar.gz |
[android] #5079 - add anchor and InfoWindowAnchor to MarkerView
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java | 16 |
1 files changed, 8 insertions, 8 deletions
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 29435a9d91..a688a8b1a9 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 @@ -1,8 +1,6 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Bitmap; -import android.graphics.Point; -import android.graphics.PointF; import android.os.Parcel; import android.os.Parcelable; @@ -22,8 +20,8 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV snippet(in.readString()); title(in.readString()); flat(in.readByte() != 0); - centerOffset((PointF) in.readParcelable(PointF.class.getClassLoader())); - infoWindowOffset((Point) in.readParcelable(Point.class.getClassLoader())); + anchor(in.readFloat(), in.readFloat()); + infoWindowAnchor(in.readFloat(), in.readFloat()); selectAnimatorResource(in.readInt()); deselectAnimatorResource(in.readInt()); rotation(in.readInt()); @@ -53,8 +51,10 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV out.writeString(getSnippet()); out.writeString(getTitle()); out.writeByte((byte) (isFlat() ? 1 : 0)); - out.writeParcelable(getCenterOffset(), flags); - out.writeParcelable(getInfoWindowOffset(), flags); + out.writeFloat(getAnchorU()); + out.writeFloat(getAnchorV()); + out.writeFloat(getInfoWindowAnchorU()); + out.writeFloat(getInfoWindowAnchorV()); out.writeInt(getSelectAnimRes()); out.writeInt(getDeselectAnimRes()); out.writeInt(getRotation()); @@ -74,8 +74,8 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV marker.setTitle(title); marker.setIcon(icon); marker.setFlat(flat); - marker.setCenterOffset(centerOffset); - marker.setInfoWindowOffset(infoWindowOffset); + marker.setAnchor(anchorU, anchorV); + marker.setInfoWindowAnchor(infoWindowAnchorU, infoWindowAnchorV); marker.setSelectAnimRes(selectAnimRes); marker.setDeselectAnimRes(deselectAnimRes); marker.setRotation(rotation); |