react-native-google-maps-plus 1.3.0 → 1.4.1-dev.1

package/ios/GoogleMapViewImpl.swift

@@ -11,6 +11,7 @@ GMSIndoorDisplayDelegate {
   private var mapView: GMSMapView?
   private var initialized = false
   private var mapReady = false
+  private var deInitialized = false
 
   private var pendingMarkers: [(id: String, marker: GMSMarker)] = []
   private var pendingPolylines: [(id: String, polyline: GMSPolyline)] = []
@@ -28,7 +29,6 @@ GMSIndoorDisplayDelegate {
 
   private var cameraMoveReasonIsGesture: Bool = false
   private var lastSubmittedCameraPosition: GMSCameraPosition?
-  private var lastSubmittedLocation: CLLocation?
 
   init(
     frame: CGRect = .zero,
@@ -62,23 +62,18 @@ 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
     mapView.map { addSubview($0) }
+    applyProps()
     initLocationCallbacks()
-    applyPending()
     onMapReady?(true)
     mapReady = true
   }
@@ -87,21 +82,7 @@ GMSIndoorDisplayDelegate {
   private func initLocationCallbacks() {
     locationHandler.onUpdate = { [weak self] loc in
       guard let self = self else { return }
-      if self.lastSubmittedLocation?.coordinate.latitude
-        != loc.coordinate.latitude
-        || self.lastSubmittedLocation?.coordinate.longitude
-        != loc.coordinate.longitude {
-        self.onLocationUpdate?(
-          RNLocation(
-            RNLatLng(
-              latitude: loc.coordinate.latitude,
-              longitude: loc.coordinate.longitude
-            ),
-            loc.course
-          )
-        )
-      }
-      self.lastSubmittedLocation = loc
+      self.onLocationUpdate?(loc.toRnLocation())
     }
     locationHandler.onError = { [weak self] error in
       self?.onLocationError?(error)
@@ -110,55 +91,19 @@ GMSIndoorDisplayDelegate {
   }
 
   @MainActor
-  private func applyPending() {
-    mapPadding.map {
-      mapView?.padding = UIEdgeInsets(
-        top: $0.top,
-        left: $0.left,
-        bottom: $0.bottom,
-        right: $0.right
-      )
-    }
-
-    if let v = uiSettings {
-      v.allGesturesEnabled.map { mapView?.settings.setAllGesturesEnabled($0) }
-      v.compassEnabled.map { mapView?.settings.compassButton = $0 }
-      v.indoorLevelPickerEnabled.map { mapView?.settings.indoorPicker = $0 }
-      v.mapToolbarEnabled.map { _ in /* not supported */ }
-      v.myLocationButtonEnabled.map { mapView?.settings.myLocationButton = $0 }
-      v.rotateEnabled.map { mapView?.settings.rotateGestures = $0 }
-      v.scrollEnabled.map { mapView?.settings.scrollGestures = $0 }
-      v.scrollDuringRotateOrZoomEnabled.map {
-        mapView?.settings.allowScrollGesturesDuringRotateOrZoom = $0
-      }
-      v.tiltEnabled.map { mapView?.settings.tiltGestures = $0 }
-      v.zoomControlsEnabled.map { _ in /* not supported */ }
-      v.zoomGesturesEnabled.map { mapView?.settings.zoomGestures = $0 }
-    }
-
-    myLocationEnabled.map { mapView?.isMyLocationEnabled = $0 }
-    buildingEnabled.map { mapView?.isBuildingsEnabled = $0 }
-    trafficEnabled.map { mapView?.isTrafficEnabled = $0 }
-    indoorEnabled.map {
-      mapView?.isIndoorEnabled = $0
-      mapView?.indoorDisplay.delegate = $0 == true ? self : nil
-    }
-    customMapStyle.map { mapView?.mapStyle = $0 }
-    mapType.map { mapView?.mapType = $0 }
-    userInterfaceStyle.map { mapView?.overrideUserInterfaceStyle = $0 }
-
-    mapZoomConfig.map {
-      mapView?.setMinZoom(
-        Float($0.min ?? 2),
-        maxZoom: Float($0.max ?? 21)
-      )
-    }
+  private func applyProps() {
+    ({ self.uiSettings = self.uiSettings })()
+    ({ self.mapPadding = self.mapPadding })()
+    ({ self.myLocationEnabled = self.myLocationEnabled })()
+    ({ self.buildingEnabled = self.buildingEnabled })()
+    ({ self.trafficEnabled = self.trafficEnabled })()
+    ({ self.indoorEnabled = self.indoorEnabled })()
+    ({ self.customMapStyle = self.customMapStyle })()
+    ({ self.mapType = self.mapType })()
+    ({ self.userInterfaceStyle = self.userInterfaceStyle })()
+    ({ self.mapZoomConfig = self.mapZoomConfig })()
+    ({ self.locationConfig = self.locationConfig })()
 
-    locationConfig.map {
-      locationHandler.desiredAccuracy =
-        $0.ios?.desiredAccuracy?.toCLLocationAccuracy
-      locationHandler.distanceFilterMeters = $0.ios?.distanceFilterMeters
-    }
     if !pendingMarkers.isEmpty {
       pendingMarkers.forEach { addMarkerInternal(id: $0.id, marker: $0.marker) }
       pendingMarkers.removeAll()
@@ -348,27 +293,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(
@@ -421,7 +355,7 @@ GMSIndoorDisplayDelegate {
   ) -> NitroModules.Promise<String?> {
     let promise = Promise<String?>()
 
-    DispatchQueue.main.async {
+    onMainAsync {
       guard let mapView = self.mapView else {
         promise.resolve(withResult: nil)
         return
@@ -454,7 +388,6 @@ GMSIndoorDisplayDelegate {
         return
       }
 
-      // Rückgabe
       if resultIsFile {
         let filename =
           "map_snapshot_\(Int(Date().timeIntervalSince1970)).\(format)"
@@ -679,6 +612,8 @@ GMSIndoorDisplayDelegate {
   }
 
   func deinitInternal() {
+    guard !deInitialized else { return }
+    deInitialized = true
     onMain {
       self.locationHandler.stop()
       self.markerBuilder.cancelAllIconTasks()
@@ -722,36 +657,14 @@ GMSIndoorDisplayDelegate {
 
   func mapView(_ mapView: GMSMapView, willMove gesture: Bool) {
     onMain {
+      self.cameraMoveReasonIsGesture = gesture
       let visibleRegion = mapView.projection.visibleRegion()
       let bounds = GMSCoordinateBounds(region: visibleRegion)
 
-      let center = CLLocationCoordinate2D(
-        latitude: (bounds.northEast.latitude + bounds.southWest.latitude) / 2.0,
-        longitude: (bounds.northEast.longitude + bounds.southWest.longitude)
-          / 2.0
-      )
-
-      let latDelta = bounds.northEast.latitude - bounds.southWest.latitude
-      let lngDelta = bounds.northEast.longitude - bounds.southWest.longitude
+      let region = bounds.toRNRegion()
+      let camera = mapView.camera.toRNCamera()
 
-      let cp = mapView.camera
-      let region = RNRegion(
-        center: RNLatLng(center.latitude, center.longitude),
-        latitudeDelta: latDelta,
-        longitudeDelta: lngDelta
-      )
-      let cam = RNCamera(
-        center: RNLatLng(
-          latitude: cp.target.latitude,
-          longitude: cp.target.longitude
-        ),
-        zoom: Double(cp.zoom),
-        bearing: cp.bearing,
-        tilt: cp.viewingAngle
-      )
-      self.cameraMoveReasonIsGesture = gesture
-
-      self.onCameraChangeStart?(region, cam, gesture)
+      self.onCameraChange?(region, camera, gesture)
     }
   }
 
@@ -770,31 +683,10 @@ GMSIndoorDisplayDelegate {
       let visibleRegion = mapView.projection.visibleRegion()
       let bounds = GMSCoordinateBounds(region: visibleRegion)
 
-      let center = CLLocationCoordinate2D(
-        latitude: (bounds.northEast.latitude + bounds.southWest.latitude) / 2.0,
-        longitude: (bounds.northEast.longitude + bounds.southWest.longitude)
-          / 2.0
-      )
-
-      let latDelta = bounds.northEast.latitude - bounds.southWest.latitude
-      let lngDelta = bounds.northEast.longitude - bounds.southWest.longitude
+      let region = bounds.toRNRegion()
+      let camera = mapView.camera.toRNCamera()
 
-      let cp = mapView.camera
-      let region = RNRegion(
-        center: RNLatLng(center.latitude, center.longitude),
-        latitudeDelta: latDelta,
-        longitudeDelta: lngDelta
-      )
-      let cam = RNCamera(
-        center: RNLatLng(
-          latitude: cp.target.latitude,
-          longitude: cp.target.longitude
-        ),
-        zoom: Double(cp.zoom),
-        bearing: cp.bearing,
-        tilt: cp.viewingAngle
-      )
-      self.onCameraChange?(region, cam, self.cameraMoveReasonIsGesture)
+      self.onCameraChange?(region, camera, self.cameraMoveReasonIsGesture)
     }
   }
 
@@ -803,31 +695,10 @@ GMSIndoorDisplayDelegate {
       let visibleRegion = mapView.projection.visibleRegion()
       let bounds = GMSCoordinateBounds(region: visibleRegion)
 
-      let center = CLLocationCoordinate2D(
-        latitude: (bounds.northEast.latitude + bounds.southWest.latitude) / 2.0,
-        longitude: (bounds.northEast.longitude + bounds.southWest.longitude)
-          / 2.0
-      )
+      let region = bounds.toRNRegion()
+      let camera = mapView.camera.toRNCamera()
 
-      let latDelta = bounds.northEast.latitude - bounds.southWest.latitude
-      let lngDelta = bounds.northEast.longitude - bounds.southWest.longitude
-
-      let cp = mapView.camera
-      let region = RNRegion(
-        center: RNLatLng(center.latitude, center.longitude),
-        latitudeDelta: latDelta,
-        longitudeDelta: lngDelta
-      )
-      let cam = RNCamera(
-        center: RNLatLng(
-          latitude: cp.target.latitude,
-          longitude: cp.target.longitude
-        ),
-        zoom: Double(cp.zoom),
-        bearing: cp.bearing,
-        tilt: cp.viewingAngle
-      )
-      self.onCameraChangeComplete?(region, cam, self.cameraMoveReasonIsGesture)
+      self.onCameraChange?(region, camera, self.cameraMoveReasonIsGesture)
     }
   }
 
@@ -837,10 +708,7 @@ GMSIndoorDisplayDelegate {
   ) {
     onMain {
       self.onMapPress?(
-        RNLatLng(
-          latitude: coordinate.latitude,
-          longitude: coordinate.longitude
-        )
+        coordinate.toRNLatLng(),
       )
     }
   }
@@ -875,7 +743,7 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMarkerDragStart?(
         marker.userData as? String,
-        RNLatLng(marker.position.latitude, marker.position.longitude)
+        marker.position.toRNLatLng()
       )
     }
   }
@@ -884,7 +752,7 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMarkerDrag?(
         marker.userData as? String,
-        RNLatLng(marker.position.latitude, marker.position.longitude)
+        marker.position.toRNLatLng()
       )
     }
   }
@@ -893,7 +761,7 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMarkerDragEnd?(
         marker.userData as? String,
-        RNLatLng(marker.position.latitude, marker.position.longitude)
+        marker.position.toRNLatLng()
       )
     }
   }
@@ -924,12 +792,3 @@ GMSIndoorDisplayDelegate {
     }
   }
 }
-
-@inline(__always)
-func onMain(_ block: @escaping () -> Void) {
-  if Thread.isMainThread {
-    block()
-  } else {
-    DispatchQueue.main.async { block() }
-  }
-}

package/ios/LocationHandler.swift

@@ -34,7 +34,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
   }
 
   func showLocationDialog() {
-    DispatchQueue.main.async {
+    onMainAsync { [weak self] in
       guard let vc = Self.topMostViewController() else { return }
       let title =
         Bundle.main.object(forInfoDictionaryKey: "LocationNotAvailableTitle")
@@ -61,7 +61,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
           title: openLocationSettingsButton ?? "Open settings",
           style: .default
         ) { _ in
-          self.openLocationSettings()
+          self?.openLocationSettings()
         }
       )
       vc.present(alert, animated: true, completion: nil)
@@ -78,7 +78,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
   }
 
   func openLocationSettings() {
-    DispatchQueue.main.async {
+    onMainAsync {
       let openSettings = {
         if #available(iOS 18.3, *) {
           guard
@@ -114,18 +114,10 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
     didFailWithError error: Error
   ) {
     let code: RNLocationErrorCode
-
     if let clError = error as? CLError {
-      switch clError.code {
-      case .denied:
-        code = RNLocationErrorCode.permissionDenied
-      case .locationUnknown, .network:
-        code = RNLocationErrorCode.positionUnavailable
-      default:
-        code = RNLocationErrorCode.internalError
-      }
+      code = clError.code.toRNLocationErrorCode
     } else {
-      code = RNLocationErrorCode.internalError
+      code = .internalError
     }
     onError?(code)
   }

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() }
@@ -18,18 +14,34 @@ final class MapCircleBuilder {
     return circle
   }
 
-  func update(_ next: RNCircle, _ c: GMSCircle) {
-    c.position = CLLocationCoordinate2D(
-      latitude: next.center.latitude,
-      longitude: next.center.longitude
-    )
-
-    c.radius = next.radius
-    c.fillColor = next.fillColor?.toUIColor() ?? nil
-    c.strokeColor = next.strokeColor?.toUIColor() ?? .black
-    c.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
-    c.isTappable = next.pressable ?? false
-    c.zIndex = Int32(next.zIndex ?? 0)
-  }
+  func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
+    if prev.center.latitude != next.center.latitude
+      || prev.center.longitude != next.center.longitude {
+      c.position = next.center.toCLLocationCoordinate2D()
+    }
+
+    if prev.radius != next.radius {
+      c.radius = next.radius ?? 0
+    }
+
+    if prev.fillColor != next.fillColor {
+      c.fillColor = next.fillColor?.toUIColor() ?? .clear
+    }
 
+    if prev.strokeColor != next.strokeColor {
+      c.strokeColor = next.strokeColor?.toUIColor() ?? .black
+    }
+
+    if prev.strokeWidth != next.strokeWidth {
+      c.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
+    }
+
+    if prev.pressable != next.pressable {
+      c.isTappable = next.pressable ?? false
+    }
+
+    if prev.zIndex != next.zIndex {
+      c.zIndex = Int32(next.zIndex ?? 0)
+    }
+  }
 }

package/ios/MapHelper.swift

@@ -18,3 +18,23 @@ func withCATransaction(
   body()
   CATransaction.commit()
 }
+
+@MainActor @inline(__always)
+func onMain(_ block: @escaping @MainActor () -> Void) {
+  if Thread.isMainThread {
+    block()
+  } else {
+    Task { @MainActor in block() }
+  }
+}
+
+@inline(__always)
+func onMainAsync(
+  _ block: @MainActor @escaping () async -> Void
+) {
+  if Thread.isMainThread {
+    Task { @MainActor in await block() }
+  } else {
+    Task { @MainActor in await block() }
+  }
+}