Eliminate test warnings

DJBen · Feb 10, 2018 · f3e515f · f3e515f
1 parent 28ac2b3
commit f3e515f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/Graviton/Common/Utils/Formatters.swift b/Graviton/Common/Utils/Formatters.swift
@@ -74,19 +74,21 @@ class CoordinateFormatter: Formatter {
         }
         let lat = coordinate.latitude
         let long = coordinate.longitude
-        func stripNegativeSign(_ dms: DegreeMinuteSecond) -> String {
+        func stripNegativeSign(_ dms: DegreeAngle) -> String {
             if dms.value >= 0 {
-                return dms.description
+                return dms.compoundDescription
             } else {
-                var str = dms.description
+                var str = dms.compoundDescription
                 str.remove(at: str.startIndex)
                 return str
             }
         }
-        let latDms = DegreeMinuteSecond(value: lat)
-        latDms.decimalNumberFormatter = Formatters.twoDecimalPointFormatter
-        let longDms = DegreeMinuteSecond(value: long)
-        longDms.decimalNumberFormatter = Formatters.twoDecimalPointFormatter
+        let latDms = DegreeAngle(lat)
+        latDms.wrapMode = .range_180
+        latDms.compoundDecimalNumberFormatter = Formatters.twoDecimalPointFormatter
+        let longDms = DegreeAngle(long)
+        longDms.wrapMode = .range_180
+        longDms.compoundDecimalNumberFormatter = Formatters.twoDecimalPointFormatter
         let latStr = stripNegativeSign(latDms) + (lat >= 0 ? " N" : " S")
         let longStr = stripNegativeSign(longDms) + (long >= 0 ? " E" : " W")
         return "\(latStr), \(longStr)"

diff --git a/OrbitsTests/ObserverParserTest.swift b/OrbitsTests/ObserverParserTest.swift
@@ -20,7 +20,9 @@ class ObserverParserTest: XCTestCase {
         mockData = try! String(contentsOfFile: path, encoding: .utf8)
         let results = ObserverRiseTransitSetParser.default.parse(content: mockData)
         XCTAssertEqual(results.count, 20)
-        let location = CLLocation(latitude: 37.7816, longitude: wrapLongitude(237.5844))
+        let long = DegreeAngle(237.5844)
+        long.wrapMode = .range_180
+        let location = CLLocation(latitude: 37.7816, longitude: long.wrappedValue)
         let expected0 = RiseTransitSetInfo(naifId: 301, jd: 2440587.865972222, location: location, daylightFlag: " ", rtsFlag: "r", azimuth: 100.8787, elevation: -0.7645)
         let expected4 = RiseTransitSetInfo(naifId: 301, jd: 2440589.133333333, location: location, daylightFlag: "C", rtsFlag: "t", azimuth: 179.0547, elevation: 35.8295)
         let expected5 = RiseTransitSetInfo(naifId: 301, jd: 2440589.354861111, location: location, daylightFlag: "*", rtsFlag: "s", azimuth: 248.5043, elevation: -0.8843)
@@ -49,7 +51,9 @@ class ObserverParserTest: XCTestCase {
         result6.jd = 2440587.541666667
         result6.daylightFlag = "*"
         result6.rtsFlag = ""
-        result6.location = CLLocation(latitude: 37.7816, longitude: wrapLongitude(237.5844))
+        let long = DegreeAngle(237.5844)
+        long.wrapMode = .range_180
+        result6.location = CLLocation(latitude: 37.7816, longitude: long.wrappedValue)
         assertEqual(result6, results[6])
     }