From 71f00852680aa14a47cef4a8ba2f6613fa2cca6f Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 6 Apr 2017 16:11:14 +1200 Subject: [PATCH] Implemented geotimezone from com.github.bfsmith - Calculates timezone from mark #story[28] #pair[fwy13,hba56] --- .idea/copyright/profiles_settings.xml | 3 --- pom.xml | 6 +++++- src/main/java/seng302/Controllers/RaceController.java | 7 +++++++ 3 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index a3e030d6..f86ff1a3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,11 @@ mockito-all 1.9.5 - + + com.github.bfsmith + geotimezone + 1.0.3 + diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index 7fb037d2..a109e2f5 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -1,6 +1,8 @@ package seng302.Controllers; +import com.github.bfsmith.geotimezone.TimeZoneLookup; +import com.github.bfsmith.geotimezone.TimeZoneResult; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; @@ -165,6 +167,11 @@ public class RaceController extends Controller { startScreen.setVisible(false); ongoingRacePane.setVisible(true); + //timezone + TimeZoneLookup timeZoneLookup = new TimeZoneLookup(); + TimeZoneResult timeZoneResult = timeZoneLookup.getTimeZone(raceXMLReader.getMark().getLatitude(), raceXMLReader.getMark().getLongitude()); + System.out.println(timeZoneResult.getResult()); + initializeFPS(); initializeAnnotations();