Update current location marker

collect_app/src/androidTest/java/org/odk/collect/android/support/FakeClickableMapFragment.kt

@@ -3,13 +3,13 @@ package org.odk.collect.android.support
 import android.os.Handler
 import android.os.Looper
 import androidx.fragment.app.Fragment
-import org.odk.collect.maps.traces.LineDescription
 import org.odk.collect.maps.MapFragment
 import org.odk.collect.maps.MapPoint
 import org.odk.collect.maps.circles.CircleDescription
-import org.odk.collect.maps.traces.PolygonDescription
 import org.odk.collect.maps.markers.MarkerDescription
 import org.odk.collect.maps.markers.MarkerIconDescription
+import org.odk.collect.maps.traces.LineDescription
+import org.odk.collect.maps.traces.PolygonDescription
 
 class FakeClickableMapFragment : Fragment(), MapFragment {
 
@@ -46,11 +46,6 @@ class FakeClickableMapFragment : Fragment(), MapFragment {
         animate: Boolean
     ) {}
 
-    override fun addMarker(markerDescription: MarkerDescription): Int {
-        val id = idCounter++
-        return id
-    }
-
     override fun updateMarker(
         featureId: Int,
         markerDescription: MarkerDescription
@@ -60,7 +55,7 @@ class FakeClickableMapFragment : Fragment(), MapFragment {
 
     override fun addMarkers(markers: List<MarkerDescription>): List<Int> {
         return markers.map {
-            addMarker(it)
+            idCounter++
         }
     }
 
@@ -97,6 +92,7 @@ class FakeClickableMapFragment : Fragment(), MapFragment {
     }
 
     override fun clearFeatures() {}
+    override fun clearFeatures(ids: List<Int>) {}
 
     override fun setClickListener(listener: MapFragment.PointListener?) {}
 
@@ -108,16 +104,6 @@ class FakeClickableMapFragment : Fragment(), MapFragment {
 
     override fun setDragEndListener(listener: MapFragment.FeatureListener?) {}
 
-    override fun setGpsLocationEnabled(enabled: Boolean) {}
-
-    override fun getGpsLocation(): MapPoint? {
-        return null
-    }
-
-    override fun setGpsLocationListener(listener: MapFragment.PointListener?) {}
-
-    override fun setRetainMockAccuracy(retainMockAccuracy: Boolean) {}
-
     override fun hasCenter(): Boolean {
         return false
     }

collect_app/src/main/java/org/odk/collect/android/injection/config/CollectGoogleMapsDependencyModule.kt

@@ -12,10 +12,6 @@ class CollectGoogleMapsDependencyModule(
         return appDependencyComponent.referenceLayerRepository()
     }
 
-    override fun providesLocationClient(): LocationClient {
-        return appDependencyComponent.locationClient()
-    }
-
     override fun providesSettingsProvider(): SettingsProvider {
         return appDependencyComponent.settingsProvider()
     }

collect_app/src/main/java/org/odk/collect/android/injection/config/CollectOsmDroidDependencyModule.kt

@@ -1,7 +1,6 @@
 package org.odk.collect.android.injection.config
 
 import org.odk.collect.android.geo.MapConfiguratorProvider
-import org.odk.collect.location.LocationClient
 import org.odk.collect.maps.MapConfigurator
 import org.odk.collect.maps.layers.ReferenceLayerRepository
 import org.odk.collect.osmdroid.OsmDroidDependencyModule
@@ -15,10 +14,6 @@ class CollectOsmDroidDependencyModule(
         return appDependencyComponent.referenceLayerRepository()
     }
 
-    override fun providesLocationClient(): LocationClient {
-        return appDependencyComponent.locationClient()
-    }
-
     override fun providesMapConfigurator(): MapConfigurator {
         return MapConfiguratorProvider.getConfigurator(
             appDependencyComponent.settingsProvider().getUnprotectedSettings().getString(ProjectKeys.KEY_BASEMAP_SOURCE)

collect_app/src/test/java/org/odk/collect/android/widgets/support/NoOpMapFragment.kt

@@ -44,10 +44,6 @@ class NoOpMapFragment : Fragment(), MapFragment {
     ) {
     }
 
-    override fun addMarker(markerDescription: MarkerDescription): Int {
-        TODO("Not yet implemented")
-    }
-
     override fun updateMarker(
         featureId: Int,
         markerDescription: MarkerDescription
@@ -106,6 +102,9 @@ class NoOpMapFragment : Fragment(), MapFragment {
     override fun clearFeatures() {
     }
 
+    override fun clearFeatures(ids: List<Int>) {
+    }
+
     override fun setClickListener(listener: MapFragment.PointListener?) {
     }
 
@@ -118,19 +117,6 @@ class NoOpMapFragment : Fragment(), MapFragment {
     override fun setDragEndListener(listener: MapFragment.FeatureListener?) {
     }
 
-    override fun setGpsLocationEnabled(enabled: Boolean) {
-    }
-
-    override fun getGpsLocation(): MapPoint? {
-        TODO("Not yet implemented")
-    }
-
-    override fun setGpsLocationListener(listener: MapFragment.PointListener?) {
-    }
-
-    override fun setRetainMockAccuracy(retainMockAccuracy: Boolean) {
-    }
-
     override fun hasCenter(): Boolean {
         return false
     }

geo/src/main/java/org/odk/collect/geo/GeoUtils.kt

@@ -2,8 +2,14 @@ package org.odk.collect.geo
 
 import android.content.Context
 import android.location.Location
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.asLiveData
 import org.javarosa.core.model.data.GeoPointData
+import org.odk.collect.location.tracker.LocationTracker
+import org.odk.collect.location.tracker.bindToLifecycle
+import org.odk.collect.maps.MapFragment
 import org.odk.collect.maps.MapPoint
+import org.odk.collect.maps.circles.CurrentLocationDelegate
 import org.odk.collect.shared.strings.StringUtils.removeEnd
 import org.odk.collect.strings.R
 import java.text.DecimalFormat
@@ -93,7 +99,27 @@ object GeoUtils {
         return MapPoint(this.getPart(0), this.getPart(1), this.getPart(2), this.getPart(3))
     }
 
+    @JvmStatic
     fun org.odk.collect.location.Location.toMapPoint(): MapPoint {
         return MapPoint(this.latitude, this.longitude, this.altitude, this.accuracy.toDouble())
     }
+
+    @JvmStatic
+    @JvmOverloads
+    fun MapFragment.showCurrentLocation(
+        locationTracker: LocationTracker,
+        currentLocationDelegate: CurrentLocationDelegate,
+        retainMockAccuracy: Boolean = false,
+        afterUpdate: (MapPoint) -> Unit = {}
+    ) {
+        val lifecycleOwner = this as Fragment
+        locationTracker.bindToLifecycle(lifecycleOwner, retainMockAccuracy)
+        locationTracker.getLocation().asLiveData().observe(lifecycleOwner) {
+            if (it != null) {
+                val mapPoint = it.toMapPoint()
+                currentLocationDelegate.update(this, mapPoint)
+                afterUpdate(mapPoint)
+            }
+        }
+    }
 }