react-native-google-maps-plus 1.7.0-dev.1 → 1.7.0-dev.11

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

@@ -0,0 +1,13 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.GoogleMap
+import com.rngooglemapsplus.RNMapType
+
+fun RNMapType.toGoogleMapType(): Int =
+  when (this) {
+    RNMapType.NONE -> GoogleMap.MAP_TYPE_NONE
+    RNMapType.NORMAL -> GoogleMap.MAP_TYPE_NORMAL
+    RNMapType.HYBRID -> GoogleMap.MAP_TYPE_HYBRID
+    RNMapType.SATELLITE -> GoogleMap.MAP_TYPE_SATELLITE
+    RNMapType.TERRAIN -> GoogleMap.MAP_TYPE_TERRAIN
+  }

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

@@ -0,0 +1,13 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.VisibleRegion
+import com.rngooglemapsplus.RNRegion
+
+fun VisibleRegion.toRnRegion(): RNRegion =
+  RNRegion(
+    nearLeft = nearLeft.toRnLatLng(),
+    nearRight = nearRight.toRnLatLng(),
+    farLeft = farLeft.toRnLatLng(),
+    farRight = farRight.toRnLatLng(),
+    latLngBounds = latLngBounds.toRnLatLngBounds(),
+  )

package/ios/GoogleMapViewImpl.swift

@@ -19,6 +19,7 @@ GMSIndoorDisplayDelegate {
   private var pendingCircles: [(id: String, circle: GMSCircle)] = []
   private var pendingHeatmaps: [(id: String, heatmap: GMUHeatmapTileLayer)] = []
   private var pendingKmlLayers: [(id: String, kmlString: String)] = []
+  private var pendingUrlTileOverlays: [(id: String, urlTileOverlay: GMSURLTileLayer)] = []
 
   private var markersById: [String: GMSMarker] = [:]
   private var polylinesById: [String: GMSPolyline] = [:]
@@ -26,9 +27,9 @@ GMSIndoorDisplayDelegate {
   private var circlesById: [String: GMSCircle] = [:]
   private var heatmapsById: [String: GMUHeatmapTileLayer] = [:]
   private var kmlLayerById: [String: GMUGeometryRenderer] = [:]
+  private var urlTileOverlays: [String: GMSURLTileLayer] = [:]
 
   private var cameraMoveReasonIsGesture: Bool = false
-  private var lastSubmittedCameraPosition: GMSCameraPosition?
 
   init(
     frame: CGRect = .zero,
@@ -135,6 +136,12 @@ GMSIndoorDisplayDelegate {
       }
       pendingKmlLayers.removeAll()
     }
+    if !pendingUrlTileOverlays.isEmpty {
+      pendingUrlTileOverlays.forEach {
+        addUrlTileOverlayInternal(id: $0.id, urlTileOverlay: $0.urlTileOverlay)
+      }
+      pendingUrlTileOverlays.removeAll()
+    }
   }
 
   @MainActor
@@ -254,24 +261,49 @@ GMSIndoorDisplayDelegate {
 
   var onMapError: ((RNMapErrorCode) -> Void)?
   var onMapReady: ((Bool) -> Void)?
-  var onMapLoaded: ((Bool) -> Void)?
+  var onMapLoaded: ((RNRegion, RNCamera) -> Void)?
   var onLocationUpdate: ((RNLocation) -> Void)?
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
   var onMapPress: ((RNLatLng) -> Void)?
   var onMapLongPress: ((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 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 onIndoorBuildingFocused: ((RNIndoorBuilding) -> Void)?
   var onIndoorLevelActivated: ((RNIndoorLevel) -> 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 {
@@ -421,14 +453,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
@@ -455,8 +492,8 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   private func addPolylineInternal(id: String, polyline: GMSPolyline) {
+    polyline.tagData = PolylineTag(id: id)
     polyline.map = mapView
-    polyline.userData = id
     polylinesById[id] = polyline
   }
 
@@ -489,8 +526,8 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   private func addPolygonInternal(id: String, polygon: GMSPolygon) {
+    polygon.tagData = PolygonTag(id: id)
     polygon.map = mapView
-    polygon.userData = id
     polygonsById[id] = polygon
   }
 
@@ -523,8 +560,8 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   private func addCircleInternal(id: String, circle: GMSCircle) {
+    circle.tagData = CircleTag(id: id)
     circle.map = mapView
-    circle.userData = id
     circlesById[id] = circle
   }
 
@@ -612,6 +649,36 @@ GMSIndoorDisplayDelegate {
     pendingKmlLayers.removeAll()
   }
 
+  @MainActor
+  func addUrlTileOverlay(id: String, urlTileOverlay: GMSURLTileLayer) {
+    if mapView == nil {
+      pendingUrlTileOverlays.append((id, urlTileOverlay))
+      return
+    }
+    urlTileOverlays.removeValue(forKey: id).map { $0.map = nil }
+    addUrlTileOverlayInternal(id: id, urlTileOverlay: urlTileOverlay)
+  }
+
+  @MainActor
+  private func addUrlTileOverlayInternal(
+    id: String,
+    urlTileOverlay: GMSURLTileLayer
+  ) {
+    urlTileOverlay.map = mapView
+  }
+
+  @MainActor
+  func removeUrlTileOverlay(id: String) {
+    urlTileOverlays.removeValue(forKey: id).map { $0.map = nil }
+  }
+
+  @MainActor
+  func clearUrlTileOverlay() {
+    urlTileOverlays.values.forEach { $0.map = nil }
+    urlTileOverlays.removeAll()
+    pendingUrlTileOverlays.removeAll()
+  }
+
   func deinitInternal() {
     guard !deInitialized else { return }
     deInitialized = true
@@ -624,6 +691,7 @@ GMSIndoorDisplayDelegate {
       self.clearCircles()
       self.clearHeatmaps()
       self.clearKmlLayers()
+      self.clearUrlTileOverlay()
       self.mapView?.clear()
       self.mapView?.indoorDisplay.delegate = nil
       self.mapView?.delegate = nil
@@ -659,53 +727,43 @@ GMSIndoorDisplayDelegate {
   func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {
     guard !loaded else { return }
     loaded = true
-    onMapLoaded?(true)
+    let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
+    let camera = mapView.camera.toRNCamera()
+
+    self.onMapLoaded?(visibleRegion, camera)
   }
 
   func mapView(_ mapView: GMSMapView, willMove gesture: Bool) {
+    if !loaded { return }
     onMain {
       self.cameraMoveReasonIsGesture = gesture
-      let visibleRegion = mapView.projection.visibleRegion()
-      let bounds = GMSCoordinateBounds(region: visibleRegion)
 
-      let region = bounds.toRNRegion()
+      let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()
 
-      self.onCameraChangeStart?(region, camera, gesture)
+      self.onCameraChangeStart?(visibleRegion, camera, gesture)
     }
   }
 
   func mapView(_ mapView: GMSMapView, didChange position: GMSCameraPosition) {
+    if !loaded { return }
     onMain {
-      if let last = self.lastSubmittedCameraPosition,
-         last.target.latitude == position.target.latitude,
-         last.target.longitude == position.target.longitude,
-         last.zoom == position.zoom,
-         last.bearing == position.bearing,
-         last.viewingAngle == position.viewingAngle {
-        return
-      }
-
-      self.lastSubmittedCameraPosition = position
-      let visibleRegion = mapView.projection.visibleRegion()
-      let bounds = GMSCoordinateBounds(region: visibleRegion)
-
-      let region = bounds.toRNRegion()
+      let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()
+      let gesture = self.cameraMoveReasonIsGesture
 
-      self.onCameraChange?(region, camera, self.cameraMoveReasonIsGesture)
+      self.onCameraChange?(visibleRegion, camera, gesture)
     }
   }
 
   func mapView(_ mapView: GMSMapView, idleAt position: GMSCameraPosition) {
+    if !loaded { return }
     onMain {
-      let visibleRegion = mapView.projection.visibleRegion()
-      let bounds = GMSCoordinateBounds(region: visibleRegion)
-
-      let region = bounds.toRNRegion()
+      let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()
+      let gesture = self.cameraMoveReasonIsGesture
 
-      self.onCameraChangeComplete?(region, camera, self.cameraMoveReasonIsGesture)
+      self.onCameraChangeComplete?(visibleRegion, camera, gesture)
     }
   }
 
@@ -731,25 +789,35 @@ GMSIndoorDisplayDelegate {
     }
   }
 
+  func mapView(
+    _ mapView: GMSMapView,
+    didTapPOIWithPlaceID placeID: String,
+    name: String,
+    location: CLLocationCoordinate2D
+  ) {
+    onMain {
+      self.onPoiPress?(placeID, name, location.toRNLatLng())
+    }
+  }
+
   func mapView(_ mapView: GMSMapView, didTap marker: GMSMarker) -> Bool {
     onMain {
-      mapView.selectedMarker = marker
-      self.onMarkerPress?(marker.userData as? String, )
+      self.onMarkerPress?(marker.idTag)
     }
-    return true
+    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
@@ -760,7 +828,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didBeginDragging marker: GMSMarker) {
     onMain {
       self.onMarkerDragStart?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -769,7 +837,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didDrag marker: GMSMarker) {
     onMain {
       self.onMarkerDrag?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -778,7 +846,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didEndDragging marker: GMSMarker) {
     onMain {
       self.onMarkerDragEnd?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -809,4 +877,52 @@ GMSIndoorDisplayDelegate {
       )
     }
   }
+
+  func mapView(_ mapView: GMSMapView, didTapInfoWindowOf marker: GMSMarker) {
+    onMain {
+      self.onInfoWindowPress?(marker.idTag)
+    }
+  }
+
+  func mapView(_ mapView: GMSMapView, didCloseInfoWindowOf marker: GMSMarker) {
+    onMain {
+      self.onInfoWindowClose?(marker.idTag)
+    }
+  }
+
+  func mapView(
+    _ mapView: GMSMapView,
+    didLongPressInfoWindowOf marker: GMSMarker
+  ) {
+    onMain {
+      self.onInfoWindowLongPress?(marker.idTag)
+    }
+  }
+
+  func mapView(
+    _ mapView: GMSMapView,
+    didTapMyLocation location: CLLocationCoordinate2D
+  ) {
+    onMain {
+      self.mapView?.myLocation.map {
+        self.onMyLocationPress?($0.toRnLocation())
+      }
+    }
+  }
+
+  func didTapMyLocationButton(for mapView: GMSMapView) -> Bool {
+    onMain {
+      self.onMyLocationButtonPress?(true)
+    }
+    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/MapCircleBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapCircleBuilder {
+  @MainActor
   func build(_ c: RNCircle) -> GMSCircle {
     let circle = GMSCircle()
     circle.position = c.center.toCLLocationCoordinate2D()
@@ -14,6 +15,7 @@ final class MapCircleBuilder {
     return circle
   }
 
+  @MainActor
   func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
     if prev.center.latitude != next.center.latitude
       || prev.center.longitude != next.center.longitude {

package/ios/MapHeatmapBuilder.swift

@@ -4,6 +4,7 @@ import GoogleMapsUtils
 import UIKit
 
 final class MapHeatmapBuilder {
+  @MainActor
   func build(_ h: RNHeatmap) -> GMUHeatmapTileLayer {
     let heatmap = GMUHeatmapTileLayer()
     heatmap.weightedData = h.weightedData.toWeightedLatLngs()
@@ -18,7 +19,7 @@ final class MapHeatmapBuilder {
       heatmap.gradient = GMUGradient(
         colors: colors,
         startPoints: startPoints,
-        colorMapSize: 256
+        colorMapSize: UInt(g.colorMapSize)
       )
     }
 

package/ios/MapMarkerBuilder.swift

@@ -10,11 +10,11 @@ final class MapMarkerBuilder {
   }()
   private var tasks: [String: Task<Void, Never>] = [:]
 
+  @MainActor
   func build(_ m: RNMarker, icon: UIImage?) -> GMSMarker {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
     )
-    marker.userData = m.id
     marker.tracksViewChanges = true
     marker.icon = icon
     m.title.map { marker.title = $0 }
@@ -34,6 +34,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
@@ -119,6 +124,12 @@ final class MapMarkerBuilder {
           y: next.infoWindowAnchor?.y ?? 0
         )
       }
+
+      m.tagData = MarkerTag(
+        id: next.id,
+        iconSvg: next.infoWindowIconSvg
+      )
+
     }
   }
 
@@ -160,11 +171,13 @@ final class MapMarkerBuilder {
     tasks[id] = task
   }
 
+  @MainActor
   func cancelIconTask(_ id: String) {
     tasks[id]?.cancel()
     tasks.removeValue(forKey: id)
   }
 
+  @MainActor
   func cancelAllIconTasks() {
     let ids = Array(tasks.keys)
     for id in ids {
@@ -174,6 +187,46 @@ final class MapMarkerBuilder {
     iconCache.removeAllObjects()
   }
 
+  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,
           let data = iconSvg.svgString.data(using: .utf8)

package/ios/MapPolygonBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapPolygonBuilder {
+  @MainActor
   func build(_ p: RNPolygon) -> GMSPolygon {
     let path = GMSMutablePath()
     p.coordinates.forEach {
@@ -28,6 +29,7 @@ final class MapPolygonBuilder {
     return pg
   }
 
+  @MainActor
   func update(_ prev: RNPolygon, _ next: RNPolygon, _ pg: GMSPolygon) {
     let coordsChanged =
       prev.coordinates.count != next.coordinates.count

package/ios/MapPolylineBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapPolylineBuilder {
+  @MainActor
   func build(_ p: RNPolyline) -> GMSPolyline {
     let path = GMSMutablePath()
     p.coordinates.forEach {
@@ -22,6 +23,7 @@ final class MapPolylineBuilder {
     return pl
   }
 
+  @MainActor
   func update(_ prev: RNPolyline, _ next: RNPolyline, _ pl: GMSPolyline) {
     let coordsChanged =
       prev.coordinates.count != next.coordinates.count

package/ios/MapUrlTileOverlayBuilder.swift

@@ -0,0 +1,24 @@
+import GoogleMaps
+
+class MapUrlTileOverlayBuilder {
+  @MainActor
+  func build(_ t: RNUrlTileOverlay) -> GMSURLTileLayer {
+
+    let constructor: GMSTileURLConstructor = { (x: UInt, y: UInt, zoom: UInt) in
+      let urlString = t.url
+        .replacingOccurrences(of: "{x}", with: "\(x)")
+        .replacingOccurrences(of: "{y}", with: "\(y)")
+        .replacingOccurrences(of: "{z}", with: "\(zoom)")
+      return URL(string: urlString)
+    }
+
+    let layer = GMSURLTileLayer(urlConstructor: constructor)
+
+    layer.tileSize = Int(t.tileSize)
+    t.opacity.map { layer.opacity = Float($0) }
+    t.zIndex.map { layer.zIndex = Int32($0) }
+    t.fadeIn.map { layer.fadeIn = $0 }
+
+    return layer
+  }
+}