Upgrade iOS SDK to v200.7 (#90)

* Upgrade arcgis sdk

* Upgrade arcgis sdk + create MapContentView

* Fix few issues after upgrading sdk

* Fix few issues after upgrading sdk

* Clean code

* fix build

* reformat code

* Update CustomLocationProvider.swift

* Fix location indicator example

---------

Co-authored-by: Julian Bissekkou <[email protected]>

Author: TarekTolba1

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios.podspec

@@ -14,8 +14,7 @@ A new Flutter project.
   s.source           = { :path => '.' }
   s.source_files = 'arcgis_map_sdk_ios/Sources/**/*'
   s.dependency 'Flutter'
-  s.dependency 'ArcGIS-Runtime-Toolkit-iOS'
-  s.platform = :ios, '13.0'
+  s.platform = :ios, '16.0'
 
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Package.swift

@@ -6,19 +6,19 @@ import PackageDescription
 let package = Package(
     name: "arcgis_map_sdk_ios",
     platforms: [
-        .iOS("14.0")
+        .iOS("16.0")
     ],
     products: [
         .library(name: "arcgis-map-sdk-ios", targets: ["arcgis_map_sdk_ios"])
     ],
     dependencies: [
-        .package(url: "https://github.com/Esri/arcgis-runtime-ios", .upToNextMinor(from: "100.15.0")),
+        .package(url: "https://github.com/Esri/arcgis-maps-sdk-swift",  .upToNextMinor(from: "200.7.0")),
     ],
     targets: [
         .target(
             name: "arcgis_map_sdk_ios",
             dependencies: [
-                .product(name: "ArcGIS", package: "arcgis-runtime-ios")
+                .product(name: "ArcGIS", package: "arcgis-maps-sdk-swift")
             ]
         ),
     ]

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

@@ -0,0 +1,48 @@
+//
+//  Created by Julian Bissekkou on 27.11.23.
+//
+
+import Foundation
+import ArcGIS
+
+final class CustomLocationProvider: LocationProvider {
+    private var locationContinuation: AsyncStream<Location>.Continuation?
+    private var headingContinuation: AsyncStream<Double>.Continuation?
+    
+    
+    // Exposed stream
+    var locations: AsyncStream<Location> {
+        AsyncStream { @Sendable continuation in
+            self.locationContinuation = continuation
+            continuation.onTermination = { _ in
+                     self.locationContinuation = nil
+            }
+        }
+    }
+    
+    var headings: AsyncStream<Double> {
+        AsyncStream { continuation in
+            self.headingContinuation = continuation
+            continuation.onTermination = { @Sendable _ in
+                self.headingContinuation = nil
+            }
+        }
+    }
+
+    // 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)
+        if let heading = position.heading {
+            headingContinuation?.yield(heading)
+        }
+    }
+}
+

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/CustomLocationProvider.swift

@@ -16,10 +16,10 @@ class GraphicsParser {
         self.registrar = registrar
     }
 
-    func parse(dictionary: Dictionary<String, Any>) throws -> [AGSGraphic] {
+    func parse(dictionary: Dictionary<String, Any>) throws -> [Graphic] {
         let type = dictionary["type"] as! String
 
-        let newGraphics: [AGSGraphic]
+        let newGraphics: [Graphic]
         switch (type) {
         case "point":
             newGraphics = try! parsePoint(dictionary)
@@ -31,26 +31,29 @@ class GraphicsParser {
             throw ParseException(message: "Unknown graphic type: \(type)")
         }
 
-        let attributes = dictionary["attributes"] as? Dictionary<String, Any>
-        if let attributes = attributes {
-            newGraphics.forEach {
-                $0.attributes.addEntries(from: attributes)
+        // Apply attributes to each graphic, if present
+        if let attributes = dictionary["attributes"] as? [String: Any] {
+            newGraphics.forEach { graphic in
+                for (key, value) in attributes {
+                    graphic.setAttributeValue(value, forKey: key)
+                }
             }
         }
+        
         return newGraphics
     }
 
-    private func parsePoint(_ dictionary: [String: Any]) throws -> [AGSGraphic] {
+    private func parsePoint(_ dictionary: [String: Any]) throws -> [Graphic] {
         let point: LatLng = try! JsonUtil.objectOfJson(dictionary["point"] as! Dictionary<String, Any>)
 
-        let graphic = AGSGraphic()
+        let graphic = Graphic()
         graphic.geometry = point.toAGSPoint()
         graphic.symbol = try! parseSymbol(dictionary["symbol"] as! Dictionary<String, Any>)
 
         return [graphic]
     }
 
-    private func parsePolyline(_ dictionary: [String: Any]) throws -> [AGSGraphic] {
+    private func parsePolyline(_ dictionary: [String: Any]) throws -> [Graphic] {
         let payload: PathPayload = try! JsonUtil.objectOfJson(dictionary)
 
         return try payload.paths.map { coordinates in
@@ -59,28 +62,28 @@ class GraphicsParser {
                     throw ParseException(message: "Size of coordinates need to be at least 2. Got \(array)")
                 }
                 if(array.count > 2) {
-                    return AGSPoint(x: array[0], y: array[1], z: array[2], spatialReference: .wgs84())
+                    return Point(x: array[0], y: array[1], z: array[2], spatialReference: .wgs84)
                 }
-                return AGSPoint(x: array[0], y: array[1], spatialReference: .wgs84())
+                return Point(x: array[0], y: array[1], spatialReference: .wgs84)
             }
 
-            let graphic = AGSGraphic()
-            graphic.geometry = AGSPolyline(points: points)
+            let graphic = Graphic()
+            graphic.geometry = Polyline(points: points)
             graphic.symbol = try! parseSymbol(dictionary["symbol"] as! Dictionary<String, Any>)
 
             return graphic
         }
     }
 
-    private func parsePolygon(_ dictionary: [String: Any]) throws -> [AGSGraphic] {
+    private func parsePolygon(_ dictionary: [String: Any]) throws -> [Graphic] {
         let payload: PolygonPayload = try! JsonUtil.objectOfJson(dictionary)
 
         return payload.rings.map { ring in
-            let graphic = AGSGraphic()
+            let graphic = Graphic()
             let points = ring.map { coordinate in
-                AGSPoint(x: coordinate[0], y: coordinate[1], spatialReference: .wgs84())
+                Point(x: coordinate[0], y: coordinate[1], spatialReference: .wgs84)
             }
-            graphic.geometry = AGSPolygon(points: points)
+            graphic.geometry = Polygon(points: points)
             graphic.symbol = try! parseSymbol(dictionary["symbol"] as! Dictionary<String, Any>)
 
             return graphic
@@ -89,7 +92,7 @@ class GraphicsParser {
 
     // region symbol parsing
 
-    func parseSymbol(_ dictionary: [String: Any]) throws -> AGSSymbol {
+    func parseSymbol(_ dictionary: [String: Any]) throws -> Symbol {
         let type = dictionary["type"] as! String;
         switch (type) {
         case "simple-marker":
@@ -105,48 +108,48 @@ class GraphicsParser {
         }
     }
 
-    private func parseSimpleMarkerSymbol(_ dictionary: [String: Any]) -> AGSSymbol {
+    private func parseSimpleMarkerSymbol(_ dictionary: [String: Any]) -> Symbol {
         let payload: SimpleMarkerSymbolPayload = try! JsonUtil.objectOfJson(dictionary)
 
-        let symbol = AGSSimpleMarkerSymbol()
+        let symbol = SimpleMarkerSymbol()
         symbol.color = payload.color.toUIColor()
         symbol.size = payload.size
-        symbol.outline = AGSSimpleLineSymbol(
+        symbol.outline = SimpleLineSymbol(
                 style: .solid,
                 color: payload.outlineColor.toUIColor(),
                 width: payload.outlineWidth
         )
         return symbol
     }
 
-    private func parseSimpleFillMarkerSymbol(_ dictionary: [String: Any]) -> AGSSymbol {
+    private func parseSimpleFillMarkerSymbol(_ dictionary: [String: Any]) -> Symbol {
         let payload: SimpleFillSymbolPayload = try! JsonUtil.objectOfJson(dictionary)
 
-        let symbol = AGSSimpleFillSymbol()
+        let symbol = SimpleFillSymbol()
         symbol.color = payload.fillColor.toUIColor()
 
-        let outline = AGSSimpleLineSymbol()
+        let outline = SimpleLineSymbol()
         outline.width = payload.outlineWidth
         outline.color = payload.outlineColor.toUIColor()
         symbol.outline = outline
 
         return symbol
     }
 
-    private func parsePictureMarkerSymbol(_ dictionary: [String: Any]) -> AGSSymbol {
+    private func parsePictureMarkerSymbol(_ dictionary: [String: Any]) -> Symbol {
         let payload: PictureMarkerSymbolPayload = try! JsonUtil.objectOfJson(dictionary)
 
         if(!payload.assetUri.isWebUrl()) {
             let uiImage = getFlutterUiImage(payload.assetUri)
-            let symbol = AGSPictureMarkerSymbol(image: uiImage!)
+            let symbol = PictureMarkerSymbol(image: uiImage!)
             symbol.width = payload.width
             symbol.height = payload.height
             symbol.offsetX = payload.xOffset
             symbol.offsetY = payload.yOffset
             return symbol
         }
 
-        let symbol = AGSPictureMarkerSymbol(url: URL(string: payload.assetUri)!)
+        let symbol = PictureMarkerSymbol(url: URL(string: payload.assetUri)!)
         symbol.width = payload.width
         symbol.height = payload.height
         symbol.offsetX = payload.xOffset
@@ -161,9 +164,9 @@ class GraphicsParser {
         return UIImage(named: path!)
     }
 
-    private func parseSimpleLineSymbol(_ dictionary: [String: Any]) -> AGSSymbol {
+    private func parseSimpleLineSymbol(_ dictionary: [String: Any]) -> Symbol {
         let payload: SimpleLineSymbolPayload = try! JsonUtil.objectOfJson(dictionary)
-        let symbol = AGSSimpleLineSymbol()
+        let symbol = SimpleLineSymbol()
 
         if let color = payload.color {
             symbol.color = color.toUIColor()

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

@@ -0,0 +1,84 @@
+//
+//  Created by Tarek Tolba on 29/04/2025.
+//
+
+import SwiftUI
+import ArcGIS
+import CoreLocation
+
+
+struct MapContentView: View {
+    @ObservedObject var viewModel: MapViewModel
+    
+    init(viewModel: MapViewModel) {
+        self.viewModel = viewModel
+    }
+    
+    var body: some View {
+        MapViewReader { mapViewProxy in
+            MapView(
+                map: viewModel.map,
+                viewpoint: viewModel.viewpoint,
+                graphicsOverlays: [viewModel.defaultGraphicsOverlay]
+            )
+            .attributionBarHidden(viewModel.attributionBarHidden)
+            .locationDisplay(viewModel.locationDisplay)
+            .contentInsets(viewModel.contentInsets)
+            .interactionModes(viewModel.interactionModes)
+            .onViewpointChanged(kind: .centerAndScale) { newViewpoint in
+                viewModel.viewpoint = newViewpoint
+            }
+            .onScaleChanged { scale in
+                viewModel.onScaleChanged?(scale)
+            }
+            .onVisibleAreaChanged { polygon in
+                viewModel.onVisibleAreaChanged?(polygon)
+            }
+            .onChange(of: viewModel.map.basemap?.loadStatus) { newValue in
+                if let newValue {
+                    viewModel.onLoadStatusChanged?(newValue)
+                }
+            }
+            .task {
+                // Store the mapViewProxy for external access
+                viewModel.mapViewProxy = mapViewProxy
+                viewModel.onViewInit?();
+            }
+            .onDisappear {
+                viewModel.stopLocationDataSource()
+                // Clear the mapViewProxy reference when view disappears
+                viewModel.mapViewProxy = nil
+            }
+            .ignoresSafeArea(edges: .all)
+        }
+    }
+}
+
+
+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()
+    
+    var onScaleChanged: ((Double) -> Void)?
+    var onVisibleAreaChanged: ((Polygon) -> Void)?
+    var onLoadStatusChanged: ((LoadStatus) -> Void)?
+    var onViewInit: (() -> Void)?
+    
+    init(viewpoint : Viewpoint) {
+        self.viewpoint = viewpoint
+    }
+    
+    /// Stops the location data source.
+    func stopLocationDataSource() {
+        Task {
+            await locationDisplay.dataSource.stop()
+        }
+    }
+}

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

@@ -13,19 +13,3 @@ struct AnimationOptions: Codable {
     var animationCurve: String
 }
 
-extension AnimationOptions {
-    func arcgisAnimationCurve() -> AGSAnimationCurve {
-        switch animationCurve {
-        case "linear":
-            return .linear
-        case "easeIn":
-            return .easeInCirc
-        case "easeOut":
-            return .easeOutCirc
-        case "easeInOut":
-            return .easeInOutCirc
-        default:
-            return .linear
-        }
-    }
-}

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

@@ -15,7 +15,7 @@ struct LatLng: Codable {
 }
 
 extension LatLng {
-    func toAGSPoint() -> AGSPoint {
-        AGSPoint(x: longitude, y: latitude, spatialReference: .wgs84())
+    func toAGSPoint() -> Point {
+        Point(x: longitude, y: latitude, spatialReference: .wgs84)
     }
 }