RaceClock no has run(), or is runnable, as it wasn't needed.

Refactored Sparkline a bit. Now listens to our data model instead of being manually updated. Boat position labels don't work currently, though.
VisualiserRace now also tracks the order in which boats pass each leg.

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

@@ -18,6 +18,7 @@ import shared.model.*;
 import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +41,13 @@ public class VisualiserRace extends Race {
     private ObservableList<Mark> boatMarkers;
 
 
+    /**
+     * Maps between a Leg to a list of boats, in the order that they finished the leg.
+     * Used by the Sparkline to ensure it has correct information.
+     */
+    private Map<Leg, List<VisualiserBoat>> legCompletionOrder = new HashMap<>();
+
+
 
     /**
      * Constructs a race object with a given RaceDataSource, BoatDataSource, and RegattaDataSource and receives events from LatestMessages.
@@ -58,6 +66,12 @@ public class VisualiserRace extends Race {
 
         this.boatMarkers = FXCollections.observableArrayList(boatDataSource.getMarkerBoats().values());
 
+
+        //Initialise the leg completion order map.
+        for (Leg leg : this.legs) {
+            this.legCompletionOrder.put(leg, new ArrayList<>(this.boats.size()));
+        }
+
     }
 
 
@@ -216,8 +230,7 @@ public class VisualiserRace extends Race {
 
             if (legNumber >= 1 && legNumber < legs.size()) {
                 if (boat.getCurrentLeg() != legs.get(legNumber)) {
-                    boat.setCurrentLeg(legs.get(legNumber));
-                    boat.setTimeAtLastMark(this.raceClock.getCurrentTime());
+                    boatFinishedLeg(boat, legs.get(legNumber));
                 }
             }
 
@@ -238,6 +251,23 @@ public class VisualiserRace extends Race {
     }
 
 
+    /**
+     * Updates a boat's leg to a specified leg. Also records the order in which the boat passed the leg.
+     * @param boat The boat to update.
+     * @param leg The leg to use.
+     */
+    private void boatFinishedLeg(VisualiserBoat boat, Leg leg) {
+
+        //Record order in which boat finished leg.
+        this.legCompletionOrder.get(boat.getCurrentLeg()).add(boat);
+
+        //Update boat.
+        boat.setCurrentLeg(leg);
+        boat.setTimeAtLastMark(this.raceClock.getCurrentTime());
+
+    }
+
+
     /**
      * Updates all of the marker boats based on messages received.
      * @param boatMarkers The list of marker boats.
@@ -354,14 +384,23 @@ public class VisualiserRace extends Race {
      */
     private void updateBoatPositions(ObservableList<VisualiserBoat> boats) {
 
+        //Sort boats.
         sortBoatsByPosition(boats);
 
-        for (VisualiserBoat boat: boats) {
-            boat.setPosition(Integer.toString(boats.indexOf(boat) + 1));
+        //Assign new positions.
+        for (int i = 0; i < boats.size(); i++) {
+            VisualiserBoat boat = boats.get(i);
+
+
+            if ((boat.getStatus() == BoatStatusEnum.DNF) || (boat.getStatus() == BoatStatusEnum.PRESTART) || (boat.getCurrentLeg().getLegNumber() < 0)) {
 
-            if ((boat.getStatus() == BoatStatusEnum.DNF) || (boat.getStatus() == BoatStatusEnum.PRESTART) || (boat.getCurrentLeg().getLegNumber() < 0))
                 boat.setPosition("-");
+
+            } else {
+                boat.setPosition(Integer.toString(i + 1));
+            }
         }
+
     }
 
     /**
@@ -396,6 +435,14 @@ public class VisualiserRace extends Race {
         return boats;
     }
 
+    /**
+     * Returns the order in which boats completed each leg. Maps the leg to a list of boats, ordered by the order in which they finished the leg.
+     * @return Leg completion order for each leg.
+     */
+    public Map<Leg, List<VisualiserBoat>> getLegCompletionOrder() {
+        return legCompletionOrder;
+    }
+
     /**
      * Takes an estimated time an event will occur, and converts it to the
      * number of seconds before the event will occur.