react-native-maps 1.25.0-alpha.8 → 1.25.0

package/ios/generated/RNMapsSpecs/EventEmitters.cpp

@@ -318,7 +318,7 @@ void RNMapsGoogleMapViewEventEmitter::onRegionChangeStart(OnRegionChangeStart $e
   region.setProperty(runtime, "longitudeDelta", $event.region.longitudeDelta);
   $payload.setProperty(runtime, "region", region);
 }
-$payload.setProperty(runtime, "continuous", $event.continuous);
+$payload.setProperty(runtime, "isGesture", $event.isGesture);
     return $payload;
   });
 }
@@ -335,7 +335,7 @@ void RNMapsGoogleMapViewEventEmitter::onRegionChange(OnRegionChange $event) cons
   region.setProperty(runtime, "longitudeDelta", $event.region.longitudeDelta);
   $payload.setProperty(runtime, "region", region);
 }
-$payload.setProperty(runtime, "continuous", $event.continuous);
+$payload.setProperty(runtime, "isGesture", $event.isGesture);
     return $payload;
   });
 }
@@ -352,7 +352,7 @@ void RNMapsGoogleMapViewEventEmitter::onRegionChangeComplete(OnRegionChangeCompl
   region.setProperty(runtime, "longitudeDelta", $event.region.longitudeDelta);
   $payload.setProperty(runtime, "region", region);
 }
-$payload.setProperty(runtime, "continuous", $event.continuous);
+$payload.setProperty(runtime, "isGesture", $event.isGesture);
     return $payload;
   });
 }
@@ -730,7 +730,7 @@ void RNMapsMapViewEventEmitter::onRegionChangeStart(OnRegionChangeStart $event)
   region.setProperty(runtime, "longitudeDelta", $event.region.longitudeDelta);
   $payload.setProperty(runtime, "region", region);
 }
-$payload.setProperty(runtime, "continuous", $event.continuous);
+$payload.setProperty(runtime, "isGesture", $event.isGesture);
     return $payload;
   });
 }
@@ -747,7 +747,7 @@ void RNMapsMapViewEventEmitter::onRegionChange(OnRegionChange $event) const {
   region.setProperty(runtime, "longitudeDelta", $event.region.longitudeDelta);
   $payload.setProperty(runtime, "region", region);
 }
-$payload.setProperty(runtime, "continuous", $event.continuous);
+$payload.setProperty(runtime, "isGesture", $event.isGesture);
     return $payload;
   });
 }
@@ -764,7 +764,7 @@ void RNMapsMapViewEventEmitter::onRegionChangeComplete(OnRegionChangeComplete $e
   region.setProperty(runtime, "longitudeDelta", $event.region.longitudeDelta);
   $payload.setProperty(runtime, "region", region);
 }
-$payload.setProperty(runtime, "continuous", $event.continuous);
+$payload.setProperty(runtime, "isGesture", $event.isGesture);
     return $payload;
   });
 }
@@ -974,4 +974,6 @@ $payload.setProperty(runtime, "id", $event.id);
   });
 }
 
+
+
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/EventEmitters.h

@@ -245,7 +245,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
 
   struct OnRegionChangeStart {
       OnRegionChangeStartRegion region;
-    bool continuous;
+    bool isGesture;
     };
 
   struct OnRegionChangeRegion {
@@ -257,7 +257,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
 
   struct OnRegionChange {
       OnRegionChangeRegion region;
-    bool continuous;
+    bool isGesture;
     };
 
   struct OnRegionChangeCompleteRegion {
@@ -269,7 +269,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
 
   struct OnRegionChangeComplete {
       OnRegionChangeCompleteRegion region;
-    bool continuous;
+    bool isGesture;
     };
 
   struct OnUserLocationChangeCoordinate {
@@ -593,7 +593,7 @@ class RNMapsMapViewEventEmitter : public ViewEventEmitter {
 
   struct OnRegionChangeStart {
       OnRegionChangeStartRegion region;
-    bool continuous;
+    bool isGesture;
     };
 
   struct OnRegionChangeRegion {
@@ -605,7 +605,7 @@ class RNMapsMapViewEventEmitter : public ViewEventEmitter {
 
   struct OnRegionChange {
       OnRegionChangeRegion region;
-    bool continuous;
+    bool isGesture;
     };
 
   struct OnRegionChangeCompleteRegion {
@@ -617,7 +617,7 @@ class RNMapsMapViewEventEmitter : public ViewEventEmitter {
 
   struct OnRegionChangeComplete {
       OnRegionChangeCompleteRegion region;
-    bool continuous;
+    bool isGesture;
     };
 
   struct OnUserLocationChangeCoordinate {
@@ -842,5 +842,19 @@ class RNMapsPolylineEventEmitter : public ViewEventEmitter {
     OnPressPosition position;
     };
   void onPress(OnPress value) const;
+};
+class RNMapsUrlTileEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+  
+};
+class RNMapsWMSTileEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+  
 };
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/Props.cpp

@@ -32,7 +32,7 @@ RNMapsCircleProps::RNMapsCircleProps(
     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})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
       {}
 RNMapsGoogleMapViewProps::RNMapsGoogleMapViewProps(
@@ -83,6 +83,7 @@ RNMapsGooglePolygonProps::RNMapsGooglePolygonProps(
     coordinates(convertRawProp(context, rawProps, "coordinates", sourceProps.coordinates, {})),
     fillColor(convertRawProp(context, rawProps, "fillColor", sourceProps.fillColor, {})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     geodesic(convertRawProp(context, rawProps, "geodesic", sourceProps.geodesic, {false})),
     holes(convertRawProp(context, rawProps, "holes", sourceProps.holes, {})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
@@ -131,6 +132,7 @@ RNMapsMapViewProps::RNMapsMapViewProps(
     tintColor(convertRawProp(context, rawProps, "tintColor", sourceProps.tintColor, {})),
     toolbarEnabled(convertRawProp(context, rawProps, "toolbarEnabled", sourceProps.toolbarEnabled, {true})),
     userInterfaceStyle(convertRawProp(context, rawProps, "userInterfaceStyle", sourceProps.userInterfaceStyle, {RNMapsMapViewUserInterfaceStyle::System})),
+    customMapStyleString(convertRawProp(context, rawProps, "customMapStyleString", sourceProps.customMapStyleString, {})),
     userLocationAnnotationTitle(convertRawProp(context, rawProps, "userLocationAnnotationTitle", sourceProps.userLocationAnnotationTitle, {})),
     userLocationCalloutEnabled(convertRawProp(context, rawProps, "userLocationCalloutEnabled", sourceProps.userLocationCalloutEnabled, {false})),
     userLocationFastestInterval(convertRawProp(context, rawProps, "userLocationFastestInterval", sourceProps.userLocationFastestInterval, {5000})),
@@ -152,6 +154,7 @@ RNMapsMarkerProps::RNMapsMarkerProps(
     image(convertRawProp(context, rawProps, "image", sourceProps.image, {})),
     calloutOffset(convertRawProp(context, rawProps, "calloutOffset", sourceProps.calloutOffset, {})),
     displayPriority(convertRawProp(context, rawProps, "displayPriority", sourceProps.displayPriority, {RNMapsMarkerDisplayPriority::Required})),
+    centerOffset(convertRawProp(context, rawProps, "centerOffset", sourceProps.centerOffset, {})),
     coordinate(convertRawProp(context, rawProps, "coordinate", sourceProps.coordinate, {})),
     description(convertRawProp(context, rawProps, "description", sourceProps.description, {})),
     draggable(convertRawProp(context, rawProps, "draggable", sourceProps.draggable, {false})),
@@ -187,8 +190,40 @@ RNMapsPolylineProps::RNMapsPolylineProps(
     lineJoin(convertRawProp(context, rawProps, "lineJoin", sourceProps.lineJoin, {RNMapsPolylineLineJoin::Miter})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
     strokeColors(convertRawProp(context, rawProps, "strokeColors", sourceProps.strokeColors, {})),
-    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {0.0})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
       {}
+RNMapsUrlTileProps::RNMapsUrlTileProps(
+    const PropsParserContext &context,
+    const RNMapsUrlTileProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    doubleTileSize(convertRawProp(context, rawProps, "doubleTileSize", sourceProps.doubleTileSize, {false})),
+    flipY(convertRawProp(context, rawProps, "flipY", sourceProps.flipY, {false})),
+    maximumNativeZ(convertRawProp(context, rawProps, "maximumNativeZ", sourceProps.maximumNativeZ, {100})),
+    maximumZ(convertRawProp(context, rawProps, "maximumZ", sourceProps.maximumZ, {100})),
+    minimumZ(convertRawProp(context, rawProps, "minimumZ", sourceProps.minimumZ, {0})),
+    offlineMode(convertRawProp(context, rawProps, "offlineMode", sourceProps.offlineMode, {false})),
+    shouldReplaceMapContent(convertRawProp(context, rawProps, "shouldReplaceMapContent", sourceProps.shouldReplaceMapContent, {false})),
+    tileCacheMaxAge(convertRawProp(context, rawProps, "tileCacheMaxAge", sourceProps.tileCacheMaxAge, {0})),
+    tileCachePath(convertRawProp(context, rawProps, "tileCachePath", sourceProps.tileCachePath, {})),
+    tileSize(convertRawProp(context, rawProps, "tileSize", sourceProps.tileSize, {256})),
+    urlTemplate(convertRawProp(context, rawProps, "urlTemplate", sourceProps.urlTemplate, {}))
+      {}
+RNMapsWMSTileProps::RNMapsWMSTileProps(
+    const PropsParserContext &context,
+    const RNMapsWMSTileProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    maximumNativeZ(convertRawProp(context, rawProps, "maximumNativeZ", sourceProps.maximumNativeZ, {100})),
+    maximumZ(convertRawProp(context, rawProps, "maximumZ", sourceProps.maximumZ, {100})),
+    minimumZ(convertRawProp(context, rawProps, "minimumZ", sourceProps.minimumZ, {0})),
+    offlineMode(convertRawProp(context, rawProps, "offlineMode", sourceProps.offlineMode, {false})),
+    shouldReplaceMapContent(convertRawProp(context, rawProps, "shouldReplaceMapContent", sourceProps.shouldReplaceMapContent, {false})),
+    tileCacheMaxAge(convertRawProp(context, rawProps, "tileCacheMaxAge", sourceProps.tileCacheMaxAge, {0})),
+    tileCachePath(convertRawProp(context, rawProps, "tileCachePath", sourceProps.tileCachePath, {})),
+    tileSize(convertRawProp(context, rawProps, "tileSize", sourceProps.tileSize, {256})),
+    urlTemplate(convertRawProp(context, rawProps, "urlTemplate", sourceProps.urlTemplate, {}))
+      {}
 
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/Props.h

@@ -61,7 +61,7 @@ class RNMapsCircleProps final : public ViewProps {
   SharedColor fillColor{};
   double radius{0.0};
   SharedColor strokeColor{};
-  Float strokeWidth{0.0};
+  Float strokeWidth{1.0};
   bool tappable{false};
 };
 
@@ -478,6 +478,7 @@ class RNMapsGooglePolygonProps final : public ViewProps {
   std::vector<RNMapsGooglePolygonCoordinatesStruct> coordinates{};
   SharedColor fillColor{};
   SharedColor strokeColor{};
+  Float strokeWidth{1.0};
   bool geodesic{false};
   std::vector<std::vector<RNMapsGooglePolygonHolesStruct>> holes{};
   bool tappable{false};
@@ -918,6 +919,7 @@ class RNMapsMapViewProps final : public ViewProps {
   SharedColor tintColor{};
   bool toolbarEnabled{true};
   RNMapsMapViewUserInterfaceStyle userInterfaceStyle{RNMapsMapViewUserInterfaceStyle::System};
+  std::string customMapStyleString{};
   std::string userLocationAnnotationTitle{};
   bool userLocationCalloutEnabled{false};
   int userLocationFastestInterval{5000};
@@ -1047,6 +1049,28 @@ static inline std::string toString(const RNMapsMarkerCalloutOffsetStruct &value)
   return "[Object RNMapsMarkerCalloutOffsetStruct]";
 }
 
+struct RNMapsMarkerCenterOffsetStruct {
+  double x{0.0};
+  double y{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsMarkerCenterOffsetStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_x = map.find("x");
+  if (tmp_x != map.end()) {
+    fromRawValue(context, tmp_x->second, result.x);
+  }
+  auto tmp_y = map.find("y");
+  if (tmp_y != map.end()) {
+    fromRawValue(context, tmp_y->second, result.y);
+  }
+}
+
+static inline std::string toString(const RNMapsMarkerCenterOffsetStruct &value) {
+  return "[Object RNMapsMarkerCenterOffsetStruct]";
+}
+
 struct RNMapsMarkerCoordinateStruct {
   double latitude{0.0};
   double longitude{0.0};
@@ -1080,6 +1104,7 @@ class RNMapsMarkerProps final : public ViewProps {
   ImageSource image{};
   RNMapsMarkerCalloutOffsetStruct calloutOffset{};
   RNMapsMarkerDisplayPriority displayPriority{RNMapsMarkerDisplayPriority::Required};
+  RNMapsMarkerCenterOffsetStruct centerOffset{};
   RNMapsMarkerCoordinateStruct coordinate{};
   std::string description{};
   bool draggable{false};
@@ -1093,12 +1118,12 @@ class RNMapsMarkerProps final : public ViewProps {
   bool useLegacyPinView{false};
 };
 
-struct RNMapsOverlayBoundsStruct {
+struct RNMapsOverlayBoundsNorthEastStruct {
   double latitude{0.0};
   double longitude{0.0};
 };
 
-static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsNorthEastStruct &result) {
   auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto tmp_latitude = map.find("latitude");
@@ -1111,19 +1136,53 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   }
 }
 
-static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
-  return "[Object RNMapsOverlayBoundsStruct]";
+static inline std::string toString(const RNMapsOverlayBoundsNorthEastStruct &value) {
+  return "[Object RNMapsOverlayBoundsNorthEastStruct]";
 }
 
-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);
+struct RNMapsOverlayBoundsSouthWestStruct {
+  double latitude{0.0};
+  double longitude{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsSouthWestStruct &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 RNMapsOverlayBoundsSouthWestStruct &value) {
+  return "[Object RNMapsOverlayBoundsSouthWestStruct]";
 }
 
+struct RNMapsOverlayBoundsStruct {
+  RNMapsOverlayBoundsNorthEastStruct northEast{};
+  RNMapsOverlayBoundsSouthWestStruct southWest{};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_northEast = map.find("northEast");
+  if (tmp_northEast != map.end()) {
+    fromRawValue(context, tmp_northEast->second, result.northEast);
+  }
+  auto tmp_southWest = map.find("southWest");
+  if (tmp_southWest != map.end()) {
+    fromRawValue(context, tmp_southWest->second, result.southWest);
+  }
+}
+
+static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
+  return "[Object RNMapsOverlayBoundsStruct]";
+}
 class RNMapsOverlayProps final : public ViewProps {
  public:
   RNMapsOverlayProps() = default;
@@ -1132,7 +1191,7 @@ class RNMapsOverlayProps final : public ViewProps {
 #pragma mark - Props
 
   Float bearing{0.0};
-  std::vector<RNMapsOverlayBoundsStruct> bounds{};
+  RNMapsOverlayBoundsStruct bounds{};
   ImageSource image{};
   Float opacity{1.0};
   bool tappable{false};
@@ -1217,8 +1276,46 @@ class RNMapsPolylineProps final : public ViewProps {
   RNMapsPolylineLineJoin lineJoin{RNMapsPolylineLineJoin::Miter};
   SharedColor strokeColor{};
   std::vector<SharedColor> strokeColors{};
-  Float strokeWidth{0.0};
+  Float strokeWidth{1.0};
   bool tappable{false};
 };
 
+class RNMapsUrlTileProps final : public ViewProps {
+ public:
+  RNMapsUrlTileProps() = default;
+  RNMapsUrlTileProps(const PropsParserContext& context, const RNMapsUrlTileProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  bool doubleTileSize{false};
+  bool flipY{false};
+  int maximumNativeZ{100};
+  int maximumZ{100};
+  int minimumZ{0};
+  bool offlineMode{false};
+  bool shouldReplaceMapContent{false};
+  int tileCacheMaxAge{0};
+  std::string tileCachePath{};
+  int tileSize{256};
+  std::string urlTemplate{};
+};
+
+class RNMapsWMSTileProps final : public ViewProps {
+ public:
+  RNMapsWMSTileProps() = default;
+  RNMapsWMSTileProps(const PropsParserContext& context, const RNMapsWMSTileProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  int maximumNativeZ{100};
+  int maximumZ{100};
+  int minimumZ{0};
+  bool offlineMode{false};
+  bool shouldReplaceMapContent{false};
+  int tileCacheMaxAge{0};
+  std::string tileCachePath{};
+  int tileSize{256};
+  std::string urlTemplate{};
+};
+
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/ShadowNodes.cpp

@@ -20,5 +20,7 @@ extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";
 extern const char RNMapsMarkerComponentName[] = "RNMapsMarker";
 extern const char RNMapsOverlayComponentName[] = "RNMapsOverlay";
 extern const char RNMapsPolylineComponentName[] = "RNMapsPolyline";
+extern const char RNMapsUrlTileComponentName[] = "RNMapsUrlTile";
+extern const char RNMapsWMSTileComponentName[] = "RNMapsWMSTile";
 
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/ShadowNodes.h

@@ -106,4 +106,26 @@ using RNMapsPolylineShadowNode = ConcreteViewShadowNode<
     RNMapsPolylineEventEmitter,
     RNMapsPolylineState>;
 
+JSI_EXPORT extern const char RNMapsUrlTileComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsUrlTile> component.
+ */
+using RNMapsUrlTileShadowNode = ConcreteViewShadowNode<
+    RNMapsUrlTileComponentName,
+    RNMapsUrlTileProps,
+    RNMapsUrlTileEventEmitter,
+    RNMapsUrlTileState>;
+
+JSI_EXPORT extern const char RNMapsWMSTileComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsWMSTile> component.
+ */
+using RNMapsWMSTileShadowNode = ConcreteViewShadowNode<
+    RNMapsWMSTileComponentName,
+    RNMapsWMSTileProps,
+    RNMapsWMSTileEventEmitter,
+    RNMapsWMSTileState>;
+
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/States.h

@@ -110,4 +110,28 @@ public:
 #endif
 };
 
+class RNMapsUrlTileState {
+public:
+  RNMapsUrlTileState() = default;
+
+#ifdef ANDROID
+  RNMapsUrlTileState(RNMapsUrlTileState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
+class RNMapsWMSTileState {
+public:
+  RNMapsWMSTileState() = default;
+
+#ifdef ANDROID
+  RNMapsWMSTileState(RNMapsWMSTileState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 } // namespace facebook::react

package/ios/generated/module.modulemap

@@ -1,6 +1,6 @@
 framework module ReactNativeMapsGenerated {
     header "RNMapsAirModuleDelegate.h"
-    header "RNMapsHostVewDelegate.h"
+    header "RNMapsHostViewDelegate.h"
 
     explicit module RNMapsSpecs {
         header "ComponentDescriptors.h"

package/package.json

@@ -5,7 +5,7 @@
   "main": "src/index.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.25.0-alpha.8",
+  "version": "1.25.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -25,8 +25,6 @@
     "ios",
     "app.plugin.js",
     "plugin/build",
-    "react-native-maps-generated.podspec",
-    "react-native-google-maps.podspec",
     "react-native-maps.podspec",
     "react-native.config.js",
     "!android/build",
@@ -111,6 +109,14 @@
     "includesGeneratedCode": true,
     "android": {
       "javaPackageName": "com.rnmaps.fabric"
+    },
+    "ios": {
+      "componentProvider": {
+        "RNMapsGoogleMapView": "RNMapsGoogleMapView",
+        "RNMapsGooglePolygon": "RNMapsGooglePolygonView",
+        "RNMapsMapView": "RNMapsMapView",
+        "RNMapsMarker": "RNMapsMarkerView"
+      }
     }
   },
   "engines": {

package/plugin/build/ios.js

@@ -62,7 +62,7 @@ var withMapsIOS = function (config, props) {
     });
     // Adds/Removes AppDelegate setup for Google Maps API on iOS
     config = withGoogleMapsAppDelegate(config, {
-        apiKey: props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey,
+        apiKey: (props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey) || null,
     });
     return config;
 };
@@ -111,14 +111,14 @@ function removeGoogleMapsAppDelegateInit(src) {
 exports.removeGoogleMapsAppDelegateInit = removeGoogleMapsAppDelegateInit;
 /**
  * @param src The contents of the Podfile.
+ * @param useGoogleMaps if GoogleMaps for iOS is used
  * @returns Podfile with react-native-maps integration configured.
  */
 function addMapsCocoapods(src, useGoogleMaps) {
     var newSrc = '  rn_maps_path = File.dirname(`node --print "require.resolve(\'react-native-maps/package.json\')"`) \n';
     if (useGoogleMaps) {
-        newSrc += "  pod 'react-native-google-maps', :path => rn_maps_path \n";
+        newSrc += "  pod 'react-native-maps/Google', :path => rn_maps_path \n";
     }
-    newSrc += "  pod 'react-native-maps-generated', :path => rn_maps_path \n";
     return (0, generateCode_1.mergeContents)({
         tag: 'react-native-maps',
         src: src,

package/src/AnimatedRegion.ts

@@ -1,5 +1,5 @@
 import {Animated} from 'react-native';
-import {Region} from './sharedTypes';
+import type {Region} from './sharedTypes';
 
 const AnimatedWithChildren = Object.getPrototypeOf(Animated.ValueXY);
 if (__DEV__) {
@@ -89,6 +89,7 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
     };
   }
 
+  // @ts-ignore
   private __attach() {
     this.latitude.__addChild(this);
     this.longitude.__addChild(this);
@@ -96,6 +97,7 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
     this.longitudeDelta.__addChild(this);
   }
 
+  // @ts-ignore
   private __detach() {
     this.latitude.__removeChild(this);
     this.longitude.__removeChild(this);

package/src/Geojson.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {
+import type {
   Feature,
   FeatureCollection,
   Point,
@@ -10,12 +10,12 @@ import {
   Polygon,
   MultiPolygon,
 } from 'geojson';
-import Marker, {MapMarkerProps as MarkerProps} from './MapMarker';
-import {MapPolygonProps as PolygonProps} from './MapPolygon';
-import {MapPolylineProps as PolylineProps} from './MapPolyline';
+import Marker, {type MapMarkerProps as MarkerProps} from './MapMarker';
+import type {MapPolygonProps as PolygonProps} from './MapPolygon';
+import type {MapPolylineProps as PolylineProps} from './MapPolyline';
 import Polyline from './MapPolyline';
 import MapPolygon from './MapPolygon';
-import {LatLng} from './sharedTypes';
+import type {LatLng} from './sharedTypes';
 
 export type GeojsonProps = {
   /**

package/src/MapCallout.tsx

@@ -1,14 +1,14 @@
 import * as React from 'react';
-import {StyleSheet, ViewProps} from 'react-native';
+import {StyleSheet, type ViewProps} from 'react-native';
 import decorateMapComponent, {
-  MapManagerCommand,
-  NativeComponent,
   ProviderContext,
   SUPPORTED,
-  UIManagerCommand,
   USES_DEFAULT_IMPLEMENTATION,
+  type MapManagerCommand,
+  type NativeComponent,
+  type UIManagerCommand,
 } from './decorateMapComponent';
-import {CalloutPressEvent} from './sharedTypes';
+import type {CalloutPressEvent} from './sharedTypes';
 
 export type MapCalloutProps = ViewProps & {
   /**

package/src/MapCalloutSubview.tsx

@@ -1,14 +1,18 @@
 import * as React from 'react';
-import {NativeSyntheticEvent, StyleSheet, ViewProps} from 'react-native';
+import {
+  StyleSheet,
+  type NativeSyntheticEvent,
+  type ViewProps,
+} from 'react-native';
 import decorateMapComponent, {
   SUPPORTED,
   NOT_SUPPORTED,
   ProviderContext,
-  NativeComponent,
-  MapManagerCommand,
-  UIManagerCommand,
+  type NativeComponent,
+  type MapManagerCommand,
+  type UIManagerCommand,
 } from './decorateMapComponent';
-import {Frame, Point} from './sharedTypes';
+import type {Frame, Point} from './sharedTypes';
 
 export type MapCalloutSubviewProps = ViewProps & {
   /**

package/src/MapCircle.tsx

@@ -1,14 +1,14 @@
 import * as React from 'react';
-import {View, ViewProps} from 'react-native';
+import {View, type ViewProps} from 'react-native';
 import decorateMapComponent, {
   USES_DEFAULT_IMPLEMENTATION,
   SUPPORTED,
   ProviderContext,
-  NativeComponent,
-  MapManagerCommand,
-  UIManagerCommand,
+  type NativeComponent,
+  type MapManagerCommand,
+  type UIManagerCommand,
 } from './decorateMapComponent';
-import {LatLng, LineCapType, LineJoinType} from './sharedTypes';
+import type {LatLng, LineCapType, LineJoinType} from './sharedTypes';
 
 export type MapCircleProps = ViewProps & {
   /**