react-native-google-maps-plus 1.7.0-dev.13 → 1.7.0-dev.14

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
@@ -169,51 +173,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 ->
         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,7 +236,7 @@ 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)
     }
   }

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/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/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/MapMarkerBuilder.swift

@@ -15,7 +15,6 @@ final class MapMarkerBuilder {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
     )
-    marker.tracksViewChanges = true
     marker.icon = icon
     m.title.map { marker.title = $0 }
     m.snippet.map { marker.snippet = $0 }
@@ -42,65 +41,28 @@ final class MapMarkerBuilder {
       iconSvg: m.infoWindowIconSvg
     )
 
-    onMainAsync { [weak marker] in
-      try? await Task.sleep(nanoseconds: 250_000_000)
-      marker?.tracksViewChanges = false
-    }
-
     return marker
   }
 
   @MainActor
   func update(_ prev: RNMarker, _ next: RNMarker, _ m: GMSMarker) {
-    if prev.coordinate.latitude != next.coordinate.latitude
-      || prev.coordinate.longitude != next.coordinate.longitude {
+    if !prev.coordinateEquals(next) {
       m.position = next.coordinate.toCLLocationCoordinate2D()
     }
 
-    if prev.title != next.title {
-      m.title = next.title
-    }
-
-    if prev.snippet != next.snippet {
-      m.snippet = next.snippet
-    }
-
-    if prev.opacity != next.opacity {
-      let opacity = Float(next.opacity ?? 1)
-      m.opacity = opacity
-      m.iconView?.alpha = CGFloat(opacity)
-    }
-
-    if prev.flat != next.flat {
-      m.isFlat = next.flat ?? false
-    }
-
-    if prev.draggable != next.draggable {
-      m.isDraggable = next.draggable ?? false
-    }
-
-    if prev.rotation != next.rotation {
-      m.rotation = next.rotation ?? 0
-    }
-
-    if prev.zIndex != next.zIndex {
-      m.zIndex = Int32(next.zIndex ?? 0)
-    }
-
     if !prev.markerStyleEquals(next) {
       buildIconAsync(next.id, next) { img in
         m.tracksViewChanges = true
         m.icon = img
 
-        if prev.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y {
+        if !prev.anchorEquals(next) {
           m.groundAnchor = CGPoint(
             x: next.anchor?.x ?? 0.5,
             y: next.anchor?.y ?? 1
           )
         }
 
-        if prev.infoWindowAnchor?.x != next.infoWindowAnchor?.x
-          || prev.infoWindowAnchor?.y != next.infoWindowAnchor?.y {
+        if !prev.infoWindowAnchorEquals(next) {
           m.infoWindowAnchor = CGPoint(
             x: next.infoWindowAnchor?.x ?? 0.5,
             y: next.infoWindowAnchor?.y ?? 0
@@ -113,26 +75,68 @@ final class MapMarkerBuilder {
         }
       }
     } else {
-      if prev.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y {
+      if !prev.anchorEquals(next) {
         m.groundAnchor = CGPoint(
           x: next.anchor?.x ?? 0.5,
           y: next.anchor?.y ?? 1
         )
       }
 
-      if prev.infoWindowAnchor?.x != next.infoWindowAnchor?.x
-        || prev.infoWindowAnchor?.y != next.infoWindowAnchor?.y {
+      if !prev.infoWindowAnchorEquals(next) {
         m.infoWindowAnchor = CGPoint(
           x: next.infoWindowAnchor?.x ?? 0.5,
           y: next.infoWindowAnchor?.y ?? 0
         )
       }
+    }
+
+    var tracksInfoWindowChanges = false
+
+    if prev.title != next.title {
+      tracksInfoWindowChanges = true
+      m.title = next.title
+    }
+
+    if prev.snippet != next.snippet {
+      tracksInfoWindowChanges = true
+      m.snippet = next.snippet
+    }
+
+    if(tracksInfoWindowChanges) {
+      m.tracksInfoWindowChanges = true
+      onMainAsync { [weak m] in
+        try? await Task.sleep(nanoseconds: 250_000_000)
+        m?.tracksInfoWindowChanges = false
+      }
+    }
+
+    if prev.opacity != next.opacity {
+      let opacity = Float(next.opacity ?? 1)
+      m.opacity = opacity
+      m.iconView?.alpha = CGFloat(opacity)
+    }
 
+    if prev.flat != next.flat {
+      m.isFlat = next.flat ?? false
+    }
+
+    if prev.draggable != next.draggable {
+      m.isDraggable = next.draggable ?? false
+    }
+
+    if prev.rotation != next.rotation {
+      m.rotation = next.rotation ?? 0
+    }
+
+    if prev.zIndex != next.zIndex {
+      m.zIndex = Int32(next.zIndex ?? 0)
+    }
+
+    if !prev.markerInfoWindowStyleEquals(next) {
       m.tagData = MarkerTag(
         id: next.id,
         iconSvg: next.infoWindowIconSvg
       )
-
     }
   }
 

package/ios/MapPolygonBuilder.swift

@@ -3,13 +3,7 @@ import GoogleMaps
 final class MapPolygonBuilder {
   @MainActor
   func build(_ p: RNPolygon) -> GMSPolygon {
-    let path = GMSMutablePath()
-    p.coordinates.forEach {
-      path.add(
-        $0.toCLLocationCoordinate2D()
-      )
-    }
-
+    let path = p.coordinates.toGMSPath()
     let pg = GMSPolygon(path: path)
 
     p.fillColor.map { pg.fillColor = $0.toUIColor() }
@@ -17,13 +11,7 @@ final class MapPolygonBuilder {
     p.strokeWidth.map { pg.strokeWidth = CGFloat($0) }
     p.pressable.map { pg.isTappable = $0 }
     p.geodesic.map { pg.geodesic = $0 }
-    p.holes.map {
-      pg.holes = $0.map { hole in
-        let path = GMSMutablePath()
-        hole.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-        return path
-      }
-    }
+    pg.holes = p.holes.toMapPolygonHoles()
     p.zIndex.map { pg.zIndex = Int32($0) }
 
     return pg
@@ -31,35 +19,12 @@ final class MapPolygonBuilder {
 
   @MainActor
   func update(_ prev: RNPolygon, _ next: RNPolygon, _ pg: GMSPolygon) {
-    let coordsChanged =
-      prev.coordinates.count != next.coordinates.count
-        || !zip(prev.coordinates, next.coordinates).allSatisfy {
-          $0.latitude == $1.latitude && $0.longitude == $1.longitude
-        }
-
-    if coordsChanged {
-      let path = GMSMutablePath()
-      next.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-      pg.path = path
+    if !prev.coordinatesEquals(next) {
+      pg.path = next.coordinates.toGMSPath()
     }
 
-    let prevHoles = prev.holes ?? []
-    let nextHoles = next.holes ?? []
-    let holesChanged =
-      prevHoles.count != nextHoles.count
-        || !zip(prevHoles, nextHoles).allSatisfy { a, b in
-          a.coordinates.count == b.coordinates.count
-            && zip(a.coordinates, b.coordinates).allSatisfy {
-              $0.latitude == $1.latitude && $0.longitude == $1.longitude
-            }
-        }
-
-    if holesChanged {
-      pg.holes = nextHoles.map { hole in
-        let path = GMSMutablePath()
-        hole.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-        return path
-      }
+    if !prev.holesEquals(next) {
+      pg.holes = next.holes.toMapPolygonHoles()
     }
 
     if prev.fillColor != next.fillColor {

package/ios/MapPolylineBuilder.swift

@@ -25,16 +25,8 @@ final class MapPolylineBuilder {
 
   @MainActor
   func update(_ prev: RNPolyline, _ next: RNPolyline, _ pl: GMSPolyline) {
-    let coordsChanged =
-      prev.coordinates.count != next.coordinates.count
-        || !zip(prev.coordinates, next.coordinates).allSatisfy {
-          $0.latitude == $1.latitude && $0.longitude == $1.longitude
-        }
-
-    if coordsChanged {
-      let path = GMSMutablePath()
-      next.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-      pl.path = path
+    if !prev.coordinatesEquals(next) {
+      pl.path = next.coordinates.toGMSPath()
     }
 
     if prev.width != next.width {

package/ios/extensions/RNCircle+Extension.swift

@@ -2,10 +2,19 @@ import GoogleMaps
 
 extension RNCircle {
   func circleEquals(_ b: RNCircle) -> Bool {
-    zIndex == b.zIndex && pressable == b.pressable
-      && center.latitude == b.center.latitude
-      && center.longitude == b.center.longitude && radius == b.radius
-      && strokeWidth == b.strokeWidth && strokeColor == b.strokeColor
-      && fillColor == b.fillColor
+    if zIndex != b.zIndex { return false }
+    if pressable != b.pressable { return false }
+    if !centerEquals(b) { 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
+  }
+
+  func centerEquals(_ b: RNCircle) -> Bool {
+    if center.latitude != b.center.latitude { return false }
+    if center.longitude != b.center.longitude { return false }
+    return true
   }
 }

package/ios/extensions/RNLatLng+Extension.swift

@@ -1,7 +1,18 @@
 import CoreLocation
+import GoogleMaps
 
 extension RNLatLng {
   func toCLLocationCoordinate2D() -> CLLocationCoordinate2D {
     CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
   }
 }
+
+extension Array where Element == RNLatLng {
+  func toGMSPath() -> GMSPath {
+    let path = GMSMutablePath()
+    for coord in self {
+      path.add(coord.toCLLocationCoordinate2D())
+    }
+    return path
+  }
+}

package/ios/extensions/RNLineCapType+Extension.swift

@@ -0,0 +1,10 @@
+extension RNLineCapType {
+  func toCGLineCap() -> CGLineCap {
+    switch self {
+    case .round: return .round
+    case .square: return .square
+    default: return .butt
+    }
+  }
+}
+

package/ios/extensions/RNLineJoinType+Extension.swift

@@ -0,0 +1,11 @@
+extension RNLineJoinType {
+  func toCGLineJoin() -> CGLineJoin {
+    switch self {
+    case .round: return .round
+    case .bevel: return .bevel
+    default: return .miter
+    }
+  }
+
+}
+

package/ios/extensions/RNMarker+Extension.swift

@@ -2,21 +2,52 @@ import GoogleMaps
 
 extension RNMarker {
   func markerEquals(_ b: RNMarker) -> Bool {
-    id == b.id && zIndex == b.zIndex
-      && coordinate.latitude == b.coordinate.latitude
-      && coordinate.longitude == b.coordinate.longitude
-      && anchor?.x == b.anchor?.x && anchor?.y == b.anchor?.y
-      && showInfoWindow == b.showInfoWindow && title == b.title
-      && snippet == b.snippet && opacity == b.opacity && flat == b.flat
-      && draggable == b.draggable && rotation == b.rotation
-      && infoWindowAnchor?.x == b.infoWindowAnchor?.x
-      && infoWindowAnchor?.y == b.infoWindowAnchor?.y
-      && markerStyleEquals(b)
+    if id != b.id { return false }
+    if zIndex != b.zIndex { return false }
+    if !coordinateEquals(b) { return false }
+    if !anchorEquals(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 !infoWindowAnchorEquals(b) { return false }
+    if !markerInfoWindowStyleEquals(b) { return false }
+    if !markerStyleEquals(b) { return false }
+    return true
+  }
+
+  func coordinateEquals(_ b: RNMarker) -> Bool {
+    if coordinate.latitude != b.coordinate.latitude { return false }
+    if coordinate.longitude != b.coordinate.longitude { return false }
+    return true
+  }
+
+  func anchorEquals(_ b: RNMarker) -> Bool {
+    if anchor?.x != b.anchor?.x { return false }
+    if anchor?.y != b.anchor?.y { return false }
+    return true
+  }
+
+  func infoWindowAnchorEquals(_ b: RNMarker) -> Bool {
+    if infoWindowAnchor?.x != b.infoWindowAnchor?.x { return false }
+    if infoWindowAnchor?.y != b.infoWindowAnchor?.y { return false }
+    return true
+  }
+
+  func markerInfoWindowStyleEquals(_ b: RNMarker) -> Bool {
+    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
   }
 
   func markerStyleEquals(_ b: RNMarker) -> Bool {
-    iconSvg?.width == b.iconSvg?.width && iconSvg?.height == b.iconSvg?.height
-      && iconSvg?.svgString == b.iconSvg?.svgString
+    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
   }
 
   func styleHash() -> NSNumber {

package/ios/extensions/RNPolygon+Extension.swift.swift

@@ -2,32 +2,48 @@ import GoogleMaps
 
 extension RNPolygon {
   func polygonEquals(_ b: RNPolygon) -> Bool {
-    guard zIndex == b.zIndex,
-          pressable == b.pressable,
-          strokeWidth == b.strokeWidth,
-          fillColor == b.fillColor,
-          strokeColor == b.strokeColor,
-          geodesic == b.geodesic,
-          coordinates.count == b.coordinates.count,
-          holes?.count == b.holes?.count
-    else { return false }
-
-    for i in 0..<coordinates.count {
-      if coordinates[i].latitude != b.coordinates[i].latitude
-        || coordinates[i].longitude != b.coordinates[i].longitude {
+    if zIndex != b.zIndex { return false }
+    if pressable != b.pressable { return false }
+    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 !coordinatesEquals(b) { return false }
+    if !holesEquals(b) { return false }
+
+    return true
+  }
+
+  func coordinatesEquals(_ b: RNPolygon) -> Bool {
+    if coordinates.count != b.coordinates.count { return false }
+
+    for (a, c) in zip(coordinates, b.coordinates) {
+      if a.latitude != c.latitude || a.longitude != c.longitude {
         return false
       }
     }
 
-    for i in 0..<(holes?.count ?? 0) {
-      let ha = holes![i]
-      let hb = b.holes![i]
-      if ha.coordinates.count != hb.coordinates.count { return false }
+    return true
+  }
+
+  func holesEquals(_ b: RNPolygon) -> Bool {
+    if let holes = holes, let bHoles = b.holes {
+      if holes.count != bHoles.count { return false }
 
-      for j in 0..<ha.coordinates.count {
-        if ha.coordinates[j].latitude != hb.coordinates[j].latitude
-          || ha.coordinates[j].longitude != hb.coordinates[j].longitude {
-          return false
+      for i in holes.indices {
+        let ah = holes[i]
+        let bh = bHoles[i]
+
+        if ah.coordinates.count != bh.coordinates.count { return false }
+
+        for j in ah.coordinates.indices {
+          let p = ah.coordinates[j]
+          let q = bh.coordinates[j]
+
+          if p.latitude != q.latitude || p.longitude != q.longitude {
+            return false
+          }
         }
       }
     }
@@ -35,3 +51,16 @@ extension RNPolygon {
     return true
   }
 }
+
+extension Optional where Wrapped == [RNPolygonHole] {
+  func toMapPolygonHoles() -> [GMSPath]? {
+    guard let holes = self else { return nil }
+    return holes.map { hole in
+      let path = GMSMutablePath()
+      hole.coordinates.forEach { coord in
+        path.add(coord.toCLLocationCoordinate2D())
+      }
+      return path
+    }
+  }
+}

package/ios/extensions/RNPolyline+Extension.swift.swift

@@ -2,37 +2,26 @@ import GoogleMaps
 
 extension RNPolyline {
   func polylineEquals(_ b: RNPolyline) -> Bool {
-    guard zIndex == b.zIndex,
-          (width ?? 0) == (b.width ?? 0),
-          lineCap == b.lineCap,
-          lineJoin == b.lineJoin,
-          color == b.color,
-          geodesic == b.geodesic,
-          coordinates.count == b.coordinates.count
-    else { return false }
+    if zIndex != b.zIndex { return false }
+    if width != b.width { return false }
+    if lineCap != b.lineCap { return false }
+    if lineJoin != b.lineJoin { return false }
+    if color != b.color { return false }
+    if geodesic != b.geodesic { return false }
+    if !coordinatesEquals(b) { return false }
 
-    for i in 0..<coordinates.count {
-      if coordinates[i].latitude != b.coordinates[i].latitude
-        || coordinates[i].longitude != b.coordinates[i].longitude {
-        return false
-      }
-    }
     return true
   }
 
-  private func mapLineCap(_ t: RNLineCapType) -> CGLineCap {
-    switch t {
-    case .round: return .round
-    case .square: return .square
-    default: return .butt
-    }
-  }
+  func coordinatesEquals(_ b: RNPolyline) -> Bool {
+    if coordinates.count != b.coordinates.count { return false }
 
-  private func mapLineJoin(_ t: RNLineJoinType) -> CGLineJoin {
-    switch t {
-    case .round: return .round
-    case .bevel: return .bevel
-    default: return .miter
+    for (a, c) in zip(coordinates, b.coordinates) {
+      if a.latitude != c.latitude || a.longitude != c.longitude {
+        return false
+      }
     }
+
+    return true
   }
 }

package/lib/module/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AAmEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AAyKA,WAAYA,yBAAyB,0BAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA;AAYrC,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAYjC,WAAYC,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAoCjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}
+{"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AAmEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AAwKA,WAAYA,yBAAyB,0BAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA;AAYrC,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAYjC,WAAYC,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAoCjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}

package/lib/typescript/src/types.d.ts

@@ -95,7 +95,6 @@ export type RNMarker = {
     zIndex?: number;
     coordinate: RNLatLng;
     anchor?: RNPosition;
-    showInfoWindow?: boolean;
     title?: string;
     snippet?: string;
     opacity?: number;

package/lib/typescript/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}

package/nitrogen/generated/android/c++/JRNMarker.hpp

@@ -46,8 +46,6 @@ namespace margelo::nitro::rngooglemapsplus {
       jni::local_ref<JRNLatLng> coordinate = this->getFieldValue(fieldCoordinate);
       static const auto fieldAnchor = clazz->getField<JRNPosition>("anchor");
       jni::local_ref<JRNPosition> anchor = this->getFieldValue(fieldAnchor);
-      static const auto fieldShowInfoWindow = clazz->getField<jni::JBoolean>("showInfoWindow");
-      jni::local_ref<jni::JBoolean> showInfoWindow = this->getFieldValue(fieldShowInfoWindow);
       static const auto fieldTitle = clazz->getField<jni::JString>("title");
       jni::local_ref<jni::JString> title = this->getFieldValue(fieldTitle);
       static const auto fieldSnippet = clazz->getField<jni::JString>("snippet");
@@ -71,7 +69,6 @@ namespace margelo::nitro::rngooglemapsplus {
         zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
         coordinate->toCpp(),
         anchor != nullptr ? std::make_optional(anchor->toCpp()) : std::nullopt,
-        showInfoWindow != nullptr ? std::make_optional(static_cast<bool>(showInfoWindow->value())) : std::nullopt,
         title != nullptr ? std::make_optional(title->toStdString()) : std::nullopt,
         snippet != nullptr ? std::make_optional(snippet->toStdString()) : std::nullopt,
         opacity != nullptr ? std::make_optional(opacity->value()) : std::nullopt,
@@ -90,7 +87,7 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNMarker::javaobject> fromCpp(const RNMarker& value) {
-      using JSignature = JRNMarker(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNPosition>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNPosition>, jni::alias_ref<JRNMarkerSvg>, jni::alias_ref<JRNMarkerSvg>);
+      using JSignature = JRNMarker(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNPosition>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNPosition>, jni::alias_ref<JRNMarkerSvg>, jni::alias_ref<JRNMarkerSvg>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -99,7 +96,6 @@ namespace margelo::nitro::rngooglemapsplus {
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
         JRNLatLng::fromCpp(value.coordinate),
         value.anchor.has_value() ? JRNPosition::fromCpp(value.anchor.value()) : nullptr,
-        value.showInfoWindow.has_value() ? jni::JBoolean::valueOf(value.showInfoWindow.value()) : nullptr,
         value.title.has_value() ? jni::make_jstring(value.title.value()) : nullptr,
         value.snippet.has_value() ? jni::make_jstring(value.snippet.value()) : nullptr,
         value.opacity.has_value() ? jni::JDouble::valueOf(value.opacity.value()) : nullptr,

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMarker.kt

@@ -32,9 +32,6 @@ data class RNMarker(
   val anchor: RNPosition?,
   @DoNotStrip
   @Keep
-  val showInfoWindow: Boolean?,
-  @DoNotStrip
-  @Keep
   val title: String?,
   @DoNotStrip
   @Keep
@@ -69,8 +66,8 @@ data class RNMarker(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, showInfoWindow: Boolean?, title: String?, snippet: String?, opacity: Double?, flat: Boolean?, draggable: Boolean?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?): RNMarker {
-      return RNMarker(id, zIndex, coordinate, anchor, showInfoWindow, title, snippet, opacity, flat, draggable, rotation, infoWindowAnchor, iconSvg, infoWindowIconSvg)
+    private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, title: String?, snippet: String?, opacity: Double?, flat: Boolean?, draggable: Boolean?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?): RNMarker {
+      return RNMarker(id, zIndex, coordinate, anchor, title, snippet, opacity, flat, draggable, rotation, infoWindowAnchor, iconSvg, infoWindowIconSvg)
     }
   }
 }

package/nitrogen/generated/ios/swift/RNMarker.swift

@@ -18,7 +18,7 @@ public extension RNMarker {
   /**
    * Create a new instance of `RNMarker`.
    */
-  init(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, showInfoWindow: Bool?, title: String?, snippet: String?, opacity: Double?, flat: Bool?, draggable: Bool?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?) {
+  init(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, title: String?, snippet: String?, opacity: Double?, flat: Bool?, draggable: Bool?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?) {
     self.init(std.string(id), { () -> bridge.std__optional_double_ in
       if let __unwrappedValue = zIndex {
         return bridge.create_std__optional_double_(__unwrappedValue)
@@ -31,12 +31,6 @@ public extension RNMarker {
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_bool_ in
-      if let __unwrappedValue = showInfoWindow {
-        return bridge.create_std__optional_bool_(__unwrappedValue)
-      } else {
-        return .init()
-      }
     }(), { () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = title {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
@@ -150,30 +144,6 @@ public extension RNMarker {
     }
   }
   
-  var showInfoWindow: Bool? {
-    @inline(__always)
-    get {
-      return { () -> Bool? in
-        if bridge.has_value_std__optional_bool_(self.__showInfoWindow) {
-          let __unwrapped = bridge.get_std__optional_bool_(self.__showInfoWindow)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__showInfoWindow = { () -> bridge.std__optional_bool_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_bool_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-  }
-  
   var title: String? {
     @inline(__always)
     get {

package/nitrogen/generated/shared/c++/RNMarker.hpp

@@ -47,7 +47,6 @@ namespace margelo::nitro::rngooglemapsplus {
     std::optional<double> zIndex     SWIFT_PRIVATE;
     RNLatLng coordinate     SWIFT_PRIVATE;
     std::optional<RNPosition> anchor     SWIFT_PRIVATE;
-    std::optional<bool> showInfoWindow     SWIFT_PRIVATE;
     std::optional<std::string> title     SWIFT_PRIVATE;
     std::optional<std::string> snippet     SWIFT_PRIVATE;
     std::optional<double> opacity     SWIFT_PRIVATE;
@@ -60,7 +59,7 @@ namespace margelo::nitro::rngooglemapsplus {
 
   public:
     RNMarker() = default;
-    explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<bool> showInfoWindow, std::optional<std::string> title, std::optional<std::string> snippet, std::optional<double> opacity, std::optional<bool> flat, std::optional<bool> draggable, std::optional<double> rotation, std::optional<RNPosition> infoWindowAnchor, std::optional<RNMarkerSvg> iconSvg, std::optional<RNMarkerSvg> infoWindowIconSvg): id(id), zIndex(zIndex), coordinate(coordinate), anchor(anchor), showInfoWindow(showInfoWindow), title(title), snippet(snippet), opacity(opacity), flat(flat), draggable(draggable), rotation(rotation), infoWindowAnchor(infoWindowAnchor), iconSvg(iconSvg), infoWindowIconSvg(infoWindowIconSvg) {}
+    explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<std::string> title, std::optional<std::string> snippet, std::optional<double> opacity, std::optional<bool> flat, std::optional<bool> draggable, std::optional<double> rotation, std::optional<RNPosition> infoWindowAnchor, std::optional<RNMarkerSvg> iconSvg, std::optional<RNMarkerSvg> infoWindowIconSvg): id(id), zIndex(zIndex), coordinate(coordinate), anchor(anchor), title(title), snippet(snippet), opacity(opacity), flat(flat), draggable(draggable), rotation(rotation), infoWindowAnchor(infoWindowAnchor), iconSvg(iconSvg), infoWindowIconSvg(infoWindowIconSvg) {}
   };
 
 } // namespace margelo::nitro::rngooglemapsplus
@@ -77,7 +76,6 @@ namespace margelo::nitro {
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "zIndex")),
         JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "coordinate")),
         JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::fromJSI(runtime, obj.getProperty(runtime, "anchor")),
-        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "showInfoWindow")),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "title")),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "snippet")),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "opacity")),
@@ -95,7 +93,6 @@ namespace margelo::nitro {
       obj.setProperty(runtime, "zIndex", JSIConverter<std::optional<double>>::toJSI(runtime, arg.zIndex));
       obj.setProperty(runtime, "coordinate", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.coordinate));
       obj.setProperty(runtime, "anchor", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::toJSI(runtime, arg.anchor));
-      obj.setProperty(runtime, "showInfoWindow", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.showInfoWindow));
       obj.setProperty(runtime, "title", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.title));
       obj.setProperty(runtime, "snippet", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.snippet));
       obj.setProperty(runtime, "opacity", JSIConverter<std::optional<double>>::toJSI(runtime, arg.opacity));
@@ -119,7 +116,6 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "zIndex"))) return false;
       if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "coordinate"))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::canConvert(runtime, obj.getProperty(runtime, "anchor"))) return false;
-      if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "showInfoWindow"))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "title"))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "snippet"))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "opacity"))) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.13",
+  "version": "1.7.0-dev.14",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/types.ts

@@ -163,7 +163,6 @@ export type RNMarker = {
   zIndex?: number;
   coordinate: RNLatLng;
   anchor?: RNPosition;
-  showInfoWindow?: boolean;
   title?: string;
   snippet?: string;
   opacity?: number;