react-native-google-maps-plus 1.3.0 → 1.4.1-dev.1

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/CameraPositionExtension.kt

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.CameraPosition
+import com.rngooglemapsplus.RNCamera
+
+fun CameraPosition.toRnCamera(): RNCamera =
+  RNCamera(
+    center = target.toRnLatLng(),
+    zoom = zoom.toDouble(),
+    bearing = bearing.toDouble(),
+    tilt = tilt.toDouble(),
+  )

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

@@ -0,0 +1,28 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.common.ConnectionResult
+import com.rngooglemapsplus.RNMapErrorCode
+
+fun Int.toRNMapErrorCodeOrNull(): RNMapErrorCode? =
+  when (this) {
+    ConnectionResult.SERVICE_MISSING ->
+      RNMapErrorCode.PLAY_SERVICES_MISSING
+
+    ConnectionResult.SERVICE_INVALID ->
+      RNMapErrorCode.PLAY_SERVICES_INVALID
+
+    ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED ->
+      RNMapErrorCode.PLAY_SERVICES_OUTDATED
+
+    ConnectionResult.SERVICE_UPDATING ->
+      RNMapErrorCode.PLAY_SERVICE_UPDATING
+
+    ConnectionResult.SERVICE_DISABLED ->
+      RNMapErrorCode.PLAY_SERVICES_DISABLED
+
+    ConnectionResult.SUCCESS ->
+      null
+
+    else ->
+      RNMapErrorCode.UNKNOWN
+  }

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

@@ -0,0 +1,15 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLngBounds
+import com.rngooglemapsplus.RNRegion
+
+fun LatLngBounds.toRnRegion(): RNRegion {
+  val latDelta = northeast.latitude - southwest.latitude
+  val lngDelta = northeast.longitude - southwest.longitude
+
+  return RNRegion(
+    center = center.toRnLatLng(),
+    latitudeDelta = latDelta,
+    longitudeDelta = lngDelta,
+  )
+}

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/LocationExtension.kt

@@ -0,0 +1,59 @@
+package com.rngooglemapsplus.extensions
+
+import android.location.Location
+import android.os.Build
+import com.rngooglemapsplus.RNLatLng
+import com.rngooglemapsplus.RNLocation
+import com.rngooglemapsplus.RNLocationAndroid
+
+fun Location.toRnLocation(): RNLocation =
+  RNLocation(
+    center = RNLatLng(latitude, longitude),
+    altitude = altitude,
+    accuracy = accuracy.toDouble(),
+    bearing = bearing.toDouble(),
+    speed = speed.toDouble(),
+    time = time.toDouble(),
+    android =
+      RNLocationAndroid(
+        provider = provider,
+        elapsedRealtimeNanos = elapsedRealtimeNanos.toDouble(),
+        bearingAccuracyDegrees =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            bearingAccuracyDegrees.toDouble()
+          } else {
+            null
+          },
+        speedAccuracyMetersPerSecond =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            speedAccuracyMetersPerSecond.toDouble()
+          } else {
+            null
+          },
+        verticalAccuracyMeters =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            verticalAccuracyMeters.toDouble()
+          } else {
+            null
+          },
+        mslAltitudeMeters =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            mslAltitudeMeters
+          } else {
+            null
+          },
+        mslAltitudeAccuracyMeters =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            mslAltitudeAccuracyMeters.toDouble()
+          } else {
+            null
+          },
+        isMock =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            isMock
+          } else {
+            isFromMockProvider
+          },
+      ),
+    ios = null,
+  )

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