[Feat] #233 코드정리

Pepsi-Club · Apr 17, 2024 · 2172033 · 2172033
1 parent 2bfb92f
commit 2172033
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 31 deletions.
diff --git a/Projects/Feature/NearMapFeature/Sources/NMapsClustreing/LeafMarkerUpdater.swift b/Projects/Feature/NearMapFeature/Sources/NMapsClustreing/LeafMarkerUpdater.swift
@@ -16,7 +16,7 @@ import RxSwift
 public class LeafMarkerUpdater: NMCDefaultLeafMarkerUpdater {
     let selectedBusStopId = BehaviorSubject<String>(value: "")
 
-    private var selectedMarker: NMFMarker? {
+    var selectedMarker: NMFMarker? {
         didSet {
             oldValue?.iconImage = unselectedImg
             selectedMarker?.iconImage = selectedImg

diff --git a/Projects/Feature/NearMapFeature/Sources/ViewController/NearMapViewController.swift b/Projects/Feature/NearMapFeature/Sources/ViewController/NearMapViewController.swift
@@ -138,7 +138,6 @@ public final class NearMapViewController: UIViewController {
                     .methodInvoked(#selector(UIViewController.viewWillAppear))
                     .map { _ in },
                 informationViewTapEvent: tapGesture.rx.event.map { _ in },
-                selectedBusStopId: .empty(),
                 locationChangeEvent: cameraMoveEvent
             )
         )

diff --git a/Projects/Feature/NearMapFeature/Sources/ViewModel/NearMapViewModel.swift b/Projects/Feature/NearMapFeature/Sources/ViewModel/NearMapViewModel.swift
@@ -40,35 +40,37 @@ public final class NearMapViewModel: LeafMarkerUpdater, ViewModel {
 		)
 
         input.viewWillAppearEvent
-            .take(1)
             .withUnretained(self)
             .bind(
                 onNext: { viewModel, _ in
-                    if case .normal = viewModel.viewMode {
-                        viewModel.useCase.getNearByStopInfo()
-                            .subscribe(onNext: { selectedBusStopInfo in
-                                viewModel.selectedBusStopId.onNext(
-                                    selectedBusStopInfo.0.busStopId
-                                )
-                            })
-                            .disposed(by: viewModel.disposeBag)
+                    viewModel.useCase.requestAuthorize()
+                    if case .focused(let busStopId) = viewModel.viewMode {
+                        let selectedBusStopInfo = viewModel.useCase
+                            .getSelectedBusStop(busStopId: busStopId)
+                        viewModel
+                            .selectedBusStopId.onNext(busStopId)
+                        output.navigationTitle.accept(
+                            selectedBusStopInfo.0.busStopName
+                        )
                     }
                 }
             )
             .disposed(by: disposeBag)
 
         input.viewWillAppearEvent
+            .take(1)
             .withUnretained(self)
             .bind(
                 onNext: { viewModel, _ in
-                    viewModel.useCase.requestAuthorize()
-                    if case .focused(let busStopId) = viewModel.viewMode {
-                        let selectedBusStopInfo = viewModel.useCase
-                            .getSelectedBusStop(busStopId: busStopId)
-                        viewModel.selectedBusStopId.onNext(busStopId)
-                        output.navigationTitle.accept(
-                            selectedBusStopInfo.0.busStopName
-                        )
+                    if case .normal = viewModel.viewMode {
+                        viewModel.useCase.getNearByStopInfo()
+                            .subscribe(
+                                onNext: { selectedBusStopInfo in
+                                    viewModel.selectedBusStopId
+                                        .onNext(selectedBusStopInfo.0.busStopId)
+                                }
+                            )
+                            .disposed(by: viewModel.disposeBag)
                     }
                 }
             )
@@ -109,6 +111,17 @@ public final class NearMapViewModel: LeafMarkerUpdater, ViewModel {
             )
             .disposed(by: disposeBag)
 
+        input.locationChangeEvent
+            .withUnretained(self)
+            .map { viewModel, range in
+                let (longitudeRange, latitudeRange) = range
+                return viewModel.useCase.getNearBusStopList(
+                    longitudeRange: longitudeRange,
+                    latitudeRange: latitudeRange)
+            }
+            .bind(to: output.nearStopList)
+            .disposed(by: disposeBag)
+
         selectedBusStopId
             .distinctUntilChanged()
             .withUnretained(self)
@@ -118,21 +131,11 @@ public final class NearMapViewModel: LeafMarkerUpdater, ViewModel {
                     let selectedStopInfo = viewModel.useCase
                         .getSelectedBusStop(busStopId: busStopId)
                     output.selectedBusStopInfo.onNext(selectedStopInfo)
+                    viewModel.selectedMarker
                 }
             )
             .disposed(by: disposeBag)
 
-        input.locationChangeEvent
-            .withUnretained(self)
-            .map { viewModel, range in
-                let (longitudeRange, latitudeRange) = range
-                return viewModel.useCase.getNearBusStopList(
-                    longitudeRange: longitudeRange,
-                    latitudeRange: latitudeRange)
-            }
-            .bind(to: output.nearStopList)
-            .disposed(by: disposeBag)
-
         return output
 	}
 }
@@ -141,7 +144,6 @@ extension NearMapViewModel {
     public struct Input {
         let viewWillAppearEvent: Observable<Void>
         let informationViewTapEvent: Observable<Void>
-        let selectedBusStopId: Observable<String>
         let locationChangeEvent
         : Observable<(ClosedRange<Double>, ClosedRange<Double>)>
     }