Currently, mock/pom.xml and visualiser/pom.xml build racevisionGame mock and visualiser.

Now using jetbrains nullable/notnull instead of sun (was causing maven issues).

racevisionGame/src/main/java/shared/model/Boat.java

@@ -1,9 +1,9 @@
 package shared.model;
 
 
-import com.sun.istack.internal.Nullable;
 import javafx.beans.property.*;
 import network.Messages.Enums.BoatStatusEnum;
+import org.jetbrains.annotations.Nullable;
 
 import java.time.ZonedDateTime;
 

racevisionGame/src/main/java/shared/model/Constants.java

@@ -33,7 +33,7 @@ public class Constants {
      * Frame periods are multiplied by this to get the amount of time a single frame represents.
      * E.g., frame period = 20ms, scale = 5, frame represents 20 * 5 = 100ms, and so boats are simulated for 100ms, even though only 20ms actually occurred.
      */
-    public static final int RaceTimeScale = 15;
+    public static final int RaceTimeScale = 10;
 
     /**
      * The race pre-start time, in milliseconds. 3 minutes.

racevisionGame/src/main/java/shared/model/RaceClock.java

@@ -1,14 +1,11 @@
 package shared.model;
 
-import com.github.bfsmith.geotimezone.TimeZoneLookup;
-import com.github.bfsmith.geotimezone.TimeZoneResult;
-import com.sun.istack.internal.Nullable;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import org.jetbrains.annotations.Nullable;
 import visualiser.model.ResizableRaceCanvas;
 
 import java.time.Duration;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -91,20 +88,6 @@ public class RaceClock {
 
     }
 
-    //TODO could potentially remove this, and the dependency, as it doesn't appear to be needed (regatta.xml has timezone already).
-    /**
-     * Returns the ZonedDateTime corresponding to a specified GPSCoordinate.
-     * @param gpsCoordinate The GPSCoordinate to lookup.
-     * @return The ZonedDateTime for the coordinate.
-     */
-    public static ZonedDateTime getCurrentZonedDateTime(GPSCoordinate gpsCoordinate) {
-        TimeZoneLookup timeZoneLookup = new TimeZoneLookup();
-        TimeZoneResult timeZoneResult = timeZoneLookup.getTimeZone(gpsCoordinate.getLatitude(), gpsCoordinate.getLongitude());
-        ZoneId zone = ZoneId.of(timeZoneResult.getResult());
-        return LocalDateTime.now(zone).atZone(zone);
-    }
-
-
 
 
     /**
@@ -227,6 +210,7 @@ public class RaceClock {
      * Returns the current time of the race.
      * @return The current time of the race.
      */
+    @Nullable
     public ZonedDateTime getCurrentTime() {
         return currentTime;
     }

racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java

@@ -104,19 +104,18 @@ public class VisualiserBoat extends Boat {
 
     /**
      * Attempts to add a new point to boat's track.
-     * It only adds a new point if the boat is still racing (see {@link #getStatus()} and {@link BoatStatusEnum#RACING}), and if at least {@link #trackPointTimeInterval} milliseconds have occurred.
+     * It only adds a new point if the boat is still racing (see {@link #getStatus()} and {@link BoatStatusEnum#RACING}), and if at least {@link #trackPointTimeInterval} milliseconds have occurred, using race time.
      * @param coordinate The {@link GPSCoordinate} of the trackpoint.
+     * @param currentTime The current race time.
      * @see TrackPoint
      */
-    public void addTrackPoint(GPSCoordinate coordinate) {
-
-        //TODO bugfix: instead of creating a track point every #trackPointTimeInterval milliseconds of real time, we should base it off of race time, so that we will create a consistent number of track points regardless of what the race time scale is.
+    public void addTrackPoint(GPSCoordinate coordinate, ZonedDateTime currentTime) {
 
         //Get current time.
-        long currentTime = System.currentTimeMillis();
+        long currentTimeMilli = currentTime.toInstant().toEpochMilli();
 
         //Check if enough time has passed to create a new track point.
-        Boolean canBeAdded = currentTime >= nextValidTime;
+        Boolean canBeAdded = currentTimeMilli >= nextValidTime;
 
         //If it has, and if we are still racing, create the point.
         if (canBeAdded && (getStatus() == BoatStatusEnum.RACING)) {
@@ -125,11 +124,11 @@ public class VisualiserBoat extends Boat {
             long expiryPeriod = trackPointTimeInterval * trackPointLimit;
 
             //Create and add point.
-            TrackPoint trackPoint = new TrackPoint(coordinate, currentTime, expiryPeriod);
+            TrackPoint trackPoint = new TrackPoint(coordinate, currentTimeMilli, expiryPeriod);
             track.add(trackPoint);
 
             //Update the nextValidTime for the next track point.
-            nextValidTime = currentTime + trackPointTimeInterval;
+            nextValidTime = currentTimeMilli + trackPointTimeInterval;
 
         }
     }

racevisionGame/src/main/java/visualiser/model/VisualiserRace.java

@@ -237,7 +237,7 @@ public class VisualiserRace extends Race {
 
             //Attempt to add a track point.
             if (newBoatStatusEnum == BoatStatusEnum.RACING) {
-                boat.addTrackPoint(boat.getCurrentPosition());
+                boat.addTrackPoint(boat.getCurrentPosition(), raceClock.getCurrentTime());
             }
 
             //Set finish time if boat finished.
@@ -353,17 +353,21 @@ public class VisualiserRace extends Race {
                 long currentFrameTime = System.currentTimeMillis();
                 long framePeriod = currentFrameTime - lastFrameTime;
 
+
+                //Update race status.
+                updateRaceStatus(latestMessages.getRaceStatus());
+
+
                 //Update racing boats.
                 updateBoats(boats, latestMessages.getBoatLocationMap(), latestMessages.getBoatStatusMap());
                 //And their positions (e.g., 5th).
                 updateBoatPositions(boats);
 
+
                 //Update marker boats.
                 updateMarkers(boatMarkers, latestMessages.getBoatLocationMap(), latestMessages.getBoatStatusMap());
 
 
-                //Update race status.
-                updateRaceStatus(latestMessages.getRaceStatus());
 
 
                 if (getRaceStatusEnum() == RaceStatusEnum.FINISHED) {