Merge branch 'feature/21-searching-an-address-should-zoom-into' into develop

Author: sds100

app/src/main/java/com/mapcode/map/MapViewModel.kt

@@ -190,7 +190,7 @@ class MapViewModel @Inject constructor(
         }
 
         val cleansedLatitude = LocationUtils.cleanseLatitude(query.toDouble())
-        moveCamera(cleansedLatitude, location.value.longitude, 0f)
+        moveCamera(cleansedLatitude, location.value.longitude, 17f)
     }
 
     fun queryLongitude(query: String) {
@@ -199,7 +199,7 @@ class MapViewModel @Inject constructor(
         }
 
         val cleansedLongitude = LocationUtils.cleanseLongitude(query.toDouble())
-        moveCamera(location.value.latitude, cleansedLongitude, 0f)
+        moveCamera(location.value.latitude, cleansedLongitude, 17f)
     }
 
     fun onTerritoryClick() {
@@ -250,7 +250,7 @@ class MapViewModel @Inject constructor(
      */
     private fun onResolveAddressQuery(query: String, result: Result<Location>) {
         result.onSuccess { newLocation ->
-            moveCamera(newLocation.latitude, newLocation.longitude, 0f)
+            moveCamera(newLocation.latitude, newLocation.longitude, 17f)
         }.onFailure { error ->
             val addressHelper: AddressHelper
             val addressError: AddressError

app/src/test/java/com/mapcode/map/MapViewModelTest.kt

@@ -583,4 +583,40 @@ internal class MapViewModelTest {
 
         assertThat(viewModel.showCantFindLocationSnackBar).isFalse()
     }
+
+    @Test
+    fun `zoom into street level after searching an address`() = runTest {
+        useCase.knownLocations.add(
+            FakeLocation(
+                1.0,
+                1.0,
+                addresses = listOf("Street, City, Country"),
+                mapcodes = listOf(
+                    Mapcode("AB.CD", Territory.NLD),
+                    Mapcode("VX.YZ", Territory.NLD)
+                )
+            )
+        )
+
+        viewModel.queryAddress("Street, City, Country")
+        runCurrent()
+
+        assertThat(viewModel.zoom.value).isEqualTo(17f)
+    }
+    
+    @Test
+    fun `zoom into street level after searching a latitude`() = runTest {
+        viewModel.queryLatitude("1.0")
+        runCurrent()
+
+        assertThat(viewModel.zoom.value).isEqualTo(17f)
+    }
+
+    @Test
+    fun `zoom into street level after searching a longitude`() = runTest {
+        viewModel.queryLongitude("1.0")
+        runCurrent()
+
+        assertThat(viewModel.zoom.value).isEqualTo(17f)
+    }
 }