Don't calculate difficulty twice

kylecorry31 · Aug 31, 2023 · 2b3db40 · 2b3db40
1 parent 0c8f267
commit 2b3db40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/domain/hiking/HikingService.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/domain/hiking/HikingService.kt
@@ -91,10 +91,11 @@ class HikingService : IHikingService {
 
     override fun getHikingDuration(
         path: List<PathPoint>,
-        paceFactor: Float
+        paceFactor: Float,
+        difficulty: HikingDifficulty?
     ): Duration {
-        val difficulty = getHikingDifficulty(path)
-        return getHikingDuration(path, getAveragePace(difficulty, paceFactor))
+        val diff = difficulty ?: getHikingDifficulty(path)
+        return getHikingDuration(path, getAveragePace(diff, paceFactor))
     }
 
     override fun getElevationGain(path: List<PathPoint>): Distance {

diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/domain/hiking/IHikingService.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/domain/hiking/IHikingService.kt
@@ -23,7 +23,8 @@ interface IHikingService {
 
     fun getHikingDuration(
         path: List<PathPoint>,
-        paceFactor: Float = 2f
+        paceFactor: Float = 2f,
+        difficulty: HikingDifficulty? = null
     ): Duration
 
     fun getElevationLossGain(path: List<PathPoint>): Pair<Distance, Distance>

diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathOverviewFragment.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathOverviewFragment.kt
@@ -352,9 +352,9 @@ class PathOverviewFragment : BoundFragment<FragmentPathOverviewBinding>() {
 
     private suspend fun updateHikingStats() = onDefault {
         val reversed = waypoints.reversed()
+        difficulty = hikingService.getHikingDifficulty(reversed)
         calculatedDuration =
             hikingService.getHikingDuration(reversed, paceFactor)
-        difficulty = hikingService.getHikingDifficulty(reversed)
     }
 
     private fun movePath() {