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

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

@@ -13,6 +13,7 @@ import android.location.Location;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
+import android.os.Bundle;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -24,8 +25,6 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.PermissionChecker;
-import androidx.core.view.GestureDetectorCompat;
-import androidx.core.view.MotionEventCompat;
 
 import com.facebook.react.common.MapBuilder;
 
@@ -90,6 +89,9 @@ import com.rnmaps.fabric.event.*;
 public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter,
         GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener, DefaultLifecycleObserver {
     public GoogleMap map;
+    private Bundle savedMapState;
+    private Map<Integer, MapFeature> savedFeatures = new HashMap<>();
+
     private MarkerManager markerManager;
     private MarkerManager.Collection markerCollection;
     private PolylineManager polylineManager;
@@ -128,27 +130,29 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private String customMapStyleString;
     private boolean initialRegionSet = false;
     private boolean initialCameraSet = false;
-    private LatLngBounds cameraLastIdleBounds;
-    private int cameraMoveReason = 0;
+    private int cameraMoveReason = -1;
     private MapMarker selectedMarker;
 
+    private LifecycleOwner currentLifecycleOwner;
+    private boolean isLifecycleObserverAttached = false;
+
     private static final String[] PERMISSIONS = new String[]{
             "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
 
-    private final List<MapFeature> features = new ArrayList<>();
+    private final Map<Integer, MapFeature> features = new HashMap<>();
     private final Map<Marker, MapMarker> markerMap = new HashMap<>();
     private final Map<Polyline, MapPolyline> polylineMap = new HashMap<>();
     private final Map<Polygon, MapPolygon> polygonMap = new HashMap<>();
     private final Map<GroundOverlay, MapOverlay> overlayMap = new HashMap<>();
     private final Map<TileOverlay, MapHeatmap> heatmapMap = new HashMap<>();
     private final Map<TileOverlay, MapGradientPolyline> gradientPolylineMap = new HashMap<>();
-    private final GestureDetectorCompat gestureDetector;
+    private final GestureDetector gestureDetector;
     private boolean paused = false;
     private boolean destroyed = false;
     private final ThemedReactContext context;
     private final FusedLocationSource fusedLocationSource;
 
-    private final ViewAttacherGroup attacherGroup;
+    private ViewAttacherGroup attacherGroup;
     private LatLng tapLocation;
     private Float maxZoomLevel;
     private Float minZoomLevel;
@@ -250,10 +254,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                    GoogleMapOptions googleMapOptions) {
         super(context, googleMapOptions);
         this.context = context;
-        Activity activity = context.getCurrentActivity();
-        if (activity instanceof LifecycleOwner) {
-            ((LifecycleOwner) activity).getLifecycle().addObserver(this);
-        }
         super.getMapAsync(this);
 
         final MapView view = this;
@@ -261,7 +261,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         fusedLocationSource = new FusedLocationSource(context);
 
         gestureDetector =
-                new GestureDetectorCompat(context, new GestureDetector.SimpleOnGestureListener() {
+                new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
 
                     @Override
                     public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
@@ -292,6 +292,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         // Set up a parent view for triggering visibility in subviews that depend on it.
         // Mainly ReactImageView depends on Fresco which depends on onVisibilityChanged() event
+       prepareAttacherView();
+    }
+
+    private void prepareAttacherView(){
         attacherGroup = new ViewAttacherGroup(context);
         LayoutParams attacherLayoutParams = new LayoutParams(0, 0);
         attacherLayoutParams.width = 0;
@@ -309,12 +313,66 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        attachLifecycleObserver();
+        if (savedMapState != null) {
+            super.onCreate(savedMapState);
+            super.onStart();
+            super.onResume();
+            prepareAttacherView();
+            getMapAsync((map)->{
+                onMapReady(map);
+                savedFeatures.forEach((index, feature) -> {
+                    addFeature(feature, index);
+                });
+            });
+        }
+    }
+
+    // Override onDetachedFromWindow to detach lifecycle observer
+    @Override
+    protected void onDetachedFromWindow() {
+        if (savedMapState == null) {
+            savedMapState = new Bundle();
+        }
+        super.onSaveInstanceState(savedMapState);
+        super.onPause();
+        super.onStop();
+        savedFeatures = new HashMap<>(features);
+        savedFeatures.keySet().forEach(this::removeFeatureAt);
+        removeView(attacherGroup);
+        attacherGroup = null;
+        detachLifecycleObserver();
+        super.onDetachedFromWindow();
+    }
+
+    // Method to attach lifecycle observer
+    private void attachLifecycleObserver() {
+        Activity activity = context.getCurrentActivity();
+        if (activity instanceof LifecycleOwner && !isLifecycleObserverAttached) {
+            currentLifecycleOwner = (LifecycleOwner) activity;
+            currentLifecycleOwner.getLifecycle().addObserver(this);
+            isLifecycleObserverAttached = true;
+        }
+    }
+
+    // Method to detach lifecycle observer
+    private void detachLifecycleObserver() {
+        if (currentLifecycleOwner != null && isLifecycleObserverAttached) {
+            currentLifecycleOwner.getLifecycle().removeObserver(this);
+            isLifecycleObserverAttached = false;
+            currentLifecycleOwner = null;
+        }
+    }
+
     public double[][] getMarkersFrames(boolean onlyVisible) {
 
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
         boolean addedPosition = false;
         LatLngBounds mapBounds = map.getProjection().getVisibleRegion().latLngBounds;
-        for (MapFeature feature : features) {
+        for (MapFeature feature : features.values()) {
             if (feature instanceof MapMarker) {
                 Marker marker = (Marker) feature.getFeature();
                 if (!onlyVisible ||
@@ -459,7 +517,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                 MapMarker airMapMarker = getMarkerMap(marker);
 
                 WritableMap eventData = makeClickEventData(marker.getPosition());
-                eventData.putString("action", "press");
+                eventData.putString("action", "marker-press");
                 eventData.putString("id", airMapMarker.getIdentifier());
                 airMapMarker.dispatchEvent(eventData, OnPressEvent::new);
 
@@ -563,31 +621,25 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         map.setOnCameraMoveStartedListener(reason -> {
             cameraMoveReason = reason;
+            LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
             boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason;
-            WritableMap event = new WritableNativeMap();
-            event.putBoolean("isGesture", isGesture);
-            dispatchEvent(event, OnRegionChangeStartEvent::new);
+            WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, isGesture);
+            dispatchEvent(payload, OnRegionChangeStartEvent::new);
         });
 
         map.setOnCameraMoveListener(() -> {
-            LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
-            cameraLastIdleBounds = null;
             boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
-            WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, false, isGesture);
-            dispatchEvent(payload, OnRegionChangeStartEvent::new);
+            LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
+            WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, isGesture);
+            dispatchEvent(payload, OnRegionChangeEvent::new);
         });
 
         map.setOnCameraIdleListener(() -> {
+            boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
+            cameraMoveReason = -1;
             LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
-            if ((cameraMoveReason != 0) &&
-                    ((cameraLastIdleBounds == null) ||
-                            LatLngBoundsUtils.BoundsAreDifferent(bounds, cameraLastIdleBounds))) {
-
-                cameraLastIdleBounds = bounds;
-                boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
-                WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, false, isGesture);
-                dispatchEvent(payload, OnRegionChangeCompleteEvent::new);
-            }
+            WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, isGesture);
+            dispatchEvent(payload, OnRegionChangeCompleteEvent::new);
         });
 
         map.setOnMapLoadedCallback(() -> {
@@ -689,10 +741,11 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         }
         destroyed = true;
 
-        Activity activity = context.getCurrentActivity();
-        if (activity instanceof LifecycleOwner) {
-            ((LifecycleOwner) activity).getLifecycle().removeObserver(this);
-        }
+        // Detach lifecycle observer before destroying
+        detachLifecycleObserver();
+        savedMapState = null;
+        savedFeatures = null;
+
         if (!paused) {
             onPause();
             paused = true;
@@ -1063,7 +1116,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         if (child instanceof MapMarker) {
             MapMarker annotation = (MapMarker) child;
             annotation.addToMap(markerCollection);
-            features.add(index, annotation);
+            features.put(index, annotation);
 
             // Allow visibility event to be triggered later
             int visibility = annotation.getVisibility();
@@ -1089,47 +1142,47 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         } else if (child instanceof MapPolyline) {
             MapPolyline polylineView = (MapPolyline) child;
             polylineView.addToMap(polylineCollection);
-            features.add(index, polylineView);
+            features.put(index, polylineView);
             Polyline polyline = (Polyline) polylineView.getFeature();
             polylineMap.put(polyline, polylineView);
         } else if (child instanceof MapGradientPolyline) {
             MapGradientPolyline polylineView = (MapGradientPolyline) child;
             polylineView.addToMap(map);
-            features.add(index, polylineView);
+            features.put(index, polylineView);
             TileOverlay tileOverlay = (TileOverlay) polylineView.getFeature();
             gradientPolylineMap.put(tileOverlay, polylineView);
         } else if (child instanceof MapPolygon) {
             MapPolygon polygonView = (MapPolygon) child;
             polygonView.addToMap(polygonCollection);
-            features.add(index, polygonView);
+            features.put(index, polygonView);
             Polygon polygon = (Polygon) polygonView.getFeature();
             polygonMap.put(polygon, polygonView);
         } else if (child instanceof MapCircle) {
             MapCircle circleView = (MapCircle) child;
             circleView.addToMap(circleCollection);
-            features.add(index, circleView);
+            features.put(index, circleView);
         } else if (child instanceof MapUrlTile) {
             MapUrlTile urlTileView = (MapUrlTile) child;
             urlTileView.addToMap(map);
-            features.add(index, urlTileView);
+            features.put(index, urlTileView);
         } else if (child instanceof MapWMSTile) {
             MapWMSTile urlTileView = (MapWMSTile) child;
             urlTileView.addToMap(map);
-            features.add(index, urlTileView);
+            features.put(index, urlTileView);
         } else if (child instanceof MapLocalTile) {
             MapLocalTile localTileView = (MapLocalTile) child;
             localTileView.addToMap(map);
-            features.add(index, localTileView);
+            features.put(index, localTileView);
         } else if (child instanceof MapOverlay) {
             MapOverlay overlayView = (MapOverlay) child;
             overlayView.addToMap(groundOverlayCollection);
-            features.add(index, overlayView);
+            features.put(index, overlayView);
             GroundOverlay overlay = (GroundOverlay) overlayView.getFeature();
             overlayMap.put(overlay, overlayView);
         } else if (child instanceof MapHeatmap) {
             MapHeatmap heatmapView = (MapHeatmap) child;
             heatmapView.addToMap(map);
-            features.add(index, heatmapView);
+            features.put(index, heatmapView);
             TileOverlay heatmap = (TileOverlay) heatmapView.getFeature();
             heatmapMap.put(heatmap, heatmapView);
         } else if (child instanceof ViewGroup) {
@@ -1274,8 +1327,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
 
         boolean addedPosition = false;
-        if (features.size() > 0) {
-            for (MapFeature feature : features) {
+        if (!features.isEmpty()) {
+            for (MapFeature feature : features.values()) {
                 if (feature instanceof MapMarker) {
                     Marker marker = (Marker) feature.getFeature();
                     builder.include(marker.getPosition());
@@ -1317,7 +1370,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         List<String> markerIDList = Arrays.asList(markerIDs);
 
-        for (MapFeature feature : features) {
+        for (MapFeature feature : features.values()) {
             if (feature instanceof MapMarker) {
                 String identifier = ((MapMarker) feature).getIdentifier();
                 Marker marker = (Marker) feature.getFeature();
@@ -1489,7 +1542,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             tapLocation = map.getProjection().fromScreenLocation(new Point(X, Y));
         }
 
-        int action = MotionEventCompat.getActionMasked(ev);
+        int action = ev.getActionMasked();
 
         switch (action) {
             case (MotionEvent.ACTION_DOWN):
@@ -1512,7 +1565,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         MapMarker markerView = getMarkerMap(marker);
         event = makeClickEventData(marker.getPosition());
-        dispatchEvent(event, OnMarkerDragStartEvent::new, markerView.getId(), context);
+        markerView.dispatchEvent(event, OnDragStartEvent::new);
     }
 
     @Override
@@ -1522,7 +1575,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         MapMarker markerView = getMarkerMap(marker);
         event = makeClickEventData(marker.getPosition());
-        dispatchEvent(event, OnMarkerDragEvent::new, markerView.getId(), context);
+        markerView.dispatchEvent(event, OnDragEvent::new);
     }
 
     @Override
@@ -1531,7 +1584,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         dispatchEvent(event, OnMarkerDragEndEvent::new);
         MapMarker markerView = getMarkerMap(marker);
         event = makeClickEventData(marker.getPosition());
-        dispatchEvent(event, OnMarkerDragEndEvent::new, markerView.getId(), context);
+        markerView.dispatchEvent(event, OnDragEndEvent::new);
     }
 
     @Override

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

@@ -1,45 +1,102 @@
 package com.rnmaps.maps;
 
+import androidx.annotation.NonNull;
+
+import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+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.rnmaps.fabric.OverlayManager;
+import com.rnmaps.fabric.PolygonManager;
+import com.rnmaps.fabric.PolylineManager;
+import com.rnmaps.fabric.UrlTileManager;
+import com.rnmaps.fabric.WMSTileManager;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-public class MapsPackage implements ReactPackage {
+public class MapsPackage extends BaseReactPackage implements ReactPackage {
 
   @Override
-  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-    List<NativeModule> modules = new ArrayList<>();
+  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),
+            new OverlayManager(reactContext),
+            new UrlTileManager(reactContext),
+            new WMSTileManager(reactContext),
+            new MapGradientPolylineManager(reactContext),
+            new MapLocalTileManager(reactContext),
+            new MapHeatmapManager());
+  }
 
-    modules.add(new MapModule(reactContext));
 
-    return modules;
+  @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);
+    }
+    if (PolygonManager.REACT_CLASS.equals(name)) {
+      return new PolygonManager(reactContext);
+    }
+    if (CalloutManager.REACT_CLASS.equals(name)) {
+      return new CalloutManager(reactContext);
+    }
+    if (MarkerManager.REACT_CLASS.equals(name)) {
+      return new MarkerManager(reactContext);
+    }
+    if (MapViewManager.REACT_CLASS.equals(name)) {
+      return new MapViewManager(reactContext);
+    }
+    if (UrlTileManager.REACT_CLASS.equals(name)) {
+      return new UrlTileManager(reactContext);
+    }
+    if (WMSTileManager.REACT_CLASS.equals(name)) {
+      return new WMSTileManager(reactContext);
+    }
+    if (NativeAirMapsModuleSpec.NAME.equals(name)) {
+      return new NativeAirMapsModule(reactContext);
+    } else {
+      return null;
+    }
   }
 
   @Override
-  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-    MapManager mapManager = new MapManager(reactContext);
-    MapMarkerManager annotationManager = new MapMarkerManager();
-    mapManager.setMarkerManager(annotationManager);
-
-    List<ViewManager> viewManagers = new ArrayList<>();
-
-    viewManagers.add(mapManager);
-    viewManagers.add(annotationManager);
-    viewManagers.add(new MapCalloutManager());
-    viewManagers.add(new MapPolylineManager(reactContext));
-    viewManagers.add(new MapGradientPolylineManager(reactContext));
-    viewManagers.add(new MapPolygonManager(reactContext));
-    viewManagers.add(new MapCircleManager(reactContext));
-    viewManagers.add(new MapUrlTileManager(reactContext));
-    viewManagers.add(new MapWMSTileManager(reactContext));
-    viewManagers.add(new MapLocalTileManager(reactContext));
-    viewManagers.add(new MapOverlayManager(reactContext));
-    viewManagers.add(new MapHeatmapManager());
-
-    return viewManagers;
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return new ReactModuleInfoProvider() {
+      @NonNull
+      @Override
+      public Map<String, ReactModuleInfo> getReactModuleInfos() {
+        Map<String, ReactModuleInfo> map = new HashMap<>();
+        map.put(NativeAirMapsModuleSpec.NAME, new ReactModuleInfo(
+                NativeAirMapsModuleSpec.NAME,       // name
+                NativeAirMapsModuleSpec.NAME,       // className
+                false, // canOverrideExistingModule
+                false, // needsEagerInit
+                false, // isCXXModule
+                true   // isTurboModule
+        ));
+        return map;
+      }
+    };
   }
 }

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

@@ -9,13 +9,11 @@ import com.google.android.gms.maps.model.LatLngBounds;
 
 public class RegionChangeEvent extends Event<RegionChangeEvent> {
   private final LatLngBounds bounds;
-  private final boolean continuous;
   private final boolean isGesture;
 
-  public RegionChangeEvent(int id, LatLngBounds bounds, boolean continuous, boolean isGesture) {
+  public RegionChangeEvent(int id, LatLngBounds bounds, boolean isGesture) {
     super(id);
     this.bounds = bounds;
-    this.continuous = continuous;
     this.isGesture = isGesture;
   }
 
@@ -32,7 +30,6 @@ public class RegionChangeEvent extends Event<RegionChangeEvent> {
   @Override
   public void dispatch(RCTEventEmitter rctEventEmitter) {
     WritableMap event = new WritableNativeMap();
-    event.putBoolean("continuous", continuous);
 
     WritableMap region = new WritableNativeMap();
     LatLng center = bounds.getCenter();

package/android/src/main/jni/react/renderer/components/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;
   });
 }

package/android/src/main/jni/react/renderer/components/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 {

package/android/src/main/jni/react/renderer/components/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}))
@@ -153,10 +154,12 @@ 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})),
     title(convertRawProp(context, rawProps, "title", sourceProps.title, {})),
+    tracksViewChanges(convertRawProp(context, rawProps, "tracksViewChanges", sourceProps.tracksViewChanges, {true})),
     identifier(convertRawProp(context, rawProps, "identifier", sourceProps.identifier, {})),
     isPreselected(convertRawProp(context, rawProps, "isPreselected", sourceProps.isPreselected, {false})),
     opacity(convertRawProp(context, rawProps, "opacity", sourceProps.opacity, {1.0})),
@@ -188,7 +191,7 @@ 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(