react-native-maps 1.21.0-alpha.99 → 1.22.0

package/android/src/main/java/com/rnmaps/maps/MapMarker.java

@@ -57,595 +57,599 @@ import java.util.Map;
 
 public class MapMarker extends MapFeature {
 
-  private MarkerOptions markerOptions;
-  private Marker marker;
-  private int width;
-  private int height;
-  private String identifier;
-
-  private LatLng position;
-  private String title;
-  private String snippet;
-
-  private boolean anchorIsSet;
-  private float anchorX;
-  private float anchorY;
-
-  private MapCallout calloutView;
-  private View wrappedCalloutView;
-  private final Context context;
-
-  private float markerHue = 0.0f; // should be between 0 and 360
-  private BitmapDescriptor iconBitmapDescriptor;
-  private Bitmap iconBitmap;
-
-  private float rotation = 0.0f;
-  private boolean flat = false;
-  private boolean draggable = false;
-  private int zIndex = 0;
-  private float opacity = 1.0f;
-
-  private float calloutAnchorX;
-  private float calloutAnchorY;
-  private boolean calloutAnchorIsSet;
-
-  private boolean tracksViewChanges = true;
-  private boolean tracksViewChangesActive = false;
-
-  private boolean hasCustomMarkerView = false;
-  private final MapMarkerManager markerManager;
-  private String imageUri;
-  private boolean loadingImage;
-
-  private final DraweeHolder<?> logoHolder;
-  private ImageManager.OnImageLoadedListener imageLoadedListener;
-  private DataSource<CloseableReference<CloseableImage>> dataSource;
-  private final ControllerListener<ImageInfo> mLogoControllerListener =
-      new BaseControllerListener<ImageInfo>() {
-    @Override
-    public void onSubmit(String id, Object callerContext){
-        loadingImage = true;
-    }
-        @Override
-        public void onFinalImageSet(
-            String id,
-            @Nullable final ImageInfo imageInfo,
-            @Nullable Animatable animatable) {
-          CloseableReference<CloseableImage> imageReference = null;
-          try {
-            imageReference = dataSource.getResult();
-            if (imageReference != null) {
-              CloseableImage image = imageReference.get();
-              if (image instanceof CloseableStaticBitmap) {
-                CloseableStaticBitmap closeableStaticBitmap = (CloseableStaticBitmap) image;
-                Bitmap bitmap = closeableStaticBitmap.getUnderlyingBitmap();
-                if (bitmap != null) {
-                  bitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
-                  iconBitmap = bitmap;
-                  iconBitmapDescriptor = BitmapDescriptorFactory.fromBitmap(bitmap);
+    private MarkerOptions markerOptions;
+    private Marker marker;
+    private int width;
+    private int height;
+    private String identifier;
+
+    private LatLng position;
+    private String title;
+    private String snippet;
+
+    private boolean anchorIsSet;
+    private float anchorX;
+    private float anchorY;
+
+    private MapCallout calloutView;
+    private View wrappedCalloutView;
+    private final Context context;
+
+    private float markerHue = 0.0f; // should be between 0 and 360
+    private BitmapDescriptor iconBitmapDescriptor;
+    private Bitmap iconBitmap;
+
+    private float rotation = 0.0f;
+    private boolean flat = false;
+    private boolean draggable = false;
+    private int zIndex = 0;
+    private float opacity = 1.0f;
+
+    private float calloutAnchorX;
+    private float calloutAnchorY;
+    private boolean calloutAnchorIsSet;
+
+    private boolean tracksViewChanges = true;
+    private boolean tracksViewChangesActive = false;
+
+    private boolean hasCustomMarkerView = false;
+    private final MapMarkerManager markerManager;
+    private String imageUri;
+    private boolean loadingImage;
+
+    private final DraweeHolder<?> logoHolder;
+    private ImageManager.OnImageLoadedListener imageLoadedListener;
+    private DataSource<CloseableReference<CloseableImage>> dataSource;
+    private final ControllerListener<ImageInfo> mLogoControllerListener =
+            new BaseControllerListener<ImageInfo>() {
+                @Override
+                public void onSubmit(String id, Object callerContext) {
+                    loadingImage = true;
+                }
+
+                @Override
+                public void onFinalImageSet(
+                        String id,
+                        @Nullable final ImageInfo imageInfo,
+                        @Nullable Animatable animatable) {
+                    CloseableReference<CloseableImage> imageReference = null;
+                    try {
+                        imageReference = dataSource.getResult();
+                        if (imageReference != null) {
+                            CloseableImage image = imageReference.get();
+                            if (image instanceof CloseableStaticBitmap) {
+                                CloseableStaticBitmap closeableStaticBitmap = (CloseableStaticBitmap) image;
+                                Bitmap bitmap = closeableStaticBitmap.getUnderlyingBitmap();
+                                if (bitmap != null) {
+                                    bitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+                                    iconBitmap = bitmap;
+                                    iconBitmapDescriptor = BitmapDescriptorFactory.fromBitmap(bitmap);
+                                }
+                            }
+                        }
+                    } finally {
+                        dataSource.close();
+                        if (imageReference != null) {
+                            CloseableReference.closeSafely(imageReference);
+                        }
+                    }
+                    if (MapMarker.this.markerManager != null && MapMarker.this.imageUri != null) {
+                        MapMarker.this.markerManager.getSharedIcon(MapMarker.this.imageUri)
+                                .updateIcon(iconBitmapDescriptor, iconBitmap);
+                    }
+                    update(true);
+                    loadingImage = false;
+                    if (imageLoadedListener != null) {
+                        imageLoadedListener.onImageLoaded(null, null, false);
+                        // fire and forget
+                        imageLoadedListener = null;
+                    }
                 }
-              }
+            };
+
+    public MapMarker(Context context, MapMarkerManager markerManager) {
+        super(context);
+        this.context = context;
+        this.markerManager = markerManager;
+        logoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
+        logoHolder.onAttach();
+    }
+
+    public MapMarker(Context context, MarkerOptions options, MapMarkerManager markerManager) {
+        super(context);
+        this.context = context;
+        this.markerManager = markerManager;
+        logoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
+        logoHolder.onAttach();
+
+        position = options.getPosition();
+        setAnchor(options.getAnchorU(), options.getAnchorV());
+        setCalloutAnchor(options.getInfoWindowAnchorU(), options.getInfoWindowAnchorV());
+        setTitle(options.getTitle());
+        setSnippet(options.getSnippet());
+        setRotation(options.getRotation());
+        setFlat(options.isFlat());
+        setDraggable(options.isDraggable());
+        setZIndex(Math.round(options.getZIndex()));
+        setOpacity(options.getAlpha());
+        iconBitmapDescriptor = options.getIcon();
+    }
+
+    private GenericDraweeHierarchy createDraweeHierarchy() {
+        return new GenericDraweeHierarchyBuilder(getResources())
+                .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
+                .setFadeDuration(0)
+                .build();
+    }
+
+    public void setCoordinate(ReadableMap coordinate) {
+        setCoordinate(new LatLng(coordinate.getDouble("latitude"), coordinate.getDouble("longitude")));
+    }
+
+    public void setCoordinate(LatLng position) {
+        this.position = position;
+        if (marker != null) {
+            marker.setPosition(position);
+        }
+        update(false);
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+        update(false);
+    }
+
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+        if (marker != null) {
+            marker.setTitle(title);
+        }
+        update(false);
+    }
+
+    public void setSnippet(String snippet) {
+        this.snippet = snippet;
+        if (marker != null) {
+            marker.setSnippet(snippet);
+        }
+        update(false);
+    }
+
+    public void setRotation(float rotation) {
+        this.rotation = rotation;
+        if (marker != null) {
+            marker.setRotation(rotation);
+        }
+        update(false);
+    }
+
+    public void setFlat(boolean flat) {
+        this.flat = flat;
+        if (marker != null) {
+            marker.setFlat(flat);
+        }
+        update(false);
+    }
+
+    public void setDraggable(boolean draggable) {
+        this.draggable = draggable;
+        if (marker != null) {
+            marker.setDraggable(draggable);
+        }
+        update(false);
+    }
+
+    public void setZIndex(int zIndex) {
+        this.zIndex = zIndex;
+        if (marker != null) {
+            marker.setZIndex(zIndex);
+        }
+        update(false);
+    }
+
+    public void setOpacity(float opacity) {
+        this.opacity = opacity;
+        if (marker != null) {
+            marker.setAlpha(opacity);
+        }
+        update(false);
+    }
+
+    public void setMarkerHue(float markerHue) {
+        this.markerHue = markerHue;
+        update(false);
+    }
+
+    public void setAnchor(double x, double y) {
+        anchorIsSet = true;
+        anchorX = (float) x;
+        anchorY = (float) y;
+        if (marker != null) {
+            marker.setAnchor(anchorX, anchorY);
+        }
+        update(false);
+    }
+
+    public void setCalloutAnchor(double x, double y) {
+        calloutAnchorIsSet = true;
+        calloutAnchorX = (float) x;
+        calloutAnchorY = (float) y;
+        if (marker != null) {
+            marker.setInfoWindowAnchor(calloutAnchorX, calloutAnchorY);
+        }
+        update(false);
+    }
+
+    public void setTracksViewChanges(boolean tracksViewChanges) {
+        this.tracksViewChanges = tracksViewChanges;
+        updateTracksViewChanges();
+    }
+
+    private void updateTracksViewChanges() {
+        boolean shouldTrack = tracksViewChanges && hasCustomMarkerView && marker != null;
+        if (shouldTrack == tracksViewChangesActive) return;
+        tracksViewChangesActive = shouldTrack;
+
+        if (shouldTrack) {
+            ViewChangesTracker.getInstance().addMarker(this);
+        } else {
+            ViewChangesTracker.getInstance().removeMarker(this);
+
+            // Let it render one more time to avoid race conditions.
+            // i.e. Image onLoad ->
+            //      ViewChangesTracker may not get a chance to render ->
+            //      setState({ tracksViewChanges: false }) ->
+            //      image loaded but not rendered.
+            updateMarkerIcon();
+        }
+    }
+
+    public LatLng getPosition() {
+        return position;
+    }
+
+    public boolean updateCustomForTracking() {
+        if (!tracksViewChangesActive)
+            return false;
+
+        updateMarkerIcon();
+
+        return true;
+    }
+
+    public void updateMarkerIcon() {
+        if (marker == null) return;
+
+        marker.setIcon(getIcon());
+    }
+
+    public LatLng interpolate(float fraction, LatLng a, LatLng b) {
+        double lat = (b.latitude - a.latitude) * fraction + a.latitude;
+        double lng = (b.longitude - a.longitude) * fraction + a.longitude;
+        return new LatLng(lat, lng);
+    }
+
+    public void animateToCoodinate(LatLng finalPosition, Integer duration) {
+        TypeEvaluator<LatLng> typeEvaluator = new TypeEvaluator<LatLng>() {
+            @Override
+            public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
+                return interpolate(fraction, startValue, endValue);
+            }
+        };
+        Property<Marker, LatLng> property = Property.of(Marker.class, LatLng.class, "position");
+        ObjectAnimator animator = ObjectAnimator.ofObject(
+                marker,
+                property,
+                typeEvaluator,
+                finalPosition);
+        animator.setDuration(duration);
+        animator.start();
+    }
+
+    public void setImage(String uri) {
+
+        boolean shouldLoadImage = true;
+
+        if (this.markerManager != null) {
+            // remove marker from previous shared icon if needed, to avoid future updates from it.
+            // remove the shared icon completely if no markers on it as well.
+            // this is to avoid memory leak due to orphan bitmaps.
+            //
+            // However in case where client want to update all markers from icon A to icon B
+            // and after some time to update back from icon B to icon A
+            // it may be better to keep it though. We assume that is rare.
+            if (this.imageUri != null) {
+                this.markerManager.getSharedIcon(this.imageUri).removeMarker(this);
+                this.markerManager.removeSharedIconIfEmpty(this.imageUri);
             }
-          } finally {
-            dataSource.close();
-            if (imageReference != null) {
-              CloseableReference.closeSafely(imageReference);
+            if (uri != null) {
+                // listening for marker bitmap descriptor update, as well as check whether to load the image.
+                MapMarkerManager.AirMapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
+                sharedIcon.addMarker(this);
+                shouldLoadImage = sharedIcon.shouldLoadImage();
             }
-          }
-          if (MapMarker.this.markerManager != null && MapMarker.this.imageUri != null) {
-            MapMarker.this.markerManager.getSharedIcon(MapMarker.this.imageUri)
-                .updateIcon(iconBitmapDescriptor, iconBitmap);
-          }
-          update(true);
-          loadingImage = false;
-          if (imageLoadedListener != null){
-            imageLoadedListener.onImageLoaded(null, null, false);
-            // fire and forget
-            imageLoadedListener = null;
-          }
         }
-      };
-
-  public MapMarker(Context context, MapMarkerManager markerManager) {
-    super(context);
-    this.context = context;
-    this.markerManager = markerManager;
-    logoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
-    logoHolder.onAttach();
-  }
-
-  public MapMarker(Context context, MarkerOptions options, MapMarkerManager markerManager) {
-    super(context);
-    this.context = context;
-    this.markerManager = markerManager;
-    logoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
-    logoHolder.onAttach();
-
-    position = options.getPosition();
-    setAnchor(options.getAnchorU(), options.getAnchorV());
-    setCalloutAnchor(options.getInfoWindowAnchorU(), options.getInfoWindowAnchorV());
-    setTitle(options.getTitle());
-    setSnippet(options.getSnippet());
-    setRotation(options.getRotation());
-    setFlat(options.isFlat());
-    setDraggable(options.isDraggable());
-    setZIndex(Math.round(options.getZIndex()));
-    setOpacity(options.getAlpha());
-    iconBitmapDescriptor = options.getIcon();
-  }
-
-  private GenericDraweeHierarchy createDraweeHierarchy() {
-    return new GenericDraweeHierarchyBuilder(getResources())
-        .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
-        .setFadeDuration(0)
-        .build();
-  }
-
-  public void setCoordinate(ReadableMap coordinate) {
-    setCoordinate(new LatLng(coordinate.getDouble("latitude"), coordinate.getDouble("longitude")));
-  }
-  public void setCoordinate(LatLng position){
-    this.position = position;
-    if (marker != null) {
-      marker.setPosition(position);
-    }
-    update(false);
-  }
-
-  public void setIdentifier(String identifier) {
-    this.identifier = identifier;
-    update(false);
-  }
-
-  public String getIdentifier() {
-    return this.identifier;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-    if (marker != null) {
-      marker.setTitle(title);
-    }
-    update(false);
-  }
-
-  public void setSnippet(String snippet) {
-    this.snippet = snippet;
-    if (marker != null) {
-      marker.setSnippet(snippet);
-    }
-    update(false);
-  }
-
-  public void setRotation(float rotation) {
-    this.rotation = rotation;
-    if (marker != null) {
-      marker.setRotation(rotation);
-    }
-    update(false);
-  }
-
-  public void setFlat(boolean flat) {
-    this.flat = flat;
-    if (marker != null) {
-      marker.setFlat(flat);
-    }
-    update(false);
-  }
-
-  public void setDraggable(boolean draggable) {
-    this.draggable = draggable;
-    if (marker != null) {
-      marker.setDraggable(draggable);
-    }
-    update(false);
-  }
-
-  public void setZIndex(int zIndex) {
-    this.zIndex = zIndex;
-    if (marker != null) {
-      marker.setZIndex(zIndex);
-    }
-    update(false);
-  }
-
-  public void setOpacity(float opacity) {
-    this.opacity = opacity;
-    if (marker != null) {
-      marker.setAlpha(opacity);
-    }
-    update(false);
-  }
-
-  public void setMarkerHue(float markerHue) {
-    this.markerHue = markerHue;
-    update(false);
-  }
-
-  public void setAnchor(double x, double y) {
-    anchorIsSet = true;
-    anchorX = (float) x;
-    anchorY = (float) y;
-    if (marker != null) {
-      marker.setAnchor(anchorX, anchorY);
-    }
-    update(false);
-  }
-
-  public void setCalloutAnchor(double x, double y) {
-    calloutAnchorIsSet = true;
-    calloutAnchorX = (float) x;
-    calloutAnchorY = (float) y;
-    if (marker != null) {
-      marker.setInfoWindowAnchor(calloutAnchorX, calloutAnchorY);
-    }
-    update(false);
-  }
-
-  public void setTracksViewChanges(boolean tracksViewChanges) {
-    this.tracksViewChanges = tracksViewChanges;
-    updateTracksViewChanges();
-  }
-
-  private void updateTracksViewChanges() {
-    boolean shouldTrack = tracksViewChanges && hasCustomMarkerView && marker != null;
-    if (shouldTrack == tracksViewChangesActive) return;
-    tracksViewChangesActive = shouldTrack;
-
-    if (shouldTrack) {
-      ViewChangesTracker.getInstance().addMarker(this);
-    } else {
-      ViewChangesTracker.getInstance().removeMarker(this);
-
-      // Let it render one more time to avoid race conditions.
-      // i.e. Image onLoad ->
-      //      ViewChangesTracker may not get a chance to render ->
-      //      setState({ tracksViewChanges: false }) ->
-      //      image loaded but not rendered.
-      updateMarkerIcon();
-    }
-  }
-
-  public LatLng getPosition() {
-    return position;
-  }
-
-  public boolean updateCustomForTracking() {
-    if (!tracksViewChangesActive)
-      return false;
-
-    updateMarkerIcon();
-
-    return true;
-  }
-
-  public void updateMarkerIcon() {
-    if (marker == null) return;
-
-    marker.setIcon(getIcon());
-  }
-
-  public LatLng interpolate(float fraction, LatLng a, LatLng b) {
-    double lat = (b.latitude - a.latitude) * fraction + a.latitude;
-    double lng = (b.longitude - a.longitude) * fraction + a.longitude;
-    return new LatLng(lat, lng);
-  }
-
-  public void animateToCoodinate(LatLng finalPosition, Integer duration) {
-    TypeEvaluator<LatLng> typeEvaluator = new TypeEvaluator<LatLng>() {
-      @Override
-      public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
-        return interpolate(fraction, startValue, endValue);
-      }
-    };
-    Property<Marker, LatLng> property = Property.of(Marker.class, LatLng.class, "position");
-    ObjectAnimator animator = ObjectAnimator.ofObject(
-      marker,
-      property,
-      typeEvaluator,
-      finalPosition);
-    animator.setDuration(duration);
-    animator.start();
-  }
-
-  public void setImage(String uri) {
-
-    boolean shouldLoadImage = true;
-
-    if (this.markerManager != null) {
-      // remove marker from previous shared icon if needed, to avoid future updates from it.
-      // remove the shared icon completely if no markers on it as well.
-      // this is to avoid memory leak due to orphan bitmaps.
-      //
-      // However in case where client want to update all markers from icon A to icon B
-      // and after some time to update back from icon B to icon A
-      // it may be better to keep it though. We assume that is rare.
-      if (this.imageUri != null) {
-        this.markerManager.getSharedIcon(this.imageUri).removeMarker(this);
-        this.markerManager.removeSharedIconIfEmpty(this.imageUri);
-      }
-      if (uri != null) {
-        // listening for marker bitmap descriptor update, as well as check whether to load the image.
-        MapMarkerManager.AirMapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
-        sharedIcon.addMarker(this);
-        shouldLoadImage = sharedIcon.shouldLoadImage();
-      }
-    }
-
-    this.imageUri = uri;
-    if (!shouldLoadImage) {return;}
-
-    if (uri == null) {
-      iconBitmapDescriptor = null;
-      update(true);
-    } else if (uri.startsWith("http://") || uri.startsWith("https://") ||
-        uri.startsWith("file://") || uri.startsWith("asset://") || uri.startsWith("data:")) {
-      ImageRequest imageRequest = ImageRequestBuilder
-          .newBuilderWithSource(Uri.parse(uri))
-          .build();
-
-      ImagePipeline imagePipeline = Fresco.getImagePipeline();
-      dataSource = imagePipeline.fetchDecodedImage(imageRequest, this);
-      DraweeController controller = Fresco.newDraweeControllerBuilder()
-          .setImageRequest(imageRequest)
-          .setControllerListener(mLogoControllerListener)
-          .setOldController(logoHolder.getController())
-          .build();
-      logoHolder.setController(controller);
-    } else {
-      iconBitmapDescriptor = getBitmapDescriptorByName(uri);
-      int drawableId = getDrawableResourceByName(uri);
-      iconBitmap = BitmapFactory.decodeResource(getResources(), drawableId);
-      if (iconBitmap == null) { // VectorDrawable or similar
-          Drawable drawable = getResources().getDrawable(drawableId);
-          iconBitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-          drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
-          Canvas canvas = new Canvas(iconBitmap);
-          drawable.draw(canvas);
-      }
-      if (this.markerManager != null) {
-        this.markerManager.getSharedIcon(uri).updateIcon(iconBitmapDescriptor, iconBitmap);
-      }
-      update(true);
-    }
-  }
-
-  public void setIconBitmapDescriptor(BitmapDescriptor bitmapDescriptor, Bitmap bitmap) {
-    this.iconBitmapDescriptor = bitmapDescriptor;
-    this.iconBitmap = bitmap;
-    this.update(true);
-  }
-
-  public void setIconBitmap(Bitmap bitmap) {
-    this.iconBitmap = bitmap;
-  }
-
-  public MarkerOptions getMarkerOptions() {
-    if (markerOptions == null) {
-      markerOptions = new MarkerOptions();
-    }
-
-    fillMarkerOptions(markerOptions);
-    return markerOptions;
-  }
-
-  @Override
-  public void addView(View child, int index) {
-    super.addView(child, index);
-    // if children are added, it means we are rendering a custom marker
-    if (!(child instanceof MapCallout)) {
-      hasCustomMarkerView = true;
-      updateTracksViewChanges();
-    }
-    update(true);
-  }
-
-  @Override
-  public void requestLayout() {
-    super.requestLayout();
-
-    if (getChildCount() == 0) {
-      if (hasCustomMarkerView) {
-        hasCustomMarkerView = false;
-        clearDrawableCache();
+
+        this.imageUri = uri;
+        if (!shouldLoadImage) {
+            return;
+        }
+
+        if (uri == null) {
+            iconBitmapDescriptor = null;
+            update(true);
+        } else if (uri.startsWith("http://") || uri.startsWith("https://") ||
+                uri.startsWith("file://") || uri.startsWith("asset://") || uri.startsWith("data:")) {
+            ImageRequest imageRequest = ImageRequestBuilder
+                    .newBuilderWithSource(Uri.parse(uri))
+                    .build();
+
+            ImagePipeline imagePipeline = Fresco.getImagePipeline();
+            dataSource = imagePipeline.fetchDecodedImage(imageRequest, this);
+            DraweeController controller = Fresco.newDraweeControllerBuilder()
+                    .setImageRequest(imageRequest)
+                    .setControllerListener(mLogoControllerListener)
+                    .setOldController(logoHolder.getController())
+                    .build();
+            logoHolder.setController(controller);
+        } else {
+            iconBitmapDescriptor = getBitmapDescriptorByName(uri);
+            int drawableId = getDrawableResourceByName(uri);
+            iconBitmap = BitmapFactory.decodeResource(getResources(), drawableId);
+            if (iconBitmap == null) { // VectorDrawable or similar
+                Drawable drawable = getResources().getDrawable(drawableId);
+                iconBitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+                drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+                Canvas canvas = new Canvas(iconBitmap);
+                drawable.draw(canvas);
+            }
+            if (this.markerManager != null) {
+                this.markerManager.getSharedIcon(uri).updateIcon(iconBitmapDescriptor, iconBitmap);
+            }
+            update(true);
+        }
+    }
+
+    public void setIconBitmapDescriptor(BitmapDescriptor bitmapDescriptor, Bitmap bitmap) {
+        this.iconBitmapDescriptor = bitmapDescriptor;
+        this.iconBitmap = bitmap;
+        this.update(true);
+    }
+
+    public void setIconBitmap(Bitmap bitmap) {
+        this.iconBitmap = bitmap;
+    }
+
+    public MarkerOptions getMarkerOptions() {
+        if (markerOptions == null) {
+            markerOptions = new MarkerOptions();
+        }
+
+        fillMarkerOptions(markerOptions);
+        return markerOptions;
+    }
+
+    @Override
+    public void addView(View child, int index) {
+        super.addView(child, index);
+        // if children are added, it means we are rendering a custom marker
+        if (!(child instanceof MapCallout)) {
+            hasCustomMarkerView = true;
+            updateTracksViewChanges();
+        }
+        update(true);
+    }
+
+    @Override
+    public void requestLayout() {
+        super.requestLayout();
+
+        if (getChildCount() == 0) {
+            if (hasCustomMarkerView) {
+                hasCustomMarkerView = false;
+                clearDrawableCache();
+                updateTracksViewChanges();
+                update(true);
+            }
+        }
+    }
+
+    @Override
+    public Object getFeature() {
+        return marker;
+    }
+
+    @Override
+    public void addToMap(Object collection) {
+        MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
+        marker = markerCollection.addMarker(getMarkerOptions());
         updateTracksViewChanges();
+    }
+
+    @Override
+    public void removeFromMap(Object collection) {
+        if (marker == null) {
+            return;
+        }
+        MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
+        markerCollection.remove(marker);
+        marker = null;
+        updateTracksViewChanges();
+    }
+
+    private BitmapDescriptor getIcon() {
+        if (hasCustomMarkerView) {
+            // creating a bitmap from an arbitrary view
+            if (iconBitmapDescriptor != null) {
+                Bitmap viewBitmap = createDrawable();
+                int width = Math.max(iconBitmap.getWidth(), viewBitmap.getWidth());
+                int height = Math.max(iconBitmap.getHeight(), viewBitmap.getHeight());
+                Bitmap combinedBitmap = Bitmap.createBitmap(width, height, iconBitmap.getConfig());
+                Canvas canvas = new Canvas(combinedBitmap);
+                canvas.drawBitmap(iconBitmap, 0, 0, null);
+                canvas.drawBitmap(viewBitmap, 0, 0, null);
+                return BitmapDescriptorFactory.fromBitmap(combinedBitmap);
+            } else {
+                return BitmapDescriptorFactory.fromBitmap(createDrawable());
+            }
+        } else if (iconBitmapDescriptor != null) {
+            // use local image as a marker
+            return iconBitmapDescriptor;
+        } else {
+            // render the default marker pin
+            return BitmapDescriptorFactory.defaultMarker(this.markerHue);
+        }
+    }
+
+    private MarkerOptions fillMarkerOptions(MarkerOptions options) {
+        options.position(position);
+        if (anchorIsSet) options.anchor(anchorX, anchorY);
+        if (calloutAnchorIsSet) options.infoWindowAnchor(calloutAnchorX, calloutAnchorY);
+        options.title(title);
+        options.snippet(snippet);
+        options.rotation(rotation);
+        options.flat(flat);
+        options.draggable(draggable);
+        options.zIndex(zIndex);
+        options.alpha(opacity);
+        options.icon(getIcon());
+        return options;
+    }
+
+    public void update(boolean updateIcon) {
+        if (marker == null) {
+            return;
+        }
+
+        if (updateIcon)
+            updateMarkerIcon();
+
+        if (anchorIsSet) {
+            marker.setAnchor(anchorX, anchorY);
+        } else {
+            marker.setAnchor(0.5f, 1.0f);
+        }
+
+        if (calloutAnchorIsSet) {
+            marker.setInfoWindowAnchor(calloutAnchorX, calloutAnchorY);
+        } else {
+            marker.setInfoWindowAnchor(0.5f, 0);
+        }
+    }
+
+    public void update(int width, int height) {
+        this.width = width;
+        this.height = height;
+
         update(true);
-      }
-    }
-  }
-
-  @Override
-  public Object getFeature() {
-    return marker;
-  }
-
-  @Override
-  public void addToMap(Object collection) {
-    MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
-    marker = markerCollection.addMarker(getMarkerOptions());
-    updateTracksViewChanges();
-  }
-
-  @Override
-  public void removeFromMap(Object collection) {
-    if (marker == null) {
-      return;
-    }
-    MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
-    markerCollection.remove(marker);
-    marker = null;
-    updateTracksViewChanges();
-  }
-
-  private BitmapDescriptor getIcon() {
-    if (hasCustomMarkerView) {
-      // creating a bitmap from an arbitrary view
-      if (iconBitmapDescriptor != null) {
-        Bitmap viewBitmap = createDrawable();
-        int width = Math.max(iconBitmap.getWidth(), viewBitmap.getWidth());
-        int height = Math.max(iconBitmap.getHeight(), viewBitmap.getHeight());
-        Bitmap combinedBitmap = Bitmap.createBitmap(width, height, iconBitmap.getConfig());
-        Canvas canvas = new Canvas(combinedBitmap);
-        canvas.drawBitmap(iconBitmap, 0, 0, null);
-        canvas.drawBitmap(viewBitmap, 0, 0, null);
-        return BitmapDescriptorFactory.fromBitmap(combinedBitmap);
-      } else {
-        return BitmapDescriptorFactory.fromBitmap(createDrawable());
-      }
-    } else if (iconBitmapDescriptor != null) {
-      // use local image as a marker
-      return iconBitmapDescriptor;
-    } else {
-      // render the default marker pin
-      return BitmapDescriptorFactory.defaultMarker(this.markerHue);
-    }
-  }
-
-  private MarkerOptions fillMarkerOptions(MarkerOptions options) {
-    options.position(position);
-    if (anchorIsSet) options.anchor(anchorX, anchorY);
-    if (calloutAnchorIsSet) options.infoWindowAnchor(calloutAnchorX, calloutAnchorY);
-    options.title(title);
-    options.snippet(snippet);
-    options.rotation(rotation);
-    options.flat(flat);
-    options.draggable(draggable);
-    options.zIndex(zIndex);
-    options.alpha(opacity);
-    options.icon(getIcon());
-    return options;
-  }
-
-  public void update(boolean updateIcon) {
-    if (marker == null) {
-      return;
-    }
-
-    if (updateIcon)
-      updateMarkerIcon();
-
-    if (anchorIsSet) {
-      marker.setAnchor(anchorX, anchorY);
-    } else {
-      marker.setAnchor(0.5f, 1.0f);
-    }
-
-    if (calloutAnchorIsSet) {
-      marker.setInfoWindowAnchor(calloutAnchorX, calloutAnchorY);
-    } else {
-      marker.setInfoWindowAnchor(0.5f, 0);
-    }
-  }
-
-  public void update(int width, int height) {
-    this.width = width;
-    this.height = height;
-
-    update(true);
-  }
-
-  private Bitmap mLastBitmapCreated = null;
-
-  private void clearDrawableCache() {
-    mLastBitmapCreated = null;
-  }
-
-  private Bitmap createDrawable() {
-    int width = this.width <= 0 ? 100 : this.width;
-    int height = this.height <= 0 ? 100 : this.height;
-    this.buildDrawingCache();
-
-    // Do not create the doublebuffer-bitmap each time. reuse it to save memory.
-    Bitmap bitmap = mLastBitmapCreated;
-
-    if (bitmap == null ||
-            bitmap.isRecycled() ||
-            bitmap.getWidth() != width ||
-            bitmap.getHeight() != height) {
-      bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-      mLastBitmapCreated = bitmap;
-    } else {
-      bitmap.eraseColor(Color.TRANSPARENT);
-    }
-
-    Canvas canvas = new Canvas(bitmap);
-    this.draw(canvas);
-
-    return bitmap;
-  }
-
-  public void setCalloutView(MapCallout view) {
-    this.calloutView = view;
-  }
-
-  public MapCallout getCalloutView() {
-    return this.calloutView;
-  }
-
-  public View getCallout() {
-    if (this.calloutView == null) return null;
+    }
+
+    private Bitmap mLastBitmapCreated = null;
 
-    if (this.wrappedCalloutView == null) {
-      this.wrapCalloutView();
+    private void clearDrawableCache() {
+        mLastBitmapCreated = null;
     }
 
-    if (this.calloutView.getTooltip()) {
-      return this.wrappedCalloutView;
-    } else {
-      return null;
+    private Bitmap createDrawable() {
+        int width = this.width <= 0 ? 100 : this.width;
+        int height = this.height <= 0 ? 100 : this.height;
+        this.buildDrawingCache();
+
+        // Do not create the doublebuffer-bitmap each time. reuse it to save memory.
+        Bitmap bitmap = mLastBitmapCreated;
+
+        if (bitmap == null ||
+                bitmap.isRecycled() ||
+                bitmap.getWidth() != width ||
+                bitmap.getHeight() != height) {
+            bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+            mLastBitmapCreated = bitmap;
+        } else {
+            bitmap.eraseColor(Color.TRANSPARENT);
+        }
+
+        Canvas canvas = new Canvas(bitmap);
+        this.draw(canvas);
+
+        return bitmap;
     }
-  }
 
-  public View getInfoContents() {
-    if (this.calloutView == null) return null;
+    public void setCalloutView(MapCallout view) {
+        this.calloutView = view;
+    }
 
-    if (this.wrappedCalloutView == null) {
-      this.wrapCalloutView();
+    public MapCallout getCalloutView() {
+        return this.calloutView;
     }
 
-    if (this.calloutView.getTooltip()) {
-      return null;
-    } else {
-      return this.wrappedCalloutView;
+    public View getCallout() {
+        if (this.calloutView == null) return null;
+
+        if (this.wrappedCalloutView == null) {
+            this.wrapCalloutView();
+        }
+
+        if (this.calloutView.getTooltip()) {
+            return this.wrappedCalloutView;
+        } else {
+            return null;
+        }
     }
-  }
 
-  private void wrapCalloutView() {
-    // some hackery is needed to get the arbitrary infowindow view to render centered, and
-    // with only the width/height that it needs.
-    if (this.calloutView == null || this.calloutView.getChildCount() == 0) {
-      return;
+    public View getInfoContents() {
+        if (this.calloutView == null) return null;
+
+        if (this.wrappedCalloutView == null) {
+            this.wrapCalloutView();
+        }
+
+        if (this.calloutView.getTooltip()) {
+            return null;
+        } else {
+            return this.wrappedCalloutView;
+        }
     }
 
-    LinearLayout LL = new LinearLayout(context);
-    LL.setOrientation(LinearLayout.VERTICAL);
-    LL.setLayoutParams(new LinearLayout.LayoutParams(
-        this.calloutView.width,
-        this.calloutView.height,
-        0f
-    ));
+    private void wrapCalloutView() {
+        // some hackery is needed to get the arbitrary infowindow view to render centered, and
+        // with only the width/height that it needs.
+        if (this.calloutView == null || this.calloutView.getChildCount() == 0) {
+            return;
+        }
 
+        LinearLayout LL = new LinearLayout(context);
+        LL.setOrientation(LinearLayout.VERTICAL);
+        LL.setLayoutParams(new LinearLayout.LayoutParams(
+                this.calloutView.width,
+                this.calloutView.height,
+                0f
+        ));
 
-    LinearLayout LL2 = new LinearLayout(context);
-    LL2.setOrientation(LinearLayout.HORIZONTAL);
-    LL2.setLayoutParams(new LinearLayout.LayoutParams(
-        this.calloutView.width,
-        this.calloutView.height,
-        0f
-    ));
 
-    LL.addView(LL2);
-    LL2.addView(this.calloutView);
+        LinearLayout LL2 = new LinearLayout(context);
+        LL2.setOrientation(LinearLayout.HORIZONTAL);
+        LL2.setLayoutParams(new LinearLayout.LayoutParams(
+                this.calloutView.width,
+                this.calloutView.height,
+                0f
+        ));
 
-    this.wrappedCalloutView = LL;
-  }
+        LL.addView(LL2);
+        LL2.addView(this.calloutView);
 
-  private int getDrawableResourceByName(String name) {
-    return getResources().getIdentifier(
-        name,
-        "drawable",
-        getContext().getPackageName());
-  }
+        this.wrappedCalloutView = LL;
+    }
+
+    private int getDrawableResourceByName(String name) {
+        return getResources().getIdentifier(
+                name,
+                "drawable",
+                getContext().getPackageName());
+    }
 
     public boolean isLoadingImage() {
         return loadingImage;
@@ -660,42 +664,43 @@ public class MapMarker extends MapFeature {
     }
 
     @FunctionalInterface
-  public interface EventCreator<T extends Event> {
-    T create(int surfaceId, int viewId, WritableMap payload);
-  }
-  public  <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator) {
-    // Cast context to ReactContext
-    ReactContext reactContext = (ReactContext) context;
-
-    // Get the event dispatcher
-    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
-
-    // If there is a dispatcher, create and dispatch the event
-    if (eventDispatcher != null) {
-      int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
-      T event = creator.create(surfaceId, getId(), payload);
-      eventDispatcher.dispatchEvent(event);
-    }
-  }
-
-  private BitmapDescriptor getBitmapDescriptorByName(String name) {
-    return BitmapDescriptorFactory.fromResource(getDrawableResourceByName(name));
-  }
-
-  public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
-    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
-    builder.put(OnSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnSelectEvent.EVENT_NAME));
-    builder.put(OnDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDeselectEvent.EVENT_NAME));
-    builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
-    return builder.build();
-  }
-
-  public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-    return MapBuilder.of(
-            OnDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEvent.EVENT_NAME),
-            OnDragStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragStartEvent.EVENT_NAME),
-            OnDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEndEvent.EVENT_NAME)
-    );
-  }
+    public interface EventCreator<T extends Event> {
+        T create(int surfaceId, int viewId, WritableMap payload);
+    }
+
+    public <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator) {
+        // Cast context to ReactContext
+        ReactContext reactContext = (ReactContext) context;
+
+        // Get the event dispatcher
+        EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+
+        // If there is a dispatcher, create and dispatch the event
+        if (eventDispatcher != null) {
+            int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
+            T event = creator.create(surfaceId, getId(), payload);
+            eventDispatcher.dispatchEvent(event);
+        }
+    }
+
+    private BitmapDescriptor getBitmapDescriptorByName(String name) {
+        return BitmapDescriptorFactory.fromResource(getDrawableResourceByName(name));
+    }
+
+    public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+        builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+        return builder.build();
+    }
+
+    public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return MapBuilder.of(
+                OnSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnSelectEvent.EVENT_NAME),
+                OnDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDeselectEvent.EVENT_NAME),
+                OnDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEvent.EVENT_NAME),
+                OnDragStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragStartEvent.EVENT_NAME),
+                OnDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEndEvent.EVENT_NAME)
+        );
+    }
 
 }