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

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

@@ -31,19 +31,52 @@ class MapPolylineBuilder {
     }
 
   fun update(
-    polyline: Polyline,
+    prev: RNPolyline,
     next: RNPolyline,
+    polyline: Polyline,
   ) {
-    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
+    val coordsChanged =
+      prev.coordinates.size != next.coordinates.size ||
+        !prev.coordinates.zip(next.coordinates).all { (a, b) ->
+          a.latitude == b.latitude && a.longitude == b.longitude
+        }
+
+    if (coordsChanged) {
+      polyline.points = next.coordinates.map { it.toLatLng() }
+    }
+
+    if (prev.width != next.width) {
+      polyline.width = next.width?.dpToPx() ?: 1f
+    }
+
+    val newCap = mapLineCap(next.lineCap ?: RNLineCapType.BUTT)
+    val prevCap = mapLineCap(prev.lineCap ?: RNLineCapType.BUTT)
+    if (newCap != prevCap) {
+      polyline.startCap = newCap
+      polyline.endCap = newCap
+    }
+
+    val newJoin = mapLineJoin(next.lineJoin ?: RNLineJoinType.MITER)
+    val prevJoin = mapLineJoin(prev.lineJoin ?: RNLineJoinType.MITER)
+    if (newJoin != prevJoin) {
+      polyline.jointType = newJoin
+    }
+
+    if (prev.color != next.color) {
+      polyline.color = next.color?.toColor() ?: Color.BLACK
+    }
+
+    if (prev.pressable != next.pressable) {
+      polyline.isClickable = next.pressable ?: false
+    }
+
+    if (prev.geodesic != next.geodesic) {
+      polyline.isGeodesic = next.geodesic ?: false
+    }
+
+    if (prev.zIndex != next.zIndex) {
+      polyline.zIndex = next.zIndex?.toFloat() ?: 0f
+    }
   }
 
   private fun mapLineCap(type: RNLineCapType?): Cap =

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

@@ -157,7 +157,7 @@ class RNGoogleMapsPlusView(
         } else if (!prev.markerEquals(next)) {
           view.updateMarker(id) { marker ->
             onUi {
-              markerBuilder.update(marker, next, prev)
+              markerBuilder.update(prev, next, marker)
             }
           }
         }
@@ -181,7 +181,7 @@ class RNGoogleMapsPlusView(
         } else if (!prev.polylineEquals(next)) {
           view.updatePolyline(id) { polyline ->
             onUi {
-              polylineBuilder.update(polyline, next)
+              polylineBuilder.update(prev, next, polyline)
             }
           }
         }
@@ -205,7 +205,7 @@ class RNGoogleMapsPlusView(
           view.addPolygon(id, polygonBuilder.build(next))
         } else if (!prev.polygonEquals(next)) {
           view.updatePolygon(id) { polygon ->
-            onUi { polygonBuilder.update(polygon, next) }
+            onUi { polygonBuilder.update(prev, next, polygon) }
           }
         }
       }
@@ -229,7 +229,7 @@ class RNGoogleMapsPlusView(
         } else if (!prev.circleEquals(next)) {
           view.updateCircle(id) { circle ->
             onUi {
-              circleBuilder.update(circle, next)
+              circleBuilder.update(prev, next, circle)
             }
           }
         }

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

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.CameraPosition
+import com.rngooglemapsplus.RNCamera
+
+fun CameraPosition.toRnCamera(): RNCamera =
+  RNCamera(
+    center = target.toRnLatLng(),
+    zoom = zoom.toDouble(),
+    bearing = bearing.toDouble(),
+    tilt = tilt.toDouble(),
+  )

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

@@ -0,0 +1,28 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.common.ConnectionResult
+import com.rngooglemapsplus.RNMapErrorCode
+
+fun Int.toRNMapErrorCodeOrNull(): RNMapErrorCode? =
+  when (this) {
+    ConnectionResult.SERVICE_MISSING ->
+      RNMapErrorCode.PLAY_SERVICES_MISSING
+
+    ConnectionResult.SERVICE_INVALID ->
+      RNMapErrorCode.PLAY_SERVICES_INVALID
+
+    ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED ->
+      RNMapErrorCode.PLAY_SERVICES_OUTDATED
+
+    ConnectionResult.SERVICE_UPDATING ->
+      RNMapErrorCode.PLAY_SERVICE_UPDATING
+
+    ConnectionResult.SERVICE_DISABLED ->
+      RNMapErrorCode.PLAY_SERVICES_DISABLED
+
+    ConnectionResult.SUCCESS ->
+      null
+
+    else ->
+      RNMapErrorCode.UNKNOWN
+  }

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

@@ -0,0 +1,15 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLngBounds
+import com.rngooglemapsplus.RNRegion
+
+fun LatLngBounds.toRnRegion(): RNRegion {
+  val latDelta = northeast.latitude - southwest.latitude
+  val lngDelta = northeast.longitude - southwest.longitude
+
+  return RNRegion(
+    center = center.toRnLatLng(),
+    latitudeDelta = latDelta,
+    longitudeDelta = lngDelta,
+  )
+}

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

@@ -0,0 +1,59 @@
+package com.rngooglemapsplus.extensions
+
+import android.location.Location
+import android.os.Build
+import com.rngooglemapsplus.RNLatLng
+import com.rngooglemapsplus.RNLocation
+import com.rngooglemapsplus.RNLocationAndroid
+
+fun Location.toRnLocation(): RNLocation =
+  RNLocation(
+    center = RNLatLng(latitude, longitude),
+    altitude = altitude,
+    accuracy = accuracy.toDouble(),
+    bearing = bearing.toDouble(),
+    speed = speed.toDouble(),
+    time = time.toDouble(),
+    android =
+      RNLocationAndroid(
+        provider = provider,
+        elapsedRealtimeNanos = elapsedRealtimeNanos.toDouble(),
+        bearingAccuracyDegrees =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            bearingAccuracyDegrees.toDouble()
+          } else {
+            null
+          },
+        speedAccuracyMetersPerSecond =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            speedAccuracyMetersPerSecond.toDouble()
+          } else {
+            null
+          },
+        verticalAccuracyMeters =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            verticalAccuracyMeters.toDouble()
+          } else {
+            null
+          },
+        mslAltitudeMeters =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            mslAltitudeMeters
+          } else {
+            null
+          },
+        mslAltitudeAccuracyMeters =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            mslAltitudeAccuracyMeters.toDouble()
+          } else {
+            null
+          },
+        isMock =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            isMock
+          } else {
+            isFromMockProvider
+          },
+      ),
+    ios = null,
+  )

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,
@@ -72,8 +72,8 @@ GMSIndoorDisplayDelegate {
     mapView?.autoresizingMask = [.flexibleWidth, .flexibleHeight]
     mapView?.paddingAdjustmentBehavior = .never
     mapView.map { addSubview($0) }
+    applyProps()
     initLocationCallbacks()
-    applyPending()
     onMapReady?(true)
     mapReady = true
   }
@@ -82,18 +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(
-            loc.coordinate.toRNLatLng(),
-            loc.course
-          )
-        )
-      }
-      self.lastSubmittedLocation = loc
+      self.onLocationUpdate?(loc.toRnLocation())
     }
     locationHandler.onError = { [weak self] error in
       self?.onLocationError?(error)
@@ -102,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 }
+  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 })()
 
-    mapZoomConfig.map {
-      mapView?.setMinZoom(
-        Float($0.min ?? 2),
-        maxZoom: Float($0.max ?? 21)
-      )
-    }
-
-    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()
@@ -402,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
@@ -435,7 +388,6 @@ GMSIndoorDisplayDelegate {
         return
       }
 
-      // Rückgabe
       if resultIsFile {
         let filename =
           "map_snapshot_\(Int(Date().timeIntervalSince1970)).\(format)"
@@ -660,6 +612,8 @@ GMSIndoorDisplayDelegate {
   }
 
   func deinitInternal() {
+    guard !deInitialized else { return }
+    deInitialized = true
     onMain {
       self.locationHandler.stop()
       self.markerBuilder.cancelAllIconTasks()
@@ -703,33 +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 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: center.toRNLatLng(),
-        latitudeDelta: latDelta,
-        longitudeDelta: lngDelta
-      )
-      let cam = RNCamera(
-        center: cp.target.toRNLatLng(),
-        zoom: Double(cp.zoom),
-        bearing: cp.bearing,
-        tilt: cp.viewingAngle
-      )
-      self.cameraMoveReasonIsGesture = gesture
-
-      self.onCameraChangeStart?(region, cam, gesture)
+      self.onCameraChange?(region, camera, gesture)
     }
   }
 
@@ -748,28 +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: center.toRNLatLng(),
-        latitudeDelta: latDelta,
-        longitudeDelta: lngDelta
-      )
-      let cam = RNCamera(
-        center: cp.target.toRNLatLng(),
-        zoom: Double(cp.zoom),
-        bearing: cp.bearing,
-        tilt: cp.viewingAngle
-      )
-      self.onCameraChange?(region, cam, self.cameraMoveReasonIsGesture)
+      self.onCameraChange?(region, camera, self.cameraMoveReasonIsGesture)
     }
   }
 
@@ -778,28 +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 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: center.toRNLatLng(),
-        latitudeDelta: latDelta,
-        longitudeDelta: lngDelta
-      )
-      let cam = RNCamera(
-        center: cp.target.toRNLatLng(),
-        zoom: Double(cp.zoom),
-        bearing: cp.bearing,
-        tilt: cp.viewingAngle
-      )
-      self.onCameraChangeComplete?(region, cam, self.cameraMoveReasonIsGesture)
+      self.onCameraChange?(region, camera, self.cameraMoveReasonIsGesture)
     }
   }
 
@@ -893,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

@@ -14,14 +14,34 @@ final class MapCircleBuilder {
     return circle
   }
 
-  func update(_ next: RNCircle, _ c: GMSCircle) {
-    c.position = next.center.toCLLocationCoordinate2D()
-    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() }
+  }
+}