refactor: Expands Coord property names

Author: NeedleInAJayStack

Sources/Haystack/Coord.swift

@@ -8,19 +8,19 @@ import Foundation
 public struct Coord: Val {
     public static var valType: ValType { .Coord }
 
-    public let lat: Double
-    public let lng: Double
+    public let latitude: Double
+    public let longitude: Double
 
-    public init(lat: Double, lng: Double) throws {
-        guard -90 <= lat, lat <= 90, -180 <= lng, lng <= 180 else {
-            throw CoordError.invalidCoordinates(lat: lat, lng: lng)
+    public init(latitude: Double, longitude: Double) throws {
+        guard -90 <= latitude, latitude <= 90, -180 <= longitude, longitude <= 180 else {
+            throw CoordError.invalidCoordinates(lat: latitude, lng: longitude)
         }
-        self.lat = lat
-        self.lng = lng
+        self.latitude = latitude
+        self.longitude = longitude
     }
 
     public func toZinc() -> String {
-        return "C(\(lat),\(lng))"
+        return "C(\(latitude),\(longitude))"
     }
 }
 
@@ -47,8 +47,8 @@ extension Coord: Codable {
             }
 
             try self.init(
-                lat: container.decode(Double.self, forKey: .lat),
-                lng: container.decode(Double.self, forKey: .lng)
+                latitude: container.decode(Double.self, forKey: .lat),
+                longitude: container.decode(Double.self, forKey: .lng)
             )
         } else {
             throw DecodingError.typeMismatch(
@@ -64,8 +64,8 @@ extension Coord: Codable {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
-        try container.encode(lat, forKey: .lat)
-        try container.encode(lng, forKey: .lng)
+        try container.encode(latitude, forKey: .lat)
+        try container.encode(longitude, forKey: .lng)
     }
 }
 

Sources/Haystack/IO/ZincReader.swift

@@ -104,7 +104,7 @@ public class ZincReader {
         try consume(.comma)
         let longitude = try consumeNumber()
         try consume(.rparen)
-        return try Coord(lat: latitude.val, lng: longitude.val)
+        return try Coord(latitude: latitude.val, longitude: longitude.val)
     }
 
     private func parseXStr(_ id: String) throws -> XStr {

Tests/HaystackTests/CoordTests.swift

@@ -3,14 +3,14 @@ import Haystack
 
 final class CoordTests: XCTestCase {
     func testInit() throws {
-        try XCTAssertThrowsError(Coord(lat: -91, lng: 0))
-        try XCTAssertThrowsError(Coord(lat: 91, lng: 0))
-        try XCTAssertThrowsError(Coord(lat: 0, lng: -181))
-        try XCTAssertThrowsError(Coord(lat: 0, lng: 181))
+        try XCTAssertThrowsError(Coord(latitude: -91, longitude: 0))
+        try XCTAssertThrowsError(Coord(latitude: 91, longitude: 0))
+        try XCTAssertThrowsError(Coord(latitude: 0, longitude: -181))
+        try XCTAssertThrowsError(Coord(latitude: 0, longitude: 181))
     }
 
     func testJsonCoding() throws {
-        let value = try Coord(lat: 40, lng: -111.84)
+        let value = try Coord(latitude: 40, longitude: -111.84)
         let jsonString = #"{"_kind":"coord","lat":40,"lng":-111.84}"#
 
         let encodedData = try JSONEncoder().encode(value)
@@ -28,7 +28,7 @@ final class CoordTests: XCTestCase {
 
     func testToZinc() throws {
         XCTAssertEqual(
-            try Coord(lat: 40, lng: -111.84).toZinc(),
+            try Coord(latitude: 40, longitude: -111.84).toZinc(),
             "C(40.0,-111.84)"
         )
     }

Tests/HaystackTests/IO/ZincReaderTests.swift

@@ -108,7 +108,7 @@ final class ZincReaderTests: XCTestCase {
                 [marker, remove, null, null], // Bin not supported.
                 [Date(year: 2009, month: 12, day: 31), Time(hour: 23, minute: 59, second: 1), Time(hour: 1, minute: 2, second: 3, millisecond: 123), DateTime(year: 2009, month: 2, day: 3, hour: 4, minute: 5, second: 6)],
                 [Number.infinity, Number.negativeInfinity, "", Number.nan],
-                [Coord(lat: 12, lng: -34), Coord(lat: 0.123, lng: -0.789), Coord(lat: 84.5, lng: -77.45), Coord(lat: -90, lng: 180)],
+                [Coord(latitude: 12, longitude: -34), Coord(latitude: 0.123, longitude: -0.789), Coord(latitude: 84.5, longitude: -77.45), Coord(latitude: -90, longitude: 180)],
             ]
         )