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

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

@@ -10,8 +10,6 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
 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.common.api.ResolvableApiException
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationCallback
@@ -19,22 +17,43 @@ import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.LocationSettingsRequest
-import com.google.android.gms.location.LocationSettingsStatusCodes
 import com.google.android.gms.location.Priority
+import com.google.android.gms.maps.LocationSource
 import com.google.android.gms.tasks.OnSuccessListener
+import com.rngooglemapsplus.extensions.toLocationErrorCode
 
 private const val REQ_LOCATION_SETTINGS = 2001
+private const val PRIORITY_DEFAULT = Priority.PRIORITY_BALANCED_POWER_ACCURACY
+private const val INTERVAL_DEFAULT = 600000L
+private const val MIN_UPDATE_INTERVAL = 3600000L
 
 class LocationHandler(
   val context: ReactContext,
-) {
+) : LocationSource {
   private val fusedLocationClientProviderClient: FusedLocationProviderClient =
     LocationServices.getFusedLocationProviderClient(context)
+  private var listener: LocationSource.OnLocationChangedListener? = null
   private var locationRequest: LocationRequest? = null
   private var locationCallback: LocationCallback? = null
-  private var priority = Priority.PRIORITY_HIGH_ACCURACY
-  private var interval: Long = 5000
-  private var minUpdateInterval: Long = 5000
+
+  var priority: Int? = PRIORITY_DEFAULT
+    set(value) {
+      field = value
+      start()
+    }
+
+  var interval: Long? = INTERVAL_DEFAULT
+    set(value) {
+      field = value
+      buildLocationRequest()
+    }
+
+  var minUpdateInterval: Long? = MIN_UPDATE_INTERVAL
+    set(value) {
+      field = value
+      buildLocationRequest()
+    }
+
   var onUpdate: ((Location) -> Unit)? = null
   var onError: ((RNLocationErrorCode) -> Unit)? = null
 
@@ -90,6 +109,10 @@ class LocationHandler(
 
   @Suppress("deprecation")
   private fun buildLocationRequest() {
+    val priority = priority ?: Priority.PRIORITY_BALANCED_POWER_ACCURACY
+    val interval = interval ?: INTERVAL_DEFAULT
+    val minUpdateInterval = minUpdateInterval ?: MIN_UPDATE_INTERVAL
+
     locationRequest =
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
         LocationRequest
@@ -106,21 +129,6 @@ class LocationHandler(
     restartLocationUpdates()
   }
 
-  fun setPriority(priority: Int) {
-    this.priority = priority
-    buildLocationRequest()
-  }
-
-  fun setInterval(interval: Int) {
-    this.interval = interval.toLong()
-    buildLocationRequest()
-  }
-
-  fun setFastestInterval(fastestInterval: Int) {
-    this.minUpdateInterval = fastestInterval.toLong()
-    buildLocationRequest()
-  }
-
   private fun restartLocationUpdates() {
     stop()
     // 4) Google Play Services checken – früh zurückmelden
@@ -146,7 +154,7 @@ class LocationHandler(
             }
           },
         ).addOnFailureListener { e ->
-          val error = mapThrowableToCode(e)
+          val error = e.toLocationErrorCode(context)
           onError?.invoke(error)
         }
       locationCallback =
@@ -154,6 +162,7 @@ class LocationHandler(
           override fun onLocationResult(locationResult: LocationResult) {
             val location = locationResult.lastLocation
             if (location != null) {
+              listener?.onLocationChanged(location)
               onUpdate?.invoke(location)
             } else {
               onError?.invoke(RNLocationErrorCode.POSITION_UNAVAILABLE)
@@ -166,40 +175,31 @@ class LocationHandler(
           locationCallback!!,
           Looper.getMainLooper(),
         ).addOnFailureListener { e ->
-          val error = mapThrowableToCode(e)
+          val error = e.toLocationErrorCode(context)
           onError?.invoke(error)
         }
     } catch (se: SecurityException) {
       onError?.invoke(RNLocationErrorCode.PERMISSION_DENIED)
     } catch (ex: Exception) {
-      val error = mapThrowableToCode(ex)
+      val error = ex.toLocationErrorCode(context)
       onError?.invoke(error)
     }
   }
 
-  private fun mapThrowableToCode(t: Throwable): RNLocationErrorCode {
-    if (t is SecurityException) return RNLocationErrorCode.PERMISSION_DENIED
-    if (t.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
-    }
-    if (t is ApiException) {
-      when (t.statusCode) {
-        CommonStatusCodes.NETWORK_ERROR -> return RNLocationErrorCode.POSITION_UNAVAILABLE
-        LocationSettingsStatusCodes.RESOLUTION_REQUIRED,
-        LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE,
-        -> return RNLocationErrorCode.SETTINGS_NOT_SATISFIED
-      }
-      return RNLocationErrorCode.INTERNAL_ERROR
-    }
-    return RNLocationErrorCode.INTERNAL_ERROR
-  }
-
   fun stop() {
+    listener = null
     if (locationCallback != null) {
       fusedLocationClientProviderClient.removeLocationUpdates(locationCallback!!)
       locationCallback = null
     }
   }
+
+  override fun activate(listener: LocationSource.OnLocationChangedListener) {
+    this.listener = listener
+    start()
+  }
+
+  override fun deactivate() {
+    stop()
+  }
 }

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

@@ -0,0 +1,19 @@
+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
+import com.rngooglemapsplus.extensions.toColor
+
+class MapCircleBuilder {
+  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()) }
+    }
+}

package/android/src/main/java/com/rngooglemapsplus/{MapMarker.kt → MapMarkerBuilder.kt}

@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.coroutineContext
 
-class MarkerOptions(
+class MarkerBuilder(
   private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default),
 ) {
   private val iconCache =
@@ -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 → MapPolygonBuilder.kt}

@@ -2,8 +2,9 @@ package com.rngooglemapsplus
 
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.PolygonOptions
+import com.rngooglemapsplus.extensions.toColor
 
-class MapPolygonOptions {
+class MapPolygonBuilder {
   fun buildPolygonOptions(poly: RNPolygon): PolygonOptions =
     PolygonOptions().apply {
       poly.coordinates.forEach { pt ->
@@ -15,22 +16,7 @@ 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 (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/{MapPolyline.kt → MapPolylineBuilder.kt.kt}

@@ -7,8 +7,9 @@ import com.google.android.gms.maps.model.JointType
 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
 
-class MapPolylineOptions {
+class MapPolylineBuilder {
   fun buildPolylineOptions(pl: RNPolyline): PolylineOptions =
     PolylineOptions().apply {
       pl.coordinates.forEach { pt ->
@@ -22,7 +23,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 =
@@ -40,20 +42,3 @@ class MapPolylineOptions {
       null -> JointType.DEFAULT
     }
 }
-
-fun RNPolyline.polylineEquals(b: RNPolyline): Boolean {
-  if (zIndex != b.zIndex) 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
-}