react-native-google-maps-plus 1.7.0-dev.10 → 1.7.0-dev.12

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

@@ -7,7 +7,6 @@ import PolylineTag
 import android.annotation.SuppressLint
 import android.graphics.Bitmap
 import android.location.Location
-import android.util.Base64
 import android.util.Size
 import android.view.View
 import android.widget.FrameLayout
@@ -38,6 +37,7 @@ 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.encode
 import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.onUiSync
 import com.rngooglemapsplus.extensions.toGooglePriority
@@ -50,12 +50,10 @@ import com.rngooglemapsplus.extensions.toRnCamera
 import com.rngooglemapsplus.extensions.toRnLatLng
 import com.rngooglemapsplus.extensions.toRnLocation
 import com.rngooglemapsplus.extensions.toRnRegion
+import com.rngooglemapsplus.extensions.withPaddingPixels
 import idTag
 import tagData
 import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.FileOutputStream
 import java.nio.charset.StandardCharsets
 
 class GoogleMapsViewImpl(
@@ -427,56 +425,23 @@ class GoogleMapsViewImpl(
     durationMs: Int,
   ) = onUi {
     if (coordinates.isEmpty()) return@onUi
-    val builder = LatLngBounds.Builder()
+
+    val w = mapView?.width ?: 0
+    val h = mapView?.height ?: 0
+
+    val builder = LatLngBounds.builder()
     coordinates.forEach { coord -> builder.include(coord.toLatLng()) }
-    val bounds = builder.build()
-
-    val latSpan = bounds.northeast.latitude - bounds.southwest.latitude
-    val lngSpan = bounds.northeast.longitude - bounds.southwest.longitude
-
-    val h = (mapView?.height ?: 0)
-    val w = (mapView?.width ?: 0)
-    val latPerPixel = if (h != 0) latSpan / h else 0.0
-    val lngPerPixel = if (w != 0) lngSpan / w else 0.0
-
-    builder.include(
-      LatLng(
-        bounds.northeast.latitude + (padding.top.dpToPx() * latPerPixel),
-        bounds.northeast.longitude,
-      ),
-    )
-    builder.include(
-      LatLng(
-        bounds.southwest.latitude - (padding.bottom.dpToPx() * latPerPixel),
-        bounds.southwest.longitude,
-      ),
-    )
-    builder.include(
-      LatLng(
-        bounds.northeast.latitude,
-        bounds.northeast.longitude + (padding.right.dpToPx() * lngPerPixel),
-      ),
-    )
-    builder.include(
-      LatLng(
-        bounds.southwest.latitude,
-        bounds.southwest.longitude - (padding.left.dpToPx() * lngPerPixel),
-      ),
-    )
-
-    val paddedBounds = builder.build()
+
+    val baseBounds = builder.build()
+    val paddedBounds = baseBounds.withPaddingPixels(w, h, padding)
+
     val adjustedWidth =
       (w - padding.left.dpToPx() - padding.right.dpToPx()).toInt().coerceAtLeast(0)
     val adjustedHeight =
       (h - padding.top.dpToPx() - padding.bottom.dpToPx()).toInt().coerceAtLeast(0)
 
-    val update =
-      CameraUpdateFactory.newLatLngBounds(
-        paddedBounds,
-        adjustedWidth,
-        adjustedHeight,
-        0,
-      )
+    val update = CameraUpdateFactory.newLatLngBounds(paddedBounds, adjustedWidth, adjustedHeight, 0)
+
     if (animated) {
       googleMap?.animateCamera(update, durationMs, null)
     } else {
@@ -512,30 +477,9 @@ class GoogleMapsViewImpl(
     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 (_: Exception) {
-          promise.resolve(null)
-        }
+        bitmap
+          ?.encode(context, size, format, compressFormat, quality, resultIsFile)
+          ?.let(promise::resolve) ?: promise.resolve(null)
       }
     }
     return promise

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

@@ -0,0 +1,35 @@
+package com.rngooglemapsplus.extensions
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.util.Base64
+import android.util.Size
+import androidx.core.graphics.scale
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.FileOutputStream
+
+fun Bitmap.encode(
+  context: Context,
+  targetSize: Size?,
+  format: String,
+  compressFormat: Bitmap.CompressFormat,
+  quality: Double,
+  asFile: Boolean,
+): String? =
+  try {
+    targetSize?.let { scale(it.width, it.height) }
+    val output = ByteArrayOutputStream()
+    compress(compressFormat, (quality * 100).toInt().coerceIn(0, 100), output)
+    val bytes = output.toByteArray()
+
+    if (asFile) {
+      val file = File(context.cacheDir, "snapshot_${System.currentTimeMillis()}.$format")
+      FileOutputStream(file).use { it.write(bytes) }
+      file.absolutePath
+    } else {
+      "data:image/$format;base64," + Base64.encodeToString(bytes, Base64.NO_WRAP)
+    }
+  } catch (_: Exception) {
+    null
+  }

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

@@ -1,10 +1,41 @@
 package com.rngooglemapsplus.extensions
 
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.rngooglemapsplus.RNLatLngBounds
+import com.rngooglemapsplus.RNMapPadding
 
 fun LatLngBounds.toRnLatLngBounds(): RNLatLngBounds =
   RNLatLngBounds(
     northeast = northeast.toRnLatLng(),
     southwest = southwest.toRnLatLng(),
   )
+
+fun LatLngBounds.withPaddingPixels(
+  mapWidthPx: Int,
+  mapHeightPx: Int,
+  padding: RNMapPadding,
+): LatLngBounds {
+  val latSpan = northeast.latitude - southwest.latitude
+  val lngSpan = northeast.longitude - southwest.longitude
+  if (latSpan == 0.0 && lngSpan == 0.0) return this
+
+  val latPerPixel = if (mapHeightPx != 0) latSpan / mapHeightPx else 0.0
+  val lngPerPixel = if (mapWidthPx != 0) lngSpan / mapWidthPx else 0.0
+
+  val builder = LatLngBounds.builder()
+  builder.include(
+    LatLng(
+      northeast.latitude + (padding.top.dpToPx() * latPerPixel),
+      northeast.longitude + (padding.right.dpToPx() * lngPerPixel),
+    ),
+  )
+  builder.include(
+    LatLng(
+      southwest.latitude - (padding.bottom.dpToPx() * latPerPixel),
+      southwest.longitude - (padding.left.dpToPx() * lngPerPixel),
+    ),
+  )
+  return builder.build()
+}

package/ios/GoogleMapViewImpl.swift

@@ -288,7 +288,7 @@ GMSIndoorDisplayDelegate {
   @MainActor
   func showMarkerInfoWindow(id: String) {
     onMain {
-      guard let marker =  self.markersById[id] else { return }
+      guard let marker = self.markersById[id] else { return }
       self.mapView?.selectedMarker = nil
       self.mapView?.selectedMarker = marker
     }
@@ -399,42 +399,16 @@ GMSIndoorDisplayDelegate {
         mapView.layer.render(in: ctx.cgContext)
       }
 
-      var finalImage = image
-
-      size.map {
-        UIGraphicsBeginImageContextWithOptions($0, false, 0.0)
-        image.draw(in: CGRect(origin: .zero, size: $0))
-        finalImage = UIGraphicsGetImageFromCurrentImageContext() ?? image
-        UIGraphicsEndImageContext()
-      }
-
-      let data: Data?
-      switch imageFormat {
-      case .jpeg:
-        data = finalImage.jpegData(compressionQuality: quality)
-      case .png:
-        data = finalImage.pngData()
-      }
-
-      guard let imageData = data else {
-        promise.resolve(withResult: nil)
-        return
-      }
-
-      if resultIsFile {
-        let filename =
-          "map_snapshot_\(Int(Date().timeIntervalSince1970)).\(format)"
-        let fileURL = URL(fileURLWithPath: NSTemporaryDirectory())
-          .appendingPathComponent(filename)
-        do {
-          try imageData.write(to: fileURL)
-          promise.resolve(withResult: fileURL.path)
-        } catch {
-          promise.resolve(withResult: nil)
-        }
+      if let result = image.encode(
+        targetSize: size,
+        format: format,
+        imageFormat: imageFormat,
+        quality: quality,
+        resultIsFile: resultIsFile
+      ) {
+        promise.resolve(withResult: result)
       } else {
-        let base64 = imageData.base64EncodedString()
-        promise.resolve(withResult: "data:image/\(format);base64,\(base64)")
+        promise.resolve(withResult: nil)
       }
     }
 

package/ios/extensions/UIImage+Extension.swift

@@ -0,0 +1,45 @@
+import UIKit
+
+extension UIImage {
+  func encode(
+    targetSize: CGSize? = nil,
+    format: String = "png",
+    imageFormat: ImageFormat = .png,
+    quality: CGFloat = 1.0,
+    resultIsFile: Bool = false
+  ) -> String? {
+    var imageToEncode = self
+
+    if let targetSize = targetSize {
+      UIGraphicsBeginImageContextWithOptions(targetSize, false, 0.0)
+      self.draw(in: CGRect(origin: .zero, size: targetSize))
+      imageToEncode = UIGraphicsGetImageFromCurrentImageContext() ?? self
+      UIGraphicsEndImageContext()
+    }
+
+    let data: Data?
+    switch imageFormat {
+    case .jpeg:
+      data = imageToEncode.jpegData(compressionQuality: quality)
+    case .png:
+      data = imageToEncode.pngData()
+    }
+
+    guard let imageData = data else { return nil }
+
+    if resultIsFile {
+      let filename = "snapshot_\(Int(Date().timeIntervalSince1970)).\(format)"
+      let fileURL = FileManager.default.temporaryDirectory
+        .appendingPathComponent(filename)
+      do {
+        try imageData.write(to: fileURL)
+        return fileURL.path
+      } catch {
+        return nil
+      }
+    } else {
+      let base64 = imageData.base64EncodedString()
+      return "data:image/\(format);base64,\(base64)"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.10",
+  "version": "1.7.0-dev.12",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",