Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
2 changed files with 11 additions and 2 deletions
Showing only changes of commit b3f0497fba - Show all commits

View File

@@ -74,9 +74,9 @@ public class Route implements Parcelable {
return this.imageURL;
}
public int calculateTotalTimeMinutes() {
public double calculateTotalTimeMinutes() {
// 5 km / h walking speed
return (int) ((totalDistance / 1000) / 5) * 60;
return ((totalDistance / 1000) / 5) * 60;
}

View File

@@ -99,4 +99,13 @@ public class RouteTest {
assertNotEquals(expected, route.getDescription());
}
@Test
public void testCalculate(){
route.setTotalDistance(18000);
int expected = 216;
System.out.println(route.getTotalDistance());
System.out.println(route.calculateTotalTimeMinutes());
assertEquals(expected, route.calculateTotalTimeMinutes(), 0.01);
}
}