Update flag.json and Flag unit tests

sxg · Mar 15, 2019 · 4fe3f5b · 4fe3f5b
1 parent 1616678
commit 4fe3f5b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 58 deletions.
diff --git a/Tests/FlagTests.swift b/Tests/FlagTests.swift
@@ -38,13 +38,8 @@ class FlagTests: XCTestCase {
         // Then
         XCTAssertNotNil(flag)
         XCTAssertNil(flag.darkSkyUnavailable)
-        XCTAssertEqual(flag.darkSkyStations, ["KLWX", "KDOX"])
-        XCTAssertNil(flag.dataPointStations)
-        XCTAssertEqual(flag.isdStations, ["724060-93721", "745944-93784", "997296-99999", "997302-99999", "999999-13725"])
-        XCTAssertEqual(flag.lampStations, ["KADW", "KAPG", "KBWI", "KCGS", "KDCA", "KDMH", "KDMW", "KFME", "KMTN", "KNAK"])
-        XCTAssertNil(flag.metarStations)
-        XCTAssertNil(flag.metnoLicense)
-        XCTAssertEqual(flag.sources, ["darksky", "lamp", "gfs", "cmc", "nam", "rap", "rtma", "sref", "fnmoc", "isd", "nwspa", "madis", "nearest-precip"])
+        XCTAssertEqual(flag.nearestStation, 1.839)
+        XCTAssertEqual(flag.sources, ["nearest-precip", "nwspa", "cmc", "gfs", "hrrr", "icon", "isd", "madis", "nam", "sref", "darksky"])
         XCTAssertEqual(flag.units, Units.us)
     }
 

diff --git a/Tests/Resources/flag.json b/Tests/Resources/flag.json
@@ -1,59 +1,17 @@
 {
     "sources":[
-        "darksky",
-        "lamp",
-        "gfs",
+        "nearest-precip",
+        "nwspa",
         "cmc",
-        "nam",
-        "rap",
-        "rtma",
-        "sref",
-        "fnmoc",
+        "gfs",
+        "hrrr",
+        "icon",
         "isd",
-        "nwspa",
         "madis",
-        "nearest-precip"
-    ],
-    "darksky-stations":[
-        "KLWX",
-        "KDOX"
-    ],
-    "lamp-stations":[
-        "KADW",
-        "KAPG",
-        "KBWI",
-        "KCGS",
-        "KDCA",
-        "KDMH",
-        "KDMW",
-        "KFME",
-        "KMTN",
-        "KNAK"
-    ],
-    "isd-stations":[
-        "724060-93721",
-        "745944-93784",
-        "997296-99999",
-        "997302-99999",
-        "999999-13725"
-    ],
-    "madis-stations":[
-        "4MD9",
-        "AR338",
-        "AS955",
-        "BLTM2",
-        "C0577",
-        "C1032",
-        "C1550",
-        "C3783",
-        "C9454",
-        "D8468",
-        "E2096",
-        "E6378",
-        "FSKM2",
-        "KBWI",
-        "KDMH",
-        "RSTM2"
+        "nam",
+        "sref",
+        "darksky"
     ],
+    "nearest-station":1.839,
     "units":"us"
 }