lint fixes checkpoint

ngageoint · Dec 20, 2023 · 1fc37d5 · 1fc37d5
1 parent 76176bb
commit 1fc37d5
Show file tree

Hide file tree

Showing 178 changed files with 4,470 additions and 2,644 deletions.
diff --git a/Marlin/Marlin.xcodeproj/project.pbxproj b/Marlin/Marlin.xcodeproj/project.pbxproj
diff --git a/Marlin/Marlin/Conversions/GeoJSONExportable.swift b/Marlin/Marlin/Conversions/GeoJSONExportable.swift
@@ -31,47 +31,42 @@ extension GeoJSONExportable {
     }
     var geoJsonFeatures: [Feature] {
         var geoJsonProperties: [String: AnyCodable] = [:]
-
-//        if let exportable = self as? AnyGeoJSONExportable {
-//            return exportable.base.geoJsonFeatures
-//        } else {
-
-            if let dataSource = self as? DataSource {
-                geoJsonProperties["marlin_data_source"] = AnyCodable(Self.definition.key)
-
-                let encoder = JSONEncoder()
-                encoder.outputFormatting = .prettyPrinted
-
-                if let encodable = dataSource as? Encodable, let data = encodable.dictionary {
-                    for (key, value) in data {
-                        geoJsonProperties[key] = AnyCodable(value)
-                    }
-                } else {
-
-                    for property in Self.properties {
-                        if let gjObject = self as? NSObject, let value = gjObject.value(forKey: property.key) {
-                            switch property.type {
-                            case .location:
-                                print("ignore")
-                            default:
-                                let codable = AnyCodable(value)
-                                geoJsonProperties[property.key] = codable
-                            }
-
-                        }
+
+        geoJsonProperties["marlin_data_source"] = AnyCodable(Self.definition.key)
+
+        let encoder = JSONEncoder()
+        encoder.outputFormatting = .prettyPrinted
+
+        if let encodable = self as? Encodable, let data = encodable.dictionary {
+            for (key, value) in data {
+                geoJsonProperties[key] = AnyCodable(value)
+            }
+        } else {
+
+            for property in Self.properties {
+                if let gjObject = self as? NSObject, let value = gjObject.value(forKey: property.key) {
+                    switch property.type {
+                    case .location:
+                        print("ignore")
+                    default:
+                        let codable = AnyCodable(value)
+                        geoJsonProperties[property.key] = codable
                     }
+
                 }
-//            }
+            }
         }
-        return getFeature(sf: sfGeometry, geoJsonProperties: geoJsonProperties)
+        return getFeature(simpleFeature: sfGeometry, geoJsonProperties: geoJsonProperties)
     }
 
-    func getFeature(sf: SFGeometry?, geoJsonProperties: [String: AnyCodable]) -> [Feature] {
+    func getFeature(simpleFeature: SFGeometry?, geoJsonProperties: [String: AnyCodable]) -> [Feature] {
         var features: [Feature] = []
-        switch sf {
+        switch simpleFeature {
         case let point as SFPoint:
             if let x = point.x as? Double, let y = point.y as? Double {
-                features.append(Feature(geometry: .point(Point(longitude: x, latitude: y)), properties: geoJsonProperties))
+                features.append(
+                    Feature(geometry: .point(Point(longitude: x, latitude: y)), properties: geoJsonProperties)
+                )
             }
         case let line as SFLineString:
             if let lineString = line.toGeoJSON() {
@@ -84,7 +79,9 @@ extension GeoJSONExportable {
         case let collection as SFGeometryCollection:
             for geometry in collection.geometries {
                 if let geometry = geometry as? SFGeometry {
-                    features.append(contentsOf: getFeature(sf: geometry, geoJsonProperties: geoJsonProperties))
+                    features.append(
+                        contentsOf: getFeature(simpleFeature: geometry, geoJsonProperties: geoJsonProperties)
+                    )
                 }
             }
         default:

diff --git a/Marlin/Marlin/CoreData/NSManagedObjectContext+Extensions.swift b/Marlin/Marlin/CoreData/NSManagedObjectContext+Extensions.swift
@@ -65,7 +65,8 @@ extension NSManagedObjectContext {
     }
 
     func truncateAll<T: NSManagedObject>(_ entityClass: T.Type) -> Bool {
-        let request: NSFetchRequest<NSFetchRequestResult> = entityClass.fetchRequest() as NSFetchRequest<NSFetchRequestResult>
+        let request: NSFetchRequest<NSFetchRequestResult> = 
+        entityClass.fetchRequest() as NSFetchRequest<NSFetchRequestResult>
         let deleteRequest = NSBatchDeleteRequest(fetchRequest: request)
 
         do {

diff --git a/Marlin/Marlin/CoreData/Persistence.swift b/Marlin/Marlin/CoreData/Persistence.swift
@@ -125,11 +125,12 @@ class MockPersistentStore: PersistentStore {
 class CoreDataPersistentStore: PersistentStore {
     let logger = Logger(subsystem: "mil.nga.msi.Marlin", category: "persistence")
 
-    func fetchFirst<T: NSManagedObject>(_ entityClass: T.Type,
-                                         sortBy: [NSSortDescriptor]? = nil,
-                                         predicate: NSPredicate? = nil,
-                                        context: NSManagedObjectContext? = nil) throws -> T? {
-
+    func fetchFirst<T: NSManagedObject>(
+        _ entityClass: T.Type,
+        sortBy: [NSSortDescriptor]? = nil,
+        predicate: NSPredicate? = nil,
+        context: NSManagedObjectContext? = nil
+    ) throws -> T? {
         return try (context ?? container.viewContext).fetchFirst(entityClass, sortBy: sortBy, predicate: predicate)
     }
 
@@ -452,7 +453,7 @@ class CoreDataPersistentStore: PersistentStore {
 
     private func mergePersistentHistoryChanges(from history: [NSPersistentHistoryTransaction]) {
         let entityMap: [String?: String] = 
-        MSI.shared.masterDataList.reduce([String?: String]()) { (partialResult, importable) -> [String?: String] in
+        MSI.shared.mainDataList.reduce([String?: String]()) { (partialResult, importable) -> [String?: String] in
             var partialResult = partialResult
             partialResult[importable.entity().name] = importable.key
             return partialResult
@@ -487,7 +488,7 @@ class CoreDataPersistentStore: PersistentStore {
                 self.storeHistoryToken(newToken)
             }
             var dataSourceUpdatedNotifications: [DataSourceUpdatedNotification] = []
-            for dataSource in MSI.shared.masterDataList {
+            for dataSource in MSI.shared.mainDataList {
                 let inserts = insertCounts[dataSource.key] ?? 0
                 let updates = updateCounts[dataSource.key] ?? 0
                 if inserts != 0 || updates != 0 {

diff --git a/Marlin/Marlin/DataSources/DFRS/DFRS+DataSource.swift b/Marlin/Marlin/DataSources/DFRS/DFRS+DataSource.swift
@@ -111,7 +111,10 @@ extension DFRS: BatchImportable {
         }
         let count = value.dfrs.count
         NSLog("Received \(count) \(Self.key) records.")
-        return try await Self.importRecords(from: value.dfrs, taskContext: PersistenceController.current.newTaskContext())
+        return try await Self.importRecords(
+            from: value.dfrs,
+            taskContext: PersistenceController.current.newTaskContext()
+        )
     }
 
     static func dataRequest() -> [MSIRouter] {

diff --git a/Marlin/Marlin/DataSources/DFRS/DFRS+MapImage.swift b/Marlin/Marlin/DataSources/DFRS/DFRS+MapImage.swift
@@ -21,7 +21,18 @@ extension DFRS: MapImage {
 
     static var cacheTiles: Bool = true
 
-    func mapImage(marker: Bool, zoomLevel: Int, tileBounds3857: MapBoundingBox?, context: CGContext? = nil) -> [UIImage] {
-        return defaultMapImage(marker: marker, zoomLevel: zoomLevel, tileBounds3857: tileBounds3857, context: context, tileSize: 512.0)
+    func mapImage(
+        marker: Bool,
+        zoomLevel: Int,
+        tileBounds3857: MapBoundingBox?,
+        context: CGContext? = nil
+    ) -> [UIImage] {
+        return defaultMapImage(
+            marker: marker,
+            zoomLevel: zoomLevel,
+            tileBounds3857: tileBounds3857,
+            context: context,
+            tileSize: 512.0
+        )
     }
 }
diff --git a/Marlin/Marlin/DataSources/DFRS/DFRSArea+BatchImportable.swift b/Marlin/Marlin/DataSources/DFRS/DFRSArea+BatchImportable.swift
@@ -20,7 +20,10 @@ extension DFRSArea: BatchImportable {
         }
         let count = value.areas.count
         NSLog("Received \(count) DFRS Area records.")
-        return try await Self.batchImport(from: value.areas, taskContext: PersistenceController.current.newTaskContext())
+        return try await Self.batchImport(
+            from: value.areas,
+            taskContext: PersistenceController.current.newTaskContext()
+        )
     }
 
     static func dataRequest() -> [MSIRouter] {

diff --git a/Marlin/Marlin/DataSources/DFRS/Views/DFRSDetailView.swift b/Marlin/Marlin/DataSources/DFRS/Views/DFRSDetailView.swift
@@ -11,7 +11,16 @@ import CoreData
 
 struct DFRSDetailView: View {
     @FetchRequest(
-        sortDescriptors: [NSSortDescriptor(keyPath: \DFRSArea.areaName, ascending: true), NSSortDescriptor(keyPath: \DFRSArea.index, ascending: true)],
+        sortDescriptors: [
+            NSSortDescriptor(
+                keyPath: \DFRSArea.areaName,
+                ascending: true
+            ),
+            NSSortDescriptor(
+                keyPath: \DFRSArea.index,
+                ascending: true
+            )
+        ],
         predicate: NSPredicate(format: "areaNote != nil || indexNote != nil"),
         animation: .default)
     private var areas: FetchedResults<DFRSArea>
@@ -32,8 +41,12 @@ struct DFRSDetailView: View {
                         .background(Color(uiColor: dfrs.color))
                         .padding(.bottom, -8)
                     if let predicate = predicate, CLLocationCoordinate2DIsValid(dfrs.coordinate) {
-                        DataSourceLocationMapView(dataSourceLocation: dfrs, mapName: "DFRS Detail Map", mixins: [DFRSMap(fetchPredicate: predicate)])
-                            .frame(maxWidth: .infinity, minHeight: 300, maxHeight: 300)
+                        DataSourceLocationMapView(
+                            dataSourceLocation: dfrs,
+                            mapName: "DFRS Detail Map",
+                            mixins: [DFRSMap(fetchPredicate: predicate)]
+                        )
+                        .frame(maxWidth: .infinity, minHeight: 300, maxHeight: 300)
                     }
                     dfrs.summary
                         .setShowTitle(false)

diff --git a/Marlin/Marlin/DataSources/DataSource.swift b/Marlin/Marlin/DataSources/DataSource.swift
@@ -105,7 +105,14 @@ struct DataSourceProperty: Hashable, Identifiable, Codable {
     let requiredInFilter: Bool
     let subEntityKey: String?
 
-    init(name: String, key: String, type: DataSourcePropertyType, subEntityKey: String? = nil, enumerationValues: [String: [String]]? = nil, requiredInFilter: Bool = false) {
+    init(
+        name: String,
+        key: String,
+        type: DataSourcePropertyType,
+        subEntityKey: String? = nil,
+        enumerationValues: [String: [String]]? = nil,
+        requiredInFilter: Bool = false
+    ) {
         self.name = name
         self.key = key
         self.type = type
@@ -128,7 +135,11 @@ extension Locatable {
 
     static func getBoundingPredicate(minLat: Double, maxLat: Double, minLon: Double, maxLon: Double) -> NSPredicate {
         return NSPredicate(
-            format: "latitude >= %lf AND latitude <= %lf AND longitude >= %lf AND longitude <= %lf", minLat, maxLat, minLon, maxLon
+            format: "latitude >= %lf AND latitude <= %lf AND longitude >= %lf AND longitude <= %lf", 
+            minLat,
+            maxLat,
+            minLon,
+            maxLon
         )
     }
 }
@@ -139,7 +150,6 @@ protocol DataSource {
     static var defaultSort: [DataSourceSortParameter] { get }
     static var defaultFilter: [DataSourceFilterParameter] { get }
     static var imageScale: CGFloat { get }
-    func view(on: MKMapView) -> MKAnnotationView?
     static func cachedImage(zoomLevel: Int) -> UIImage?
     static func cacheImage(zoomLevel: Int, image: UIImage)
     static var dateFormatter: DateFormatter { get }
@@ -165,10 +175,6 @@ extension DataSource {
         }
         return nil
     }
-
-    func view(on: MKMapView) -> MKAnnotationView? {
-        return nil
-    }
 }
 
 protocol DataSourceViewBuilder: DataSource {