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

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

@@ -9,10 +9,12 @@ import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 import com.rnmaps.fabric.CalloutManager;
+import com.rnmaps.fabric.CircleManager;
 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;
 
@@ -24,12 +26,18 @@ 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));
+        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);
+        }
         if (PolylineManager.REACT_CLASS.equals(name)) {
             return new PolylineManager(reactContext);
         }

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

@@ -2,10 +2,15 @@ package com.rnmaps.maps;
 
 import android.content.Context;
 
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.MapBuilder;
 import com.google.android.gms.maps.model.Circle;
 import com.google.android.gms.maps.model.CircleOptions;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.maps.android.collections.CircleManager;
+import com.rnmaps.fabric.event.OnPressEvent;
+
+import java.util.Map;
 
 public class MapCircle extends MapFeature {
 
@@ -18,6 +23,7 @@ public class MapCircle extends MapFeature {
   private int fillColor;
   private float strokeWidth;
   private float zIndex;
+  private boolean tappable;
 
   public MapCircle(Context context) {
     super(context);
@@ -30,6 +36,12 @@ public class MapCircle extends MapFeature {
     }
   }
 
+  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 void setRadius(double radius) {
     this.radius = radius;
     if (circle != null) {
@@ -65,6 +77,13 @@ public class MapCircle extends MapFeature {
     }
   }
 
+  public void setTappable(boolean tappable) {
+    this.tappable = tappable;
+    if (circle != null) {
+      circle.setClickable(tappable);
+    }
+  }
+
   public CircleOptions getCircleOptions() {
     if (circleOptions == null) {
       circleOptions = createCircleOptions();
@@ -99,4 +118,9 @@ public class MapCircle extends MapFeature {
     CircleManager.Collection circleCollection = (CircleManager.Collection) collection;
     circleCollection.remove(circle);
   }
+
+
+  public void setCenter(ReadableMap center) {
+    setCenter(new LatLng(center.getDouble("latitude"), center.getDouble("longitude")));
+  }
 }

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

@@ -17,10 +17,12 @@ namespace facebook::react {
 void RNMapsSpecs_registerComponentDescriptorsFromCodegen(
   std::shared_ptr<const ComponentDescriptorProviderRegistry> registry) {
 registry->add(concreteComponentDescriptorProvider<RNMapsCalloutComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsCircleComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDescriptor>());
 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

@@ -17,10 +17,12 @@
 namespace facebook::react {
 
 using RNMapsCalloutComponentDescriptor = ConcreteComponentDescriptor<RNMapsCalloutShadowNode>;
+using RNMapsCircleComponentDescriptor = ConcreteComponentDescriptor<RNMapsCircleShadowNode>;
 using RNMapsGoogleMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsGoogleMapViewShadowNode>;
 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

@@ -35,6 +35,28 @@ $payload.setProperty(runtime, "id", $event.id);
 }
 
 
+void RNMapsCircleEventEmitter::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 RNMapsGoogleMapViewEventEmitter::onIndoorBuildingFocused(OnIndoorBuildingFocused $event) const {
   dispatchEvent("indoorBuildingFocused", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
@@ -916,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

@@ -35,6 +35,28 @@ class RNMapsCalloutEventEmitter : public ViewEventEmitter {
     };
   void onPress(OnPress value) const;
 };
+class RNMapsCircleEventEmitter : 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 RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;
@@ -784,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

@@ -23,6 +23,18 @@ RNMapsCalloutProps::RNMapsCalloutProps(
     alphaHitTest(convertRawProp(context, rawProps, "alphaHitTest", sourceProps.alphaHitTest, {false})),
     tooltip(convertRawProp(context, rawProps, "tooltip", sourceProps.tooltip, {false}))
       {}
+RNMapsCircleProps::RNMapsCircleProps(
+    const PropsParserContext &context,
+    const RNMapsCircleProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    center(convertRawProp(context, rawProps, "center", sourceProps.center, {})),
+    fillColor(convertRawProp(context, rawProps, "fillColor", sourceProps.fillColor, {})),
+    radius(convertRawProp(context, rawProps, "radius", sourceProps.radius, {0.0})),
+    strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {0.0})),
+    tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
+      {}
 RNMapsGoogleMapViewProps::RNMapsGoogleMapViewProps(
     const PropsParserContext &context,
     const RNMapsGoogleMapViewProps &sourceProps,
@@ -151,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

@@ -29,6 +29,42 @@ class RNMapsCalloutProps final : public ViewProps {
   bool tooltip{false};
 };
 
+struct RNMapsCircleCenterStruct {
+  double latitude{0.0};
+  double longitude{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsCircleCenterStruct &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 RNMapsCircleCenterStruct &value) {
+  return "[Object RNMapsCircleCenterStruct]";
+}
+class RNMapsCircleProps final : public ViewProps {
+ public:
+  RNMapsCircleProps() = default;
+  RNMapsCircleProps(const PropsParserContext& context, const RNMapsCircleProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  RNMapsCircleCenterStruct center{};
+  SharedColor fillColor{};
+  double radius{0.0};
+  SharedColor strokeColor{};
+  Float strokeWidth{0.0};
+  bool tappable{false};
+};
+
 enum class RNMapsGoogleMapViewMapType { Hybrid, MutedStandard, None, Satellite, Standard, Terrain, SatelliteFlyover, HybridFlyover };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsGoogleMapViewMapType &result) {
@@ -1056,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) {