[android] Anchoring was only set once while it was still unmeasured. There are times that a view is still unmeasured even after a measure call. We need to validate again before setting the offset. (#6154)

2 files changed, 12 insertions, 4 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
index 9631bc4ca8..eb6d6d6647 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import com.mapbox.mapboxsdk.R;
+import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.Projection;
@@ -115,14 +116,16 @@ public class MarkerViewManager {
             final View convertView = markerViewMap.get(marker);
             if (convertView != null) {
                 PointF point = mapboxMap.getProjection().toScreenLocation(marker.getPosition());
-                if (marker.getOffsetX() == -1) {
+                if (marker.getOffsetX() == MapboxConstants.UNMEASURED) {
                     // ensure view is measured first
                     if (convertView.getMeasuredWidth() == 0) {
                         convertView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
                     }
-                    int x = (int) (marker.getAnchorU() * convertView.getMeasuredWidth());
-                    int y = (int) (marker.getAnchorV() * convertView.getMeasuredHeight());
-                    marker.setOffset(x, y);
+                    if (convertView.getMeasuredWidth() != 0) {
+                        int x = (int) (marker.getAnchorU() * convertView.getMeasuredWidth());
+                        int y = (int) (marker.getAnchorV() * convertView.getMeasuredHeight());
+                        marker.setOffset(x, y);
+                    }
                 }
 
                 convertView.setX(point.x - marker.getOffsetX());
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
index 3993615eb9..b4737809fe 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
@@ -41,6 +41,11 @@ public class MapboxConstants {
     public final static boolean DEFAULT_SET_STORAGE_EXTERNAL = false;
 
     /**
+     * Unmeasured state
+     */
+    public final static float UNMEASURED = -1f;
+
+    /**
      * Default animation time
      */
     public static final int ANIMATION_DURATION = 300;