Merge pull request #173 from timroesner/172-modify-coordinates

Modify coordinates
timroesner · May 11, 2019 · 5457c9e · 5457c9e
2 parents deb15c0 + e3192a5
commit 5457c9e
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 146 deletions.
diff --git a/BayPass.xcodeproj/project.pbxproj b/BayPass.xcodeproj/project.pbxproj
@@ -293,7 +293,7 @@
 		6A009197217EAF800087A32B /* Pass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pass.swift; sourceTree = "<group>"; };
 		6A009199217EAFFE0087A32B /* Ticket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ticket.swift; sourceTree = "<group>"; };
 		6A0A9BE92256F6C60093CA57 /* Array.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Array.swift; sourceTree = "<group>"; };
-		6A0A9BEF225734B50093CA57 /* Coordinates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coordinates.swift; sourceTree = "<group>"; };
+		6A0A9BEF225734B50093CA57 /* Coordinates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Coordinates.swift; path = ../Coordinates.swift; sourceTree = "<group>"; };
 		6A0ED235217BFA4B003CD497 /* MapAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MapAnnotation.swift; path = BayPass/Model/Map/MapAnnotation.swift; sourceTree = SOURCE_ROOT; };
 		6A18FDBA2235AFB7002047B9 /* HereTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HereTests.swift; sourceTree = "<group>"; };
 		6A221D6B224DB37A00A36175 /* System.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = System.swift; path = ../../System.swift; sourceTree = "<group>"; };
@@ -666,6 +666,7 @@
 				6A0ED235217BFA4B003CD497 /* MapAnnotation.swift */,
 				6A221D6B224DB37A00A36175 /* System.swift */,
 				6AB22BEA225FF05E0073F023 /* SystemCoordinates.swift */,
+				6A0A9BEF225734B50093CA57 /* Coordinates.swift */,
 			);
 			path = Map;
 			sourceTree = "<group>";
@@ -686,7 +687,6 @@
 			children = (
 				6A009191217EAD580087A32B /* Map */,
 				6A009194217EAF090087A32B /* Ticket */,
-				6A0A9BEF225734B50093CA57 /* Coordinates.swift */,
 				22B40EFB225815B5009520C6 /* PaymentMethod.swift */,
 				226DAA9F2266FFDE00B10E20 /* UserManager.swift */,
 			);

diff --git a/BayPass/APIs/GMParseToGTFS.swift b/BayPass/APIs/GMParseToGTFS.swift
@@ -48,7 +48,7 @@ struct Parse {
         "Powell Street Station": "Powell St.",
         "Richmond Station": "Richmond",
         "Rockridge Station": "Rockridge",
-        // "San Bruno",
+        "San Bruno Station": "San Bruno",
         "San Francisco International Airport Station": "San Francisco International Airport",
         "San Leandro Station": "San Leandro",
         "South Hayward BART Station": "South Hayward",

diff --git a/BayPass/APIs/Here.swift b/BayPass/APIs/Here.swift
@@ -117,15 +117,19 @@ class Here {
     func parseLine(from json: [String : Any]) -> Line? {
         guard let lineName = json["name"] as? String,
             let lineDestination = json["dir"] as? String,
-            let at = json["At"] as? [String: Any],
             let modeNum = json["mode"] as? Int
-        else { return nil }
+        else {
+            print("Could not parse line json: \(json)")
+            return nil
+        }
 
-        var colorString = at["color"] as? String ?? ""
+        let at = json["At"] as? [String: Any]
+        var colorString = at?["color"] as? String ?? ""
         if colorString == "#FEF0B5" || colorString == "#FFFF33" {
             colorString = "#F3B43F"
         }
         let color = UIColor(hex: Int(colorString.dropFirst(), radix: 16) ?? 0x4A90E2)
+
         let transitMode = transitModeConvert(num: modeNum)
         let ag = Agency.zero
 

diff --git a/BayPass/Controller/Map/MVCStationOverview.swift b/BayPass/Controller/Map/MVCStationOverview.swift
@@ -14,7 +14,10 @@ extension MapViewController {
         bottomSheet.moveOverlay(toNotchAt: 0, animated: true)
         mapView.removeAnnotations(mapView.annotations)
 
-        mapView.addAnnotation(MapAnnotation(fromStation: station))
+        let stationAnnotation = MapAnnotation(fromStation: station)
+        mapView.addAnnotation(stationAnnotation)
+        mapView.selectAnnotation(stationAnnotation, animated: true)
+
         let insets = UIEdgeInsets(top: 0, left: view.frame.width/2, bottom: 0, right: 0)
         let rect = MKMapRect(origin: MKMapPoint(station.location.coordinate), size: MKMapSize(width: 3000, height: 3000))
         mapView.setVisibleMapRect(rect, edgePadding: insets, animated: true)

diff --git a/BayPass/Controller/Map/SearchViewController.swift b/BayPass/Controller/Map/SearchViewController.swift
@@ -35,6 +35,7 @@ class SearchViewController: UIViewController {
 
         view.backgroundColor = UIColor.white
         view.layer.cornerRadius = 21
+        view.layer.applySketchShadow(color: .black, alpha: 0.20, x: 6, y: 6, blur: 25, spread: 5)
         setupViews()
     }
 

diff --git a/BayPass/Controller/TIcketDetailViewController.swift b/BayPass/Controller/TIcketDetailViewController.swift
diff --git a/BayPass/Controller/Ticket/TicketDetailViewController.swift b/BayPass/Controller/Ticket/TicketDetailViewController.swift
@@ -107,10 +107,13 @@ class TicketDetailViewController: UIViewController {
         view.addSubview(typeInfoLb)
         typeInfoLb.text = ticket?.name ?? pass?.name
         typeInfoLb.textColor = UIColor.black
+        typeInfoLb.numberOfLines = 0
+        typeInfoLb.textAlignment = .center
         typeInfoLb.font = UIFont.systemFont(ofSize: 26, weight: .bold)
         typeInfoLb.snp.makeConstraints { (make) -> Void in
             make.centerX.equalTo(typeLb.snp.centerX)
             make.top.equalTo(typeLb.snp.bottom).offset(10)
+            make.left.right.equalToSuperview().inset(20)
         }
     }
 

diff --git a/BayPass/Extensions/UIColor.swift b/BayPass/Extensions/UIColor.swift
@@ -60,7 +60,7 @@ extension UIColor {
     func isLight() -> Bool {
         guard let components = cgColor.components, components.count > 2 else {return false}
         let brightness = ((components[0] * 299) + (components[1] * 587) + (components[2] * 114)) / 1000
-        return (brightness > 0.5)
+        return (brightness > 0.65)
     }
 
     // https://stackoverflow.com/a/38435309/10458607

diff --git a/BayPass/Model/Coordinates.swift b/BayPass/Model/Coordinates.swift
@@ -14,8 +14,8 @@ struct Coordinates {
     var radius: Int
     var max: Int
 
-    init(center: CLLocationCoordinate2D, radius: Int, max: Int) {
-        self.center = center
+    init(latitude: Double, longitude: Double, radius: Int, max: Int) {
+        self.center = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
         self.radius = radius
         self.max = max
     }

diff --git a/BayPass/System.swift b/BayPass/System.swift
@@ -24,8 +24,8 @@ class System {
             group.enter()
             here.getStationsNearby(center: c.center, radius: c.radius, max: c.max) { stations in
                 for station in stations {
-                    if var stationThatsAlreadyThere = self.allStationsDict[station.name] {
-                        stationThatsAlreadyThere.lines.append(contentsOf: station.lines)
+                    if self.allStationsDict[station.name] != nil {
+                        self.allStationsDict[station.name]?.lines.append(contentsOf: station.lines)
                     } else {
                         self.allStationsDict[station.name] = station
                     }