react-native-google-maps-plus 1.0.2 → 1.1.0-dev.1

package/ios/LocationHandler.swift

@@ -2,43 +2,43 @@ import CoreLocation
 import Foundation
 import UIKit
 
+private let kCLLocationAccuracyDefault: CLLocationAccuracy =
+  kCLLocationAccuracyBest
+private let kCLDistanceFilterNoneDefault: CLLocationDistance =
+  kCLDistanceFilterNone
+
 final class LocationHandler: NSObject, CLLocationManagerDelegate {
 
   private let manager = CLLocationManager()
-  private var priority: Int = Priority.highAccuracy.rawValue
-  private var interval: TimeInterval = 5.0
-  private var minUpdateInterval: TimeInterval = 5.0
-  private var distanceFilterMeters: CLLocationDistance = kCLDistanceFilterNone
+
+  var desiredAccuracy: CLLocationAccuracy? = kCLLocationAccuracyDefault {
+    didSet {
+      if let desiredAccuracy = desiredAccuracy {
+        manager.desiredAccuracy = desiredAccuracy
+      } else {
+        manager.desiredAccuracy = kCLLocationAccuracyBest
+      }
+    }
+  }
+
+  var distanceFilterMeters: CLLocationDistance? = kCLDistanceFilterNoneDefault {
+    didSet {
+      if let distanceFilterMeters = distanceFilterMeters {
+        manager.distanceFilter = distanceFilterMeters
+      } else {
+        manager.distanceFilter = kCLDistanceFilterNone
+      }
+    }
+  }
 
   var onUpdate: ((CLLocation) -> Void)?
   var onError: ((_ error: RNLocationErrorCode) -> Void)?
 
-  private var lastEmit: Date?
-
   override init() {
     super.init()
     manager.delegate = self
     manager.pausesLocationUpdatesAutomatically = true
     manager.activityType = .other
-    applyPriority()
-  }
-
-  func setPriority(_ priority: Int) {
-    self.priority = priority
-    applyPriority()
-  }
-
-  func setInterval(_ seconds: Int) {
-    self.interval = max(0, TimeInterval(seconds))
-  }
-
-  func setFastestInterval(_ seconds: Int) {
-    self.minUpdateInterval = max(0, TimeInterval(seconds))
-  }
-
-  func setDistanceFilter(_ meters: Double) {
-    self.distanceFilterMeters = meters >= 0 ? meters : kCLDistanceFilterNone
-    manager.distanceFilter = distanceFilterMeters
   }
 
   func showLocationDialog() {
@@ -110,36 +110,13 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
     }
   }
 
-  private func applyPriority() {
-    guard let p = Priority(rawValue: priority) else {
-      manager.desiredAccuracy = kCLLocationAccuracyBest
-      return
-    }
-    switch p {
-    case .highAccuracy:
-      manager.desiredAccuracy = kCLLocationAccuracyBest
-    case .balanced:
-      manager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
-    case .lowPower:
-      manager.desiredAccuracy = kCLLocationAccuracyHundredMeters
-    case .passive:
-      manager.desiredAccuracy = kCLLocationAccuracyKilometer
-    }
-  }
-
   private func startUpdates() {
-    manager.distanceFilter = distanceFilterMeters
+    manager.desiredAccuracy = desiredAccuracy ?? kCLLocationAccuracyDefault
+    manager.distanceFilter =
+      distanceFilterMeters ?? kCLDistanceFilterNoneDefault
     manager.startUpdatingLocation()
   }
 
-  private func shouldEmit(now: Date) -> Bool {
-    if let last = lastEmit {
-      let delta = now.timeIntervalSince(last)
-      if delta < minUpdateInterval { return false }
-    }
-    return true
-  }
-
   func locationManager(
     _ manager: CLLocationManager,
     didFailWithError error: Error
@@ -166,12 +143,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
     didUpdateLocations locations: [CLLocation]
   ) {
     guard let loc = locations.last else { return }
-    let now = Date()
-
-    if shouldEmit(now: now) {
-      lastEmit = now
-      onUpdate?(loc)
-    }
+    onUpdate?(loc)
   }
 
   private static func topMostViewController() -> UIViewController? {
@@ -191,15 +163,3 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
   }
 
 }
-
-extension LocationHandler {
-  enum Priority: Int {
-    case highAccuracy = 100
-    /// Android: PRIORITY_BALANCED_POWER_ACCURACY
-    case balanced = 102
-    /// Android: PRIORITY_LOW_POWER
-    case lowPower = 104
-    /// Android: PRIORITY_PASSIVE
-    case passive = 105
-  }
-}

package/ios/MapCircleBuilder.swift

@@ -0,0 +1,20 @@
+import GoogleMaps
+
+final class MapCircleBuilder {
+
+  func buildCircle(_ c: RNCircle) -> GMSCircle {
+    let circle = GMSCircle()
+    circle.position = CLLocationCoordinate2D(
+      latitude: c.center.latitude,
+      longitude: c.center.longitude
+    )
+    if let r = c.radius { circle.radius = r }
+    if let fc = c.fillColor?.toUIColor() { circle.fillColor = fc }
+    if let sc = c.strokeColor?.toUIColor() { circle.strokeColor = sc }
+    if let sw = c.strokeWidth { circle.strokeWidth = CGFloat(sw) }
+    if let pr = c.pressable { circle.isTappable = pr }
+    if let zi = c.zIndex { circle.zIndex = Int32(zi) }
+
+    return circle
+  }
+}

package/ios/{MapMarker.swift → MapMarkerBuilder.swift}

@@ -2,7 +2,7 @@ import GoogleMaps
 import SVGKit
 import UIKit
 
-final class MapMarkerOptions {
+final class MapMarkerBuilder {
   private let iconCache = NSCache<NSString, UIImage>()
   private var tasks: [String: Task<Void, Never>] = [:]
   private let queue = DispatchQueue(
@@ -18,7 +18,6 @@ final class MapMarkerOptions {
         longitude: m.coordinate.longitude
       )
     )
-    marker.zIndex = Int32(m.zIndex)
     marker.userData = m.id
     marker.tracksViewChanges = true
     marker.icon = icon
@@ -26,6 +25,7 @@ final class MapMarkerOptions {
       x: m.anchor?.x ?? 0.5,
       y: m.anchor?.y ?? 0.5
     )
+    if let zi = m.zIndex { marker.zIndex = Int32(zi) }
     DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) { [weak marker] in
       marker?.tracksViewChanges = false
     }
@@ -71,24 +71,17 @@ final class MapMarkerOptions {
 
   @MainActor
   func updateMarker(_ prev: RNMarker, _ next: RNMarker, _ m: GMSMarker) {
-    if prev.coordinate.latitude != next.coordinate.latitude
-      || prev.coordinate.longitude != next.coordinate.longitude {
-      m.position = CLLocationCoordinate2D(
-        latitude: next.coordinate.latitude,
-        longitude: next.coordinate.longitude
-      )
-    }
+    m.position = CLLocationCoordinate2D(
+      latitude: next.coordinate.latitude,
+      longitude: next.coordinate.longitude
+    )
 
-    if prev.zIndex != next.zIndex {
-      m.zIndex = Int32(next.zIndex)
-    }
+    if let zi = next.zIndex { m.zIndex = Int32(zi) }
 
-    if prev.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y {
-      m.groundAnchor = CGPoint(
-        x: next.anchor?.x ?? 0.5,
-        y: next.anchor?.y ?? 0.5
-      )
-    }
+    m.groundAnchor = CGPoint(
+      x: next.anchor?.x ?? 0.5,
+      y: next.anchor?.y ?? 0.5
+    )
 
     if !prev.markerStyleEquals(next) {
       buildIconAsync(next.id, next) { img in
@@ -181,27 +174,3 @@ final class MapMarkerOptions {
   }
 
 }
-
-extension RNMarker {
-  func markerEquals(_ b: RNMarker) -> Bool {
-    id == b.id && zIndex == b.zIndex
-      && coordinate.latitude == b.coordinate.latitude
-      && coordinate.longitude == b.coordinate.longitude
-      && anchor?.x == b.anchor?.x && anchor?.y == b.anchor?.y
-      && markerStyleEquals(b)
-  }
-
-  func markerStyleEquals(_ b: RNMarker) -> Bool {
-    width == b.width && height == b.height
-      && iconSvg == b.iconSvg
-  }
-
-  func styleHash() -> NSString {
-    var hasher = Hasher()
-    hasher.combine(width)
-    hasher.combine(height)
-    hasher.combine(iconSvg)
-    return String(hasher.finalize()) as NSString
-  }
-
-}

package/ios/MapPolygonBuilder.swift

@@ -0,0 +1,20 @@
+import GoogleMaps
+
+final class MapPolygonBuilder {
+
+  func buildPolygon(_ p: RNPolygon) -> GMSPolygon {
+    let path = GMSMutablePath()
+    p.coordinates.forEach {
+      path.add(
+        CLLocationCoordinate2D(latitude: $0.latitude, longitude: $0.longitude)
+      )
+    }
+    let pg = GMSPolygon(path: path)
+    if let fc = p.fillColor?.toUIColor() { pg.fillColor = fc }
+    if let sc = p.strokeColor?.toUIColor() { pg.strokeColor = sc }
+    if let sw = p.strokeWidth { pg.strokeWidth = CGFloat(sw) }
+    if let pr = p.pressable { pg.isTappable = pr }
+    if let zi = p.zIndex { pg.zIndex = Int32(zi) }
+    return pg
+  }
+}

package/ios/MapPolylineBuilder.swift

@@ -0,0 +1,24 @@
+import GoogleMaps
+
+final class MapPolylineBuilder {
+  func buildPolyline(_ p: RNPolyline) -> GMSPolyline {
+    let path = GMSMutablePath()
+    p.coordinates.forEach {
+      path.add(
+        CLLocationCoordinate2D(latitude: $0.latitude, longitude: $0.longitude)
+      )
+    }
+    let pl = GMSPolyline(path: path)
+    if let w = p.width { pl.strokeWidth = CGFloat(w) }
+    if let c = p.color?.toUIColor() { pl.strokeColor = c }
+    if let cap = p.lineCap {
+      /// pl.lineCap = mapLineCap(cap)
+    }
+    if let join = p.lineJoin {
+      /// pl.strokeJoin = mapLineJoin(join)
+    }
+    if let pr = p.pressable { pl.isTappable = pr }
+    if let zi = p.zIndex { pl.zIndex = Int32(zi) }
+    return pl
+  }
+}

package/ios/PermissionHandler.swift

@@ -14,7 +14,7 @@ final class PermissionHandler: NSObject, CLLocationManagerDelegate {
   }
 
   func requestLocationPermission()
-    -> NitroModules.Promise<RNLocationPermissionResult> {
+  -> NitroModules.Promise<RNLocationPermissionResult> {
     let promise = NitroModules.Promise<RNLocationPermissionResult>()
 
     let status = manager.authorizationStatus

package/ios/RNGoogleMapsPlusModule.swift

@@ -16,7 +16,7 @@ final class RNGoogleMapsPlusModule: HybridRNGoogleMapsPlusModuleSpec {
   }
 
   func requestLocationPermission()
-    -> NitroModules.Promise<RNLocationPermissionResult> {
+  -> NitroModules.Promise<RNLocationPermissionResult> {
     return permissionHandler.requestLocationPermission()
   }