react-native-google-maps-plus 1.7.0 → 1.8.0-dev.2

package/android/build.gradle

@@ -136,6 +136,6 @@ dependencies {
   implementation "com.google.android.gms:play-services-base:${getExtOrDefault('googlePlayServicesBaseVersion')}"
   implementation "com.google.android.gms:play-services-maps:${getExtOrDefault('googlePlayServicesMapsVersion')}"
   implementation "com.google.android.gms:play-services-location:${getExtOrDefault('googlePlayServicesLocationVersion')}"
-  implementation 'com.google.maps.android:android-maps-utils:3.10.0'
+  implementation "com.google.maps.android:android-maps-utils:${getExtOrDefault('mapsUtilsVersion')}"
   implementation 'com.caverock:androidsvg-aar:1.4'
 }

package/android/gradle.properties

@@ -3,6 +3,7 @@ RNGoogleMapsPlus_minSdkVersion=26
 RNGoogleMapsPlus_targetSdkVersion=36
 RNGoogleMapsPlus_compileSdkVersion=36
 RNGoogleMapsPlus_ndkVersion=27.1.12297006
-RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.8.0
+RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.9.0
 RNGoogleMapsPlus_googlePlayServicesMapsVersion=19.2.0
 RNGoogleMapsPlus_googlePlayServicesLocationVersion=21.3.0
+RNGoogleMapsPlus_mapsUtilsVersion=3.19.0

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

@@ -4,6 +4,7 @@ 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.rngooglemapsplus.extensions.centerEquals
 import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
@@ -25,9 +26,7 @@ class MapCircleBuilder {
     next: RNCircle,
     circle: Circle,
   ) = onUi {
-    if (prev.center.latitude != next.center.latitude ||
-      prev.center.longitude != next.center.longitude
-    ) {
+    if (!prev.centerEquals(next)) {
       circle.center = next.center.toLatLng()
     }
 

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

@@ -19,6 +19,10 @@ import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
+import com.rngooglemapsplus.extensions.anchorEquals
+import com.rngooglemapsplus.extensions.coordinatesEquals
+import com.rngooglemapsplus.extensions.infoWindowAnchorEquals
+import com.rngooglemapsplus.extensions.markerInfoWindowStyleEquals
 import com.rngooglemapsplus.extensions.markerStyleEquals
 import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.styleHash
@@ -73,7 +77,10 @@ class MapMarkerBuilder(
                 val height = (svg.documentHeight.takeIf { it > 0 } ?: 128f).toInt()
 
                 createBitmap(width, height).apply {
-                  Canvas(this).also(svg::renderToCanvas)
+                  density = context.resources.displayMetrics.densityDpi
+                  Canvas(this).also {
+                    svg.renderToCanvas(it)
+                  }
                 }
               }
 
@@ -94,10 +101,12 @@ class MapMarkerBuilder(
                     val innerSvg = SVG.getFromString(svgText)
                     val w = innerSvg.documentWidth.takeIf { it > 0 } ?: 128f
                     val h = innerSvg.documentHeight.takeIf { it > 0 } ?: 128f
-                    val bmp = createBitmap(w.toInt(), h.toInt())
-                    val canvas = Canvas(bmp)
-                    innerSvg.renderToCanvas(canvas)
-                    bmp
+                    createBitmap(w.toInt(), h.toInt()).apply {
+                      density = context.resources.displayMetrics.densityDpi
+                      Canvas(this).also {
+                        innerSvg.renderToCanvas(it)
+                      }
+                    }
                   } else {
                     conn.inputStream.use { BitmapFactory.decodeStream(it) }
                   }
@@ -169,51 +178,39 @@ class MapMarkerBuilder(
     next: RNMarker,
     marker: Marker,
   ) = onUi {
-    if (prev.coordinate.latitude != next.coordinate.latitude ||
-      prev.coordinate.longitude != next.coordinate.longitude
-    ) {
+    if (!prev.coordinatesEquals(next)) {
       marker.position = next.coordinate.toLatLng()
     }
 
     if (!prev.markerStyleEquals(next)) {
-      buildIconAsync(marker.id, next) { icon ->
+      buildIconAsync(next) { icon ->
         marker.setIcon(icon)
-        if (prev.infoWindowAnchor?.x != next.infoWindowAnchor?.x ||
-          prev.infoWindowAnchor?.y != next.infoWindowAnchor?.y
-        ) {
-          marker.setInfoWindowAnchor(
-            (next.infoWindowAnchor?.x ?: 0.5f).toFloat(),
-            (next.infoWindowAnchor?.y ?: 0f).toFloat(),
-          )
-        }
-
-        if (prev.anchor?.x != next.anchor?.x ||
-          prev.anchor?.y != next.anchor?.y
-        ) {
+        if (!prev.anchorEquals(next)) {
           marker.setAnchor(
             (next.anchor?.x ?: 0.5f).toFloat(),
             (next.anchor?.y ?: 1.0f).toFloat(),
           )
         }
+        if (!prev.infoWindowAnchorEquals(next)) {
+          marker.setInfoWindowAnchor(
+            (next.infoWindowAnchor?.x ?: 0.5f).toFloat(),
+            (next.infoWindowAnchor?.y ?: 0f).toFloat(),
+          )
+        }
       }
     } else {
-      if (prev.infoWindowAnchor?.x != next.infoWindowAnchor?.x ||
-        prev.infoWindowAnchor?.y != next.infoWindowAnchor?.y
-      ) {
-        marker.setInfoWindowAnchor(
-          (next.infoWindowAnchor?.x ?: 0.5f).toFloat(),
-          (next.infoWindowAnchor?.y ?: 0f).toFloat(),
-        )
-      }
-
-      if (prev.anchor?.x != next.anchor?.x ||
-        prev.anchor?.y != next.anchor?.y
-      ) {
+      if (!prev.anchorEquals(next)) {
         marker.setAnchor(
           (next.anchor?.x ?: 0.5f).toFloat(),
           (next.anchor?.y ?: 1.0f).toFloat(),
         )
       }
+      if (!prev.infoWindowAnchorEquals(next)) {
+        marker.setInfoWindowAnchor(
+          (next.infoWindowAnchor?.x ?: 0.5f).toFloat(),
+          (next.infoWindowAnchor?.y ?: 0f).toFloat(),
+        )
+      }
     }
 
     if (prev.title != next.title) {
@@ -244,17 +241,16 @@ class MapMarkerBuilder(
       marker.zIndex = next.zIndex?.toFloat() ?: 0f
     }
 
-    if (prev.infoWindowIconSvg != next.infoWindowIconSvg) {
+    if (!prev.markerInfoWindowStyleEquals(next)) {
       marker.tag = MarkerTag(id = next.id, iconSvg = next.infoWindowIconSvg)
     }
   }
 
   fun buildIconAsync(
-    id: String,
     m: RNMarker,
     onReady: (BitmapDescriptor?) -> Unit,
   ) {
-    jobsById[id]?.cancel()
+    jobsById[m.id]?.cancel()
 
     m.iconSvg ?: return onReady(null)
 
@@ -283,11 +279,11 @@ class MapMarkerBuilder(
           iconCache.evictAll()
         } catch (_: Throwable) {
         } finally {
-          jobsById.remove(id)
+          jobsById.remove(m.id)
         }
       }
 
-    jobsById[id] = job
+    jobsById[m.id] = job
   }
 
   fun cancelIconJob(id: String) {
@@ -337,27 +333,28 @@ class MapMarkerBuilder(
       coroutineContext.ensureActive()
       val svg = SVG.getFromString(m.iconSvg.svgString)
 
-      coroutineContext.ensureActive()
-      svg.setDocumentWidth(m.iconSvg.width.dpToPx())
-      svg.setDocumentHeight(m.iconSvg.height.dpToPx())
+      val wPx =
+        m.iconSvg.width
+          .dpToPx()
+          .toInt()
+      val hPx =
+        m.iconSvg.height
+          .dpToPx()
+          .toInt()
 
       coroutineContext.ensureActive()
-      bmp =
-        createBitmap(
-          m.iconSvg.width
-            .dpToPx()
-            .toInt(),
-          m.iconSvg.height
-            .dpToPx()
-            .toInt(),
-          Bitmap.Config.ARGB_8888,
-        )
+      svg.setDocumentWidth(wPx.toFloat())
+      svg.setDocumentHeight(hPx.toFloat())
 
       coroutineContext.ensureActive()
-      val canvas = Canvas(bmp)
-      svg.renderToCanvas(canvas)
+      bmp =
+        createBitmap(wPx, hPx, Bitmap.Config.ARGB_8888).apply {
+          density = context.resources.displayMetrics.densityDpi
+          Canvas(this).also {
+            svg.renderToCanvas(it)
+          }
+        }
 
-      coroutineContext.ensureActive()
       return bmp
     } catch (t: Throwable) {
       try {

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

@@ -4,9 +4,12 @@ import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.PolygonOptions
+import com.rngooglemapsplus.extensions.coordinatesEquals
+import com.rngooglemapsplus.extensions.holesEquals
 import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
+import com.rngooglemapsplus.extensions.toMapsPolygonHoles
 
 class MapPolygonBuilder {
   fun build(poly: RNPolygon): PolygonOptions =
@@ -32,32 +35,12 @@ class MapPolygonBuilder {
     next: RNPolygon,
     poly: Polygon,
   ) = onUi {
-    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) {
+    if (!prev.coordinatesEquals(next)) {
       poly.points = next.coordinates.map { it.toLatLng() }
     }
 
-    val prevHoles = prev.holes?.toList() ?: emptyList()
-    val nextHoles = next.holes?.toList() ?: emptyList()
-    val holesChanged =
-      prevHoles.size != nextHoles.size ||
-        !prevHoles.zip(nextHoles).all { (ha, hb) ->
-          ha.coordinates.size == hb.coordinates.size &&
-            ha.coordinates.zip(hb.coordinates).all { (a, b) ->
-              a.latitude == b.latitude && a.longitude == b.longitude
-            }
-        }
-
-    if (holesChanged) {
-      poly.holes =
-        nextHoles.map { hole ->
-          hole.coordinates.map { it.toLatLng() }
-        }
+    if (!prev.holesEquals(next)) {
+      poly.holes = next.holes?.toMapsPolygonHoles() ?: emptyList()
     }
 
     if (prev.fillColor != next.fillColor) {

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

@@ -2,16 +2,14 @@ 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.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.coordinatesEquals
 import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
+import com.rngooglemapsplus.extensions.toMapJointType
+import com.rngooglemapsplus.extensions.toMapLineCap
 
 class MapPolylineBuilder {
   fun build(pl: RNPolyline): PolylineOptions =
@@ -21,10 +19,10 @@ class MapPolylineBuilder {
       }
       pl.width?.let { width(it.dpToPx()) }
       pl.lineCap?.let {
-        startCap(mapLineCap(it))
-        endCap(mapLineCap(it))
+        startCap(it.toMapLineCap())
+        endCap(it.toMapLineCap())
       }
-      pl.lineJoin?.let { jointType(mapLineJoin(it)) }
+      pl.lineJoin?.let { jointType(it.toMapJointType()) }
       pl.color?.let { color(it.toColor()) }
       pl.geodesic?.let { geodesic(it) }
       pl.pressable?.let { clickable(it) }
@@ -36,13 +34,7 @@ class MapPolylineBuilder {
     next: RNPolyline,
     polyline: Polyline,
   ) = onUi {
-    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) {
+    if (!prev.coordinatesEquals(next)) {
       polyline.points = next.coordinates.map { it.toLatLng() }
     }
 
@@ -50,17 +42,13 @@ class MapPolylineBuilder {
       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
+    if (prev.lineCap != next.lineCap) {
+      polyline.startCap = next.lineCap.toMapLineCap()
+      polyline.endCap = next.lineCap.toMapLineCap()
     }
 
-    val newJoin = mapLineJoin(next.lineJoin ?: RNLineJoinType.MITER)
-    val prevJoin = mapLineJoin(prev.lineJoin ?: RNLineJoinType.MITER)
-    if (newJoin != prevJoin) {
-      polyline.jointType = newJoin
+    if (prev.lineJoin != next.lineJoin) {
+      polyline.jointType = next.lineJoin.toMapJointType()
     }
 
     if (prev.color != next.color) {
@@ -79,19 +67,4 @@ class MapPolylineBuilder {
       polyline.zIndex = next.zIndex?.toFloat() ?: 0f
     }
   }
-
-  private fun mapLineCap(type: RNLineCapType?): Cap =
-    when (type) {
-      RNLineCapType.ROUND -> RoundCap()
-      RNLineCapType.SQUARE -> SquareCap()
-      else -> ButtCap()
-    }
-
-  private fun mapLineJoin(type: RNLineJoinType?): Int =
-    when (type) {
-      RNLineJoinType.ROUND -> JointType.ROUND
-      RNLineJoinType.BEVEL -> JointType.BEVEL
-      RNLineJoinType.MITER -> JointType.DEFAULT
-      null -> JointType.DEFAULT
-    }
 }

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

@@ -12,6 +12,7 @@ import com.rngooglemapsplus.extensions.markerEquals
 import com.rngooglemapsplus.extensions.polygonEquals
 import com.rngooglemapsplus.extensions.polylineEquals
 import com.rngooglemapsplus.extensions.toCameraPosition
+import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toCompressFormat
 import com.rngooglemapsplus.extensions.toFileExtension
 import com.rngooglemapsplus.extensions.toGoogleMapType
@@ -48,6 +49,7 @@ class RNGoogleMapsPlusView(
           initialProps?.mapId?.let { mapId(it) }
           initialProps?.liteMode?.let { liteMode(it) }
           initialProps?.camera?.let { camera(it.toCameraPosition(current = null)) }
+          initialProps?.backgroundColor?.let { backgroundColor(it.toColor()) }
         }
       view.initMapView(options)
     }
@@ -149,7 +151,7 @@ class RNGoogleMapsPlusView(
         val prev = prevById[id]
         when {
           prev == null ->
-            markerBuilder.buildIconAsync(id, next) { icon ->
+            markerBuilder.buildIconAsync(next) { icon ->
               view.addMarker(
                 id,
                 markerBuilder.build(next, icon),
@@ -427,7 +429,7 @@ class RNGoogleMapsPlusView(
   }
 
   override fun setCamera(
-    camera: RNCamera,
+    camera: RNCameraUpdate,
     animated: Boolean?,
     durationMs: Double?,
   ) {

package/android/src/main/java/com/rngooglemapsplus/extensions/{RNCameraExtension.kt → RNCameraUpdateExtension.kt}

@@ -2,9 +2,9 @@ package com.rngooglemapsplus.extensions
 
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
-import com.rngooglemapsplus.RNCamera
+import com.rngooglemapsplus.RNCameraUpdate
 
-fun RNCamera.toCameraPosition(current: CameraPosition?) =
+fun RNCameraUpdate.toCameraPosition(current: CameraPosition?) =
   CameraPosition
     .builder()
     .target(center?.toLatLng() ?: current?.target ?: LatLng(0.0, 0.0))

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

@@ -0,0 +1,14 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.ButtCap
+import com.google.android.gms.maps.model.Cap
+import com.google.android.gms.maps.model.RoundCap
+import com.google.android.gms.maps.model.SquareCap
+import com.rngooglemapsplus.RNLineCapType
+
+fun RNLineCapType?.toMapLineCap(): Cap =
+  when (this) {
+    RNLineCapType.ROUND -> RoundCap()
+    RNLineCapType.SQUARE -> SquareCap()
+    else -> ButtCap()
+  }

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

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.JointType
+import com.rngooglemapsplus.RNLineJoinType
+
+fun RNLineJoinType?.toMapJointType(): Int =
+  when (this) {
+    RNLineJoinType.ROUND -> JointType.ROUND
+    RNLineJoinType.BEVEL -> JointType.BEVEL
+    RNLineJoinType.MITER -> JointType.DEFAULT
+    null -> JointType.DEFAULT
+  }

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

@@ -3,12 +3,18 @@ package com.rngooglemapsplus.extensions
 import com.rngooglemapsplus.RNCircle
 
 fun RNCircle.circleEquals(b: RNCircle): Boolean {
+  if (!centerEquals(b)) return false
   if (zIndex != b.zIndex) return false
   if (pressable != b.pressable) return false
-  if (center != b.center) return false
   if (radius != b.radius) return false
   if (strokeWidth != b.strokeWidth) return false
   if (strokeColor != b.strokeColor) return false
   if (fillColor != b.fillColor) return false
   return true
 }
+
+fun RNCircle.centerEquals(b: RNCircle): Boolean {
+  if (center.latitude != b.center.latitude) return false
+  if (center.longitude != b.center.longitude) return false
+  return true
+}

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

@@ -2,24 +2,61 @@ package com.rngooglemapsplus.extensions
 
 import com.rngooglemapsplus.RNMarker
 
-fun RNMarker.markerEquals(b: RNMarker): Boolean =
-  id == b.id &&
-    zIndex == b.zIndex &&
-    coordinate == b.coordinate &&
-    anchor == b.anchor &&
-    showInfoWindow == b.showInfoWindow &&
-    title == b.title &&
-    snippet == b.snippet &&
-    opacity == b.opacity &&
-    flat == b.flat &&
-    draggable == b.draggable &&
-    rotation == b.rotation &&
-    infoWindowAnchor == b.infoWindowAnchor &&
-    markerStyleEquals(b)
-
-fun RNMarker.markerStyleEquals(b: RNMarker): Boolean = iconSvg == b.iconSvg
+fun RNMarker.markerEquals(b: RNMarker): Boolean {
+  if (id != b.id) return false
+  if (zIndex != b.zIndex) return false
+  if (!coordinatesEquals(b)) return false
+  if (!anchorEquals(b)) return false
+  if (!infoWindowAnchorEquals(b)) return false
+  if (title != b.title) return false
+  if (snippet != b.snippet) return false
+  if (opacity != b.opacity) return false
+  if (flat != b.flat) return false
+  if (draggable != b.draggable) return false
+  if (rotation != b.rotation) return false
+  if (!markerInfoWindowStyleEquals(b)) return false
+  if (!markerStyleEquals(b)) return false
+
+  return true
+}
+
+fun RNMarker.coordinatesEquals(b: RNMarker): Boolean {
+  if (coordinate.latitude != b.coordinate.latitude) return false
+  if (coordinate.longitude != b.coordinate.longitude) return false
+  return true
+}
+
+fun RNMarker.anchorEquals(b: RNMarker): Boolean {
+  if (anchor?.x != b.anchor?.x) return false
+  if (anchor?.y != b.anchor?.y) return false
+  return true
+}
+
+fun RNMarker.infoWindowAnchorEquals(b: RNMarker): Boolean {
+  if (infoWindowAnchor?.x != b.infoWindowAnchor?.x) return false
+  if (infoWindowAnchor?.y != b.infoWindowAnchor?.y) return false
+  return true
+}
+
+fun RNMarker.markerInfoWindowStyleEquals(b: RNMarker): Boolean {
+  if (infoWindowIconSvg?.width != b.infoWindowIconSvg?.width) return false
+  if (infoWindowIconSvg?.height != b.infoWindowIconSvg?.height) return false
+  if (infoWindowIconSvg?.svgString != b.infoWindowIconSvg?.svgString) return false
+
+  return true
+}
+
+fun RNMarker.markerStyleEquals(b: RNMarker): Boolean {
+  if (iconSvg?.width != b.iconSvg?.width) return false
+  if (iconSvg?.height != b.iconSvg?.height) return false
+  if (iconSvg?.svgString != b.iconSvg?.svgString) return false
+
+  return true
+}
 
 fun RNMarker.styleHash(): Int =
   arrayOf<Any?>(
-    iconSvg,
+    iconSvg?.width,
+    iconSvg?.height,
+    iconSvg?.svgString,
   ).contentHashCode()

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

@@ -1,6 +1,8 @@
 package com.rngooglemapsplus.extensions
 
+import com.google.android.gms.maps.model.LatLng
 import com.rngooglemapsplus.RNPolygon
+import com.rngooglemapsplus.RNPolygonHole
 
 fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   if (zIndex != b.zIndex) return false
@@ -9,7 +11,12 @@ fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   if (fillColor != b.fillColor) return false
   if (strokeColor != b.strokeColor) return false
   if (geodesic != b.geodesic) return false
-  if (!holes.contentEquals(b.holes)) return false
+  if (!coordinatesEquals(b)) return false
+  if (!holesEquals(b)) return false
+  return true
+}
+
+fun RNPolygon.coordinatesEquals(b: RNPolygon): Boolean {
   val ac = coordinates
   val bc = b.coordinates
   if (ac.size != bc.size) return false
@@ -20,3 +27,26 @@ fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   }
   return true
 }
+
+fun RNPolygon.holesEquals(b: RNPolygon): Boolean {
+  if (holes?.size != b.holes?.size) return false
+  if (holes != null && b.holes != null) {
+    for (i in holes.indices) {
+      val ah = holes[i]
+      val bh = b.holes[i]
+
+      if (ah.coordinates.size != bh.coordinates.size) return false
+      for (j in ah.coordinates.indices) {
+        val p = ah.coordinates[j]
+        val q = bh.coordinates[j]
+        if (p.latitude != q.latitude || p.longitude != q.longitude) return false
+      }
+    }
+  }
+  return true
+}
+
+fun Array<RNPolygonHole>.toMapsPolygonHoles(): List<List<LatLng>> =
+  this.map { hole ->
+    hole.coordinates.map { it.toLatLng() }
+  }

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

@@ -5,11 +5,16 @@ import com.rngooglemapsplus.RNPolyline
 fun RNPolyline.polylineEquals(b: RNPolyline): Boolean {
   if (zIndex != b.zIndex) return false
   if (pressable != b.pressable) return false
-  if ((width ?: 0.0) != (b.width ?: 0.0)) return false
+  if (width != b.width) return false
   if (lineCap != b.lineCap) return false
   if (lineJoin != b.lineJoin) return false
   if (geodesic != b.geodesic) return false
   if (color != b.color) return false
+  if (!coordinatesEquals(b)) return false
+  return true
+}
+
+fun RNPolyline.coordinatesEquals(b: RNPolyline): Boolean {
   val ac = coordinates
   val bc = b.coordinates
   if (ac.size != bc.size) return false

package/ios/GoogleMapViewImpl.swift

@@ -444,7 +444,10 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   func removeMarker(id: String) {
-    markersById.removeValue(forKey: id).map { $0.map = nil }
+    markersById.removeValue(forKey: id).map {
+      $0.icon = nil
+      $0.map = nil
+    }
   }
 
   @MainActor

package/ios/LocationHandler.swift

@@ -35,6 +35,8 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
 
   func showLocationDialog() {
     onMainAsync { [weak self] in
+      guard let self = self else { return }
+
       guard let vc = Self.topMostViewController() else { return }
       let title =
         Bundle.main.object(forInfoDictionaryKey: "LocationNotAvailableTitle")
@@ -61,7 +63,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
           title: openLocationSettingsButton ?? "Open settings",
           style: .default
         ) { _ in
-          self?.openLocationSettings()
+          self.openLocationSettings()
         }
       )
       vc.present(alert, animated: true, completion: nil)

package/ios/MapCircleBuilder.swift

@@ -17,13 +17,12 @@ final class MapCircleBuilder {
 
   @MainActor
   func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
-    if prev.center.latitude != next.center.latitude
-      || prev.center.longitude != next.center.longitude {
+    if !prev.centerEquals(next) {
       c.position = next.center.toCLLocationCoordinate2D()
     }
 
     if prev.radius != next.radius {
-      c.radius = next.radius ?? 0
+      c.radius = next.radius
     }
 
     if prev.fillColor != next.fillColor {

package/ios/MapHelper.swift

@@ -32,11 +32,9 @@ func onMain(_ block: @escaping @MainActor () -> Void) {
 
 @inline(__always)
 func onMainAsync(
-  _ block: @MainActor @escaping () async -> Void
+  _ block: @escaping @MainActor () async -> Void
 ) {
-  if Thread.isMainThread {
-    Task { @MainActor in await block() }
-  } else {
-    Task { @MainActor in await block() }
+  Task { @MainActor in
+    await block()
   }
 }