react-native-google-maps-plus 1.0.2 → 1.0.3-dev.1

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

@@ -0,0 +1,29 @@
+package com.rngooglemapsplus
+
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.google.android.gms.maps.model.CircleOptions
+import com.google.android.gms.maps.model.LatLng
+
+class MapCircleOptions {
+  fun buildCircleOptions(circle: RNCircle): CircleOptions =
+    CircleOptions().apply {
+      center(LatLng(circle.center.latitude, circle.center.longitude))
+      circle.radius?.let { radius(it) }
+      circle.strokeWidth?.let { strokeWidth(it.dpToPx()) }
+      circle.strokeColor?.let { strokeColor(it.toColor()) }
+      circle.fillColor?.let { fillColor(it.toColor()) }
+      circle.pressable?.let { clickable(it) }
+      circle.zIndex?.let { zIndex(it.toFloat()) }
+    }
+}
+
+fun RNCircle.circleEquals(b: RNCircle): Boolean {
+  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
+}

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

@@ -36,11 +36,12 @@ class MarkerOptions(
     m: RNMarker,
     icon: BitmapDescriptor,
   ): MarkerOptions =
-    MarkerOptions()
-      .position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
-      .zIndex(m.zIndex.toFloat())
-      .icon(icon)
-      .anchor((m.anchor?.x ?: 0.5).toFloat(), (m.anchor?.y ?: 0.5).toFloat())
+    MarkerOptions().apply {
+      position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
+      anchor((m.anchor?.x ?: 0.5).toFloat(), (m.anchor?.y ?: 0.5).toFloat())
+      icon(icon)
+      m.zIndex?.let { zIndex(it.toFloat()) }
+    }
 
   fun buildIconAsync(
     id: String,

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

@@ -15,12 +15,14 @@ class MapPolygonOptions {
       poly.fillColor?.let { fillColor(it.toColor()) }
       poly.strokeColor?.let { strokeColor(it.toColor()) }
       poly.strokeWidth?.let { strokeWidth(it.dpToPx()) }
-      zIndex(poly.zIndex.toFloat())
+      poly.pressable?.let { clickable(it) }
+      poly.zIndex?.let { zIndex(it.toFloat()) }
     }
 }
 
 fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   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

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

@@ -22,7 +22,8 @@ class MapPolylineOptions {
       pl.lineCap?.let { endCap(mapLineCap(it)) }
       pl.lineJoin?.let { jointType(mapLineJoin(it)) }
       pl.color?.let { color(it.toColor()) }
-      zIndex(pl.zIndex.toFloat())
+      pl.pressable?.let { clickable(it) }
+      pl.zIndex?.let { zIndex(it.toFloat()) }
     }
 
   fun mapLineCap(type: RNLineCapType?): Cap =
@@ -43,6 +44,7 @@ class MapPolylineOptions {
 
 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 (lineCap != b.lineCap) return false
   if (lineJoin != b.lineJoin) return false

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

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.maps.model.CameraPosition
+import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MapColorScheme
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
@@ -13,71 +14,77 @@ import com.margelo.nitro.core.Promise
 class RNGoogleMapsPlusView(
   val context: ThemedReactContext,
 ) : HybridRNGoogleMapsPlusViewSpec() {
-  private var currentCustomMapStyle: String = ""
+  private var currentCustomMapStyle: String? = null
   private var permissionHandler = PermissionHandler(context)
   private var locationHandler = LocationHandler(context)
   private var playServiceHandler = PlayServicesHandler(context)
+
   private val markerOptions = MarkerOptions()
+  private val polylineOptions = MapPolylineOptions()
+  private val polygonOptions = MapPolygonOptions()
+  private val circleOptions = MapCircleOptions()
 
   override val view =
     GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerOptions)
 
-  private val polylineOptions = MapPolylineOptions()
-  private val polygonOptions = MapPolygonOptions()
+  override var initialProps: RNInitialProps? = null
+    set(value) {
+      view.initMapView(
+        value?.mapId,
+        value?.liteMode,
+        mapCameraToCameraPosition(value?.initialCamera),
+      )
+    }
 
-  override var buildingEnabled: Boolean
-    get() = view.buildingEnabled
+  override var buildingEnabled: Boolean? = null
     set(value) {
       view.buildingEnabled = value
     }
 
-  override var trafficEnabled: Boolean
-    get() = view.trafficEnabled
+  override var trafficEnabled: Boolean? = null
     set(value) {
       view.trafficEnabled = value
     }
 
-  override var customMapStyle: String
-    get() = currentCustomMapStyle
+  override var customMapStyle: String? = null
     set(value) {
       currentCustomMapStyle = value
-      view.customMapStyle = MapStyleOptions(value)
-    }
-
-  override var initialCamera: RNCamera
-    get() = mapCameraPotionToCamera(view.initialCamera)
-    set(value) {
-      view.initialCamera = mapCameraToCameraPosition(value)
+      value?.let {
+        view.customMapStyle = MapStyleOptions(it)
+      }
     }
 
-  override var userInterfaceStyle: RNUserInterfaceStyle
-    get() = mapColorSchemeToUserInterfaceStyle(view.userInterfaceStyle)
+  override var userInterfaceStyle: RNUserInterfaceStyle? = null
     set(value) {
       view.userInterfaceStyle = userInterfaceStyleToMapColorScheme(value)
     }
 
-  override var minZoomLevel: Double
-    get() = view.minZoomLevel
+  override var minZoomLevel: Double? = null
     set(value) {
       view.minZoomLevel = value
     }
 
-  override var maxZoomLevel: Double
-    get() = view.maxZoomLevel
+  override var maxZoomLevel: Double? = null
     set(value) {
       view.maxZoomLevel = value
     }
 
-  override var mapPadding: RNMapPadding
-    get() = view.mapPadding
+  override var mapPadding: RNMapPadding? = null
     set(value) {
       view.mapPadding = value
     }
 
-  override var markers: Array<RNMarker> = emptyArray()
+  override var mapType: RNMapType? = null
     set(value) {
-      val prevById = field.associateBy { it.id }
-      val nextById = value.associateBy { it.id }
+      value?.let {
+        view.mapType = it.value
+      }
+    }
+
+  override var markers: Array<RNMarker>? = null
+    set(value) {
+      val prevById = field?.associateBy { it.id } ?: emptyMap()
+      val nextById = value?.associateBy { it.id } ?: emptyMap()
 
       (prevById.keys - nextById.keys).forEach { id ->
         markerOptions.cancelIconJob(id)
@@ -96,27 +103,24 @@ class RNGoogleMapsPlusView(
         } else if (!prev.markerEquals(next)) {
           view.updateMarker(id) { m ->
             onUi {
-              if (prev.coordinate != next.coordinate) {
-                m.position =
-                  com.google.android.gms.maps.model.LatLng(
-                    next.coordinate.latitude,
-                    next.coordinate.longitude,
-                  )
-              }
-              if (prev.zIndex != next.zIndex) {
-                m.zIndex = next.zIndex.toFloat()
+              m.position =
+                LatLng(
+                  next.coordinate.latitude,
+                  next.coordinate.longitude,
+                )
+              next.zIndex?.let { m.zIndex = it.toFloat() } ?: run {
+                m.zIndex = 0f
               }
+
               if (!prev.markerStyleEquals(next)) {
                 markerOptions.buildIconAsync(id, next) { icon ->
                   m.setIcon(icon)
                 }
               }
-              if (prev.anchor != next.anchor) {
-                m.setAnchor(
-                  (next.anchor?.x ?: 0.5).toFloat(),
-                  (next.anchor?.y ?: 0.5).toFloat(),
-                )
-              }
+              m.setAnchor(
+                (next.anchor?.x ?: 0.5).toFloat(),
+                (next.anchor?.y ?: 0.5).toFloat(),
+              )
             }
           }
         }
@@ -124,10 +128,10 @@ class RNGoogleMapsPlusView(
       field = value
     }
 
-  override var polylines: Array<RNPolyline> = emptyArray()
+  override var polylines: Array<RNPolyline>? = null
     set(value) {
-      val prevById = field.associateBy { it.id }
-      val nextById = value.associateBy { it.id }
+      val prevById = field?.associateBy { it.id } ?: emptyMap()
+      val nextById = value?.associateBy { it.id } ?: emptyMap()
 
       (prevById.keys - nextById.keys).forEach { id ->
         view.removePolyline(id)
@@ -142,8 +146,8 @@ class RNGoogleMapsPlusView(
             onUi {
               gms.points =
                 next.coordinates.map {
-                  com.google.android.gms.maps.model
-                    .LatLng(it.latitude, it.longitude)
+
+                  LatLng(it.latitude, it.longitude)
                 }
               next.width?.let { gms.width = it.dpToPx() }
               next.lineCap?.let {
@@ -153,7 +157,7 @@ class RNGoogleMapsPlusView(
               }
               next.lineJoin?.let { gms.jointType = polylineOptions.mapLineJoin(it) }
               next.color?.let { gms.color = it.toColor() }
-              gms.zIndex = next.zIndex.toFloat()
+              next.zIndex?.let { gms.zIndex = it.toFloat() }
             }
           }
         }
@@ -161,10 +165,10 @@ class RNGoogleMapsPlusView(
       field = value
     }
 
-  override var polygons: Array<RNPolygon> = emptyArray()
+  override var polygons: Array<RNPolygon>? = null
     set(value) {
-      val prevById = field.associateBy { it.id }
-      val nextById = value.associateBy { it.id }
+      val prevById = field?.associateBy { it.id } ?: emptyMap()
+      val nextById = value?.associateBy { it.id } ?: emptyMap()
 
       (prevById.keys - nextById.keys).forEach { id ->
         view.removePolygon(id)
@@ -185,7 +189,36 @@ class RNGoogleMapsPlusView(
               next.fillColor?.let { gmsPoly.fillColor = it.toColor() }
               next.strokeColor?.let { gmsPoly.strokeColor = it.toColor() }
               next.strokeWidth?.let { gmsPoly.strokeWidth = it.dpToPx() }
-              gmsPoly.zIndex = next.zIndex.toFloat()
+              next.zIndex?.let { gmsPoly.zIndex = it.toFloat() }
+            }
+          }
+        }
+      }
+      field = value
+    }
+
+  override var circles: Array<RNCircle>? = null
+    set(value) {
+      val prevById = field?.associateBy { it.id } ?: emptyMap()
+      val nextById = value?.associateBy { it.id } ?: emptyMap()
+
+      (prevById.keys - nextById.keys).forEach { id ->
+        view.removeCircle(id)
+      }
+
+      nextById.forEach { (id, next) ->
+        val prev = prevById[id]
+        if (prev == null) {
+          view.addCircle(id, circleOptions.buildCircleOptions(next))
+        } else if (!prev.circleEquals(next)) {
+          view.updateCircle(id) { gmsCircle ->
+            onUi {
+              gmsCircle.center = LatLng(next.center.latitude, next.center.longitude)
+              next.radius?.let { gmsCircle.radius = it }
+              next.strokeWidth?.let { gmsCircle.strokeWidth = it.dpToPx() }
+              next.strokeColor?.let { gmsCircle.strokeColor = it.toColor() }
+              next.fillColor?.let { gmsCircle.fillColor = it.toColor() }
+              next.zIndex?.let { gmsCircle.zIndex = it.toFloat() } ?: run { gmsCircle.zIndex = 0f }
             }
           }
         }
@@ -193,55 +226,61 @@ class RNGoogleMapsPlusView(
       field = value
     }
 
-  override var onMapError: ((RNMapErrorCode) -> Unit)?
-    get() = view.onMapError
+  override var onMapError: ((RNMapErrorCode) -> Unit)? = null
     set(cb) {
       view.onMapError = cb
     }
 
-  override var onMapReady: ((Boolean) -> Unit)?
-    get() = view.onMapReady
+  override var onMapReady: ((Boolean) -> Unit)? = null
     set(cb) {
       view.onMapReady = cb
     }
-  override var onLocationUpdate: ((RNLocation) -> Unit)?
-    get() = view.onLocationUpdate
+  override var onLocationUpdate: ((RNLocation) -> Unit)? = null
     set(cb) {
       view.onLocationUpdate = cb
     }
 
-  override var onLocationError: ((RNLocationErrorCode) -> Unit)?
-    get() = view.onLocationError
+  override var onLocationError: ((RNLocationErrorCode) -> Unit)? = null
     set(cb) {
       view.onLocationError = cb
     }
 
-  override var onMapPress: ((RNLatLng) -> Unit)?
-    get() = view.onMapPress
+  override var onMapPress: ((RNLatLng) -> Unit)? = null
     set(cb) {
       view.onMapPress = cb
     }
 
-  override var onMarkerPress: ((String) -> Unit)?
-    get() = view.onMarkerPress
+  override var onMarkerPress: ((String) -> Unit)? = null
     set(cb) {
       view.onMarkerPress = cb
     }
 
-  override var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)?
-    get() = view.onCameraChangeStart
+  override var onPolylinePress: ((String) -> Unit)? = null
+    set(cb) {
+      view.onPolylinePress = cb
+    }
+
+  override var onPolygonPress: ((String) -> Unit)? = null
+    set(cb) {
+      view.onPolygonPress = cb
+    }
+
+  override var onCirclePress: ((String) -> Unit)? = null
+    set(cb) {
+      view.onCirclePress = cb
+    }
+
+  override var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChangeStart = cb
     }
 
-  override var onCameraChange: ((RNRegion, RNCamera, Boolean) -> Unit)?
-    get() = view.onCameraChange
+  override var onCameraChange: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChange = cb
     }
 
-  override var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)?
-    get() = view.onCameraChangeComplete
+  override var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChangeComplete = cb
     }
@@ -280,8 +319,9 @@ class RNGoogleMapsPlusView(
 
   override fun isGooglePlayServicesAvailable(): Boolean = playServiceHandler.isPlayServicesAvailable()
 
-  fun userInterfaceStyleToMapColorScheme(value: RNUserInterfaceStyle): Int =
-    when (value) {
+  fun userInterfaceStyleToMapColorScheme(value: RNUserInterfaceStyle?): Int? {
+    value ?: return null
+    return when (value) {
       RNUserInterfaceStyle.LIGHT -> {
         MapColorScheme.LIGHT
       }
@@ -294,8 +334,10 @@ class RNGoogleMapsPlusView(
         MapColorScheme.FOLLOW_SYSTEM
       }
     }
+  }
 
-  fun mapCameraToCameraPosition(camera: RNCamera): CameraPosition {
+  fun mapCameraToCameraPosition(camera: RNCamera?): CameraPosition? {
+    camera ?: return null
     val builder = CameraPosition.builder()
     camera.center?.let {
       builder.target(
@@ -311,21 +353,6 @@ class RNGoogleMapsPlusView(
 
     return builder.build()
   }
-
-  fun mapCameraPotionToCamera(cameraPosition: CameraPosition): RNCamera =
-    RNCamera(
-      center = RNLatLng(cameraPosition.target.latitude, cameraPosition.target.longitude),
-      zoom = cameraPosition.zoom.toDouble(),
-      bearing = cameraPosition.bearing.toDouble(),
-      tilt = cameraPosition.tilt.toDouble(),
-    )
-
-  fun mapColorSchemeToUserInterfaceStyle(value: Int): RNUserInterfaceStyle =
-    when (value) {
-      MapColorScheme.LIGHT -> RNUserInterfaceStyle.LIGHT
-      MapColorScheme.DARK -> RNUserInterfaceStyle.DARK
-      else -> RNUserInterfaceStyle.DEFAULT
-    }
 }
 
 private inline fun onUi(crossinline block: () -> Unit) {

package/ios/Color.swift

@@ -41,17 +41,17 @@ extension UIColor {
   private static func fromRGBFunction(_ s: String) -> UIColor? {
     let nums =
       s
-      .replacingOccurrences(of: "rgba", with: "")
-      .replacingOccurrences(of: "rgb", with: "")
-      .replacingOccurrences(of: "(", with: "")
-      .replacingOccurrences(of: ")", with: "")
-      .split(separator: ",")
-      .map { $0.trimmingCharacters(in: .whitespaces) }
+        .replacingOccurrences(of: "rgba", with: "")
+        .replacingOccurrences(of: "rgb", with: "")
+        .replacingOccurrences(of: "(", with: "")
+        .replacingOccurrences(of: ")", with: "")
+        .split(separator: ",")
+        .map { $0.trimmingCharacters(in: .whitespaces) }
 
     guard nums.count == 3 || nums.count == 4,
-      let r = Double(nums[0]),
-      let g = Double(nums[1]),
-      let b = Double(nums[2])
+          let r = Double(nums[0]),
+          let g = Double(nums[1]),
+          let b = Double(nums[2])
     else { return nil }
     let a = (nums.count == 4) ? (Double(nums[3]) ?? 1.0) : 1.0
     return UIColor(
@@ -65,18 +65,18 @@ extension UIColor {
   private static func fromHSLFunction(_ s: String) -> UIColor? {
     let parts =
       s
-      .replacingOccurrences(of: "hsla", with: "")
-      .replacingOccurrences(of: "hsl", with: "")
-      .replacingOccurrences(of: "(", with: "")
-      .replacingOccurrences(of: ")", with: "")
-      .replacingOccurrences(of: "%", with: "")
-      .split(separator: ",")
-      .map { $0.trimmingCharacters(in: .whitespaces) }
+        .replacingOccurrences(of: "hsla", with: "")
+        .replacingOccurrences(of: "hsl", with: "")
+        .replacingOccurrences(of: "(", with: "")
+        .replacingOccurrences(of: ")", with: "")
+        .replacingOccurrences(of: "%", with: "")
+        .split(separator: ",")
+        .map { $0.trimmingCharacters(in: .whitespaces) }
 
     guard parts.count == 3 || parts.count == 4,
-      let h = Double(parts[0]),
-      let sPerc = Double(parts[1]),
-      let lPerc = Double(parts[2])
+          let h = Double(parts[0]),
+          let sPerc = Double(parts[1]),
+          let lPerc = Double(parts[2])
     else { return nil }
 
     let a = (parts.count == 4) ? (Double(parts[3]) ?? 1.0) : 1.0
@@ -87,7 +87,7 @@ extension UIColor {
     let x = c * (1 - Swift.abs((h / 60).truncatingRemainder(dividingBy: 2) - 1))
     let m = l - c / 2
 
-// swiftlint:disable:next large_tuple
+    // swiftlint:disable:next large_tuple
     let (r1, g1, b1): (Double, Double, Double)
     switch h {
     case 0..<60: (r1, g1, b1) = (c, x, 0)