react-native-maps 1.21.0-alpha.82 → 1.21.0-alpha.83

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsCircleManagerDelegate.java

@@ -0,0 +1,49 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMapsCircleManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMapsCircleManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMapsCircleManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "center":
+        mViewManager.setCenter(view, (ReadableMap) value);
+        break;
+      case "fillColor":
+        mViewManager.setFillColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "radius":
+        mViewManager.setRadius(view, value == null ? Double.NaN : ((Double) value).doubleValue());
+        break;
+      case "strokeColor":
+        mViewManager.setStrokeColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "strokeWidth":
+        mViewManager.setStrokeWidth(view, value == null ? 0f : ((Double) value).floatValue());
+        break;
+      case "tappable":
+        mViewManager.setTappable(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsCircleManagerInterface.java

@@ -0,0 +1,24 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
+
+public interface RNMapsCircleManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+  void setCenter(T view, @Nullable ReadableMap value);
+  void setFillColor(T view, @Nullable Integer value);
+  void setRadius(T view, double value);
+  void setStrokeColor(T view, @Nullable Integer value);
+  void setStrokeWidth(T view, float value);
+  void setTappable(T view, boolean value);
+}

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsOverlayManagerDelegate.java

@@ -0,0 +1,46 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMapsOverlayManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMapsOverlayManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMapsOverlayManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "bearing":
+        mViewManager.setBearing(view, value == null ? 0f : ((Double) value).floatValue());
+        break;
+      case "bounds":
+        mViewManager.setBounds(view, (ReadableArray) value);
+        break;
+      case "image":
+        mViewManager.setImage(view, (ReadableMap) value);
+        break;
+      case "opacity":
+        mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
+        break;
+      case "tappable":
+        mViewManager.setTappable(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsOverlayManagerInterface.java

@@ -0,0 +1,24 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
+
+public interface RNMapsOverlayManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+  void setBearing(T view, float value);
+  void setBounds(T view, @Nullable ReadableArray value);
+  void setImage(T view, @Nullable ReadableMap value);
+  void setOpacity(T view, float value);
+  void setTappable(T view, boolean value);
+}

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.cpp

@@ -22,6 +22,7 @@ registry->add(concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDe
 registry->add(concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsMapViewComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsMarkerComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsOverlayComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsPolylineComponentDescriptor>());
 }
 

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.h

@@ -22,6 +22,7 @@ using RNMapsGoogleMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMap
 using RNMapsGooglePolygonComponentDescriptor = ConcreteComponentDescriptor<RNMapsGooglePolygonShadowNode>;
 using RNMapsMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsMapViewShadowNode>;
 using RNMapsMarkerComponentDescriptor = ConcreteComponentDescriptor<RNMapsMarkerShadowNode>;
+using RNMapsOverlayComponentDescriptor = ConcreteComponentDescriptor<RNMapsOverlayShadowNode>;
 using RNMapsPolylineComponentDescriptor = ConcreteComponentDescriptor<RNMapsPolylineShadowNode>;
 
 void RNMapsSpecs_registerComponentDescriptorsFromCodegen(

package/android/generated/jni/react/renderer/components/RNMapsSpecs/EventEmitters.cpp

@@ -938,6 +938,28 @@ $payload.setProperty(runtime, "id", $event.id);
 }
 
 
+void RNMapsOverlayEventEmitter::onPress(OnPress $event) const {
+  dispatchEvent("press", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "action", $event.action);
+$payload.setProperty(runtime, "id", $event.id);
+{
+  auto coordinate = jsi::Object(runtime);
+  coordinate.setProperty(runtime, "latitude", $event.coordinate.latitude);
+  coordinate.setProperty(runtime, "longitude", $event.coordinate.longitude);
+  $payload.setProperty(runtime, "coordinate", coordinate);
+}
+{
+  auto position = jsi::Object(runtime);
+  position.setProperty(runtime, "x", $event.position.x);
+  position.setProperty(runtime, "y", $event.position.y);
+  $payload.setProperty(runtime, "position", position);
+}
+    return $payload;
+  });
+}
+
+
 void RNMapsPolylineEventEmitter::onPress(OnPress $event) const {
   dispatchEvent("press", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);

package/android/generated/jni/react/renderer/components/RNMapsSpecs/EventEmitters.h

@@ -806,6 +806,28 @@ class RNMapsMarkerEventEmitter : public ViewEventEmitter {
 
   void onSelect(OnSelect value) const;
 };
+class RNMapsOverlayEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  struct OnPressCoordinate {
+      double latitude;
+    double longitude;
+    };
+
+  struct OnPressPosition {
+      double x;
+    double y;
+    };
+
+  struct OnPress {
+      std::string action;
+    std::string id;
+    OnPressCoordinate coordinate;
+    OnPressPosition position;
+    };
+  void onPress(OnPress value) const;
+};
 class RNMapsPolylineEventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;

package/android/generated/jni/react/renderer/components/RNMapsSpecs/Props.cpp

@@ -163,6 +163,17 @@ RNMapsMarkerProps::RNMapsMarkerProps(
     subtitleVisibility(convertRawProp(context, rawProps, "subtitleVisibility", sourceProps.subtitleVisibility, {RNMapsMarkerSubtitleVisibility::Adaptive})),
     useLegacyPinView(convertRawProp(context, rawProps, "useLegacyPinView", sourceProps.useLegacyPinView, {false}))
       {}
+RNMapsOverlayProps::RNMapsOverlayProps(
+    const PropsParserContext &context,
+    const RNMapsOverlayProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    bearing(convertRawProp(context, rawProps, "bearing", sourceProps.bearing, {0.0})),
+    bounds(convertRawProp(context, rawProps, "bounds", sourceProps.bounds, {})),
+    image(convertRawProp(context, rawProps, "image", sourceProps.image, {})),
+    opacity(convertRawProp(context, rawProps, "opacity", sourceProps.opacity, {1.0})),
+    tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
+      {}
 RNMapsPolylineProps::RNMapsPolylineProps(
     const PropsParserContext &context,
     const RNMapsPolylineProps &sourceProps,

package/android/generated/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -1092,6 +1092,51 @@ class RNMapsMarkerProps final : public ViewProps {
   bool useLegacyPinView{false};
 };
 
+struct RNMapsOverlayBoundsStruct {
+  double latitude{0.0};
+  double longitude{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_latitude = map.find("latitude");
+  if (tmp_latitude != map.end()) {
+    fromRawValue(context, tmp_latitude->second, result.latitude);
+  }
+  auto tmp_longitude = map.find("longitude");
+  if (tmp_longitude != map.end()) {
+    fromRawValue(context, tmp_longitude->second, result.longitude);
+  }
+}
+
+static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
+  return "[Object RNMapsOverlayBoundsStruct]";
+}
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<RNMapsOverlayBoundsStruct> &result) {
+  auto items = (std::vector<RawValue>)value;
+  for (const auto &item : items) {
+    RNMapsOverlayBoundsStruct newItem;
+    fromRawValue(context, item, newItem);
+    result.emplace_back(newItem);
+  }
+}
+
+class RNMapsOverlayProps final : public ViewProps {
+ public:
+  RNMapsOverlayProps() = default;
+  RNMapsOverlayProps(const PropsParserContext& context, const RNMapsOverlayProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  Float bearing{0.0};
+  std::vector<RNMapsOverlayBoundsStruct> bounds{};
+  ImageSource image{};
+  Float opacity{1.0};
+  bool tappable{false};
+};
+
 enum class RNMapsPolylineLineCap { Butt, Round, Square };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsPolylineLineCap &result) {

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ShadowNodes.cpp

@@ -18,6 +18,7 @@ extern const char RNMapsGoogleMapViewComponentName[] = "RNMapsGoogleMapView";
 extern const char RNMapsGooglePolygonComponentName[] = "RNMapsGooglePolygon";
 extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";
 extern const char RNMapsMarkerComponentName[] = "RNMapsMarker";
+extern const char RNMapsOverlayComponentName[] = "RNMapsOverlay";
 extern const char RNMapsPolylineComponentName[] = "RNMapsPolyline";
 
 } // namespace facebook::react

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ShadowNodes.h

@@ -84,6 +84,17 @@ using RNMapsMarkerShadowNode = ConcreteViewShadowNode<
     RNMapsMarkerEventEmitter,
     RNMapsMarkerState>;
 
+JSI_EXPORT extern const char RNMapsOverlayComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsOverlay> component.
+ */
+using RNMapsOverlayShadowNode = ConcreteViewShadowNode<
+    RNMapsOverlayComponentName,
+    RNMapsOverlayProps,
+    RNMapsOverlayEventEmitter,
+    RNMapsOverlayState>;
+
 JSI_EXPORT extern const char RNMapsPolylineComponentName[];
 
 /*

package/android/generated/jni/react/renderer/components/RNMapsSpecs/States.h

@@ -86,6 +86,18 @@ public:
 #endif
 };
 
+class RNMapsOverlayState {
+public:
+  RNMapsOverlayState() = default;
+
+#ifdef ANDROID
+  RNMapsOverlayState(RNMapsOverlayState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 class RNMapsPolylineState {
 public:
   RNMapsPolylineState() = default;

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -34,6 +34,7 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.MapColorScheme;
 import com.rnmaps.maps.MapMarker;
+import com.rnmaps.maps.MapOverlay;
 import com.rnmaps.maps.MapView;
 import com.rnmaps.maps.SizeReportingShadowNode;
 
@@ -321,6 +322,10 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
             ((MapMarker) child).setImageLoadedListener((uri, drawable, b) -> {
                 parent.addFeature(child, parent.getFeatureCount());
             });
+//        } else if (child instanceof MapOverlay && ((MapOverlay) child).isLoadingImage()){
+//            ((MapOverlay) child).setImageLoadedListener((uri, drawable, b) -> {
+//                parent.addFeature(child, parent.getFeatureCount());
+//            });
         } else {
             parent.addFeature(child, index);
         }

package/android/src/main/java/com/rnmaps/fabric/MarkerManager.java

@@ -2,7 +2,6 @@ package com.rnmaps.fabric;
 
 
 import android.graphics.Color;
-import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;

package/android/src/main/java/com/rnmaps/fabric/OverlayManager.java

@@ -0,0 +1,94 @@
+package com.rnmaps.fabric;
+
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsOverlayManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsOverlayManagerInterface;
+import com.rnmaps.maps.MapOverlay;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@ReactModule(name = OverlayManager.REACT_CLASS)
+public class OverlayManager extends ViewGroupManager<MapOverlay> implements RNMapsOverlayManagerInterface<MapOverlay> {
+    public OverlayManager(ReactApplicationContext context) {
+        super(context);
+    }
+
+    private final RNMapsOverlayManagerDelegate<MapOverlay, OverlayManager> delegate =
+            new RNMapsOverlayManagerDelegate<>(this);
+
+    @Override
+    public ViewManagerDelegate<MapOverlay> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public MapOverlay createViewInstance(ThemedReactContext context) {
+        return new MapOverlay(context);
+    }
+
+
+    public static final String REACT_CLASS = "RNMapsOverlay";
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        return MapOverlay.getExportedCustomBubblingEventTypeConstants();
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return new HashMap<>();
+    }
+
+
+
+    @Override
+    public void setZIndex(MapOverlay view, float value) {
+        view.setZIndex(value);
+    }
+
+
+    @Override
+    public void setBearing(MapOverlay view, float value) {
+        view.setBearing(value);
+    }
+
+    @Override
+    public void setBounds(MapOverlay view, @Nullable ReadableArray value) {
+            view.setBounds(value);
+    }
+
+    @Override
+    public void setImage(MapOverlay view, @Nullable ReadableMap value) {
+        if (value != null) {
+            view.setImage(value.getString("uri"));
+        }
+    }
+
+
+    @Override
+    public void setOpacity(MapOverlay view, float value) {
+        view.setTransparency(value);
+    }
+
+    @Override
+    public void setTappable(MapOverlay view, boolean value) {
+            view.setTappable(value);
+    }
+}

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

@@ -14,6 +14,7 @@ import com.rnmaps.fabric.MapViewManager;
 import com.rnmaps.fabric.MarkerManager;
 import com.rnmaps.fabric.NativeAirMapsModule;
 import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
+import com.rnmaps.fabric.OverlayManager;
 import com.rnmaps.fabric.PolygonManager;
 import com.rnmaps.fabric.PolylineManager;
 
@@ -25,12 +26,15 @@ public class MapAirModulePackage extends TurboReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext), new CalloutManager(reactContext), new PolygonManager(reactContext), new PolylineManager(reactContext), new CircleManager(reactContext));
+        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext), new CalloutManager(reactContext), new PolygonManager(reactContext), new PolylineManager(reactContext), new CircleManager(reactContext), new OverlayManager(reactContext));
     }
 
 
     @Override
     public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (OverlayManager.REACT_CLASS.equals(name)) {
+            return new OverlayManager(reactContext);
+        }
         if (CircleManager.REACT_CLASS.equals(name)) {
             return new CircleManager(reactContext);
         }

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

@@ -2,8 +2,33 @@ package com.rnmaps.maps;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 
+import androidx.annotation.Nullable;
+
+import com.facebook.common.references.CloseableReference;
+import com.facebook.datasource.DataSource;
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.controller.BaseControllerListener;
+import com.facebook.drawee.controller.ControllerListener;
+import com.facebook.drawee.drawable.ScalingUtils;
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
+import com.facebook.drawee.interfaces.DraweeController;
+import com.facebook.drawee.view.DraweeHolder;
+import com.facebook.imagepipeline.core.ImagePipeline;
+import com.facebook.imagepipeline.image.CloseableImage;
+import com.facebook.imagepipeline.image.CloseableStaticBitmap;
+import com.facebook.imagepipeline.image.ImageInfo;
+import com.facebook.imagepipeline.request.ImageRequest;
+import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.MapBuilder;
+import com.google.android.gms.common.images.ImageManager;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.GroundOverlay;
@@ -11,30 +36,127 @@ import com.google.android.gms.maps.model.GroundOverlayOptions;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.maps.android.collections.GroundOverlayManager;
+import com.rnmaps.fabric.event.OnPressEvent;
+
+import java.util.Map;
 
 public class MapOverlay extends MapFeature implements ImageReadable {
 
+
+  private String imageUri;
+  private boolean loadingImage;
+
   private GroundOverlayOptions groundOverlayOptions;
   private GroundOverlay groundOverlay;
   private LatLngBounds bounds;
   private float bearing;
   private BitmapDescriptor iconBitmapDescriptor;
+  private Bitmap iconBitmap;
   private boolean tappable;
   private float zIndex;
   private float transparency;
 
+  private DataSource<CloseableReference<CloseableImage>> dataSource;
+
   private final ImageReader mImageReader;
   private GroundOverlayManager.Collection groundOverlayCollection;
 
+  private final DraweeHolder<?> logoHolder;
+  private ImageManager.OnImageLoadedListener imageLoadedListener;
+
+  public boolean isLoadingImage() {
+    return loadingImage;
+  }
+
+  public ImageManager.OnImageLoadedListener getImageLoadedListener() {
+    return imageLoadedListener;
+  }
+
+  public void setImageLoadedListener(ImageManager.OnImageLoadedListener imageLoadedListener) {
+    this.imageLoadedListener = imageLoadedListener;
+  }
+
+
   public MapOverlay(Context context) {
     super(context);
     this.mImageReader = new ImageReader(context, getResources(), this);
+    logoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
+    logoHolder.onAttach();
+  }
+
+  private GenericDraweeHierarchy createDraweeHierarchy() {
+    return new GenericDraweeHierarchyBuilder(getResources())
+            .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
+            .setFadeDuration(0)
+            .build();
+  }
+
+  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);
+                }
+              }
+
+              loadingImage = false;
+              if (imageLoadedListener != null){
+                imageLoadedListener.onImageLoaded(null, null, false);
+                // fire and forget
+                imageLoadedListener = null;
+              }
+              update();
+            }
+          };
+
+  // seems like apple users north west, south east
+  // google uses north east, south west
+  private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds){
+    double lat1 = bounds.getArray(0).getDouble(0);
+    double lon1 = bounds.getArray(0).getDouble(1);
+    double lat2 = bounds.getArray(1).getDouble(0);
+    double lon2 = bounds.getArray(1).getDouble(1);
+
+// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
+    double southLat = Math.min(lat1, lat2);
+    double northLat = Math.max(lat1, lat2);
+    double westLon = Math.min(lon1, lon2);
+    double eastLon = Math.max(lon1, lon2);
+
+// Create corrected LatLngs
+    LatLng sw = new LatLng(southLat, westLon);
+    LatLng ne = new LatLng(northLat, eastLon);
+   return new LatLngBounds(sw, ne);
   }
 
   public void setBounds(ReadableArray bounds) {
-    LatLng sw = new LatLng(bounds.getArray(0).getDouble(0), bounds.getArray(0).getDouble(1));
-    LatLng ne = new LatLng(bounds.getArray(1).getDouble(0), bounds.getArray(1).getDouble(1));
-    this.bounds = new LatLngBounds(sw, ne);
+
+    this.bounds = fixBoundsIfNecessary(bounds);
     if (this.groundOverlay != null) {
       this.groundOverlay.setPositionFromBounds(this.bounds);
     }
@@ -63,6 +185,51 @@ public class MapOverlay extends MapFeature implements ImageReadable {
 
   public void setImage(String uri) {
     this.mImageReader.setImage(uri);
+    boolean shouldLoadImage = true;
+
+    this.imageUri = uri;
+    if (!shouldLoadImage) {return;}
+
+    if (uri == null) {
+      iconBitmapDescriptor = null;
+    } 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);
+      }
+
+  }
+    }
+
+  private BitmapDescriptor getBitmapDescriptorByName(String name) {
+    return BitmapDescriptorFactory.fromResource(getDrawableResourceByName(name));
+  }
+
+  private int getDrawableResourceByName(String name) {
+    return getResources().getIdentifier(
+            name,
+            "drawable",
+            getContext().getPackageName());
   }
 
   public void setTappable(boolean tapabble) {
@@ -72,6 +239,11 @@ public class MapOverlay extends MapFeature implements ImageReadable {
     }
   }
 
+  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 GroundOverlayOptions getGroundOverlayOptions() {
     if (this.groundOverlayOptions == null) {

package/ios/generated/RNMapsSpecs/ComponentDescriptors.cpp

@@ -22,6 +22,7 @@ registry->add(concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDe
 registry->add(concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsMapViewComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsMarkerComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsOverlayComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsPolylineComponentDescriptor>());
 }
 

package/ios/generated/RNMapsSpecs/ComponentDescriptors.h

@@ -22,6 +22,7 @@ using RNMapsGoogleMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMap
 using RNMapsGooglePolygonComponentDescriptor = ConcreteComponentDescriptor<RNMapsGooglePolygonShadowNode>;
 using RNMapsMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsMapViewShadowNode>;
 using RNMapsMarkerComponentDescriptor = ConcreteComponentDescriptor<RNMapsMarkerShadowNode>;
+using RNMapsOverlayComponentDescriptor = ConcreteComponentDescriptor<RNMapsOverlayShadowNode>;
 using RNMapsPolylineComponentDescriptor = ConcreteComponentDescriptor<RNMapsPolylineShadowNode>;
 
 void RNMapsSpecs_registerComponentDescriptorsFromCodegen(

package/ios/generated/RNMapsSpecs/EventEmitters.cpp

@@ -938,6 +938,28 @@ $payload.setProperty(runtime, "id", $event.id);
 }
 
 
+void RNMapsOverlayEventEmitter::onPress(OnPress $event) const {
+  dispatchEvent("press", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "action", $event.action);
+$payload.setProperty(runtime, "id", $event.id);
+{
+  auto coordinate = jsi::Object(runtime);
+  coordinate.setProperty(runtime, "latitude", $event.coordinate.latitude);
+  coordinate.setProperty(runtime, "longitude", $event.coordinate.longitude);
+  $payload.setProperty(runtime, "coordinate", coordinate);
+}
+{
+  auto position = jsi::Object(runtime);
+  position.setProperty(runtime, "x", $event.position.x);
+  position.setProperty(runtime, "y", $event.position.y);
+  $payload.setProperty(runtime, "position", position);
+}
+    return $payload;
+  });
+}
+
+
 void RNMapsPolylineEventEmitter::onPress(OnPress $event) const {
   dispatchEvent("press", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);

package/ios/generated/RNMapsSpecs/EventEmitters.h

@@ -806,6 +806,28 @@ class RNMapsMarkerEventEmitter : public ViewEventEmitter {
 
   void onSelect(OnSelect value) const;
 };
+class RNMapsOverlayEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  struct OnPressCoordinate {
+      double latitude;
+    double longitude;
+    };
+
+  struct OnPressPosition {
+      double x;
+    double y;
+    };
+
+  struct OnPress {
+      std::string action;
+    std::string id;
+    OnPressCoordinate coordinate;
+    OnPressPosition position;
+    };
+  void onPress(OnPress value) const;
+};
 class RNMapsPolylineEventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;

package/ios/generated/RNMapsSpecs/Props.cpp

@@ -163,6 +163,17 @@ RNMapsMarkerProps::RNMapsMarkerProps(
     subtitleVisibility(convertRawProp(context, rawProps, "subtitleVisibility", sourceProps.subtitleVisibility, {RNMapsMarkerSubtitleVisibility::Adaptive})),
     useLegacyPinView(convertRawProp(context, rawProps, "useLegacyPinView", sourceProps.useLegacyPinView, {false}))
       {}
+RNMapsOverlayProps::RNMapsOverlayProps(
+    const PropsParserContext &context,
+    const RNMapsOverlayProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    bearing(convertRawProp(context, rawProps, "bearing", sourceProps.bearing, {0.0})),
+    bounds(convertRawProp(context, rawProps, "bounds", sourceProps.bounds, {})),
+    image(convertRawProp(context, rawProps, "image", sourceProps.image, {})),
+    opacity(convertRawProp(context, rawProps, "opacity", sourceProps.opacity, {1.0})),
+    tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
+      {}
 RNMapsPolylineProps::RNMapsPolylineProps(
     const PropsParserContext &context,
     const RNMapsPolylineProps &sourceProps,

package/ios/generated/RNMapsSpecs/Props.h

@@ -1092,6 +1092,51 @@ class RNMapsMarkerProps final : public ViewProps {
   bool useLegacyPinView{false};
 };
 
+struct RNMapsOverlayBoundsStruct {
+  double latitude{0.0};
+  double longitude{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_latitude = map.find("latitude");
+  if (tmp_latitude != map.end()) {
+    fromRawValue(context, tmp_latitude->second, result.latitude);
+  }
+  auto tmp_longitude = map.find("longitude");
+  if (tmp_longitude != map.end()) {
+    fromRawValue(context, tmp_longitude->second, result.longitude);
+  }
+}
+
+static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
+  return "[Object RNMapsOverlayBoundsStruct]";
+}
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<RNMapsOverlayBoundsStruct> &result) {
+  auto items = (std::vector<RawValue>)value;
+  for (const auto &item : items) {
+    RNMapsOverlayBoundsStruct newItem;
+    fromRawValue(context, item, newItem);
+    result.emplace_back(newItem);
+  }
+}
+
+class RNMapsOverlayProps final : public ViewProps {
+ public:
+  RNMapsOverlayProps() = default;
+  RNMapsOverlayProps(const PropsParserContext& context, const RNMapsOverlayProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  Float bearing{0.0};
+  std::vector<RNMapsOverlayBoundsStruct> bounds{};
+  ImageSource image{};
+  Float opacity{1.0};
+  bool tappable{false};
+};
+
 enum class RNMapsPolylineLineCap { Butt, Round, Square };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsPolylineLineCap &result) {

package/ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h

@@ -592,6 +592,10 @@ if ([commandName isEqualToString:@"redraw"]) {
 #endif
 }
 
+@protocol RCTRNMapsOverlayViewProtocol <NSObject>
+
+@end
+
 @protocol RCTRNMapsPolylineViewProtocol <NSObject>
 
 @end

package/ios/generated/RNMapsSpecs/ShadowNodes.cpp

@@ -18,6 +18,7 @@ extern const char RNMapsGoogleMapViewComponentName[] = "RNMapsGoogleMapView";
 extern const char RNMapsGooglePolygonComponentName[] = "RNMapsGooglePolygon";
 extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";
 extern const char RNMapsMarkerComponentName[] = "RNMapsMarker";
+extern const char RNMapsOverlayComponentName[] = "RNMapsOverlay";
 extern const char RNMapsPolylineComponentName[] = "RNMapsPolyline";
 
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/ShadowNodes.h

@@ -84,6 +84,17 @@ using RNMapsMarkerShadowNode = ConcreteViewShadowNode<
     RNMapsMarkerEventEmitter,
     RNMapsMarkerState>;
 
+JSI_EXPORT extern const char RNMapsOverlayComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsOverlay> component.
+ */
+using RNMapsOverlayShadowNode = ConcreteViewShadowNode<
+    RNMapsOverlayComponentName,
+    RNMapsOverlayProps,
+    RNMapsOverlayEventEmitter,
+    RNMapsOverlayState>;
+
 JSI_EXPORT extern const char RNMapsPolylineComponentName[];
 
 /*

package/ios/generated/RNMapsSpecs/States.h

@@ -86,6 +86,18 @@ public:
 #endif
 };
 
+class RNMapsOverlayState {
+public:
+  RNMapsOverlayState() = default;
+
+#ifdef ANDROID
+  RNMapsOverlayState(RNMapsOverlayState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 class RNMapsPolylineState {
 public:
   RNMapsPolylineState() = default;

package/lib/MapMarker.js

@@ -127,7 +127,12 @@ class MapMarker extends React.Component {
         let image;
         if (this.props.image) {
             if (this.fabricMarker) {
-                image = this.props.image;
+                if (typeof this.props.image === 'string') {
+                    image = { uri: this.props.image };
+                }
+                else {
+                    image = this.props.image;
+                }
             }
             else {
                 const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};

package/lib/MapOverlay.d.ts

@@ -60,6 +60,7 @@ export declare class MapOverlay extends React.Component<MapOverlayProps> {
     getMapManagerCommand: (name: string) => MapManagerCommand;
     getUIManagerCommand: (name: string) => UIManagerCommand;
     static Animated: Animated.AnimatedComponent<typeof MapOverlay>;
+    private fabricOverlay?;
     render(): React.JSX.Element;
 }
 type Coordinate = [number, number];

package/lib/MapOverlay.js

@@ -32,13 +32,32 @@ class MapOverlay extends React.Component {
     getMapManagerCommand;
     getUIManagerCommand;
     static Animated;
+    fabricOverlay = undefined;
     render() {
         const { opacity = 1.0 } = this.props;
-        let image;
-        const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};
-        image = resolvedImage.uri || this.props.image;
+        if (this.fabricOverlay === undefined) {
+            this.fabricOverlay = react_native_1.Platform.OS === 'android';
+        }
         const AIRMapOverlay = this.getNativeComponent();
-        return (<AIRMapOverlay {...this.props} opacity={opacity} image={image} style={[styles.overlay, this.props.style]}/>);
+        let image;
+        if (this.props.image) {
+            if (this.fabricOverlay) {
+                if (typeof this.props.image === 'string') {
+                    image = { uri: this.props.image };
+                }
+                else {
+                    image = this.props.image;
+                }
+            }
+            else {
+                const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};
+                image = resolvedImage.uri || this.props.image;
+            }
+        }
+        console.log('MapOverlay image: ' + image);
+        return (<AIRMapOverlay {...this.props} opacity={opacity} 
+        // @ts-ignore
+        image={image} style={[styles.overlay, this.props.style]}/>);
     }
 }
 exports.MapOverlay = MapOverlay;

package/lib/decorateMapComponent.js

@@ -12,6 +12,7 @@ const NativeComponentMarker_1 = __importDefault(require("./specs/NativeComponent
 const NativeComponentCallout_1 = __importDefault(require("./specs/NativeComponentCallout"));
 const NativeComponentPolyline_1 = __importDefault(require("./specs/NativeComponentPolyline"));
 const NativeComponentCircle_1 = __importDefault(require("./specs/NativeComponentCircle"));
+const NativeComponentOverlay_1 = __importDefault(require("./specs/NativeComponentOverlay"));
 exports.SUPPORTED = 'SUPPORTED';
 exports.USES_DEFAULT_IMPLEMENTATION = 'USES_DEFAULT_IMPLEMENTATION';
 exports.NOT_SUPPORTED = 'NOT_SUPPORTED';
@@ -68,6 +69,10 @@ function decorateMapComponent(Component, componentName, providers) {
                     // @ts-ignore
                     return NativeComponentCircle_1.default;
                 }
+                else if (componentName === 'Overlay') {
+                    // @ts-ignore
+                    return NativeComponentOverlay_1.default;
+                }
             }
             const key = provider || 'default';
             if (components[key]) {

package/lib/specs/NativeComponentOverlay.d.ts

@@ -0,0 +1,67 @@
+import { Double, Float, BubblingEventHandler, WithDefault } from 'react-native/Libraries/Types/CodegenTypes';
+import type { ViewProps, HostComponent, ImageSourcePropType as ImageSource } from 'react-native';
+export type LatLng = Readonly<{
+    latitude: Double;
+    longitude: Double;
+}>;
+export type OverlayPressEventHandler = BubblingEventHandler<Readonly<{
+    action?: string;
+    id: string;
+    coordinate: {
+        latitude: Double;
+        longitude: Double;
+    };
+    position?: {
+        x: Double;
+        y: Double;
+    };
+}>>;
+export interface OverlayFabricNativeProps extends ViewProps {
+    /**
+     * The bearing in degrees clockwise from north. Values outside the range [0, 360) will be normalized.
+     *
+     * @default 0
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    bearing?: Float;
+    /**
+     * The coordinates for the image (left-top corner, right-bottom corner). ie.```[[lat, long], [lat, long]]```
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    bounds: ReadonlyArray<LatLng>;
+    /**
+     * A custom image to be used as the overlay.
+     * Only required local image resources and uri (as for images located in the net) are allowed to be used.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    image?: ImageSource | null;
+    /**
+     * Callback that is called when user taps on the map.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    onPress?: OverlayPressEventHandler;
+    /**
+     * The overlay's opacity between 0.0 and 1.0.
+     *
+     * @default 1.0
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    opacity?: WithDefault<Float, 1.0>;
+    /**
+     * Boolean to allow a polygon to be tappable and use the onPress function.
+     *
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    tappable?: boolean;
+}
+declare const _default: HostComponent<OverlayFabricNativeProps>;
+export default _default;

package/lib/specs/NativeComponentOverlay.js

@@ -0,0 +1,7 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const codegenNativeComponent_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsOverlay', {});

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.82",
+  "version": "1.21.0-alpha.83",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",