Fixes rare crash when dropping a pin (#427)

* Fixes rare crash when dropping a pin

* Compile fixes

* GHA tweaks, and lock GeoMonitor to 0.2.0 for TripKit 5.x

Author: nighthawk

.github/workflows/docs-dryrun.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: macos-15
     steps:
       - name: Checkout main
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: macos-15
     steps:
       - name: Checkout main
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable

.github/workflows/swift.yml

@@ -36,7 +36,7 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: ${{ matrix.xcode }}
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build
         run: swift build --target TripKit
 
@@ -50,7 +50,7 @@ jobs:
       image: swift:${{ matrix.swift }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build
         run: swift build --target TripKitAPI
 
@@ -61,7 +61,7 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Build TripKit Mac
         run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme "TripKit" -sdk macosx
       - name: Build TripKitUI iOS
@@ -76,7 +76,7 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Run tests
         env:
           TRIPGO_API_KEY: ${{ secrets.TRIPGO_API_KEY }}
@@ -96,7 +96,7 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build TripKitUIExample
         run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme TripKitUIExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16'
 
@@ -124,7 +124,7 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build ${{ matrix.name }}
         run: |
           cd ${{ matrix.directory }}

Package.resolved

@@ -22,7 +22,7 @@ let package = Package(
   dependencies: [
     .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.1.0")),
     .package(url: "https://github.com/onevcat/Kingfisher.git", .upToNextMajor(from: "7.0.0")),
-    .package(url: "https://github.com/skedgo/GeoMonitor.git", .upToNextMinor(from: "0.2.0")),
+    .package(url: "https://github.com/skedgo/GeoMonitor.git", exact: "0.2.0"),
     .package(url: "https://github.com/skedgo/TGCardViewController.git", .upToNextMajor(from: "2.2.10")),
   ],
   targets: [

Package.swift

@@ -48,19 +48,24 @@ open class TKNamedCoordinate : NSObject, NSSecureCoding, Codable, TKClusterable
   @objc public var placemark: CLPlacemark? {
     if let placemark = _placemark { return placemark }
     guard coordinate.isValid, TKNamedCoordinate.enableReverseGeocodingAddress, reverseGeocodingTask == nil else { return nil }
-    
-    let coordinate = self.coordinate
-    reverseGeocodingTask = Task { [weak self] in
-      let location = CLLocation(latitude: coordinate.latitude, longitude: coordinate.longitude)
-      let geocoder = CLGeocoder()
-      if let best = try? await geocoder.reverseGeocodeLocation(location).first {
-        self?.assignPlacemark(best, includeName: false)
-      }
+
+    reverseGeocodingTask = Task { @MainActor [weak self] in
+      try? await self?.needsAddress(includeName: false)
     }
     return nil
   }
-  
+
   private var reverseGeocodingTask: Task<Void, Never>?
+
+  @MainActor
+  public func needsAddress(includeName: Bool) async throws {
+    guard _address == nil else { return }
+    let location = CLLocation(latitude: coordinate.latitude, longitude: coordinate.longitude)
+    let geocoder = CLGeocoder()
+    if let best = try await geocoder.reverseGeocodeLocation(location).first {
+      assignPlacemark(best, includeName: includeName)
+    }
+  }
 
   @objc public var locationID: String? = nil
   @objc public var timeZoneID: String? = nil
@@ -129,7 +134,7 @@ open class TKNamedCoordinate : NSObject, NSSecureCoding, Codable, TKClusterable
     self.init(latitude: from.latitude, longitude: from.longitude, name: from.name, address: from.address)
   }
 
-  public func assignPlacemark(_ placemark: CLPlacemark, includeName: Bool) {
+  func assignPlacemark(_ placemark: CLPlacemark, includeName: Bool) {
     if includeName {
       if let name = placemark.name {
         self.name = name

Sources/TripKit/model/TKNamedCoordinate.swift

@@ -174,14 +174,14 @@ extension TKUIRoutingResultsViewModel {
       origin = asObject.rx.observeWeakly(CLLocationCoordinate2D.self, "coordinate")
         .compactMap { [weak asObject] _ in asObject?.coordinate }
         .distinctUntilChanged(isCloseEnough)
-        .flatMapLatest { [weak asObject] _ in RouteBuilder.needAddress(asObject, retryLimit: 3, delay: 1) }
+        .flatMapLatest { [weak asObject] _ in RouteBuilder.needAddress(asObject) }
         .map { _ in (builder, Self.buildId(for: builder)) }
     }
     if let asObject = builder.destination {
       destination = asObject.rx.observeWeakly(CLLocationCoordinate2D.self, "coordinate")
         .compactMap { [weak asObject] _ in asObject?.coordinate }
         .distinctUntilChanged(isCloseEnough)
-        .flatMapLatest { [weak asObject] _ in RouteBuilder.needAddress(asObject, retryLimit: 3, delay: 1) }
+        .flatMapLatest { [weak asObject] _ in RouteBuilder.needAddress(asObject) }
         .map { _ in (builder, Self.buildId(for: builder)) }
     }
     return Observable.merge(origin, destination)
@@ -338,35 +338,28 @@ extension TKUIRoutingResultsViewModel.RouteBuilder {
   }
 
   func reverseGeocodeLocations() -> Observable<(origin: String?, destination: String?)> {
-    let originObservable = Self.needAddress(origin, retryLimit: 5, delay: 5)
-    let destinationObservable = Self.needAddress(destination, retryLimit: 5, delay: 5)
+    let originObservable = Self.needAddress(origin)
+    let destinationObservable = Self.needAddress(destination)
     return Observable
       .combineLatest(originObservable, destinationObservable) { (origin: $0, destination: $1) }
       .distinctUntilChanged { $0.origin == $1.origin && $0.destination == $1.destination }
   }
 
-  static func needAddress(_ location: TKNamedCoordinate?, retryLimit: Int, delay: Int) -> Observable<String?> {
+  static func needAddress(_ location: TKNamedCoordinate?) -> Observable<String?> {
     if let from = location?.title, from != Loc.Location {
       return .just(from)
     } else if let location {
-      return Self.geocode(location, retryLimit: retryLimit, delay: delay).catchAndReturn(nil)
+      return Single.create {
+        try await location.needsAddress(includeName: true)
+        return location.title
+      }
+      .asObservable()
+      .catchAndReturn(nil)
     } else {
       return .just(nil)
     }
   }
 
-  private static func geocode(_ location: TKNamedCoordinate, retryLimit: Int, delay: Int) -> Observable<String?> {
-    return CLGeocoder().rx
-      .reverseGeocode(namedCoordinate: location)
-      .asObservable()
-      .retry { errors in
-        return errors.enumerated().flatMap { (index, error) -> Observable<Int> in
-          guard index < retryLimit else { throw error }
-          return Observable<Int>.timer(RxTimeInterval.seconds(delay), scheduler: MainScheduler.instance)
-        }
-      }
-  }
-  
   func generateRequest() -> TripRequest? {
     guard let destination = destination, let time = time else { return nil }
 
@@ -446,30 +439,4 @@ extension TKUIRoutingResultsViewModel.RouteBuilder: Equatable {
   }
 }
 
-// MARK: -
-
-extension Reactive where Base: CLGeocoder {
-  
-  func reverseGeocode(namedCoordinate: TKNamedCoordinate) -> Single<String?> {
-    return Single.create { single in
-      let location = CLLocation(latitude: namedCoordinate.coordinate.latitude, longitude: namedCoordinate.coordinate.longitude)
-      
-      let geocoder = CLGeocoder()
-      geocoder.reverseGeocodeLocation(location) { (placemarks, error) in
-        if let error {
-          single(.failure(error))
-        } else {
-          if let first = placemarks?.first {
-            // TODO: Shouldn't always overwrite the name, e.g., if it's from a favourite
-            namedCoordinate.assignPlacemark(first, includeName: true)
-          }
-          single(.success(placemarks?.first?.name))
-        }
-      }
-      
-      return Disposables.create()
-    }
-  }
-  
-}
 

Sources/TripKitUI/view model/TKUIRoutingResultsViewModel+CalculateRoutes.swift

@@ -1512,8 +1512,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/skedgo/GeoMonitor";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.2.0;
+				kind = exactVersion;
+				version = 0.2.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */