sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop

Browse Source
This commit is contained in:
RemoMeijer
2021-01-06 21:04:06 +01:00
parent 9da1078998 f552afb49e
commit b3f0497fba
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/a1/nextlocation/data/Route.java
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;
}

9
app/src/test/java/com/a1/nextlocation/RouteTest.java
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);
}
}