react-native-google-maps-plus 1.1.0-dev.2 → 1.1.0-dev.3

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

@@ -293,11 +293,9 @@ class GoogleMapsViewImpl(
       userInterfaceStyle?.let {
         googleMap?.mapColorScheme = it
       }
-      minZoomLevel?.let {
-        googleMap?.setMinZoomPreference(it.toFloat())
-      }
-      maxZoomLevel?.let {
-        googleMap?.setMaxZoomPreference(it.toFloat())
+      mapZoomConfig?.let {
+        googleMap?.setMinZoomPreference(it.min?.toFloat() ?: 2.0f)
+        googleMap?.setMaxZoomPreference(it.max?.toFloat() ?: 21.0f)
       }
     }
 
@@ -340,56 +338,34 @@ class GoogleMapsViewImpl(
     set(value) {
       field = value
       onUi {
-        value?.let { v ->
-          googleMap?.uiSettings?.apply {
-            v.allGesturesEnabled?.let { setAllGesturesEnabled(it) }
-            v.compassEnabled?.let { isCompassEnabled = it }
-            v.indoorLevelPickerEnabled?.let { isIndoorLevelPickerEnabled = it }
-            v.mapToolbarEnabled?.let { isMapToolbarEnabled = it }
-            v.myLocationButtonEnabled?.let {
-              googleMap?.setLocationSource(locationHandler)
-              isMyLocationButtonEnabled = it
-            }
-            v.rotateEnabled?.let { isRotateGesturesEnabled = it }
-            v.scrollEnabled?.let { isScrollGesturesEnabled = it }
-            v.scrollDuringRotateOrZoomEnabled?.let {
-              isScrollGesturesEnabledDuringRotateOrZoom = it
-            }
-            v.tiltEnabled?.let { isTiltGesturesEnabled = it }
-            v.zoomControlsEnabled?.let { isZoomControlsEnabled = it }
-            v.zoomGesturesEnabled?.let { isZoomGesturesEnabled = it }
-          }
+        googleMap?.uiSettings?.apply {
+          setAllGesturesEnabled(value?.allGesturesEnabled ?: true)
+          isCompassEnabled = value?.compassEnabled ?: false
+          isIndoorLevelPickerEnabled = value?.indoorLevelPickerEnabled ?: false
+          isMapToolbarEnabled = value?.mapToolbarEnabled ?: false
+
+          val myLocationEnabled = value?.myLocationButtonEnabled ?: false
+          googleMap?.setLocationSource(if (myLocationEnabled) locationHandler else null)
+          isMyLocationButtonEnabled = myLocationEnabled
+
+          isRotateGesturesEnabled = value?.rotateEnabled ?: true
+          isScrollGesturesEnabled = value?.scrollEnabled ?: true
+          isScrollGesturesEnabledDuringRotateOrZoom =
+            value?.scrollDuringRotateOrZoomEnabled ?: true
+          isTiltGesturesEnabled = value?.tiltEnabled ?: true
+          isZoomControlsEnabled = value?.zoomControlsEnabled ?: false
+          isZoomGesturesEnabled = value?.zoomGesturesEnabled ?: false
         }
-          ?: run {
-            googleMap?.uiSettings?.apply {
-              setAllGesturesEnabled(true)
-              isCompassEnabled = false
-              isIndoorLevelPickerEnabled = false
-              isMapToolbarEnabled = false
-              isMyLocationButtonEnabled = false
-              googleMap?.setLocationSource(null)
-              isRotateGesturesEnabled = true
-              isScrollGesturesEnabled = true
-              isScrollGesturesEnabledDuringRotateOrZoom = true
-              isTiltGesturesEnabled = true
-              isZoomControlsEnabled = false
-              isZoomGesturesEnabled = false
-            }
-          }
       }
     }
 
   @SuppressLint("MissingPermission")
   var myLocationEnabled: Boolean? = null
     set(value) {
+      field = value
       onUi {
         try {
-          value?.let {
-            googleMap?.isMyLocationEnabled = it
-          }
-            ?: run {
-              googleMap?.isMyLocationEnabled = false
-            }
+          googleMap?.isMyLocationEnabled = value ?: false
         } catch (se: SecurityException) {
           onLocationError?.invoke(RNLocationErrorCode.PERMISSION_DENIED)
         } catch (ex: Exception) {
@@ -403,12 +379,7 @@ class GoogleMapsViewImpl(
     set(value) {
       field = value
       onUi {
-        value?.let {
-          googleMap?.isBuildingsEnabled = it
-        }
-          ?: run {
-            googleMap?.isBuildingsEnabled = false
-          }
+        googleMap?.isBuildingsEnabled = value ?: false
       }
     }
 
@@ -416,11 +387,7 @@ class GoogleMapsViewImpl(
     set(value) {
       field = value
       onUi {
-        value?.let {
-          googleMap?.isTrafficEnabled = it
-        } ?: run {
-          googleMap?.isTrafficEnabled = false
-        }
+        googleMap?.isTrafficEnabled = value ?: false
       }
     }
 
@@ -428,12 +395,7 @@ class GoogleMapsViewImpl(
     set(value) {
       field = value
       onUi {
-        value?.let {
-          googleMap?.isIndoorEnabled = it
-        }
-          ?: run {
-            googleMap?.isIndoorEnabled = false
-          }
+        googleMap?.isIndoorEnabled = value ?: false
       }
     }
 
@@ -449,52 +411,29 @@ class GoogleMapsViewImpl(
     set(value) {
       field = value
       onUi {
-        value?.let {
-          googleMap?.mapColorScheme = it
-        } ?: run {
-          googleMap?.mapColorScheme = MapColorScheme.FOLLOW_SYSTEM
-        }
+        googleMap?.mapColorScheme = value ?: MapColorScheme.FOLLOW_SYSTEM
       }
     }
 
-  var minZoomLevel: Double? = null
+  var mapZoomConfig: RNMapZoomConfig? = null
     set(value) {
       field = value
       onUi {
-        value?.let {
-          googleMap?.setMinZoomPreference(it.toFloat())
-        } ?: run {
-          googleMap?.setMinZoomPreference(2.0f)
-        }
-      }
-    }
-
-  var maxZoomLevel: Double? = null
-    set(value) {
-      field = value
-      onUi {
-        value?.let {
-          googleMap?.setMaxZoomPreference(it.toFloat())
-        } ?: run {
-          googleMap?.setMaxZoomPreference(21.0f)
-        }
+        googleMap?.setMinZoomPreference(value?.min?.toFloat() ?: 2.0f)
+        googleMap?.setMaxZoomPreference(value?.max?.toFloat() ?: 21.0f)
       }
     }
 
   var mapPadding: RNMapPadding? = null
     set(value) {
       field = value
-      value?.let {
-        onUi {
-          googleMap?.setPadding(
-            it.left.dpToPx().toInt(),
-            it.top.dpToPx().toInt(),
-            it.right.dpToPx().toInt(),
-            it.bottom.dpToPx().toInt(),
-          )
-        }
-      } ?: run {
-        googleMap?.setPadding(0, 0, 0, 0)
+      onUi {
+        googleMap?.setPadding(
+          value?.left?.dpToPx()?.toInt() ?: 0,
+          value?.top?.dpToPx()?.toInt() ?: 0,
+          value?.right?.dpToPx()?.toInt() ?: 0,
+          value?.bottom?.dpToPx()?.toInt() ?: 0,
+        )
       }
     }
 
@@ -502,11 +441,7 @@ class GoogleMapsViewImpl(
     set(value) {
       field = value
       onUi {
-        value?.let {
-          googleMap?.mapType = it
-        } ?: run {
-          googleMap?.mapType = 1
-        }
+        googleMap?.mapType = value ?: 1
       }
     }
 

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

@@ -38,19 +38,19 @@ class LocationHandler(
 
   var priority: Int? = PRIORITY_DEFAULT
     set(value) {
-      field = value
+      field = value ?: PRIORITY_DEFAULT
       start()
     }
 
   var interval: Long? = INTERVAL_DEFAULT
     set(value) {
-      field = value
+      field = value ?: INTERVAL_DEFAULT
       buildLocationRequest()
     }
 
   var minUpdateInterval: Long? = MIN_UPDATE_INTERVAL
     set(value) {
-      field = value
+      field = value ?: MIN_UPDATE_INTERVAL
       buildLocationRequest()
     }
 

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

@@ -1,19 +1,33 @@
 package com.rngooglemapsplus
 
+import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.google.android.gms.maps.model.Circle
 import com.google.android.gms.maps.model.CircleOptions
 import com.google.android.gms.maps.model.LatLng
 import com.rngooglemapsplus.extensions.toColor
 
 class MapCircleBuilder {
-  fun buildCircleOptions(circle: RNCircle): CircleOptions =
+  fun build(circle: RNCircle): CircleOptions =
     CircleOptions().apply {
       center(LatLng(circle.center.latitude, circle.center.longitude))
-      circle.radius?.let { radius(it) }
+      radius(circle.radius)
       circle.strokeWidth?.let { strokeWidth(it.dpToPx()) }
       circle.strokeColor?.let { strokeColor(it.toColor()) }
       circle.fillColor?.let { fillColor(it.toColor()) }
       circle.pressable?.let { clickable(it) }
       circle.zIndex?.let { zIndex(it.toFloat()) }
     }
+
+  fun update(
+    circle: Circle,
+    next: RNCircle,
+  ) {
+    circle.center = LatLng(next.center.latitude, next.center.longitude)
+    circle.radius = next.radius
+    circle.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
+    circle.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
+    circle.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
+    circle.zIndex = next.zIndex?.toFloat() ?: 0f
+  }
 }

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

@@ -9,7 +9,9 @@ import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
+import com.rngooglemapsplus.extensions.markerStyleEquals
 import com.rngooglemapsplus.extensions.styleHash
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -44,6 +46,29 @@ class MapMarkerBuilder(
       m.zIndex?.let { zIndex(it.toFloat()) }
     }
 
+  fun update(
+    marker: Marker,
+    prev: RNMarker,
+    next: RNMarker,
+  ) {
+    marker.position =
+      LatLng(
+        next.coordinate.latitude,
+        next.coordinate.longitude,
+      )
+    marker.zIndex = next.zIndex?.toFloat() ?: 0f
+
+    if (!prev.markerStyleEquals(next)) {
+      buildIconAsync(marker.id, next) { icon ->
+        marker.setIcon(icon)
+      }
+    }
+    marker.setAnchor(
+      (next.anchor?.x ?: 0.5).toFloat(),
+      (next.anchor?.y ?: 0.5).toFloat(),
+    )
+  }
+
   fun buildIconAsync(
     id: String,
     m: RNMarker,

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

@@ -1,11 +1,14 @@
 package com.rngooglemapsplus
 
+import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.PolygonOptions
 import com.rngooglemapsplus.extensions.toColor
 
 class MapPolygonBuilder {
-  fun buildPolygonOptions(poly: RNPolygon): PolygonOptions =
+  fun build(poly: RNPolygon): PolygonOptions =
     PolygonOptions().apply {
       poly.coordinates.forEach { pt ->
         add(
@@ -19,4 +22,18 @@ class MapPolygonBuilder {
       poly.pressable?.let { clickable(it) }
       poly.zIndex?.let { zIndex(it.toFloat()) }
     }
+
+  fun update(
+    gmsPoly: Polygon,
+    next: RNPolygon,
+  ) {
+    gmsPoly.points =
+      next.coordinates.map {
+        LatLng(it.latitude, it.longitude)
+      }
+    gmsPoly.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
+    gmsPoly.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
+    gmsPoly.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
+    gmsPoly.zIndex = next.zIndex?.toFloat() ?: 0f
+  }
 }

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

@@ -1,40 +1,57 @@
 package com.rngooglemapsplus
 
+import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.ButtCap
 import com.google.android.gms.maps.model.Cap
 import com.google.android.gms.maps.model.JointType
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
 import com.google.android.gms.maps.model.RoundCap
 import com.google.android.gms.maps.model.SquareCap
 import com.rngooglemapsplus.extensions.toColor
 
 class MapPolylineBuilder {
-  fun buildPolylineOptions(pl: RNPolyline): PolylineOptions =
+  fun build(pl: RNPolyline): PolylineOptions =
     PolylineOptions().apply {
       pl.coordinates.forEach { pt ->
-        add(
-          com.google.android.gms.maps.model
-            .LatLng(pt.latitude, pt.longitude),
-        )
+        add(LatLng(pt.latitude, pt.longitude))
       }
       pl.width?.let { width(it.dpToPx()) }
-      pl.lineCap?.let { startCap(mapLineCap(it)) }
-      pl.lineCap?.let { endCap(mapLineCap(it)) }
+      pl.lineCap?.let {
+        startCap(mapLineCap(it))
+        endCap(mapLineCap(it))
+      }
       pl.lineJoin?.let { jointType(mapLineJoin(it)) }
       pl.color?.let { color(it.toColor()) }
       pl.pressable?.let { clickable(it) }
       pl.zIndex?.let { zIndex(it.toFloat()) }
     }
 
-  fun mapLineCap(type: RNLineCapType?): Cap =
+  fun update(
+    polyline: Polyline,
+    next: RNPolyline,
+  ) {
+    polyline.points = next.coordinates.map { LatLng(it.latitude, it.longitude) }
+
+    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.zIndex = next.zIndex?.toFloat() ?: 0f
+  }
+
+  private fun mapLineCap(type: RNLineCapType?): Cap =
     when (type) {
       RNLineCapType.ROUND -> RoundCap()
       RNLineCapType.SQUARE -> SquareCap()
       else -> ButtCap()
     }
 
-  fun mapLineJoin(type: RNLineJoinType?): Int =
+  private fun mapLineJoin(type: RNLineJoinType?): Int =
     when (type) {
       RNLineJoinType.ROUND -> JointType.ROUND
       RNLineJoinType.BEVEL -> JointType.BEVEL

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

@@ -2,18 +2,14 @@ package com.rngooglemapsplus
 
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
-import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.circleEquals
 import com.rngooglemapsplus.extensions.markerEquals
-import com.rngooglemapsplus.extensions.markerStyleEquals
 import com.rngooglemapsplus.extensions.polygonEquals
 import com.rngooglemapsplus.extensions.polylineEquals
 import com.rngooglemapsplus.extensions.toCameraPosition
-import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toMapColorScheme
 
 @DoNotStrip
@@ -35,6 +31,8 @@ class RNGoogleMapsPlusView(
 
   override var initialProps: RNInitialProps? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.initMapView(
         value?.mapId,
         value?.liteMode,
@@ -44,31 +42,43 @@ class RNGoogleMapsPlusView(
 
   override var uiSettings: RNMapUiSettings? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.uiSettings = value
     }
 
   override var myLocationEnabled: Boolean? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.myLocationEnabled = value
     }
 
   override var buildingEnabled: Boolean? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.buildingEnabled = value
     }
 
   override var trafficEnabled: Boolean? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.trafficEnabled = value
     }
 
   override var indoorEnabled: Boolean? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.indoorEnabled = value
     }
 
   override var customMapStyle: String? = null
     set(value) {
+      if (field == value) return
+      field = value
       currentCustomMapStyle = value
       value?.let {
         view.customMapStyle = MapStyleOptions(it)
@@ -77,26 +87,29 @@ class RNGoogleMapsPlusView(
 
   override var userInterfaceStyle: RNUserInterfaceStyle? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.userInterfaceStyle = value.toMapColorScheme()
     }
 
-  override var minZoomLevel: Double? = null
-    set(value) {
-      view.minZoomLevel = value
-    }
-
-  override var maxZoomLevel: Double? = null
+  override var mapZoomConfig: RNMapZoomConfig? = null
     set(value) {
-      view.maxZoomLevel = value
+      if (field == value) return
+      field = value
+      view.mapZoomConfig = value
     }
 
   override var mapPadding: RNMapPadding? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.mapPadding = value
     }
 
   override var mapType: RNMapType? = null
     set(value) {
+      if (field == value) return
+      field = value
       value?.let {
         view.mapType = it.value
       }
@@ -104,8 +117,10 @@ class RNGoogleMapsPlusView(
 
   override var markers: Array<RNMarker>? = null
     set(value) {
+      if (field.contentEquals(value)) return
       val prevById = field?.associateBy { it.id } ?: emptyMap()
       val nextById = value?.associateBy { it.id } ?: emptyMap()
+      field = value
 
       (prevById.keys - nextById.keys).forEach { id ->
         markerBuilder.cancelIconJob(id)
@@ -122,38 +137,21 @@ class RNGoogleMapsPlusView(
             )
           }
         } else if (!prev.markerEquals(next)) {
-          view.updateMarker(id) { m ->
+          view.updateMarker(id) { marker ->
             onUi {
-              m.position =
-                LatLng(
-                  next.coordinate.latitude,
-                  next.coordinate.longitude,
-                )
-              next.zIndex?.let { m.zIndex = it.toFloat() } ?: run {
-                m.zIndex = 0f
-              }
-
-              if (!prev.markerStyleEquals(next)) {
-                markerBuilder.buildIconAsync(id, next) { icon ->
-                  m.setIcon(icon)
-                }
-              }
-              m.setAnchor(
-                (next.anchor?.x ?: 0.5).toFloat(),
-                (next.anchor?.y ?: 0.5).toFloat(),
-              )
+              markerBuilder.update(marker, next, prev)
             }
           }
         }
       }
-      field = value
     }
 
   override var polylines: Array<RNPolyline>? = null
     set(value) {
+      if (field.contentEquals(value)) return
       val prevById = field?.associateBy { it.id } ?: emptyMap()
       val nextById = value?.associateBy { it.id } ?: emptyMap()
-
+      field = value
       (prevById.keys - nextById.keys).forEach { id ->
         view.removePolyline(id)
       }
@@ -161,35 +159,23 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolyline(id, polylineBuilder.buildPolylineOptions(next))
+          view.addPolyline(id, polylineBuilder.build(next))
         } else if (!prev.polylineEquals(next)) {
-          view.updatePolyline(id) { gms ->
+          view.updatePolyline(id) { polyline ->
             onUi {
-              gms.points =
-                next.coordinates.map {
-
-                  LatLng(it.latitude, it.longitude)
-                }
-              next.width?.let { gms.width = it.dpToPx() }
-              next.lineCap?.let {
-                val cap = polylineBuilder.mapLineCap(it)
-                gms.startCap = cap
-                gms.endCap = cap
-              }
-              next.lineJoin?.let { gms.jointType = polylineBuilder.mapLineJoin(it) }
-              next.color?.let { gms.color = it.toColor() }
-              next.zIndex?.let { gms.zIndex = it.toFloat() }
+              polylineBuilder.update(polyline, next)
             }
           }
         }
       }
-      field = value
     }
 
   override var polygons: Array<RNPolygon>? = null
     set(value) {
+      if (field.contentEquals(value)) return
       val prevById = field?.associateBy { it.id } ?: emptyMap()
       val nextById = value?.associateBy { it.id } ?: emptyMap()
+      field = value
 
       (prevById.keys - nextById.keys).forEach { id ->
         view.removePolygon(id)
@@ -198,30 +184,21 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolygon(id, polygonBuilder.buildPolygonOptions(next))
+          view.addPolygon(id, polygonBuilder.build(next))
         } else if (!prev.polygonEquals(next)) {
-          view.updatePolygon(id) { gmsPoly ->
-            onUi {
-              gmsPoly.points =
-                next.coordinates.map {
-                  com.google.android.gms.maps.model
-                    .LatLng(it.latitude, it.longitude)
-                }
-              next.fillColor?.let { gmsPoly.fillColor = it.toColor() }
-              next.strokeColor?.let { gmsPoly.strokeColor = it.toColor() }
-              next.strokeWidth?.let { gmsPoly.strokeWidth = it.dpToPx() }
-              next.zIndex?.let { gmsPoly.zIndex = it.toFloat() }
-            }
+          view.updatePolygon(id) { polygon ->
+            onUi { polygonBuilder.update(polygon, next) }
           }
         }
       }
-      field = value
     }
 
   override var circles: Array<RNCircle>? = null
     set(value) {
+      if (field.contentEquals(value)) return
       val prevById = field?.associateBy { it.id } ?: emptyMap()
       val nextById = value?.associateBy { it.id } ?: emptyMap()
+      field = value
 
       (prevById.keys - nextById.keys).forEach { id ->
         view.removeCircle(id)
@@ -230,25 +207,21 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addCircle(id, circleBuilder.buildCircleOptions(next))
+          view.addCircle(id, circleBuilder.build(next))
         } else if (!prev.circleEquals(next)) {
-          view.updateCircle(id) { gmsCircle ->
+          view.updateCircle(id) { circle ->
             onUi {
-              gmsCircle.center = LatLng(next.center.latitude, next.center.longitude)
-              next.radius?.let { gmsCircle.radius = it }
-              next.strokeWidth?.let { gmsCircle.strokeWidth = it.dpToPx() }
-              next.strokeColor?.let { gmsCircle.strokeColor = it.toColor() }
-              next.fillColor?.let { gmsCircle.fillColor = it.toColor() }
-              next.zIndex?.let { gmsCircle.zIndex = it.toFloat() } ?: run { gmsCircle.zIndex = 0f }
+              circleBuilder.update(circle, next)
             }
           }
         }
       }
-      field = value
     }
 
   override var locationConfig: RNLocationConfig? = null
     set(value) {
+      if (field == value) return
+      field = value
       view.locationConfig = value
     }
 
@@ -261,6 +234,7 @@ class RNGoogleMapsPlusView(
     set(cb) {
       view.onMapReady = cb
     }
+
   override var onLocationUpdate: ((RNLocation) -> Unit)? = null
     set(cb) {
       view.onLocationUpdate = cb