Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 0b34873

Browse files
committed
set showOnMapnavWarning to true
various updates initial full flow test
1 parent 70a431f commit 0b34873

File tree

9 files changed

+732
-248
lines changed

9 files changed

+732
-248
lines changed

Marlin/Marlin.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
F727A684284E351800BD728A /* MSIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = F727A683284E351800BD728A /* MSIError.swift */; };
9595
F727A691284E605800BD728A /* MarlinTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F727A690284E605800BD728A /* MarlinTests.swift */; };
9696
F727A697284E606F00BD728A /* KIF+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F727A687284E485500BD728A /* KIF+extensions.swift */; };
97-
F727A698284E607100BD728A /* MSITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F727A685284E476200BD728A /* MSITests.swift */; };
9897
F72D88F42971B84D00D022FB /* FilterBottomSheetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72D88F32971B84D00D022FB /* FilterBottomSheetTests.swift */; };
9998
F72D88F62971E9D900D022FB /* FilterBottomSheetRowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72D88F52971E9D900D022FB /* FilterBottomSheetRowTests.swift */; };
10099
F72D88F82971FF8000D022FB /* HamburgerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72D88F72971FF8000D022FB /* HamburgerTests.swift */; };
@@ -115,6 +114,7 @@
115114
F72D8919297F0D7D00D022FB /* dfrsMockData.json in Resources */ = {isa = PBXBuildFile; fileRef = F72D8918297F0D7D00D022FB /* dfrsMockData.json */; };
116115
F72D891B297F449C00D022FB /* DFRSDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72D891A297F449C00D022FB /* DFRSDataTests.swift */; };
117116
F72E0F6C2A28D5160099BFFD /* LightSectorsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72E0F6B2A28D5160099BFFD /* LightSectorsTests.swift */; };
117+
F72E0F6E2A2926600099BFFD /* MarlinFullFlowTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72E0F6D2A2926600099BFFD /* MarlinFullFlowTest.swift */; };
118118
F72EAAB7291BF21400AC6026 /* ModuDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72EAAB6291BF21400AC6026 /* ModuDataTests.swift */; };
119119
F72EAAB9291BF28C00AC6026 /* moduMockData.json in Resources */ = {isa = PBXBuildFile; fileRef = F72EAAB8291BF28C00AC6026 /* moduMockData.json */; };
120120
F72EAABC291C138000AC6026 /* PortDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72EAABB291C138000AC6026 /* PortDataTests.swift */; };
@@ -508,7 +508,6 @@
508508
F7275FDE28FA252800ED8D9A /* LightProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LightProtocol.swift; sourceTree = "<group>"; };
509509
F727A682284E29AE00BD728A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
510510
F727A683284E351800BD728A /* MSIError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSIError.swift; sourceTree = "<group>"; };
511-
F727A685284E476200BD728A /* MSITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSITests.swift; sourceTree = "<group>"; };
512511
F727A687284E485500BD728A /* KIF+extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KIF+extensions.swift"; sourceTree = "<group>"; };
513512
F727A689284E5F9600BD728A /* Marlin-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Marlin-Bridging-Header.h"; sourceTree = "<group>"; };
514513
F727A68E284E605800BD728A /* MarlinTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MarlinTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -533,6 +532,7 @@
533532
F72D8918297F0D7D00D022FB /* dfrsMockData.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = dfrsMockData.json; sourceTree = "<group>"; };
534533
F72D891A297F449C00D022FB /* DFRSDataTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DFRSDataTests.swift; sourceTree = "<group>"; };
535534
F72E0F6B2A28D5160099BFFD /* LightSectorsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LightSectorsTests.swift; sourceTree = "<group>"; };
535+
F72E0F6D2A2926600099BFFD /* MarlinFullFlowTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarlinFullFlowTest.swift; sourceTree = "<group>"; };
536536
F72EAAB6291BF21400AC6026 /* ModuDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModuDataTests.swift; sourceTree = "<group>"; };
537537
F72EAAB8291BF28C00AC6026 /* moduMockData.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = moduMockData.json; sourceTree = "<group>"; };
538538
F72EAABB291C138000AC6026 /* PortDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortDataTests.swift; sourceTree = "<group>"; };
@@ -1082,11 +1082,11 @@
10821082
F7C23E152911C7920002A7DF /* DataSources */,
10831083
F71DF47C284E68C200686951 /* responses */,
10841084
F727A689284E5F9600BD728A /* Marlin-Bridging-Header.h */,
1085-
F727A685284E476200BD728A /* MSITests.swift */,
10861085
F727A687284E485500BD728A /* KIF+extensions.swift */,
10871086
F727A690284E605800BD728A /* MarlinTests.swift */,
10881087
F71DF481284E783600686951 /* TestHelper.swift */,
10891088
F7364E412A26A1740098F243 /* MarlinTestInitialization.swift */,
1089+
F72E0F6D2A2926600099BFFD /* MarlinFullFlowTest.swift */,
10901090
);
10911091
path = MarlinTests;
10921092
sourceTree = "<group>";
@@ -2205,7 +2205,6 @@
22052205
F72281DA296F27D000218FC0 /* CurrentLocationTests.swift in Sources */,
22062206
F7C23E182911C7D50002A7DF /* ASAMDataTests.swift in Sources */,
22072207
F75F81DF295F68BB0062A708 /* BadgeTests.swift in Sources */,
2208-
F727A698284E607100BD728A /* MSITests.swift in Sources */,
22092208
F7ABB608299D532800BAD868 /* NavigationalWarningAreaUnreadBadgeTests.swift in Sources */,
22102209
F73D9E1F29709A69008AF40D /* DifferentialGPSStationSummaryViewTests.swift in Sources */,
22112210
F75F81D529526E9C0062A708 /* AsamSummaryViewTests.swift in Sources */,
@@ -2249,6 +2248,7 @@
22492248
F7ABB606299D1EE900BAD868 /* NavigationalWarningsOverviewTests.swift in Sources */,
22502249
F72D88F42971B84D00D022FB /* FilterBottomSheetTests.swift in Sources */,
22512250
F75324BB2980906E005C509F /* CLLocationCoordinate2DExtensionsTests.swift in Sources */,
2251+
F72E0F6E2A2926600099BFFD /* MarlinFullFlowTest.swift in Sources */,
22522252
F72EAAB7291BF21400AC6026 /* ModuDataTests.swift in Sources */,
22532253
F7D8FA792941005E00E7D0A1 /* ChartCorrectionListViewModelTests.swift in Sources */,
22542254
F749E43529AE90E200B2FF8B /* NewMapLayerViewModelTests.swift in Sources */,

Marlin/Marlin/DataSources/Light/Light+CoreDataClass.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import CoreData
1010
import MapKit
1111
import OSLog
1212
import SwiftUI
13-
import Kingfisher
1413

1514
struct LightVolume {
1615
var volumeQuery: String

Marlin/Marlin/DataSources/NavigationalWarning/NavigationalWarning+Decodable.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ struct NavigationalWarningPropertyContainer: Decodable {
2121
}
2222
}
2323

24-
/// A struct encapsulating the properties of a Quake.
2524
struct NavigationalWarningProperties: Decodable {
2625

2726
static let apiToDateFormatter: DateFormatter = {

Marlin/Marlin/Map/MarlinMap.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,7 @@ class MarlinMapCoordinator: NSObject, MKMapViewDelegate, UIGestureRecognizerDele
329329
let span = mapView?.region.span ?? MKCoordinateSpan(zoomLevel: 17, pixelWidth: Double(mapView?.frame.size.width ?? UIScreen.main.bounds.width))
330330
let adjustedCenter = CLLocationCoordinate2D(latitude: ds.coordinate.latitude - (span.latitudeDelta / 4.0), longitude: ds.coordinate.longitude)
331331
if CLLocationCoordinate2DIsValid(adjustedCenter) {
332-
mapView?.setCenter(adjustedCenter, animated: true)
333-
currentRegion = MKCoordinateRegion(center: adjustedCenter, span: span)
332+
setMapRegion(region: MKCoordinateRegion(center: adjustedCenter, span: span))
334333
}
335334
}
336335
}

Marlin/Marlin/MarlinView.swift

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -89,26 +89,6 @@ struct MarlinView: View {
8989
MappedDataSourcesFilter(showBottomSheet: $filterOpen)
9090
.environmentObject(dataSourceList)
9191
}
92-
// .bottomSheet(isPresented: $filterOpen, detents: .large, delegate: self) {
93-
// MappedDataSourcesFilter()
94-
// .environmentObject(dataSourceList)
95-
// .toolbar {
96-
// ToolbarItem(placement: .navigationBarTrailing) {
97-
// Button(action: {
98-
// filterOpen.toggle()
99-
// }) {
100-
// Image(systemName: "xmark.circle.fill")
101-
// .imageScale(.large)
102-
// .foregroundColor(Color.onPrimaryColor.opacity(0.87))
103-
// }
104-
// .accessibilityElement(children: .contain)
105-
// .accessibilityLabel("Close Filter")
106-
// }
107-
// }
108-
// .onAppear {
109-
// Metrics.shared.appRoute(["mapFilter"])
110-
// }
111-
// }
11292
.snackbar(isPresented: $showSnackbar) {
11393
Group {
11494
if let snackbarModel = snackbarModel {

Marlin/Marlin/userDefaults.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<true/>
1919
<key>showOnMapdfrs</key>
2020
<true/>
21+
<key>showOnMapnavWarning</key>
22+
<true/>
2123
<key>asamOrder</key>
2224
<integer>0</integer>
2325
<key>moduOrder</key>

Marlin/MarlinTests/MSITests.swift

Lines changed: 0 additions & 211 deletions
This file was deleted.

0 commit comments

Comments
 (0)