Merge pull request #264 from thingineeer/#262---네이버맵-수정

[Fix] #262 - 사용자 경험 개선을 위한 네이버맵 수정

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,6 +13,9 @@
 ## 📸 스크린샷
 
 <!-- 작업한 화면이 있다면 스크린 샷으로 첨부해주세요. -->
+<!-- 큰 이미지, png 짜를때 재사용하세요.
+<img src = "이미지주소" width = "50%" height = "50%">
+ -->
 
 |    구현 내용    |   스크린샷   |
 | :-------------: | :----------: |

Runnect-iOS/.swiftlint.yml

@@ -14,5 +14,6 @@ excluded:
   # AppDelegate, SceneDelegate file 무시
   - Runnect-iOS/Global/Supports/AppDelegate.swift
   - Runnect-iOS/Global/Supports/SceneDelegate.swift
+  - Runnect-iOS/Global/UIComponents/MapView/RNMapView.swift
 
 force_cast: warning

Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj

@@ -1703,7 +1703,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2024.0312.0041;
+				CURRENT_PROJECT_VERSION = 2024.0319.2120;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8Q4H7X3Q58;
 				GENERATE_INFOPLIST_FILE = NO;
@@ -1747,7 +1747,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2024.0312.0041;
+				CURRENT_PROJECT_VERSION = 2024.0319.2120;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8Q4H7X3Q58;
 				GENERATE_INFOPLIST_FILE = NO;

Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift

@@ -40,7 +40,8 @@ enum ImageLiterals {
     static var icTime: UIImage { .load(named: "ic_time") }
     static var icLocationPoint: UIImage { .load(named: "ic_location_point") }
     static var icAlert: UIImage { .load(named: "ic_alert") }
-    static var icLocationOverlay: UIImage { .load(named: "ic_location_overlay") }
+    static var icLocationOverlayDirection: UIImage { .load(named: "ic_location_overlay_direction") }
+    static var icLocationOverlayNormal: UIImage { .load(named: "ic_location_overlay_normal") }
     static var icLogoCircle: UIImage { .load(named: "ic_logo_circle") }
     static var icMore: UIImage { .load(named: "ic_more") }
     static var icPlus: UIImage { .load(named: "ic_plus") }

Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_location_overlay_normal.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 9581.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Runnect-iOS/Runnect-iOS/Global/UIComponents/MapView/RNMapView.swift

@@ -25,7 +25,7 @@ final class RNMapView: UIView {
     private let screenHeight = UIScreen.main.bounds.height
 
     let pathImage = PassthroughSubject<UIImage?, Never>()
-    private var cancelBag = Set<AnyCancellable>()
+    private var cancelBag = CancelBag()
 
     private let locationManager = CLLocationManager()
     private var isDrawMode: Bool = false
@@ -40,7 +40,8 @@ final class RNMapView: UIView {
         [self.startMarker.position] + self.markers.map { $0.position }
     }
     private var bottomPadding: CGFloat = 0
-    private let locationOverlayIcon = NMFOverlayImage(image: ImageLiterals.icLocationOverlay)
+    private let locationOverlayIconDirection = NMFOverlayImage(image: ImageLiterals.icLocationOverlayDirection)
+    private let locationOverlayIconNormal = NMFOverlayImage(image: ImageLiterals.icLocationOverlayNormal)
 
     // MARK: - UI Components
 
@@ -59,16 +60,17 @@ final class RNMapView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.mapInit()
-        setLocationOverlay()
     }
 
     private func mapInit() {
         setUI()
         setLayout()
+        setBind()
         setDelegate()
         setMap()
         getLocationAuth()
         setPathOverlay()
+        observePositionModeChanges()
     }
 
     required init?(coder: NSCoder) {
@@ -90,7 +92,12 @@ extension RNMapView {
     @discardableResult
     func setPositionMode(mode: NMFMyPositionMode) -> Self {
         map.mapView.positionMode = mode
-        setLocationOverlay()
+        switch mode {
+        case .direction:
+            setDirectionModeLocationOverlay()
+        default:
+            setNormalModeLocationOverLay()
+        }
         return self
     }
 
@@ -154,26 +161,6 @@ extension RNMapView {
         return self
     }
 
-    /// 캡처를 위한 좌표 설정 및 카메라 이동
-    func makeCameraMoveForCapture(at locations: [NMGLatLng]) {
-        map.mapView.contentInset = UIEdgeInsets(top: screenHeight/4, left: 0, bottom: screenHeight/4, right: 0)
-        let bounds = makeMBR(at: locations)
-        let cameraUpdate = NMFCameraUpdate(fit: bounds, padding: 100)
-        cameraUpdate.animation = .none
-        LoadingIndicator.showLoading()
-        map.mapView.moveCamera(cameraUpdate) { isCancelled in
-            if isCancelled {
-                print("카메라 이동 취소")
-                LoadingIndicator.hideLoading()
-            } else {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                    self.makePathImage()
-                    LoadingIndicator.hideLoading()
-                }
-            }
-        }
-    }
-
     /// 사용자 위치로 카메라 이동
     @discardableResult
     func moveToUserLocation() -> Self {
@@ -285,6 +272,26 @@ extension RNMapView {
         }
     }
 
+    /// 캡처를 위한 좌표 설정 및 카메라 이동
+    private func makeCameraMoveForCapture(at locations: [NMGLatLng]) {
+        map.mapView.contentInset = UIEdgeInsets(top: screenHeight/4, left: 0, bottom: screenHeight/4, right: 0)
+        let bounds = makeMBR(at: locations)
+        let cameraUpdate = NMFCameraUpdate(fit: bounds, padding: 100)
+        cameraUpdate.animation = .none
+        LoadingIndicator.showLoading()
+        map.mapView.moveCamera(cameraUpdate) { isCancelled in
+            if isCancelled {
+                print("카메라 이동 취소")
+                LoadingIndicator.hideLoading()
+            } else {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    self.makePathImage()
+                    LoadingIndicator.hideLoading()
+                }
+            }
+        }
+    }
+
     // 두 지점 사이의 거리(m) 추가
     private func addDistance(with newLocation: NMGLatLng) {
         let lastCLLoc = markersLatLngs.last?.toCLLocation()
@@ -331,29 +338,62 @@ extension RNMapView {
         map.mapView.touchDelegate = self
     }
 
-    private func setPathOverlay() {
+    private func setPathOverlay() { // 코스 path UI 설정
         pathOverlay.width = 4
         pathOverlay.outlineWidth = 0
         pathOverlay.color = .m1
     }
 
-    private func setLocationOverlay() {
+    private func setDirectionModeLocationOverlay() {
+        let locationOverlay = map.mapView.locationOverlay
+        locationOverlay.icon = locationOverlayIconDirection
+    }
+
+    private func setNormalModeLocationOverLay() {
         let locationOverlay = map.mapView.locationOverlay
-        locationOverlay.icon = locationOverlayIcon
+        locationOverlay.icon = locationOverlayIconNormal
+    }
+
+    private func observePositionModeChanges() {
+        map.mapView.addObserver(self, forKeyPath: "positionMode", options: [.new, .old], context: nil)
+    }
+
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
+        // positionMode가 변경될 때 호출됩니다.
+        if keyPath == "positionMode", object is NMFMapView {
+            DispatchQueue.main.async { [weak self] in
+                self?.updateStateName()
+            }
+        }
+    }
+
+    private func updateStateName() {
+        let stateStr: String
+        switch map.mapView.positionMode {
+        case .normal:
+            stateStr = "NoFollow"
+            setNormalModeLocationOverLay()
+        case .direction:
+            stateStr = "Follow"
+            setDirectionModeLocationOverlay()
+        default:
+            stateStr = "otherAction"
+        }
+
+        print("Position Mode: \(stateStr)")
     }
 }
 
 // MARK: - UI & Layout
 
 extension RNMapView {
-    private func setUI() {
+    private func setUI() { // 현재 위치를 찍는 아이콘의 UI 구현
         self.backgroundColor = .white
         self.locationButton.setImage(ImageLiterals.icMapLocation, for: .normal)
         self.locationButton.isHidden = true
-        self.locationButton.addTarget(self, action: #selector(locationButtonDidTap), for: .touchUpInside)
     }
 
-    private func setLayout() {
+    private func setLayout() { // 지도와 현재위치 이동 버튼 의 레이아웃 구성
         addSubviews(map, locationButton)
 
         map.snp.makeConstraints {
@@ -373,13 +413,11 @@ extension RNMapView {
             }
         }
     }
-}
-
-// MARK: - @objc Function
-
-extension RNMapView {
-    @objc func locationButtonDidTap() {
-        self.setPositionMode(mode: .direction)
+
+    private func setBind() {
+        locationButton.tapPublisher.sink { [weak self] _ in
+            self?.setPositionMode(mode: .direction)
+        }.store(in: cancelBag)
     }
 }
 
@@ -388,11 +426,9 @@ extension RNMapView {
 extension RNMapView: NMFMapViewCameraDelegate, NMFMapViewTouchDelegate {
     // 지도 탭 이벤트
     func mapView(_ mapView: NMFMapView, didTapMap latlng: NMGLatLng, point: CGPoint) {
-        guard isDrawMode && markers.count < 19 else { return }
+        guard isDrawMode && markers.count < 25 else { return }
         self.makeMarker(at: latlng)
-    }
-
-    func mapView(_ mapView: NMFMapView, cameraWillChangeByReason reason: Int, animated: Bool) {
+
     }
 
     // 지도 이동 멈췄을 때 호출되는 메서드

Runnect-iOS/Runnect-iOS/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundleDevelopmentRegion</key>
@@ -19,9 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.1</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
+	<string>2.0.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -46,7 +46,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2024.0312.0041</string>
+	<string>2024.0319.2120</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>kakaokompassauth</string>

Runnect-iOS/Runnect-iOS/Network/Dto/CourseDrawingDto/ResponseDto/TmapAddressSearchingResponseDto.swift

@@ -8,23 +8,30 @@
 import Foundation
 
 // MARK: - TmapAddressSearchingResponseDto
+
 struct TmapAddressSearchingResponseDto: Codable {
     let addressInfo: AddressInfo
 
     func toDepartureLocationModel(latitude: Double, longitude: Double) -> DepartureLocationModel {
-        let buildingName = self.addressInfo.buildingName.isEmpty ? "내가 설정한 출발지" : self.addressInfo.buildingName
+        let buildingName = self.addressInfo.buildingName.isEmpty ? "주소를 알 수 없는 출발지" : self.addressInfo.buildingName
 
-        return DepartureLocationModel(departureName: buildingName, departureAddress: addressInfo.fullAddress, latitude: String(latitude), longitude: String(longitude))
+        return DepartureLocationModel(
+            departureName: buildingName,
+            departureAddress: addressInfo.fullAddress,
+            latitude: String(latitude),
+            longitude: String(longitude)
+        )
     }
 }
 
 // MARK: - AddressInfo
+
 struct AddressInfo: Codable {
     let fullAddress, addressType, cityDo, guGun: String
     let eupMyun, adminDong, adminDongCode, legalDong: String
     let legalDongCode, ri, bunji, roadName: String
     let buildingIndex, buildingName, mappingDistance, roadCode: String
-
+    
     enum CodingKeys: String, CodingKey {
         case fullAddress, addressType
         case cityDo = "city_do"

Runnect-iOS/Runnect-iOS/Network/Router/CourseDrawingRouter/DepartureSearchingRouter.swift

@@ -69,7 +69,7 @@ extension DepartureSearchingRouter: TargetType {
         switch self {
         case .getAddress(let keyword):
             return .requestParameters(parameters: ["query": keyword], encoding: URLEncoding.default)
-        case .getLocationAddress(let latitude, let longitude):
+        case .getLocationAddress(let latitude, let longitude): // 사용하지 않습니다.
             return .requestParameters(parameters: ["x": longitude, "y": latitude], encoding: URLEncoding.default)
         case .getLocationTmapAddress(let latitude, let longitude):
             return .requestParameters(parameters: ["lat": latitude, "lon": longitude, "addressType": "A04", "appKey": Config.tmapAPIKey], encoding: URLEncoding.default)