From f3e636f586b96b62d7f1853d7db0a646472cd0c2 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 6 Jan 2021 20:48:45 +0100 Subject: [PATCH] added route calculating time --- .../java/com/a1/nextlocation/data/FileIO.java | 42 ------------------- .../java/com/a1/nextlocation/data/Route.java | 7 +++- 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/a1/nextlocation/data/FileIO.java b/app/src/main/java/com/a1/nextlocation/data/FileIO.java index 5a27035..7ea2cda 100644 --- a/app/src/main/java/com/a1/nextlocation/data/FileIO.java +++ b/app/src/main/java/com/a1/nextlocation/data/FileIO.java @@ -65,46 +65,4 @@ public class FileIO { } return res; } - -// public void writeFileData(T objectToWrite, Context context) { -// //TODO make -// //object naar jsonobject -// //jsonarray toevoegen/maken -// //filewriter naar file -// -// String filename = ""; -// if (objectToWrite instanceof Coupon){ -// filename = "coupons.json"; -// } -// -// if (objectToWrite instanceof Route){ -// filename = "routes.json"; -// } -// -// if (objectToWrite instanceof Location){ -// filename = "locations.json"; -// } -// -// try (FileOutputStream fileOutputStream = context.openFileOutput(filename, Context.MODE_PRIVATE)){ -// String json = new Gson().toJson(objectToWrite); -// -// fileOutputStream.write(json.getBytes(StandardCharsets.UTF_8)); -// -// } catch (FileNotFoundException e) { -// e.printStackTrace(); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// -// /*try (FileWriter fileWriter = new FileWriter(filename)){ -// -// String json = new Gson().toJson(objectToWrite); -// -// fileWriter.append(json); -// fileWriter.flush(); -// -// } catch (IOException e) { -// e.printStackTrace(); -// }*/ -// } } diff --git a/app/src/main/java/com/a1/nextlocation/data/Route.java b/app/src/main/java/com/a1/nextlocation/data/Route.java index dd48247..c837de1 100644 --- a/app/src/main/java/com/a1/nextlocation/data/Route.java +++ b/app/src/main/java/com/a1/nextlocation/data/Route.java @@ -74,9 +74,14 @@ public class Route implements Parcelable { return this.imageURL; } + public int calculateTotalTimeMinutes() { + // 5 km / h walking speed + return (int) ((totalDistance / 1000) / 5) * 60; + } + public int getTotalTime() { - //TODO calculate total time according to all locations in list + return totalTime; }