ngageoint · paulsolt-ofsw · Sep 23, 2025
@@ -12,6 +12,7 @@ import DataSourceTileOverlay
 import DataSourceDefinition
 import Combine
 
+@MainActor
 class DataSourceMapViewModel {
     var dataSource: any DataSourceDefinition
     var key: String
@@ -45,6 +46,7 @@ class DataSourceMapViewModel {
 
     let requerySubject = PassthroughSubject<Void, Never>()
 
+    @MainActor
     init(
         dataSource: any DataSourceDefinition,
         key: String,

@@ -276,6 +276,9 @@
         }
       }
     },
+    "Delete" : {
+      "comment" : "Alert delete button"
+    },
     "Downloaded %@ of %@" : {
       "localizations" : {
         "en" : {

@@ -53,7 +53,7 @@ class DataSourceMap: MapMixin {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] annotations in
                 Task { [weak self] in
-                    await self?.handleFeatureChanges(annotations: annotations)
+                    self?.handleFeatureChanges(annotations: annotations)
                 }
             }
             .store(in: &cancellable)
@@ -62,7 +62,7 @@ class DataSourceMap: MapMixin {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] featureOverlays in
                 Task { [weak self] in
-                    await self?.handleFeatureOverlayChanges(featureOverlays: featureOverlays)
+                    self?.handleFeatureOverlayChanges(featureOverlays: featureOverlays)
                 }
             }
             .store(in: &cancellable)
@@ -71,7 +71,7 @@ class DataSourceMap: MapMixin {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] tileOverlays in
                 Task { [weak self] in
-                    await self?.updateTileOverlays(tileOverlays: tileOverlays)
+                    self?.updateTileOverlays(tileOverlays: tileOverlays)
                 }
             }
             .store(in: &cancellable)
@@ -266,6 +266,7 @@ class DataSourceMap: MapMixin {
         return !inserts.isEmpty || !removals.isEmpty
     }
 
+    @MainActor
     func removeMixin(mapView: MKMapView, mapState: MapState) {
         mapView.removeOverlays(viewModel?.featureOverlays ?? [])
         mapView.removeAnnotations(viewModel?.annotations ?? [])

@@ -10,6 +10,7 @@ import Foundation
 import MapKit
 import MapFramework
 
+@MainActor
 protocol FilteredUsersMap {
     var mapView: MKMapView? { get set }
     var filteredUsersMapMixin: FilteredUsersMapMixin? { get set }

@@ -27,6 +27,7 @@ class ObservationsMap: DataSourceMap {
     @Injected(\.observationImageRepository)
     var imageRepository: ObservationImageRepository
 
+    @MainActor
     init() {
         super.init(
             dataSource: DataSources.observation

@@ -13,8 +13,9 @@ extension DataSources {
     static let featureItem: FeatureItemDefinition = FeatureItemDefinition.definition
 }
 
-class FeatureItemDefinition: DataSourceDefinition {
-    var mappable: Bool = true
+final
+class FeatureItemDefinition: DataSourceDefinition, Sendable {
+    var mappable: Bool = true 
 
     var color: UIColor = .magenta
 

@@ -20,7 +20,7 @@ public class FeedItemAnnotation: DataSourceAnnotation {
 
     public override var dataSource: any DataSourceDefinition {
         get {
-            DataSources.feedItem
+            DataSources.feedItem // ERROR: Main actor-isolated conformance of 'FeedItemDefinition' to 'DataSourceDefinition' cannot be used in nonisolated context; this is an error in the Swift 6 language mode
         }
         set { }
     }

@@ -12,9 +12,9 @@ import GeoPackage
 import DataSourceDefinition
 import MapFramework
 
-struct AnnotationsAndOverlays {
-    let annotations: [DataSourceAnnotation]
-    let overlays: [MKOverlay]
+struct AnnotationsAndOverlays: Sendable {
+    let annotations: [DataSourceAnnotation] // Error: Stored property 'annotations' of 'Sendable'-conforming struct 'AnnotationsAndOverlays' has non-sendable type '[DataSourceAnnotation]'
+    let overlays: [MKOverlay] // Error: Stored property 'overlays' of 'Sendable'-conforming struct 'AnnotationsAndOverlays' has non-sendable type '[any MKOverlay]'
 }
 
 protocol MapFeatureRepository {

@@ -12,6 +12,7 @@ import Kingfisher
 import UIKit
 import CoreLocation
 
+@MainActor
 class MageNavStack: UIViewController {
     @Injected(\.currentLocationRepository)
     var currentLocationRepository: CurrentLocationRepository

@@ -1,6 +1,7 @@
 import UIKit
 import SwiftUI
 
+//@MainActor
 public protocol DataSourceDefinition: ObservableObject {
     var mappable: Bool { get }
     var color: UIColor { get }

@@ -36,6 +36,7 @@ public class UnknownDefinition: DataSourceDefinition {
     private init() { }
 }
 
+//@MainActor
 open class DataSourceAnnotation: NSObject, MKAnnotation, Identifiable, DataSourceIdentifiable {
     static func == (lhs: DataSourceAnnotation, rhs: DataSourceAnnotation) -> Bool {
         lhs.id == rhs.id

@@ -12,6 +12,7 @@ import CoreGraphics
 import DataSourceTileOverlay
 import SwiftUI
 
+@MainActor
 public protocol MapMixin {
     var uuid: UUID { get }
     func cleanupMixin()
@@ -26,7 +27,7 @@ public protocol MapMixin {
         touchPoint: CGPoint
     ) async -> [String: [String]]
 
-    func setupMixin(mapView: MKMapView, mapState: MapState)
+    func setupMixin(mapView: MKMapView, mapState: MapState) 
     func removeMixin(mapView: MKMapView, mapState: MapState)
     func updateMixin(mapView: MKMapView, mapState: MapState)
 }

@@ -8,6 +8,7 @@
 
 import Foundation
 
+@MainActor
 protocol MapProtocol {
     var mixins: MapMixins { get set }
     var mapState: MapState { get }

@@ -11,6 +11,7 @@ import SwiftUI
 import MapKit
 import MAGEStyle
 
+@MainActor
 public struct MapRepresentable: UIViewRepresentable, MapProtocol {
     var notificationOnTap: NSNotification.Name = .MapItemsTapped
     var notificationOnLongPress: NSNotification.Name = .MapLongPress
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ public class FeedItemAnnotation: DataSourceAnnotation { @@
         public override var dataSource: any DataSourceDefinition {
             get {
-                DataSources.feedItem
+                DataSources.feedItem // ERROR: Main actor-isolated conformance of 'FeedItemDefinition' to 'DataSourceDefinition' cannot be used in nonisolated context; this is an error in the Swift 6 language mode
             }
             set { }
         }
@@ Expand Down @@