react-native-google-maps-plus 1.3.0 → 1.4.1

package/android/build.gradle

@@ -28,7 +28,7 @@ apply from: "./fix-prefab.gradle"
 if (rootProject.name != "rngooglemapsplus.example") {
     apply plugin: "com.facebook.react"
 } else {
-    println("\u001B[33m⚠️  Skipping React Native Gradle plugin in library (example build detected)\u001B[0m")
+    println("\u001B[33mSkipping React Native Gradle plugin in library (example build detected)\u001B[0m")
 }
 
 def getExtOrIntegerDefault(name) {

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

@@ -35,9 +35,11 @@ import com.google.android.gms.maps.model.TileOverlayOptions
 import com.google.maps.android.data.kml.KmlLayer
 import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.toGooglePriority
+import com.rngooglemapsplus.extensions.toLatLng
 import com.rngooglemapsplus.extensions.toLocationErrorCode
 import com.rngooglemapsplus.extensions.toRNIndoorBuilding
 import com.rngooglemapsplus.extensions.toRNIndoorLevel
+import com.rngooglemapsplus.extensions.toRnLatLng
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -88,11 +90,7 @@ class GoogleMapsViewImpl(
     reactContext.addLifecycleEventListener(this)
   }
 
-  fun initMapView(
-    mapId: String?,
-    liteMode: Boolean?,
-    cameraPosition: CameraPosition?,
-  ) {
+  fun initMapView(googleMapsOptions: GoogleMapOptions) {
     if (initialized) return
     initialized = true
     val result = playServiceHandler.playServicesAvailability()
@@ -126,13 +124,7 @@ class GoogleMapsViewImpl(
     mapView =
       MapView(
         reactContext,
-        GoogleMapOptions().apply {
-          mapId?.let { mapId(it) }
-          liteMode?.let { liteMode(it) }
-          cameraPosition?.let {
-            camera(it)
-          }
-        },
+        googleMapsOptions,
       )
 
     super.addView(mapView)
@@ -173,12 +165,12 @@ class GoogleMapsViewImpl(
 
     onCameraChangeStart?.invoke(
       RNRegion(
-        center = RNLatLng(bounds.center.latitude, bounds.center.longitude),
+        center = bounds.center.toRnLatLng(),
         latitudeDelta = latDelta,
         longitudeDelta = lngDelta,
       ),
       RNCamera(
-        center = RNLatLng(cameraPosition.target.latitude, cameraPosition.target.longitude),
+        center = cameraPosition.target.toRnLatLng(),
         zoom = cameraPosition.zoom.toDouble(),
         bearing = cameraPosition.bearing.toDouble(),
         tilt = cameraPosition.tilt.toDouble(),
@@ -205,12 +197,12 @@ class GoogleMapsViewImpl(
 
     onCameraChange?.invoke(
       RNRegion(
-        center = RNLatLng(bounds.center.latitude, bounds.center.longitude),
+        center = bounds.center.toRnLatLng(),
         latitudeDelta = latDelta,
         longitudeDelta = lngDelta,
       ),
       RNCamera(
-        center = RNLatLng(cameraPosition.target.latitude, cameraPosition.target.longitude),
+        center = cameraPosition.target.toRnLatLng(),
         zoom = cameraPosition.zoom.toDouble(),
         bearing = cameraPosition.bearing.toDouble(),
         tilt = cameraPosition.tilt.toDouble(),
@@ -233,12 +225,12 @@ class GoogleMapsViewImpl(
 
     onCameraChangeComplete?.invoke(
       RNRegion(
-        center = RNLatLng(bounds.center.latitude, bounds.center.longitude),
+        center = bounds.center.toRnLatLng(),
         latitudeDelta = latDelta,
         longitudeDelta = lngDelta,
       ),
       RNCamera(
-        center = RNLatLng(cameraPosition.target.latitude, cameraPosition.target.longitude),
+        center = cameraPosition.target.toRnLatLng(),
         zoom = cameraPosition.zoom.toDouble(),
         bearing = cameraPosition.bearing.toDouble(),
         tilt = cameraPosition.tilt.toDouble(),
@@ -544,7 +536,7 @@ class GoogleMapsViewImpl(
     onUi {
       val builder = LatLngBounds.Builder()
       coordinates.forEach { coord ->
-        builder.include(LatLng(coord.latitude, coord.longitude))
+        builder.include(coord.toLatLng())
       }
       val bounds = builder.build()
 
@@ -1069,28 +1061,28 @@ class GoogleMapsViewImpl(
 
   override fun onMapClick(coordinates: LatLng) {
     onMapPress?.invoke(
-      RNLatLng(coordinates.latitude, coordinates.longitude),
+      coordinates.toRnLatLng(),
     )
   }
 
   override fun onMarkerDragStart(marker: Marker) {
     onMarkerDragStart?.invoke(
       marker.tag?.toString(),
-      RNLatLng(marker.position.latitude, marker.position.longitude),
+      marker.position.toRnLatLng(),
     )
   }
 
   override fun onMarkerDrag(marker: Marker) {
     onMarkerDrag?.invoke(
       marker.tag?.toString(),
-      RNLatLng(marker.position.latitude, marker.position.longitude),
+      marker.position.toRnLatLng(),
     )
   }
 
   override fun onMarkerDragEnd(marker: Marker) {
     onMarkerDragEnd?.invoke(
       marker.tag?.toString(),
-      RNLatLng(marker.position.latitude, marker.position.longitude),
+      marker.position.toRnLatLng(),
     )
   }
 

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

@@ -4,13 +4,13 @@ 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
+import com.rngooglemapsplus.extensions.toLatLng
 
 class MapCircleBuilder {
   fun build(circle: RNCircle): CircleOptions =
     CircleOptions().apply {
-      center(LatLng(circle.center.latitude, circle.center.longitude))
+      center(circle.center.toLatLng())
       radius(circle.radius)
       circle.strokeWidth?.let { strokeWidth(it.dpToPx()) }
       circle.strokeColor?.let { strokeColor(it.toColor()) }
@@ -20,14 +20,38 @@ class MapCircleBuilder {
     }
 
   fun update(
-    circle: Circle,
+    prev: RNCircle,
     next: RNCircle,
+    circle: Circle,
   ) {
-    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
+    if (prev.center.latitude != next.center.latitude ||
+      prev.center.longitude != next.center.longitude
+    ) {
+      circle.center = next.center.toLatLng()
+    }
+
+    if (prev.radius != next.radius) {
+      circle.radius = next.radius
+    }
+
+    if (prev.strokeWidth != next.strokeWidth) {
+      circle.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
+    }
+
+    if (prev.strokeColor != next.strokeColor) {
+      circle.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
+    }
+
+    if (prev.fillColor != next.fillColor) {
+      circle.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
+    }
+
+    if (prev.pressable != next.pressable) {
+      circle.isClickable = next.pressable ?: false
+    }
+
+    if (prev.zIndex != next.zIndex) {
+      circle.zIndex = next.zIndex?.toFloat() ?: 0f
+    }
   }
 }

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

@@ -8,11 +8,11 @@ import com.caverock.androidsvg.SVG
 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 com.rngooglemapsplus.extensions.toLatLng
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -40,43 +40,98 @@ class MapMarkerBuilder(
     icon: BitmapDescriptor?,
   ): MarkerOptions =
     MarkerOptions().apply {
-      position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
+      position(m.coordinate.toLatLng())
       icon(icon)
       m.title?.let { title(it) }
       m.snippet?.let { snippet(it) }
       m.opacity?.let { alpha(it.toFloat()) }
       m.flat?.let { flat(it) }
       m.draggable?.let { draggable(it) }
+      m.rotation?.let { rotation(it.toFloat()) }
+      m.infoWindowAnchor?.let { infoWindowAnchor(it.x.toFloat(), it.y.toFloat()) }
       m.anchor?.let { anchor((m.anchor.x).toFloat(), (m.anchor.y).toFloat()) }
       m.zIndex?.let { zIndex(it.toFloat()) }
     }
 
   fun update(
-    marker: Marker,
     prev: RNMarker,
     next: RNMarker,
+    marker: Marker,
   ) {
-    marker.position =
-      LatLng(
-        next.coordinate.latitude,
-        next.coordinate.longitude,
-      )
+    if (prev.coordinate.latitude != next.coordinate.latitude ||
+      prev.coordinate.longitude != next.coordinate.longitude
+    ) {
+      marker.position = next.coordinate.toLatLng()
+    }
 
     if (!prev.markerStyleEquals(next)) {
       buildIconAsync(marker.id, 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
+        ) {
+          marker.setAnchor(
+            (next.anchor?.x ?: 0.5f).toFloat(),
+            (next.anchor?.y ?: 1.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
+      ) {
+        marker.setAnchor(
+          (next.anchor?.x ?: 0.5f).toFloat(),
+          (next.anchor?.y ?: 1.0f).toFloat(),
+        )
+      }
+    }
+
+    if (prev.title != next.title) {
+      marker.title = next.title
+    }
+
+    if (prev.snippet != next.snippet) {
+      marker.snippet = next.snippet
+    }
+
+    if (prev.opacity != next.opacity) {
+      marker.alpha = next.opacity?.toFloat() ?: 1f
+    }
+
+    if (prev.flat != next.flat) {
+      marker.isFlat = next.flat ?: false
+    }
+
+    if (prev.draggable != next.draggable) {
+      marker.isDraggable = next.draggable ?: false
+    }
+
+    if (prev.rotation != next.rotation) {
+      marker.rotation = next.rotation?.toFloat() ?: 0f
+    }
+
+    if (prev.zIndex != next.zIndex) {
+      marker.zIndex = next.zIndex?.toFloat() ?: 0f
     }
-    marker.title = next.title
-    marker.snippet = next.snippet
-    marker.alpha = next.opacity?.toFloat() ?: 0f
-    marker.isFlat = next.flat ?: false
-    marker.isDraggable = next.draggable ?: false
-    marker.setAnchor(
-      (next.anchor?.x ?: 0.5).toFloat(),
-      (next.anchor?.y ?: 1.0).toFloat(),
-    )
-    marker.zIndex = next.zIndex?.toFloat() ?: 0f
   }
 
   fun buildIconAsync(

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

@@ -2,38 +2,85 @@ 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
+import com.rngooglemapsplus.extensions.toLatLng
 
 class MapPolygonBuilder {
   fun build(poly: RNPolygon): PolygonOptions =
     PolygonOptions().apply {
       poly.coordinates.forEach { pt ->
         add(
-          com.google.android.gms.maps.model
-            .LatLng(pt.latitude, pt.longitude),
+          pt.toLatLng(),
         )
       }
       poly.fillColor?.let { fillColor(it.toColor()) }
       poly.strokeColor?.let { strokeColor(it.toColor()) }
       poly.strokeWidth?.let { strokeWidth(it.dpToPx()) }
       poly.pressable?.let { clickable(it) }
+      poly.geodesic?.let { geodesic(it) }
+      poly.holes?.forEach { hole ->
+        addHole(hole.coordinates.map { it.toLatLng() })
+      }
       poly.zIndex?.let { zIndex(it.toFloat()) }
     }
 
   fun update(
-    gmsPoly: Polygon,
+    prev: RNPolygon,
     next: RNPolygon,
+    poly: Polygon,
   ) {
-    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
+    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) {
+      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.fillColor != next.fillColor) {
+      poly.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
+    }
+
+    if (prev.strokeColor != next.strokeColor) {
+      poly.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
+    }
+
+    if (prev.strokeWidth != next.strokeWidth) {
+      poly.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
+    }
+
+    if (prev.pressable != next.pressable) {
+      poly.isClickable = next.pressable ?: false
+    }
+
+    if (prev.geodesic != next.geodesic) {
+      poly.isGeodesic = next.geodesic ?: false
+    }
+
+    if (prev.zIndex != next.zIndex) {
+      poly.zIndex = next.zIndex?.toFloat() ?: 0f
+    }
   }
 }

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

@@ -5,18 +5,18 @@ 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
+import com.rngooglemapsplus.extensions.toLatLng
 
 class MapPolylineBuilder {
   fun build(pl: RNPolyline): PolylineOptions =
     PolylineOptions().apply {
       pl.coordinates.forEach { pt ->
-        add(LatLng(pt.latitude, pt.longitude))
+        add(pt.toLatLng())
       }
       pl.width?.let { width(it.dpToPx()) }
       pl.lineCap?.let {
@@ -25,23 +25,58 @@ class MapPolylineBuilder {
       }
       pl.lineJoin?.let { jointType(mapLineJoin(it)) }
       pl.color?.let { color(it.toColor()) }
+      pl.geodesic?.let { geodesic(it) }
       pl.pressable?.let { clickable(it) }
       pl.zIndex?.let { zIndex(it.toFloat()) }
     }
 
   fun update(
-    polyline: Polyline,
+    prev: RNPolyline,
     next: RNPolyline,
+    polyline: Polyline,
   ) {
-    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
+    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) {
+      polyline.points = next.coordinates.map { it.toLatLng() }
+    }
+
+    if (prev.width != next.width) {
+      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
+    }
+
+    val newJoin = mapLineJoin(next.lineJoin ?: RNLineJoinType.MITER)
+    val prevJoin = mapLineJoin(prev.lineJoin ?: RNLineJoinType.MITER)
+    if (newJoin != prevJoin) {
+      polyline.jointType = newJoin
+    }
+
+    if (prev.color != next.color) {
+      polyline.color = next.color?.toColor() ?: Color.BLACK
+    }
+
+    if (prev.pressable != next.pressable) {
+      polyline.isClickable = next.pressable ?: false
+    }
+
+    if (prev.geodesic != next.geodesic) {
+      polyline.isGeodesic = next.geodesic ?: false
+    }
+
+    if (prev.zIndex != next.zIndex) {
+      polyline.zIndex = next.zIndex?.toFloat() ?: 0f
+    }
   }
 
   private fun mapLineCap(type: RNLineCapType?): Cap =

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

@@ -3,6 +3,7 @@ package com.rngooglemapsplus
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.ThemedReactContext
+import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.circleEquals
@@ -40,11 +41,13 @@ class RNGoogleMapsPlusView(
     super.afterUpdate()
     if (!propsInitialized) {
       propsInitialized = true
-      view.initMapView(
-        initialProps?.mapId,
-        initialProps?.liteMode,
-        initialProps?.camera?.toCameraPosition(),
-      )
+      val options =
+        GoogleMapOptions().apply {
+          initialProps?.mapId?.let { mapId(it) }
+          initialProps?.liteMode?.let { liteMode(it) }
+          initialProps?.camera?.let { camera(it.toCameraPosition()) }
+        }
+      view.initMapView(options)
     }
   }
 
@@ -154,7 +157,7 @@ class RNGoogleMapsPlusView(
         } else if (!prev.markerEquals(next)) {
           view.updateMarker(id) { marker ->
             onUi {
-              markerBuilder.update(marker, next, prev)
+              markerBuilder.update(prev, next, marker)
             }
           }
         }
@@ -178,7 +181,7 @@ class RNGoogleMapsPlusView(
         } else if (!prev.polylineEquals(next)) {
           view.updatePolyline(id) { polyline ->
             onUi {
-              polylineBuilder.update(polyline, next)
+              polylineBuilder.update(prev, next, polyline)
             }
           }
         }
@@ -202,7 +205,7 @@ class RNGoogleMapsPlusView(
           view.addPolygon(id, polygonBuilder.build(next))
         } else if (!prev.polygonEquals(next)) {
           view.updatePolygon(id) { polygon ->
-            onUi { polygonBuilder.update(polygon, next) }
+            onUi { polygonBuilder.update(prev, next, polygon) }
           }
         }
       }
@@ -226,7 +229,7 @@ class RNGoogleMapsPlusView(
         } else if (!prev.circleEquals(next)) {
           view.updateCircle(id) { circle ->
             onUi {
-              circleBuilder.update(circle, next)
+              circleBuilder.update(prev, next, circle)
             }
           }
         }

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

@@ -0,0 +1,6 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLng
+import com.rngooglemapsplus.RNLatLng
+
+fun LatLng.toRnLatLng(): RNLatLng = RNLatLng(latitude, longitude)

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 {
   val builder = CameraPosition.builder()
 
   center?.let {
-    builder.target(LatLng(it.latitude, it.longitude))
+    builder.target(it.toLatLng())
   }
 
   zoom?.let { builder.zoom(it.toFloat()) }

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

@@ -0,0 +1,6 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLng
+import com.rngooglemapsplus.RNLatLng
+
+fun RNLatLng.toLatLng(): LatLng = LatLng(latitude, longitude)

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

@@ -7,6 +7,14 @@ fun RNMarker.markerEquals(b: RNMarker): Boolean =
     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

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

@@ -8,6 +8,8 @@ fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   if (strokeWidth != b.strokeWidth) return false
   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
   val ac = coordinates
   val bc = b.coordinates
   if (ac.size != bc.size) return false

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

@@ -8,6 +8,7 @@ fun RNPolyline.polylineEquals(b: RNPolyline): Boolean {
   if ((width ?: 0.0) != (b.width ?: 0.0)) 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
   val ac = coordinates
   val bc = b.coordinates