Move to Vincenty from Spherical

Example/ForeFlightKMLDemo/KML/KMLGenerator.swift

@@ -1,5 +1,4 @@
 import Foundation
-import GeodesySpherical
 import CoreLocation
 import ForeFlightKML
 

Example/ForeFlightKMLDemo/Map/MapViewRepresentable.swift

@@ -1,7 +1,6 @@
 import SwiftUI
 import MapKit
 import CoreLocation
-import GeodesySpherical
 import ForeFlightKML
 
 struct MapViewRepresentable: UIViewRepresentable {

Package.swift

@@ -11,14 +11,14 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/florianreinhart/Geodesy", .upToNextMajor(from: "0.2.2")),
+        .package(url: "https://github.com/Haelix-Code/Vincenty", .upToNextMinor(from: "0.0.1")),
         .package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.0")
     ],
     targets: [
         .target(
             name: "ForeFlightKML",
             dependencies: [
-                .product(name: "Geodesy", package: "Geodesy"),
+                .product(name: "Vincenty", package: "Vincenty"),
                 .product(name: "ZIPFoundation", package: "ZIPFoundation")
             ],
             resources: [

README.md

@@ -30,7 +30,6 @@ See `/Tests/UserMapShapeTests/UserMapShapesSampleFullTest.swift`
 
 ```swift
 import ForeFlightKML
-import GeodesySpherical
 
 let builder = ForeFlightKMLBuilder(documentName: "Airport with ATZ")
 
@@ -126,7 +125,7 @@ Full public API surface is visible in the package sources.
 
 ## Notes, conventions and gotchas
 
-- **Coordinates order**: KML requires `longitude,latitude[,altitude]`. The public API accepts `Coordinate(latitude:..., longitude:...)` (from `Geodesy`) and the framework emits coordinates in the KML `lon,lat[,alt]` order.
+- **Coordinates order**: KML requires `longitude,latitude[,altitude]`. The public API accepts `Coordinate(latitude:..., longitude:...)` (a typealias for [Vincenty](https://github.com/Haelix-Code/Vincenty)'s `GeodeticCoordinate`) and the framework emits coordinates in the KML `lon,lat[,alt]` order.
 - **Units**: Distances (e.g. `LineCircle.radius`) are in **meters**.
 - **Angles/bearings**: bearings (for arc & circle generation) are interpreted in degrees (0..360). The bearing convention is clockwise from north.
 - **Altitude**: When you provide altitudes, the `AltitudeMode` is emitted (defaults to `.absolute` in most geometries).

Sources/ForeFlightKML/CoreElements/LineString.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// A line string connecting multiple coordinates in order.
 /// Used for routes, boundaries, or any connected line geometry.

Sources/ForeFlightKML/CoreElements/LinearRing.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// Defines a closed line string, typically the outer boundary of a Polygon.
 /// Optionally, a LinearRing can also be used as the inner boundary of a Polygon to create holes in the Polygon.

Sources/ForeFlightKML/CoreElements/Point.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// A geographic point in 3D space that can be displayed as a marker in ForeFlight.
 ///

Sources/ForeFlightKML/ForeFlightKML+Convenience.swift

@@ -1,5 +1,5 @@
 import Foundation
-import GeodesySpherical
+import Vincenty
 
 extension ForeFlightKMLBuilder {
 

Sources/ForeFlightKML/ForeFlightKML.swift

@@ -1,5 +1,5 @@
 import Foundation
-import GeodesySpherical
+import Vincenty
 
 /// A Builder for composing a KML Document (styles + placemarks).
 /// Use this to create KML documents compatible with ForeFlight's User Map Shapes feature.

Sources/ForeFlightKML/Geometry/Circle/LineCircle.swift

@@ -1,5 +1,5 @@
 import Foundation
-import GeodesySpherical
+import Vincenty
 
 /// A circular line geometry approximated with multiple line segments.
 ///

Sources/ForeFlightKML/Geometry/Circle/PolygonCircle.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// A circular polygon geometry approximated with multiple line segments.
 ///

Sources/ForeFlightKML/Geometry/Segment/LineSector.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// An arc or sector geometry (like a pie slice) defined by center, radius, and angular extents.
 ///

Sources/ForeFlightKML/Geometry/Segment/PolygonAnnularSector.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 public struct PolygonAnnularSector: KMLElement, AltitudeSupport {
     let polygon: Polygon

Sources/ForeFlightKML/Geometry/Segment/PolygonSector.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 public struct PolygonSector: KMLElement, AltitudeSupport {
     let polygon: Polygon

Sources/ForeFlightKML/Geometry/Shared/CircleGeometry.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 internal enum CircleGeometry {
 

Sources/ForeFlightKML/Geometry/Shared/Line.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// A simple line connecting multiple coordinates in sequence.
 ///

Sources/ForeFlightKML/Geometry/Shared/SectorGeometry.swift

@@ -1,5 +1,5 @@
 import Foundation
-import GeodesySpherical
+import Vincenty
 
 internal enum SectorGeometry {
     static func generateSectorPoints(

Sources/ForeFlightKML/Models/CoordinateContainer.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// Protocol for KML elements that contain coordinate arrays and support altitude/tessellation.
 /// Used by LineString, LinearRing, and similar coordinate-based geometries.

Sources/ForeFlightKML/Models/Placemark.swift

@@ -1,4 +1,4 @@
-import GeodesySpherical
+import Vincenty
 
 /// Represents a Feature Placemark that combines geometry with styling and metadata.
 ///

Sources/ForeFlightKML/Utils/Geodesy+KML.swift → Sources/ForeFlightKML/Utils/Coordinate+KML.swift

@@ -1,5 +1,6 @@
 import Foundation
-import GeodesySpherical
+// Re-exported so `Coordinate` is fully usable with just `import ForeFlightKML`.
+@_exported import Vincenty
 
 // KML uses 3D geographic coordinates: longitude, latitude and altitude, in that order.
 // The longitude and latitude components are in decimal degrees
@@ -39,7 +40,21 @@ internal func formatCoordinate(_ value: Double, precision: Int) -> String {
     return String(formatted[formatted.startIndex..<end])
 }
 
-extension GeodesySpherical.Coordinate {
+/// A WGS-84 latitude/longitude in decimal degrees.
+public typealias Coordinate = GeodeticCoordinate
+
+extension Coordinate {
+    /// The point `distance` metres from here along a WGS-84 geodesic, setting off on `bearing`
+    /// degrees from north (Vincenty direct solution).
+    ///
+    /// Non-finite input yields a NaN coordinate rather than trapping.
+    internal func destination(with distance: Double, bearing: Double) -> Coordinate {
+        guard let solution = try? Ellipsoid.wgs84.direct(from: self, distance: distance, initialBearing: bearing) else {
+            return Coordinate(latitude: .nan, longitude: .nan)
+        }
+        return solution.destination
+    }
+
     /// Format coordinate as KML `longitude,latitude` string with given precision.
     /// Trailing zeros are trimmed (e.g. `2.0` not `2.00000000`).
     public func kmlString(precision: Int = 8) -> String {
@@ -68,7 +83,7 @@ internal struct Coordinate3D: Hashable {
     public let altitude: Double?
 
     public init(
-        latitude: GeodesySpherical.Degrees, longitude: GeodesySpherical.Degrees,
+        latitude: Double, longitude: Double,
         altitude: Double? = nil
     ) {
         self.coordinate = Coordinate(latitude: latitude, longitude: longitude)
@@ -80,8 +95,8 @@ internal struct Coordinate3D: Hashable {
         self.altitude = altitude
     }
 
-    public var latitude: GeodesySpherical.Degrees { coordinate.latitude }
-    public var longitude: GeodesySpherical.Degrees { coordinate.longitude }
+    public var latitude: Double { coordinate.latitude }
+    public var longitude: Double { coordinate.longitude }
 
     public func kmlString(precision: Int = kDefaultCoordinatePrecision) -> String {
         let lon = formatCoordinate(self.longitude, precision: precision)

Tests/ForeFlightKMLTests/Builder/ForeFlightKML+BuildTests.swift

@@ -1,5 +1,4 @@
 import XCTest
-import GeodesySpherical
 @testable import ForeFlightKML
 
 final class ForeFlightKMLBuildTests: XCTestCase {

Tests/ForeFlightKMLTests/Builder/ForeFlightKML+KMZTests.swift

@@ -1,6 +1,5 @@
 import XCTest
 @testable import ForeFlightKML
-import GeodesySpherical
 import ZIPFoundation
 
 final class KMZPackagingTests: XCTestCase {

Tests/ForeFlightKMLTests/Builder/ForeFlightKMLTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import Foundation
 import XCTest
 

Tests/ForeFlightKMLTests/CoreElementTests/LineStringTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/CoreElementTests/LinearRingTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/CoreElementTests/PointTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/CoreElementTests/PolygonTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/GeometryTests/LineCircleTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/GeometryTests/LineSectorTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/GeometryTests/LineTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/GeometryTests/PolygonAnnularSectorTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/GeometryTests/PolygonCircleTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/GeometryTests/PolygonSegmentTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/ModelTests/AltitudeTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/ModelTests/CoordinateContainerTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/StyleTests/Geometry/GeometryStyleTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/StyleTests/Geometry/PointStyleTests.swift

@@ -1,5 +1,4 @@
 import XCTest
-import GeodesySpherical
 @testable import ForeFlightKML
 
 final class PointStylesTests: XCTestCase {

Tests/ForeFlightKMLTests/StyleTests/IconStyle+HiddenTests.swift

@@ -1,6 +1,5 @@
 import XCTest
 @testable import ForeFlightKML
-import GeodesySpherical
 
 final class LabelOnlyTests: XCTestCase {
 

Tests/ForeFlightKMLTests/StyleTests/SubStyleTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/ForeFlightKMLTests/Utils/CoordinateFormattingTests.swift

@@ -1,5 +1,4 @@
 import XCTest
-import GeodesySpherical
 @testable import ForeFlightKML
 
 final class CoordinateFormattingTests: XCTestCase {

Tests/ForeFlightKMLTests/Utils/TestHelpers.swift

@@ -1,5 +1,4 @@
 import XCTest
-import GeodesySpherical
 @testable import ForeFlightKML
 
 class XMLTestHelper {

Tests/UserMapShapeTests/UserMapShapesSampleFullTest.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML

Tests/UserMapShapeTests/UserMapShapesSampleIndividualTests.swift

@@ -1,4 +1,3 @@
-import GeodesySpherical
 import XCTest
 
 @testable import ForeFlightKML