Any -> Sendable in GeoJsonWritable (#67)

Outdooractive · Feb 20, 2025 · 09127c8 · 09127c8
1 parent a84053b
commit 09127c8
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 22 deletions.
diff --git a/Package.swift b/Package.swift
@@ -5,6 +5,7 @@ import PackageDescription
 let swiftSettings: [SwiftSetting] = [
     .enableExperimentalFeature("StrictConcurrency"), // 5.10
     .enableUpcomingFeature("StrictConcurrency"), // 6.0
+    .enableUpcomingFeature("InferSendableFromCaptures"), // Silences a Sendable warning
 ]
 
 let package = Package(

diff --git a/Sources/GISTools/GeoJson/Feature.swift b/Sources/GISTools/GeoJson/Feature.swift
@@ -59,7 +59,7 @@ public struct Feature:
             }
         }
 
-        public var asJson: Any {
+        public var asJson: Sendable {
             switch self {
             case .double(let double): double
             case .int(let int): int
@@ -148,13 +148,13 @@ public struct Feature:
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.feature.rawValue,
             "properties": properties,
             "geometry": geometry.asJson
         ]
-        if let id = id {
+        if let id {
             result["id"] = id.asJson
         }
         if let boundingBox = boundingBox {

diff --git a/Sources/GISTools/GeoJson/FeatureCollection.swift b/Sources/GISTools/GeoJson/FeatureCollection.swift
@@ -115,8 +115,8 @@ public struct FeatureCollection:
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.featureCollection.rawValue,
             "features": features.map { $0.asJson }
         ]

diff --git a/Sources/GISTools/GeoJson/GeoJsonConvertible.swift b/Sources/GISTools/GeoJson/GeoJsonConvertible.swift
@@ -54,7 +54,7 @@ public protocol GeoJsonWritable {
     /// Return the GeoJson object as a Swift dictionary.
     ///
     /// - important: Always projected to EPSG:4326, unless the receiver has no SRID.
-    var asJson: [String: Any] { get }
+    var asJson: [String: Sendable] { get }
 
 }
 
@@ -99,7 +99,7 @@ extension Sequence where Self.Iterator.Element: GeoJsonWritable {
     /// Returns all elements as an array of JSON objects
     ///
     /// - important: Always projected to EPSG:4326, unless the coordinate has no SRID.
-    public var asJson: [[String: Any]] {
+    public var asJson: [[String: Sendable]] {
         return self.map({ $0.asJson })
     }
 

diff --git a/Sources/GISTools/GeoJson/GeometryCollection.swift b/Sources/GISTools/GeoJson/GeometryCollection.swift
@@ -62,8 +62,8 @@ public struct GeometryCollection: GeoJsonGeometry {
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.geometryCollection.rawValue,
             "geometries": geometries.map { $0.asJson }
         ]

diff --git a/Sources/GISTools/GeoJson/LineString.swift b/Sources/GISTools/GeoJson/LineString.swift
@@ -115,8 +115,8 @@ public struct LineString:
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.lineString.rawValue,
             "coordinates": coordinates.map { $0.asJson }
         ]

diff --git a/Sources/GISTools/GeoJson/MultiLineString.swift b/Sources/GISTools/GeoJson/MultiLineString.swift
@@ -112,8 +112,8 @@ public struct MultiLineString:
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.multiLineString.rawValue,
             "coordinates": coordinates.map { $0.map { $0.asJson } }
         ]

diff --git a/Sources/GISTools/GeoJson/MultiPoint.swift b/Sources/GISTools/GeoJson/MultiPoint.swift
@@ -94,8 +94,8 @@ public struct MultiPoint:
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.multiPoint.rawValue,
             "coordinates": coordinates.map { $0.asJson }
         ]

diff --git a/Sources/GISTools/GeoJson/MultiPolygon.swift b/Sources/GISTools/GeoJson/MultiPolygon.swift
@@ -97,8 +97,8 @@ public struct MultiPolygon:
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.multiPolygon.rawValue,
             "coordinates": coordinates.map { $0.map { $0.map { $0.asJson } } }
         ]

diff --git a/Sources/GISTools/GeoJson/Point.swift b/Sources/GISTools/GeoJson/Point.swift
@@ -64,8 +64,8 @@ public struct Point: PointGeometry {
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.point.rawValue,
             "coordinates": coordinate.asJson
         ]

diff --git a/Sources/GISTools/GeoJson/Polygon.swift b/Sources/GISTools/GeoJson/Polygon.swift
@@ -113,8 +113,8 @@ public struct Polygon:
         }
     }
 
-    public var asJson: [String: Any] {
-        var result: [String: Any] = [
+    public var asJson: [String: Sendable] {
+        var result: [String: Sendable] = [
             "type": GeoJsonType.polygon.rawValue,
             "coordinates": coordinates.map { $0.map { $0.asJson } }
         ]