feat : getSubwayRoute() 함수 구현

jeeminimini · jeeminimini · commit adbb74ce0788 · 2022-11-30T18:16:28.000+09:00
- 지하철 루트 좌표 받아오기 구현
diff --git a/data/src/main/java/com/stop/data/model/nearplace/Place.kt b/data/src/main/java/com/stop/data/model/nearplace/Place.kt
@@ -21,7 +21,7 @@ data class Place(
 
     fun toNowStationLocationUseCaseModel() = NowStationLocationUseCaseItem(
         name = name,
-        latitude = centerLat,
-        longitude = centerLon
+        latitude = centerLat.toString(),
+        longitude = centerLon.toString()
     )
 }
diff --git a/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt
@@ -49,7 +49,7 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
             return places.first().toNowStationLocationUseCaseModel()
         }.onFailure {
             throw it
-        }.getOrDefault(NowStationLocationUseCaseItem("", 0.0, 0.0)) as NowStationLocationUseCaseItem
+        }.getOrDefault(NowStationLocationUseCaseItem("", "0", "0")) as NowStationLocationUseCaseItem
     }
 
 }
diff --git a/data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt
@@ -52,8 +52,25 @@ internal class RouteRepositoryImpl @Inject constructor(
         return remoteDataSource.getGyeonggiBusStationId(stationName)
     }
 
-    override suspend fun getSubwayRoute(routeRequest: RouteRequest): SubwayRouteLocationUseCaseItem {
-        return remoteDataSource.getRoute(routeRequest).metaData.plan.itineraries.first().legs.first { it.mode != "WALK" }
-            .toUseCaseModel()
+    override suspend fun getSubwayRoute(
+        routeRequest: RouteRequest,
+        subwayLine: String,
+        startSubwayStation: String,
+        endSubwayStation: String
+    ): SubwayRouteLocationUseCaseItem {
+        return remoteDataSource.getRoute(routeRequest).metaData.plan.itineraries.first {
+            it.legs.any { leg ->
+                leg.mode == "SUBWAY"
+                && leg.route?.contains(subwayLine) ?: false
+                        && leg.start.name.contains(startSubwayStation)
+                        && leg.end.name.contains(endSubwayStation)
+            }
+        }.legs.first { leg ->
+            leg.mode == "SUBWAY"
+                    && leg.route?.contains(subwayLine) ?: false
+                    && leg.start.name.contains(startSubwayStation)
+                    && leg.end.name.contains(endSubwayStation)
+        }.toUseCaseModel()
     }
-}
+
+}
diff --git a/domain/src/main/java/com/stop/domain/model/nowlocation/NowStationLocationUseCaseItem.kt b/domain/src/main/java/com/stop/domain/model/nowlocation/NowStationLocationUseCaseItem.kt
@@ -2,6 +2,6 @@ package com.stop.domain.model.nowlocation
 
 data class NowStationLocationUseCaseItem(
     val name: String,
-    val latitude: Double,
-    val longitude: Double
+    val latitude: String,
+    val longitude: String
 )
diff --git a/domain/src/main/java/com/stop/domain/model/route/tmap/origin/Leg.kt b/domain/src/main/java/com/stop/domain/model/route/tmap/origin/Leg.kt
@@ -20,7 +20,7 @@ data class Leg(
 ) {
     fun toUseCaseModel(): SubwayRouteLocationUseCaseItem {
         val line = passShape?.linestring?.split(" ")?.map {
-            val (lat, long) = it.split(",")
+            val (long, lat) = it.split(",")
             Location(lat.toDouble(), long.toDouble())
         } ?: emptyList()
         return SubwayRouteLocationUseCaseItem(
diff --git a/domain/src/main/java/com/stop/domain/repository/RouteRepository.kt b/domain/src/main/java/com/stop/domain/repository/RouteRepository.kt
@@ -23,5 +23,10 @@ interface RouteRepository {
 
     suspend fun getGyeonggiBusStationId(stationName: String): GetGyeonggiBusStationIdResponse
 
-    suspend fun getSubwayRoute(routeRequest: RouteRequest): SubwayRouteLocationUseCaseItem
+    suspend fun getSubwayRoute(
+        routeRequest: RouteRequest,
+        subwayLine: String,
+        startSubwayStation: String,
+        endSubwayStation: String
+    ): SubwayRouteLocationUseCaseItem
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayRouteUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayRouteUseCase.kt
@@ -5,6 +5,11 @@ import com.stop.domain.model.route.tmap.RouteRequest
 
 interface GetSubwayRouteUseCase {
 
-    suspend operator fun invoke(routeRequest: RouteRequest): SubwayRouteLocationUseCaseItem
+    suspend operator fun invoke(
+        routeRequest: RouteRequest,
+        subwayLine: String,
+        startSubwayStation: String,
+        endSubwayStation: String
+    ): SubwayRouteLocationUseCaseItem
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayRouteUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayRouteUseCaseImpl.kt
@@ -9,8 +9,17 @@ class GetSubwayRouteUseCaseImpl @Inject constructor(
     private val routeRepository: RouteRepository
 ) : GetSubwayRouteUseCase {
 
-    override suspend fun invoke(routeRequest: RouteRequest): SubwayRouteLocationUseCaseItem {
-        return routeRepository.getSubwayRoute(routeRequest)
+    override suspend fun invoke(
+        routeRequest: RouteRequest,
+        subwayLine: String,
+        startSubwayStation: String,
+        endSubwayStation: String
+    ): SubwayRouteLocationUseCaseItem {
+        return routeRepository.getSubwayRoute(
+            routeRequest,
+            subwayLine,
+            startSubwayStation,
+            endSubwayStation)
     }
 
 }
diff --git a/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt b/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt
@@ -4,14 +4,18 @@ import android.util.Log
 import androidx.lifecycle.*
 import com.stop.data.BuildConfig
 import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
-import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
+import com.stop.domain.model.nowlocation.SubwayRouteLocationUseCaseItem
+import com.stop.domain.model.route.tmap.RouteRequest
 import com.stop.domain.usecase.nowlocation.GetBusNowLocationUseCase
 import com.stop.domain.usecase.nowlocation.GetNowStationLocationUseCase
 import com.stop.domain.usecase.nowlocation.GetSubwayRouteUseCase
 import com.stop.domain.usecase.nowlocation.GetSubwayTrainNowStationUseCase
 import com.stop.model.Location
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.random.Random
 
@@ -52,15 +56,17 @@ class MissionViewModel @Inject constructor(
     private val _busNowLocationInfo = MutableLiveData<BusInfoUseCaseItem>()
     val busNowLocationInfo: LiveData<BusInfoUseCaseItem> = _busNowLocationInfo
 
-    private val _nowStationLocationInfo = MutableLiveData<NowStationLocationUseCaseItem>()
-    val nowStationLocationInfo: LiveData<NowStationLocationUseCaseItem> = _nowStationLocationInfo
+    private val _subwayRoute = MutableLiveData<SubwayRouteLocationUseCaseItem>()
+    val subwayRoute: LiveData<SubwayRouteLocationUseCaseItem> = _subwayRoute
 
     var personCurrentLocation = Location(37.553836, 126.969652)
     var busCurrentLocation = Location(37.553836, 126.969652)
 
+    lateinit var startSubwayStation: String
+
     init {
         getBusNowLocation()
-        getNowStationLocation()
+        getSubwayRoute()
     }
 
     fun setDestination(inputDestination: String) {
@@ -119,22 +125,36 @@ class MissionViewModel @Inject constructor(
     }
 
 
-    suspend fun getNowStationLocation() = withContext(Dispatchers.Main) {
-        val searchKeyword = getSubwayTrainNowLocation().stationName
+    private suspend fun getNowStationLocation() = withContext(Dispatchers.Main) {
+        startSubwayStation = getSubwayTrainNowLocation().stationName
         getNowStationLocationUseCase(
             TMAP_VERSION,
-            searchKeyword,
+            startSubwayStation,
             personCurrentLocation.longitude,
             personCurrentLocation.latitude,
             BuildConfig.T_MAP_APP_KEY
         )
     }
 
-//    private fun getSubwayRoute() {
-//        viewModelScope.launch {
-//            getSubwayRouteUseCase(RouteRequest())
-//        }
-//    }
+    private fun getSubwayRoute() {
+        viewModelScope.launch {
+            val startLocation = getNowStationLocation()
+            getSubwayRouteUseCase(
+                RouteRequest(
+                    startLocation.longitude,
+                    startLocation.latitude,
+                    TEST_SUBWAY_LONG,
+                    TEST_SUBWAY_LAT
+                ),
+                TEST_SUBWAY_NUMER.toString() + LINE,
+                startSubwayStation.dropLast(1), //"역" 버리기
+                TEST_END_SUBWAY_STATION
+            ).apply {
+                _subwayRoute.value = this
+            }
+            Log.d("MissionFragment", "subwayRoute ${_subwayRoute.value}")
+        }
+    }
 
     companion object {
         private const val DELAY_TIME = 1000L
@@ -149,9 +169,15 @@ class MissionViewModel @Inject constructor(
         private var TIME_TEST = 0
 
         private const val TEST_SUBWAY_NUMER = 4
-        private const val TEST_TRAIN_NUMBER = "4615"
+        private const val LINE = "호선" //임시로.. 종성님이 어떻게 넘겨주시느냐에 따라 달림
+        private const val TEST_TRAIN_NUMBER = "4645"
 
         private const val TMAP_VERSION = 1
+
+        private const val TEST_SUBWAY_LAT = "37.30973177"
+        private const val TEST_SUBWAY_LONG = "126.85359515"
+        private const val TEST_END_SUBWAY_STATION = "한대앞"
+
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ data class Place(`
`21`	`21`
`22`	`22`	`fun toNowStationLocationUseCaseModel() = NowStationLocationUseCaseItem(`
`23`	`23`	`name = name,`
`24`		`- latitude = centerLat,`
`25`		`- longitude = centerLon`
	`24`	`+ latitude = centerLat.toString(),`
	`25`	`+ longitude = centerLon.toString()`
`26`	`26`	`)`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ internal class NearPlaceRepositoryImpl @Inject constructor(`
`49`	`49`	`return places.first().toNowStationLocationUseCaseModel()`
`50`	`50`	`}.onFailure {`
`51`	`51`	`throw it`
`52`		`- }.getOrDefault(NowStationLocationUseCaseItem("", 0.0, 0.0)) as NowStationLocationUseCaseItem`
	`52`	`+ }.getOrDefault(NowStationLocationUseCaseItem("", "0", "0")) as NowStationLocationUseCaseItem`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ package com.stop.domain.model.nowlocation`
`2`	`2`
`3`	`3`	`data class NowStationLocationUseCaseItem(`
`4`	`4`	`val name: String,`
`5`		`- val latitude: Double,`
`6`		`- val longitude: Double`
	`5`	`+ val latitude: String,`
	`6`	`+ val longitude: String`
`7`	`7`	`)`