react-native-google-maps-plus 1.6.1 → 1.6.2

package/android/build.gradle

@@ -44,6 +44,8 @@ android {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
+    consumerProguardFiles "proguard-rules.pro"
+
     externalNativeBuild {
       cmake {
         cppFlags "-frtti -fexceptions -Wall -fstack-protector-all"

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

@@ -250,6 +250,9 @@ class GoogleMapsViewImpl(
     }
   }
 
+  val currentCamera: CameraPosition?
+    get() = googleMap?.cameraPosition
+
   var initialProps: RNInitialProps? = null
 
   var uiSettings: RNMapUiSettings? = null

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

@@ -45,7 +45,7 @@ class RNGoogleMapsPlusView(
         GoogleMapOptions().apply {
           initialProps?.mapId?.let { mapId(it) }
           initialProps?.liteMode?.let { liteMode(it) }
-          initialProps?.camera?.let { camera(it.toCameraPosition()) }
+          initialProps?.camera?.let { camera(it.toCameraPosition(current = null)) }
         }
       view.initMapView(options)
     }
@@ -361,7 +361,14 @@ class RNGoogleMapsPlusView(
     animated: Boolean?,
     durationMs: Double?,
   ) {
-    view.setCamera(camera.toCameraPosition(), animated == true, durationMs?.toInt() ?: 3000)
+    onUi {
+      val current = view.currentCamera
+      view.setCamera(
+        camera.toCameraPosition(current),
+        animated == true,
+        durationMs?.toInt() ?: 3000,
+      )
+    }
   }
 
   override fun setCameraToCoordinates(

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

@@ -19,40 +19,44 @@ fun Location.toRnLocation(): RNLocation =
         provider = provider,
         elapsedRealtimeNanos = elapsedRealtimeNanos.toDouble(),
         bearingAccuracyDegrees =
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            bearingAccuracyDegrees.toDouble()
-          } else {
-            null
+          when {
+            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
+          when {
+            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
+          when {
+            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
+          when {
+            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
+          when {
+            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
+          when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> isMock
+            else -> isFromMockProvider
           },
       ),
     ios = null,

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

@@ -1,18 +1,14 @@
 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(it.toLatLng())
-  }
-
-  zoom?.let { builder.zoom(it.toFloat()) }
-  bearing?.let { builder.bearing(it.toFloat()) }
-  tilt?.let { builder.tilt(it.toFloat()) }
-
-  return builder.build()
-}
+fun RNCamera.toCameraPosition(current: CameraPosition?) =
+  CameraPosition
+    .builder()
+    .target(center?.toLatLng() ?: current?.target ?: LatLng(0.0, 0.0))
+    .zoom(zoom?.toFloat() ?: current?.zoom ?: 0f)
+    .bearing(bearing?.toFloat() ?: current?.bearing ?: 0f)
+    .tilt(tilt?.toFloat() ?: current?.tilt ?: 0f)
+    .build()

package/ios/GoogleMapViewImpl.swift

@@ -278,7 +278,7 @@ GMSIndoorDisplayDelegate {
         disableActions: false,
         duration: durationMs / 1000.0
       ) {
-        mapView?.animate(to: camera)
+        self.mapView?.animate(to: camera)
       }
     } else {
       let update = GMSCameraUpdate.setCamera(camera)
@@ -318,7 +318,7 @@ GMSIndoorDisplayDelegate {
         disableActions: false,
         duration: durationMs / 1000.0
       ) {
-        mapView?.animate(with: update)
+        self.mapView?.animate(with: update)
       }
     } else {
       mapView?.moveCamera(update)

package/ios/MapHelper.swift

@@ -1,22 +1,24 @@
 import QuartzCore
 
-@inline(__always)
+@MainActor @inline(__always)
 func withCATransaction(
   disableActions: Bool = true,
   duration: CFTimeInterval? = nil,
   timingFunction: CAMediaTimingFunction? = nil,
   completion: (() -> Void)? = nil,
-  _ body: () -> Void
+  _ body: @escaping @MainActor () -> Void
 ) {
-  CATransaction.begin()
+  onMain {
+    CATransaction.begin()
 
-  CATransaction.setDisableActions(disableActions)
-  duration.map { CATransaction.setAnimationDuration($0) }
-  timingFunction.map { CATransaction.setAnimationTimingFunction($0) }
-  completion.map { CATransaction.setCompletionBlock($0) }
+    CATransaction.setDisableActions(disableActions)
+    duration.map { CATransaction.setAnimationDuration($0) }
+    timingFunction.map { CATransaction.setAnimationTimingFunction($0) }
+    completion.map { CATransaction.setCompletionBlock($0) }
 
-  body()
-  CATransaction.commit()
+    body()
+    CATransaction.commit()
+  }
 }
 
 @MainActor @inline(__always)

package/ios/RNGoogleMapsPlusView.swift

@@ -132,19 +132,19 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       withCATransaction(disableActions: true) {
 
         removed.forEach {
-          impl.removeMarker(id: $0)
-          markerBuilder.cancelIconTask($0)
+          self.impl.removeMarker(id: $0)
+          self.markerBuilder.cancelIconTask($0)
         }
 
         for (id, next) in nextById {
           if let prev = prevById[id] {
             if !prev.markerEquals(next) {
-              impl.updateMarker(id: id) { m in
+              self.impl.updateMarker(id: id) { m in
                 self.markerBuilder.update(prev, next, m)
               }
             }
           } else {
-            markerBuilder.buildIconAsync(next.id, next) { icon in
+            self.markerBuilder.buildIconAsync(next.id, next) { icon in
               let marker = self.markerBuilder.build(next, icon: icon)
               self.impl.addMarker(id: id, marker: marker)
             }

package/ios/extensions/RNCamera+Extension.swift

@@ -4,8 +4,8 @@ import GoogleMaps
 extension RNCamera {
   func toGMSCameraPosition(current: GMSCameraPosition?) -> GMSCameraPosition {
     let center = CLLocationCoordinate2D(
-      latitude: center?.latitude ?? current?.target.latitude ?? 0,
-      longitude: center?.longitude ?? current?.target.longitude ?? 0
+      latitude: center?.latitude ?? current?.target.latitude ?? 0.0,
+      longitude: center?.longitude ?? current?.target.longitude ?? 0.0
     )
 
     let zoom = Float(zoom ?? Double(current?.zoom ?? 0))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",