diff --git a/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt b/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt
index e2228d9..5658fc8 100644
--- a/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt
+++ b/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt
@@ -103,10 +103,12 @@ class MapboxMapper {
             return Lanes(Arrows(lanes), Arrows(outlines))
         }
 
-        fun map(locationMatcherResult: LocationMatcherResult): GarminLocation {
-            val state = GarminLocation()
-            // TODO: speed, limit, location?, bearing
-            return state
+        fun asSpeed(locationMatcherResult: LocationMatcherResult): Speed {
+            return Speed(
+                locationMatcherResult.enhancedLocation.speed.let { it?.toInt() ?: 0 },
+                locationMatcherResult.speedLimitInfo.speed.let { it ?: 0 },
+            )
+
         }
 
     }