diff --git a/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt b/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt index 51fb02e..5235100 100644 --- a/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt +++ b/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt @@ -9,7 +9,6 @@ import com.mapbox.navigation.tripdata.maneuver.model.StepDistance class DataCache { - private val garminManeuver: GarminManeuver = GarminManeuver.empty() private var maneuverCache: Maneuver? = null private var locationCache: LocationMatcherResult? = null private var session: NavigationSessionState? = null diff --git a/app/src/main/java/eu/ztsh/garmin/data/Model.kt b/app/src/main/java/eu/ztsh/garmin/data/Model.kt index 9bfdbe7..0bea440 100644 --- a/app/src/main/java/eu/ztsh/garmin/data/Model.kt +++ b/app/src/main/java/eu/ztsh/garmin/data/Model.kt @@ -130,43 +130,3 @@ class Direction( } } - -interface GarminModelItem { - - fun merge(item: GarminModelItem) -} - -class GarminManeuver : GarminModelItem { - - lateinit var lanes: Lanes - lateinit var direction: Direction - lateinit var distance: Distance - var flag: Boolean = false // WTF? - - override fun merge(item: GarminModelItem) { - val maneuver = item as GarminManeuver - this.lanes = maneuver.lanes - this.direction = maneuver.direction - this.distance = maneuver.distance - this.flag = maneuver.flag - } - - companion object { - - val empty: () -> GarminManeuver = { - val manouver = GarminManeuver() - manouver.lanes = Lanes(Arrows(setOf()), Arrows(setOf())) - manouver.direction = Direction(out = OutType.Off) - manouver.distance = Distance(0.0, Unit.Any) - manouver - } - } -} - -class GarminLocation : GarminModelItem { - - override fun merge(item: GarminModelItem) { - TODO("Not yet implemented") - } - -}