react-native-google-maps-plus 1.6.0 → 1.6.1-dev.2

package/README.md

@@ -12,7 +12,7 @@
 [![Platform: Android](https://img.shields.io/badge/platform-android-green.svg?logo=android&logoColor=white)](https://developer.android.com/)
 [![Platform: iOS](https://img.shields.io/badge/platform-iOS-lightgrey.svg?logo=apple&logoColor=black)](https://developer.apple.com/ios/)
 
-React-native wrapper for android & IOS google maps sdk
+React Native wrapper for Android & iOS Google Maps SDK.
 
 ## Installation
 

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

@@ -140,11 +140,9 @@ class GoogleMapsViewImpl(
   override fun onCameraMoveStarted(reason: Int) {
     lastSubmittedCameraPosition = null
     cameraMoveReason = reason
-    val bounds = googleMap?.projection?.visibleRegion?.latLngBounds
-    val cameraPosition = googleMap?.cameraPosition
-    if (bounds == null || cameraPosition == null) {
-      return
-    }
+    val bounds = googleMap?.projection?.visibleRegion?.latLngBounds ?: return
+    val cameraPosition = googleMap?.cameraPosition ?: return
+
     val isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason
 
     onCameraChangeStart?.invoke(
@@ -155,11 +153,9 @@ class GoogleMapsViewImpl(
   }
 
   override fun onCameraMove() {
-    val bounds = googleMap?.projection?.visibleRegion?.latLngBounds
-    val cameraPosition = googleMap?.cameraPosition
-    if (bounds == null || cameraPosition == null) {
-      return
-    }
+    val bounds = googleMap?.projection?.visibleRegion?.latLngBounds ?: return
+    val cameraPosition = googleMap?.cameraPosition ?: return
+
     if (cameraPosition == lastSubmittedCameraPosition) {
       return
     }
@@ -167,7 +163,7 @@ class GoogleMapsViewImpl(
 
     val isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
 
-    onCameraChangeStart?.invoke(
+    onCameraChange?.invoke(
       bounds.toRnRegion(),
       cameraPosition.toRnCamera(),
       isGesture,
@@ -175,15 +171,12 @@ class GoogleMapsViewImpl(
   }
 
   override fun onCameraIdle() {
-    val bounds = googleMap?.projection?.visibleRegion?.latLngBounds
-    val cameraPosition = googleMap?.cameraPosition
+    val bounds = googleMap?.projection?.visibleRegion?.latLngBounds ?: return
+    val cameraPosition = googleMap?.cameraPosition ?: return
 
-    if (bounds == null || cameraPosition == null) {
-      return
-    }
     val isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
 
-    onCameraChangeStart?.invoke(
+    onCameraChangeComplete?.invoke(
       bounds.toRnRegion(),
       cameraPosition.toRnCamera(),
       isGesture,
@@ -279,7 +272,7 @@ class GoogleMapsViewImpl(
             value?.scrollDuringRotateOrZoomEnabled ?: true
           isTiltGesturesEnabled = value?.tiltEnabled ?: true
           isZoomControlsEnabled = value?.zoomControlsEnabled ?: false
-          isZoomGesturesEnabled = value?.zoomGesturesEnabled ?: false
+          isZoomGesturesEnabled = value?.zoomGesturesEnabled ?: true
         }
       }
     }
@@ -404,11 +397,6 @@ class GoogleMapsViewImpl(
     durationMs: Int,
   ) {
     onUi {
-      val current = googleMap?.cameraPosition
-      if (current == null) {
-        return@onUi
-      }
-
       val update = CameraUpdateFactory.newCameraPosition(cameraPosition)
 
       if (animated) {

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

@@ -140,10 +140,9 @@ class MapMarkerBuilder(
     onReady: (BitmapDescriptor?) -> Unit,
   ) {
     jobsById[id]?.cancel()
-    if (m.iconSvg == null) {
-      onReady(null)
-      return
-    }
+
+    m.iconSvg ?: return onReady(null)
+
     val key = m.styleHash()
     iconCache.get(key)?.let { cached ->
       onReady(cached)
@@ -191,10 +190,9 @@ class MapMarkerBuilder(
   }
 
   private suspend fun renderBitmap(m: RNMarker): Bitmap? {
+    m.iconSvg ?: return null
+
     var bmp: Bitmap? = null
-    if (m.iconSvg == null) {
-      return null
-    }
     try {
       coroutineContext.ensureActive()
       val svg = SVG.getFromString(m.iconSvg.svgString)

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

@@ -147,19 +147,16 @@ class RNGoogleMapsPlusView(
 
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
-        if (prev == null) {
-          markerBuilder.buildIconAsync(id, next) { icon ->
-            view.addMarker(
-              id,
-              markerBuilder.build(next, icon),
-            )
-          }
-        } else if (!prev.markerEquals(next)) {
-          view.updateMarker(id) { marker ->
-            onUi {
-              markerBuilder.update(prev, next, marker)
+        when {
+          prev == null ->
+            markerBuilder.buildIconAsync(id, next) { icon ->
+              view.addMarker(id, markerBuilder.build(next, icon))
+            }
+
+          !prev.markerEquals(next) ->
+            view.updateMarker(id) { marker ->
+              onUi { markerBuilder.update(prev, next, marker) }
             }
-          }
         }
       }
     }
@@ -176,14 +173,14 @@ class RNGoogleMapsPlusView(
 
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
-        if (prev == null) {
-          view.addPolyline(id, polylineBuilder.build(next))
-        } else if (!prev.polylineEquals(next)) {
-          view.updatePolyline(id) { polyline ->
-            onUi {
-              polylineBuilder.update(prev, next, polyline)
+        when {
+          prev == null ->
+            view.addPolyline(id, polylineBuilder.build(next))
+
+          !prev.polylineEquals(next) ->
+            view.updatePolyline(id) { polyline ->
+              onUi { polylineBuilder.update(prev, next, polyline) }
             }
-          }
         }
       }
     }
@@ -201,12 +198,14 @@ class RNGoogleMapsPlusView(
 
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
-        if (prev == null) {
-          view.addPolygon(id, polygonBuilder.build(next))
-        } else if (!prev.polygonEquals(next)) {
-          view.updatePolygon(id) { polygon ->
-            onUi { polygonBuilder.update(prev, next, polygon) }
-          }
+        when {
+          prev == null ->
+            view.addPolygon(id, polygonBuilder.build(next))
+
+          !prev.polygonEquals(next) ->
+            view.updatePolygon(id) { polygon ->
+              onUi { polygonBuilder.update(prev, next, polygon) }
+            }
         }
       }
     }
@@ -224,14 +223,14 @@ class RNGoogleMapsPlusView(
 
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
-        if (prev == null) {
-          view.addCircle(id, circleBuilder.build(next))
-        } else if (!prev.circleEquals(next)) {
-          view.updateCircle(id) { circle ->
-            onUi {
-              circleBuilder.update(prev, next, circle)
+        when {
+          prev == null ->
+            view.addCircle(id, circleBuilder.build(next))
+
+          !prev.circleEquals(next) ->
+            view.updateCircle(id) { circle ->
+              onUi { circleBuilder.update(prev, next, circle) }
             }
-          }
         }
       }
     }

package/ios/GoogleMapViewImpl.swift

@@ -164,7 +164,7 @@ GMSIndoorDisplayDelegate {
       mapView?.settings.allowScrollGesturesDuringRotateOrZoom =
         uiSettings?.scrollDuringRotateOrZoomEnabled ?? true
       mapView?.settings.tiltGestures = uiSettings?.tiltEnabled ?? true
-      mapView?.settings.zoomGestures = uiSettings?.zoomGesturesEnabled ?? false
+      mapView?.settings.zoomGestures = uiSettings?.zoomGesturesEnabled ?? true
     }
   }
 
@@ -664,7 +664,7 @@ GMSIndoorDisplayDelegate {
       let region = bounds.toRNRegion()
       let camera = mapView.camera.toRNCamera()
 
-      self.onCameraChange?(region, camera, gesture)
+      self.onCameraChangeStart?(region, camera, gesture)
     }
   }
 
@@ -698,7 +698,7 @@ GMSIndoorDisplayDelegate {
       let region = bounds.toRNRegion()
       let camera = mapView.camera.toRNCamera()
 
-      self.onCameraChange?(region, camera, self.cameraMoveReasonIsGesture)
+      self.onCameraChangeComplete?(region, camera, self.cameraMoveReasonIsGesture)
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.6.0",
-  "description": "React-native wrapper for android & IOS google maps sdk",
+  "version": "1.6.1-dev.2",
+  "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -79,38 +79,34 @@
     "@commitlint/config-conventional": "20.0.0",
     "@eslint/compat": "1.4.0",
     "@eslint/eslintrc": "3.3.1",
-    "@eslint/js": "9.37.0",
+    "@eslint/js": "9.38.0",
     "@expo/config-plugins": "54.0.2",
     "@jamesacarr/eslint-formatter-github-actions": "0.2.0",
-    "@react-native/babel-preset": "0.82.0",
-    "@react-native/eslint-config": "0.82.0",
+    "@react-native/babel-preset": "0.82.1",
+    "@react-native/eslint-config": "0.82.1",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "13.0.0-beta.1",
+    "@semantic-release/npm": "13.1.1",
     "@types/jest": "30.0.0",
     "@types/react": "19.2.2",
     "clang-format-node": "2.0.2",
     "conventional-changelog-conventionalcommits": "9.1.0",
     "del-cli": "7.0.0",
-    "eslint": "9.37.0",
+    "eslint": "9.38.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-ft-flow": "3.0.11",
     "eslint-plugin-prettier": "5.5.4",
     "jest": "30.2.0",
-    "lefthook": "1.13.6",
-    "nitrogen": "0.30.1",
+    "lefthook": "2.0.0",
+    "nitrogen": "0.30.2",
     "prettier": "3.6.2",
     "react": "19.2.0",
-    "react-native": "0.82.0",
+    "react-native": "0.82.1",
     "react-native-builder-bob": "0.40.13",
-    "react-native-nitro-modules": "0.30.1",
-    "semantic-release": "25.0.0-beta.6",
+    "react-native-nitro-modules": "0.30.2",
+    "semantic-release": "25.0.1",
     "typescript": "5.9.3"
   },
-  "overrides": {
-    "@semantic-release/npm": "13.0.0-beta.1",
-    "semantic-release": "25.0.0-beta.6"
-  },
   "peerDependencies": {
     "expo": "*",
     "react": "*",