react-native-google-maps-plus 1.0.3-dev.1 → 1.1.0-dev.2

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

@@ -4,11 +4,17 @@ import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
-import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
-import com.google.android.gms.maps.model.MapColorScheme
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
+import com.rngooglemapsplus.extensions.circleEquals
+import com.rngooglemapsplus.extensions.markerEquals
+import com.rngooglemapsplus.extensions.markerStyleEquals
+import com.rngooglemapsplus.extensions.polygonEquals
+import com.rngooglemapsplus.extensions.polylineEquals
+import com.rngooglemapsplus.extensions.toCameraPosition
+import com.rngooglemapsplus.extensions.toColor
+import com.rngooglemapsplus.extensions.toMapColorScheme
 
 @DoNotStrip
 class RNGoogleMapsPlusView(
@@ -19,23 +25,33 @@ class RNGoogleMapsPlusView(
   private var locationHandler = LocationHandler(context)
   private var playServiceHandler = PlayServicesHandler(context)
 
-  private val markerOptions = MarkerOptions()
-  private val polylineOptions = MapPolylineOptions()
-  private val polygonOptions = MapPolygonOptions()
-  private val circleOptions = MapCircleOptions()
+  private val markerBuilder = MapMarkerBuilder()
+  private val polylineBuilder = MapPolylineBuilder()
+  private val polygonBuilder = MapPolygonBuilder()
+  private val circleBuilder = MapCircleBuilder()
 
   override val view =
-    GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerOptions)
+    GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
 
   override var initialProps: RNInitialProps? = null
     set(value) {
       view.initMapView(
         value?.mapId,
         value?.liteMode,
-        mapCameraToCameraPosition(value?.initialCamera),
+        value?.camera?.toCameraPosition(),
       )
     }
 
+  override var uiSettings: RNMapUiSettings? = null
+    set(value) {
+      view.uiSettings = value
+    }
+
+  override var myLocationEnabled: Boolean? = null
+    set(value) {
+      view.myLocationEnabled = value
+    }
+
   override var buildingEnabled: Boolean? = null
     set(value) {
       view.buildingEnabled = value
@@ -46,6 +62,11 @@ class RNGoogleMapsPlusView(
       view.trafficEnabled = value
     }
 
+  override var indoorEnabled: Boolean? = null
+    set(value) {
+      view.indoorEnabled = value
+    }
+
   override var customMapStyle: String? = null
     set(value) {
       currentCustomMapStyle = value
@@ -56,7 +77,7 @@ class RNGoogleMapsPlusView(
 
   override var userInterfaceStyle: RNUserInterfaceStyle? = null
     set(value) {
-      view.userInterfaceStyle = userInterfaceStyleToMapColorScheme(value)
+      view.userInterfaceStyle = value.toMapColorScheme()
     }
 
   override var minZoomLevel: Double? = null
@@ -87,17 +108,17 @@ class RNGoogleMapsPlusView(
       val nextById = value?.associateBy { it.id } ?: emptyMap()
 
       (prevById.keys - nextById.keys).forEach { id ->
-        markerOptions.cancelIconJob(id)
+        markerBuilder.cancelIconJob(id)
         view.removeMarker(id)
       }
 
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          markerOptions.buildIconAsync(id, next) { icon ->
+          markerBuilder.buildIconAsync(id, next) { icon ->
             view.addMarker(
               id,
-              markerOptions.build(next, icon),
+              markerBuilder.build(next, icon),
             )
           }
         } else if (!prev.markerEquals(next)) {
@@ -113,7 +134,7 @@ class RNGoogleMapsPlusView(
               }
 
               if (!prev.markerStyleEquals(next)) {
-                markerOptions.buildIconAsync(id, next) { icon ->
+                markerBuilder.buildIconAsync(id, next) { icon ->
                   m.setIcon(icon)
                 }
               }
@@ -140,7 +161,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolyline(id, polylineOptions.buildPolylineOptions(next))
+          view.addPolyline(id, polylineBuilder.buildPolylineOptions(next))
         } else if (!prev.polylineEquals(next)) {
           view.updatePolyline(id) { gms ->
             onUi {
@@ -151,11 +172,11 @@ class RNGoogleMapsPlusView(
                 }
               next.width?.let { gms.width = it.dpToPx() }
               next.lineCap?.let {
-                val cap = polylineOptions.mapLineCap(it)
+                val cap = polylineBuilder.mapLineCap(it)
                 gms.startCap = cap
                 gms.endCap = cap
               }
-              next.lineJoin?.let { gms.jointType = polylineOptions.mapLineJoin(it) }
+              next.lineJoin?.let { gms.jointType = polylineBuilder.mapLineJoin(it) }
               next.color?.let { gms.color = it.toColor() }
               next.zIndex?.let { gms.zIndex = it.toFloat() }
             }
@@ -177,7 +198,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolygon(id, polygonOptions.buildPolygonOptions(next))
+          view.addPolygon(id, polygonBuilder.buildPolygonOptions(next))
         } else if (!prev.polygonEquals(next)) {
           view.updatePolygon(id) { gmsPoly ->
             onUi {
@@ -209,7 +230,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addCircle(id, circleOptions.buildCircleOptions(next))
+          view.addCircle(id, circleBuilder.buildCircleOptions(next))
         } else if (!prev.circleEquals(next)) {
           view.updateCircle(id) { gmsCircle ->
             onUi {
@@ -226,6 +247,11 @@ class RNGoogleMapsPlusView(
       field = value
     }
 
+  override var locationConfig: RNLocationConfig? = null
+    set(value) {
+      view.locationConfig = value
+    }
+
   override var onMapError: ((RNMapErrorCode) -> Unit)? = null
     set(cb) {
       view.onMapError = cb
@@ -290,7 +316,7 @@ class RNGoogleMapsPlusView(
     animated: Boolean?,
     durationMS: Double?,
   ) {
-    view.setCamera(camera, animated == true, durationMS?.toInt() ?: 3000)
+    view.setCamera(camera.toCameraPosition(), animated == true, durationMS?.toInt() ?: 3000)
   }
 
   override fun setCameraToCoordinates(
@@ -318,41 +344,6 @@ class RNGoogleMapsPlusView(
   override fun requestLocationPermission(): Promise<RNLocationPermissionResult> = permissionHandler.requestLocationPermission()
 
   override fun isGooglePlayServicesAvailable(): Boolean = playServiceHandler.isPlayServicesAvailable()
-
-  fun userInterfaceStyleToMapColorScheme(value: RNUserInterfaceStyle?): Int? {
-    value ?: return null
-    return when (value) {
-      RNUserInterfaceStyle.LIGHT -> {
-        MapColorScheme.LIGHT
-      }
-
-      RNUserInterfaceStyle.DARK -> {
-        MapColorScheme.DARK
-      }
-
-      RNUserInterfaceStyle.DEFAULT -> {
-        MapColorScheme.FOLLOW_SYSTEM
-      }
-    }
-  }
-
-  fun mapCameraToCameraPosition(camera: RNCamera?): CameraPosition? {
-    camera ?: return null
-    val builder = CameraPosition.builder()
-    camera.center?.let {
-      builder.target(
-        com.google.android.gms.maps.model.LatLng(
-          camera.center.latitude,
-          camera.center.longitude,
-        ),
-      )
-    }
-    camera.zoom?.let { builder.zoom(it.toFloat()) }
-    camera.bearing?.let { builder.bearing(it.toFloat()) }
-    camera.tilt?.let { builder.tilt(it.toFloat()) }
-
-    return builder.build()
-  }
 }
 
 private inline fun onUi(crossinline block: () -> Unit) {

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

@@ -0,0 +1,19 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.CameraPosition
+import com.google.android.gms.maps.model.LatLng
+import com.rngooglemapsplus.RNCamera
+
+fun RNCamera.toCameraPosition(): CameraPosition {
+  val builder = CameraPosition.builder()
+
+  center?.let {
+    builder.target(LatLng(it.latitude, it.longitude))
+  }
+
+  zoom?.let { builder.zoom(it.toFloat()) }
+  bearing?.let { builder.bearing(it.toFloat()) }
+  tilt?.let { builder.tilt(it.toFloat()) }
+
+  return builder.build()
+}

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

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.location.Priority
+import com.rngooglemapsplus.RNAndroidLocationPriority
+
+fun RNAndroidLocationPriority.toGooglePriority(): Int =
+  when (this) {
+    RNAndroidLocationPriority.PRIORITY_HIGH_ACCURACY -> Priority.PRIORITY_HIGH_ACCURACY
+    RNAndroidLocationPriority.PRIORITY_BALANCED_POWER_ACCURACY -> Priority.PRIORITY_BALANCED_POWER_ACCURACY
+    RNAndroidLocationPriority.PRIORITY_LOW_POWER -> Priority.PRIORITY_LOW_POWER
+    RNAndroidLocationPriority.PRIORITY_PASSIVE -> Priority.PRIORITY_PASSIVE
+  }

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

@@ -0,0 +1,14 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNCircle
+
+fun RNCircle.circleEquals(b: RNCircle): Boolean {
+  if (zIndex != b.zIndex) return false
+  if (pressable != b.pressable) return false
+  if (center != b.center) return false
+  if (radius != b.radius) return false
+  if (strokeWidth != b.strokeWidth) return false
+  if (strokeColor != b.strokeColor) return false
+  if (fillColor != b.fillColor) return false
+  return true
+}

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

@@ -0,0 +1,17 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNMarker
+
+fun RNMarker.markerEquals(b: RNMarker): Boolean =
+  id == b.id &&
+    zIndex == b.zIndex &&
+    coordinate == b.coordinate &&
+    anchor == b.anchor &&
+    markerStyleEquals(b)
+
+fun RNMarker.markerStyleEquals(b: RNMarker): Boolean = iconSvg == b.iconSvg
+
+fun RNMarker.styleHash(): Int =
+  arrayOf<Any?>(
+    iconSvg,
+  ).contentHashCode()

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

@@ -0,0 +1,20 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNPolygon
+
+fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
+  if (zIndex != b.zIndex) return false
+  if (pressable != b.pressable) return false
+  if (strokeWidth != b.strokeWidth) return false
+  if (fillColor != b.fillColor) return false
+  if (strokeColor != b.strokeColor) return false
+  val ac = coordinates
+  val bc = b.coordinates
+  if (ac.size != bc.size) return false
+  for (i in ac.indices) {
+    val p = ac[i]
+    val q = bc[i]
+    if (p.latitude != q.latitude || p.longitude != q.longitude) return false
+  }
+  return true
+}

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

@@ -0,0 +1,21 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNPolyline
+
+fun RNPolyline.polylineEquals(b: RNPolyline): Boolean {
+  if (zIndex != b.zIndex) return false
+  if (pressable != b.pressable) return false
+  if ((width ?: 0.0) != (b.width ?: 0.0)) return false
+  if (lineCap != b.lineCap) return false
+  if (lineJoin != b.lineJoin) return false
+  if (color != b.color) return false
+  val ac = coordinates
+  val bc = b.coordinates
+  if (ac.size != bc.size) return false
+  for (i in ac.indices) {
+    val p = ac[i]
+    val q = bc[i]
+    if (p.latitude != q.latitude || p.longitude != q.longitude) return false
+  }
+  return true
+}

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

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.MapColorScheme
+import com.rngooglemapsplus.RNUserInterfaceStyle
+
+fun RNUserInterfaceStyle?.toMapColorScheme(): Int? =
+  when (this) {
+    RNUserInterfaceStyle.LIGHT -> MapColorScheme.LIGHT
+    RNUserInterfaceStyle.DARK -> MapColorScheme.DARK
+    RNUserInterfaceStyle.DEFAULT -> MapColorScheme.FOLLOW_SYSTEM
+    null -> null
+  }

package/android/src/main/java/com/rngooglemapsplus/{Color.kt → extensions/StringExtension.kt}

@@ -1,4 +1,4 @@
-package com.rngooglemapsplus
+package com.rngooglemapsplus.extensions
 
 import android.graphics.Color
 import androidx.core.graphics.toColorInt

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

@@ -0,0 +1,38 @@
+package com.rngooglemapsplus.extensions
+
+import android.content.Context
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.common.api.CommonStatusCodes
+import com.google.android.gms.location.LocationSettingsStatusCodes
+import com.rngooglemapsplus.RNLocationErrorCode
+
+fun Throwable.toLocationErrorCode(context: Context): RNLocationErrorCode {
+  return when (this) {
+    is SecurityException -> RNLocationErrorCode.PERMISSION_DENIED
+
+    is ApiException ->
+      when (statusCode) {
+        CommonStatusCodes.NETWORK_ERROR ->
+          RNLocationErrorCode.POSITION_UNAVAILABLE
+        LocationSettingsStatusCodes.RESOLUTION_REQUIRED,
+        LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE,
+        ->
+          RNLocationErrorCode.SETTINGS_NOT_SATISFIED
+        else ->
+          RNLocationErrorCode.INTERNAL_ERROR
+      }
+
+    else -> {
+      if (message?.contains("GoogleApi", ignoreCase = true) == true) {
+        val gms = GoogleApiAvailability.getInstance()
+        val status = gms.isGooglePlayServicesAvailable(context)
+        if (status != ConnectionResult.SUCCESS) {
+          return RNLocationErrorCode.PLAY_SERVICE_NOT_AVAILABLE
+        }
+      }
+      RNLocationErrorCode.INTERNAL_ERROR
+    }
+  }
+}

package/ios/GoogleMapViewImpl.swift

@@ -5,7 +5,7 @@ import UIKit
 final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
 
   private let locationHandler: LocationHandler
-  private let markerOptions: MapMarkerOptions
+  private let markerBuilder: MapMarkerBuilder
   private var mapView: GMSMapView?
   private var initialized = false
   private var mapReady = false
@@ -24,26 +24,13 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
   private var lastSubmittedCameraPosition: GMSCameraPosition?
   private var lastSubmittedLocation: CLLocation?
 
-  var onMapError: ((RNMapErrorCode) -> Void)?
-  var onMapReady: ((Bool) -> Void)?
-  var onLocationUpdate: ((RNLocation) -> Void)?
-  var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
-  var onMapPress: ((RNLatLng) -> Void)?
-  var onMarkerPress: ((String) -> Void)?
-  var onPolylinePress: ((String) -> Void)?
-  var onPolygonPress: ((String) -> Void)?
-  var onCirclePress: ((String) -> Void)?
-  var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)?
-  var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)?
-  var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)?
-
   init(
     frame: CGRect = .zero,
     locationHandler: LocationHandler,
-    markerOptions: MapMarkerOptions
+    markerBuilder: MapMarkerBuilder
   ) {
     self.locationHandler = locationHandler
-    self.markerOptions = markerOptions
+    self.markerBuilder = markerBuilder
     super.init(frame: frame)
     setupAppLifecycleObservers()
   }
@@ -132,12 +119,46 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
       )
     }
 
-    if let style = customMapStyle {
-      mapView?.mapStyle = style
+    if let uiSettings = uiSettings {
+      if let allGesturesEnabled = uiSettings.allGesturesEnabled {
+        mapView?.settings.setAllGesturesEnabled(allGesturesEnabled)
+      }
+      if let compassEnabled = uiSettings.compassEnabled {
+        mapView?.settings.compassButton = compassEnabled
+      }
+      if let indoorLevelPickerEnabled = uiSettings.indoorLevelPickerEnabled {
+        mapView?.settings.indoorPicker = indoorLevelPickerEnabled
+      }
+      if let mapToolbarEnabled = uiSettings.mapToolbarEnabled {
+        /// not supported
+      }
+      if let myLocationButtonEnabled = uiSettings.myLocationButtonEnabled {
+        mapView?.settings.myLocationButton = myLocationButtonEnabled
+      }
+      if let rotateEnabled = uiSettings.rotateEnabled {
+        mapView?.settings.rotateGestures = rotateEnabled
+      }
+      if let scrollEnabled = uiSettings.scrollEnabled {
+        mapView?.settings.scrollGestures = scrollEnabled
+      }
+      if let scrollDuringRotateOrZoomEnabled = uiSettings
+        .scrollDuringRotateOrZoomEnabled {
+        mapView?.settings.allowScrollGesturesDuringRotateOrZoom =
+          scrollDuringRotateOrZoomEnabled
+      }
+      if let tiltEnabled = uiSettings.tiltEnabled {
+        mapView?.settings.tiltGestures = tiltEnabled
+      }
+      if let zoomControlsEnabled = uiSettings.zoomControlsEnabled {
+        /// not supported
+      }
+      if let zoomGesturesEnabled = uiSettings.zoomGesturesEnabled {
+        mapView?.settings.zoomGestures = zoomGesturesEnabled
+      }
     }
 
-    if let mapType = mapType {
-      mapView?.mapType = mapType
+    if let myLocation = myLocationEnabled {
+      mapView?.isMyLocationEnabled = myLocation
     }
 
     if let buildings = buildingEnabled {
@@ -148,6 +169,18 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
       mapView?.isTrafficEnabled = traffic
     }
 
+    if let indoor = indoorEnabled {
+      mapView?.isIndoorEnabled = indoor
+    }
+
+    if let style = customMapStyle {
+      mapView?.mapStyle = style
+    }
+
+    if let mapType = mapType {
+      mapView?.mapType = mapType
+    }
+
     if let uiStyle = userInterfaceStyle {
       mapView?.overrideUserInterfaceStyle = uiStyle
     }
@@ -156,6 +189,13 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
       mapView?.setMinZoom(Float(minZoom), maxZoom: Float(maxZoom))
     }
 
+    if let locationConfig = locationConfig {
+      locationHandler.desiredAccuracy =
+        locationConfig.ios?.desiredAccuracy?.toCLLocationAccuracy
+      locationHandler.distanceFilterMeters =
+        locationConfig.ios?.distanceFilterMeters
+    }
+
     if !pendingMarkers.isEmpty {
       pendingMarkers.forEach {
         addMarkerInternal(id: $0.id, marker: $0.marker)
@@ -186,11 +226,80 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
     mapView?.camera
   }
 
+  @MainActor
+  var uiSettings: RNMapUiSettings? {
+    didSet {
+      guard let mapView = mapView else { return }
+      let settings = mapView.settings
+
+      if let v = uiSettings {
+        if let allGesturesEnabled = v.allGesturesEnabled {
+          settings.setAllGesturesEnabled(allGesturesEnabled)
+        }
+        if let compassEnabled = v.compassEnabled {
+          settings.compassButton = compassEnabled
+        }
+        if let indoorLevelPickerEnabled = v.indoorLevelPickerEnabled {
+          settings.indoorPicker = indoorLevelPickerEnabled
+        }
+        if let mapToolbarEnabled = v.mapToolbarEnabled {
+          /// not supported
+        }
+        if let myLocationButtonEnabled = v.myLocationButtonEnabled {
+          settings.myLocationButton = myLocationButtonEnabled
+        }
+        if let rotateEnabled = v.rotateEnabled {
+          settings.rotateGestures = rotateEnabled
+        }
+        if let scrollEnabled = v.scrollEnabled {
+          settings.scrollGestures = scrollEnabled
+        }
+        if let scrollDuringRotateOrZoomEnabled = v
+          .scrollDuringRotateOrZoomEnabled {
+          settings.allowScrollGesturesDuringRotateOrZoom =
+            scrollDuringRotateOrZoomEnabled
+        }
+        if let tiltEnabled = v.tiltEnabled {
+          settings.tiltGestures = tiltEnabled
+        }
+        if let zoomControlsEnabled = v.zoomControlsEnabled {
+          /// not supported
+        }
+        if let zoomGesturesEnabled = v.zoomGesturesEnabled {
+          settings.zoomGestures = zoomGesturesEnabled
+        }
+      } else {
+        settings.setAllGesturesEnabled(true)
+        settings.compassButton = false
+        settings.indoorPicker = false
+        settings.myLocationButton = false
+        settings.rotateGestures = true
+        settings.scrollGestures = true
+        settings.allowScrollGesturesDuringRotateOrZoom = true
+        settings.tiltGestures = true
+        settings.zoomGestures = false
+      }
+    }
+  }
+
+  @MainActor
+  var myLocationEnabled: Bool? {
+    didSet {
+      if let value = myLocationEnabled {
+        mapView?.isMyLocationEnabled = value
+      } else {
+        mapView?.isMyLocationEnabled = false
+      }
+    }
+  }
+
   @MainActor
   var buildingEnabled: Bool? {
     didSet {
       if let value = buildingEnabled {
         mapView?.isBuildingsEnabled = value
+      } else {
+        mapView?.isBuildingsEnabled = false
       }
     }
   }
@@ -200,6 +309,19 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
     didSet {
       if let value = trafficEnabled {
         mapView?.isTrafficEnabled = value
+      } else {
+        mapView?.isTrafficEnabled = false
+      }
+    }
+  }
+
+  @MainActor
+  var indoorEnabled: Bool? {
+    didSet {
+      if let value = indoorEnabled {
+        mapView?.isIndoorEnabled = value
+      } else {
+        mapView?.isIndoorEnabled = false
       }
     }
   }
@@ -243,7 +365,6 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
   @MainActor
   var mapPadding: RNMapPadding? {
     didSet {
-      mapPadding
       if let padding = mapPadding {
         mapView?.padding = UIEdgeInsets(
           top: padding.top,
@@ -263,6 +384,28 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
     }
   }
 
+  @MainActor var locationConfig: RNLocationConfig? {
+    didSet {
+      locationHandler.desiredAccuracy =
+        locationConfig?.ios?.desiredAccuracy?.toCLLocationAccuracy
+      locationHandler.distanceFilterMeters =
+        locationConfig?.ios?.distanceFilterMeters
+    }
+  }
+
+  var onMapError: ((RNMapErrorCode) -> Void)?
+  var onMapReady: ((Bool) -> Void)?
+  var onLocationUpdate: ((RNLocation) -> Void)?
+  var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
+  var onMapPress: ((RNLatLng) -> Void)?
+  var onMarkerPress: ((String) -> Void)?
+  var onPolylinePress: ((String) -> Void)?
+  var onPolygonPress: ((String) -> Void)?
+  var onCirclePress: ((String) -> Void)?
+  var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)?
+  var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)?
+  var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)?
+
   func setCamera(camera: GMSCameraPosition, animated: Bool, durationMS: Double) {
     if animated {
       withCATransaction(
@@ -467,7 +610,7 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
   }
 
   func deinitInternal() {
-    markerOptions.cancelAllIconTasks()
+    markerBuilder.cancelAllIconTasks()
     clearMarkers()
     clearPolylines()
     clearPolygons()