[iOS] 여정 드로잉에 필요한 filter를 평균값을 활용하도록 수정

iOS/Features/Home/Sources/Home/Presentation/HomeViewController.swift

@@ -124,7 +124,9 @@ public final class HomeViewController: HomeBottomSheetViewController {
         super.viewDidAppear(animated)
 
         // 화면 시작 시 새로고침 버튼 기능 한번 실행
-        self.refreshButton.sendActions(for: .touchUpInside)
+        if !self.viewModel.state.isRecording.value {
+            self.refreshButton.sendActions(for: .touchUpInside)
+        }
     }
 
     // MARK: - Combine Binding
@@ -223,7 +225,8 @@ extension HomeViewController: RecordJourneyButtonViewDelegate {
 
         let refreshButtonAction = UIAction { [weak self] _ in
             guard let coordinates = self?.contentViewController.visibleCoordinates else { return }
-
+            self?.contentViewController.clearAnnotations()
+            self?.contentViewController.clearOverlays()
             self?.viewModel.trigger(.refreshButtonDidTap(visibleCoordinates: coordinates))
         }
         self.refreshButton.addAction(refreshButtonAction, for: .touchUpInside)

iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewController.swift

@@ -320,20 +320,14 @@ extension MapViewController: CLLocationManagerDelegate {
             return
         }
 
-        let previousCoordinate = (self.viewModel as? RecordJourneyViewModel)?.state.previousCoordinate.value
-
-        if let previousCoordinate = previousCoordinate {
-            if !self.isDistanceOver5AndUnder50(coordinate1: previousCoordinate,
-                                               coordinate2: newCurrentLocation.coordinate) {
-                return
-            }
-        }
-
         let coordinate2D = CLLocationCoordinate2D(latitude: newCurrentLocation.coordinate.latitude,
                                                   longitude: newCurrentLocation.coordinate.longitude)
+        recordJourneyViewModel.trigger(.fiveLocationsDidRecorded(coordinate2D))
 
-        recordJourneyViewModel.trigger(.locationDidUpdated(coordinate2D))
-        recordJourneyViewModel.trigger(.locationsShouldRecorded([coordinate2D]))
+        // filtering된 위치 정보가 있을 경우(5개의 위치 데이터가 들어와 필터링이 완료되었을 경우)에만 아래 두 trigger 실행 가능
+        guard let filteredCoordinate2D = recordJourneyViewModel.state.filteredCoordinate.value else { return }
+        recordJourneyViewModel.trigger(.locationDidUpdated(filteredCoordinate2D))
+        recordJourneyViewModel.trigger(.locationsShouldRecorded([filteredCoordinate2D]))
     }
 
     private func handleAuthorizationChange(_ manager: CLLocationManager) {
@@ -374,13 +368,13 @@ extension MapViewController: CLLocationManagerDelegate {
         }
     }
 
-    private func isDistanceOver5AndUnder50(coordinate1: CLLocationCoordinate2D,
-                                           coordinate2: CLLocationCoordinate2D) -> Bool {
-        let location1 = CLLocation(latitude: coordinate1.latitude, longitude: coordinate1.longitude)
-        let location2 = CLLocation(latitude: coordinate2.latitude, longitude: coordinate2.longitude)
-        MSLogger.make(category: .navigateMap).log("이동한 거리: \(location1.distance(from: location2))")
-        return 5 <= location1.distance(from: location2) && location1.distance(from: location2) <= 50
-    }
+//    private func isDistanceOver5AndUnder50(coordinate1: CLLocationCoordinate2D,
+//                                           coordinate2: CLLocationCoordinate2D) -> Bool {
+//        let location1 = CLLocation(latitude: coordinate1.latitude, longitude: coordinate1.longitude)
+//        let location2 = CLLocation(latitude: coordinate2.latitude, longitude: coordinate2.longitude)
+//        MSLogger.make(category: .navigateMap).log("이동한 거리: \(location1.distance(from: location2))")
+//        return 5 <= location1.distance(from: location2) && location1.distance(from: location2) <= 50
+//    }
 
 }
 

iOS/Features/Home/Sources/NavigateMap/Presentation/RecordJourney/RecordJourneyViewModel.swift

@@ -20,13 +20,16 @@ public final class RecordJourneyViewModel: MapViewModel {
         case locationDidUpdated(CLLocationCoordinate2D)
         case locationsShouldRecorded([CLLocationCoordinate2D])
         case recordingDidCancelled
+        case fiveLocationsDidRecorded(CLLocationCoordinate2D)
     }
 
     public struct State {
         // CurrentValue
         public var previousCoordinate = CurrentValueSubject<CLLocationCoordinate2D?, Never>(nil)
         public var currentCoordinate = CurrentValueSubject<CLLocationCoordinate2D?, Never>(nil)
         public var recordingJourney: CurrentValueSubject<RecordingJourney, Never>
+        public var recordedCoordinates = CurrentValueSubject<[CLLocationCoordinate2D], Never>([])
+        public var filteredCoordinate = CurrentValueSubject<CLLocationCoordinate2D?, Never>(nil)
     }
 
     // MARK: - Properties
@@ -54,10 +57,14 @@ public final class RecordJourneyViewModel: MapViewModel {
             #if DEBUG
             MSLogger.make(category: .home).debug("View Did load.")
             #endif
+
+        /// 이전 currentCoordinate를 previousCoordinate에, 저장할 현재 위치를 currentCoordinate에 update
         case .locationDidUpdated(let coordinate):
             let previousCoordinate = self.state.currentCoordinate.value
             self.state.previousCoordinate.send(previousCoordinate)
             self.state.currentCoordinate.send(coordinate)
+
+        /// 저장하고 자 하는 위치 데이터를 서버에 전송
         case .locationsShouldRecorded(let coordinates):
             Task {
                 let recordingJourney = self.state.recordingJourney.value
@@ -67,10 +74,12 @@ public final class RecordJourneyViewModel: MapViewModel {
                 switch result {
                 case .success(let recordingJourney):
                     self.state.recordingJourney.send(recordingJourney)
+                    self.state.filteredCoordinate.send(nil)
                 case .failure(let error):
                     MSLogger.make(category: .home).error("\(error)")
                 }
             }
+        /// 기록 중에 여정 기록을 취소
         case .recordingDidCancelled:
             Task {
                 guard let userID = self.userRepository.fetchUUID() else { return }
@@ -86,7 +95,72 @@ public final class RecordJourneyViewModel: MapViewModel {
                     MSLogger.make(category: .home).error("\(error)")
                 }
             }
+        /// 업데이트되는 위치 정보를 받아와 5개가 될 경우 평균값 필터링 후 저장하는 로직
+        case .fiveLocationsDidRecorded(let coordinate):
+            self.filterLongestCoordinate(coordinate: coordinate)
         }
     }
 
 }
+
+private extension RecordJourneyViewModel {
+
+    func calculateDistance(from coordinate1: CLLocationCoordinate2D,
+                           to coordinate2: CLLocationCoordinate2D) -> CLLocationDistance {
+        let location1 = CLLocation(latitude: coordinate1.latitude,
+                                   longitude: coordinate1.longitude)
+        let location2 = CLLocation(latitude: coordinate2.latitude,
+                                   longitude: coordinate2.longitude)
+        return location1.distance(from: location2)
+    }
+
+    func filterLongestCoordinate(coordinate: CLLocationCoordinate2D) {
+        if let previousCoordinate = self.state.previousCoordinate.value {
+            if calculateDistance(from: previousCoordinate, to: coordinate) <= 5 {
+                return
+            }
+        }
+        var recordedCoords = self.state.recordedCoordinates.value
+        recordedCoords.append(coordinate)
+        self.state.recordedCoordinates.send(recordedCoords)
+
+        if self.state.recordedCoordinates.value.count >= 5 {
+            let initialCoordinate = recordedCoords.reduce(CLLocationCoordinate2D(latitude: 0,
+                                                                                 longitude: 0)) { result, coordinate in
+                return CLLocationCoordinate2D(latitude: result.latitude + coordinate.latitude,
+                                              longitude: result.longitude + coordinate.longitude)
+            }
+            let initialLat = initialCoordinate.latitude
+            let initialLong = initialCoordinate.longitude
+            let averageCoordinate = CLLocationCoordinate2D(latitude: initialLat / Double(recordedCoords.count),
+                                                           longitude: initialLong / Double(recordedCoords.count))
+
+            // 가장 먼 거리에 있는 Coordinate의 index값을 찾음.
+            guard let indexToRemove = recordedCoords.enumerated().max(by: {
+                let distance1 = calculateDistance(from: $0.element,
+                                                  to: averageCoordinate)
+                let distance2 = calculateDistance(from: $1.element,
+                                                  to: averageCoordinate)
+                return distance1 < distance2
+            })?.offset else {
+                return
+            }
+
+            var fourCoordinates = recordedCoords
+            fourCoordinates.remove(at: indexToRemove)
+
+            let finalCoordinate = fourCoordinates.reduce(CLLocationCoordinate2D(latitude: 0,
+                                                                                longitude: 0)) { result, coordinate in
+                return CLLocationCoordinate2D(latitude: result.latitude + coordinate.latitude,
+                                              longitude: result.longitude + coordinate.longitude)
+            }
+            let finalLat = finalCoordinate.latitude
+            let finalLong = finalCoordinate.longitude
+            let finalAverage = CLLocationCoordinate2D(latitude: finalLat / Double(fourCoordinates.count),
+                                                      longitude: finalLong / Double(fourCoordinates.count))
+
+            self.state.filteredCoordinate.send(finalAverage)
+            self.state.recordedCoordinates.send([])
+        }
+    }
+}

iOS/MSData/Sources/MSData/Repository/UserRepository.swift

@@ -57,11 +57,15 @@ public struct UserRepositoryImplementation: UserRepository {
         let result = await self.networking.request(UserResponseDTO.self, router: router)
         switch result {
         case .success(let userResponse):
+            #if DEBUG
+            MSLogger.make(category: .network).debug("서버에 새로운 유저를 생성했습니다.")
+            #endif
             if let storedUserID = try? self.storeUUID(userID) {
                 return .success(storedUserID)
+            } else {
+                MSLogger.make(category: .keychain).warning("Keychain에 새로운 유저 정보를 저장하지 못했습니다.")
+                return .success(userResponse.userID)
             }
-            MSLogger.make(category: .keychain).warning("서버에 새로운 유저를 생성했지만, Keychain에 저장하지 못했습니다.")
-            return .success(userResponse.userID)
         case .failure(let error):
             return .failure(error)
         }
@@ -73,6 +77,9 @@ public struct UserRepositoryImplementation: UserRepository {
 
         do {
             try self.keychain.set(value: userID, account: account)
+            #if DEBUG
+            MSLogger.make(category: .keychain).debug("Keychain에 서버 정보를 저장했습니다.")
+            #endif
             return userID
         } catch {
             throw MSKeychainStorage.KeychainError.creationError