feat : 목적지와 처음 현재 위치 축적 구현

Author: jeeminimini

presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt

@@ -172,13 +172,15 @@ class MissionFragment : Fragment(), MissionHandler {
                     }
                     1 -> {
                         beforeLocation = userLocation
-                        tMap.tMapView.setCenterPoint(userLocation.latitude, userLocation.longitude)
                         tMap.addMarker(
                             Marker.PERSON_MARKER,
                             Marker.PERSON_MARKER_IMG,
                             TMapPoint(userLocation.latitude, userLocation.longitude)
                         )
                         viewModel.personCurrentLocation = userLocation
+                        tMap.latitudes.add(userLocation.latitude)
+                        tMap.longitudes.add(userLocation.longitude)
+                        tMap.setRouteDetailFocus()
                         first += 1
                     }
                     else -> {
@@ -206,6 +208,8 @@ class MissionFragment : Fragment(), MissionHandler {
 
     private fun makeDestinationMarker() {
         tMap.addMarker(Marker.DESTINATION_MARKER, Marker.DESTINATION_MARKER_IMG, TEST_DESTINATION)
+        tMap.latitudes.add(TEST_DESTINATION.latitude)
+        tMap.longitudes.add(TEST_DESTINATION.longitude)
     }
 
     companion object {

presentation/src/main/java/com/stop/ui/routedetail/RouteDetailTMap.kt

@@ -12,11 +12,9 @@ import com.stop.ui.util.TMap
 
 class RouteDetailTMap(
     private val context: Context,
-    private val handler: RouteDetailHandler,
+    handler: RouteDetailHandler,
 ) : TMap(context, handler) {
     private val tMapPoints = arrayListOf<TMapPoint>()
-    private val latitudes = arrayListOf<Double>()
-    private val longitudes = arrayListOf<Double>()
 
     private var polyLine = TMapPolyLine()
 
@@ -76,23 +74,12 @@ class RouteDetailTMap(
             convertToTMapPoint(routes.first().start.coordinate)
         )
         addMarker(
-            Marker.DESTINATION_MARKER,
-            Marker.DESTINATION_MARKER_IMG,
+            Marker.END_MARKER,
+            Marker.END_MARKER_IMG,
             convertToTMapPoint(routes.last().end.coordinate)
         )
     }
 
-    private fun setRouteDetailFocus() {
-        val maxLatitude = latitudes.max()
-        val minLatitude = latitudes.min()
-        val maxLongitude = longitudes.max()
-        val minLongitude = longitudes.min()
-
-        tMapView.setCenterPoint((maxLatitude + minLatitude) / 2, (maxLongitude + minLongitude) / 2)
-        tMapView.zoomToSpan(maxLatitude - minLatitude, maxLongitude - minLongitude)
-        tMapView.zoomLevel -= 1
-    }
-
     private fun addTMapPoints(point: TMapPoint) {
         tMapPoints.add(point)
         latitudes.add(point.latitude)

presentation/src/main/java/com/stop/ui/util/Marker.kt

@@ -10,8 +10,8 @@ object Marker {
     const val START_MARKER = "start_marker"
     const val START_MARKER_IMG = R.drawable.ic_start_marker
 
-    const val DESTINATION_MARKER = "destination_marker"
-    const val DESTINATION_MARKER_IMG = R.drawable.ic_destination_marker
+    const val END_MARKER = "end_marker"
+    const val END_MARKER_IMG = R.drawable.ic_destination_marker
 
     const val PERSON_MARKER = "person_marker"
     const val PERSON_MARKER_IMG = R.drawable.ic_person_marker

presentation/src/main/java/com/stop/ui/util/TMap.kt

@@ -20,6 +20,9 @@ open class TMap(
     lateinit var tMapView: TMapView
     lateinit var initLocation: Location
 
+    val latitudes = arrayListOf<Double>()
+    val longitudes = arrayListOf<Double>()
+
     var isTracking = true
 
     fun init() {
@@ -94,4 +97,16 @@ open class TMap(
         tMapView.removeTMapMarkerItem(id)
         tMapView.addTMapMarkerItem(marker)
     }
+
+    fun setRouteDetailFocus() {
+        val maxLatitude = latitudes.max()
+        val minLatitude = latitudes.min()
+        val maxLongitude = longitudes.max()
+        val minLongitude = longitudes.min()
+
+        tMapView.setCenterPoint((maxLatitude + minLatitude) / 2, (maxLongitude + minLongitude) / 2)
+        tMapView.zoomToSpan(maxLatitude - minLatitude, maxLongitude - minLongitude)
+        tMapView.zoomLevel -= 1
+    }
+
 }

presentation/src/main/res/drawable/ic__zoom_out_map.xml

@@ -0,0 +1,5 @@
+<vector android:height="32dp" android:tint="#AD87E7"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15,3l2.3,2.3l-2.89,2.87l1.42,1.42L18.7,6.7L21,9V3H15zM3,9l2.3,-2.3l2.87,2.89l1.42,-1.42L6.7,5.3L9,3H3V9zM9,21l-2.3,-2.3l2.89,-2.87l-1.42,-1.42L5.3,17.3L3,15v6H9zM21,15l-2.3,2.3l-2.87,-2.89l-1.42,1.42l2.89,2.87L15,21h6V15z"/>
+</vector>