react-native-google-maps-plus 1.3.0-dev.2 → 1.3.0-dev.4

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

@@ -1,8 +1,12 @@
 package com.rngooglemapsplus
 
 import android.annotation.SuppressLint
+import android.graphics.Bitmap
 import android.location.Location
+import android.util.Base64
+import android.util.Size
 import android.widget.FrameLayout
+import androidx.core.graphics.scale
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.PixelUtil.dpToPx
@@ -29,11 +33,15 @@ import com.google.android.gms.maps.model.PolylineOptions
 import com.google.android.gms.maps.model.TileOverlay
 import com.google.android.gms.maps.model.TileOverlayOptions
 import com.google.maps.android.data.kml.KmlLayer
+import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.toGooglePriority
 import com.rngooglemapsplus.extensions.toLocationErrorCode
 import com.rngooglemapsplus.extensions.toRNIndoorBuilding
 import com.rngooglemapsplus.extensions.toRNIndoorLevel
 import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.FileOutputStream
 import java.nio.charset.StandardCharsets
 
 class GoogleMapsViewImpl(
@@ -145,9 +153,9 @@ class GoogleMapsViewImpl(
       }
       initLocationCallbacks()
       applyPending()
+      mapReady = true
+      onMapReady?.invoke(true)
     }
-    mapReady = true
-    onMapReady?.invoke(true)
   }
 
   override fun onCameraMoveStarted(reason: Int) {
@@ -188,6 +196,8 @@ class GoogleMapsViewImpl(
     if (cameraPosition == lastSubmittedCameraPosition) {
       return
     }
+    lastSubmittedCameraPosition = cameraPosition
+
     val isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
 
     val latDelta = bounds.northeast.latitude - bounds.southwest.latitude
@@ -207,7 +217,6 @@ class GoogleMapsViewImpl(
       ),
       isGesture,
     )
-    lastSubmittedCameraPosition = cameraPosition
   }
 
   override fun onCameraIdle() {
@@ -363,6 +372,8 @@ class GoogleMapsViewImpl(
     }
   }
 
+  var initialProps: RNInitialProps? = null
+
   var uiSettings: RNMapUiSettings? = null
     set(value) {
       field = value
@@ -503,7 +514,7 @@ class GoogleMapsViewImpl(
   fun setCamera(
     cameraPosition: CameraPosition,
     animated: Boolean,
-    durationMS: Int,
+    durationMs: Int,
   ) {
     onUi {
       val current = googleMap?.cameraPosition
@@ -514,7 +525,7 @@ class GoogleMapsViewImpl(
       val update = CameraUpdateFactory.newCameraPosition(cameraPosition)
 
       if (animated) {
-        googleMap?.animateCamera(update, durationMS, null)
+        googleMap?.animateCamera(update, durationMs, null)
       } else {
         googleMap?.moveCamera(update)
       }
@@ -525,7 +536,7 @@ class GoogleMapsViewImpl(
     coordinates: Array<RNLatLng>,
     padding: RNMapPadding,
     animated: Boolean,
-    durationMS: Int,
+    durationMs: Int,
   ) {
     if (coordinates.isEmpty()) {
       return
@@ -583,13 +594,85 @@ class GoogleMapsViewImpl(
           0,
         )
       if (animated) {
-        googleMap?.animateCamera(update, durationMS, null)
+        googleMap?.animateCamera(update, durationMs, null)
       } else {
         googleMap?.moveCamera(update)
       }
     }
   }
 
+  fun setCameraBounds(bounds: LatLngBounds?) {
+    onUi {
+      googleMap?.setLatLngBoundsForCameraTarget(bounds)
+    }
+  }
+
+  fun animateToBounds(
+    bounds: LatLngBounds,
+    padding: Int,
+    durationMs: Int,
+    lockBounds: Boolean,
+  ) {
+    onUi {
+      if (lockBounds) {
+        googleMap?.setLatLngBoundsForCameraTarget(bounds)
+      }
+      val update =
+        CameraUpdateFactory.newLatLngBounds(
+          bounds,
+          padding,
+        )
+      googleMap?.animateCamera(update, durationMs, null)
+    }
+  }
+
+  fun snapshot(
+    size: Size?,
+    format: String,
+    compressFormat: Bitmap.CompressFormat,
+    quality: Double,
+    resultIsFile: Boolean,
+  ): Promise<String?> {
+    val promise = Promise<String?>()
+    onUi {
+      googleMap?.snapshot { bitmap ->
+        try {
+          if (bitmap == null) {
+            promise.resolve(null)
+            return@snapshot
+          }
+
+          val scaledBitmap =
+            size?.let {
+              bitmap.scale(it.width, it.height)
+            } ?: bitmap
+
+          val output = ByteArrayOutputStream()
+          scaledBitmap.compress(compressFormat, (quality * 100).toInt().coerceIn(0, 100), output)
+          val bytes = output.toByteArray()
+
+          if (resultIsFile) {
+            val file = File(context.cacheDir, "map_snapshot_${System.currentTimeMillis()}.$format")
+            FileOutputStream(file).use { it.write(bytes) }
+            promise.resolve(file.absolutePath)
+          } else {
+            val base64 = Base64.encodeToString(bytes, Base64.NO_WRAP)
+            promise.resolve("data:image/$format;base64,$base64")
+          }
+
+          if (scaledBitmap != bitmap) {
+            scaledBitmap.recycle()
+          }
+          bitmap.recycle()
+        } catch (e: Exception) {
+          promise.resolve(null)
+        }
+      }
+    }
+
+    return promise
+  }
+
   fun addMarker(
     id: String,
     opts: MarkerOptions,
@@ -894,6 +977,7 @@ class GoogleMapsViewImpl(
 
   fun destroyInternal() {
     onUi {
+      locationHandler.stop()
       markerBuilder.cancelAllJobs()
       clearMarkers()
       clearPolylines()
@@ -901,7 +985,6 @@ class GoogleMapsViewImpl(
       clearCircles()
       clearHeatmaps()
       clearKmlLayer()
-      locationHandler.stop()
       googleMap?.apply {
         setOnCameraMoveStartedListener(null)
         setOnCameraMoveListener(null)
@@ -922,6 +1005,7 @@ class GoogleMapsViewImpl(
       }
       super.removeAllViews()
       reactContext.removeLifecycleEventListener(this)
+      initialized = false
     }
   }
 

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

@@ -131,7 +131,6 @@ class LocationHandler(
 
   private fun restartLocationUpdates() {
     stop()
-    // 4) Google Play Services checken – früh zurückmelden
     val playServicesStatus =
       GoogleApiAvailability
         .getInstance()

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

@@ -6,16 +6,22 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
 import com.rngooglemapsplus.extensions.circleEquals
+import com.rngooglemapsplus.extensions.isFileResult
 import com.rngooglemapsplus.extensions.markerEquals
 import com.rngooglemapsplus.extensions.polygonEquals
 import com.rngooglemapsplus.extensions.polylineEquals
 import com.rngooglemapsplus.extensions.toCameraPosition
+import com.rngooglemapsplus.extensions.toCompressFormat
+import com.rngooglemapsplus.extensions.toFileExtension
+import com.rngooglemapsplus.extensions.toLatLngBounds
 import com.rngooglemapsplus.extensions.toMapColorScheme
+import com.rngooglemapsplus.extensions.toSize
 
 @DoNotStrip
 class RNGoogleMapsPlusView(
   val context: ThemedReactContext,
 ) : HybridRNGoogleMapsPlusViewSpec() {
+  private var propsInitialized = false
   private var currentCustomMapStyle: String? = null
   private var permissionHandler = PermissionHandler(context)
   private var locationHandler = LocationHandler(context)
@@ -30,15 +36,23 @@ class RNGoogleMapsPlusView(
   override val view =
     GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
 
+  override fun afterUpdate() {
+    super.afterUpdate()
+    if (!propsInitialized) {
+      propsInitialized = true
+      view.initMapView(
+        initialProps?.mapId,
+        initialProps?.liteMode,
+        initialProps?.camera?.toCameraPosition(),
+      )
+    }
+  }
+
   override var initialProps: RNInitialProps? = null
     set(value) {
       if (field == value) return
       field = value
-      view.initMapView(
-        value?.mapId,
-        value?.liteMode,
-        value?.camera?.toCameraPosition(),
-      )
+      view.initialProps = value
     }
 
   override var uiSettings: RNMapUiSettings? = null
@@ -343,25 +357,54 @@ class RNGoogleMapsPlusView(
   override fun setCamera(
     camera: RNCamera,
     animated: Boolean?,
-    durationMS: Double?,
+    durationMs: Double?,
   ) {
-    view.setCamera(camera.toCameraPosition(), animated == true, durationMS?.toInt() ?: 3000)
+    view.setCamera(camera.toCameraPosition(), animated == true, durationMs?.toInt() ?: 3000)
   }
 
   override fun setCameraToCoordinates(
     coordinates: Array<RNLatLng>,
     padding: RNMapPadding?,
     animated: Boolean?,
-    durationMS: Double?,
+    durationMs: Double?,
   ) {
     view.setCameraToCoordinates(
       coordinates,
       padding = padding ?: RNMapPadding(0.0, 0.0, 0.0, 0.0),
       animated == true,
-      durationMS?.toInt() ?: 3000,
+      durationMs?.toInt() ?: 3000,
+    )
+  }
+
+  override fun setCameraBounds(bounds: RNLatLngBounds?) {
+    view.setCameraBounds(
+      bounds?.toLatLngBounds(),
+    )
+  }
+
+  override fun animateToBounds(
+    bounds: RNLatLngBounds,
+    padding: Double?,
+    durationMs: Double?,
+    lockBounds: Boolean?,
+  ) {
+    view.animateToBounds(
+      bounds.toLatLngBounds(),
+      padding = padding?.toInt() ?: 0,
+      durationMs?.toInt() ?: 3000,
+      lockBounds = false,
     )
   }
 
+  override fun snapshot(options: RNSnapshotOptions): Promise<String?> =
+    view.snapshot(
+      size = options.size.toSize(),
+      format = options.format.toFileExtension(),
+      compressFormat = options.format.toCompressFormat(),
+      quality = options.quality,
+      resultIsFile = options.resultType.isFileResult(),
+    )
+
   override fun showLocationDialog() {
     locationHandler.showLocationDialog()
   }

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

@@ -0,0 +1,17 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLngBounds
+import com.rngooglemapsplus.RNLatLngBounds
+
+fun RNLatLngBounds.toLatLngBounds(): LatLngBounds =
+  LatLngBounds(
+    LatLng(
+      southWest.latitude,
+      southWest.longitude,
+    ),
+    LatLng(
+      northEast.latitude,
+      northEast.longitude,
+    ),
+  )

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

@@ -0,0 +1,7 @@
+package com.rngooglemapsplus.extensions
+
+import android.util.Size
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.rngooglemapsplus.RNSize
+
+fun RNSize?.toSize(): Size? = this?.let { Size(width.dpToPx().toInt(), height.dpToPx().toInt()) }

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

@@ -0,0 +1,16 @@
+package com.rngooglemapsplus.extensions
+
+import android.graphics.Bitmap
+import com.rngooglemapsplus.RNSnapshotFormat
+
+fun RNSnapshotFormat?.toCompressFormat(): Bitmap.CompressFormat =
+  when (this) {
+    RNSnapshotFormat.JPG, RNSnapshotFormat.JPEG -> Bitmap.CompressFormat.JPEG
+    RNSnapshotFormat.PNG, null -> Bitmap.CompressFormat.PNG
+  }
+
+fun RNSnapshotFormat?.toFileExtension(): String =
+  when (this) {
+    RNSnapshotFormat.JPG, RNSnapshotFormat.JPEG -> "jpg"
+    RNSnapshotFormat.PNG, null -> "png"
+  }

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

@@ -0,0 +1,9 @@
+package com.rngooglemapsplus.extensions
+
+import com.rngooglemapsplus.RNSnapshotResultType
+
+fun RNSnapshotResultType?.isFileResult(): Boolean =
+  when (this) {
+    RNSnapshotResultType.FILE -> true
+    RNSnapshotResultType.BASE64, null -> false
+  }