From 393fd4aba90b79b1e5385e6590126d379f6163d9 Mon Sep 17 00:00:00 2001
From: jannis <jannis@tadris.de>
Date: Sun, 25 Aug 2019 13:23:29 +0200
Subject: [PATCH] Use running calorie calculation for hiking

---
 .../main/java/de/tadris/fitness/util/CalorieCalculator.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java b/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java
index d6064aa..3a50270 100644
--- a/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java
+++ b/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java
@@ -48,14 +48,10 @@ public class CalorieCalculator {
      */
     public static double getMET(Workout workout){
         double speedInKmh= workout.avgSpeed * 3.6;
-        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_RUNNING)){
+        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_RUNNING) || workout.workoutType.equals(Workout.WORKOUT_TYPE_HIKING)){
             // This is a linear graph based on the website linked above
             return Math.max(1.5, speedInKmh*1.117 - 2.1906);
         }
-        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_HIKING)){
-            // Use fixed MET because no more precise calculation was found
-            return 6.0;
-        }
         if(workout.workoutType.equals(Workout.WORKOUT_TYPE_CYCLING)){
             // This is a linear graph based on the website linked above
             return Math.max(3, (speedInKmh-10) / 1.5);