Merge pull request #43 from boostcampwm-2022/15-feature-map-bookmark

[PR] 지도에 북마크 표시 구현, panel 구현시 dataBinding으로 변경

Author: jeeminimini

data/src/main/java/com/stop/data/di/RemoteDataModule.kt

@@ -17,5 +17,4 @@ internal abstract class RemoteDataModule {
     abstract fun provideNearPlaceRemoteData(
         nearPlaceRemoteDataSourceImpl: NearPlaceRemoteDataSourceImpl
     ): NearPlaceRemoteDataSource
-
 }

data/src/main/java/com/stop/data/remote/model/nearplace/NearPlcaeResponse.kt renamed to data/src/main/java/com/stop/data/remote/model/nearplace/NearPlaceResponse.kt

@@ -3,6 +3,6 @@ package com.stop.data.remote.model.nearplace
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class NearPlcaeResponse(
+data class NearPlaceResponse(
     val searchPoiInfo: SearchPoiInfo
 )

data/src/main/java/com/stop/data/remote/network/FakeTmapApiService.kt

@@ -29,7 +29,7 @@ internal interface FakeTmapApiService {
         @Query("lon") longitude: String,
         @Query("version") version: Int = REVERSE_GEOCODING_VERSION,
         @Query("coordType") coordinationType: String = REVERSE_GEOCODING_COORDINATION_TYPE,
-        @Query("addressType") addressType: String = REVERSE_GEOCODING_ADDRESS_TYPE,
+        @Query("addressType") addressType: String,
     ): NetworkResult<ReverseGeocodingResponse>
 
     companion object {
@@ -38,6 +38,5 @@ internal interface FakeTmapApiService {
         private const val REVERSE_GEOCODING_URL = "tmap/geo/reversegeocoding"
         private const val REVERSE_GEOCODING_VERSION = 1
         private const val REVERSE_GEOCODING_COORDINATION_TYPE = "WGS84GEO"
-        private const val REVERSE_GEOCODING_ADDRESS_TYPE = "A02"
     }
 }

data/src/main/java/com/stop/data/remote/network/NearPlaceApiService.kt

@@ -1,7 +1,7 @@
 package com.stop.data.remote.network
 
 import com.stop.data.remote.model.NetworkResult
-import com.stop.data.remote.model.nearplace.NearPlcaeResponse
+import com.stop.data.remote.model.nearplace.NearPlaceResponse
 import retrofit2.http.GET
 import retrofit2.http.Query
 
@@ -14,6 +14,5 @@ internal interface NearPlaceApiService {
         @Query("centerLon") centerLon: Double,
         @Query("centerLat") centerLat: Double,
         @Query("appKey") appKey: String,
-    ): NetworkResult<NearPlcaeResponse>
-
+    ): NetworkResult<NearPlaceResponse>
 }

data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSource.kt

@@ -1,5 +1,6 @@
 package com.stop.data.remote.source.route
 
+import com.stop.domain.model.geoLocation.AddressType
 import com.stop.domain.model.route.gyeonggi.GetGyeonggiBusStationIdResponse
 import com.stop.domain.model.route.seoul.bus.GetBusStationArsIdResponse
 import com.stop.domain.model.route.tmap.RouteRequest
@@ -11,7 +12,7 @@ internal interface RouteRemoteDataSource {
 
     suspend fun getRoute(routeRequest: RouteRequest): RouteResponse
 
-    suspend fun reverseGeocoding(coordinate: Coordinate): ReverseGeocodingResponse
+    suspend fun reverseGeocoding(coordinate: Coordinate, addressType: AddressType): ReverseGeocodingResponse
 
     suspend fun getSubwayStationCd(stationId: String, stationName: String): String
 

data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSourceImpl.kt

@@ -5,6 +5,7 @@ import com.stop.data.remote.network.ApisDataService
 import com.stop.data.remote.network.FakeTmapApiService
 import com.stop.data.remote.network.OpenApiSeoulService
 import com.stop.data.remote.network.WsBusApiService
+import com.stop.domain.model.geoLocation.AddressType
 import com.stop.domain.model.route.gyeonggi.GetGyeonggiBusStationIdResponse
 import com.stop.domain.model.route.seoul.bus.GetBusStationArsIdResponse
 import com.stop.domain.model.route.seoul.subway.SubwayStationResponse
@@ -43,8 +44,8 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun reverseGeocoding(coordinate: Coordinate): ReverseGeocodingResponse {
-        with(fakeTmapApiService.getReverseGeocoding(coordinate.latitude, coordinate.longitude)) {
+    override suspend fun reverseGeocoding(coordinate: Coordinate, addressType: AddressType): ReverseGeocodingResponse {
+        with(fakeTmapApiService.getReverseGeocoding(coordinate.latitude, coordinate.longitude, addressType = addressType.type)) {
             return when (this) {
                 is NetworkResult.Success -> this.data
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)

data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt

@@ -1,6 +1,7 @@
 package com.stop.data.repository
 
 import com.stop.data.remote.source.route.RouteRemoteDataSource
+import com.stop.domain.model.geoLocation.AddressType
 import com.stop.domain.model.route.gyeonggi.GetGyeonggiBusStationIdResponse
 import com.stop.domain.model.route.seoul.bus.GetBusStationArsIdResponse
 import com.stop.domain.model.route.tmap.RouteRequest
@@ -18,8 +19,8 @@ internal class RouteRepositoryImpl @Inject constructor(
         return remoteDataSource.getRoute(routeRequest)
     }
 
-    override suspend fun reverseGeocoding(coordinate: Coordinate): ReverseGeocodingResponse {
-        return remoteDataSource.reverseGeocoding(coordinate)
+    override suspend fun reverseGeocoding(coordinate: Coordinate, addressType: AddressType): ReverseGeocodingResponse {
+        return remoteDataSource.reverseGeocoding(coordinate, addressType)
     }
 
     override suspend fun getSubwayStationCd(stationId: String, stationName: String): String {

domain/src/main/java/com/stop/domain/di/UseCaseModule.kt

@@ -1,7 +1,9 @@
 package com.stop.domain.di
 
-import com.stop.domain.usecase.GetRouteUseCase
-import com.stop.domain.usecase.GetRouteUseCaseImpl
+import com.stop.domain.usecase.route.GetRouteUseCase
+import com.stop.domain.usecase.route.GetRouteUseCaseImpl
+import com.stop.domain.usecase.geoLocation.GeoLocationUseCase
+import com.stop.domain.usecase.geoLocation.GeoLocationUseCaseImpl
 import dagger.Module
 import dagger.Binds
 import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
@@ -25,4 +27,7 @@ internal interface UseCaseModule {
         getNearPlacesUseCaseImpl: GetNearPlacesUseCaseImpl
     ): GetNearPlacesUseCase
 
+    @Binds
+    @Singleton
+    fun provideGeoLocationUseCase(geoLocationUseCaseImpl: GeoLocationUseCaseImpl): GeoLocationUseCase
 }

domain/src/main/java/com/stop/domain/model/geoLocation/AddressType.kt

@@ -0,0 +1,6 @@
+package com.stop.domain.model.geoLocation
+
+enum class AddressType(val type: String) {
+    LOT_ADDRESS("A02"),
+    FULL_ADDRESS("A10")
+}

domain/src/main/java/com/stop/domain/model/geoLocation/GeoLocationInfo.kt

@@ -0,0 +1,8 @@
+package com.stop.domain.model.geoLocation
+
+data class GeoLocationInfo(
+    val title: String,
+    val roadAddress: String,
+    val lotAddress: String,
+    val distance: String
+)