feat(app): link to station detail from map

krystxf · krystxf · commit 5a2dfcc23d04 · 2024-06-19T18:44:17.000+02:00
diff --git a/app/Common/Types/departuresResponseTypes.swift b/app/Common/Types/departuresResponseTypes.swift
@@ -9,5 +9,3 @@ struct ApiDeparture: Codable {
     let line: String
     let heading: String
 }
-
- 
diff --git a/app/Common/Utils/networkUtils.swift b/app/Common/Utils/networkUtils.swift
@@ -37,9 +37,7 @@ func getDeparturesByGtfsID(gtfsIDs: [String]) async throws -> DeparturesByGtfsID
         decoder.keyDecodingStrategy = .convertFromSnakeCase
         decoder.dateDecodingStrategy = .iso8601
         return try decoder.decode(DeparturesByGtfsIDs.self, from: data)
-
-    }
-    catch {
+    } catch {
         throw FetchError.InvalidaData
     }
 }
diff --git a/app/metro-now.xcodeproj/project.pbxproj b/app/metro-now.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 70;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -41,6 +41,7 @@
 		2D4D8F852C0010A5006F9080 /* networkUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D4D8F842C0010A5006F9080 /* networkUtils.swift */; };
 		2D84CCA12BF8BD7500D2382B /* PlatformListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D84CCA02BF8BD7500D2382B /* PlatformListViewModel.swift */; };
 		2D9213E92C081D99004A37C2 /* WidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D9213E82C081D99004A37C2 /* WidgetView.swift */; };
+		2D94BD8E2C21DE250006CA04 /* StationLocationMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D94BD8D2C21DE250006CA04 /* StationLocationMapView.swift */; };
 		2DC639DC2BF3CCBA00A72C7F /* metro_nowApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DC639DB2BF3CCBA00A72C7F /* metro_nowApp.swift */; };
 		2DC639DE2BF3CCBA00A72C7F /* PlatformListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DC639DD2BF3CCBA00A72C7F /* PlatformListView.swift */; };
 		2DC639E02BF3CCBC00A72C7F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DC639DF2BF3CCBC00A72C7F /* Assets.xcassets */; };
@@ -149,6 +150,7 @@
 		2D4D8F842C0010A5006F9080 /* networkUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = networkUtils.swift; sourceTree = "<group>"; };
 		2D84CCA02BF8BD7500D2382B /* PlatformListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlatformListViewModel.swift; sourceTree = "<group>"; };
 		2D9213E82C081D99004A37C2 /* WidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetView.swift; sourceTree = "<group>"; };
+		2D94BD8D2C21DE250006CA04 /* StationLocationMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StationLocationMapView.swift; sourceTree = "<group>"; };
 		2DC639D82BF3CCBA00A72C7F /* metro-now.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "metro-now.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2DC639DB2BF3CCBA00A72C7F /* metro_nowApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = metro_nowApp.swift; sourceTree = "<group>"; };
 		2DC639DD2BF3CCBA00A72C7F /* PlatformListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlatformListView.swift; sourceTree = "<group>"; };
@@ -182,6 +184,10 @@
 		2DF66D972BFD39B000B31FA2 /* test-coordinates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "test-coordinates.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+		2D94BD892C21BFB90006CA04 /* StationDetail */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = StationDetail; sourceTree = "<group>"; };
+/* End PBXFileSystemSynchronizedRootGroup section */
+
 /* Begin PBXFrameworksBuildPhase section */
 		2D4486802BFAA10A005C59CE /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
@@ -341,6 +347,7 @@
 		2DC639E92BF3CD3900A72C7F /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				2D94BD892C21BFB90006CA04 /* StationDetail */,
 				2DC63A062BF4C24C00A72C7F /* Map */,
 				2DC639FE2BF4B1C600A72C7F /* PlatformDetail */,
 				2DC639EA2BF3CD4700A72C7F /* PlatformList */,
@@ -381,6 +388,7 @@
 			children = (
 				2DC63A072BF4C25B00A72C7F /* MapView.swift */,
 				2D350E662BFBE50600F68039 /* MapStationAnnotationView.swift */,
+				2D94BD8D2C21DE250006CA04 /* StationLocationMapView.swift */,
 			);
 			path = Map;
 			sourceTree = "<group>";
@@ -663,6 +671,7 @@
 				2D1B2C3B2BFAD6CC007ED5EB /* LocationModel.swift in Sources */,
 				2D350E672BFBE50600F68039 /* MapStationAnnotationView.swift in Sources */,
 				2D1B2C422BFAD72C007ED5EB /* jsonUtils.swift in Sources */,
+				2D94BD8E2C21DE250006CA04 /* StationLocationMapView.swift in Sources */,
 				2D1B2C3F2BFAD70F007ED5EB /* timeUtils.swift in Sources */,
 				2DC639DC2BF3CCBA00A72C7F /* metro_nowApp.swift in Sources */,
 				2D4D8F852C0010A5006F9080 /* networkUtils.swift in Sources */,
diff --git a/app/metro-now/Core/Map/MapView.swift b/app/metro-now/Core/Map/MapView.swift
@@ -6,7 +6,7 @@ import MapKit
 import SwiftUI
 
 private struct MetroStationAnnotation {
-    let name: String
+    var name: String
     let coordinate: CLLocationCoordinate2D
     let metroLines: [String] // A | B | C
 }
@@ -15,12 +15,16 @@ struct MapView: View {
     @State private var metroStationAnnotations: [MetroStationAnnotation] = []
 
     var body: some View {
-        Map {
-            UserAnnotation()
+        NavigationStack {
+            Map {
+                UserAnnotation()
 
-            ForEach(metroStationAnnotations, id: \.name) { station in
-                Annotation(station.name, coordinate: station.coordinate) {
-                    MapMetroStationView(metroLines: station.metroLines)
+                ForEach(metroStationAnnotations, id: \.name) { station in
+                    Annotation(station.name, coordinate: station.coordinate) {
+                        NavigationLink(destination: StationLocationMapView(stationName: station.name)) {
+                            MapMetroStationView(metroLines: station.metroLines)
+                        }
+                    }
                 }
             }
         }
@@ -31,6 +35,7 @@ struct MapView: View {
             }
 
             metroStationAnnotations = metroStationsGeoJSON.features.map { feature in
+
                 MetroStationAnnotation(
                     name: feature.properties.name,
                     coordinate: CLLocationCoordinate2D(
diff --git a/app/metro-now/Core/Map/StationLocationMapView.swift b/app/metro-now/Core/Map/StationLocationMapView.swift
@@ -0,0 +1,101 @@
+
+import MapKit
+import SwiftUI
+
+struct StationLocationMapView: View {
+    let stationName: String
+    let station: MetroStationsGeoJSONFeature
+    let stationCoordinate: CLLocationCoordinate2D
+    let distanceFormatter = MKDistanceFormatter()
+    @StateObject private var locationModel = LocationModel()
+    @State var distance: Double = -1
+
+    init(stationName: String) {
+        self.stationName = stationName
+        let stations: MetroStationsGeoJSON = getParsedJSONFile(.METRO_STATIONS_FILE)!
+        station = stations.features.first(where: { $0.properties.name == stationName })!
+        stationCoordinate = CLLocationCoordinate2D(latitude: station.geometry.coordinates[1], longitude: station.geometry.coordinates[0])
+    }
+
+    var body: some View { ScrollView {
+        ZStack {
+            Text("Map")
+                .hidden()
+                .frame(height: 350)
+                .frame(maxWidth: .infinity)
+        }
+
+        .background(alignment: .bottom) {
+            Map {
+                Marker(stationName, coordinate: stationCoordinate)
+            }
+
+            .mask {
+                LinearGradient(
+                    stops: [
+                        .init(color: .clear, location: 0),
+                        .init(color: .black.opacity(0.15), location: 0.1),
+                        .init(color: .black, location: 0.6),
+                        .init(color: .black, location: 1),
+                    ],
+                    startPoint: .top,
+                    endPoint: .bottom
+                )
+            }
+            .padding(.top, -150)
+        }
+        .ignoresSafeArea(edges: .top)
+        VStack(spacing: 20) {
+            HStack(spacing: 20) {
+                Button(action: {}) {
+                    Label("Navigate", systemImage: "figure.walk.circle.fill")
+                        .padding()
+                        .background(Color.blue)
+                        .foregroundColor(.white)
+                        .cornerRadius(8)
+                }
+                if distance > -1 {
+                    VStack(alignment: .leading) {
+                        Text("DISTANCE")
+                            .font(.subheadline)
+                            .foregroundColor(.secondary)
+                        Label {
+                            Text(distanceFormatter.string(fromDistance: distance))
+                        } icon: {
+                            Image(systemName: "point.topleft.down.to.point.bottomright.curvepath")
+                                .foregroundColor(.secondary)
+                        }
+                    }
+                }
+                Spacer()
+            }
+
+            HStack {
+                Text("Departures")
+                    .font(.headline)
+                Spacer()
+            }
+        }
+        .padding()
+    }
+    .navigationTitle(stationName)
+    .onReceive(locationModel.$location) { location in
+
+        guard let location else {
+            print("Unknown location")
+            return
+        }
+        print("User's location: \(location)")
+
+        let userLocation = CLLocation(latitude: location.coordinate.latitude, longitude: location.coordinate.longitude)
+        let stationLocation = CLLocation(latitude: stationCoordinate.latitude, longitude: stationCoordinate.longitude)
+        distance = userLocation.distance(from: stationLocation)
+    }
+    }
+}
+
+#Preview {
+    StationLocationMapView(
+        stationName: "I. P. Pavlova"
+    )
+}
diff --git a/app/metro-now/Core/PlatformList/PlatformListView.swift b/app/metro-now/Core/PlatformList/PlatformListView.swift
@@ -41,7 +41,7 @@ struct PlatformsListView: View {
 //                            let platformDepartures =  departuresByGtfsID?[platform.gtfsId]
 //                            let platformDepartures = departuresByGtfsID?[platform.gtfsId]
 //                            let direction = platformDepartures.first?.heading ?? platform.direction
-                            
+
 //                            NavigationLink {
 //                                PlatformDetailView(
 //                                    defaultDirection: platform.direction,
@@ -77,7 +77,7 @@ struct PlatformsListView: View {
 //                                )
 //                            }
 //                        }
-// 
+//
 //                    }
                 }
                 .padding(10)

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,3 @@ struct ApiDeparture: Codable {`
`9`	`9`	`let line: String`
`10`	`10`	`let heading: String`
`11`	`11`	`}`
`12`		`-`
`13`		`-`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,7 @@ func getDeparturesByGtfsID(gtfsIDs: [String]) async throws -> DeparturesByGtfsID`
`37`	`37`	`decoder.keyDecodingStrategy = .convertFromSnakeCase`
`38`	`38`	`decoder.dateDecodingStrategy = .iso8601`
`39`	`39`	`return try decoder.decode(DeparturesByGtfsIDs.self, from: data)`
`40`		`-`
`41`		`- }`
`42`		`- catch {`
	`40`	`+ } catch {`
`43`	`41`	`throw FetchError.InvalidaData`
`44`	`42`	`}`
`45`	`43`	`}`