react-native-google-maps-plus 1.7.0-dev.9 → 1.8.0-dev.1

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

@@ -0,0 +1,14 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.ButtCap
+import com.google.android.gms.maps.model.Cap
+import com.google.android.gms.maps.model.RoundCap
+import com.google.android.gms.maps.model.SquareCap
+import com.rngooglemapsplus.RNLineCapType
+
+fun RNLineCapType?.toMapLineCap(): Cap =
+  when (this) {
+    RNLineCapType.ROUND -> RoundCap()
+    RNLineCapType.SQUARE -> SquareCap()
+    else -> ButtCap()
+  }

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

@@ -0,0 +1,12 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.JointType
+import com.rngooglemapsplus.RNLineJoinType
+
+fun RNLineJoinType?.toMapJointType(): Int =
+  when (this) {
+    RNLineJoinType.ROUND -> JointType.ROUND
+    RNLineJoinType.BEVEL -> JointType.BEVEL
+    RNLineJoinType.MITER -> JointType.DEFAULT
+    null -> JointType.DEFAULT
+  }

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

@@ -3,12 +3,18 @@ package com.rngooglemapsplus.extensions
 import com.rngooglemapsplus.RNCircle
 
 fun RNCircle.circleEquals(b: RNCircle): Boolean {
+  if (!centerEquals(b)) return false
   if (zIndex != b.zIndex) return false
   if (pressable != b.pressable) return false
-  if (center != b.center) return false
   if (radius != b.radius) return false
   if (strokeWidth != b.strokeWidth) return false
   if (strokeColor != b.strokeColor) return false
   if (fillColor != b.fillColor) return false
   return true
 }
+
+fun RNCircle.centerEquals(b: RNCircle): Boolean {
+  if (center.latitude != b.center.latitude) return false
+  if (center.longitude != b.center.longitude) return false
+  return true
+}

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

@@ -2,24 +2,61 @@ package com.rngooglemapsplus.extensions
 
 import com.rngooglemapsplus.RNMarker
 
-fun RNMarker.markerEquals(b: RNMarker): Boolean =
-  id == b.id &&
-    zIndex == b.zIndex &&
-    coordinate == b.coordinate &&
-    anchor == b.anchor &&
-    showInfoWindow == b.showInfoWindow &&
-    title == b.title &&
-    snippet == b.snippet &&
-    opacity == b.opacity &&
-    flat == b.flat &&
-    draggable == b.draggable &&
-    rotation == b.rotation &&
-    infoWindowAnchor == b.infoWindowAnchor &&
-    markerStyleEquals(b)
-
-fun RNMarker.markerStyleEquals(b: RNMarker): Boolean = iconSvg == b.iconSvg
+fun RNMarker.markerEquals(b: RNMarker): Boolean {
+  if (id != b.id) return false
+  if (zIndex != b.zIndex) return false
+  if (!coordinatesEquals(b)) return false
+  if (!anchorEquals(b)) return false
+  if (!infoWindowAnchorEquals(b)) return false
+  if (title != b.title) return false
+  if (snippet != b.snippet) return false
+  if (opacity != b.opacity) return false
+  if (flat != b.flat) return false
+  if (draggable != b.draggable) return false
+  if (rotation != b.rotation) return false
+  if (!markerInfoWindowStyleEquals(b)) return false
+  if (!markerStyleEquals(b)) return false
+
+  return true
+}
+
+fun RNMarker.coordinatesEquals(b: RNMarker): Boolean {
+  if (coordinate.latitude != b.coordinate.latitude) return false
+  if (coordinate.longitude != b.coordinate.longitude) return false
+  return true
+}
+
+fun RNMarker.anchorEquals(b: RNMarker): Boolean {
+  if (anchor?.x != b.anchor?.x) return false
+  if (anchor?.y != b.anchor?.y) return false
+  return true
+}
+
+fun RNMarker.infoWindowAnchorEquals(b: RNMarker): Boolean {
+  if (infoWindowAnchor?.x != b.infoWindowAnchor?.x) return false
+  if (infoWindowAnchor?.y != b.infoWindowAnchor?.y) return false
+  return true
+}
+
+fun RNMarker.markerInfoWindowStyleEquals(b: RNMarker): Boolean {
+  if (infoWindowIconSvg?.width != b.infoWindowIconSvg?.width) return false
+  if (infoWindowIconSvg?.height != b.infoWindowIconSvg?.height) return false
+  if (infoWindowIconSvg?.svgString != b.infoWindowIconSvg?.svgString) return false
+
+  return true
+}
+
+fun RNMarker.markerStyleEquals(b: RNMarker): Boolean {
+  if (iconSvg?.width != b.iconSvg?.width) return false
+  if (iconSvg?.height != b.iconSvg?.height) return false
+  if (iconSvg?.svgString != b.iconSvg?.svgString) return false
+
+  return true
+}
 
 fun RNMarker.styleHash(): Int =
   arrayOf<Any?>(
-    iconSvg,
+    iconSvg?.width,
+    iconSvg?.height,
+    iconSvg?.svgString,
   ).contentHashCode()

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

@@ -1,6 +1,8 @@
 package com.rngooglemapsplus.extensions
 
+import com.google.android.gms.maps.model.LatLng
 import com.rngooglemapsplus.RNPolygon
+import com.rngooglemapsplus.RNPolygonHole
 
 fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   if (zIndex != b.zIndex) return false
@@ -9,7 +11,12 @@ fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   if (fillColor != b.fillColor) return false
   if (strokeColor != b.strokeColor) return false
   if (geodesic != b.geodesic) return false
-  if (!holes.contentEquals(b.holes)) return false
+  if (!coordinatesEquals(b)) return false
+  if (!holesEquals(b)) return false
+  return true
+}
+
+fun RNPolygon.coordinatesEquals(b: RNPolygon): Boolean {
   val ac = coordinates
   val bc = b.coordinates
   if (ac.size != bc.size) return false
@@ -20,3 +27,26 @@ fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   }
   return true
 }
+
+fun RNPolygon.holesEquals(b: RNPolygon): Boolean {
+  if (holes?.size != b.holes?.size) return false
+  if (holes != null && b.holes != null) {
+    for (i in holes.indices) {
+      val ah = holes[i]
+      val bh = b.holes[i]
+
+      if (ah.coordinates.size != bh.coordinates.size) return false
+      for (j in ah.coordinates.indices) {
+        val p = ah.coordinates[j]
+        val q = bh.coordinates[j]
+        if (p.latitude != q.latitude || p.longitude != q.longitude) return false
+      }
+    }
+  }
+  return true
+}
+
+fun Array<RNPolygonHole>.toMapsPolygonHoles(): List<List<LatLng>> =
+  this.map { hole ->
+    hole.coordinates.map { it.toLatLng() }
+  }

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

@@ -5,11 +5,16 @@ import com.rngooglemapsplus.RNPolyline
 fun RNPolyline.polylineEquals(b: RNPolyline): Boolean {
   if (zIndex != b.zIndex) return false
   if (pressable != b.pressable) return false
-  if ((width ?: 0.0) != (b.width ?: 0.0)) return false
+  if (width != b.width) return false
   if (lineCap != b.lineCap) return false
   if (lineJoin != b.lineJoin) return false
   if (geodesic != b.geodesic) return false
   if (color != b.color) return false
+  if (!coordinatesEquals(b)) return false
+  return true
+}
+
+fun RNPolyline.coordinatesEquals(b: RNPolyline): Boolean {
   val ac = coordinates
   val bc = b.coordinates
   if (ac.size != bc.size) return false

package/ios/GoogleMapViewImpl.swift

@@ -261,29 +261,48 @@ GMSIndoorDisplayDelegate {
 
   var onMapError: ((RNMapErrorCode) -> Void)?
   var onMapReady: ((Bool) -> Void)?
-  var onMapLoaded: ((RNRegion, RNCamera) -> Void)?
+  var onMapLoaded: ((RNRegion, RNCameraChange) -> Void)?
   var onLocationUpdate: ((RNLocation) -> Void)?
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
   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)?
+  var onCameraChangeStart: ((RNRegion, RNCameraChange, Bool) -> Void)?
+  var onCameraChange: ((RNRegion, RNCameraChange, Bool) -> Void)?
+  var onCameraChangeComplete: ((RNRegion, RNCameraChange, 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) {
@@ -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,19 +427,27 @@ 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
   func removeMarker(id: String) {
-    markersById.removeValue(forKey: id).map { $0.map = nil }
+    markersById.removeValue(forKey: id).map {
+      $0.icon = nil
+      $0.map = nil
+    }
   }
 
   @MainActor
@@ -468,8 +469,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 +503,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 +537,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 +577,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 +614,7 @@ GMSIndoorDisplayDelegate {
         geometries: parser.placemarks
       )
       renderer.render()
+      kmlLayerById[id] = renderer
     }
   }
 
@@ -641,16 +646,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,8 +790,7 @@ GMSIndoorDisplayDelegate {
 
   func mapView(_ mapView: GMSMapView, didTap marker: GMSMarker) -> Bool {
     onMain {
-      mapView.selectedMarker = marker
-      self.onMarkerPress?(marker.userData as? String, )
+      self.onMarkerPress?(marker.idTag)
     }
     return uiSettings?.consumeOnMarkerPress ?? false
   }
@@ -788,13 +799,13 @@ GMSIndoorDisplayDelegate {
     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 +816,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didBeginDragging marker: GMSMarker) {
     onMain {
       self.onMarkerDragStart?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -814,7 +825,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didDrag marker: GMSMarker) {
     onMain {
       self.onMarkerDrag?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -823,7 +834,7 @@ GMSIndoorDisplayDelegate {
   func mapView(_ mapView: GMSMapView, didEndDragging marker: GMSMarker) {
     onMain {
       self.onMarkerDragEnd?(
-        marker.userData as? String,
+        marker.idTag,
         marker.position.toRNLatLng()
       )
     }
@@ -857,13 +868,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 +883,7 @@ GMSIndoorDisplayDelegate {
     didLongPressInfoWindowOf marker: GMSMarker
   ) {
     onMain {
-      self.onInfoWindowLongPress?(marker.userData as? String)
+      self.onInfoWindowLongPress?(marker.idTag)
     }
   }
 
@@ -893,4 +904,13 @@ GMSIndoorDisplayDelegate {
     }
     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/LocationHandler.swift

@@ -35,6 +35,8 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
 
   func showLocationDialog() {
     onMainAsync { [weak self] in
+      guard let self = self else { return }
+
       guard let vc = Self.topMostViewController() else { return }
       let title =
         Bundle.main.object(forInfoDictionaryKey: "LocationNotAvailableTitle")
@@ -61,7 +63,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
           title: openLocationSettingsButton ?? "Open settings",
           style: .default
         ) { _ in
-          self?.openLocationSettings()
+          self.openLocationSettings()
         }
       )
       vc.present(alert, animated: true, completion: nil)

package/ios/MapCircleBuilder.swift

@@ -17,13 +17,12 @@ final class MapCircleBuilder {
 
   @MainActor
   func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
-    if prev.center.latitude != next.center.latitude
-      || prev.center.longitude != next.center.longitude {
+    if !prev.centerEquals(next) {
       c.position = next.center.toCLLocationCoordinate2D()
     }
 
     if prev.radius != next.radius {
-      c.radius = next.radius ?? 0
+      c.radius = next.radius
     }
 
     if prev.fillColor != next.fillColor {

package/ios/MapHelper.swift

@@ -32,11 +32,9 @@ func onMain(_ block: @escaping @MainActor () -> Void) {
 
 @inline(__always)
 func onMainAsync(
-  _ block: @MainActor @escaping () async -> Void
+  _ block: @escaping @MainActor () async -> Void
 ) {
-  if Thread.isMainThread {
-    Task { @MainActor in await block() }
-  } else {
-    Task { @MainActor in await block() }
+  Task { @MainActor in
+    await block()
   }
 }