react-native-google-maps-plus 1.8.8-dev.1 → 1.10.0-dev.2

package/README.md

@@ -4,8 +4,6 @@
 [![Dev Release](https://img.shields.io/npm/v/react-native-google-maps-plus/dev.svg?label=dev%20release&color=orange)](https://www.npmjs.com/package/react-native-google-maps-plus)
 [![Build](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml/badge.svg)](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml)
 ![React Native](https://img.shields.io/badge/react--native-%3E%3D0.81.0-61dafb.svg?logo=react)
-![Platform: Android](https://img.shields.io/badge/android-supported-brightgreen.svg?logo=android&logoColor=white)
-![Platform: iOS](https://img.shields.io/badge/ios-supported-lightgrey.svg?logo=apple&logoColor=black)
 
 React Native wrapper for Android & iOS Google Maps SDK.
 

package/android/build.gradle

@@ -70,27 +70,6 @@ android {
     }
   }
 
-  packagingOptions {
-    excludes = [
-            "META-INF",
-            "META-INF/**",
-            "**/libc++_shared.so",
-            "**/libfbjni.so",
-            "**/libjsi.so",
-            "**/libfolly_json.so",
-            "**/libfolly_runtime.so",
-            "**/libglog.so",
-            "**/libhermes.so",
-            "**/libhermes-executor-debug.so",
-            "**/libhermes_executor.so",
-            "**/libreactnative.so",
-            "**/libreactnativejni.so",
-            "**/libturbomodulejsijni.so",
-            "**/libreact_nativemodule_core.so",
-            "**/libjscexecutor.so"
-    ]
-  }
-
   buildFeatures {
     buildConfig true
     prefab true

package/android/gradle.properties

@@ -6,4 +6,4 @@ RNGoogleMapsPlus_ndkVersion=27.1.12297006
 RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.9.0
 RNGoogleMapsPlus_googlePlayServicesMapsVersion=19.2.0
 RNGoogleMapsPlus_googlePlayServicesLocationVersion=21.3.0
-RNGoogleMapsPlus_mapsUtilsVersion=3.19.0
+RNGoogleMapsPlus_mapsUtilsVersion=3.19.1

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -12,7 +12,8 @@ import android.location.Location
 import android.util.Size
 import android.view.View
 import android.widget.FrameLayout
-import com.facebook.react.bridge.LifecycleEventListener
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.findViewTreeLifecycleOwner
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.maps.CameraUpdateFactory
@@ -81,10 +82,12 @@ class GoogleMapsViewImpl(
   GoogleMap.OnInfoWindowLongClickListener,
   GoogleMap.OnMyLocationClickListener,
   GoogleMap.OnMyLocationButtonClickListener,
-  GoogleMap.InfoWindowAdapter,
-  LifecycleEventListener {
-  private var initialized = false
-  private var loaded = false
+  GoogleMap.InfoWindowAdapter {
+  private var lifecycleObserver: MapLifecycleEventObserver? = null
+  private var lifecycle: Lifecycle? = null
+
+  private var mapViewInitialized = false
+  private var mapViewLoaded = false
   private var destroyed = false
   private var googleMap: GoogleMap? = null
   private var mapView: MapView? = null
@@ -125,13 +128,12 @@ class GoogleMapsViewImpl(
   init {
     MapsInitializer.initialize(reactContext)
     reactContext.registerComponentCallbacks(componentCallbacks)
-    reactContext.addLifecycleEventListener(this)
   }
 
-  fun initMapView(googleMapsOptions: GoogleMapOptions) =
+  fun initMapView() =
     onUi {
-      if (initialized) return@onUi
-      initialized = true
+      if (mapViewInitialized) return@onUi
+      mapViewInitialized = true
 
       val result = playServiceHandler.playServicesAvailability()
       val errorCode = result.toRNMapErrorCodeOrNull()
@@ -144,45 +146,46 @@ class GoogleMapsViewImpl(
         }
       }
 
-      mapView = MapView(reactContext, googleMapsOptions)
-      super.addView(mapView)
-
-      mapView?.onCreate(null)
-      mapView?.getMapAsync { map ->
-        googleMap = map
-        googleMap?.setOnMapLoadedCallback {
-          googleMap?.setOnCameraMoveStartedListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnCameraMoveListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnCameraIdleListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnMarkerClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnPolylineClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnPolygonClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnCircleClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnMapClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnMapLongClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnPoiClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnMarkerDragListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnInfoWindowClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnInfoWindowCloseListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnInfoWindowLongClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnMyLocationClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setOnMyLocationButtonClickListener(this@GoogleMapsViewImpl)
-          googleMap?.setInfoWindowAdapter(this@GoogleMapsViewImpl)
-          loaded = true
-          onMapLoaded?.invoke(
-            map.projection.visibleRegion.toRnRegion(),
-            map.cameraPosition.toRnCamera(),
-          )
+      mapView =
+        MapView(reactContext, googleMapsOptions).also {
+          lifecycleObserver = MapLifecycleEventObserver(it, locationHandler)
+          super.addView(it)
+          it.getMapAsync { map ->
+            googleMap = map
+            googleMap?.setOnMapLoadedCallback {
+              googleMap?.setOnCameraMoveStartedListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnCameraMoveListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnCameraIdleListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnMarkerClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnPolylineClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnPolygonClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnCircleClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnMapClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnMapLongClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnPoiClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnMarkerDragListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnInfoWindowClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnInfoWindowCloseListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnInfoWindowLongClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnMyLocationClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setOnMyLocationButtonClickListener(this@GoogleMapsViewImpl)
+              googleMap?.setInfoWindowAdapter(this@GoogleMapsViewImpl)
+              mapViewLoaded = true
+              onMapLoaded?.invoke(
+                map.projection.visibleRegion.toRnRegion(),
+                map.cameraPosition.toRnCamera(),
+              )
+            }
+            applyProps()
+            initLocationCallbacks()
+            onMapReady?.invoke(true)
+          }
         }
-        applyProps()
-        initLocationCallbacks()
-        onMapReady?.invoke(true)
-      }
     }
 
   override fun onCameraMoveStarted(reason: Int) =
     onUi {
-      if (!loaded) return@onUi
+      if (!mapViewLoaded) return@onUi
       cameraMoveReason = reason
       val visibleRegion = googleMap?.projection?.visibleRegion ?: return@onUi
       val cameraPosition = googleMap?.cameraPosition ?: return@onUi
@@ -195,7 +198,7 @@ class GoogleMapsViewImpl(
 
   override fun onCameraMove() =
     onUi {
-      if (!loaded) return@onUi
+      if (!mapViewLoaded) return@onUi
       val visibleRegion = googleMap?.projection?.visibleRegion ?: return@onUi
       val cameraPosition = googleMap?.cameraPosition ?: return@onUi
       val gesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
@@ -208,7 +211,7 @@ class GoogleMapsViewImpl(
 
   override fun onCameraIdle() =
     onUi {
-      if (!loaded) return@onUi
+      if (!mapViewLoaded) return@onUi
       val visibleRegion = googleMap?.projection?.visibleRegion ?: return@onUi
       val cameraPosition = googleMap?.cameraPosition ?: return@onUi
       val gesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
@@ -226,7 +229,6 @@ class GoogleMapsViewImpl(
     locationHandler.onError = { error ->
       onUi { onLocationError?.invoke(error) }
     }
-    locationHandler.start()
   }
 
   fun applyProps() {
@@ -275,7 +277,7 @@ class GoogleMapsViewImpl(
   val currentCamera: CameraPosition?
     get() = onUiSync { googleMap?.cameraPosition }
 
-  var initialProps: RNInitialProps? = null
+  var googleMapsOptions: GoogleMapOptions = GoogleMapOptions()
 
   var uiSettings: RNMapUiSettings? = null
     set(value) {
@@ -811,7 +813,7 @@ class GoogleMapsViewImpl(
     onUi {
       if (destroyed) return@onUi
       destroyed = true
-      locationHandler.stop()
+      lifecycleObserver?.toDestroyedState()
       markerBuilder.cancelAllJobs()
       clearMarkers()
       clearPolylines()
@@ -840,16 +842,10 @@ class GoogleMapsViewImpl(
         setInfoWindowAdapter(null)
       }
       googleMap = null
-      mapView?.apply {
-        onPause()
-        onStop()
-        onDestroy()
-        removeAllViews()
-      }
+      mapView?.removeAllViews()
       super.removeAllViews()
       reactContext.unregisterComponentCallbacks(componentCallbacks)
-      reactContext.removeLifecycleEventListener(this)
-      initialized = false
+      mapViewInitialized = false
     }
 
   override fun requestLayout() {
@@ -864,32 +860,20 @@ class GoogleMapsViewImpl(
     }
   }
 
-  override fun onAttachedToWindow() =
-    onUi {
-      super.onAttachedToWindow()
-      locationHandler.start()
-    }
-
-  override fun onDetachedFromWindow() =
-    onUi {
-      super.onDetachedFromWindow()
-      locationHandler.stop()
-    }
-
-  override fun onHostResume() =
-    onUi {
-      locationHandler.start()
-      mapView?.onResume()
-    }
-
-  override fun onHostPause() =
-    onUi {
-      locationHandler.stop()
-      mapView?.onPause()
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    initMapView()
+    lifecycle = mapView?.findViewTreeLifecycleOwner()?.lifecycle
+    lifecycleObserver?.let { observer ->
+      lifecycle?.addObserver(observer)
     }
+  }
 
-  override fun onHostDestroy() {
-    destroyInternal()
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+    lifecycleObserver?.let { lifecycle?.removeObserver(it) }
+    lifecycle = null
+    lifecycleObserver?.toCreatedState()
   }
 
   override fun onMarkerClick(marker: Marker): Boolean {

package/android/src/main/java/com/rngooglemapsplus/MapLifecycleEventObserver.kt

@@ -0,0 +1,78 @@
+package com.rngooglemapsplus
+
+import android.os.Bundle
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import com.google.android.gms.maps.MapView
+
+class MapLifecycleEventObserver(
+  private val mapView: MapView?,
+  private val locationHandler: LocationHandler,
+) : LifecycleEventObserver {
+  private var currentState: Lifecycle.State = Lifecycle.State.INITIALIZED
+
+  override fun onStateChanged(
+    source: LifecycleOwner,
+    event: Lifecycle.Event,
+  ) {
+    when (event) {
+      Lifecycle.Event.ON_DESTROY -> toCreatedState()
+      else -> toState(event.targetState)
+    }
+  }
+
+  fun toCreatedState() {
+    if (currentState > Lifecycle.State.CREATED) {
+      toState(Lifecycle.State.CREATED)
+    }
+  }
+
+  fun toDestroyedState() {
+    if (currentState > Lifecycle.State.INITIALIZED) {
+      toState(Lifecycle.State.DESTROYED)
+    }
+  }
+
+  private fun toState(state: Lifecycle.State) {
+    while (currentState != state) {
+      when {
+        currentState < state -> upFromCurrentState()
+        currentState > state -> downFromCurrentState()
+      }
+    }
+  }
+
+  private fun downFromCurrentState() {
+    Lifecycle.Event.downFrom(currentState)?.also {
+      invokeEvent(it)
+    }
+  }
+
+  private fun upFromCurrentState() {
+    Lifecycle.Event.upFrom(currentState)?.also {
+      invokeEvent(it)
+    }
+  }
+
+  private fun invokeEvent(event: Lifecycle.Event) {
+    when (event) {
+      Lifecycle.Event.ON_CREATE -> mapView?.onCreate(Bundle())
+      Lifecycle.Event.ON_START -> mapView?.onStart()
+      Lifecycle.Event.ON_RESUME -> {
+        locationHandler.start()
+        mapView?.onResume()
+      }
+
+      Lifecycle.Event.ON_PAUSE -> {
+        mapView?.onPause()
+        locationHandler.stop()
+      }
+
+      Lifecycle.Event.ON_STOP -> mapView?.onStop()
+      Lifecycle.Event.ON_DESTROY -> mapView?.onDestroy()
+      Lifecycle.Event.ON_ANY -> {}
+    }
+    currentState = event.targetState
+  }
+}

package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -24,7 +24,6 @@ import com.rngooglemapsplus.extensions.toSize
 class RNGoogleMapsPlusView(
   val context: ThemedReactContext,
 ) : HybridRNGoogleMapsPlusViewSpec() {
-  private var propsInitialized = false
   private var currentCustomMapStyle: String? = null
   private var permissionHandler = PermissionHandler(context)
   private var locationHandler = LocationHandler(context)
@@ -40,10 +39,11 @@ class RNGoogleMapsPlusView(
   override val view =
     GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
 
-  override fun afterUpdate() {
-    super.afterUpdate()
-    if (!propsInitialized) {
-      propsInitialized = true
+  override var initialProps: RNInitialProps? = null
+    set(value) {
+      if (field == value) return
+      field = value
+
       val options =
         GoogleMapOptions().apply {
           initialProps?.mapId?.let { mapId(it) }
@@ -51,15 +51,8 @@ class RNGoogleMapsPlusView(
           initialProps?.camera?.let { camera(it.toCameraPosition(current = null)) }
           initialProps?.backgroundColor?.let { backgroundColor(it.toColor()) }
         }
-      view.initMapView(options)
-    }
-  }
 
-  override var initialProps: RNInitialProps? = null
-    set(value) {
-      if (field == value) return
-      field = value
-      view.initialProps = value
+      view.googleMapsOptions = options
     }
 
   override var uiSettings: RNMapUiSettings? = null

package/android/src/main/java/com/rngooglemapsplus/extensions/RNLatLngBoundsExtension.kt

@@ -1,6 +1,5 @@
 package com.rngooglemapsplus.extensions
 
-import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.rngooglemapsplus.RNLatLngBounds
 

package/android/src/main/java/com/rngooglemapsplus/extensions/ThrowableExtension.kt

@@ -16,10 +16,12 @@ fun Throwable.toLocationErrorCode(context: Context): RNLocationErrorCode {
       when (statusCode) {
         CommonStatusCodes.NETWORK_ERROR ->
           RNLocationErrorCode.POSITION_UNAVAILABLE
+
         LocationSettingsStatusCodes.RESOLUTION_REQUIRED,
         LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE,
         ->
           RNLocationErrorCode.SETTINGS_NOT_SATISFIED
+
         else ->
           RNLocationErrorCode.INTERNAL_ERROR
       }

package/expoConfig/build/index.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
-var pkg = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../../package.json'), 'utf8'));
 var config_plugins_1 = require("@expo/config-plugins");
-var withIosGoogleMapsPlus_1 = __importDefault(require("./ios/withIosGoogleMapsPlus"));
 var withAndroidGoogleMapsPlus_1 = __importDefault(require("./android/withAndroidGoogleMapsPlus"));
+var withIosGoogleMapsPlus_1 = __importDefault(require("./ios/withIosGoogleMapsPlus"));
+var pkg = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../../package.json'), 'utf8'));
 var withGoogleMapsPlus = function (config, props) {
     config = (0, withAndroidGoogleMapsPlus_1.default)(config, props);
     config = (0, withIosGoogleMapsPlus_1.default)(config, props);

package/ios/GoogleMapViewImpl.swift

@@ -1,8 +1,8 @@
 import CoreLocation
 import GoogleMaps
 import GoogleMapsUtils
-import UIKit
 import NitroModules
+import UIKit
 
 final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate,
 GMSIndoorDisplayDelegate {
@@ -40,14 +40,18 @@ GMSIndoorDisplayDelegate {
     self.locationHandler = locationHandler
     self.markerBuilder = markerBuilder
     super.init(frame: frame)
-    setupAppLifecycleObservers()
   }
 
+  @MainActor
+  private var lifecycleAttached = false
+
   @MainActor
   private var lifecycleTasks = [Task<Void, Never>]()
 
   @MainActor
-  private func setupAppLifecycleObservers() {
+  private func attachLifecycleObservers() {
+    if lifecycleAttached { return }
+    lifecycleAttached = true
     lifecycleTasks.append(
       Task { @MainActor in
         for await _ in NotificationCenter.default.notifications(
@@ -79,12 +83,20 @@ GMSIndoorDisplayDelegate {
     )
   }
 
+  @MainActor
+  private func detachLifecycleObservers() {
+    if !lifecycleAttached { return }
+    lifecycleAttached = false
+    lifecycleTasks.forEach { $0.cancel() }
+    lifecycleTasks.removeAll()
+  }
+
   required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
 
   @MainActor
-  func initMapView(googleMapOptions: GMSMapViewOptions) {
+  func initMapView() {
     if initialized { return }
     initialized = true
     googleMapOptions.frame = bounds
@@ -108,7 +120,6 @@ GMSIndoorDisplayDelegate {
     locationHandler.onError = { [weak self] error in
       self?.onLocationError?(error)
     }
-    locationHandler.start()
   }
 
   @MainActor
@@ -171,9 +182,7 @@ GMSIndoorDisplayDelegate {
   }
 
   @MainActor
-  var initialProps: RNInitialProps? {
-    didSet {}
-  }
+  var googleMapOptions: GMSMapViewOptions = GMSMapViewOptions()
 
   @MainActor
   var uiSettings: RNMapUiSettings? {
@@ -273,10 +282,12 @@ GMSIndoorDisplayDelegate {
   @MainActor
   var locationConfig: RNLocationConfig? {
     didSet {
-      locationHandler.desiredAccuracy =
-        locationConfig?.ios?.desiredAccuracy?.toCLLocationAccuracy
-      locationHandler.distanceFilterMeters =
-        locationConfig?.ios?.distanceFilterMeters
+      locationHandler.updateConfig(
+        desiredAccuracy: locationConfig?.ios?.desiredAccuracy?
+          .toCLLocationAccuracy,
+        distanceFilterMeters: locationConfig?.ios?.distanceFilterMeters,
+        activityType: locationConfig?.ios?.activityType?.toCLActivityType,
+      )
     }
   }
 
@@ -691,6 +702,7 @@ GMSIndoorDisplayDelegate {
   func deinitInternal() {
     guard !deInitialized else { return }
     deInitialized = true
+    detachLifecycleObservers()
     onMain {
       self.locationHandler.stop()
       self.markerBuilder.cancelAllIconTasks()
@@ -726,16 +738,17 @@ GMSIndoorDisplayDelegate {
   override func didMoveToWindow() {
     super.didMoveToWindow()
     if window != nil {
+      attachLifecycleObservers()
       locationHandler.start()
+      initMapView()
     } else {
       locationHandler.stop()
+      detachLifecycleObservers()
     }
   }
 
   deinit {
     deinitInternal()
-    lifecycleTasks.forEach { $0.cancel() }
-    lifecycleTasks.removeAll()
   }
 
   func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {

package/ios/LocationHandler.swift

@@ -6,22 +6,19 @@ private let kCLLocationAccuracyDefault: CLLocationAccuracy =
   kCLLocationAccuracyBest
 private let kCLDistanceFilterNoneDefault: CLLocationDistance =
   kCLDistanceFilterNone
+private let kCLActivityTypeDefault: CLActivityType = .other
 
 final class LocationHandler: NSObject, CLLocationManagerDelegate {
 
   private let manager = CLLocationManager()
 
-  var desiredAccuracy: CLLocationAccuracy? = kCLLocationAccuracyDefault {
-    didSet {
-      manager.desiredAccuracy = desiredAccuracy ?? kCLLocationAccuracyBest
-    }
-  }
+  private var isActive = false
 
-  var distanceFilterMeters: CLLocationDistance? = kCLDistanceFilterNoneDefault {
-    didSet {
-      manager.distanceFilter = distanceFilterMeters ?? kCLDistanceFilterNone
-    }
-  }
+  private var currentDesiredAccuracy: CLLocationAccuracy =
+    kCLLocationAccuracyDefault
+  private var currentDistanceFilter: CLLocationDistance =
+    kCLDistanceFilterNoneDefault
+  private var currentActivityType: CLActivityType = kCLActivityTypeDefault
 
   var onUpdate: ((CLLocation) -> Void)?
   var onError: ((_ error: RNLocationErrorCode) -> Void)?
@@ -30,7 +27,21 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
     super.init()
     manager.delegate = self
     manager.pausesLocationUpdatesAutomatically = true
-    manager.activityType = .other
+  }
+
+  func updateConfig(
+    desiredAccuracy: CLLocationAccuracy?,
+    distanceFilterMeters: CLLocationDistance?,
+    activityType: CLActivityType?
+  ) {
+    currentDesiredAccuracy = desiredAccuracy ?? kCLLocationAccuracyDefault
+    manager.desiredAccuracy = currentDesiredAccuracy
+
+    currentDistanceFilter = distanceFilterMeters ?? kCLDistanceFilterNoneDefault
+    manager.distanceFilter = currentDistanceFilter
+
+    currentActivityType = activityType ?? kCLActivityTypeDefault
+    manager.activityType = currentActivityType
   }
 
   func showLocationDialog() {
@@ -71,11 +82,19 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
   }
 
   func start() {
-    stop()
-    startUpdates()
+    guard !isActive else { return }
+    isActive = true
+
+    manager.location.map {
+      onUpdate?($0)
+    }
+
+    manager.startUpdatingLocation()
   }
 
   func stop() {
+    guard isActive else { return }
+    isActive = false
     manager.stopUpdatingLocation()
   }
 
@@ -104,13 +123,6 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
     }
   }
 
-  private func startUpdates() {
-    manager.desiredAccuracy = desiredAccuracy ?? kCLLocationAccuracyDefault
-    manager.distanceFilter =
-      distanceFilterMeters ?? kCLDistanceFilterNoneDefault
-    manager.startUpdatingLocation()
-  }
-
   func locationManager(
     _ manager: CLLocationManager,
     didFailWithError error: Error

package/ios/RNGoogleMapsPlusView.swift

@@ -8,7 +8,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
   private let permissionHandler: PermissionHandler
   private let locationHandler: LocationHandler
 
-  private var propsInitialized = false
   private let markerBuilder = MapMarkerBuilder()
   private let polylineBuilder = MapPolylineBuilder()
   private let polygonBuilder = MapPolygonBuilder()
@@ -32,9 +31,13 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
   }
 
   @MainActor
-  func afterUpdate() {
-    if !propsInitialized {
-      propsInitialized = true
+  func dispose() {
+    impl.deinitInternal()
+  }
+
+  @MainActor
+  var initialProps: RNInitialProps? {
+    didSet {
       let options = GMSMapViewOptions()
       initialProps?.mapId.map { options.mapID = GMSMapID(identifier: $0) }
       initialProps?.liteMode.map { _ in /* not supported */ }
@@ -44,19 +47,8 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       initialProps?.backgroundColor.map {
         options.backgroundColor = $0.toUIColor()
       }
-      impl.initMapView(googleMapOptions: options)
-    }
-  }
 
-  @MainActor
-  func dispose() {
-    impl.deinitInternal()
-  }
-
-  @MainActor
-  var initialProps: RNInitialProps? {
-    didSet {
-      impl.initialProps = initialProps
+      impl.googleMapOptions = options
     }
   }