react-native-google-maps-plus 1.3.0-dev.6 → 1.3.0-dev.8

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

@@ -20,15 +20,38 @@ class MapCircleBuilder {
     }
 
   fun update(
-    circle: Circle,
+    prev: RNCircle,
     next: RNCircle,
+    circle: Circle,
   ) {
-    circle.center = next.center.toLatLng()
-    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.isClickable = next.pressable ?: false
-    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

@@ -54,33 +54,84 @@ class MapMarkerBuilder(
     }
 
   fun update(
-    marker: Marker,
     prev: RNMarker,
     next: RNMarker,
+    marker: Marker,
   ) {
-    marker.position =
-      next.coordinate.toLatLng()
+    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() ?: 1f
-    marker.isFlat = next.flat ?: false
-    marker.isDraggable = next.draggable ?: false
-    marker.rotation = next.rotation?.toFloat() ?: 0f
-    marker.setInfoWindowAnchor(
-      (next.infoWindowAnchor?.x ?: 0.5).toFloat(),
-      (next.infoWindowAnchor?.y ?: 0).toFloat(),
-    )
-    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

@@ -27,21 +27,60 @@ class MapPolygonBuilder {
     }
 
   fun update(
-    poly: Polygon,
+    prev: RNPolygon,
     next: RNPolygon,
+    poly: Polygon,
   ) {
-    poly.points =
-      next.coordinates.map {
-        it.toLatLng()
-      }
-    poly.fillColor = next.fillColor?.toColor() ?: Color.TRANSPARENT
-    poly.strokeColor = next.strokeColor?.toColor() ?: Color.BLACK
-    poly.strokeWidth = next.strokeWidth?.dpToPx() ?: 1f
-    poly.isClickable = next.pressable ?: false
-    poly.isGeodesic = next.geodesic ?: false
-    poly.holes = next.holes?.map { hole ->
-      hole.coordinates.map { it.toLatLng() }
-    } ?: emptyList()
-    poly.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

@@ -31,19 +31,52 @@ class MapPolylineBuilder {
     }
 
   fun update(
-    polyline: Polyline,
+    prev: RNPolyline,
     next: RNPolyline,
+    polyline: Polyline,
   ) {
-    polyline.points = next.coordinates.map { it.toLatLng() }
-    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.isClickable = next.pressable ?: false
-    polyline.isGeodesic = next.geodesic ?: false
-    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

@@ -157,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)
             }
           }
         }
@@ -181,7 +181,7 @@ class RNGoogleMapsPlusView(
         } else if (!prev.polylineEquals(next)) {
           view.updatePolyline(id) { polyline ->
             onUi {
-              polylineBuilder.update(polyline, next)
+              polylineBuilder.update(prev, next, polyline)
             }
           }
         }
@@ -205,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) }
           }
         }
       }
@@ -229,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/ios/MapCircleBuilder.swift

@@ -14,14 +14,34 @@ final class MapCircleBuilder {
     return circle
   }
 
-  func update(_ next: RNCircle, _ c: GMSCircle) {
-    c.position = next.center.toCLLocationCoordinate2D()
-    c.radius = next.radius
-    c.fillColor = next.fillColor?.toUIColor() ?? nil
-    c.strokeColor = next.strokeColor?.toUIColor() ?? .black
-    c.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
-    c.isTappable = next.pressable ?? false
-    c.zIndex = Int32(next.zIndex ?? 0)
-  }
+  func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
+    if prev.center.latitude != next.center.latitude
+      || prev.center.longitude != next.center.longitude {
+      c.position = next.center.toCLLocationCoordinate2D()
+    }
+
+    if prev.radius != next.radius {
+      c.radius = next.radius ?? 0
+    }
+
+    if prev.fillColor != next.fillColor {
+      c.fillColor = next.fillColor?.toUIColor() ?? .clear
+    }
+
+    if prev.strokeColor != next.strokeColor {
+      c.strokeColor = next.strokeColor?.toUIColor() ?? .black
+    }
 
+    if prev.strokeWidth != next.strokeWidth {
+      c.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
+    }
+
+    if prev.pressable != next.pressable {
+      c.isTappable = next.pressable ?? false
+    }
+
+    if prev.zIndex != next.zIndex {
+      c.zIndex = Int32(next.zIndex ?? 0)
+    }
+  }
 }

package/ios/MapMarkerBuilder.swift

@@ -44,31 +44,58 @@ final class MapMarkerBuilder {
 
   @MainActor
   func update(_ prev: RNMarker, _ next: RNMarker, _ m: GMSMarker) {
-    m.position = next.coordinate.toCLLocationCoordinate2D()
-    m.title = next.title
-    m.snippet = next.snippet
-    m.iconView?.alpha = CGFloat(next.opacity ?? 1)
-    m.isFlat = next.flat ?? false
-    m.isDraggable = next.draggable ?? false
-    m.rotation = next.rotation ?? 0
-    m.infoWindowAnchor = CGPoint(
-      x: next.infoWindowAnchor?.x ?? 0.5,
-      y: next.infoWindowAnchor?.y ?? 0
-    )
-    m.zIndex = Int32(next.zIndex ?? 0)
-    m.groundAnchor = CGPoint(
-      x: next.anchor?.x ?? 0.5,
-      y: next.anchor?.y ?? 1
-    )
+    if prev.coordinate.latitude != next.coordinate.latitude
+      || prev.coordinate.longitude != next.coordinate.longitude {
+      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.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y{
           m.groundAnchor = CGPoint(
             x: next.anchor?.x ?? 0.5,
-            y: next.anchor?.y ?? 0.5
+            y: next.anchor?.y ?? 1
+          )
+        }
+
+        if prev.infoWindowAnchor?.x != next.infoWindowAnchor?.x
+          || prev.infoWindowAnchor?.y != next.infoWindowAnchor?.y {
+          m.infoWindowAnchor = CGPoint(
+            x: next.infoWindowAnchor?.x ?? 0.5,
+            y: next.infoWindowAnchor?.y ?? 0
           )
         }
 
@@ -76,6 +103,21 @@ final class MapMarkerBuilder {
           m?.tracksViewChanges = false
         }
       }
+    } else {
+      if prev.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y{
+        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 {
+        m.infoWindowAnchor = CGPoint(
+          x: next.infoWindowAnchor?.x ?? 0.5,
+          y: next.infoWindowAnchor?.y ?? 0
+        )
+      }
     }
   }
 

package/ios/MapPolygonBuilder.swift

@@ -28,26 +28,60 @@ final class MapPolygonBuilder {
     return pg
   }
 
-  func update(_ next: RNPolygon, _ pg: GMSPolygon) {
-    let path = GMSMutablePath()
-    next.coordinates.forEach {
-      path.add(
-        $0.toCLLocationCoordinate2D()
-      )
+  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
     }
-    pg.path = path
 
-    pg.fillColor = next.fillColor?.toUIColor() ?? .clear
-    pg.strokeColor = next.strokeColor?.toUIColor() ?? .black
-    pg.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
-    pg.isTappable = next.pressable ?? false
-    pg.geodesic = next.geodesic ?? false
-    pg.holes =
-      next.holes?.map { hole in
+    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
-      } ?? []
-    pg.zIndex = Int32(next.zIndex ?? 0)
+      }
+    }
+
+    if prev.fillColor != next.fillColor {
+      pg.fillColor = next.fillColor?.toUIColor() ?? .clear
+    }
+
+    if prev.strokeColor != next.strokeColor {
+      pg.strokeColor = next.strokeColor?.toUIColor() ?? .black
+    }
+
+    if prev.strokeWidth != next.strokeWidth {
+      pg.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
+    }
+
+    if prev.pressable != next.pressable {
+      pg.isTappable = next.pressable ?? false
+    }
+
+    if prev.geodesic != next.geodesic {
+      pg.geodesic = next.geodesic ?? false
+    }
+
+    if prev.zIndex != next.zIndex {
+      pg.zIndex = Int32(next.zIndex ?? 0)
+    }
   }
 }

package/ios/MapPolylineBuilder.swift

@@ -22,21 +22,37 @@ final class MapPolylineBuilder {
     return pl
   }
 
-  func update(_ next: RNPolyline, _ pl: GMSPolyline) {
-    let path = GMSMutablePath()
-    next.coordinates.forEach {
-      path.add(
-        $0.toCLLocationCoordinate2D()
-      )
+  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.width != next.width {
+      pl.strokeWidth = CGFloat(next.width ?? 1.0)
+    }
+
+    if prev.color != next.color {
+      pl.strokeColor = next.color?.toUIColor() ?? .black
+    }
+
+    if prev.pressable != next.pressable {
+      pl.isTappable = next.pressable ?? false
+    }
+
+    if prev.geodesic != next.geodesic {
+      pl.geodesic = next.geodesic ?? false
+    }
+
+    if prev.zIndex != next.zIndex {
+      pl.zIndex = Int32(next.zIndex ?? 0)
     }
-    pl.path = path
-
-    /* lineCap not supported */
-    /* lineJoin not supported */
-    pl.strokeWidth = CGFloat(next.width ?? 1.0)
-    pl.strokeColor = next.color?.toUIColor() ?? .black
-    pl.isTappable = next.pressable ?? false
-    pl.geodesic = next.geodesic ?? false
-    pl.zIndex = Int32(next.zIndex ?? 0)
   }
 }

package/ios/RNGoogleMapsPlusView.swift

@@ -169,7 +169,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
         if let prev = prevById[id] {
           if !prev.polylineEquals(next) {
             impl.updatePolyline(id: id) { pl in
-              self.polylineBuilder.update(next, pl)
+              self.polylineBuilder.update(prev, next, pl)
             }
           }
         } else {
@@ -201,7 +201,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
         if let prev = prevById[id] {
           if !prev.polygonEquals(next) {
             impl.updatePolygon(id: id) { pg in
-              self.polygonBuilder.update(next, pg)
+              self.polygonBuilder.update(prev, next, pg)
             }
           }
         } else {
@@ -230,7 +230,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
         if let prev = prevById[id] {
           if !prev.circleEquals(next) {
             impl.updateCircle(id: id) { circle in
-              self.circleBuilder.update(next, circle)
+              self.circleBuilder.update(prev, next, circle)
             }
           }
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.3.0-dev.6",
+  "version": "1.3.0-dev.8",
   "description": "React-native wrapper for android & IOS google maps sdk",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",