updated to support WMATAFetcher 2.2.0

Author: clrung

DC Metro.xcodeproj/project.pbxproj

@@ -246,6 +246,7 @@
 						CreatedOnToolsVersion = 7.3;
 						DevelopmentTeam = 2848SVWH7M;
 						LastSwiftMigration = 0800;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.ApplicationGroups.Mac = {
 								enabled = 1;
@@ -259,6 +260,7 @@
 						CreatedOnToolsVersion = 7.3;
 						DevelopmentTeam = 2848SVWH7M;
 						LastSwiftMigration = 0800;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.ApplicationGroups.Mac = {
 								enabled = 1;
@@ -569,6 +571,7 @@
 				CODE_SIGN_ENTITLEMENTS = "DC Metro.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 2848SVWH7M;
 				INFOPLIST_FILE = DCMetro/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -587,6 +590,7 @@
 				CODE_SIGN_ENTITLEMENTS = "DC Metro.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 2848SVWH7M;
 				INFOPLIST_FILE = DCMetro/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -605,6 +609,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 2848SVWH7M;
 				INFOPLIST_FILE = DCMetroWidget/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -625,6 +630,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 2848SVWH7M;
 				INFOPLIST_FILE = DCMetroWidget/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;

DCMetro/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>9</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

DCMetroWidget/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>XPC!</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>9</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

DCMetroWidget/MainViewController.swift

@@ -98,7 +98,7 @@ class MainViewController: NSViewController, NCWidgetProviding, NSTableViewDelega
 			self.selectedStationLabel.stringValue = selectedStation.description
 
 			let trainsHeight = self.trains.count * (self.ROW_HEIGHT + self.ROW_SPACING)
-			let spacesHeight = WMATAfetcher.getSpaceCount(self.trains) * (self.ROW_HEIGHT - self.SPACE_HEIGHT)
+			let spacesHeight = WMATAfetcher.getSpaceCount(trains: self.trains) * (self.ROW_HEIGHT - self.SPACE_HEIGHT)
 
 			self.predictionTableViewHeightConstraint.constant = CGFloat(self.HEADER_HEIGHT + trainsHeight - spacesHeight)
 			self.predictionTableView.reloadData()
@@ -166,10 +166,10 @@ class MainViewController: NSViewController, NCWidgetProviding, NSTableViewDelega
 	}
 
 	func tableView(_ tableView: NSTableView, heightOfRow row: Int) -> CGFloat {
-		if self.trains[row].group != "-1" {
-			return CGFloat(ROW_HEIGHT)
-		} else {
+		if self.trains[row].group == "-1" {
 			return CGFloat(SPACE_HEIGHT)
+		} else {
+			return CGFloat(ROW_HEIGHT)
 		}
 	}
 
@@ -180,7 +180,7 @@ class MainViewController: NSViewController, NCWidgetProviding, NSTableViewDelega
 		LocationManager.sharedManager.stopUpdatingLocation()
 
 		if currentLocation != nil {
-			fiveClosestStations = WMATAfetcher.getClosestStations(currentLocation!, numStations: 5)
+			fiveClosestStations = WMATAfetcher.getClosestStations(location: currentLocation!, numStations: 5)
 			if !didSelectStation {
 				selectedStation = fiveClosestStations[0]
 			}
@@ -213,7 +213,7 @@ class MainViewController: NSViewController, NCWidgetProviding, NSTableViewDelega
 	Wrapper method that calls getPrediction(), passing it the selectedStation.
 	*/
 	func getPredictionsForSelectedStation() {
-		WMATAfetcher.getStationPredictions(selectedStation.rawValue, onCompleted: {
+		WMATAfetcher.getStationPredictions(stationCode: selectedStation.rawValue, onCompleted: {
 			trainResponse in
 			if trainResponse.errorCode == nil {
 				self.trains = trainResponse.trains!

Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
-  - Crashlytics (3.8.2):
+  - Crashlytics (3.8.3):
     - Fabric (~> 1.6.3)
-  - Fabric (1.6.9)
-  - SwiftyJSON (3.1.1)
-  - WMATAFetcher (2.1.0):
+  - Fabric (1.6.11)
+  - SwiftyJSON (3.1.3)
+  - WMATAFetcher (2.2.0):
     - SwiftyJSON (~> 3.0)
 
 DEPENDENCIES:
@@ -12,11 +12,11 @@ DEPENDENCIES:
   - WMATAFetcher
 
 SPEC CHECKSUMS:
-  Crashlytics: 27acca95a01b042a8294291dd6dff27f8f6af6d7
-  Fabric: bc5bec42cef4bcf1ee3ce0e218fc518e4b44dfbb
-  SwiftyJSON: f0be2e604f83e8405a624e9f891898bf6ed4e019
-  WMATAFetcher: dc4a278dfc34d415bfb949e444f0166793a8231f
+  Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e
+  Fabric: 5911403591946b8228ab1c51d98f1d7137e863c6
+  SwiftyJSON: 38a8ea2006779c0fc4c310cb2ee8195327740faf
+  WMATAFetcher: 782b4d3ae6b967bd1de6dbe113d95ba2cbfb667f
 
 PODFILE CHECKSUM: cf472ee5754ad4f01b24dd56f92f19db35f25794
 
-COCOAPODS: 1.1.0.rc.2
+COCOAPODS: 1.2.0.beta.1