Upgrade arcgis sdk + create MapContentView

Author: TarekTolba1

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapView.swift

@@ -32,16 +32,14 @@ class GraphicsParser {
         }
 
         // Apply attributes to each graphic, if present
-         if let attributes = dictionary["attributes"] as? [String: Any] {
-             for graphic in newGraphics {
-                 if let mutableAttributes = graphic.attributes as? NSMutableDictionary {
-                     for (key, value) in attributes {
-                         mutableAttributes[key] = value
-                     }
-                 }
-             }
-         }
-  
+        if let attributes = dictionary["attributes"] as? [String: Any] {
+            newGraphics.forEach { graphic in
+                for (key, value) in attributes {
+                    graphic.setAttributeValue(value, forKey: key)
+                }
+            }
+        }
+        
         return newGraphics
     }
 

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/GraphicsParser.swift

@@ -8,9 +8,9 @@
 import Foundation
 import ArcGIS
 
-//class ManualLocationDataSource: AGSLocationDataSource {
+//class ManualLocationDataSource: LocationDataSource {
 //    public func setNewLocation(_ position: UserPosition) {
-//        let loc = AGSLocation(
+//        let loc = Location(
 //            position: position.latLng.toAGSPoint(),
 //            horizontalAccuracy: position.accuracy ?? 0,
 //            velocity: position.velocity ?? 0,
@@ -20,3 +20,40 @@ import ArcGIS
 //        didUpdate(loc)
 //    }
 //}
+
+final class CustomLocationProvider: LocationProvider {
+    private var locationContinuation: AsyncThrowingStream<Location, Error>.Continuation?
+    
+    // Exposed stream
+    var locations: AsyncThrowingStream<Location, Error> {
+        AsyncThrowingStream { continuation in
+            self.locationContinuation = continuation
+        }
+    }
+
+    var headings: AsyncThrowingStream<Double, Error> {
+        AsyncThrowingStream { continuation in
+            Task {
+                while !Task.isCancelled {
+                    continuation.yield(.random(in: 0...360))
+                    await Task.yield()
+                }
+                continuation.finish()
+            }
+        }
+    }
+
+    // Push location from outside
+    public func setNewLocation(_ position: UserPosition) {
+        let loc = Location(
+            position: position.latLng.toAGSPoint(),
+            horizontalAccuracy: position.accuracy ?? 0,
+            verticalAccuracy: position.accuracy ?? 0,
+            speed: position.velocity ?? 0,
+            course: position.heading ?? 0,
+            isLastKnown: false
+        )
+        locationContinuation?.yield(loc)
+    }
+}
+

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ManualLocationDataSource.swift

@@ -0,0 +1,99 @@
+//
+//  Created by Tarek Tolba on 29/04/2025.
+//
+
+import SwiftUI
+import ArcGIS
+import CoreLocation
+
+
+struct MapContentView: View {
+    @ObservedObject var mapViewModel: MapViewModel
+        
+    init(mapViewModel: MapViewModel) {
+        self.mapViewModel = mapViewModel
+    }
+    
+    var body: some View {
+        MapViewReader { mapViewProxy in
+            MapView(map: mapViewModel.map,
+                    viewpoint: mapViewModel.viewpoint,
+                    graphicsOverlays: [mapViewModel.defaultGraphicsOverlay])
+                .attributionBarHidden(mapViewModel.attributionBarHidden)
+                .locationDisplay(mapViewModel.locationDisplay)
+                .contentInsets(mapViewModel.contentInsets)
+                .interactionModes(mapViewModel.interactionModes)
+                .onViewpointChanged(kind: .centerAndScale) { newViewpoint in
+                    mapViewModel.viewpoint = newViewpoint
+                }.onScaleChanged(perform: { scale in
+                    mapViewModel.onScaleChanged?(scale)
+                }).onVisibleAreaChanged(perform: { polygon in
+                    mapViewModel.onVisibleAreaChanged?(polygon)
+                })
+                .onChange(of: mapViewModel.map.basemap?.loadStatus) { newValue in
+                    if let newValue {
+                         mapViewModel.onLoadStatusChanged?(newValue)
+                     }
+                }
+                .task {
+                    // Store the mapViewProxy for external access
+                    mapViewModel.mapViewProxy = mapViewProxy
+                    
+//                    await mapViewModel.locationDidChange()
+                }
+                .onDisappear {
+                    mapViewModel.stopLocationDataSource()
+                    // Clear the mapViewProxy reference when view disappears
+                    mapViewModel.mapViewProxy = nil
+                }
+        }
+    }
+}
+
+
+class MapViewModel: ObservableObject {
+    let map = Map()
+    let locationDisplay = LocationDisplay()
+    
+    @Published var viewpoint: Viewpoint
+    @Published var mapViewProxy: MapViewProxy?
+    @Published var attributionBarHidden: Bool = false
+    @Published var contentInsets: EdgeInsets = EdgeInsets()
+    @Published var interactionModes: MapViewInteractionModes = .all
+    @Published var defaultGraphicsOverlay = GraphicsOverlay()
+    /// The latest location update from the location data source.
+    @Published var currentLocation: Location?
+    
+    var onScaleChanged: ((Double) -> Void)?
+    var onVisibleAreaChanged: ((Polygon) -> Void)?
+    var onLoadStatusChanged: ((LoadStatus) -> Void)?
+    
+    init(viewpoint : Viewpoint) {
+        self.viewpoint = viewpoint
+    }
+    
+    // Methods that can be called from outside
+    func setViewpoint(_ newViewpoint: Viewpoint) {
+        viewpoint = newViewpoint
+    }
+    
+    func setViewpointGeometry(_ geometry: Geometry) async {
+        guard let mapViewProxy = mapViewProxy else { return }
+        await mapViewProxy.setViewpointGeometry(geometry)
+    }
+
+    /// Stops the location data source.
+    func stopLocationDataSource() {
+        Task {
+            await locationDisplay.dataSource.stop()
+        }
+    }
+    
+//    /// Uses `for-await-in` to access location updates produced by the async stream.
+//    @MainActor
+//    func locationDidChange() async {
+//        for await newLocation in locationDisplay.dataSource.locations {
+//            currentLocation = newLocation
+//        }
+//    }
+}

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/MapContentView.swift

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
+platform :ios, '16.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/ios/Podfile

@@ -17,6 +17,6 @@ SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   geolocator_apple: d981750b9f47dbdb02427e1476d9a04397beb8d9
 
-PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
+PODFILE CHECKSUM: ae273562e2241d2b1bd4b6d2d349a48b8fe1a2a7
 
 COCOAPODS: 1.16.2

example/ios/Podfile.lock

@@ -179,7 +179,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
 			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
@@ -369,7 +369,7 @@
 				DEVELOPMENT_TEAM = 64Z45JP26B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -499,7 +499,7 @@
 				DEVELOPMENT_TEAM = 64Z45JP26B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -523,7 +523,7 @@
 				DEVELOPMENT_TEAM = 64Z45JP26B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -562,7 +562,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};