react-native-google-maps-plus 1.7.0-dev.8 → 1.7.0

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/android/src/main/java/com/rngooglemapsplus/extensions/MapObjectTagExtensions.kt

@@ -0,0 +1,84 @@
+import android.util.Log
+import com.google.android.gms.maps.model.Circle
+import com.google.android.gms.maps.model.Marker
+import com.google.android.gms.maps.model.Polygon
+import com.google.android.gms.maps.model.Polyline
+import com.rngooglemapsplus.RNMarkerSvg
+
+sealed class MapObjectTag(
+  open val id: String,
+)
+
+data class MarkerTag(
+  override val id: String,
+  val iconSvg: RNMarkerSvg? = null,
+) : MapObjectTag(id)
+
+data class PolylineTag(
+  override val id: String,
+) : MapObjectTag(id)
+
+data class PolygonTag(
+  override val id: String,
+) : MapObjectTag(id)
+
+data class CircleTag(
+  override val id: String,
+) : MapObjectTag(id)
+
+val Marker.tagData: MarkerTag
+  get() =
+    (tag as? MarkerTag) ?: run {
+      Log.w("MapTag", "Marker without tag detected at $position")
+      val fallback = MarkerTag(id = "unknown")
+      tag = fallback
+      fallback
+    }
+
+val Marker.idTag: String
+  get() = tagData.id
+
+var Polyline.tagData: PolylineTag
+  get() =
+    (tag as? PolylineTag) ?: run {
+      Log.w("MapTag", "Polyline without tag detected")
+      val fallback = PolylineTag(id = "unknown")
+      tag = fallback
+      fallback
+    }
+  set(value) {
+    tag = value
+  }
+
+val Polyline.idTag: String
+  get() = tagData.id
+
+var Polygon.tagData: PolygonTag
+  get() =
+    (tag as? PolygonTag) ?: run {
+      Log.w("MapTag", "Polygon without tag detected")
+      val fallback = PolygonTag(id = "unknown")
+      tag = fallback
+      fallback
+    }
+  set(value) {
+    tag = value
+  }
+
+val Polygon.idTag: String
+  get() = tagData.id
+
+var Circle.tagData: CircleTag
+  get() =
+    (tag as? CircleTag) ?: run {
+      Log.w("MapTag", "Circle without tag detected")
+      val fallback = CircleTag(id = "unknown")
+      tag = fallback
+      fallback
+    }
+  set(value) {
+    tag = value
+  }
+
+val Circle.idTag: String
+  get() = tagData.id

package/ios/GoogleMapViewImpl.swift

@@ -267,24 +267,43 @@ GMSIndoorDisplayDelegate {
   var onMapPress: ((RNLatLng) -> Void)?
   var onMapLongPress: ((RNLatLng) -> Void)?
   var onPoiPress: ((String, String, RNLatLng) -> Void)?
-  var onMarkerPress: ((String?) -> Void)?
-  var onPolylinePress: ((String?) -> Void)?
-  var onPolygonPress: ((String?) -> Void)?
-  var onCirclePress: ((String?) -> Void)?
-  var onMarkerDragStart: ((String?, RNLatLng) -> Void)?
-  var onMarkerDrag: ((String?, RNLatLng) -> Void)?
-  var onMarkerDragEnd: ((String?, RNLatLng) -> Void)?
+  var onMarkerPress: ((String) -> Void)?
+  var onPolylinePress: ((String) -> Void)?
+  var onPolygonPress: ((String) -> Void)?
+  var onCirclePress: ((String) -> Void)?
+  var onMarkerDragStart: ((String, RNLatLng) -> Void)?
+  var onMarkerDrag: ((String, RNLatLng) -> Void)?
+  var onMarkerDragEnd: ((String, RNLatLng) -> Void)?
   var onIndoorBuildingFocused: ((RNIndoorBuilding) -> Void)?
   var onIndoorLevelActivated: ((RNIndoorLevel) -> Void)?
-  var onInfoWindowPress: ((String?) -> Void)?
-  var onInfoWindowClose: ((String?) -> Void)?
-  var onInfoWindowLongPress: ((String?) -> Void)?
+  var onInfoWindowPress: ((String) -> Void)?
+  var onInfoWindowClose: ((String) -> Void)?
+  var onInfoWindowLongPress: ((String) -> Void)?
   var onMyLocationPress: ((RNLocation) -> Void)?
   var onMyLocationButtonPress: ((Bool) -> Void)?
   var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)?
   var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)?
   var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)?
 
+  @MainActor
+  func showMarkerInfoWindow(id: String) {
+    onMain {
+      guard let marker = self.markersById[id] else { return }
+      self.mapView?.selectedMarker = nil
+      self.mapView?.selectedMarker = marker
+    }
+  }
+
+  @MainActor
+  func hideMarkerInfoWindow(id: String) {
+    onMain {
+      guard let marker = self.markersById[id] else { return }
+      if self.mapView?.selectedMarker == marker {
+        self.mapView?.selectedMarker = nil
+      }
+    }
+  }
+
   @MainActor
   func setCamera(camera: GMSCameraPosition, animated: Bool, durationMs: Double) {
     if animated {
@@ -380,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)
       }
     }
 
@@ -434,14 +427,19 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   private func addMarkerInternal(id: String, marker: GMSMarker) {
-    marker.userData = id
     marker.map = mapView
     markersById[id] = marker
   }
 
   @MainActor
   func updateMarker(id: String, block: @escaping (GMSMarker) -> Void) {
-    markersById[id].map { block($0) }
+    markersById[id].map {
+      block($0)
+      if let mapView, mapView.selectedMarker == $0 {
+        mapView.selectedMarker = nil
+        mapView.selectedMarker = $0
+      }
+    }
   }
 
   @MainActor
@@ -468,8 +466,8 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   private func addPolylineInternal(id: String, polyline: GMSPolyline) {
+    polyline.tagData = PolylineTag(id: id)
     polyline.map = mapView
-    polyline.userData = id
     polylinesById[id] = polyline
   }
 
@@ -502,8 +500,8 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   private func addPolygonInternal(id: String, polygon: GMSPolygon) {
+    polygon.tagData = PolygonTag(id: id)
     polygon.map = mapView
-    polygon.userData = id
     polygonsById[id] = polygon
   }
 
@@ -536,8 +534,8 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   private func addCircleInternal(id: String, circle: GMSCircle) {
+    circle.tagData = CircleTag(id: id)
     circle.map = mapView
-    circle.userData = id
     circlesById[id] = circle
   }
 
@@ -576,7 +574,10 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   func removeHeatmap(id: String) {
-    heatmapsById.removeValue(forKey: id).map { $0.map = nil }
+    heatmapsById.removeValue(forKey: id).map {
+      $0.clearTileCache()
+      $0.map = nil
+    }
   }
 
   @MainActor
@@ -610,6 +611,7 @@ GMSIndoorDisplayDelegate {
         geometries: parser.placemarks
       )
       renderer.render()
+      kmlLayerById[id] = renderer
     }
   }
 
@@ -641,16 +643,23 @@ GMSIndoorDisplayDelegate {
     urlTileOverlay: GMSURLTileLayer
   ) {
     urlTileOverlay.map = mapView
+    urlTileOverlays[id] = urlTileOverlay
   }
 
   @MainActor
   func removeUrlTileOverlay(id: String) {
-    urlTileOverlays.removeValue(forKey: id).map { $0.map = nil }
+    urlTileOverlays.removeValue(forKey: id).map {
+      $0.clearTileCache()
+      $0.map = nil
+    }
   }
 
   @MainActor
   func clearUrlTileOverlay() {
-    urlTileOverlays.values.forEach { $0.map = nil }
+    urlTileOverlays.values.forEach {
+      $0.clearTileCache()
+      $0.map = nil
+    }
     urlTileOverlays.removeAll()
     pendingUrlTileOverlays.removeAll()
   }
@@ -778,23 +787,22 @@ GMSIndoorDisplayDelegate {
 
   func mapView(_ mapView: GMSMapView, didTap marker: GMSMarker) -> Bool {
     onMain {
-      mapView.selectedMarker = marker
-      self.onMarkerPress?(marker.userData as? String, )
+      self.onMarkerPress?(marker.idTag)
     }
-    return false
+    return uiSettings?.consumeOnMarkerPress ?? false
   }
 
   func mapView(_ mapView: GMSMapView, didTap overlay: GMSOverlay) {
     onMain {
       switch overlay {
       case let circle as GMSCircle:
-        self.onCirclePress?(circle.userData as? String, )
+        self.onCirclePress?(circle.idTag)
 
       case let polygon as GMSPolygon:
-        self.onPolygonPress?(polygon.userData as? String, )
+        self.onPolygonPress?(polygon.idTag)
 
       case let polyline as GMSPolyline:
-        self.onPolylinePress?(polyline.userData as? String, )
+        self.onPolylinePress?(polyline.idTag)
 
       default:
         break
@@ -805,7 +813,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didBeginDragging marker: GMSMarker) {
     onMain {
       self.onMarkerDragStart?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -814,7 +822,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didDrag marker: GMSMarker) {
     onMain {
       self.onMarkerDrag?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -823,7 +831,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didEndDragging marker: GMSMarker) {
     onMain {
       self.onMarkerDragEnd?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -857,13 +865,13 @@ GMSIndoorDisplayDelegate {
 
   func mapView(_ mapView: GMSMapView, didTapInfoWindowOf marker: GMSMarker) {
     onMain {
-      self.onInfoWindowPress?(marker.userData as? String)
+      self.onInfoWindowPress?(marker.idTag)
     }
   }
 
   func mapView(_ mapView: GMSMapView, didCloseInfoWindowOf marker: GMSMarker) {
     onMain {
-      self.onInfoWindowClose?(marker.userData as? String)
+      self.onInfoWindowClose?(marker.idTag)
     }
   }
 
@@ -872,7 +880,7 @@ GMSIndoorDisplayDelegate {
     didLongPressInfoWindowOf marker: GMSMarker
   ) {
     onMain {
-      self.onInfoWindowLongPress?(marker.userData as? String)
+      self.onInfoWindowLongPress?(marker.idTag)
     }
   }
 
@@ -891,6 +899,15 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMyLocationButtonPress?(true)
     }
-    return false
+    return uiSettings?.consumeOnMyLocationButtonPress ?? false
+  }
+
+  func mapView(_ mapView: GMSMapView, markerInfoWindow marker: GMSMarker) -> UIView? {
+    return markerBuilder.buildInfoWindow(iconSvg: marker.tagData.iconSvg)
+  }
+
+  func mapView(_ mapView: GMSMapView, markerInfoContents marker: GMSMarker)
+  -> UIView? {
+    return nil
   }
 }

package/ios/MapMarkerBuilder.swift

@@ -15,12 +15,14 @@ final class MapMarkerBuilder {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
     )
-    marker.userData = m.id
     marker.tracksViewChanges = true
     marker.icon = icon
     m.title.map { marker.title = $0 }
     m.snippet.map { marker.snippet = $0 }
-    m.opacity.map { marker.iconView?.alpha = CGFloat($0) }
+    m.opacity.map {
+      marker.opacity = Float($0)
+      marker.iconView?.alpha = CGFloat($0)
+    }
     m.flat.map { marker.isFlat = $0 }
     m.draggable.map { marker.isDraggable = $0 }
     m.rotation.map { marker.rotation = $0 }
@@ -35,6 +37,11 @@ final class MapMarkerBuilder {
     }
     m.zIndex.map { marker.zIndex = Int32($0) }
 
+    marker.tagData = MarkerTag(
+      id: m.id,
+      iconSvg: m.infoWindowIconSvg
+    )
+
     onMainAsync { [weak marker] in
       try? await Task.sleep(nanoseconds: 250_000_000)
       marker?.tracksViewChanges = false
@@ -120,6 +127,12 @@ final class MapMarkerBuilder {
           y: next.infoWindowAnchor?.y ?? 0
         )
       }
+
+      m.tagData = MarkerTag(
+        id: next.id,
+        iconSvg: next.infoWindowIconSvg
+      )
+
     }
   }
 
@@ -177,6 +190,46 @@ final class MapMarkerBuilder {
     iconCache.removeAllObjects()
   }
 
+  @MainActor
+  func buildInfoWindow(iconSvg: RNMarkerSvg?) -> UIImageView? {
+    guard let iconSvg = iconSvg else {
+      return nil
+    }
+
+    guard let data = iconSvg.svgString.data(using: .utf8),
+          let svgImg = SVGKImage(data: data)
+    else {
+      return nil
+    }
+
+    let size = CGSize(
+      width: max(1, CGFloat(iconSvg.width)),
+      height: max(1, CGFloat(iconSvg.height))
+    )
+
+    svgImg.size = size
+
+    guard let base = svgImg.uiImage else {
+      return nil
+    }
+
+    let fmt = UIGraphicsImageRendererFormat.default()
+    fmt.opaque = false
+    fmt.scale = UIScreen.main.scale
+    let renderer = UIGraphicsImageRenderer(size: size, format: fmt)
+
+    let finalImage = renderer.image { _ in
+      base.draw(in: CGRect(origin: .zero, size: size))
+    }
+
+    let imageView = UIImageView(image: finalImage)
+    imageView.frame = CGRect(origin: .zero, size: size)
+    imageView.contentMode = .scaleAspectFit
+    imageView.backgroundColor = .clear
+
+    return imageView
+  }
+
   @MainActor
   private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) async -> UIImage? {
     guard let iconSvg = m.iconSvg,

package/ios/RNGoogleMapsPlusView.swift

@@ -349,31 +349,31 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onPoiPress = onPoiPress }
   }
   @MainActor
-  var onMarkerPress: ((String?) -> Void)? {
+  var onMarkerPress: ((String) -> Void)? {
     didSet { impl.onMarkerPress = onMarkerPress }
   }
   @MainActor
-  var onPolylinePress: ((String?) -> Void)? {
+  var onPolylinePress: ((String) -> Void)? {
     didSet { impl.onPolylinePress = onPolylinePress }
   }
   @MainActor
-  var onPolygonPress: ((String?) -> Void)? {
+  var onPolygonPress: ((String) -> Void)? {
     didSet { impl.onPolygonPress = onPolygonPress }
   }
   @MainActor
-  var onCirclePress: ((String?) -> Void)? {
+  var onCirclePress: ((String) -> Void)? {
     didSet { impl.onCirclePress = onCirclePress }
   }
   @MainActor
-  var onMarkerDragStart: ((String?, RNLatLng) -> Void)? {
+  var onMarkerDragStart: ((String, RNLatLng) -> Void)? {
     didSet { impl.onMarkerDragStart = onMarkerDragStart }
   }
   @MainActor
-  var onMarkerDrag: ((String?, RNLatLng) -> Void)? {
+  var onMarkerDrag: ((String, RNLatLng) -> Void)? {
     didSet { impl.onMarkerDrag = onMarkerDrag }
   }
   @MainActor
-  var onMarkerDragEnd: ((String?, RNLatLng) -> Void)? {
+  var onMarkerDragEnd: ((String, RNLatLng) -> Void)? {
     didSet { impl.onMarkerDragEnd = onMarkerDragEnd }
   }
   @MainActor
@@ -385,15 +385,15 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onIndoorLevelActivated = onIndoorLevelActivated }
   }
   @MainActor
-  var onInfoWindowPress: ((String?) -> Void)? {
+  var onInfoWindowPress: ((String) -> Void)? {
     didSet { impl.onInfoWindowPress = onInfoWindowPress }
   }
   @MainActor
-  var onInfoWindowClose: ((String?) -> Void)? {
+  var onInfoWindowClose: ((String) -> Void)? {
     didSet { impl.onInfoWindowClose = onInfoWindowClose }
   }
   @MainActor
-  var onInfoWindowLongPress: ((String?) -> Void)? {
+  var onInfoWindowLongPress: ((String) -> Void)? {
     didSet { impl.onInfoWindowLongPress = onInfoWindowLongPress }
   }
   @MainActor
@@ -417,6 +417,16 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onCameraChangeComplete = onCameraChangeComplete }
   }
 
+  @MainActor
+  func showMarkerInfoWindow(id: String) {
+    impl.showMarkerInfoWindow(id: id);
+  }
+
+  @MainActor
+  func hideMarkerInfoWindow(id: String) {
+    impl.hideMarkerInfoWindow(id: id);
+  }
+
   @MainActor
   func setCamera(camera: RNCamera, animated: Bool?, durationMs: Double?) {
     let cam = camera.toGMSCameraPosition(current: impl.currentCamera)