react-native-google-maps-plus 1.3.0-dev.3 → 1.3.0-dev.5

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

@@ -35,9 +35,11 @@ import com.google.android.gms.maps.model.TileOverlayOptions
 import com.google.maps.android.data.kml.KmlLayer
 import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.toGooglePriority
+import com.rngooglemapsplus.extensions.toLatLng
 import com.rngooglemapsplus.extensions.toLocationErrorCode
 import com.rngooglemapsplus.extensions.toRNIndoorBuilding
 import com.rngooglemapsplus.extensions.toRNIndoorLevel
+import com.rngooglemapsplus.extensions.toRnLatLng
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -88,11 +90,7 @@ class GoogleMapsViewImpl(
     reactContext.addLifecycleEventListener(this)
   }
 
-  fun initMapView(
-    mapId: String?,
-    liteMode: Boolean?,
-    cameraPosition: CameraPosition?,
-  ) {
+  fun initMapView(googleMapsOptions: GoogleMapOptions) {
     if (initialized) return
     initialized = true
     val result = playServiceHandler.playServicesAvailability()
@@ -126,13 +124,7 @@ class GoogleMapsViewImpl(
     mapView =
       MapView(
         reactContext,
-        GoogleMapOptions().apply {
-          mapId?.let { mapId(it) }
-          liteMode?.let { liteMode(it) }
-          cameraPosition?.let {
-            camera(it)
-          }
-        },
+        googleMapsOptions,
       )
 
     super.addView(mapView)
@@ -153,9 +145,9 @@ class GoogleMapsViewImpl(
       }
       initLocationCallbacks()
       applyPending()
+      mapReady = true
+      onMapReady?.invoke(true)
     }
-    mapReady = true
-    onMapReady?.invoke(true)
   }
 
   override fun onCameraMoveStarted(reason: Int) {
@@ -173,12 +165,12 @@ class GoogleMapsViewImpl(
 
     onCameraChangeStart?.invoke(
       RNRegion(
-        center = RNLatLng(bounds.center.latitude, bounds.center.longitude),
+        center = bounds.center.toRnLatLng(),
         latitudeDelta = latDelta,
         longitudeDelta = lngDelta,
       ),
       RNCamera(
-        center = RNLatLng(cameraPosition.target.latitude, cameraPosition.target.longitude),
+        center = cameraPosition.target.toRnLatLng(),
         zoom = cameraPosition.zoom.toDouble(),
         bearing = cameraPosition.bearing.toDouble(),
         tilt = cameraPosition.tilt.toDouble(),
@@ -205,12 +197,12 @@ class GoogleMapsViewImpl(
 
     onCameraChange?.invoke(
       RNRegion(
-        center = RNLatLng(bounds.center.latitude, bounds.center.longitude),
+        center = bounds.center.toRnLatLng(),
         latitudeDelta = latDelta,
         longitudeDelta = lngDelta,
       ),
       RNCamera(
-        center = RNLatLng(cameraPosition.target.latitude, cameraPosition.target.longitude),
+        center = cameraPosition.target.toRnLatLng(),
         zoom = cameraPosition.zoom.toDouble(),
         bearing = cameraPosition.bearing.toDouble(),
         tilt = cameraPosition.tilt.toDouble(),
@@ -233,12 +225,12 @@ class GoogleMapsViewImpl(
 
     onCameraChangeComplete?.invoke(
       RNRegion(
-        center = RNLatLng(bounds.center.latitude, bounds.center.longitude),
+        center = bounds.center.toRnLatLng(),
         latitudeDelta = latDelta,
         longitudeDelta = lngDelta,
       ),
       RNCamera(
-        center = RNLatLng(cameraPosition.target.latitude, cameraPosition.target.longitude),
+        center = cameraPosition.target.toRnLatLng(),
         zoom = cameraPosition.zoom.toDouble(),
         bearing = cameraPosition.bearing.toDouble(),
         tilt = cameraPosition.tilt.toDouble(),
@@ -372,6 +364,8 @@ class GoogleMapsViewImpl(
     }
   }
 
+  var initialProps: RNInitialProps? = null
+
   var uiSettings: RNMapUiSettings? = null
     set(value) {
       field = value
@@ -542,7 +536,7 @@ class GoogleMapsViewImpl(
     onUi {
       val builder = LatLngBounds.Builder()
       coordinates.forEach { coord ->
-        builder.include(LatLng(coord.latitude, coord.longitude))
+        builder.include(coord.toLatLng())
       }
       val bounds = builder.build()
 
@@ -975,6 +969,7 @@ class GoogleMapsViewImpl(
 
   fun destroyInternal() {
     onUi {
+      locationHandler.stop()
       markerBuilder.cancelAllJobs()
       clearMarkers()
       clearPolylines()
@@ -982,7 +977,6 @@ class GoogleMapsViewImpl(
       clearCircles()
       clearHeatmaps()
       clearKmlLayer()
-      locationHandler.stop()
       googleMap?.apply {
         setOnCameraMoveStartedListener(null)
         setOnCameraMoveListener(null)
@@ -1003,6 +997,7 @@ class GoogleMapsViewImpl(
       }
       super.removeAllViews()
       reactContext.removeLifecycleEventListener(this)
+      initialized = false
     }
   }
 
@@ -1066,28 +1061,28 @@ class GoogleMapsViewImpl(
 
   override fun onMapClick(coordinates: LatLng) {
     onMapPress?.invoke(
-      RNLatLng(coordinates.latitude, coordinates.longitude),
+      coordinates.toRnLatLng(),
     )
   }
 
   override fun onMarkerDragStart(marker: Marker) {
     onMarkerDragStart?.invoke(
       marker.tag?.toString(),
-      RNLatLng(marker.position.latitude, marker.position.longitude),
+      marker.position.toRnLatLng(),
     )
   }
 
   override fun onMarkerDrag(marker: Marker) {
     onMarkerDrag?.invoke(
       marker.tag?.toString(),
-      RNLatLng(marker.position.latitude, marker.position.longitude),
+      marker.position.toRnLatLng(),
     )
   }
 
   override fun onMarkerDragEnd(marker: Marker) {
     onMarkerDragEnd?.invoke(
       marker.tag?.toString(),
-      RNLatLng(marker.position.latitude, marker.position.longitude),
+      marker.position.toRnLatLng(),
     )
   }
 

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

@@ -4,13 +4,13 @@ import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.Circle
 import com.google.android.gms.maps.model.CircleOptions
-import com.google.android.gms.maps.model.LatLng
 import com.rngooglemapsplus.extensions.toColor
+import com.rngooglemapsplus.extensions.toLatLng
 
 class MapCircleBuilder {
   fun build(circle: RNCircle): CircleOptions =
     CircleOptions().apply {
-      center(LatLng(circle.center.latitude, circle.center.longitude))
+      center(circle.center.toLatLng())
       radius(circle.radius)
       circle.strokeWidth?.let { strokeWidth(it.dpToPx()) }
       circle.strokeColor?.let { strokeColor(it.toColor()) }
@@ -23,11 +23,12 @@ class MapCircleBuilder {
     circle: Circle,
     next: RNCircle,
   ) {
-    circle.center = LatLng(next.center.latitude, next.center.longitude)
+    circle.center = next.center.toLatLng()
     circle.radius = next.radius
     circle.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
     circle.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
     circle.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
+    circle.isClickable = next.pressable ?: false
     circle.zIndex = next.zIndex?.toFloat() ?: 0f
   }
 }

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

@@ -8,11 +8,11 @@ import com.caverock.androidsvg.SVG
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
-import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
 import com.rngooglemapsplus.extensions.markerStyleEquals
 import com.rngooglemapsplus.extensions.styleHash
+import com.rngooglemapsplus.extensions.toLatLng
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -40,13 +40,15 @@ class MapMarkerBuilder(
     icon: BitmapDescriptor?,
   ): MarkerOptions =
     MarkerOptions().apply {
-      position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
+      position(m.coordinate.toLatLng())
       icon(icon)
       m.title?.let { title(it) }
       m.snippet?.let { snippet(it) }
       m.opacity?.let { alpha(it.toFloat()) }
       m.flat?.let { flat(it) }
       m.draggable?.let { draggable(it) }
+      m.rotation?.let { rotation(it.toFloat()) }
+      m.infoWindowAnchor?.let { infoWindowAnchor(it.x.toFloat(), it.y.toFloat()) }
       m.anchor?.let { anchor((m.anchor.x).toFloat(), (m.anchor.y).toFloat()) }
       m.zIndex?.let { zIndex(it.toFloat()) }
     }
@@ -57,10 +59,7 @@ class MapMarkerBuilder(
     next: RNMarker,
   ) {
     marker.position =
-      LatLng(
-        next.coordinate.latitude,
-        next.coordinate.longitude,
-      )
+      next.coordinate.toLatLng()
 
     if (!prev.markerStyleEquals(next)) {
       buildIconAsync(marker.id, next) { icon ->
@@ -72,6 +71,11 @@ class MapMarkerBuilder(
     marker.alpha = next.opacity?.toFloat() ?: 0f
     marker.isFlat = next.flat ?: false
     marker.isDraggable = next.draggable ?: false
+    marker.rotation = next.rotation?.toFloat() ?: 0f
+    marker.setInfoWindowAnchor(
+      (next.infoWindowAnchor?.x ?: 0.5).toFloat(),
+      (next.infoWindowAnchor?.y ?: 0).toFloat(),
+    )
     marker.setAnchor(
       (next.anchor?.x ?: 0.5).toFloat(),
       (next.anchor?.y ?: 1.0).toFloat(),

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

@@ -2,38 +2,46 @@ package com.rngooglemapsplus
 
 import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
-import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.PolygonOptions
 import com.rngooglemapsplus.extensions.toColor
+import com.rngooglemapsplus.extensions.toLatLng
 
 class MapPolygonBuilder {
   fun build(poly: RNPolygon): PolygonOptions =
     PolygonOptions().apply {
       poly.coordinates.forEach { pt ->
         add(
-          com.google.android.gms.maps.model
-            .LatLng(pt.latitude, pt.longitude),
+          pt.toLatLng(),
         )
       }
       poly.fillColor?.let { fillColor(it.toColor()) }
       poly.strokeColor?.let { strokeColor(it.toColor()) }
       poly.strokeWidth?.let { strokeWidth(it.dpToPx()) }
       poly.pressable?.let { clickable(it) }
+      poly.geodesic?.let { geodesic(it) }
+      poly.holes?.forEach { hole ->
+        addHole(hole.coordinates.map { it.toLatLng() })
+      }
       poly.zIndex?.let { zIndex(it.toFloat()) }
     }
 
   fun update(
-    gmsPoly: Polygon,
+    poly: Polygon,
     next: RNPolygon,
   ) {
-    gmsPoly.points =
+    poly.points =
       next.coordinates.map {
-        LatLng(it.latitude, it.longitude)
+        it.toLatLng()
       }
-    gmsPoly.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
-    gmsPoly.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
-    gmsPoly.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
-    gmsPoly.zIndex = next.zIndex?.toFloat() ?: 0f
+    poly.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
+    poly.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
+    poly.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
+    poly.isClickable = next.pressable ?: false
+    poly.isGeodesic = next.geodesic ?: false
+    poly.holes = next.holes?.map { hole ->
+      hole.coordinates.map { it.toLatLng() }
+    } ?: emptyList()
+    poly.zIndex = next.zIndex?.toFloat() ?: 0f
   }
 }

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

@@ -5,18 +5,18 @@ import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.ButtCap
 import com.google.android.gms.maps.model.Cap
 import com.google.android.gms.maps.model.JointType
-import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
 import com.google.android.gms.maps.model.RoundCap
 import com.google.android.gms.maps.model.SquareCap
 import com.rngooglemapsplus.extensions.toColor
+import com.rngooglemapsplus.extensions.toLatLng
 
 class MapPolylineBuilder {
   fun build(pl: RNPolyline): PolylineOptions =
     PolylineOptions().apply {
       pl.coordinates.forEach { pt ->
-        add(LatLng(pt.latitude, pt.longitude))
+        add(pt.toLatLng())
       }
       pl.width?.let { width(it.dpToPx()) }
       pl.lineCap?.let {
@@ -25,6 +25,7 @@ class MapPolylineBuilder {
       }
       pl.lineJoin?.let { jointType(mapLineJoin(it)) }
       pl.color?.let { color(it.toColor()) }
+      pl.geodesic?.let { geodesic(it) }
       pl.pressable?.let { clickable(it) }
       pl.zIndex?.let { zIndex(it.toFloat()) }
     }
@@ -33,14 +34,15 @@ class MapPolylineBuilder {
     polyline: Polyline,
     next: RNPolyline,
   ) {
-    polyline.points = next.coordinates.map { LatLng(it.latitude, it.longitude) }
-
+    polyline.points = next.coordinates.map { it.toLatLng() }
     polyline.width = next.width?.dpToPx() ?: 1f
     val cap = mapLineCap(next.lineCap ?: RNLineCapType.BUTT)
     polyline.startCap = cap
     polyline.endCap = cap
     polyline.jointType = mapLineJoin(next.lineJoin ?: RNLineJoinType.MITER)
     polyline.color = next.color?.toColor() ?: Color.BLACK
+    polyline.isClickable = next.pressable ?: false
+    polyline.isGeodesic = next.geodesic ?: false
     polyline.zIndex = next.zIndex?.toFloat() ?: 0f
   }
 

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

@@ -3,6 +3,7 @@ package com.rngooglemapsplus
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.ThemedReactContext
+import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.circleEquals
@@ -21,6 +22,7 @@ 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)
@@ -35,15 +37,25 @@ class RNGoogleMapsPlusView(
   override val view =
     GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
 
+  override fun afterUpdate() {
+    super.afterUpdate()
+    if (!propsInitialized) {
+      propsInitialized = true
+      val options =
+        GoogleMapOptions().apply {
+          initialProps?.mapId?.let { mapId(it) }
+          initialProps?.liteMode?.let { liteMode(it) }
+          initialProps?.camera?.let { camera(it.toCameraPosition()) }
+        }
+      view.initMapView(options)
+    }
+  }
+
   override var initialProps: RNInitialProps? = null
     set(value) {
       if (field == value) return
       field = value
-      view.initMapView(
-        value?.mapId,
-        value?.liteMode,
-        value?.camera?.toCameraPosition(),
-      )
+      view.initialProps = value
     }
 
   override var uiSettings: RNMapUiSettings? = null

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

@@ -0,0 +1,6 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLng
+import com.rngooglemapsplus.RNLatLng
+
+fun LatLng.toRnLatLng(): RNLatLng = RNLatLng(latitude, longitude)

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

@@ -1,14 +1,13 @@
 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))
+    builder.target(it.toLatLng())
   }
 
   zoom?.let { builder.zoom(it.toFloat()) }

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

@@ -0,0 +1,6 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLng
+import com.rngooglemapsplus.RNLatLng
+
+fun RNLatLng.toLatLng(): LatLng = LatLng(latitude, longitude)

package/ios/GoogleMapViewImpl.swift

@@ -62,17 +62,12 @@ GMSIndoorDisplayDelegate {
   }
 
   @MainActor
-  func initMapView(mapId: String?, liteMode: Bool?, camera: GMSCameraPosition?) {
+  func initMapView(googleMapOptions: GMSMapViewOptions) {
     if initialized { return }
     initialized = true
-    let options = GMSMapViewOptions()
-    options.frame = bounds
+    googleMapOptions.frame = bounds
 
-    mapId.map { options.mapID = GMSMapID(identifier: $0) }
-    liteMode.map { _ in /* not supported */ }
-    camera.map { options.camera = $0 }
-
-    mapView = GMSMapView.init(options: options)
+    mapView = GMSMapView.init(options: googleMapOptions)
     mapView?.delegate = self
     mapView?.autoresizingMask = [.flexibleWidth, .flexibleHeight]
     mapView?.paddingAdjustmentBehavior = .never
@@ -93,10 +88,7 @@ GMSIndoorDisplayDelegate {
         != loc.coordinate.longitude {
         self.onLocationUpdate?(
           RNLocation(
-            RNLatLng(
-              latitude: loc.coordinate.latitude,
-              longitude: loc.coordinate.longitude
-            ),
+            loc.coordinate.toRNLatLng(),
             loc.course
           )
         )
@@ -198,6 +190,11 @@ GMSIndoorDisplayDelegate {
     mapView?.camera
   }
 
+  @MainActor
+  var initialProps: RNInitialProps? {
+    didSet {}
+  }
+
   @MainActor
   var uiSettings: RNMapUiSettings? {
     didSet {
@@ -343,27 +340,16 @@ GMSIndoorDisplayDelegate {
     animated: Bool,
     durationMs: Double
   ) {
-    if coordinates.isEmpty {
+    guard let firstCoordinates = coordinates.first else {
       return
     }
     var bounds = GMSCoordinateBounds(
-      coordinate: CLLocationCoordinate2D(
-        latitude: coordinates[0].latitude,
-        longitude: coordinates[0].longitude
-      ),
-      coordinate: CLLocationCoordinate2D(
-        latitude: coordinates[0].latitude,
-        longitude: coordinates[0].longitude
-      )
+      coordinate: firstCoordinates.toCLLocationCoordinate2D(),
+      coordinate: firstCoordinates.toCLLocationCoordinate2D()
     )
 
     for coord in coordinates.dropFirst() {
-      bounds = bounds.includingCoordinate(
-        CLLocationCoordinate2D(
-          latitude: coord.latitude,
-          longitude: coord.longitude
-        )
-      )
+      bounds = bounds.includingCoordinate(coord.toCLLocationCoordinate2D())
     }
 
     let insets = UIEdgeInsets(
@@ -629,7 +615,10 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   func clearHeatmaps() {
-    heatmapsById.values.forEach { $0.map = nil }
+    heatmapsById.values.forEach {
+      $0.clearTileCache()
+      $0.map = nil
+    }
     heatmapsById.removeAll()
     pendingHeatmaps.removeAll()
   }
@@ -671,16 +660,21 @@ GMSIndoorDisplayDelegate {
   }
 
   func deinitInternal() {
-    markerBuilder.cancelAllIconTasks()
-    clearMarkers()
-    clearPolylines()
-    clearPolygons()
-    clearCircles()
-    clearHeatmaps()
-    locationHandler.stop()
-    mapView?.clear()
-    mapView?.delegate = nil
-    mapView = nil
+    onMain {
+      self.locationHandler.stop()
+      self.markerBuilder.cancelAllIconTasks()
+      self.clearMarkers()
+      self.clearPolylines()
+      self.clearPolygons()
+      self.clearCircles()
+      self.clearHeatmaps()
+      self.clearKmlLayers()
+      self.mapView?.clear()
+      self.mapView?.indoorDisplay.delegate = nil
+      self.mapView?.delegate = nil
+      self.mapView = nil
+      self.initialized = false
+    }
   }
 
   @objc private func appDidBecomeActive() {
@@ -696,9 +690,6 @@ GMSIndoorDisplayDelegate {
   override func didMoveToWindow() {
     super.didMoveToWindow()
     if window != nil {
-      if mapView != nil && mapReady {
-        onMapReady?(true)
-      }
       locationHandler.start()
     } else {
       locationHandler.stop()
@@ -726,15 +717,12 @@ GMSIndoorDisplayDelegate {
 
       let cp = mapView.camera
       let region = RNRegion(
-        center: RNLatLng(center.latitude, center.longitude),
+        center: center.toRNLatLng(),
         latitudeDelta: latDelta,
         longitudeDelta: lngDelta
       )
       let cam = RNCamera(
-        center: RNLatLng(
-          latitude: cp.target.latitude,
-          longitude: cp.target.longitude
-        ),
+        center: cp.target.toRNLatLng(),
         zoom: Double(cp.zoom),
         bearing: cp.bearing,
         tilt: cp.viewingAngle
@@ -771,15 +759,12 @@ GMSIndoorDisplayDelegate {
 
       let cp = mapView.camera
       let region = RNRegion(
-        center: RNLatLng(center.latitude, center.longitude),
+        center: center.toRNLatLng(),
         latitudeDelta: latDelta,
         longitudeDelta: lngDelta
       )
       let cam = RNCamera(
-        center: RNLatLng(
-          latitude: cp.target.latitude,
-          longitude: cp.target.longitude
-        ),
+        center: cp.target.toRNLatLng(),
         zoom: Double(cp.zoom),
         bearing: cp.bearing,
         tilt: cp.viewingAngle
@@ -804,15 +789,12 @@ GMSIndoorDisplayDelegate {
 
       let cp = mapView.camera
       let region = RNRegion(
-        center: RNLatLng(center.latitude, center.longitude),
+        center: center.toRNLatLng(),
         latitudeDelta: latDelta,
         longitudeDelta: lngDelta
       )
       let cam = RNCamera(
-        center: RNLatLng(
-          latitude: cp.target.latitude,
-          longitude: cp.target.longitude
-        ),
+        center: cp.target.toRNLatLng(),
         zoom: Double(cp.zoom),
         bearing: cp.bearing,
         tilt: cp.viewingAngle
@@ -827,10 +809,7 @@ GMSIndoorDisplayDelegate {
   ) {
     onMain {
       self.onMapPress?(
-        RNLatLng(
-          latitude: coordinate.latitude,
-          longitude: coordinate.longitude
-        )
+        coordinate.toRNLatLng(),
       )
     }
   }
@@ -865,7 +844,7 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMarkerDragStart?(
         marker.userData as? String,
-        RNLatLng(marker.position.latitude, marker.position.longitude)
+        marker.position.toRNLatLng()
       )
     }
   }
@@ -874,7 +853,7 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMarkerDrag?(
         marker.userData as? String,
-        RNLatLng(marker.position.latitude, marker.position.longitude)
+        marker.position.toRNLatLng()
       )
     }
   }
@@ -883,7 +862,7 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMarkerDragEnd?(
         marker.userData as? String,
-        RNLatLng(marker.position.latitude, marker.position.longitude)
+        marker.position.toRNLatLng()
       )
     }
   }

package/ios/MapCircleBuilder.swift

@@ -3,11 +3,7 @@ import GoogleMaps
 final class MapCircleBuilder {
   func build(_ c: RNCircle) -> GMSCircle {
     let circle = GMSCircle()
-    circle.position = CLLocationCoordinate2D(
-      latitude: c.center.latitude,
-      longitude: c.center.longitude
-    )
-
+    circle.position = c.center.toCLLocationCoordinate2D()
     circle.radius = c.radius
     c.fillColor.map { circle.fillColor = $0.toUIColor() }
     c.strokeColor.map { circle.strokeColor = $0.toUIColor() }
@@ -19,11 +15,7 @@ final class MapCircleBuilder {
   }
 
   func update(_ next: RNCircle, _ c: GMSCircle) {
-    c.position = CLLocationCoordinate2D(
-      latitude: next.center.latitude,
-      longitude: next.center.longitude
-    )
-
+    c.position = next.center.toCLLocationCoordinate2D()
     c.radius = next.radius
     c.fillColor = next.fillColor?.toUIColor() ?? nil
     c.strokeColor = next.strokeColor?.toUIColor() ?? .black