Refactor WaypointReader

Author: pstorch

src/main/kotlin/de/storchp/opentracks/osmplugin/dashboardapi/Waypoint.kt

@@ -1,7 +1,9 @@
 package de.storchp.opentracks.osmplugin.dashboardapi
 
 import android.content.ContentResolver
+import android.content.Intent
 import android.net.Uri
+import de.storchp.opentracks.osmplugin.map.MapData
 import de.storchp.opentracks.osmplugin.map.MapUtils
 import org.oscim.core.GeoPoint
 import java.net.URLDecoder
@@ -14,7 +16,7 @@ data class Waypoint(
     val category: String? = null,
     val icon: String? = null,
     val trackId: Long = 0,
-    val latLong: GeoPoint? = null,
+    val latLong: GeoPoint,
     val photoUrl: String? = null,
 )
 
@@ -47,11 +49,7 @@ object WaypointReader {
     val QUERY_POSITION_PATTERN: Pattern =
         Pattern.compile("q=([+-]?\\d+(?:\\.\\d+)?),\\s?([+-]?\\d+(?:\\.\\d+)?)")
 
-    fun fromGeoUri(uri: String?): Waypoint? {
-        if (uri == null) {
-            return null
-        }
-
+    fun fromGeoUri(uri: String): Waypoint? {
         var schemeSpecific = uri.substring(uri.indexOf(":") + 1)
 
         var name: String? = null
@@ -133,5 +131,16 @@ object WaypointReader {
             }
         }
     }
+
+    fun fromGeoIntent(intent: Intent, mapData: MapData) {
+        require(intent.isGeoIntent())
+
+        fromGeoUri(intent.data.toString())
+            ?.let { waypoint ->
+                mapData.addWaypointMarker(waypoint)
+                mapData.updateMapPositionAndZoomLevel(waypoint.latLong, 15)
+            }
+    }
 }
 
+fun Intent.isGeoIntent() = "geo" == scheme && data != null

src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapActivity.kt

@@ -32,6 +32,7 @@ import de.storchp.opentracks.osmplugin.dashboardapi.UpdateTrackStatistics
 import de.storchp.opentracks.osmplugin.dashboardapi.UpdateTrackpointsDebug
 import de.storchp.opentracks.osmplugin.dashboardapi.WaypointReader
 import de.storchp.opentracks.osmplugin.dashboardapi.isDashboardAction
+import de.storchp.opentracks.osmplugin.dashboardapi.isGeoIntent
 import de.storchp.opentracks.osmplugin.databinding.ActivityMapsBinding
 import de.storchp.opentracks.osmplugin.utils.PreferencesUtils
 import okhttp3.Cache
@@ -183,16 +184,8 @@ open class MapsActivity : BaseActivity(), OnItemGestureListener<MarkerInterface?
                     showOnLockScreen(showOnLockScreen)
                     showFullscreen(showFullscreen)
                 }
-        } else if ("geo" == intent.scheme && intent.data != null) {
-            WaypointReader.fromGeoUri(intent.data.toString())
-                ?.let { waypoint ->
-                    val marker = MapUtils.createTappableMarker(this, waypoint)
-                    waypointsLayer!!.addItem(marker)
-                    val pos = map.getMapPosition()
-                        .setPosition(waypoint.latLong)
-                        .setZoomLevel(15)
-                    map.animator().animateTo(pos)
-                }
+        } else if (intent.isGeoIntent()) {
+            WaypointReader.fromGeoIntent(intent, mapData!!)
         }
     }
 

src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapData.kt

@@ -68,7 +68,7 @@ data class MapData(
     }
 
     fun addPauseMarker(geoPoint: GeoPoint) {
-        val marker = MapUtils.createMarker(geoPoint, pauseMarkerSymbol)
+        val marker = MapUtils.createMarker(latLong = geoPoint, markerSymbol = pauseMarkerSymbol)
         waypointsLayer.addItem(marker)
     }
 
@@ -94,17 +94,25 @@ data class MapData(
     fun getBearing() = mapMode.getBearing(movementDirection)
 
     fun updateMapPositionAndRotation(myPos: GeoPoint) {
-        val newPos = map.getMapPosition().setPosition(myPos)
+        val newPos = map.getMapPosition()
+            .setPosition(myPos)
             .setBearing(getBearing())
         map.animator().animateTo(newPos)
     }
 
+    fun updateMapPositionAndZoomLevel(myPos: GeoPoint, zoom: Int) {
+        val newPos = map.getMapPosition()
+            .setPosition(myPos)
+            .setZoomLevel(zoom)
+        map.animator().animateTo(newPos)
+    }
+
     fun renderMap() {
         map.render()
     }
 
     fun addWaypointMarker(waypoint: Waypoint) {
-        val marker = MapUtils.createMarker(waypoint.id, waypoint.latLong!!, waypointMarkerSymbol)
+        val marker = MapUtils.createMarker(waypoint.id, waypoint.latLong, waypointMarkerSymbol)
         waypointsLayer.addItem(marker)
     }
 

src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapUtils.kt

@@ -9,7 +9,6 @@ import android.util.Log
 import androidx.core.content.ContextCompat
 import de.storchp.opentracks.osmplugin.R
 import de.storchp.opentracks.osmplugin.dashboardapi.Trackpoint
-import de.storchp.opentracks.osmplugin.dashboardapi.Waypoint
 import de.storchp.opentracks.osmplugin.utils.UnitConversions
 import org.oscim.android.canvas.AndroidBitmap
 import org.oscim.core.GeoPoint
@@ -220,18 +219,8 @@ object MapUtils {
         billboard
     )
 
-    fun createPushpinMarker(context: Context, latLong: GeoPoint?, id: Long?) =
+    fun createMarker(id: Long? = null, latLong: GeoPoint, markerSymbol: MarkerSymbol) =
         MarkerItem(id, latLong.toString(), "", latLong).apply {
-            marker = createPushpinSymbol(context)
-        }
-
-    fun createMarker(id: Long, latLong: GeoPoint, markerSymbol: MarkerSymbol) =
-        MarkerItem(id, latLong.toString(), "", latLong).apply {
-            marker = markerSymbol
-        }
-
-    fun createMarker(latLong: GeoPoint, markerSymbol: MarkerSymbol) =
-        MarkerItem(latLong.toString(), "", latLong).apply {
             marker = markerSymbol
         }
 
@@ -256,6 +245,4 @@ object MapUtils {
         hotspot = HotspotPlace.BOTTOM_CENTER
     )
 
-    fun createTappableMarker(context: Context, waypoint: Waypoint) =
-        createPushpinMarker(context, waypoint.latLong, waypoint.id)
 }