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

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

@@ -4,119 +4,142 @@ import com.facebook.proguard.annotations.DoNotStrip
 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.MapColorScheme
+import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
+import com.rngooglemapsplus.extensions.circleEquals
+import com.rngooglemapsplus.extensions.polygonEquals
+import com.rngooglemapsplus.extensions.polylineEquals
+import com.rngooglemapsplus.extensions.toCameraPosition
+import com.rngooglemapsplus.extensions.toColor
+import com.rngooglemapsplus.extensions.toMapColorScheme
 
 @DoNotStrip
 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 markerBuilder = MarkerBuilder()
+  private val polylineBuilder = MapPolylineBuilder()
+  private val polygonBuilder = MapPolygonBuilder()
+  private val circleBuilder = MapCircleBuilder()
 
   override val view =
-    GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerOptions)
+    GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
+
+  override var initialProps: RNInitialProps? = null
+    set(value) {
+      view.initMapView(
+        value?.mapId,
+        value?.liteMode,
+        value?.camera?.toCameraPosition(),
+      )
+    }
 
-  private val polylineOptions = MapPolylineOptions()
-  private val polygonOptions = MapPolygonOptions()
+  override var uiSettings: RNMapUiSettings? = null
+    set(value) {
+      view.uiSettings = value
+    }
+
+  override var myLocationEnabled: Boolean? = null
+    set(value) {
+      view.myLocationEnabled = value
+    }
 
-  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 indoorEnabled: Boolean? = null
     set(value) {
-      currentCustomMapStyle = value
-      view.customMapStyle = MapStyleOptions(value)
+      view.indoorEnabled = value
     }
 
-  override var initialCamera: RNCamera
-    get() = mapCameraPotionToCamera(view.initialCamera)
+  override var customMapStyle: String? = null
     set(value) {
-      view.initialCamera = mapCameraToCameraPosition(value)
+      currentCustomMapStyle = 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)
+      view.userInterfaceStyle = value.toMapColorScheme()
     }
 
-  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)
+        markerBuilder.cancelIconJob(id)
         view.removeMarker(id)
       }
 
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          markerOptions.buildIconAsync(id, next) { icon ->
+          markerBuilder.buildIconAsync(id, next) { icon ->
             view.addMarker(
               id,
-              markerOptions.build(next, icon),
+              markerBuilder.build(next, icon),
             )
           }
         } 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 ->
+                markerBuilder.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 +147,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)
@@ -136,24 +159,24 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolyline(id, polylineOptions.buildPolylineOptions(next))
+          view.addPolyline(id, polylineBuilder.buildPolylineOptions(next))
         } else if (!prev.polylineEquals(next)) {
           view.updatePolyline(id) { gms ->
             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 {
-                val cap = polylineOptions.mapLineCap(it)
+                val cap = polylineBuilder.mapLineCap(it)
                 gms.startCap = cap
                 gms.endCap = cap
               }
-              next.lineJoin?.let { gms.jointType = polylineOptions.mapLineJoin(it) }
+              next.lineJoin?.let { gms.jointType = polylineBuilder.mapLineJoin(it) }
               next.color?.let { gms.color = it.toColor() }
-              gms.zIndex = next.zIndex.toFloat()
+              next.zIndex?.let { gms.zIndex = it.toFloat() }
             }
           }
         }
@@ -161,10 +184,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)
@@ -173,7 +196,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolygon(id, polygonOptions.buildPolygonOptions(next))
+          view.addPolygon(id, polygonBuilder.buildPolygonOptions(next))
         } else if (!prev.polygonEquals(next)) {
           view.updatePolygon(id) { gmsPoly ->
             onUi {
@@ -185,7 +208,7 @@ 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() }
             }
           }
         }
@@ -193,55 +216,95 @@ class RNGoogleMapsPlusView(
       field = value
     }
 
-  override var onMapError: ((RNMapErrorCode) -> Unit)?
-    get() = view.onMapError
+  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, circleBuilder.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 }
+            }
+          }
+        }
+      }
+      field = value
+    }
+
+  override var locationConfig: RNLocationConfig? = null
+    set(value) {
+      view.locationConfig = value
+    }
+
+  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
     }
@@ -251,7 +314,7 @@ class RNGoogleMapsPlusView(
     animated: Boolean?,
     durationMS: Double?,
   ) {
-    view.setCamera(camera, animated == true, durationMS?.toInt() ?: 3000)
+    view.setCamera(camera.toCameraPosition(), animated == true, durationMS?.toInt() ?: 3000)
   }
 
   override fun setCameraToCoordinates(
@@ -279,53 +342,6 @@ class RNGoogleMapsPlusView(
   override fun requestLocationPermission(): Promise<RNLocationPermissionResult> = permissionHandler.requestLocationPermission()
 
   override fun isGooglePlayServicesAvailable(): Boolean = playServiceHandler.isPlayServicesAvailable()
-
-  fun userInterfaceStyleToMapColorScheme(value: RNUserInterfaceStyle): Int =
-    when (value) {
-      RNUserInterfaceStyle.LIGHT -> {
-        MapColorScheme.LIGHT
-      }
-
-      RNUserInterfaceStyle.DARK -> {
-        MapColorScheme.DARK
-      }
-
-      RNUserInterfaceStyle.DEFAULT -> {
-        MapColorScheme.FOLLOW_SYSTEM
-      }
-    }
-
-  fun mapCameraToCameraPosition(camera: RNCamera): CameraPosition {
-    val builder = CameraPosition.builder()
-    camera.center?.let {
-      builder.target(
-        com.google.android.gms.maps.model.LatLng(
-          camera.center.latitude,
-          camera.center.longitude,
-        ),
-      )
-    }
-    camera.zoom?.let { builder.zoom(it.toFloat()) }
-    camera.bearing?.let { builder.bearing(it.toFloat()) }
-    camera.tilt?.let { builder.tilt(it.toFloat()) }
-
-    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/android/src/main/java/com/rngooglemapsplus/extensions/RNCameraExtension.kt

@@ -0,0 +1,19 @@
+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))
+  }
+
+  zoom?.let { builder.zoom(it.toFloat()) }
+  bearing?.let { builder.bearing(it.toFloat()) }
+  tilt?.let { builder.tilt(it.toFloat()) }
+
+  return builder.build()
+}

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

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.location.Priority
+import com.rngooglemapsplus.RNAndroidLocationPriority
+
+fun RNAndroidLocationPriority.toGooglePriority(): Int =
+  when (this) {
+    RNAndroidLocationPriority.PRIORITY_HIGH_ACCURACY -> Priority.PRIORITY_HIGH_ACCURACY
+    RNAndroidLocationPriority.PRIORITY_BALANCED_POWER_ACCURACY -> Priority.PRIORITY_BALANCED_POWER_ACCURACY
+    RNAndroidLocationPriority.PRIORITY_LOW_POWER -> Priority.PRIORITY_LOW_POWER
+    RNAndroidLocationPriority.PRIORITY_PASSIVE -> Priority.PRIORITY_PASSIVE
+  }

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

@@ -0,0 +1,14 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNCircle
+
+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/extensions/RNPolygonExtension.kt

@@ -0,0 +1,20 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNPolygon
+
+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
+  val ac = coordinates
+  val bc = b.coordinates
+  if (ac.size != bc.size) return false
+  for (i in ac.indices) {
+    val p = ac[i]
+    val q = bc[i]
+    if (p.latitude != q.latitude || p.longitude != q.longitude) return false
+  }
+  return true
+}

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

@@ -0,0 +1,21 @@
+package com.rngooglemapsplus.extensions
+
+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 (lineCap != b.lineCap) return false
+  if (lineJoin != b.lineJoin) return false
+  if (color != b.color) return false
+  val ac = coordinates
+  val bc = b.coordinates
+  if (ac.size != bc.size) return false
+  for (i in ac.indices) {
+    val p = ac[i]
+    val q = bc[i]
+    if (p.latitude != q.latitude || p.longitude != q.longitude) return false
+  }
+  return true
+}

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

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.MapColorScheme
+import com.rngooglemapsplus.RNUserInterfaceStyle
+
+fun RNUserInterfaceStyle?.toMapColorScheme(): Int? =
+  when (this) {
+    RNUserInterfaceStyle.LIGHT -> MapColorScheme.LIGHT
+    RNUserInterfaceStyle.DARK -> MapColorScheme.DARK
+    RNUserInterfaceStyle.DEFAULT -> MapColorScheme.FOLLOW_SYSTEM
+    null -> null
+  }

package/android/src/main/java/com/rngooglemapsplus/{Color.kt → extensions/StringExtension.kt}

@@ -1,4 +1,4 @@
-package com.rngooglemapsplus
+package com.rngooglemapsplus.extensions
 
 import android.graphics.Color
 import androidx.core.graphics.toColorInt

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

@@ -0,0 +1,38 @@
+package com.rngooglemapsplus.extensions
+
+import android.content.Context
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.common.api.CommonStatusCodes
+import com.google.android.gms.location.LocationSettingsStatusCodes
+import com.rngooglemapsplus.RNLocationErrorCode
+
+fun Throwable.toLocationErrorCode(context: Context): RNLocationErrorCode {
+  return when (this) {
+    is SecurityException -> RNLocationErrorCode.PERMISSION_DENIED
+
+    is ApiException ->
+      when (statusCode) {
+        CommonStatusCodes.NETWORK_ERROR ->
+          RNLocationErrorCode.POSITION_UNAVAILABLE
+        LocationSettingsStatusCodes.RESOLUTION_REQUIRED,
+        LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE,
+        ->
+          RNLocationErrorCode.SETTINGS_NOT_SATISFIED
+        else ->
+          RNLocationErrorCode.INTERNAL_ERROR
+      }
+
+    else -> {
+      if (message?.contains("GoogleApi", ignoreCase = true) == true) {
+        val gms = GoogleApiAvailability.getInstance()
+        val status = gms.isGooglePlayServicesAvailable(context)
+        if (status != ConnectionResult.SUCCESS) {
+          return RNLocationErrorCode.PLAY_SERVICE_NOT_AVAILABLE
+        }
+      }
+      RNLocationErrorCode.INTERNAL_ERROR
+    }
+  }
+}