✨ 네이버맵 locationOverlay 및 커스텀 LocationSource 구현

Co-authored-by: yonghanJu <[email protected]>

Author: bngsh

presentation/src/main/java/com/whyranoid/presentation/running/RunningActivity.kt

@@ -17,13 +17,16 @@ import java.util.Date
 
 @AndroidEntryPoint
 internal class RunningActivity :
-    BaseActivity<ActivityRunningBinding>(R.layout.activity_running), OnMapReadyCallback {
+    BaseActivity<ActivityRunningBinding>(R.layout.activity_running),
+    OnMapReadyCallback,
+    LocationSource {
 
     private val viewModel: RunningViewModel by viewModels()
 
     private lateinit var mapView: MapView
     private lateinit var naverMap: NaverMap
     private lateinit var paths: MutableList<PathOverlay>
+    private var listener: LocationSource.OnLocationChangedListener? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,10 +39,13 @@ internal class RunningActivity :
         this.naverMap = naverMap
 
         with(naverMap) {
+            locationSource = this@RunningActivity
             maxZoom = MAP_MAX_ZOOM
             minZoom = MAP_MIN_ZOOM
-            uiSettings.isLocationButtonEnabled = false
+            uiSettings.isCompassEnabled = false
             uiSettings.isZoomControlEnabled = false
+            uiSettings.isLocationButtonEnabled = false
+            uiSettings.setLogoMargin(0, 0, 0, -10)
             locationOverlay.isVisible = true
             locationOverlay.icon = OverlayImage.fromResource(R.drawable.kong)
             locationOverlay.iconWidth = MAP_ICON_SIZE
@@ -92,6 +98,14 @@ internal class RunningActivity :
         mapView.onLowMemory()
     }
 
+    override fun activate(listener: LocationSource.OnLocationChangedListener) {
+        this.listener = listener
+    }
+
+    override fun deactivate() {
+        this.listener = null
+    }
+
     private fun initViews(savedInstanceState: Bundle?) {
         mapView = binding.mapView
 
@@ -129,8 +143,16 @@ internal class RunningActivity :
     }
 
     private fun updateRunnerPosition(runningState: RunningState) {
-        runningState.runningData.runningPositionList.last().lastOrNull()?.let {
-            naverMap.locationOverlay.position = it.toLatLng()
+        runningState.runningData.lastLocation?.let { location ->
+            listener?.onLocationChanged(location) ?: run {
+                naverMap.let {
+                    val locationOverlay = it.locationOverlay
+                    locationOverlay.isVisible = true
+                    locationOverlay.position = LatLng(location)
+                    locationOverlay.bearing = (locationOverlay.bearing + 30) % 360
+                    locationOverlay.circleRadius = 100
+                }
+            }
         }
     }
 

presentation/src/main/java/com/whyranoid/presentation/running/RunningRepository.kt

@@ -67,8 +67,9 @@ class RunningRepository @Inject constructor() {
         finishData
     }
 
-    fun setRunningState(runningPosition: RunningPosition) {
+    fun setRunningState(location: Location) {
         if (_runningState.value is RunningState.Running) {
+            val runningPosition = RunningPosition(location.latitude, location.longitude)
             val prevRunningData = _runningState.value.runningData
             val newRunningTime = prevRunningData.runningTime
             val distance = FloatArray(1)
@@ -94,7 +95,8 @@ class RunningRepository @Inject constructor() {
                     runningTime = newRunningTime,
                     totalDistance = newTotalDistance,
                     pace = newPace,
-                    runningPositionList = newRunningPositionList
+                    runningPositionList = newRunningPositionList,
+                    lastLocation = location
                 )
             )
         }
@@ -113,7 +115,8 @@ data class RunningData(
     val runningTime: Int = 0,
     val totalDistance: Double = 0.0,
     val pace: Double = 0.0,
-    val runningPositionList: List<List<RunningPosition>> = listOf(emptyList())
+    val runningPositionList: List<List<RunningPosition>> = listOf(emptyList()),
+    val lastLocation: Location? = null
 )
 
 data class RunningFinishData(