Merge pull request #271 from TaskarCenterAtUW/bug-1990-GiG-User-Interactions-Are-Slow

improved pins rendering on map with cluster

Author: iAKM

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

@@ -78,6 +78,18 @@
             ReferencedContainer = "container:GoInfoGame.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "MallocStackLogging"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+         <AdditionalOption
+            key = "PrefersMallocStackLoggingLite"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

GoInfoGame/GoInfoGame.xcodeproj/xcshareddata/xcschemes/GoInfoGame.xcscheme

@@ -69,24 +69,44 @@ class AppQuestManager {
     // Fetches all the available quests from Database
     func fetchQuestsFromDB() ->  [DisplayUnitWithCoordinate] {
 
-        let allOriginalNodes = dbInstance.getNodes().filter {$0.tags.count != 0 }
+        let allOriginalNodes = dbInstance.getNodes().filter {$0.tags.count != 0 && ($0.point.latitude != 0.0 || $0.point.longitude != 0.0)}
 
 
-        let nodesFromStorage: [StoredNode] = allOriginalNodes.compactMap { original in
-            original.tags["ext:gig_complete"] == "yes" ? nil : original
+        var nodesFromStorage: [StoredNode] = []
+        for node in allOriginalNodes {
+            autoreleasepool {
+                if node.tags["ext:gig_complete"] != "yes" {
+                    nodesFromStorage.append(node)
+                }
+            }
         }
 
         let allOriginalWays = dbInstance.getWays().filter {
-            $0.tags.count != 0
+            $0.tags.count != 0 && !$0.polyline.isEmpty
         }
 
-        let waysFromStorage: [StoredWay] = allOriginalWays.compactMap { original in
-            original.tags["ext:gig_complete"] == "yes" ? nil : original
+        var waysFromStorage: [StoredWay] = []
+        
+        for way in allOriginalWays {
+            autoreleasepool {
+                if way.tags["ext:gig_complete"] != "yes" {
+                    waysFromStorage.append(way)
+                }
+            }
         }
 
 
-        let nodeElements = nodesFromStorage.map({$0.asNode()})
-        let wayElements = waysFromStorage.map({$0.asWay()})
+        let nodeElements = nodesFromStorage.map({ node in
+            autoreleasepool {
+                node.asNode()
+            }
+        })
+        let wayElements = waysFromStorage.map({ way in
+            autoreleasepool {
+                way.asWay()
+            }
+            
+        })
 
         // Get the quests for nodes
         var nodeQuests: [any Quest] = []

GoInfoGame/GoInfoGame.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -7,6 +7,11 @@
 
 import SwiftUI
 
+struct TextItem<T> {
+    let value: T
+    let titleId: String
+}
+
 struct RadioItem<T>: View {
     let textItem: TextItem<T>
     let isSelected: Bool

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -92,8 +92,8 @@ class InitialViewModel: ObservableObject {
 
         isLoading = true
 
-        ApiManager.shared.performRequest(to: .fetchLongQuests(workspaceId), setupType: .workspace, modelType: LongFormResponse.self) { result in
-            DispatchQueue.main.async {
+        ApiManager.shared.performRequest(to: .fetchLongQuests(workspaceId), setupType: .workspace, modelType: LongFormResponse.self) { [unowned self] result in
+            DispatchQueue.main.async { [unowned self] in
                 switch result {
                 case .success(let longQuestsResponse):
 

GoInfoGame/GoInfoGame/UI/CustomComponents/RadioItem.swift

@@ -77,10 +77,10 @@ struct MapView: View {
                           selectedQuest: $viewModel.selectedQuest,
                           shouldShowPolyline: $shouldShowPolyline,
 
-                          isPresented: $isPresented, isUserSettingsPresented: $showUserSettingsSheet, selectedAnnotations: $viewModel.selectedAnnotaions, isMultiSelectModeEnabled: $viewModel.isMultiSelectModeEnabled, selectedAnnotationType: $viewModel.selectedAnnotationType, showMultiSelectionBottomSheet: $showMultiSelectionBottomSheet,
+                          isPresented: $isPresented, isUserSettingsPresented: $showUserSettingsSheet, selectedAnnotations: $viewModel.selectedAnnotaions, isMultiSelectModeEnabled: $viewModel.isMultiSelectModeEnabled, selectedAnnotationType: $viewModel.selectedAnnotationType, showMultiSelectionBottomSheet: $showMultiSelectionBottomSheet ,
                       onMapViewCreated: { map in
                 self.mapViewRef = map
-            },
+            } ,
                       contextualInfo: { contextualInfo in
                 print(contextualInfo)
                 selectedDetent = .fraction(0.8)
@@ -162,7 +162,7 @@ struct MapView: View {
 
             if !viewModel.selectedAnnotaions.isEmpty,
                let selectedAnnotationType = viewModel.selectedAnnotationType,
-               let image = viewModel.selectedAnnotaions.first?.displayUnit.parent?.icon {
+               let image = UIImage(named: viewModel.selectedAnnotaions.first?.displayUnit?.parent?.iconName ?? "notes") {
 
                 MultiQuestSelectionBottomSheet(
                     selectedAnnotationType: selectedAnnotationType,
@@ -427,9 +427,34 @@ struct MapView: View {
     }
 
     func isBBoxValid(_ bbox: BBox) -> Bool {
-        let latDelta = bbox.maxLat - bbox.minLat
-        let lonDelta = bbox.maxLon - bbox.minLon
-        return latDelta * lonDelta <= 1.0
+        return isBBoxValid(minLat: bbox.minLat, minLon: bbox.minLon, maxLat: bbox.maxLat, maxLon: bbox.maxLon)
+    }
+    
+    private func isBBoxValid(minLat: Double, minLon: Double, maxLat: Double, maxLon: Double) -> Bool {
+        let latDistanceKm = haversineDistance(lat1: minLat, lon1: minLon, lat2: maxLat, lon2: minLon)
+        let lonDistanceKm = haversineDistance(lat1: minLat, lon1: minLon, lat2: minLat, lon2: maxLon)
+
+        let areaKm2 = latDistanceKm * lonDistanceKm
+        print("Area: \(areaKm2) km²")
+
+        return areaKm2 < 12.0 // allow small tolerance
+    }
+
+    private func haversineDistance(lat1: Double, lon1: Double, lat2: Double, lon2: Double) -> Double {
+        let earthRadiusKm = 6371.0
+        let dLat = degreesToRadians(lat2 - lat1)
+        let dLon = degreesToRadians(lon2 - lon1)
+
+        let a = sin(dLat / 2) * sin(dLat / 2) +
+                cos(degreesToRadians(lat1)) * cos(degreesToRadians(lat2)) *
+                sin(dLon / 2) * sin(dLon / 2)
+        let c = 2 * atan2(sqrt(a), sqrt(1 - a))
+
+        return earthRadiusKm * c
+    }
+
+    private func degreesToRadians(_ degrees: Double) -> Double {
+        return degrees * .pi / 180.0
     }
 }
 

GoInfoGame/GoInfoGame/UI/InitialView/InitialViewModel.swift

@@ -65,8 +65,8 @@ class MapViewModel: ObservableObject {
                     }
 
                     for quest in self.selectedAnnotaions {
-                        print("Quest ID: \(quest.displayUnit.id) Tags: \(tags)")
-                        if let longElementQuest = quest.displayUnit.parent as? LongElementQuest {
+                        print("Quest ID: \(quest.id) Tags: \(tags)")
+                        if let longElementQuest = quest.displayUnit?.parent as? LongElementQuest {
                             longElementQuest.onAnswer(answer: tags)
                         }
                     }
@@ -99,6 +99,9 @@ class MapViewModel: ObservableObject {
     }
 
     func fetchOSMDataFor(from bboxSource: BBoxSource) {
+        if isLoading {
+            return
+        }
         isLoading = true
         let bBox: BBox
            switch bboxSource {
@@ -115,7 +118,7 @@ class MapViewModel: ObservableObject {
 
         if let workspaceID = KeychainManager.load(key: "workspaceID") {
 
-            ApiManager.shared.performRequest(to: .fetchOSMElements(bBox.minLon, bBox.minLat, bBox.maxLon, bBox.maxLat, workspaceID), setupType: .osm, modelType: OSMMapDataResponse.self) { result in
+            ApiManager.shared.performRequest(to: .fetchOSMElements(bBox.minLon, bBox.minLat, bBox.maxLon, bBox.maxLat, workspaceID), setupType: .osm, modelType: OSMMapDataResponse.self) { [unowned self] result in
                 switch result {
                 case .success(let success):
                    let osmElements = success.getOSMElements()
@@ -124,9 +127,11 @@ class MapViewModel: ObservableObject {
                     let response = Array(osmElements.values)
                     let allValues = response
 
-                    DispatchQueue.main.async {
+                    DispatchQueue.main.async { [unowned self, allValues] in
                         self.dbInstance.saveOSMElements(allValues) // Save all where there are tags
-                        self.items = AppQuestManager.shared.fetchQuestsFromDB()
+                        autoreleasepool { [unowned self] in
+                            self.items = AppQuestManager.shared.fetchQuestsFromDB()
+                        }
                         self.isLoading = false
                         if self.items.count == 0 {self.refreshMap = UUID()}
                     }

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -65,8 +65,3 @@ enum CrossingAnswer: String {
     case no = "No"
     case none = "none"
 }
-
-struct TextItem<T> {
-    let value: T
-    let titleId: String
-}