Merge remote-tracking branch 'origin/sprint4_master' into Story877

# Conflicts:
#	mock/src/main/java/seng302/DataInput/BoatXMLReader.java
#	mock/src/main/java/seng302/DataInput/XMLReader.java
#	mock/src/main/java/seng302/Model/Boat.java
#	mock/src/main/java/seng302/Model/CompoundMark.java
#	mock/src/main/java/seng302/Model/Leg.java
#	mock/src/main/java/seng302/Model/Mark.java
#	mock/src/main/java/seng302/Model/Marker.java
#	mock/src/main/java/seng302/Model/Race.java
#	mock/src/test/java/seng302/Model/LegTest.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml

visualiser/src/main/java/seng302/Controllers/ArrowController.java

@@ -0,0 +1,17 @@
+package seng302.Controllers;
+
+import javafx.fxml.FXML;
+import javafx.scene.layout.Pane;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+/**
+ * Created by Joseph on 22/05/2017.
+ */
+public class ArrowController extends Controller {
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+    }
+}

visualiser/src/main/java/seng302/Controllers/RaceController.java

@@ -1,10 +1,17 @@
 package seng302.Controllers;
 
 
+import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
 import javafx.scene.control.*;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
 import seng302.Mock.StreamedRace;
 import seng302.Model.*;
 import seng302.VisualiserInput;
@@ -39,10 +46,21 @@ public class RaceController extends Controller {
     private static int partialBtn = 3;
     private static int importantBtn = 4;
 
+    private ArrayList<Boat> startBoats;
+    private Integer sparkLineNumber = 0;
+
     private ResizableRaceCanvas raceMap;
     private ResizableRaceMap raceBoundaries;
     private ToggleGroup annotationGroup;
+
+    private ArrayList<String> colours;
+    private Map<Integer, String> boatColours = new HashMap<>();
+    private int legNum;
+    private RaceClock raceClock;
+
+    @FXML Pane arrow;
     @FXML SplitPane race;
+    @FXML StackPane arrowPane;
     @FXML CheckBox showFPS;
     @FXML CheckBox showBoatPath;
     @FXML Label timer;
@@ -51,6 +69,7 @@ public class RaceController extends Controller {
     @FXML CheckBox showName;
     @FXML CheckBox showAbbrev;
     @FXML CheckBox showSpeed;
+    @FXML CheckBox showTime;
     @FXML Button saveAnno;
     @FXML TableView<Boat> boatInfoTable;
     @FXML TableColumn<Boat, String> boatPlacingColumn;
@@ -61,6 +80,9 @@ public class RaceController extends Controller {
     @FXML RadioButton showAnnoRBTN;
     @FXML RadioButton partialAnnoRBTN;
     @FXML RadioButton importantAnnoRBTN;
+    @FXML LineChart<Number, Number> sparklineChart;
+    @FXML NumberAxis xAxis;
+    @FXML NumberAxis yAxis;
 
     /**
      * Updates the ResizableRaceCanvas (raceMap) with most recent data
@@ -96,6 +118,7 @@ public class RaceController extends Controller {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         //listener for fps
+        startBoats = new ArrayList<>();
         showFPS.selectedProperty().addListener((ov, old_val, new_val) -> {
             if (showFPS.isSelected()) {
                 FPS.setVisible(true);
@@ -111,6 +134,64 @@ public class RaceController extends Controller {
         importantAnnoRBTN.setToggleGroup(annotationGroup);
     }
 
+    /**
+     * Creates and sets initial display for Sparkline for race positions.
+     * A data series for each boat in the race is added.
+     * Position numbers are displayed.
+     *
+     * @param boats boats to display on the sparkline
+     */
+    public void createSparkLine(ObservableList<Boat> boats){
+        // NOTE: Y axis is in negatives to display correct positions
+
+        makeColours();
+        startBoats.addAll(boats);
+        mapBoatColours();
+
+        // all boats start in 'last' place
+        for (int i=0; i<startBoats.size(); i++){
+            XYChart.Series<Number, Number> series = new XYChart.Series();
+            series.getData().add(new XYChart.Data(0, -startBoats.size()));
+            series.getData().add(new XYChart.Data(0, -startBoats.size()));
+            sparklineChart.getData().add(series);
+            sparklineChart.getData().get(i).getNode().setStyle("-fx-stroke: " +
+                    ""+boatColours.get(startBoats.get(i).getSourceID())+";");
+        }
+
+        sparklineChart.setCreateSymbols(false);
+
+        // set x axis details
+        xAxis.setAutoRanging(false);
+        xAxis.setTickMarkVisible(false);
+        xAxis.setTickLabelsVisible(false);
+        xAxis.setMinorTickVisible(false);
+        xAxis.setUpperBound((startBoats.size()+1)*legNum);
+        xAxis.setTickUnit((startBoats.size()+1)*legNum);
+
+
+        // set y axis details
+        yAxis.setLowerBound(-(startBoats.size()+1));
+        yAxis.setUpperBound(0);
+        yAxis.setAutoRanging(false);
+        yAxis.setLabel("Position in Race");
+        yAxis.setTickUnit(1);
+        yAxis.setTickMarkVisible(false);
+        yAxis.setMinorTickVisible(false);
+        // hide minus number from displaying on axis
+        yAxis.setTickLabelFormatter(new NumberAxis.DefaultFormatter(yAxis) {
+            @Override
+            public String toString(Number value) {
+                if ((Double)value == 0.0
+                        || (Double)value < -startBoats.size()){
+                    return "";
+                }
+                else {
+                    return String.format("%7.0f", -value.doubleValue());
+                }
+            }
+        });
+    }
+
     /**
      * Initializes and runs the race, based on the user's chosen scale factor
      * Currently uses an example racecourse
@@ -119,8 +200,11 @@ public class RaceController extends Controller {
      * @param raceClock The RaceClock to use for the race's countdown/elapsed duration + timezone.
      */
     public void startRace(VisualiserInput visualiserInput, RaceClock raceClock) {
-        StreamedRace newRace = new StreamedRace(visualiserInput, this);
+
         //newRace.initialiseBoats();
+        legNum = visualiserInput.getCourse().getLegs().size()-1;
+
+        makeArrow();
 
         raceMap = new ResizableRaceCanvas(visualiserInput.getCourse());
         raceMap.setMouseTransparent(true);
@@ -129,6 +213,7 @@ public class RaceController extends Controller {
         //raceMap.setBoats(newRace.getStartingBoats());
         raceMap.draw();
         raceMap.setVisible(true);
+        raceMap.setArrow(arrow.getChildren().get(0));
 
         canvasBase.getChildren().add(0, raceMap);
 
@@ -138,13 +223,25 @@ public class RaceController extends Controller {
         raceBoundaries.heightProperty().bind(canvasBase.heightProperty());
         raceBoundaries.draw();
         raceBoundaries.setVisible(true);
+
         canvasBase.getChildren().add(0, raceBoundaries);
 
         race.setVisible(true);
 
         //Initialize save annotation array, fps listener, and annotation listeners
         timeZone.setText(raceClock.getTimeZone());
-        timer.textProperty().bind(raceClock.durationProperty());
+
+        //RaceClock.duration isn't necessarily being changed in the javaFX thread, so we need to runlater the update.
+        raceClock.durationProperty().addListener((observable, oldValue, newValue) -> {
+            Platform.runLater(() -> {
+                timer.setText(newValue);
+            });
+        });
+
+        this.raceClock = raceClock;
+        raceMap.setRaceClock(raceClock);
+
+        StreamedRace newRace = new StreamedRace(visualiserInput, this);
         initializeFPS();
         initializeAnnotations();
 
@@ -183,6 +280,78 @@ public class RaceController extends Controller {
         });
     }
 
+    /**
+     * Updates the sparkline to display current boat positions.
+     * New points are plotted to represent each boat when required.
+     *
+     * @param boatsInRace used for current boat positions.
+     */
+    public void updateSparkline(ObservableList<Boat> boatsInRace){
+        int placingVal = boatsInRace.size();
+        sparkLineNumber++;
+
+        for (int i = boatsInRace.size() - 1; i >= 0; i--){
+            for (int j = startBoats.size() - 1; j >= 0; j--){
+                if (boatsInRace.get(i)==startBoats.get(j)){
+
+                    // when a boat is on its first leg
+                    if (boatsInRace.get(i).getCurrentLeg().getLegNumber()==0){
+                        // adjust boats latest point on X axis
+                        sparklineChart.getData().get(j).getData().get(1)
+                                .setXValue(sparkLineNumber);
+                    }
+
+                    // when a boat first enters its second leg
+                    else if (boatsInRace.get(i).getCurrentLeg().getLegNumber
+                            ()==1 && sparklineChart.getData().get(j).getData
+                            ().size()==2){
+                        // adjust boats position from start mark
+                        sparklineChart.getData().get(j).getData().get(1)
+                                .setYValue(-placingVal);
+                        sparklineChart.getData().get(j).getData().get(1)
+                                .setXValue(sparkLineNumber);
+                        sparklineChart.getData().get(j).getData().add(new XYChart.Data<>
+                                (sparkLineNumber, -placingVal));
+                    }
+
+                    // plot new point for boats current position
+                    else {
+                        sparklineChart.getData().get(j).getData().add
+                                (new XYChart.Data<>(sparkLineNumber, -placingVal));
+                    }
+                    placingVal-=1;
+                }
+            }
+        }
+//        xAxis.setUpperBound(sparkLineNumber);
+//        xAxis.setTickUnit(sparkLineNumber);
+    }
+
+    private void makeColours() {
+        colours = new ArrayList<>(Arrays.asList(
+                colourToHex(Color.BLUEVIOLET),
+                colourToHex(Color.BLACK),
+                colourToHex(Color.RED),
+                colourToHex(Color.ORANGE),
+                colourToHex(Color.DARKOLIVEGREEN),
+                colourToHex(Color.LIMEGREEN),
+                colourToHex(Color.PURPLE),
+                colourToHex(Color.DARKGRAY),
+                colourToHex(Color.YELLOW)
+        ));
+    }
+
+    private void mapBoatColours() {
+        int currentColour = 0;
+        for (Boat boat : startBoats) {
+            if (!boatColours.containsKey(boat.getSourceID())) {
+                boatColours.put(boat.getSourceID(), colours.get(currentColour));
+            }
+            currentColour = (currentColour + 1) % colours.size();
+        }
+    }
+
+
     private void storeCurrentAnnotationState(){
         annoShownBeforeHide.put(nameCheckAnno, showName.isSelected());
         annoShownBeforeHide.put(abbrevCheckAnno, showAbbrev.isSelected());
@@ -281,6 +450,10 @@ public class RaceController extends Controller {
             raceMap.update();
             prevBtnChecked = noBtn;
         });
+        showTime.selectedProperty().addListener((ov, old_val, new_val) -> {
+            raceMap.toggleAnnoTime();
+            raceMap.update();
+        });
         //listener to save currently selected annotation
         saveAnno.setOnAction(event -> {
             presetAnno.clear();
@@ -288,6 +461,7 @@ public class RaceController extends Controller {
             presetAnno.add(showAbbrev.isSelected());
             presetAnno.add(showSpeed.isSelected());
             presetAnno.add(showBoatPath.isSelected());
+            presetAnno.add(showTime.isSelected());
         });
         //listener for hiding
         hideAnnoRBTN.selectedProperty().addListener((ov, old_val, new_val) ->{
@@ -334,6 +508,7 @@ public class RaceController extends Controller {
                 showAbbrev.setSelected(presetAnno.get(1));
                 showSpeed.setSelected(presetAnno.get(2));
                 showBoatPath.setSelected(presetAnno.get(3));
+                showTime.setSelected(presetAnno.get(4));
                 annotationGroup.selectToggle(importantAnnoRBTN);
                 raceMap.update();
             }
@@ -342,4 +517,19 @@ public class RaceController extends Controller {
         });
         annotationGroup.selectToggle(showAnnoRBTN);
     }
+
+    private String colourToHex(Color color) {
+        return String.format( "#%02X%02X%02X",
+                (int)( color.getRed() * 255 ),
+                (int)( color.getGreen() * 255 ),
+                (int)( color.getBlue() * 255 ) );
+    }
+
+    private void makeArrow() {
+        arrowPane.getChildren().add(arrow);
+    }
+
+    public RaceClock getRaceClock() {
+        return raceClock;
+    }
 }

visualiser/src/main/java/seng302/Controllers/StartController.java

@@ -54,11 +54,14 @@ public class StartController extends Controller implements Observer {
     ///Tracks whether the race has been started (that is, has startRaceNoScaling() be called).
     private boolean hasRaceStarted = false;
 
+    //Tracks whether or not a clock has been created and setup, which occurs after receiving enough information.
+    private boolean hasCreatedClock = false;
+
     /**
      * Begins the race with a scale factor of 1
      */
     private void startRaceNoScaling() {
-        while(visualiserInput.getRaceStatus() == null);//TODO probably remove this.
+        //while(visualiserInput.getRaceStatus() == null);//TODO probably remove this.
 
         countdownTimer();
     }
@@ -112,7 +115,14 @@ public class StartController extends Controller implements Observer {
      */
     private void setRaceClock() {
         raceClock = new RaceClock(raceData.getZonedDateTime());
-        timeZoneTime.textProperty().bind(raceClock.timeStringProperty());
+
+        raceClock.timeStringProperty().addListener((observable, oldValue, newValue) -> {
+            Platform.runLater(() -> {
+                timeZoneTime.setText(newValue);
+            });
+        });
+//TEMP REMOVE
+        //timeZoneTime.textProperty().bind(raceClock.timeStringProperty());
         raceClock.run();
     }
 
@@ -125,7 +135,12 @@ public class StartController extends Controller implements Observer {
             long utcTime = visualiserInput.getRaceStatus().getExpectedStartTime();
             raceClock.setStartingTime(raceClock.getLocalTime(utcTime));
             raceStartLabel.setText(DateTimeFormatter.ofPattern(dateFormat).format(raceClock.getStartingTime()));
-            timer.textProperty().bind(raceClock.durationProperty());
+
+            raceClock.durationProperty().addListener((observable, oldValue, newValue) -> {
+                Platform.runLater(() -> {
+                    timer.setText(newValue);
+                });
+            });
         });
     }
 
@@ -150,12 +165,15 @@ public class StartController extends Controller implements Observer {
             }
             if (streamedCourse.hasReadCourse()) {
                 Platform.runLater(() -> {
-                    setRaceClock();
-                    if(visualiserInput.getRaceStatus() == null){
-                        return;//TEMP BUG FIX if the race isn't sending race status messages (our mock currently doesn't), then it would block the javafx thread with the previous while loop.
-                    }// TODO - replace with observer on VisualiserInput
-                    setStartingTime();
-                    setCurrentTime();
+                    if (!this.hasCreatedClock) {
+                        this.hasCreatedClock = true;
+                        setRaceClock();
+                        if (visualiserInput.getRaceStatus() == null) {
+                            return;//TEMP BUG FIX if the race isn't sending race status messages (our mock currently doesn't), then it would block the javafx thread with the previous while loop.
+                        }// TODO - replace with observer on VisualiserInput
+                        setStartingTime();
+                        setCurrentTime();
+                    }
                 });
             }
 

visualiser/src/main/java/seng302/Mock/BoatXMLReader.java

@@ -97,6 +97,7 @@ public class BoatXMLReader extends XMLReader {
     /**
      * Reads the information about one boat
      * Ignored values: ShapeID, StoweName, HullNum, Skipper, Type
+     * @param boat The node to read boat data from.
      */
     private void readSingleBoat(Node boat) {
         StreamedBoat streamedBoat;
@@ -127,9 +128,12 @@ public class BoatXMLReader extends XMLReader {
         }
     }
 
+
     /**
      * Reads the positional information about a boat
      * Ignored values: FlagPosition, MastTop, Z value of GPSposition
+     * @param sourceID The source ID of the boat.
+     * @param GPSPosition The relative GPS position of the boat.
      */
     private void readBoatPositionInformation(int sourceID, Node GPSPosition) {
         // TODO Get relative point before implementing. (GPSposition is based off a relative point).

visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java

@@ -125,6 +125,7 @@ public class StreamedCourseXMLReader extends XMLReader {
 
     /**
      * Indexes CompoundMark elements by their ID for use in generating the course, and populates list of Markers.
+     * @throws StreamedCourseXMLException if a CompoundMark element contains an unhandled number of compoundMarks.
      * @see seng302.Model.Marker
      */
     private void readCompoundMarks() throws StreamedCourseXMLException {

visualiser/src/main/java/seng302/Mock/StreamedRace.java

@@ -55,7 +55,8 @@ public class StreamedRace implements Runnable {
             if (boat != null) {
                 Leg startLeg = new Leg(name, 0);
                 startLeg.setEndMarker(endCompoundMark);
-                boat.setCurrentLeg(startLeg);
+                boat.setCurrentLeg(startLeg, controller.getRaceClock());
+                boat.setTimeSinceLastMark(controller.getRaceClock().getTime());
             }
         }
     }
@@ -76,6 +77,7 @@ public class StreamedRace implements Runnable {
      * @param timeElapsed Time that has elapse since the start of the the race.
      */
     private void checkPosition(Boat boat, long timeElapsed) {
+        boolean legChanged = false;
         StreamedCourse raceData = visualiserInput.getCourse();
         BoatStatus boatStatusMessage = visualiserInput.getBoatStatusMap().get(boat.getSourceID());
         if (boatStatusMessage != null) {
@@ -83,8 +85,12 @@ public class StreamedRace implements Runnable {
 
             int legNumber = boatStatusMessage.getLegNumber();
 
+
             if (legNumber >= 1 && legNumber < legs.size()) {
-                boat.setCurrentLeg(legs.get(legNumber));
+                if (boat.getCurrentLeg() != legs.get(legNumber)){
+                    boat.setCurrentLeg(legs.get(legNumber), controller.getRaceClock());
+                    legChanged = true;
+                }
             }
 
             if (boatStatusEnum == BoatStatusEnum.RACING) {
@@ -95,11 +101,13 @@ public class StreamedRace implements Runnable {
                 boatsFinished++;
                 boat.setTimeFinished(timeElapsed);
                 boat.setFinished(true);
-                //System.out.println("Boat finished");
             }
         }
-        //Update the boat display table in the GUI to reflect the leg change
-        updatePositions();
+        if (legChanged) {
+            //Update the boat display table in the GUI to reflect the leg change
+            updatePositions();
+            controller.updateSparkline(startingBoats);
+        }
     }
 
     /**
@@ -153,6 +161,7 @@ public class StreamedRace implements Runnable {
      */
     public void run() {
         setControllerListeners();
+        Platform.runLater(() -> controller.createSparkLine(startingBoats));
         initialiseBoats();
         startRaceStream();
     }

visualiser/src/main/java/seng302/Model/Boat.java

@@ -6,6 +6,7 @@ import org.geotools.referencing.GeodeticCalculator;
 import seng302.GPSCoordinate;
 
 import java.awt.geom.Point2D;
+import java.time.ZonedDateTime;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
@@ -31,6 +32,8 @@ public class Boat {
     private final Queue<TrackPoint> track = new ConcurrentLinkedQueue<>();
     private long nextValidTime = 0;
 
+    private ZonedDateTime timeSinceLastMark;
+
     /**
      * Boat initializer which keeps all of the information of the boat.
      *
@@ -66,7 +69,7 @@ public class Boat {
      */
     public GPSCoordinate getWake() {
         double reverseHeading = getHeading() - 180;
-        double wakeScale = 3;
+        double wakeScale = 5;
         double distance = wakeScale * getVelocity();
 
         GeodeticCalculator calc = new GeodeticCalculator();
@@ -181,9 +184,10 @@ public class Boat {
         return currentLeg;
     }
 
-    public void setCurrentLeg(Leg currentLeg) {
+    public void setCurrentLeg(Leg currentLeg, RaceClock raceClock) {
         this.currentLeg = currentLeg;
         this.currentLegName.setValue(currentLeg.getName());
+        this.setTimeSinceLastMark(raceClock.getTime());
     }
 
     public boolean isFinished() {
@@ -236,4 +240,12 @@ public class Boat {
     public void setDnf(boolean dnf) {
         this.dnf = dnf;
     }
+
+    public ZonedDateTime getTimeSinceLastMark() {
+        return timeSinceLastMark;
+    }
+
+    public void setTimeSinceLastMark(ZonedDateTime timeSinceLastMark) {
+        this.timeSinceLastMark = timeSinceLastMark;
+    }
 }

visualiser/src/main/java/seng302/Model/RaceClock.java

@@ -59,6 +59,8 @@ public class RaceClock implements Runnable {
         this.time = time;
         this.timeString.set(DateTimeFormatter.ofPattern("HH:mm:ss dd/MM/YYYY Z").format(time));
         this.lastTime = System.currentTimeMillis();
+
+
         if(startingTime != null) {
             long seconds = Duration.between(startingTime.toLocalDateTime(), time.toLocalDateTime()).getSeconds();
             if(seconds < 0)
@@ -66,6 +68,7 @@ public class RaceClock implements Runnable {
             else
                 duration.set(String.format("Time: %02d:%02d:%02d", seconds/3600, (seconds%3600)/60, seconds%60));
         }
+
     }
 
     /**

visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java

@@ -1,6 +1,8 @@
 package seng302.Model;
 
 
+import javafx.scene.Node;
+import javafx.scene.layout.Pane;
 import javafx.collections.ObservableList;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
@@ -10,9 +12,11 @@ import seng302.Mock.StreamedCourse;
 import seng302.RaceDataSource;
 import seng302.RaceMap;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.time.Duration;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+import java.util.*;
 
 /**
  * This creates a JavaFX Canvas that is fills it's parent.
@@ -27,9 +31,14 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     private boolean annoAbbrev = true;
     private boolean annoSpeed = true;
     private boolean annoPath = true;
+    private boolean annoTimeSinceLastMark = true;
     private List<Color> colours;
     private final List<Marker> markers;
     private final RaceDataSource raceData;
+    private Map<Integer, Color> boatColours = new HashMap<>();
+    private Node arrow;
+
+    private RaceClock raceClock;
 
     public ResizableRaceCanvas(RaceDataSource raceData) {
         super();
@@ -53,6 +62,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      */
     public void setBoats(List<Boat> boats) {
         this.boats = boats;
+        mapBoatColours();
     }
 
 
@@ -139,6 +149,13 @@ public class ResizableRaceCanvas extends ResizableCanvas {
         gc.restore();
     }
 
+    private void displayFancyArrow(GraphCoordinate coordinate, double angle) {
+        angle = angle % 360;
+        if (arrow != null && arrow.getRotate() != angle) {
+            arrow.setRotate(angle);
+        }
+    }
+
     /**
      * Rotates things on the canvas Note: this must be called in between gc.save() and gc.restore() else they will rotate everything
      *
@@ -158,8 +175,9 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      * @param abbrev     abbreviation of the boat name
      * @param speed      speed of the boat
      * @param coordinate coordinate the text appears
+     * @param timeSinceLastMark time since the last mark was passed
      */
-    private void displayText(String name, String abbrev, double speed, GraphCoordinate coordinate) {
+    private void displayText(String name, String abbrev, double speed, GraphCoordinate coordinate, ZonedDateTime timeSinceLastMark) {
         String text = "";
         //Check name toggle value
         if (annoName){
@@ -171,7 +189,12 @@ public class ResizableRaceCanvas extends ResizableCanvas {
         }
         //Check speed toggle value
         if (annoSpeed){
-            text += String.format("%.2fkn", speed);
+            text += String.format("%.2fkn ", speed);
+        }
+        //Check time since last mark toggle value
+        if(annoTimeSinceLastMark){
+            Duration timeSince = Duration.between(timeSinceLastMark, raceClock.getTime());
+            text += String.format("%d",  timeSince.getSeconds());
         }
         //String text = String.format("%s, %2$.2fkn", name, speed);
         long xCoord = coordinate.getX() + 20;
@@ -233,9 +256,9 @@ public class ResizableRaceCanvas extends ResizableCanvas {
 
         //display wind direction arrow - specify origin point and angle - angle now set to random angle
         if (raceData instanceof StreamedCourse) {
-            displayArrow(new GraphCoordinate((int) getWidth() - 40, 40), ((StreamedCourse) raceData).getWindDirection());
+            displayFancyArrow(new GraphCoordinate((int) getWidth() - 40, 40), ((StreamedCourse) raceData).getWindDirection());
         } else {
-            displayArrow(new GraphCoordinate((int) getWidth() - 40, 40), 150);
+            displayFancyArrow(new GraphCoordinate((int) getWidth() - 40, 40), 150);
         }
     }
 
@@ -248,12 +271,17 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     }
 
     /**
-     * Toggles the path of the boat
+     * Toggle boat path display in annotation
      */
     public void toggleBoatPath() {
         annoPath = !annoPath;
     }
 
+    /**
+     * Toggle boat time display in annotation
+     */
+    public void toggleAnnoTime() { annoTimeSinceLastMark = !annoTimeSinceLastMark;}
+
     /**
      * Toggle abbreviation display in annotation
      */
@@ -272,26 +300,29 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      * Draws boats while race in progress, when leg heading is set.
      */
     private void updateBoats() {
-        int currentColour = 0;
         if (boats != null) {
+            if (boatColours.size() < boats.size()) mapBoatColours();
             for (Boat boat : boats) {
                 boolean finished = boat.getCurrentLeg().getName().equals("Finish") || boat.getCurrentLeg().getName().equals("DNF");
                 boolean isStart = boat.isStarted();
+                int sourceID = boat.getSourceID();
                 if (!finished && isStart) {
-                    displayBoat(boat, boat.getHeading(), colours.get(currentColour));
+                    displayBoat(boat, boat.getHeading(), boatColours.get(sourceID));
                     GraphCoordinate wakeFrom = this.map.convertGPS(boat.getCurrentPosition());
                     GraphCoordinate wakeTo = this.map.convertGPS(boat.getWake());
-                    displayLine(wakeFrom, wakeTo, colours.get(currentColour));
+                    displayLine(wakeFrom, wakeTo, boatColours.get(sourceID));
                 } else if (!isStart) {
-                    displayBoat(boat, boat.getHeading(), colours.get(currentColour));
+                    displayBoat(boat, boat.getHeading(), boatColours.get(sourceID));
                 } else {
-                    displayBoat(boat, 0, colours.get(currentColour));
+                    displayBoat(boat, 0, boatColours.get(sourceID));
                 }
 
-                displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()));
+                if (Duration.between(boat.getTimeSinceLastMark(), raceClock.getTime()).getSeconds() < 0) {
+                    boat.setTimeSinceLastMark(raceClock.getTime());
+                }
+                displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()), boat.getTimeSinceLastMark());
                 //TODO this needs to be fixed.
-                drawTrack(boat, colours.get(currentColour));
-                currentColour = (currentColour + 1) % colours.size();
+                drawTrack(boat, boatColours.get(sourceID));
             }
         }
     }
@@ -299,6 +330,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     /**
      * Draws all track points for a given boat. Colour is set by boat, opacity by track point.
      * @param boat whose track is displayed
+     * @param colour The color to use for the track.
      * @see seng302.Model.TrackPoint
      */
     private void drawTrack(Boat boat, Color colour) {
@@ -328,4 +360,22 @@ public class ResizableRaceCanvas extends ResizableCanvas {
         ));
     }
 
-}
+    public void setArrow(Node arrow) {
+        this.arrow = arrow;
+    }
+
+    public void setRaceClock(RaceClock raceClock) {
+        this.raceClock = raceClock;
+    }
+
+    private void mapBoatColours() {
+        int currentColour = 0;
+        for (Boat boat : boats) {
+            if (!boatColours.containsKey(boat.getSourceID())) {
+                boatColours.put(boat.getSourceID(), colours.get(currentColour));
+            }
+            currentColour = (currentColour + 1) % colours.size();
+        }
+    }
+
+}

visualiser/src/main/java/seng302/VisualiserInput.java

@@ -148,6 +148,7 @@ public class VisualiserInput implements Runnable {
 
     /**
      * Sets the wind direction for the current course.
+     * @param direction The new wind direction for the course.
      */
     private void setCourseWindDirection(double direction) {
         this.course.setWindDirection(direction);
@@ -287,7 +288,7 @@ public class VisualiserInput implements Runnable {
                  for (BoatStatus boatStatus: this.raceStatus.getBoatStatuses()) {
                      this.boatStatusMap.put(boatStatus.getSourceID(), boatStatus);
                  }
-                 setCourseWindDirection(raceStatus.getScaledWindDirection() + 180);
+                 setCourseWindDirection(raceStatus.getScaledWindDirection());
              }
              //DisplayTextMessage.
              /*else if (message instanceof DisplayTextMessage) {

visualiser/src/main/resources/scenes/arrow.fxml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.paint.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.shape.*?>
+<?import javafx.scene.image.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<Pane fx:id="compass" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="125.0" prefWidth="125.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <StackPane fx:id="arrow" prefHeight="125.0" prefWidth="125.0">
+         <children>
+            <ImageView fitHeight="75.0" fitWidth="75.0">
+               <image>
+                  <Image url="@../images/arrow.png" />
+               </image>
+            </ImageView>
+         </children>
+      </StackPane>
+      <Circle fill="#1f93ff00" layoutX="63.0" layoutY="63.0" radius="60.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" />
+      <Label layoutX="55.0" layoutY="1.0" text="N">
+         <font>
+            <Font name="System Bold" size="18.0" />
+         </font>
+      </Label>
+      <Label layoutX="42.0" layoutY="99.0" text="Wind">
+         <font>
+            <Font name="System Bold" size="16.0" />
+         </font>
+      </Label>
+   </children>
+</Pane>

visualiser/src/main/resources/scenes/race.fxml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.chart.*?>
 <?import java.lang.*?>
 <?import javafx.geometry.*?>
 <?import javafx.scene.text.*?>
@@ -8,7 +9,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 
-<SplitPane fx:id="race" dividerPositions="0.7" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.RaceController">
+<SplitPane fx:id="race" dividerPositions="0.7" prefHeight="431.0" prefWidth="610.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.RaceController">
     <items>
         <GridPane fx:id="canvasBase">
             <columnConstraints>
@@ -18,7 +19,8 @@
                 <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
             </rowConstraints>
             <children>
-                <Pane prefHeight="280.0" prefWidth="400.0" GridPane.halignment="LEFT" GridPane.valignment="TOP">
+                <fx:include fx:id="arrow" source="arrow.fxml" />
+                <Pane prefHeight="200.0" prefWidth="400.0" GridPane.halignment="LEFT" GridPane.valignment="TOP">
                     <children>
                         <Accordion>
                             <panes>
@@ -30,7 +32,8 @@
                                                 <CheckBox fx:id="showAbbrev" layoutY="61.0" mnemonicParsing="false" selected="true" text="Show Boat Abbreviation" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="25.0" />
                                                 <CheckBox fx:id="showSpeed" layoutY="90.0" mnemonicParsing="false" selected="true" text="Show Boat Speed" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="50.0" />
                                                 <CheckBox fx:id="showBoatPath" mnemonicParsing="false" selected="true" text="Show Boat Paths" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="75.0" />
-                                    <Separator prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="100.0" />
+                                                <CheckBox fx:id="showTime" mnemonicParsing="false" selected="true" text="Show Boat Leg Time" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="130.0" />
+                                                <Separator prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="100.0" />
                                     <Label text="Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="105.0" />
                                     <RadioButton fx:id="hideAnnoRBTN" mnemonicParsing="false" text="Hidden" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="130.0" />
                                     <RadioButton fx:id="showAnnoRBTN" mnemonicParsing="false" text="Visible" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="155.0" />
@@ -72,11 +75,12 @@
                         <Font name="System Bold" size="15.0" />
                     </font>
                 </Label>
+                <StackPane fx:id="arrowPane" alignment="TOP_RIGHT" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false" />
             </children>
         </GridPane>
         <AnchorPane layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" GridPane.columnIndex="1">
             <children>
-                <TableView fx:id="boatInfoTable" layoutX="-2.0" prefHeight="600.0" prefWidth="264.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="-62.0" AnchorPane.topAnchor="0.0">
+                <TableView fx:id="boatInfoTable" layoutX="-2.0" prefHeight="265.0" prefWidth="242.0" AnchorPane.bottomAnchor="164.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="-62.0" AnchorPane.topAnchor="0.0">
                     <columns>
                         <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
                         <TableColumn fx:id="boatTeamColumn" prefWidth="100.0" text="Team" />
@@ -84,6 +88,18 @@
                         <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
                     </columns>
                 </TableView>
+                <AnchorPane layoutY="265.0" prefHeight="167.0" prefWidth="178.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                    <children>
+                        <LineChart fx:id="sparklineChart" layoutX="-211.0" layoutY="-186.0" mouseTransparent="true" prefHeight="167.0" prefWidth="178.0" titleSide="LEFT" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                            <xAxis>
+                                <NumberAxis side="BOTTOM" fx:id="xAxis" />
+                            </xAxis>
+                            <yAxis>
+                                <NumberAxis fx:id="yAxis" side="LEFT" />
+                            </yAxis>
+                        </LineChart>
+                    </children>
+                </AnchorPane>
             </children>
         </AnchorPane>
     </items>