react-native-google-maps-plus 1.6.1-dev.1 → 1.6.1-dev.3

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,8 @@ class GoogleMapsViewImpl(
     }
   }
 
+  val currentCamera: CameraPosition? = 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 ?: return@onUi
+      view.setCamera(
+        camera.toCameraPosition(current),
+        animated == true,
+        durationMs?.toInt() ?: 3000,
+      )
+    }
   }
 
   override fun setCameraToCoordinates(

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 {
+fun RNCamera.toCameraPosition(current: CameraPosition?): CameraPosition {
   val builder = CameraPosition.builder()
 
-  center?.let {
-    builder.target(it.toLatLng())
-  }
+  builder.target(center?.toLatLng() ?: current?.target ?: LatLng(0.0, 0.0))
 
   zoom?.let { builder.zoom(it.toFloat()) }
   bearing?.let { builder.bearing(it.toFloat()) }

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-dev.1",
+  "version": "1.6.1-dev.3",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",