From ac3f3bfd5586128d71424de3c28833f781d7aecd Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Thu, 4 May 2017 14:32:06 +1200
Subject: [PATCH 01/36] Added a check if race started, then start screen
 switches to race view automatically.

 #story[572]
---
 src/main/java/seng302/controllers/Controller.java         | 4 ++++
 src/main/java/seng302/controllers/RaceViewController.java | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index 7d45d39b..9d964243 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -89,6 +89,10 @@ public class Controller implements Initializable {
                 @Override
                 public void run() {
                     Platform.runLater(() -> {
+                        if (StreamParser.isRaceStarted()) {
+                            switchToRaceView();
+                            timer.cancel();
+                        }
                         if (StreamParser.isRaceFinished()) {
                             realTime.setText(StreamParser.getCurrentTimeString());
                             timeTillLive.setTextFill(Color.RED);
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 3b7ee6b5..12069084 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -309,7 +309,6 @@ public class RaceViewController extends Thread{
 //        }
 
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
-            System.out.println(boat.getBoatStatus());
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 positionVbox.getChildren().add(new Text(boat.getPosition() + ". " +
                         boat.getShortName() + " (Finished)"));

From 4a75c062cee0f6bcb9c479c6338479e186bb6ffe Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 11 May 2017 15:49:49 +1200
Subject: [PATCH 02/36] Making the course limits change when a new xml packet
 is received.. #story[889]

---
 src/main/java/seng302/App.java                    |  4 +++-
 .../seng302/controllers/CanvasController.java     | 12 ++++++++++++
 .../java/seng302/models/parsers/StreamParser.java | 15 +++++++++++++++
 src/main/resources/views/RaceView.fxml            |  5 +++--
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..960511f8 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,7 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 8fc7ed54..bcdcc0c5 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -240,6 +240,17 @@ public class CanvasController {
                 }
             }
         }
+        checkForCourseChanges();
+    }
+
+    private void checkForCourseChanges() {
+        if (StreamParser.isNewXmlRecieved()){
+            System.out.println("New Canvas found");
+            gc.setFill(Color.SKYBLUE);
+            gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
+            gc.restore();
+            addRaceBorder();
+        }
     }
 
     private void move(long id, RaceObject raceObject){
@@ -345,6 +356,7 @@ public class CanvasController {
      * Calculates x and y location for every marker that fits it to the canvas the race will be drawn on.
      */
     private void fitMarksToCanvas() {
+        StreamParser.isNewXmlRecieved();
         findMinMaxPoint();
         double minLonToMaxLon = scaleRaceExtremities();
         calculateReferencePointLocation(minLonToMaxLon);
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..9260ae9e 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -31,6 +31,7 @@ public class StreamParser extends Thread{
      public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatPositions = new ConcurrentHashMap<>();
      private String threadName;
      private Thread t;
+     private static boolean newXmlRecieved = false;
      private static boolean raceStarted = false;
      private static XMLParser xmlObject;
      private static boolean raceFinished = false;
@@ -122,6 +123,8 @@ public class StreamParser extends Thread{
                      extractDisplayMessage(packet);
                      break;
                  case XML_MESSAGE:
+                     System.out.println("XML MESSAGE GOT");
+                     newXmlRecieved = true;
                      extractXmlMessage(packet);
                      break;
                  case RACE_START_STATUS:
@@ -313,6 +316,9 @@ public class StreamParser extends Thread{
         if (messageType == 7) {   //7 is the boat XML
             boats = xmlObject.getBoatXML().getCompetingBoats();
         }
+        if (messageType == 6) { //6 is race info xml
+            newXmlRecieved = true;
+        }
     }
 
     /**
@@ -579,5 +585,14 @@ public class StreamParser extends Thread{
         appRunning = false;
         System.out.println("[CLIENT] Shutting down stream parser");
     }
+
+    public static boolean isNewXmlRecieved(){
+        if (newXmlRecieved){
+            newXmlRecieved = false;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
 
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 3c148485..8a0c40a5 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -7,6 +7,7 @@
 <?import javafx.scene.text.*?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Slider?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
@@ -35,9 +36,9 @@
                 <Label layoutX="11.0" layoutY="14.0" text="Timer" />
                 <Label layoutX="11.0" layoutY="88.0" text="Wind direction" />
                 <Circle fx:id="windBackgroundCircle" blendMode="DARKEN" fill="#76baf8" layoutX="110.0" layoutY="166.0" radius="35.0" stroke="#686868" strokeType="INSIDE" strokeWidth="3.0" />
-                <Text fx:id="windArrowText" fill="#686868" layoutX="86.0" layoutY="186.0" strokeType="OUTSIDE" strokeWidth="0.0" text="↑">
+                <Text fx:id="windArrowText" fill="#686868" layoutX="96.0" layoutY="186.0" strokeType="OUTSIDE" strokeWidth="0.0" text="↑" wrappingWidth="27.5">
                     <font>
-                        <Font name="AdobeArabic-Regular" size="55.0" />
+                        <Font name="Arial Black" size="55.0" />
                     </font>
                 </Text>
                 <Text fx:id="windDirectionText" fill="#a8a7a7" layoutX="171.0" layoutY="214.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0.0°" textAlignment="RIGHT">

From a23bdd0c53508c6cf1b50aa9204ec42d53475369 Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Thu, 11 May 2017 21:42:29 +1200
Subject: [PATCH 03/36] Added functionality to select important annotations and
 ui changes

- Added CSS for the race view & welcome screen
- Added view to select important annotations
- Annotations are enabled/disabled when the user changes the important annotations

Tags: #story[926]
---
 .../java/seng302/controllers/Controller.java  |   9 +-
 .../ImportantAnnotationController.java        | 125 +++++++++++++
 .../controllers/RaceViewController.java       | 109 ++++++++++--
 src/main/resources/css/master.css             | 166 ++++++++++++++++++
 src/main/resources/views/MainView.fxml        |  24 +--
 src/main/resources/views/RaceView.fxml        |  27 +--
 .../views/importantAnnotationSelectView.fxml  |  29 +++
 7 files changed, 446 insertions(+), 43 deletions(-)
 create mode 100644 src/main/java/seng302/controllers/ImportantAnnotationController.java
 create mode 100644 src/main/resources/css/master.css
 create mode 100644 src/main/resources/views/importantAnnotationSelectView.fxml

diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index 9d964243..faa67cc4 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -18,12 +18,8 @@ import seng302.models.Yacht;
 import seng302.models.parsers.StreamParser;
 import seng302.models.parsers.XMLParser;
 
-
 import java.io.IOException;
 import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
 import java.util.ResourceBundle;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -56,6 +52,7 @@ public class Controller implements Initializable {
         try{
             contentPane.getChildren().removeAll();
             contentPane.getChildren().clear();
+            contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
             contentPane.getChildren().addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
         }
         catch(javafx.fxml.LoadException e){
@@ -71,6 +68,8 @@ public class Controller implements Initializable {
         //DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         //format.setTimeZone(TimeZone.getTimeZone("GMT-8"));
         //realTime.setText(format.format(new Date()));
+        contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+        teamList.getStylesheets().add(getClass().getResource("/css/master.css").toString());
     }
 
     /**
@@ -138,7 +137,9 @@ public class Controller implements Initializable {
 
     private void updateTeamList() {
         ObservableList<Yacht> data = FXCollections.observableArrayList();
+
         teamList.setItems(data);
+
         boatNameCol.setCellValueFactory(
                 new PropertyValueFactory<>("boatName")
         );
diff --git a/src/main/java/seng302/controllers/ImportantAnnotationController.java b/src/main/java/seng302/controllers/ImportantAnnotationController.java
new file mode 100644
index 00000000..e1a031cf
--- /dev/null
+++ b/src/main/java/seng302/controllers/ImportantAnnotationController.java
@@ -0,0 +1,125 @@
+package seng302.controllers;
+
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.layout.AnchorPane;
+import javafx.stage.Stage;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+public class ImportantAnnotationController implements Initializable {
+    /*
+     * JavaFX Outlets
+     */
+    @FXML
+    private CheckBox boatWakeSelect;
+
+    @FXML
+    private CheckBox boatSpeedSelect;
+
+    @FXML
+    private CheckBox boatTrackSelect;
+
+    @FXML
+    private CheckBox boatNameSelect;
+
+    @FXML
+    private AnchorPane annotationSelectWindow;
+
+    @FXML
+    private Button closeButton;
+
+    private RaceViewController parent;
+    private Map<String, Boolean> importantAnnotations;
+    private Stage stage;
+
+    ImportantAnnotationController(RaceViewController parent, Stage stage){
+        this.parent = parent;
+        importantAnnotations = new HashMap<>();
+        this.stage = stage;
+    }
+
+    /**
+     * Sets whether or not an annotation is considered important
+     * @param name The annotation name
+     * @param isSet True if annotation is important
+     */
+    private void setAnnotation(String name, Boolean isSet){
+        importantAnnotations.put(name, isSet);
+    }
+
+    /**
+     * Sends an update to the parent controller when the important
+     * annotations have changed
+     */
+    private void sendUpdate(){
+        this.parent.importantAnnotationsChanged(this.importantAnnotations);
+    }
+
+    /**
+     * Load the current state of the 'important annotations'
+     * @param currentState hashmap containing the states of each annotation
+     */
+    void loadState(Map<String, Boolean> currentState){
+        this.importantAnnotations = currentState;
+
+        // Initialise checkboxes
+        for (String key : importantAnnotations.keySet()){
+            switch (key){
+                case "BoatWake":
+                    boatWakeSelect.setSelected(importantAnnotations.get(key));
+                    break;
+
+                case "BoatSpeed":
+                    boatSpeedSelect.setSelected(importantAnnotations.get(key));
+                    break;
+
+                case "BoatTrack":
+                    boatTrackSelect.setSelected(importantAnnotations.get(key));
+                    break;
+
+                case "BoatName":
+                    boatNameSelect.setSelected(importantAnnotations.get(key));
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    }
+
+    /**
+     * View did load
+     * @param location .
+     * @param resources .
+     */
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        boatWakeSelect.setOnAction(event -> {
+            setAnnotation("BoatWake", boatWakeSelect.isSelected());
+            sendUpdate();
+        });
+
+        boatSpeedSelect.setOnAction(event -> {
+            setAnnotation("BoatSpeed", boatSpeedSelect.isSelected());
+            sendUpdate();
+        });
+
+        boatTrackSelect.setOnAction(event -> {
+            setAnnotation("BoatTrack", boatTrackSelect.isSelected());
+            sendUpdate();
+        });
+
+        boatNameSelect.setOnAction(event -> {
+            setAnnotation("BoatName", boatNameSelect.isSelected());
+            sendUpdate();
+        });
+
+        closeButton.setOnAction(event -> stage.close());
+    }
+}
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 12069084..433e47a2 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,26 +1,27 @@
 package seng302.controllers;
 
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Slider;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
 import seng302.models.*;
-import seng302.models.parsers.ConfigParser;
 import seng302.models.parsers.StreamParser;
 
 import java.io.IOException;
@@ -43,6 +44,8 @@ public class RaceViewController extends Thread{
     @FXML
     private Slider annotationSlider;
     @FXML
+    private Button selectAnnotationBtn;
+    @FXML
     private CanvasController includedCanvasController;
 
     private ArrayList<Yacht> startingBoats = new ArrayList<>();
@@ -52,6 +55,8 @@ public class RaceViewController extends Thread{
     private ArrayList<Yacht> boatOrder = new ArrayList<>();
     private Race race;
     private Stage stage;
+    private Integer annotationLevel;
+    private Map<String, Boolean> importantAnnotations = new HashMap<>();
 
     public void initialize() {
 
@@ -79,9 +84,53 @@ public class RaceViewController extends Thread{
 //        windDirectionText.setText(String.format("%.1f°", windDirection));
 //        windArrowText.setRotate(windDirection);
         includedCanvasController.timer.start();
+
+        selectAnnotationBtn.setOnAction(event -> {
+            loadSelectAnnotationView();
+        });
     }
 
+    /**
+     * Important annotations have been changed, update this view
+     * @param newImportantAnnotations HashMap containing whether or not annotations
+     *                                are important
+     */
+    void importantAnnotationsChanged(Map<String, Boolean> newImportantAnnotations){
+        this.importantAnnotations = newImportantAnnotations;
+        setAnnotations((int)annotationSlider.getValue());
+    }
 
+    /**
+     * Loads the "select annotations" view in a new window
+     */
+    private void loadSelectAnnotationView() {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader();
+            Stage stage = new Stage();
+
+            // Set controller
+            ImportantAnnotationController controller = new ImportantAnnotationController(this, stage);
+            fxmlLoader.setController(controller);
+
+            // Load FXML and set CSS
+            fxmlLoader.setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 469, 248);
+            scene.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+            stage.initStyle(StageStyle.UNDECORATED);
+
+            stage.setScene(scene);
+            stage.show();
+
+            controller.loadState(importantAnnotations);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    Map<String, Boolean> getImportantAnnotations(){
+        return importantAnnotations;
+    }
 
     private void initializeSettings() {
         displayFps = true;
@@ -93,13 +142,13 @@ public class RaceViewController extends Thread{
             }
         });
 
-        //SLIFER STUFF BELOW
+        //SLIDER STUFF BELOW
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
             public String toString(Double n) {
                 if (n == 0) return "None";
                 if (n == 1) return "Low";
-                if (n == 2) return "Medium";
+                if (n == 2) return "Important";
                 if (n == 3) return "All";
 
                 return "All";
@@ -112,7 +161,7 @@ public class RaceViewController extends Thread{
                         return 0d;
                     case "Low":
                         return 1d;
-                    case "Medium":
+                    case "Important":
                         return 2d;
                     case "All":
                         return 3d;
@@ -303,6 +352,7 @@ public class RaceViewController extends Thread{
     private void showOrder() {
         positionVbox.getChildren().clear();
         positionVbox.getChildren().removeAll();
+        positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
 
 //        for (Boat boat : boatOrder) {
 //            positionVbox.getChildren().add(new Text(boat.getShortName() + " " + boat.getSpeedInKnots() + " Knots"));
@@ -310,11 +360,17 @@ public class RaceViewController extends Thread{
 
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
-                positionVbox.getChildren().add(new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " (Finished)"));
+                Text textToAdd = new Text(boat.getPosition() + ". " +
+                        boat.getShortName() + " (Finished)");
+                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+                positionVbox.getChildren().add(textToAdd);
+
             } else {
-                positionVbox.getChildren().add(new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " "));
+                Text textToAdd = new Text(boat.getPosition() + ". " +
+                        boat.getShortName() + " ");
+                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+                textToAdd.setStyle("");
+                positionVbox.getChildren().add(textToAdd);
             }
 
         }
@@ -401,14 +457,39 @@ public class RaceViewController extends Thread{
                     }
                 }
                 break;
+            // Important Annotations
             case 2:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
                     if(ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
-                        bg.setTeamNameObjectVisible(true);
-                        bg.setVelocityObjectVisible(false);
-                        bg.setLineGroupVisible(true);
-                        bg.setWakeVisible(false);
+
+                        if (importantAnnotations.containsKey("BoatName") && importantAnnotations.get("BoatName")){
+                            bg.setTeamNameObjectVisible(true);
+                        }
+                        else{
+                            bg.setTeamNameObjectVisible(false);
+                        }
+
+                        if (importantAnnotations.containsKey("BoatSpeed") && importantAnnotations.get("BoatSpeed")){
+                            bg.setVelocityObjectVisible(true);
+                        }
+                        else{
+                            bg.setTeamNameObjectVisible(false);
+                        }
+
+                        if (importantAnnotations.containsKey("BoatTrack") && importantAnnotations.get("BoatTrack")){
+                            bg.setLineGroupVisible(true);
+                        }
+                        else{
+                            bg.setLineGroupVisible(false);
+                        }
+
+                        if (importantAnnotations.containsKey("BoatWake") && importantAnnotations.get("BoatWake")){
+                            bg.setWakeVisible(true);
+                        }
+                        else{
+                            bg.setWakeVisible(false);
+                        }
                     }
                 }
                 break;
diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
new file mode 100644
index 00000000..81661bfe
--- /dev/null
+++ b/src/main/resources/css/master.css
@@ -0,0 +1,166 @@
+/**
+Background colours
+ */
+.background-blue{
+    -fx-background-color: #119796;
+}
+
+.background-dark{
+    -fx-background-color: #2C2c36;
+}
+
+/**
+Exit button with no background
+ */
+.clear-exit-btn{
+    -fx-background-insets: 0;
+    -fx-background-color:  #119796;
+    -fx-border-style: none;
+}
+
+/**
+Buttons
+ */
+.blue-ui-btn{
+    -fx-background-color: #119796;
+    -fx-text-fill: #fff;
+}
+
+.text-white {
+    -fx-text-fill: white !important;
+    -fx-fill:white !important;
+}
+
+/**
+Sliders
+ */
+.ui-slider .thumb {
+    -fx-background-color: rgb(60, 60, 60);
+    -fx-border-radius: 10;
+    -fx-border-color: darkgray;
+}
+
+.ui-slider .track{
+    -fx-background-color: #119796;
+}
+
+.ui-slider .axis{
+    -fx-tick-label-fill: white;
+}
+
+.ui-slider .axis .axis-label{
+    -fx-text-fill: white;
+}
+
+/**
+Checkbox
+ */
+.ui-checkbox .box{
+    -fx-background-color: white;
+    -fx-graphic:none;
+    -fx-shape: none;
+}
+
+.ui-checkbox .box .mark{
+    -fx-background-image: none;
+    -fx-image: none;
+    -fx-graphic: none;
+    -fx-shape: none;
+}
+
+.ui-checkbox:selected .box{
+    -fx-background-color: #119796;
+    -fx-shape: none;
+}
+
+.ui-checkbox:selected .box .mark{
+    -fx-background-color: #119796;
+    -fx-shape: none;
+    -fx-graphic: none;
+}
+
+/**
+Table
+ */
+.ui-table{
+    -fx-background-color: transparent;
+}
+
+.ui-table:focused{
+    -fx-background-color: transparent;
+}
+
+.ui-table .column-header-background{
+    -fx-background-color: white
+}
+
+.ui-table .column-header-background .label{
+    -fx-background-color: transparent;
+    -fx-text-fill: black;
+}
+
+.ui-table .column-header {
+    -fx-background-color: transparent;
+}
+
+.ui-table .table-cell{
+    -fx-text-fill: white;
+    -fx-border-style: none;
+}
+
+.table-row-cell{
+    -fx-background-color: #119796;
+    -fx-background-insets: 0, 0 0 1 0;
+    -fx-padding: 0.0em; /* 0 */
+    -fx-border-style: none;
+}
+
+.table-row-cell:odd{
+    -fx-background-color: #0e6d6c;
+    -fx-background-insets: 0, 0 0 1 0;
+    -fx-padding: 0.0em; /* 0 */
+    -fx-border-style: none;
+}
+
+.table-row-cell:selected {
+    -fx-background-color: #005797;
+    -fx-background-insets: 0;
+    -fx-border-style: none;
+}
+
+/**
+Remove scroll bars
+ */
+.ui-table *.scroll-bar:horizontal *.increment-button,
+.ui-table *.scroll-bar:horizontal *.decrement-button {
+    -fx-background-color: null;
+    -fx-background-radius: 0;
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+}
+
+.ui-table *.scroll-bar:horizontal *.increment-arrow,
+.ui-table *.scroll-bar:horizontal *.decrement-arrow {
+    -fx-background-color: null;
+    -fx-background-radius: 0;
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+    -fx-shape: null;
+}
+
+.ui-table *.scroll-bar:vertical *.increment-arrow,
+.ui-table *.scroll-bar:vertical *.decrement-arrow {
+    -fx-background-color: null;
+    -fx-background-radius: 0;
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+    -fx-shape: null;
+}
+
+.ui-table *.scroll-bar:vertical *.increment-button,
+.ui-table *.scroll-bar:vertical *.decrement-button {
+    -fx-background-color: null;
+    -fx-background-radius: 0;
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/views/MainView.fxml b/src/main/resources/views/MainView.fxml
index ac72bd8c..65e7ee7b 100644
--- a/src/main/resources/views/MainView.fxml
+++ b/src/main/resources/views/MainView.fxml
@@ -9,7 +9,7 @@
 
 <AnchorPane fx:id="contentPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.Controller">
    <children>
-      <GridPane nodeOrientation="LEFT_TO_RIGHT" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <GridPane nodeOrientation="LEFT_TO_RIGHT" prefWidth="800.0" style="-fx-background-color: #2C2c36;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
         </columnConstraints>
@@ -18,23 +18,23 @@
             <RowConstraints maxHeight="52.0" minHeight="52.0" prefHeight="52.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="0.0" percentHeight="8.0" prefHeight="0.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="28.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="55.0" minHeight="55.0" percentHeight="5.0" prefHeight="55.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="0.0" minHeight="0.0" percentHeight="23.0" prefHeight="0.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="55.0" minHeight="55.0" percentHeight="9.0" prefHeight="55.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="0.0" minHeight="0.0" percentHeight="29.0" prefHeight="0.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="93.0" minHeight="72.0" prefHeight="72.0" vgrow="SOMETIMES" />
           <RowConstraints maxHeight="283.0" minHeight="262.0" prefHeight="283.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <Label alignment="CENTER" text="Welcome to Race Vision" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
+            <Label alignment="CENTER" text="Welcome to Race Vision" textFill="WHITE" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
                <font>
                   <Font size="40.0" />
                </font>
             </Label>
-            <Label text="Your live AC35 livestream" GridPane.halignment="CENTER" GridPane.rowIndex="1">
+            <Label text="Your live AC35 livestream" textFill="WHITE" GridPane.halignment="CENTER" GridPane.rowIndex="1">
                <font>
                   <Font size="20.0" />
                </font>
             </Label>
-            <Label text="Livestream Status:" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
+            <Label text="Livestream Status:" textFill="WHITE" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
                <font>
                   <Font size="28.0" />
                </font>
@@ -44,17 +44,17 @@
                   <Font size="27.0" />
                </font>
             </Label>
-            <Button fx:id="streamButton" mnemonicParsing="false" onAction="#startStream" text="Click to stream" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
-            <Button fx:id="switchToRaceViewButton" disable="true" mnemonicParsing="false" onAction="#switchToRaceView" text="Watch Race" GridPane.halignment="CENTER" GridPane.rowIndex="7" GridPane.valignment="TOP" />
-            <TableView fx:id="teamList" maxWidth="500.0" prefHeight="200.0" prefWidth="210.0" GridPane.halignment="CENTER" GridPane.rowIndex="5">
+            <Button fx:id="streamButton" mnemonicParsing="false" onAction="#startStream" styleClass="blue-ui-btn" text="Click to stream" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+            <Button fx:id="switchToRaceViewButton" disable="true" mnemonicParsing="false" onAction="#switchToRaceView" styleClass="blue-ui-btn" text="Watch Race" GridPane.halignment="CENTER" GridPane.rowIndex="7" GridPane.valignment="TOP" />
+            <TableView fx:id="teamList" maxWidth="661.0" prefHeight="324.0" prefWidth="629.0" styleClass="ui-table" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="5" GridPane.vgrow="NEVER">
               <columns>
                   <TableColumn fx:id="posCol" editable="false" maxWidth="74.0" minWidth="74.0" prefWidth="74.0" resizable="false" sortable="false" text="Position" />
                 <TableColumn fx:id="boatNameCol" editable="false" maxWidth="171.0" minWidth="171.0" prefWidth="171.0" resizable="false" sortable="false" text="Boat Name" />
-                <TableColumn fx:id="shortNameCol" editable="false" maxWidth="107.0" minWidth="107.0" prefWidth="107.0" resizable="false" sortable="false" text="Short Name" />
-                  <TableColumn fx:id="countryCol" editable="false" maxWidth="147.0" minWidth="147.0" prefWidth="147.0" resizable="false" sortable="false" text="Country" />
+                <TableColumn fx:id="shortNameCol" editable="false" maxWidth="155.18472290039062" minWidth="107.0" prefWidth="155.18472290039062" resizable="false" sortable="false" text="Short Name" />
+                  <TableColumn fx:id="countryCol" editable="false" maxWidth="258.9999694824219" minWidth="147.0" prefWidth="258.9999694824219" resizable="false" sortable="false" text="Country" />
               </columns>
                <GridPane.margin>
-                  <Insets />
+                  <Insets top="10.0" />
                </GridPane.margin>
             </TableView>
             <Label fx:id="realTime" text="Local time" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="BOTTOM" />
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 3c148485..32d6f710 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -28,36 +28,37 @@
         <RowConstraints />
     </rowConstraints>
     <children>
-        <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowSpan="3">
+        <AnchorPane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #2C2c36;" GridPane.rowSpan="3">
             <children>
-                <Label layoutX="11.0" layoutY="259.0" text="Team Position" />
-                <Label layoutX="13.0" layoutY="432.0" text="Settings" />
-                <Label layoutX="11.0" layoutY="14.0" text="Timer" />
-                <Label layoutX="11.0" layoutY="88.0" text="Wind direction" />
-                <Circle fx:id="windBackgroundCircle" blendMode="DARKEN" fill="#76baf8" layoutX="110.0" layoutY="166.0" radius="35.0" stroke="#686868" strokeType="INSIDE" strokeWidth="3.0" />
-                <Text fx:id="windArrowText" fill="#686868" layoutX="86.0" layoutY="186.0" strokeType="OUTSIDE" strokeWidth="0.0" text="↑">
+                <Label layoutX="11.0" layoutY="259.0" text="Team Position" textFill="WHITE" />
+                <Label layoutX="13.0" layoutY="432.0" text="Settings" textFill="WHITE" />
+                <Label layoutX="11.0" layoutY="14.0" text="Timer" textFill="WHITE" />
+                <Label layoutX="11.0" layoutY="88.0" text="Wind direction" textFill="WHITE" />
+                <Circle fx:id="windBackgroundCircle" blendMode="DARKEN" fill="#3dcdc8" layoutX="110.0" layoutY="166.0" radius="35.0" stroke="#d7d7d7" strokeType="INSIDE" strokeWidth="3.0" />
+                <Text fx:id="windArrowText" fill="#a8a8a8" layoutX="86.0" layoutY="186.0" strokeType="OUTSIDE" strokeWidth="0.0" text="↑">
                     <font>
                         <Font name="AdobeArabic-Regular" size="55.0" />
                     </font>
                 </Text>
-                <Text fx:id="windDirectionText" fill="#a8a7a7" layoutX="171.0" layoutY="214.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0.0°" textAlignment="RIGHT">
+                <Text fx:id="windDirectionText" fill="#d3d3d3" layoutX="171.0" layoutY="214.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0.0°" textAlignment="RIGHT">
                     <font>
                         <Font name="System Bold" size="13.0" />
                     </font>
                 </Text>
-                <CheckBox fx:id="toggleFps" layoutX="21.0" layoutY="453.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="143.0" selected="true" text="Show FPS" />
-            <VBox fx:id="positionVbox" layoutX="12.0" layoutY="280.0" prefHeight="140.0" prefWidth="200.0" />
+                <CheckBox fx:id="toggleFps" graphicTextGap="0.0" layoutX="21.0" layoutY="453.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="143.0" selected="true" styleClass="ui-checkbox" text="Show FPS" textFill="WHITE" />
+            <VBox fx:id="positionVbox" layoutX="12.0" layoutY="280.0" prefHeight="140.0" prefWidth="200.0" styleClass="text-white" />
             <Pane layoutX="11.0" layoutY="30.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="51.0" prefWidth="193.0">
                <children>
-                  <Text fx:id="timerLabel" layoutX="-26.0" layoutY="34.0" strokeType="OUTSIDE" strokeWidth="0.0" text="00:00" textAlignment="CENTER" wrappingWidth="246.0">
+                  <Text fx:id="timerLabel" fill="#f8f8f8" layoutX="-26.0" layoutY="34.0" strokeType="OUTSIDE" strokeWidth="0.0" text="00:00" textAlignment="CENTER" wrappingWidth="246.0">
                      <font>
                         <Font size="25.0" />
                      </font>
                   </Text>
                </children>
             </Pane>
-            <Slider fx:id="annotationSlider" blockIncrement="1.0" layoutX="38.0" layoutY="527.0" majorTickUnit="1.0" max="3.0" minorTickCount="0" prefHeight="51.0" prefWidth="170.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" />
-            <Label layoutX="10.0" layoutY="499.0" text="Annotations" />
+            <Slider fx:id="annotationSlider" blockIncrement="1.0" layoutX="38.0" layoutY="527.0" majorTickUnit="1.0" max="3.0" minorTickCount="0" prefHeight="51.0" prefWidth="170.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" styleClass="ui-slider" />
+            <Label layoutX="10.0" layoutY="499.0" text="Annotations" textFill="WHITE" />
+            <Button fx:id="selectAnnotationBtn" layoutX="35.0" layoutY="578.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="170.0" styleClass="blue-ui-btn" text="Select Annotations" textFill="WHITE" />
             </children>
         </AnchorPane>
         <AnchorPane fx:id="contentAnchorPane" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">
diff --git a/src/main/resources/views/importantAnnotationSelectView.fxml b/src/main/resources/views/importantAnnotationSelectView.fxml
new file mode 100644
index 00000000..fb88442d
--- /dev/null
+++ b/src/main/resources/views/importantAnnotationSelectView.fxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane fx:id="annotationSelectWindow" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="248.0" prefWidth="469.0" styleClass="background-blue" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Text fill="WHITE" layoutX="26.0" layoutY="52.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Select important annotations">
+         <font>
+            <Font size="24.0" />
+         </font>
+      </Text>
+      <CheckBox fx:id="boatWakeSelect" layoutX="26.0" layoutY="80.0" mnemonicParsing="false" style="-fx-border-width: 0; -fx-background-insets: 0;" text="Boat Wakes" textFill="#e7e7e7" />
+      <CheckBox fx:id="boatSpeedSelect" layoutX="26.0" layoutY="111.0" mnemonicParsing="false" text="Boat Speed" textFill="#e7e7e7" />
+      <CheckBox fx:id="boatTrackSelect" layoutX="26.0" layoutY="142.0" mnemonicParsing="false" text="Boat Tracks" textFill="#e7e7e7" />
+      <CheckBox fx:id="boatNameSelect" layoutX="26.0" layoutY="175.0" mnemonicParsing="false" text="Boat Name" textFill="#e7e7e7" />
+      <Button fx:id="closeButton" layoutX="424.0" layoutY="-1.0" mnemonicParsing="false" prefHeight="11.0" prefWidth="49.0" style=": 0;" text="X" textFill="#ffffff4e">
+         <font>
+            <Font size="24.0" />
+         </font>
+         <styleClass>
+            <String fx:value="background-blue" />
+            <String fx:value="clearExitButton" />
+         </styleClass>
+      </Button>
+   </children>
+</AnchorPane>

From 14d975dce4296d3edcc16fcb53fc8796e45fc90b Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Fri, 12 May 2017 17:41:47 +1200
Subject: [PATCH 04/36] Fixed a bug where clicking "watch race" before race
 starts will cause boats to travel in unexpected ways.

 #story[923]
---
 .../java/seng302/controllers/Controller.java  | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index faa67cc4..da85b3ae 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -46,7 +46,7 @@ public class Controller implements Initializable {
     @FXML
     private Label realTime;
 
-    private XMLParser xmlParser;
+    private boolean switchedToRaceView = false;
 
     private void setContentPane(String jfxUrl){
         try{
@@ -65,9 +65,6 @@ public class Controller implements Initializable {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        //DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-        //format.setTimeZone(TimeZone.getTimeZone("GMT-8"));
-        //realTime.setText(format.format(new Date()));
         contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
         teamList.getStylesheets().add(getClass().getResource("/css/master.css").toString());
     }
@@ -77,7 +74,6 @@ public class Controller implements Initializable {
      */
     public void startStream() {
         if (StreamParser.isStreamStatus()) {
-            xmlParser = StreamParser.getXmlObject();
             streamButton.setVisible(false);
             realTime.setVisible(true);
             timeTillLive.setVisible(true);
@@ -89,7 +85,9 @@ public class Controller implements Initializable {
                 public void run() {
                     Platform.runLater(() -> {
                         if (StreamParser.isRaceStarted()) {
-                            switchToRaceView();
+                            if (!switchedToRaceView) {
+                                switchToRaceView();
+                            }
                             timer.cancel();
                         }
                         if (StreamParser.isRaceFinished()) {
@@ -132,6 +130,7 @@ public class Controller implements Initializable {
     }
 
     public void switchToRaceView() {
+        switchedToRaceView = true;
         setContentPane("/views/RaceView.fxml");
     }
 
@@ -152,18 +151,8 @@ public class Controller implements Initializable {
         posCol.setCellValueFactory(
                 new PropertyValueFactory<>("position")
         );
-//        if (StreamParser.isRaceStarted()) {
-        data.addAll(StreamParser.getBoatsPos().values());
-//        } else {
-//            for (Yacht boat : StreamParser.getBoats().values()) {
-//                boat.setPosition("-");
-//                data.add(boat);
-//            }
-//        }
-        teamList.refresh();
 
-//        posCol.setSortType(TableColumn.SortType.ASCENDING);
-//        teamList.getSortOrder().add(posCol);
-//        posCol.setSortable(false);
+        data.addAll(StreamParser.getBoatsPos().values());
+        teamList.refresh();
     }
 }

From 5472765b95413e0fac2364085f26a7d1776b10d6 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Fri, 12 May 2017 18:24:28 +1200
Subject: [PATCH 05/36] Removed unused methods in RaceViewController.java

 #story[923]
---
 .../controllers/RaceViewController.java       | 126 ------------------
 1 file changed, 126 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 433e47a2..d2e2ba11 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -51,8 +51,6 @@ public class RaceViewController extends Thread{
     private ArrayList<Yacht> startingBoats = new ArrayList<>();
     private boolean displayFps;
     private Timeline timerTimeline;
-    private Map<Yacht, TimelineInfo> timelineInfos = new HashMap<>();
-    private ArrayList<Yacht> boatOrder = new ArrayList<>();
     private Race race;
     private Stage stage;
     private Integer annotationLevel;
@@ -66,12 +64,6 @@ public class RaceViewController extends Thread{
         for (Yacht boat : race.getBoats()) {
             startingBoats.add(boat);
         }
-//        try{
-//            initializeTimelines();
-//        }
-//        catch (Exception e){
-//            e.printStackTrace();
-//        }
 
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
@@ -79,10 +71,6 @@ public class RaceViewController extends Thread{
         initializeSettings();
         initialiseWindDirection();
         initialisePositionVBox();
-        //set wind direction!!!!!!! can't find another place to put my code --haoming
-//        double windDirection = new ConfigParser("/config/config.xml").getWindDirection();
-//        windDirectionText.setText(String.format("%.1f°", windDirection));
-//        windArrowText.setRotate(windDirection);
         includedCanvasController.timer.start();
 
         selectAnnotationBtn.setOnAction(event -> {
@@ -225,97 +213,6 @@ public class RaceViewController extends Thread{
 
     }
 
-    /**
-     * Generates time line for each boat, and stores time time into timelineInfos hash map
-     */
-    private void initializeTimelines() {
-        HashMap<Yacht, List> boat_events = race.getEvents();
-        for (Yacht boat : boat_events.keySet()) {
-            startingBoats.add(boat);
-//            // x, y are the real time coordinates
-//            DoubleProperty x = new SimpleDoubleProperty();
-//            DoubleProperty y = new SimpleDoubleProperty();
-//
-//            List<KeyFrame> keyFrames = new ArrayList<>();
-//            List<Event> events = boat_events.get(boat);
-//
-//            // iterates all events and convert each event to keyFrame, then add them into a list
-//            for (Event event : events) {
-//                if (event.getIsFinishingEvent()) {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished -> {race.setBoatFinished(boat); handleEvent(event);},
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                } else {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished ->{
-//                                        handleEvent(event);
-//                                        boat.setHeading(event.getBoatHeading());
-//                                    },
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                }
-//            }
-//            timelineInfos.put(boat, new TimelineInfo(new Timeline(keyFrames.toArray(new KeyFrame[keyFrames.size()])), x, y));
-        }
-        setRaceDuration();
-    }
-
-    private void setRaceDuration(){
-        Double maxDuration = 0.0;
-        Timeline maxTimeline = null;
-
-        for (TimelineInfo timelineInfo : timelineInfos.values()) {
-
-            Timeline timeline = timelineInfo.getTimeline();
-            if (timeline.getTotalDuration().toMillis() >= maxDuration) {
-                maxDuration = timeline.getTotalDuration().toMillis();
-                maxTimeline = timeline;
-            }
-
-            // Timelines are paused by default
-            timeline.play();
-            timeline.pause();
-        }
-
-        maxTimeline.setOnFinished(event -> {
-            race.setRaceFinished();
-            loadRaceResultView();
-        });
-    }
-
-    /**
-     * Play each boats timerTimeline
-     */
-    public void playTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.PAUSED){
-                timeline.play();
-            }
-        }
-    }
-
-    /**
-     * Pause each boats timerTimeline
-     */
-    public void pauseTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.RUNNING){
-                timeline.pause();
-            }
-        }
-    }
-
     /**
      * Display the list of boats in the order they finished the race
      */
@@ -335,29 +232,11 @@ public class RaceViewController extends Thread{
         }
     }
 
-    public void handleEvent(Event event) {
-        Yacht boat = event.getBoat();
-        boatOrder.remove(boat);
-        boat.setMarkLastPast(event.getMarkPosInRace());
-        boatOrder.add(boat);
-        boatOrder.sort(new Comparator<Yacht>() {
-            @Override
-            public int compare(Yacht b1, Yacht b2) {
-                return b2.getMarkLastPast() - b1.getMarkLastPast();
-            }
-        });
-        showOrder();
-    }
-
     private void showOrder() {
         positionVbox.getChildren().clear();
         positionVbox.getChildren().removeAll();
         positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
 
-//        for (Boat boat : boatOrder) {
-//            positionVbox.getChildren().add(new Text(boat.getShortName() + " " + boat.getSpeedInKnots() + " Knots"));
-//        }
-
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 Text textToAdd = new Text(boat.getPosition() + ". " +
@@ -424,15 +303,10 @@ public class RaceViewController extends Thread{
         return race;
     }
 
-    public Map<Yacht, TimelineInfo> getTimelineInfos() {
-        return timelineInfos;
-    }
-
     public ArrayList<Yacht> getStartingBoats(){
         return startingBoats;
     }
 
-
     private void setAnnotations(Integer annotationLevel) {
         switch (annotationLevel) {
             case 0:

From 47880d09bc85df9592670d606b42b65a130c1e30 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Fri, 12 May 2017 20:04:09 +1200
Subject: [PATCH 06/36] Implemented estimated time to next mark. Added checkbox
 for estimated time to next mark. To be fix: change from long to human
 readable time, update time every second

 #story[923]
---
 .../ImportantAnnotationController.java        | 12 ++++++++++
 .../controllers/RaceViewController.java       | 12 +++++++++-
 src/main/java/seng302/models/BoatGroup.java   | 22 ++++++++++++++++---
 .../views/importantAnnotationSelectView.fxml  |  3 ++-
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/controllers/ImportantAnnotationController.java b/src/main/java/seng302/controllers/ImportantAnnotationController.java
index e1a031cf..d5cd577e 100644
--- a/src/main/java/seng302/controllers/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/ImportantAnnotationController.java
@@ -28,6 +28,9 @@ public class ImportantAnnotationController implements Initializable {
     @FXML
     private CheckBox boatNameSelect;
 
+    @FXML
+    private CheckBox boatEstTimeToNextMarkSelect;
+
     @FXML
     private AnchorPane annotationSelectWindow;
 
@@ -87,6 +90,10 @@ public class ImportantAnnotationController implements Initializable {
                     boatNameSelect.setSelected(importantAnnotations.get(key));
                     break;
 
+                case "BoatEstTimeToNextMark":
+                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotations.get(key));
+                    break;
+
                 default:
                     break;
             }
@@ -120,6 +127,11 @@ public class ImportantAnnotationController implements Initializable {
             sendUpdate();
         });
 
+        boatEstTimeToNextMarkSelect.setOnAction(event -> {
+            setAnnotation("BoatEstTimeToNextMark", boatEstTimeToNextMarkSelect.isSelected());
+            sendUpdate();
+        });
+
         closeButton.setOnAction(event -> stage.close());
     }
 }
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index d2e2ba11..d6bcdc49 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -315,6 +315,7 @@ public class RaceViewController extends Thread{
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(false);
                         bg.setVelocityObjectVisible(false);
+                        bg.setEstTimeToNextMarkVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -326,6 +327,7 @@ public class RaceViewController extends Thread{
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(false);
+                        bg.setEstTimeToNextMarkVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -348,7 +350,14 @@ public class RaceViewController extends Thread{
                             bg.setVelocityObjectVisible(true);
                         }
                         else{
-                            bg.setTeamNameObjectVisible(false);
+                            bg.setVelocityObjectVisible(false);
+                        }
+
+                        if (importantAnnotations.containsKey("BoatEstTimeToNextMark") && importantAnnotations.get("BoatEstTimeToNextMark")) {
+                            bg.setEstTimeToNextMarkVisible(true);
+                        }
+                        else{
+                            bg.setEstTimeToNextMarkVisible(false);
                         }
 
                         if (importantAnnotations.containsKey("BoatTrack") && importantAnnotations.get("BoatTrack")){
@@ -373,6 +382,7 @@ public class RaceViewController extends Thread{
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(true);
+                        bg.setEstTimeToNextMarkVisible(true);
                         bg.setLineGroupVisible(true);
                         bg.setWakeVisible(true);
                     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 57dd48db..0a58d90e 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -23,9 +23,11 @@ public class BoatGroup extends RaceObject{
 
     //Constants for drawing
     private static final double TEAMNAME_X_OFFSET = 10d;
-    private static final double TEAMNAME_Y_OFFSET = -15d;
+    private static final double TEAMNAME_Y_OFFSET = -29d;
     private static final double VELOCITY_X_OFFSET = 10d;
-    private static final double VELOCITY_Y_OFFSET = -5d;
+    private static final double VELOCITY_Y_OFFSET = -17d;
+    private static final double ESTTIMETONEXTMARK_X_OFFSET = 10d;
+    private static final double ESTTIMETONEXTMARK_Y_OFFSET = -5d;
     private static final double BOAT_HEIGHT = 15d;
     private static final double BOAT_WIDTH = 10d;
     //Variables for boat logic.
@@ -38,6 +40,7 @@ public class BoatGroup extends RaceObject{
     private Polygon boatPoly;
     private Text teamNameObject;
     private Text velocityObject;
+    private Text estTimeToNextMarkObject;
     private Wake wake;
     //Handles boat moving when connecting to a stream
     private boolean setToInitialLocation = false;
@@ -83,6 +86,7 @@ public class BoatGroup extends RaceObject{
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
+        estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -93,8 +97,12 @@ public class BoatGroup extends RaceObject{
         velocityObject.relocate(velocityObject.getX(), velocityObject.getY());
         destinationSet = false;
 
+        estTimeToNextMarkObject.setX(ESTTIMETONEXTMARK_X_OFFSET);
+        estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
+        estTimeToNextMarkObject.relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
+
         wake = new Wake(0, -BOAT_HEIGHT);
-        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly);
+        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject);
     }
 
     /**
@@ -120,6 +128,8 @@ public class BoatGroup extends RaceObject{
         teamNameObject.setLayoutY(teamNameObject.getLayoutY() + dy);
         velocityObject.setLayoutX(velocityObject.getLayoutX() + dx);
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
+        estTimeToNextMarkObject.setLayoutX(estTimeToNextMarkObject.getLayoutX() + dx);
+        estTimeToNextMarkObject.setLayoutY(estTimeToNextMarkObject.getLayoutY() + dy);
         wake.setLayoutX(wake.getLayoutX() + dx);
         wake.setLayoutY(wake.getLayoutY() + dy);
         rotateTo(rotation + currentRotation);
@@ -148,6 +158,8 @@ public class BoatGroup extends RaceObject{
         teamNameObject.setLayoutY(y);
         velocityObject.setLayoutX(x);
         velocityObject.setLayoutY(y);
+        estTimeToNextMarkObject.setLayoutX(x);
+        estTimeToNextMarkObject.setLayoutY(y);
         wake.setLayoutX(x);
         wake.setLayoutY(y);
         wake.rotate(currentRotation);
@@ -287,6 +299,10 @@ public class BoatGroup extends RaceObject{
         velocityObject.setVisible(visible);
     }
 
+    public void setEstTimeToNextMarkVisible(Boolean visible) {
+        estTimeToNextMarkObject.setVisible(visible);
+    }
+
     public void setLineGroupVisible(Boolean visible) {
         lineGroup.setVisible(visible);
     }
diff --git a/src/main/resources/views/importantAnnotationSelectView.fxml b/src/main/resources/views/importantAnnotationSelectView.fxml
index fb88442d..da89b52a 100644
--- a/src/main/resources/views/importantAnnotationSelectView.fxml
+++ b/src/main/resources/views/importantAnnotationSelectView.fxml
@@ -15,7 +15,8 @@
       <CheckBox fx:id="boatWakeSelect" layoutX="26.0" layoutY="80.0" mnemonicParsing="false" style="-fx-border-width: 0; -fx-background-insets: 0;" text="Boat Wakes" textFill="#e7e7e7" />
       <CheckBox fx:id="boatSpeedSelect" layoutX="26.0" layoutY="111.0" mnemonicParsing="false" text="Boat Speed" textFill="#e7e7e7" />
       <CheckBox fx:id="boatTrackSelect" layoutX="26.0" layoutY="142.0" mnemonicParsing="false" text="Boat Tracks" textFill="#e7e7e7" />
-      <CheckBox fx:id="boatNameSelect" layoutX="26.0" layoutY="175.0" mnemonicParsing="false" text="Boat Name" textFill="#e7e7e7" />
+      <CheckBox fx:id="boatNameSelect" layoutX="26.0" layoutY="173.0" mnemonicParsing="false" text="Boat Name" textFill="#e7e7e7" />
+      <CheckBox fx:id="boatEstTimeToNextMarkSelect" layoutX="26.0" layoutY="204.0" mnemonicParsing="false" text="Boat Estimated Time To Next Mark" textFill="#e7e7e7" />
       <Button fx:id="closeButton" layoutX="424.0" layoutY="-1.0" mnemonicParsing="false" prefHeight="11.0" prefWidth="49.0" style=": 0;" text="X" textFill="#ffffff4e">
          <font>
             <Font size="24.0" />

From ff6bfc95169b5b42fa42e569c2b6a15ef3452751 Mon Sep 17 00:00:00 2001
From: Michael Rausch <michael@michaelrausch.net>
Date: Sun, 14 May 2017 20:27:25 +1200
Subject: [PATCH 07/36] Important annotations are displayed correctly when
 updated.

- Important annotations can be selected, the live view updates in real time
- Change local time text colour to white
- Split the important annotations state into a separate class

Tags: #story[926]
---
 .../controllers/RaceViewController.java       | 98 ++++++++++---------
 .../controllers/annotations/Annotation.java   | 11 +++
 .../ImportantAnnotationController.java        | 75 ++++++--------
 .../ImportantAnnotationDelegate.java          | 16 +++
 .../ImportantAnnotationsState.java            | 52 ++++++++++
 src/main/resources/views/MainView.fxml        |  2 +-
 .../TestImportantAnnotationState.java         | 53 ++++++++++
 7 files changed, 216 insertions(+), 91 deletions(-)
 create mode 100644 src/main/java/seng302/controllers/annotations/Annotation.java
 rename src/main/java/seng302/controllers/{ => annotations}/ImportantAnnotationController.java (51%)
 create mode 100644 src/main/java/seng302/controllers/annotations/ImportantAnnotationDelegate.java
 create mode 100644 src/main/java/seng302/controllers/annotations/ImportantAnnotationsState.java
 create mode 100644 src/test/java/seng302/visualizer/annotations/TestImportantAnnotationState.java

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 433e47a2..24ff0163 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -21,6 +21,10 @@ import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
+import seng302.controllers.annotations.Annotation;
+import seng302.controllers.annotations.ImportantAnnotationController;
+import seng302.controllers.annotations.ImportantAnnotationDelegate;
+import seng302.controllers.annotations.ImportantAnnotationsState;
 import seng302.models.*;
 import seng302.models.parsers.StreamParser;
 
@@ -30,7 +34,7 @@ import java.util.*;
 /**
  * Created by ptg19 on 29/03/17.
  */
-public class RaceViewController extends Thread{
+public class RaceViewController extends Thread implements ImportantAnnotationDelegate{
     @FXML
     private VBox positionVbox;
     @FXML
@@ -55,23 +59,19 @@ public class RaceViewController extends Thread{
     private ArrayList<Yacht> boatOrder = new ArrayList<>();
     private Race race;
     private Stage stage;
-    private Integer annotationLevel;
-    private Map<String, Boolean> importantAnnotations = new HashMap<>();
+    private ImportantAnnotationsState importantAnnotations;
 
     public void initialize() {
+        // Load a default important annotation state
+        importantAnnotations = new ImportantAnnotationsState();
 
         RaceController raceController = new RaceController();
         raceController.initializeRace();
         race = raceController.getRace();
+
         for (Yacht boat : race.getBoats()) {
             startingBoats.add(boat);
         }
-//        try{
-//            initializeTimelines();
-//        }
-//        catch (Exception e){
-//            e.printStackTrace();
-//        }
 
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
@@ -91,13 +91,12 @@ public class RaceViewController extends Thread{
     }
 
     /**
-     * Important annotations have been changed, update this view
-     * @param newImportantAnnotations HashMap containing whether or not annotations
-     *                                are important
+     * The important annotations have been changed, update this view
+     * @param importantAnnotationsState The current state of the selected annotations
      */
-    void importantAnnotationsChanged(Map<String, Boolean> newImportantAnnotations){
-        this.importantAnnotations = newImportantAnnotations;
-        setAnnotations((int)annotationSlider.getValue());
+    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState){
+        this.importantAnnotations = importantAnnotationsState;
+        setAnnotations((int)annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
     /**
@@ -128,10 +127,6 @@ public class RaceViewController extends Thread{
         }
     }
 
-    Map<String, Boolean> getImportantAnnotations(){
-        return importantAnnotations;
-    }
-
     private void initializeSettings() {
         displayFps = true;
 
@@ -432,9 +427,43 @@ public class RaceViewController extends Thread{
         return startingBoats;
     }
 
+    /**
+     * Display the important annotations for a specific BoatGroup
+     * @param bg The boat group to set the annotations for
+     */
+    private void setBoatGroupImportantAnnotations(BoatGroup bg){
+        if (importantAnnotations.getAnnotationState(Annotation.NAME)){
+            bg.setTeamNameObjectVisible(true);
+        }
+        else{
+            bg.setTeamNameObjectVisible(false);
+        }
+
+        if (importantAnnotations.getAnnotationState(Annotation.SPEED)){
+            bg.setVelocityObjectVisible(true);
+        }
+        else{
+            bg.setVelocityObjectVisible(false);
+        }
+
+        if (importantAnnotations.getAnnotationState(Annotation.TRACK)){
+            bg.setLineGroupVisible(true);
+        }
+        else{
+            bg.setLineGroupVisible(false);
+        }
+
+        if (importantAnnotations.getAnnotationState(Annotation.WAKE)){
+            bg.setWakeVisible(true);
+        }
+        else{
+            bg.setWakeVisible(false);
+        }
+    }
 
     private void setAnnotations(Integer annotationLevel) {
         switch (annotationLevel) {
+            // No Annotations
             case 0:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
                     if(ro instanceof BoatGroup) {
@@ -446,6 +475,7 @@ public class RaceViewController extends Thread{
                     }
                 }
                 break;
+            // Low Annotations
             case 1:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
                     if(ro instanceof BoatGroup) {
@@ -462,37 +492,11 @@ public class RaceViewController extends Thread{
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
                     if(ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
-
-                        if (importantAnnotations.containsKey("BoatName") && importantAnnotations.get("BoatName")){
-                            bg.setTeamNameObjectVisible(true);
-                        }
-                        else{
-                            bg.setTeamNameObjectVisible(false);
-                        }
-
-                        if (importantAnnotations.containsKey("BoatSpeed") && importantAnnotations.get("BoatSpeed")){
-                            bg.setVelocityObjectVisible(true);
-                        }
-                        else{
-                            bg.setTeamNameObjectVisible(false);
-                        }
-
-                        if (importantAnnotations.containsKey("BoatTrack") && importantAnnotations.get("BoatTrack")){
-                            bg.setLineGroupVisible(true);
-                        }
-                        else{
-                            bg.setLineGroupVisible(false);
-                        }
-
-                        if (importantAnnotations.containsKey("BoatWake") && importantAnnotations.get("BoatWake")){
-                            bg.setWakeVisible(true);
-                        }
-                        else{
-                            bg.setWakeVisible(false);
-                        }
+                        setBoatGroupImportantAnnotations(bg);
                     }
                 }
                 break;
+            // All Annotations
             case 3:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
                     if(ro instanceof BoatGroup) {
diff --git a/src/main/java/seng302/controllers/annotations/Annotation.java b/src/main/java/seng302/controllers/annotations/Annotation.java
new file mode 100644
index 00000000..eed70162
--- /dev/null
+++ b/src/main/java/seng302/controllers/annotations/Annotation.java
@@ -0,0 +1,11 @@
+package seng302.controllers.annotations;
+
+/**
+ * Annotations the user can select as important
+ */
+public enum Annotation {
+    SPEED,
+    WAKE,
+    TRACK,
+    NAME
+}
diff --git a/src/main/java/seng302/controllers/ImportantAnnotationController.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
similarity index 51%
rename from src/main/java/seng302/controllers/ImportantAnnotationController.java
rename to src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
index e1a031cf..0d1585af 100644
--- a/src/main/java/seng302/controllers/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
@@ -1,4 +1,4 @@
-package seng302.controllers;
+package seng302.controllers.annotations;
 
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
@@ -6,6 +6,8 @@ import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
+import seng302.controllers.RaceViewController;
+import seng302.controllers.annotations.Annotation;
 
 import java.net.URL;
 import java.util.HashMap;
@@ -34,57 +36,59 @@ public class ImportantAnnotationController implements Initializable {
     @FXML
     private Button closeButton;
 
-    private RaceViewController parent;
-    private Map<String, Boolean> importantAnnotations;
+    private ImportantAnnotationDelegate delegate;
+    private ImportantAnnotationsState importantAnnotationsState;
     private Stage stage;
 
-    ImportantAnnotationController(RaceViewController parent, Stage stage){
-        this.parent = parent;
-        importantAnnotations = new HashMap<>();
+    public ImportantAnnotationController(ImportantAnnotationDelegate delegate, Stage stage){
+        this.delegate = delegate;
+        importantAnnotationsState = new ImportantAnnotationsState();
         this.stage = stage;
     }
 
     /**
-     * Sets whether or not an annotation is considered important
-     * @param name The annotation name
+     * Sets whether or not an annotation is considered important, then
+     * sends an update to the delegate
+     * @param annotation The annotation
      * @param isSet True if annotation is important
      */
-    private void setAnnotation(String name, Boolean isSet){
-        importantAnnotations.put(name, isSet);
+    private void setAnnotation(Annotation annotation, Boolean isSet){
+        importantAnnotationsState.setAnnotationState(annotation, isSet);
+        sendUpdate();
     }
 
     /**
-     * Sends an update to the parent controller when the important
+     * Sends an update to the delegate when the important
      * annotations have changed
      */
     private void sendUpdate(){
-        this.parent.importantAnnotationsChanged(this.importantAnnotations);
+        this.delegate.importantAnnotationsChanged(importantAnnotationsState);
     }
 
     /**
      * Load the current state of the 'important annotations'
      * @param currentState hashmap containing the states of each annotation
      */
-    void loadState(Map<String, Boolean> currentState){
-        this.importantAnnotations = currentState;
+    public void loadState(ImportantAnnotationsState currentState){
+        this.importantAnnotationsState = currentState;
 
         // Initialise checkboxes
-        for (String key : importantAnnotations.keySet()){
-            switch (key){
-                case "BoatWake":
-                    boatWakeSelect.setSelected(importantAnnotations.get(key));
+        for (Annotation annotation : importantAnnotationsState.getAnnotations()){
+            switch (annotation){
+                case WAKE:
+                    boatWakeSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
-                case "BoatSpeed":
-                    boatSpeedSelect.setSelected(importantAnnotations.get(key));
+                case SPEED:
+                    boatSpeedSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
-                case "BoatTrack":
-                    boatTrackSelect.setSelected(importantAnnotations.get(key));
+                case TRACK:
+                    boatTrackSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
-                case "BoatName":
-                    boatNameSelect.setSelected(importantAnnotations.get(key));
+                case NAME:
+                    boatNameSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 default:
@@ -100,25 +104,10 @@ public class ImportantAnnotationController implements Initializable {
      */
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        boatWakeSelect.setOnAction(event -> {
-            setAnnotation("BoatWake", boatWakeSelect.isSelected());
-            sendUpdate();
-        });
-
-        boatSpeedSelect.setOnAction(event -> {
-            setAnnotation("BoatSpeed", boatSpeedSelect.isSelected());
-            sendUpdate();
-        });
-
-        boatTrackSelect.setOnAction(event -> {
-            setAnnotation("BoatTrack", boatTrackSelect.isSelected());
-            sendUpdate();
-        });
-
-        boatNameSelect.setOnAction(event -> {
-            setAnnotation("BoatName", boatNameSelect.isSelected());
-            sendUpdate();
-        });
+        boatWakeSelect.setOnAction(event -> setAnnotation(Annotation.WAKE, boatWakeSelect.isSelected()));
+        boatSpeedSelect.setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
+        boatTrackSelect.setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
+        boatNameSelect.setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
 
         closeButton.setOnAction(event -> stage.close());
     }
diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationDelegate.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationDelegate.java
new file mode 100644
index 00000000..ba50726e
--- /dev/null
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationDelegate.java
@@ -0,0 +1,16 @@
+package seng302.controllers.annotations;
+
+/**
+ * An ImportantAnnotationDelegate handles updating the important annotations
+ * displayed to the user on behalf of the ImportantAnnotationController
+ */
+public interface ImportantAnnotationDelegate {
+    /**
+     * The important annotations have been changed, update the
+     * annotations displayed to the user
+     * @param importantAnnotationsState The current state of the selected annotations
+     */
+    void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState);
+
+
+}
diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationsState.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationsState.java
new file mode 100644
index 00000000..5cc97a7f
--- /dev/null
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationsState.java
@@ -0,0 +1,52 @@
+package seng302.controllers.annotations;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ImportantAnnotationsState {
+    public static final Boolean DEFAULT_ANNOTATION_STATE = true;
+    private Map<Annotation, Boolean> currentState;
+
+    /**
+     * Stores the users preference for the annotations
+     * they consider to be important
+     */
+    public ImportantAnnotationsState(){
+        this.currentState = new HashMap<>();
+        initialiseState();
+    }
+
+    /**
+     * Set each annotation to the default annotation state
+     */
+    private void initialiseState(){
+        for (Annotation annotation : getAnnotations()){
+            currentState.put(annotation, DEFAULT_ANNOTATION_STATE);
+        }
+    }
+
+    /**
+     * Sets the state (visibility) of an annotation
+     * @param annotation The annotation to set
+     * @param visible Whether or not the annotation should be visible
+     */
+    public void setAnnotationState(Annotation annotation, Boolean visible){
+        this.currentState.put(annotation, visible);
+    }
+
+    /**
+     * Returns the state (visibility) of a specific annotation
+     * @param annotation The annotation to check
+     * @return True if visible, else false
+     */
+    public Boolean getAnnotationState(Annotation annotation){
+        return this.currentState.containsKey(annotation) && this.currentState.get(annotation);
+    }
+
+    /**
+     * @return Return an array containing all defined annotations
+     */
+    public Annotation[] getAnnotations(){
+        return Annotation.class.getEnumConstants();
+    }
+}
diff --git a/src/main/resources/views/MainView.fxml b/src/main/resources/views/MainView.fxml
index 65e7ee7b..054dd6cd 100644
--- a/src/main/resources/views/MainView.fxml
+++ b/src/main/resources/views/MainView.fxml
@@ -57,7 +57,7 @@
                   <Insets top="10.0" />
                </GridPane.margin>
             </TableView>
-            <Label fx:id="realTime" text="Local time" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="BOTTOM" />
+            <Label fx:id="realTime" text="Local time" textFill="WHITE" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="BOTTOM" />
          </children>
       </GridPane>
    </children>
diff --git a/src/test/java/seng302/visualizer/annotations/TestImportantAnnotationState.java b/src/test/java/seng302/visualizer/annotations/TestImportantAnnotationState.java
new file mode 100644
index 00000000..72ef4a57
--- /dev/null
+++ b/src/test/java/seng302/visualizer/annotations/TestImportantAnnotationState.java
@@ -0,0 +1,53 @@
+package seng302.visualizer.annotations;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import seng302.controllers.annotations.Annotation;
+import seng302.controllers.annotations.ImportantAnnotationsState;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestImportantAnnotationState {
+    private ImportantAnnotationsState importantAnnotationsState;
+
+    @Before
+    public void setUpForTest(){
+        importantAnnotationsState = new ImportantAnnotationsState();
+    }
+
+    @After
+    public void tearDownAfterTest(){
+        importantAnnotationsState = null;
+    }
+
+    /**
+     * Check whether each annotation has its default value set to the default value when
+     * the class is initialized
+     */
+    @Test
+    public void testDefaultValueSet(){
+        for (Annotation annotation : importantAnnotationsState.getAnnotations()){
+            assertEquals(ImportantAnnotationsState.DEFAULT_ANNOTATION_STATE,
+                    importantAnnotationsState.getAnnotationState(annotation));
+        }
+    }
+
+    /**
+     * Check whether an annotations state can be changed
+     */
+    @Test
+    public void testAnnotationStateChange(){
+        Annotation[] annotations = importantAnnotationsState.getAnnotations();
+
+        // do not run test if there are no annotations
+        if (annotations.length <= 0){
+            return;
+        }
+
+        Boolean currentAnnotationState = importantAnnotationsState.getAnnotationState(annotations[0]);
+        importantAnnotationsState.setAnnotationState(annotations[0], !currentAnnotationState);
+
+        assertEquals(!currentAnnotationState, importantAnnotationsState.getAnnotationState(annotations[0]));
+    }
+}

From 1ab6351d48cffa85e398f5dc7eb942f71cc62db5 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 10:11:19 +1200
Subject: [PATCH 08/36] Fixed estimated time to next mark (annotation) to
 update correctly

#story[924]
---
 src/main/java/seng302/models/BoatGroup.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 0a58d90e..1d689c5f 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -236,6 +236,7 @@ public class BoatGroup extends RaceObject{
                     wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
+                estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;

From 39efafc75f8f2c5090416566f1467baa0958c35e Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 10:36:20 +1200
Subject: [PATCH 09/36] Fixed Annotation.java,
 ImportantAnnotationController.java, RaceViewController.java to include
 estimate time to next mark after merge

#story[924]
---
 .../java/seng302/controllers/RaceViewController.java   |  7 +++++++
 .../seng302/controllers/annotations/Annotation.java    |  3 ++-
 .../annotations/ImportantAnnotationController.java     | 10 +++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index b38aa4ca..cce59db3 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -340,6 +340,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         else{
             bg.setWakeVisible(false);
         }
+
+        if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
+            bg.setEstTimeToNextMarkVisible(true);
+        }
+        else {
+            bg.setEstTimeToNextMarkVisible(false);
+        }
     }
 
     private void setAnnotations(Integer annotationLevel) {
diff --git a/src/main/java/seng302/controllers/annotations/Annotation.java b/src/main/java/seng302/controllers/annotations/Annotation.java
index eed70162..0eea5ee2 100644
--- a/src/main/java/seng302/controllers/annotations/Annotation.java
+++ b/src/main/java/seng302/controllers/annotations/Annotation.java
@@ -7,5 +7,6 @@ public enum Annotation {
     SPEED,
     WAKE,
     TRACK,
-    NAME
+    NAME,
+    ESTTIMETONEXTMARK
 }
diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
index 5220b8fb..95fe84d3 100644
--- a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
@@ -94,8 +94,8 @@ public class ImportantAnnotationController implements Initializable {
                     boatNameSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
-                case "BoatEstTimeToNextMark":
-                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotations.get(key));
+                case ESTTIMETONEXTMARK:
+                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 default:
@@ -115,11 +115,7 @@ public class ImportantAnnotationController implements Initializable {
         boatSpeedSelect.setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
         boatTrackSelect.setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
         boatNameSelect.setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
-
-        boatEstTimeToNextMarkSelect.setOnAction(event -> {
-            setAnnotation("BoatEstTimeToNextMark", boatEstTimeToNextMarkSelect.isSelected());
-            sendUpdate();
-        });
+        boatEstTimeToNextMarkSelect.setOnAction(event -> setAnnotation(Annotation.ESTTIMETONEXTMARK, boatEstTimeToNextMarkSelect.isSelected()));
 
         closeButton.setOnAction(event -> stage.close());
     }

From 94d1982670d3fcb89bab5ea698d0d9b31a59227e Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 10:46:28 +1200
Subject: [PATCH 10/36] Shifted the canvas to the back of the window when
 updated.

This is to preserve the way the boats are still shown on the front when the course i reloaded.
As the main live stream has been down, this still needs to be tested.
---
 src/main/java/seng302/controllers/CanvasController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index ec449ab1..c4fa7b58 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -250,6 +250,7 @@ public class CanvasController {
             gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
             gc.restore();
             addRaceBorder();
+            canvas.toBack();
         }
     }
 

From e62a609b6b8055b3c975decaea5e736a779ad59c Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 13:47:30 +1200
Subject: [PATCH 11/36] Prepared StreamParser.java, BoatGroup.java, Yacht.java
 for leg timer annotation (story 36)

#story[927]
---
 .../controllers/RaceViewController.java       | 11 +++++-----
 src/main/java/seng302/models/BoatGroup.java   | 21 +++++++++++++++++--
 src/main/java/seng302/models/Yacht.java       | 12 ++++++-----
 .../seng302/models/parsers/StreamParser.java  | 13 ++++++++----
 4 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index cce59db3..f0ea2c51 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,6 +1,5 @@
 package seng302.controllers;
 
-import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.beans.value.ChangeListener;
@@ -342,10 +341,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
 
         if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
-            bg.setEstTimeToNextMarkVisible(true);
+            bg.setEstTimeToNextMarkObjectVisible(true);
         }
         else {
-            bg.setEstTimeToNextMarkVisible(false);
+            bg.setEstTimeToNextMarkObjectVisible(false);
         }
     }
 
@@ -358,7 +357,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(false);
                         bg.setVelocityObjectVisible(false);
-                        bg.setEstTimeToNextMarkVisible(false);
+                        bg.setEstTimeToNextMarkObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -371,7 +370,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(false);
-                        bg.setEstTimeToNextMarkVisible(false);
+                        bg.setEstTimeToNextMarkObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -393,7 +392,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(true);
-                        bg.setEstTimeToNextMarkVisible(true);
+                        bg.setEstTimeToNextMarkObjectVisible(true);
                         bg.setLineGroupVisible(true);
                         bg.setWakeVisible(true);
                     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 1d689c5f..30845ec5 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -28,6 +28,8 @@ public class BoatGroup extends RaceObject{
     private static final double VELOCITY_Y_OFFSET = -17d;
     private static final double ESTTIMETONEXTMARK_X_OFFSET = 10d;
     private static final double ESTTIMETONEXTMARK_Y_OFFSET = -5d;
+    private static final double LEGTIME_X_OFFSET = 10d;
+    private static final double LEGTIME_Y_OFFSET = 7d;
     private static final double BOAT_HEIGHT = 15d;
     private static final double BOAT_WIDTH = 10d;
     //Variables for boat logic.
@@ -41,6 +43,7 @@ public class BoatGroup extends RaceObject{
     private Text teamNameObject;
     private Text velocityObject;
     private Text estTimeToNextMarkObject;
+    private Text legTimeObject;
     private Wake wake;
     //Handles boat moving when connecting to a stream
     private boolean setToInitialLocation = false;
@@ -87,6 +90,7 @@ public class BoatGroup extends RaceObject{
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
         estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
+        legTimeObject = new Text(String.valueOf(boat.getMarkRoundingTime()));
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -101,8 +105,12 @@ public class BoatGroup extends RaceObject{
         estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
         estTimeToNextMarkObject.relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
 
+        legTimeObject.setX(LEGTIME_X_OFFSET);
+        legTimeObject.setY(LEGTIME_Y_OFFSET);
+        legTimeObject.relocate(legTimeObject.getX(), legTimeObject.getY());
+
         wake = new Wake(0, -BOAT_HEIGHT);
-        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject);
+        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject, legTimeObject);
     }
 
     /**
@@ -130,6 +138,8 @@ public class BoatGroup extends RaceObject{
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
         estTimeToNextMarkObject.setLayoutX(estTimeToNextMarkObject.getLayoutX() + dx);
         estTimeToNextMarkObject.setLayoutY(estTimeToNextMarkObject.getLayoutY() + dy);
+        legTimeObject.setLayoutX(legTimeObject.getLayoutX() + dx);
+        legTimeObject.setLayoutY(legTimeObject.getLayoutY() + dy);
         wake.setLayoutX(wake.getLayoutX() + dx);
         wake.setLayoutY(wake.getLayoutY() + dy);
         rotateTo(rotation + currentRotation);
@@ -160,6 +170,8 @@ public class BoatGroup extends RaceObject{
         velocityObject.setLayoutY(y);
         estTimeToNextMarkObject.setLayoutX(x);
         estTimeToNextMarkObject.setLayoutY(y);
+        legTimeObject.setLayoutX(x);
+        legTimeObject.setLayoutY(y);
         wake.setLayoutX(x);
         wake.setLayoutY(y);
         wake.rotate(currentRotation);
@@ -237,6 +249,7 @@ public class BoatGroup extends RaceObject{
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
                 estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
+                legTimeObject.setText(String.valueOf(boat.getMarkRoundingTime()));
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;
@@ -300,10 +313,14 @@ public class BoatGroup extends RaceObject{
         velocityObject.setVisible(visible);
     }
 
-    public void setEstTimeToNextMarkVisible(Boolean visible) {
+    public void setEstTimeToNextMarkObjectVisible(Boolean visible) {
         estTimeToNextMarkObject.setVisible(visible);
     }
 
+    public void setLegObjectTime(Boolean visible) {
+        legTimeObject.setVisible(visible);
+    }
+
     public void setLineGroupVisible(Boolean visible) {
         lineGroup.setVisible(visible);
     }
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 68970268..e21384f9 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -12,9 +12,9 @@ import java.text.SimpleDateFormat;
  *  also done outside Boat class because some old variables are not used anymore.
  */
 public class Yacht {
+    // Used in boat group
     private Color colour;
     private double velocity;
-    private Integer markLastPast;
 
     private String boatType;
     private Integer sourceID;
@@ -30,6 +30,8 @@ public class Yacht {
     private Long estimateTimeAtNextMark;
     private Long estimateTimeAtFinish;
     private String position;
+    // Mark rounding
+    private Long markRoundingTime;
 
     /**
      * Used in EventTest and RaceTest.
@@ -157,11 +159,11 @@ public class Yacht {
         this.velocity = velocity;
     }
 
-    public Integer getMarkLastPast() {
-        return markLastPast;
+    public Long getMarkRoundingTime() {
+        return markRoundingTime;
     }
 
-    public void setMarkLastPast(Integer markLastPast) {
-        this.markLastPast = markLastPast;
+    public void setMarkRoundingTime(Long markRoundingTime) {
+        this.markRoundingTime = markRoundingTime;
     }
 }
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..39e86df0 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -39,6 +39,7 @@ public class StreamParser extends Thread{
      private static Map<Integer, Yacht> boats = new HashMap<>();
      private static Map<Long, Yacht> boatsPos = new TreeMap<>();
      private static double windDirection = 0;
+     private static Long currentTimeLong;
      private static String currentTimeString;
      private static boolean appRunning;
 
@@ -196,9 +197,11 @@ public class StreamParser extends Thread{
         long currentTime = bytesToLong(Arrays.copyOfRange(payload,1,7));
         long raceId = bytesToLong(Arrays.copyOfRange(payload,7,11));
         int raceStatus = payload[11];
-//        System.out.println("raceStatus = " + raceStatus);
         long expectedStartTime = bytesToLong(Arrays.copyOfRange(payload,12,18));
+        long windDir = bytesToLong(Arrays.copyOfRange(payload,18,20));
+        long windSpeed = bytesToLong(Arrays.copyOfRange(payload,20,22));
 
+        currentTimeLong = currentTime;
         DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         if (xmlObject.getRegattaXML() != null) {
             format.setTimeZone(TimeZone.getTimeZone(getTimeZoneString()));
@@ -206,7 +209,6 @@ public class StreamParser extends Thread{
         }
         long timeTillStart = ((new Date (expectedStartTime)).getTime() - (new Date (currentTime)).getTime())/1000;
 
-
         if (timeTillStart > 0) {
             timeSinceStart = timeTillStart;
             //System.out.println("Time till start: " + timeTillStart + " Seconds");
@@ -223,10 +225,10 @@ public class StreamParser extends Thread{
             //System.out.println("Time since start: " + -1 * timeTillStart + " Seconds");
             timeSinceStart = timeTillStart;
         }
-        long windDir = bytesToLong(Arrays.copyOfRange(payload,18,20));
+
         double windDirFactor = 0x4000 / 90;   //0x4000 is 90 degrees, 0x8000 is 180 degrees, etc...
         windDirection = windDir / windDirFactor;
-        long windSpeed = bytesToLong(Arrays.copyOfRange(payload,20,22));
+
         int noBoats = payload[22];
         int raceType = payload[23];
 //        ArrayList<String> boatStatuses = new ArrayList<>();
@@ -429,6 +431,9 @@ public class StreamParser extends Thread{
         int roundingSide = payload[18];
         int markType = payload[19];
         int markId = payload[20];
+
+        // assign mark rounding time to boat
+        boats.get((int)subjectId).setMarkRoundingTime(timeStamp);
     }
 
     /**

From 764ae37ce47feca584f6cfcec3b56db7577337d7 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Mon, 15 May 2017 14:09:09 +1200
Subject: [PATCH 12/36] Gave the boatgroups a selection attribute, allowing
 them to be highlighted upon clicking

Boats can be clicked on canvas or from selection drop down on the side

#story[955]
---
 .../controllers/RaceViewController.java       | 37 +++++++++++++++++++
 src/main/java/seng302/models/BoatGroup.java   | 32 +++++++++++++++-
 src/main/java/seng302/models/Yacht.java       |  5 +++
 src/main/resources/views/RaceView.fxml        |  2 +
 4 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 24ff0163..438f972b 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -5,11 +5,15 @@ import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableArray;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Slider;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
@@ -50,6 +54,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     @FXML
     private Button selectAnnotationBtn;
     @FXML
+    private ComboBox boatSelectionComboBox;
+    @FXML
     private CanvasController includedCanvasController;
 
     private ArrayList<Yacht> startingBoats = new ArrayList<>();
@@ -79,6 +85,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initializeSettings();
         initialiseWindDirection();
         initialisePositionVBox();
+        initialiseBoatSelectionComboBox();
         //set wind direction!!!!!!! can't find another place to put my code --haoming
 //        double windDirection = new ConfigParser("/config/config.xml").getWindDirection();
 //        windDirectionText.setText(String.format("%.1f°", windDirection));
@@ -220,6 +227,16 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
     }
 
+    private void initialiseBoatSelectionComboBox() {
+
+        ObservableList<Yacht> observableBoats =  FXCollections.observableArrayList(startingBoats);
+        boatSelectionComboBox.setItems(observableBoats);
+        boatSelectionComboBox.valueProperty().addListener((observable, oldValue, newValue) -> {
+            Yacht thisYacht = (Yacht) newValue;
+            setSelectedBoat(thisYacht);
+        });
+    }
+
     /**
      * Generates time line for each boat, and stores time time into timelineInfos hash map
      */
@@ -511,6 +528,26 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
+
+    /**
+     * Sets all the annotations of the selected boat to be visible and all others to be hidden
+     * @param yacht The yacht for which we want to view all annotations
+     */
+    private void setSelectedBoat(Yacht yacht) {
+        for (RaceObject ro : includedCanvasController.getRaceObjects()) {
+            if (ro instanceof BoatGroup) {
+                BoatGroup bg = (BoatGroup) ro;
+                //We need to iterate over all race groups to get the matching boat group belonging to this boat if we
+                //are to toggle its annotations, there is no other backwards knowledge of a yacht to its boatgroup.
+                if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
+                    bg.setIsSelected(true);
+                } else {
+                    bg.setIsSelected(false);
+                }
+            }
+        }
+    }
+
     void setStage (Stage stage) {
         this.stage = stage;
     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 57dd48db..a2831c52 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -1,13 +1,16 @@
 package seng302.models;
 
+import javafx.event.EventHandler;
 import javafx.geometry.Point2D;
 import javafx.scene.Group;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Line;
 import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
+import seng302.controllers.RaceViewController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,6 +42,7 @@ public class BoatGroup extends RaceObject{
     private Text teamNameObject;
     private Text velocityObject;
     private Wake wake;
+    private boolean isSelected = false;
     //Handles boat moving when connecting to a stream
     private boolean setToInitialLocation = false;
     private boolean destinationSet;
@@ -80,6 +84,9 @@ public class BoatGroup extends RaceObject{
     private void initChildren (Color color, double... points) {
         boatPoly = new Polygon(points);
         boatPoly.setFill(color);
+        boatPoly.setOnMouseEntered(event -> boatPoly.setFill(Color.FLORALWHITE));
+        boatPoly.setOnMouseExited(event -> boatPoly.setFill(color));
+        boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected));        //Toggle the selection of the boat
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
@@ -176,7 +183,7 @@ public class BoatGroup extends RaceObject{
                             boatPoly.getLayoutY()
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
-                    l.setStroke(boatPoly.getFill());
+                    l.setStroke(boat.getColour());
                     lineGroup.getChildren().add(l);
                 }
                 if (destinationSet) { //Only begin drawing after the first destination is set
@@ -279,6 +286,10 @@ public class BoatGroup extends RaceObject{
         wake.rotate(rotationalGoal);
     }
 
+    public void paintBoat (Color color) {
+        boatPoly.setFill(color);
+    }
+
     public void setTeamNameObjectVisible(Boolean visible) {
         teamNameObject.setVisible(visible);
     }
@@ -299,6 +310,20 @@ public class BoatGroup extends RaceObject{
         return boat;
     }
 
+    /**
+     * This function sets the boats isSelected property AS WELL as actually acting upon the value of that selection.
+     * (Painting or not painting annotations)
+     * @param isSelected A Boolean indicating whether or not the boat is selected
+     */
+    public void setIsSelected(Boolean isSelected) {
+        this.isSelected = isSelected;
+        setTeamNameObjectVisible(isSelected);
+        setVelocityObjectVisible(isSelected);
+        setLineGroupVisible(isSelected);
+        setWakeVisible(isSelected);
+        paintBoat((isSelected) ? Color.WHITE : boat.getColour());
+    }
+
     /**
      * Returns true if this BoatGroup contains at least one of the given IDs.
      *
@@ -355,4 +380,9 @@ public class BoatGroup extends RaceObject{
             }
         });
     }
+
+    @Override
+    public String toString() {
+        return boat.toString();
+    }
 }
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 68970268..64509882 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -164,4 +164,9 @@ public class Yacht {
     public void setMarkLastPast(Integer markLastPast) {
         this.markLastPast = markLastPast;
     }
+
+    @Override
+    public String toString() {
+        return boatName;
+    }
 }
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 32d6f710..3dc8bf9c 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -59,6 +59,8 @@
             <Slider fx:id="annotationSlider" blockIncrement="1.0" layoutX="38.0" layoutY="527.0" majorTickUnit="1.0" max="3.0" minorTickCount="0" prefHeight="51.0" prefWidth="170.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" styleClass="ui-slider" />
             <Label layoutX="10.0" layoutY="499.0" text="Annotations" textFill="WHITE" />
             <Button fx:id="selectAnnotationBtn" layoutX="35.0" layoutY="578.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="170.0" styleClass="blue-ui-btn" text="Select Annotations" textFill="WHITE" />
+            <Text fill="WHITE" layoutX="11.0" layoutY="649.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Selection" />
+            <ComboBox fx:id="boatSelectionComboBox" layoutX="37.0" layoutY="664.0" prefHeight="25.0" prefWidth="170.0" promptText="Select Boat" styleClass="blue" />
             </children>
         </AnchorPane>
         <AnchorPane fx:id="contentAnchorPane" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">

From 081d7e3dcb2f426109963681d34216163e777f38 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 14:52:57 +1200
Subject: [PATCH 13/36] Fixed the parsing of bytes being off by one byte in the
 stream parser fr the race status packet.

#story[924] #pair[kre39,zyt10]
---
 src/main/java/seng302/App.java                         | 4 +++-
 src/main/java/seng302/models/Yacht.java                | 8 ++++----
 src/main/java/seng302/models/parsers/StreamParser.java | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..60f22080 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,7 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 68970268..31871684 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -114,10 +114,10 @@ public class Yacht {
         this.penaltiesServed = penaltiesServed;
     }
 
-    public Long getEstimateTimeAtNextMark() {
-//        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-//        return format.format(estimateTimeAtNextMark);
-        return estimateTimeAtNextMark;
+    public String getEstimateTimeAtNextMark() {
+        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        return format.format(estimateTimeAtNextMark);
+//        return estimateTimeAtNextMark;
     }
 
     public void setEstimateTimeAtNextMark(Long estimateTimeAtNextMark) {
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..ab15722b 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -236,11 +236,11 @@ public class StreamParser extends Thread{
             Yacht boat = boats.get((int)(long) boatStatusSourceID);
             boat.setBoatStatus((int)payload[28 + (i * 20)]);
             boat.setLegNumber((int)payload[29 + (i * 20)]);
-            boat.setPenaltiesAwarded((int)payload[29 + (i * 20)]);
-            boat.setPenaltiesServed((int)payload[30 + (i * 20)]);
-            Long estTimeAtNextMark = bytesToLong(Arrays.copyOfRange(payload,31 + (i * 20),37+ (i * 20)));
+            boat.setPenaltiesAwarded((int)payload[30 + (i * 20)]);
+            boat.setPenaltiesServed((int)payload[31 + (i * 20)]);
+            Long estTimeAtNextMark = bytesToLong(Arrays.copyOfRange(payload,32 + (i * 20),38+ (i * 20)));
             boat.setEstimateTimeAtNextMark(estTimeAtNextMark);
-            Long estTimeAtFinish = bytesToLong(Arrays.copyOfRange(payload,37 + (i * 20),43+ (i * 20)));
+            Long estTimeAtFinish = bytesToLong(Arrays.copyOfRange(payload,38 + (i * 20),44+ (i * 20)));
             boat.setEstimateTimeAtFinish(estTimeAtFinish);
             boatsPos.put(estTimeAtFinish, boat);
 //            String boatStatus = "SourceID: " + boatStatusSourceID;

From 2e914a7704b0d2fcab297ccfec4f97115075e0c8 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 15:49:21 +1200
Subject: [PATCH 14/36] Fixed estimate time to next mark to match acceptance
 criteria which is countdown in minutes and seconds.

 #story[924]
---
 src/main/java/seng302/App.java                        |  4 ++--
 src/main/java/seng302/models/BoatGroup.java           | 11 +++++++++--
 src/main/java/seng302/models/Yacht.java               |  8 ++++----
 .../java/seng302/models/parsers/StreamParser.java     | 11 +++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 60f22080..80163138 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,9 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
 
-//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 1d689c5f..8204a41c 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -8,7 +8,10 @@ import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
+import seng302.models.parsers.StreamParser;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -86,7 +89,9 @@ public class BoatGroup extends RaceObject{
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
-        estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
+        DateFormat format = new SimpleDateFormat("mm:ss");
+        String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+        estTimeToNextMarkObject = new Text("Next mark: " + timeToNextMark);
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -236,7 +241,9 @@ public class BoatGroup extends RaceObject{
                     wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
-                estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
+                DateFormat format = new SimpleDateFormat("mm:ss");
+                String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+                estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark);
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 31871684..68970268 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -114,10 +114,10 @@ public class Yacht {
         this.penaltiesServed = penaltiesServed;
     }
 
-    public String getEstimateTimeAtNextMark() {
-        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-        return format.format(estimateTimeAtNextMark);
-//        return estimateTimeAtNextMark;
+    public Long getEstimateTimeAtNextMark() {
+//        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+//        return format.format(estimateTimeAtNextMark);
+        return estimateTimeAtNextMark;
     }
 
     public void setEstimateTimeAtNextMark(Long estimateTimeAtNextMark) {
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index ab15722b..1aca5826 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -39,6 +39,7 @@ public class StreamParser extends Thread{
      private static Map<Integer, Yacht> boats = new HashMap<>();
      private static Map<Long, Yacht> boatsPos = new TreeMap<>();
      private static double windDirection = 0;
+     private static Long currentTimeLong;
      private static String currentTimeString;
      private static boolean appRunning;
 
@@ -199,6 +200,7 @@ public class StreamParser extends Thread{
 //        System.out.println("raceStatus = " + raceStatus);
         long expectedStartTime = bytesToLong(Arrays.copyOfRange(payload,12,18));
 
+        currentTimeLong = currentTime;
         DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         if (xmlObject.getRegattaXML() != null) {
             format.setTimeZone(TimeZone.getTimeZone(getTimeZoneString()));
@@ -575,6 +577,15 @@ public class StreamParser extends Thread{
         return boatsPos;
     }
 
+    /**
+     * returns current time in stream in long
+     *
+     * @return a long value of current time
+     */
+    public static Long getCurrentTimeLong() {
+        return currentTimeLong;
+    }
+
     public static void appClose(){
         appRunning = false;
         System.out.println("[CLIENT] Shutting down stream parser");

From 5fa47ff65b290f16fcc86bfa9716027808d6ee49 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 16:31:04 +1200
Subject: [PATCH 15/36] Implemented elapsed time since last mark on annotation.

 #story[927]
---
 .../controllers/RaceViewController.java       | 130 +++++++------
 .../controllers/annotations/Annotation.java   |   3 +-
 .../ImportantAnnotationController.java        |  55 ++++--
 src/main/java/seng302/models/BoatGroup.java   | 173 +++++++++++-------
 .../views/importantAnnotationSelectView.fxml  |   3 +-
 5 files changed, 223 insertions(+), 141 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index f0ea2c51..aa09d9d1 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -33,7 +33,8 @@ import java.util.*;
 /**
  * Created by ptg19 on 29/03/17.
  */
-public class RaceViewController extends Thread implements ImportantAnnotationDelegate{
+public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
+
     @FXML
     private VBox positionVbox;
     @FXML
@@ -85,11 +86,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
     /**
      * The important annotations have been changed, update this view
+     *
      * @param importantAnnotationsState The current state of the selected annotations
      */
-    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState){
+    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState) {
         this.importantAnnotations = importantAnnotationsState;
-        setAnnotations((int)annotationSlider.getValue()); // Refresh the displayed annotations
+        setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
     /**
@@ -101,12 +103,14 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             Stage stage = new Stage();
 
             // Set controller
-            ImportantAnnotationController controller = new ImportantAnnotationController(this, stage);
+            ImportantAnnotationController controller = new ImportantAnnotationController(this,
+                stage);
             fxmlLoader.setController(controller);
 
             // Load FXML and set CSS
-            fxmlLoader.setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
-            Scene scene = new Scene(fxmlLoader.load(), 469, 248);
+            fxmlLoader
+                .setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 469, 270);
             scene.getStylesheets().add(getClass().getResource("/css/master.css").toString());
             stage.initStyle(StageStyle.UNDECORATED);
 
@@ -125,7 +129,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
         toggleFps.selectedProperty().addListener(new ChangeListener<Boolean>() {
             @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue,
+                Boolean newValue) {
                 displayFps = !displayFps;
             }
         });
@@ -134,10 +139,18 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
             public String toString(Double n) {
-                if (n == 0) return "None";
-                if (n == 1) return "Low";
-                if (n == 2) return "Important";
-                if (n == 3) return "All";
+                if (n == 0) {
+                    return "None";
+                }
+                if (n == 1) {
+                    return "Low";
+                }
+                if (n == 2) {
+                    return "Important";
+                }
+                if (n == 3) {
+                    return "All";
+                }
 
                 return "All";
             }
@@ -161,25 +174,25 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
 
         annotationSlider.valueProperty().addListener((obs, oldval, newVal) ->
-                    setAnnotations((int)annotationSlider.getValue()));
+            setAnnotations((int) annotationSlider.getValue()));
 
         annotationSlider.setValue(3);
     }
 
-    private void initializeTimer(){
+    private void initializeTimer() {
         timerTimeline = new Timeline();
         timerTimeline.setCycleCount(Timeline.INDEFINITE);
         // Run timer update every second
         timerTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            if (StreamParser.isRaceFinished()) {
-                                timerLabel.setFill(Color.RED);
-                                timerLabel.setText("Race Finished!");
-                            } else {
-                                timerLabel.setText(currentTimer());
-                            }
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    if (StreamParser.isRaceFinished()) {
+                        timerLabel.setFill(Color.RED);
+                        timerLabel.setText("Race Finished!");
+                    } else {
+                        timerLabel.setText(currentTimer());
+                    }
+                })
         );
 
         // Start the timer
@@ -190,11 +203,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Timeline windDirTimeline = new Timeline();
         windDirTimeline.setCycleCount(Timeline.INDEFINITE);
         windDirTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            windDirectionText.setText(String.format("%.1f°", StreamParser.getWindDirection()));
-                            windArrowText.setRotate(StreamParser.getWindDirection());
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    windDirectionText
+                        .setText(String.format("%.1f°", StreamParser.getWindDirection()));
+                    windArrowText.setRotate(StreamParser.getWindDirection());
+                })
         );
         windDirTimeline.playFromStart();
     }
@@ -204,10 +218,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Timeline posVBoxTimeline = new Timeline();
         posVBoxTimeline.setCycleCount(Timeline.INDEFINITE);
         posVBoxTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            showOrder();
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    showOrder();
+                })
         );
         posVBoxTimeline.playFromStart();
 
@@ -240,13 +254,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " (Finished)");
+                    boat.getShortName() + " (Finished)");
                 textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                 positionVbox.getChildren().add(textToAdd);
 
             } else {
                 Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " ");
+                    boat.getShortName() + " ");
                 textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                 textToAdd.setStyle("");
                 positionVbox.getChildren().add(textToAdd);
@@ -291,6 +305,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     public void stopTimer() {
         timerTimeline.stop();
     }
+
     public void startTimer() {
         timerTimeline.play();
     }
@@ -303,49 +318,51 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return race;
     }
 
-    public ArrayList<Yacht> getStartingBoats(){
+    public ArrayList<Yacht> getStartingBoats() {
         return startingBoats;
     }
 
     /**
      * Display the important annotations for a specific BoatGroup
+     *
      * @param bg The boat group to set the annotations for
      */
-    private void setBoatGroupImportantAnnotations(BoatGroup bg){
-        if (importantAnnotations.getAnnotationState(Annotation.NAME)){
+    private void setBoatGroupImportantAnnotations(BoatGroup bg) {
+        if (importantAnnotations.getAnnotationState(Annotation.NAME)) {
             bg.setTeamNameObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setTeamNameObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.SPEED)){
+        if (importantAnnotations.getAnnotationState(Annotation.SPEED)) {
             bg.setVelocityObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setVelocityObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.TRACK)){
+        if (importantAnnotations.getAnnotationState(Annotation.TRACK)) {
             bg.setLineGroupVisible(true);
-        }
-        else{
+        } else {
             bg.setLineGroupVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.WAKE)){
+        if (importantAnnotations.getAnnotationState(Annotation.WAKE)) {
             bg.setWakeVisible(true);
-        }
-        else{
+        } else {
             bg.setWakeVisible(false);
         }
 
         if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
             bg.setEstTimeToNextMarkObjectVisible(true);
-        }
-        else {
+        } else {
             bg.setEstTimeToNextMarkObjectVisible(false);
         }
+
+        if (importantAnnotations.getAnnotationState(Annotation.LEGTIME)) {
+            bg.setLegTimeObjectVisible(true);
+        } else {
+            bg.setLegTimeObjectVisible(false);
+        }
     }
 
     private void setAnnotations(Integer annotationLevel) {
@@ -353,11 +370,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // No Annotations
             case 0:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(false);
                         bg.setVelocityObjectVisible(false);
                         bg.setEstTimeToNextMarkObjectVisible(false);
+                        bg.setLegTimeObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -366,11 +384,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // Low Annotations
             case 1:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(false);
                         bg.setEstTimeToNextMarkObjectVisible(false);
+                        bg.setLegTimeObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -379,7 +398,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // Important Annotations
             case 2:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         setBoatGroupImportantAnnotations(bg);
                     }
@@ -388,11 +407,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // All Annotations
             case 3:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(true);
                         bg.setEstTimeToNextMarkObjectVisible(true);
+                        bg.setLegTimeObjectVisible(true);
                         bg.setLineGroupVisible(true);
                         bg.setWakeVisible(true);
                     }
@@ -401,11 +421,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
-    void setStage (Stage stage) {
+    void setStage(Stage stage) {
         this.stage = stage;
     }
 
-    Stage getStage () {
+    Stage getStage() {
         return stage;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/controllers/annotations/Annotation.java b/src/main/java/seng302/controllers/annotations/Annotation.java
index 0eea5ee2..20a2c265 100644
--- a/src/main/java/seng302/controllers/annotations/Annotation.java
+++ b/src/main/java/seng302/controllers/annotations/Annotation.java
@@ -8,5 +8,6 @@ public enum Annotation {
     WAKE,
     TRACK,
     NAME,
-    ESTTIMETONEXTMARK
+    ESTTIMETONEXTMARK,
+    LEGTIME
 }
diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
index 95fe84d3..8dfa8df7 100644
--- a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
@@ -15,6 +15,7 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 public class ImportantAnnotationController implements Initializable {
+
     /*
      * JavaFX Outlets
      */
@@ -33,6 +34,9 @@ public class ImportantAnnotationController implements Initializable {
     @FXML
     private CheckBox boatEstTimeToNextMarkSelect;
 
+    @FXML
+    private CheckBox boatElapsedTimeSelect;
+
     @FXML
     private AnchorPane annotationSelectWindow;
 
@@ -43,7 +47,7 @@ public class ImportantAnnotationController implements Initializable {
     private ImportantAnnotationsState importantAnnotationsState;
     private Stage stage;
 
-    public ImportantAnnotationController(ImportantAnnotationDelegate delegate, Stage stage){
+    public ImportantAnnotationController(ImportantAnnotationDelegate delegate, Stage stage) {
         this.delegate = delegate;
         importantAnnotationsState = new ImportantAnnotationsState();
         this.stage = stage;
@@ -52,10 +56,11 @@ public class ImportantAnnotationController implements Initializable {
     /**
      * Sets whether or not an annotation is considered important, then
      * sends an update to the delegate
+     *
      * @param annotation The annotation
      * @param isSet True if annotation is important
      */
-    private void setAnnotation(Annotation annotation, Boolean isSet){
+    private void setAnnotation(Annotation annotation, Boolean isSet) {
         importantAnnotationsState.setAnnotationState(annotation, isSet);
         sendUpdate();
     }
@@ -64,40 +69,50 @@ public class ImportantAnnotationController implements Initializable {
      * Sends an update to the delegate when the important
      * annotations have changed
      */
-    private void sendUpdate(){
+    private void sendUpdate() {
         this.delegate.importantAnnotationsChanged(importantAnnotationsState);
     }
 
     /**
      * Load the current state of the 'important annotations'
+     *
      * @param currentState hashmap containing the states of each annotation
      */
-    public void loadState(ImportantAnnotationsState currentState){
+    public void loadState(ImportantAnnotationsState currentState) {
         this.importantAnnotationsState = currentState;
 
         // Initialise checkboxes
-        for (Annotation annotation : importantAnnotationsState.getAnnotations()){
-            switch (annotation){
+        for (Annotation annotation : importantAnnotationsState.getAnnotations()) {
+            switch (annotation) {
                 case WAKE:
-                    boatWakeSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatWakeSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case SPEED:
-                    boatSpeedSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatSpeedSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case TRACK:
-                    boatTrackSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatTrackSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case NAME:
-                    boatNameSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatNameSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case ESTTIMETONEXTMARK:
-                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatEstTimeToNextMarkSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
+                case LEGTIME:
+                    boatElapsedTimeSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
+
                 default:
                     break;
             }
@@ -106,16 +121,24 @@ public class ImportantAnnotationController implements Initializable {
 
     /**
      * View did load
+     *
      * @param location .
      * @param resources .
      */
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        boatWakeSelect.setOnAction(event -> setAnnotation(Annotation.WAKE, boatWakeSelect.isSelected()));
-        boatSpeedSelect.setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
-        boatTrackSelect.setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
-        boatNameSelect.setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
-        boatEstTimeToNextMarkSelect.setOnAction(event -> setAnnotation(Annotation.ESTTIMETONEXTMARK, boatEstTimeToNextMarkSelect.isSelected()));
+        boatWakeSelect
+            .setOnAction(event -> setAnnotation(Annotation.WAKE, boatWakeSelect.isSelected()));
+        boatSpeedSelect
+            .setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
+        boatTrackSelect
+            .setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
+        boatNameSelect
+            .setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
+        boatEstTimeToNextMarkSelect.setOnAction(event -> setAnnotation(Annotation.ESTTIMETONEXTMARK,
+            boatEstTimeToNextMarkSelect.isSelected()));
+        boatElapsedTimeSelect.setOnAction(
+            event -> setAnnotation(Annotation.LEGTIME, boatElapsedTimeSelect.isSelected()));
 
         closeButton.setOnAction(event -> stage.close());
     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 34faf696..e07c57ee 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -16,13 +16,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2 dimensional boat.
- * It contains a single polygon for the boat, a group of lines to show it's path, a wake object and two text labels to
- * annotate the boat teams name and the boats velocity. The boat will update it's position onscreen everytime
- * UpdatePosition is called unless the window is minimized in which case it attempts to store animations and apply them
- * when the window is maximised.
+ * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2
+ * dimensional boat. It contains a single polygon for the boat, a group of lines to show it's path,
+ * a wake object and two text labels to annotate the boat teams name and the boats velocity. The
+ * boat will update it's position onscreen everytime UpdatePosition is called unless the window is
+ * minimized in which case it attempts to store animations and apply them when the window is
+ * maximised.
  */
-public class BoatGroup extends RaceObject{
+public class BoatGroup extends RaceObject {
 
     //Constants for drawing
     private static final double TEAMNAME_X_OFFSET = 10d;
@@ -53,50 +54,61 @@ public class BoatGroup extends RaceObject{
     private boolean destinationSet;
     //Variables for handling minimization
     private Stage stage;
-    private boolean isMaximized= true;
+    private boolean isMaximized = true;
     private List<Line> lineStorage = new ArrayList<>();
     private int setCallCount = 5;
 
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used to tell which
-     *             BoatGroup to update.
+     *
+     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
+     * to tell which BoatGroup to update.
      * @param color The colour of the boat polygon and the trailing line.
      */
-    public BoatGroup (Yacht boat, Color color){
+    public BoatGroup(Yacht boat, Color color) {
         this.boat = boat;
         initChildren(color);
     }
 
     /**
-     * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be at point (0,0).
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used to tell which
-     *             BoatGroup to update.
+     * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be
+     * at point (0,0).
+     *
+     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
+     * to tell which BoatGroup to update.
      * @param color The colour of the boat polygon and the trailing line.
-     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat polygon.
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
      */
-    public BoatGroup (Yacht boat, Color color, double... points)
-    {
+    public BoatGroup(Yacht boat, Color color, double... points) {
         this.boat = boat;
         initChildren(color, points);
     }
 
     /**
      * Creates the javafx objects that will be the in the group by default.
+     *
      * @param color The colour of the boat polygon and the trailing line.
-     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat polygon.
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
      */
-    private void initChildren (Color color, double... points) {
+    private void initChildren(Color color, double... points) {
         boatPoly = new Polygon(points);
         boatPoly.setFill(color);
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
-        estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
-        legTimeObject = new Text(String.valueOf(boat.getMarkRoundingTime()));
         DateFormat format = new SimpleDateFormat("mm:ss");
-        String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+        String timeToNextMark = format
+            .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
         estTimeToNextMarkObject = new Text("Next mark: " + timeToNextMark);
+        if (boat.getMarkRoundingTime() != null) {
+            String elapsedTime = format
+                .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
+            legTimeObject = new Text("Last mark: " + elapsedTime);
+        } else {
+            legTimeObject = new Text("Last mark: -");
+        }
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -109,29 +121,35 @@ public class BoatGroup extends RaceObject{
 
         estTimeToNextMarkObject.setX(ESTTIMETONEXTMARK_X_OFFSET);
         estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
-        estTimeToNextMarkObject.relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
+        estTimeToNextMarkObject
+            .relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
 
         legTimeObject.setX(LEGTIME_X_OFFSET);
         legTimeObject.setY(LEGTIME_Y_OFFSET);
         legTimeObject.relocate(legTimeObject.getX(), legTimeObject.getY());
 
         wake = new Wake(0, -BOAT_HEIGHT);
-        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject, legTimeObject);
+        super.getChildren()
+            .addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject,
+                legTimeObject);
     }
 
     /**
      * Creates the javafx objects that will be the in the group by default.
+     *
      * @param color The colour of the boat polygon and the trailing line.
      */
-    private void initChildren (Color color) {
+    private void initChildren(Color color) {
         initChildren(color,
-                -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
-                0.0, -BOAT_HEIGHT / 2,
-                BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
+            -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
+            0.0, -BOAT_HEIGHT / 2,
+            BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
     }
 
     /**
-     * Moves the boat and its children annotations from its current coordinates by specified amounts.
+     * Moves the boat and its children annotations from its current coordinates by specified
+     * amounts.
+     *
      * @param dx The amount to move the X coordinate by
      * @param dy The amount to move the Y coordinate by
      */
@@ -153,21 +171,23 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Moves the boat and its children annotations to coordinates specified
+     *
      * @param x The X coordinate to move the boat to
      * @param y The Y coordinate to move the boat to
      * @param rotation The heading in degrees from north the boat should rotate to.
      */
-    public void moveTo (double x, double y, double rotation) {
+    public void moveTo(double x, double y, double rotation) {
         rotateTo(rotation);
         moveTo(x, y);
     }
 
     /**
      * Moves the boat and its children annotations to coordinates specified
+     *
      * @param x The X coordinate to move the boat to
      * @param y The Y coordinate to move the boat to
      */
-    public void moveTo (double x, double y) {
+    public void moveTo(double x, double y) {
         boatPoly.setLayoutX(x);
         boatPoly.setLayoutY(y);
         teamNameObject.setLayoutX(x);
@@ -185,9 +205,11 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Updates the position of all graphics in the BoatGroup based off of the given time interval.
-     * @param timeInterval The interval, in milliseconds, the boat should update it's position based on.
+     *
+     * @param timeInterval The interval, in milliseconds, the boat should update it's position based
+     * on.
      */
-    public void updatePosition (long timeInterval) {
+    public void updatePosition(long timeInterval) {
         //Calculate the movement of the boat.
         if (isMaximized) {
             double dx = pixelVelocityX * timeInterval;
@@ -200,10 +222,10 @@ public class BoatGroup extends RaceObject{
                 distanceTravelled = 0;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            boatPoly.getLayoutX(),
-                            boatPoly.getLayoutY()
+                        lastPoint.getX(),
+                        lastPoint.getY(),
+                        boatPoly.getLayoutX(),
+                        boatPoly.getLayoutY()
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
@@ -219,18 +241,21 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Sets the destination of the boat and the headng it should have once it reaches
+     *
      * @param newXValue The X co-ordinate the boat needs to move to.
      * @param newYValue The Y co-ordinate the boat needs to move to.
      * @param rotation Rotation to move graphics to.
      * @param raceIds RaceID of the object to move.
      */
-    public void setDestination (double newXValue, double newYValue, double rotation, double groundSpeed, int... raceIds) {
+    public void setDestination(double newXValue, double newYValue, double rotation,
+        double groundSpeed, int... raceIds) {
         if (hasRaceId(raceIds)) {
             if (setToInitialLocation) {
                 destinationSet = true;
                 boat.setVelocity(groundSpeed);
-                if (currentRotation < 0)
+                if (currentRotation < 0) {
                     currentRotation = 360 - currentRotation;
+                }
                 double dx = newXValue - boatPoly.getLayoutX();
                 double dy = newYValue - boatPoly.getLayoutY();
                 //Check movement is reasonable. Assumes a 1000 * 1000 canvas
@@ -251,14 +276,23 @@ public class BoatGroup extends RaceObject{
                     rotationalVelocity = 0;
                     wakeGenerationDelay--;
                 } else {
-                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
+                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal,
+                        boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
-                estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
-                legTimeObject.setText(String.valueOf(boat.getMarkRoundingTime()));
                 DateFormat format = new SimpleDateFormat("mm:ss");
-                String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+                // estimate time to next mark
+                String timeToNextMark = format
+                    .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
                 estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark);
+                // elapsed time
+                if (boat.getMarkRoundingTime() != null) {
+                    String elapsedTime = format
+                        .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
+                    legTimeObject.setText("Last mark: " + elapsedTime);
+                } else {
+                    legTimeObject.setText("Last mark: -");
+                }
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;
@@ -269,14 +303,14 @@ public class BoatGroup extends RaceObject{
         if (!isMaximized) {
             setToInitialLocation = false;
             wakeGenerationDelay = 2;
-            if(setCallCount-- == 0) {
+            if (setCallCount-- == 0) {
                 setCallCount = 5;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            newXValue,
-                            newYValue
+                        lastPoint.getX(),
+                        lastPoint.getY(),
+                        newXValue,
+                        newYValue
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
@@ -289,28 +323,29 @@ public class BoatGroup extends RaceObject{
         }
     }
 
-    public void setDestination (double newXValue, double newYValue, double groundSpeed, int... raceIDs) {
+    public void setDestination(double newXValue, double newYValue, double groundSpeed,
+        int... raceIDs) {
         destinationSet = true;
 
         if (hasRaceId(raceIDs)) {
             double rotation = Math.abs(
-                    Math.toDegrees(
-                            Math.atan(
-                                    (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
-                            )
+                Math.toDegrees(
+                    Math.atan(
+                        (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
                     )
+                )
             );
             setDestination(newXValue, newYValue, rotation, groundSpeed, raceIDs);
         }
     }
 
-    public void rotateTo (double rotation) {
+    public void rotateTo(double rotation) {
         currentRotation = rotation;
         boatPoly.getTransforms().setAll(new Rotate(rotation));
     }
 
-    public void forceRotation () {
-        rotateTo (rotationalGoal);
+    public void forceRotation() {
+        rotateTo(rotationalGoal);
         wake.rotate(rotationalGoal);
     }
 
@@ -326,7 +361,7 @@ public class BoatGroup extends RaceObject{
         estTimeToNextMarkObject.setVisible(visible);
     }
 
-    public void setLegObjectTime(Boolean visible) {
+    public void setLegTimeObjectVisible(Boolean visible) {
         legTimeObject.setVisible(visible);
     }
 
@@ -348,10 +383,11 @@ public class BoatGroup extends RaceObject{
      * @param raceIds The ID's to check the BoatGroup for.
      * @return True if the BoatGroup contains at east one of the given IDs, false otherwise.
      */
-    public boolean hasRaceId (int... raceIds) {
+    public boolean hasRaceId(int... raceIds) {
         for (int id : raceIds) {
-            if (id == boat.getSourceID())
+            if (id == boat.getSourceID()) {
                 return true;
+            }
         }
         return false;
     }
@@ -361,31 +397,32 @@ public class BoatGroup extends RaceObject{
      *
      * @return An array containing all ID's associated with this RaceObject.
      */
-    public int[] getRaceIds () {
-        return new int[] {boat.getSourceID()};
+    public int[] getRaceIds() {
+        return new int[]{boat.getSourceID()};
     }
 
     /**
-     * Due to javaFX limitations annotations associated with a boat that you want to appear below all boats in the
-     * Z-axis need to be pulled out of the BoatGroup and added to the parent group of the BoatGroups. This function
-     * returns these annotations as a group.
+     * Due to javaFX limitations annotations associated with a boat that you want to appear below
+     * all boats in the Z-axis need to be pulled out of the BoatGroup and added to the parent group
+     * of the BoatGroups. This function returns these annotations as a group.
      *
      * @return A group containing low priority annotations.
      */
-    public Group getLowPriorityAnnotations () {
+    public Group getLowPriorityAnnotations() {
         Group group = new Group();
         group.getChildren().addAll(wake, lineGroup);
         return group;
     }
 
     /**
-     * Use this function to let the BoatGroup know about the stage it is in. If it knows about it's stage then it will
-     * listen to the iconified property of that stage and change it's behaviour upon minimization. Without setting the
-     * Stage there is guarantee that the BoatGroup will draw properly when the stage is minimized.
+     * Use this function to let the BoatGroup know about the stage it is in. If it knows about it's
+     * stage then it will listen to the iconified property of that stage and change it's behaviour
+     * upon minimization. Without setting the Stage there is guarantee that the BoatGroup will draw
+     * properly when the stage is minimized.
      *
      * @param stage The stage that the BoatGroup is added to.
      */
-    public void setStage (Stage stage) {
+    public void setStage(Stage stage) {
         /* TODO: 4/05/17 cir27 - Find a way to get the stage to this point. Need to pass it through multiple controllers.
                                  App.start() -> Controller.setContentPane -> RaceViewController -> CanvasController
          */
diff --git a/src/main/resources/views/importantAnnotationSelectView.fxml b/src/main/resources/views/importantAnnotationSelectView.fxml
index da89b52a..8b21c2d9 100644
--- a/src/main/resources/views/importantAnnotationSelectView.fxml
+++ b/src/main/resources/views/importantAnnotationSelectView.fxml
@@ -5,7 +5,7 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane fx:id="annotationSelectWindow" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="248.0" prefWidth="469.0" styleClass="background-blue" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane fx:id="annotationSelectWindow" maxHeight="270.0" maxWidth="469.0" minHeight="270.0" minWidth="469.0" prefHeight="270.0" prefWidth="469.0" styleClass="background-blue" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Text fill="WHITE" layoutX="26.0" layoutY="52.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Select important annotations">
          <font>
@@ -26,5 +26,6 @@
             <String fx:value="clearExitButton" />
          </styleClass>
       </Button>
+      <CheckBox fx:id="boatElapsedTimeSelect" layoutX="26.0" layoutY="235.0" mnemonicParsing="false" text="Boat Elapsed Time Since Last Mark" textFill="#e7e7e7" />
    </children>
 </AnchorPane>

From 51f090324a1758d5b7539ef3a780570c67150e13 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Mon, 15 May 2017 16:44:28 +1200
Subject: [PATCH 16/36] CSS on annotation selection and minor bug fixes.
 Changed annotation slider to only have None, important and All

#story[955]
---
 src/main/java/seng302/App.java                |   2 +
 .../controllers/RaceViewController.java       |  35 ++--
 src/main/java/seng302/models/BoatGroup.java   | 151 ++++++++++--------
 src/main/resources/css/master.css             |  18 +++
 src/main/resources/views/RaceView.fxml        |   4 +-
 5 files changed, 117 insertions(+), 93 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..3b88fd00 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -63,6 +63,8 @@ public class App extends Application
         //Change the StreamReceiver in this else block to change the default data source.
         else{
             sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 438f972b..1f015913 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -75,9 +75,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         raceController.initializeRace();
         race = raceController.getRace();
 
-        for (Yacht boat : race.getBoats()) {
-            startingBoats.add(boat);
-        }
+        startingBoats = new ArrayList<>(Arrays.asList(race.getBoats()));
 
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
@@ -149,9 +147,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             @Override
             public String toString(Double n) {
                 if (n == 0) return "None";
-                if (n == 1) return "Low";
-                if (n == 2) return "Important";
-                if (n == 3) return "All";
+                if (n == 1) return "Important";
+                if (n == 2) return "All";
 
                 return "All";
             }
@@ -161,15 +158,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 switch (s) {
                     case "None":
                         return 0d;
-                    case "Low":
-                        return 1d;
                     case "Important":
-                        return 2d;
+                        return 1d;
                     case "All":
-                        return 3d;
+                        return 2d;
 
                     default:
-                        return 3d;
+                        return 2d;
                 }
             }
         });
@@ -177,7 +172,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.valueProperty().addListener((obs, oldval, newVal) ->
                     setAnnotations((int)annotationSlider.getValue()));
 
-        annotationSlider.setValue(3);
+        annotationSlider.setValue(2);
     }
 
     private void initializeTimer(){
@@ -492,20 +487,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                     }
                 }
                 break;
-            // Low Annotations
-            case 1:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        bg.setTeamNameObjectVisible(true);
-                        bg.setVelocityObjectVisible(false);
-                        bg.setLineGroupVisible(false);
-                        bg.setWakeVisible(false);
-                    }
-                }
-                break;
             // Important Annotations
-            case 2:
+            case 1:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
                     if(ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
@@ -514,7 +497,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 }
                 break;
             // All Annotations
-            case 3:
+            case 2:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
                     if(ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index a2831c52..ea30bc47 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -16,13 +16,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2 dimensional boat.
- * It contains a single polygon for the boat, a group of lines to show it's path, a wake object and two text labels to
- * annotate the boat teams name and the boats velocity. The boat will update it's position onscreen everytime
- * UpdatePosition is called unless the window is minimized in which case it attempts to store animations and apply them
- * when the window is maximised.
+ * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2
+ * dimensional boat. It contains a single polygon for the boat, a group of lines to show it's path,
+ * a wake object and two text labels to annotate the boat teams name and the boats velocity. The
+ * boat will update it's position onscreen everytime UpdatePosition is called unless the window is
+ * minimized in which case it attempts to store animations and apply them when the window is
+ * maximised.
  */
-public class BoatGroup extends RaceObject{
+public class BoatGroup extends RaceObject {
 
     //Constants for drawing
     private static final double TEAMNAME_X_OFFSET = 10d;
@@ -42,51 +43,56 @@ public class BoatGroup extends RaceObject{
     private Text teamNameObject;
     private Text velocityObject;
     private Wake wake;
-    private boolean isSelected = false;
+    private boolean isSelected = true;  //Boats annotations are visible by default at the start
     //Handles boat moving when connecting to a stream
     private boolean setToInitialLocation = false;
     private boolean destinationSet;
     //Variables for handling minimization
     private Stage stage;
-    private boolean isMaximized= true;
+    private boolean isMaximized = true;
     private List<Line> lineStorage = new ArrayList<>();
     private int setCallCount = 5;
 
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used to tell which
-     *             BoatGroup to update.
+     *
+     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
+     * to tell which BoatGroup to update.
      * @param color The colour of the boat polygon and the trailing line.
      */
-    public BoatGroup (Yacht boat, Color color){
+    public BoatGroup(Yacht boat, Color color) {
         this.boat = boat;
         initChildren(color);
     }
 
     /**
-     * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be at point (0,0).
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used to tell which
-     *             BoatGroup to update.
+     * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be
+     * at point (0,0).
+     *
+     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
+     * to tell which BoatGroup to update.
      * @param color The colour of the boat polygon and the trailing line.
-     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat polygon.
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
      */
-    public BoatGroup (Yacht boat, Color color, double... points)
-    {
+    public BoatGroup(Yacht boat, Color color, double... points) {
         this.boat = boat;
         initChildren(color, points);
     }
 
     /**
      * Creates the javafx objects that will be the in the group by default.
+     *
      * @param color The colour of the boat polygon and the trailing line.
-     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat polygon.
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
      */
-    private void initChildren (Color color, double... points) {
+    private void initChildren(Color color, double... points) {
         boatPoly = new Polygon(points);
         boatPoly.setFill(color);
         boatPoly.setOnMouseEntered(event -> boatPoly.setFill(Color.FLORALWHITE));
         boatPoly.setOnMouseExited(event -> boatPoly.setFill(color));
-        boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected));        //Toggle the selection of the boat
+        boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected));
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
@@ -106,17 +112,20 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Creates the javafx objects that will be the in the group by default.
+     *
      * @param color The colour of the boat polygon and the trailing line.
      */
-    private void initChildren (Color color) {
+    private void initChildren(Color color) {
         initChildren(color,
-                -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
-                0.0, -BOAT_HEIGHT / 2,
-                BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
+            -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
+            0.0, -BOAT_HEIGHT / 2,
+            BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
     }
 
     /**
-     * Moves the boat and its children annotations from its current coordinates by specified amounts.
+     * Moves the boat and its children annotations from its current coordinates by specified
+     * amounts.
+     *
      * @param dx The amount to move the X coordinate by
      * @param dy The amount to move the Y coordinate by
      */
@@ -134,21 +143,23 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Moves the boat and its children annotations to coordinates specified
+     *
      * @param x The X coordinate to move the boat to
      * @param y The Y coordinate to move the boat to
      * @param rotation The heading in degrees from north the boat should rotate to.
      */
-    public void moveTo (double x, double y, double rotation) {
+    public void moveTo(double x, double y, double rotation) {
         rotateTo(rotation);
         moveTo(x, y);
     }
 
     /**
      * Moves the boat and its children annotations to coordinates specified
+     *
      * @param x The X coordinate to move the boat to
      * @param y The Y coordinate to move the boat to
      */
-    public void moveTo (double x, double y) {
+    public void moveTo(double x, double y) {
         boatPoly.setLayoutX(x);
         boatPoly.setLayoutY(y);
         teamNameObject.setLayoutX(x);
@@ -162,9 +173,11 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Updates the position of all graphics in the BoatGroup based off of the given time interval.
-     * @param timeInterval The interval, in milliseconds, the boat should update it's position based on.
+     *
+     * @param timeInterval The interval, in milliseconds, the boat should update it's position based
+     * on.
      */
-    public void updatePosition (long timeInterval) {
+    public void updatePosition(long timeInterval) {
         //Calculate the movement of the boat.
         if (isMaximized) {
             double dx = pixelVelocityX * timeInterval;
@@ -177,10 +190,10 @@ public class BoatGroup extends RaceObject{
                 distanceTravelled = 0;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            boatPoly.getLayoutX(),
-                            boatPoly.getLayoutY()
+                        lastPoint.getX(),
+                        lastPoint.getY(),
+                        boatPoly.getLayoutX(),
+                        boatPoly.getLayoutY()
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boat.getColour());
@@ -196,18 +209,21 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Sets the destination of the boat and the headng it should have once it reaches
+     *
      * @param newXValue The X co-ordinate the boat needs to move to.
      * @param newYValue The Y co-ordinate the boat needs to move to.
      * @param rotation Rotation to move graphics to.
      * @param raceIds RaceID of the object to move.
      */
-    public void setDestination (double newXValue, double newYValue, double rotation, double groundSpeed, int... raceIds) {
+    public void setDestination(double newXValue, double newYValue, double rotation,
+        double groundSpeed, int... raceIds) {
         if (hasRaceId(raceIds)) {
             if (setToInitialLocation) {
                 destinationSet = true;
                 boat.setVelocity(groundSpeed);
-                if (currentRotation < 0)
+                if (currentRotation < 0) {
                     currentRotation = 360 - currentRotation;
+                }
                 double dx = newXValue - boatPoly.getLayoutX();
                 double dy = newYValue - boatPoly.getLayoutY();
                 //Check movement is reasonable. Assumes a 1000 * 1000 canvas
@@ -228,7 +244,8 @@ public class BoatGroup extends RaceObject{
                     rotationalVelocity = 0;
                     wakeGenerationDelay--;
                 } else {
-                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
+                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal,
+                        boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
             } else {
@@ -241,14 +258,14 @@ public class BoatGroup extends RaceObject{
         if (!isMaximized) {
             setToInitialLocation = false;
             wakeGenerationDelay = 2;
-            if(setCallCount-- == 0) {
+            if (setCallCount-- == 0) {
                 setCallCount = 5;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            newXValue,
-                            newYValue
+                        lastPoint.getX(),
+                        lastPoint.getY(),
+                        newXValue,
+                        newYValue
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
@@ -261,32 +278,33 @@ public class BoatGroup extends RaceObject{
         }
     }
 
-    public void setDestination (double newXValue, double newYValue, double groundSpeed, int... raceIDs) {
+    public void setDestination(double newXValue, double newYValue, double groundSpeed,
+        int... raceIDs) {
         destinationSet = true;
 
         if (hasRaceId(raceIDs)) {
             double rotation = Math.abs(
-                    Math.toDegrees(
-                            Math.atan(
-                                    (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
-                            )
+                Math.toDegrees(
+                    Math.atan(
+                        (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
                     )
+                )
             );
             setDestination(newXValue, newYValue, rotation, groundSpeed, raceIDs);
         }
     }
 
-    public void rotateTo (double rotation) {
+    public void rotateTo(double rotation) {
         currentRotation = rotation;
         boatPoly.getTransforms().setAll(new Rotate(rotation));
     }
 
-    public void forceRotation () {
-        rotateTo (rotationalGoal);
+    public void forceRotation() {
+        rotateTo(rotationalGoal);
         wake.rotate(rotationalGoal);
     }
 
-    public void paintBoat (Color color) {
+    public void paintBoat(Color color) {
         boatPoly.setFill(color);
     }
 
@@ -311,8 +329,9 @@ public class BoatGroup extends RaceObject{
     }
 
     /**
-     * This function sets the boats isSelected property AS WELL as actually acting upon the value of that selection.
-     * (Painting or not painting annotations)
+     * This function sets the boats isSelected property AS WELL as actually acting upon the value of
+     * that selection. (Painting or not painting annotations)
+     *
      * @param isSelected A Boolean indicating whether or not the boat is selected
      */
     public void setIsSelected(Boolean isSelected) {
@@ -330,10 +349,11 @@ public class BoatGroup extends RaceObject{
      * @param raceIds The ID's to check the BoatGroup for.
      * @return True if the BoatGroup contains at east one of the given IDs, false otherwise.
      */
-    public boolean hasRaceId (int... raceIds) {
+    public boolean hasRaceId(int... raceIds) {
         for (int id : raceIds) {
-            if (id == boat.getSourceID())
+            if (id == boat.getSourceID()) {
                 return true;
+            }
         }
         return false;
     }
@@ -343,31 +363,32 @@ public class BoatGroup extends RaceObject{
      *
      * @return An array containing all ID's associated with this RaceObject.
      */
-    public int[] getRaceIds () {
-        return new int[] {boat.getSourceID()};
+    public int[] getRaceIds() {
+        return new int[]{boat.getSourceID()};
     }
 
     /**
-     * Due to javaFX limitations annotations associated with a boat that you want to appear below all boats in the
-     * Z-axis need to be pulled out of the BoatGroup and added to the parent group of the BoatGroups. This function
-     * returns these annotations as a group.
+     * Due to javaFX limitations annotations associated with a boat that you want to appear below
+     * all boats in the Z-axis need to be pulled out of the BoatGroup and added to the parent group
+     * of the BoatGroups. This function returns these annotations as a group.
      *
      * @return A group containing low priority annotations.
      */
-    public Group getLowPriorityAnnotations () {
+    public Group getLowPriorityAnnotations() {
         Group group = new Group();
-        group.getChildren().addAll(wake, lineGroup);
+        group.getChildren().addAll(wake, lineGroup, teamNameObject, velocityObject);
         return group;
     }
 
     /**
-     * Use this function to let the BoatGroup know about the stage it is in. If it knows about it's stage then it will
-     * listen to the iconified property of that stage and change it's behaviour upon minimization. Without setting the
-     * Stage there is guarantee that the BoatGroup will draw properly when the stage is minimized.
+     * Use this function to let the BoatGroup know about the stage it is in. If it knows about it's
+     * stage then it will listen to the iconified property of that stage and change it's behaviour
+     * upon minimization. Without setting the Stage there is guarantee that the BoatGroup will draw
+     * properly when the stage is minimized.
      *
      * @param stage The stage that the BoatGroup is added to.
      */
-    public void setStage (Stage stage) {
+    public void setStage(Stage stage) {
         /* TODO: 4/05/17 cir27 - Find a way to get the stage to this point. Need to pass it through multiple controllers.
                                  App.start() -> Controller.setContentPane -> RaceViewController -> CanvasController
          */
diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
index 81661bfe..8223fc00 100644
--- a/src/main/resources/css/master.css
+++ b/src/main/resources/css/master.css
@@ -128,6 +128,24 @@ Table
     -fx-border-style: none;
 }
 
+
+/**
+Combo Box
+ */
+
+.combo-box-base {
+    -fx-background-color: #119796;
+    -fx-text-fill: white;
+}
+
+.combo-box-popup .list-view .list-cell:hover {
+    -fx-text-fill: white;
+}
+
+.combo-box .cell:selected {
+    -fx-text-fill: white;
+}
+
 /**
 Remove scroll bars
  */
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 3dc8bf9c..cfb36f23 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -56,11 +56,11 @@
                   </Text>
                </children>
             </Pane>
-            <Slider fx:id="annotationSlider" blockIncrement="1.0" layoutX="38.0" layoutY="527.0" majorTickUnit="1.0" max="3.0" minorTickCount="0" prefHeight="51.0" prefWidth="170.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" styleClass="ui-slider" />
+            <Slider fx:id="annotationSlider" blockIncrement="1.0" layoutX="38.0" layoutY="527.0" majorTickUnit="1.0" max="2.0" minorTickCount="0" prefHeight="51.0" prefWidth="170.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" styleClass="ui-slider" />
             <Label layoutX="10.0" layoutY="499.0" text="Annotations" textFill="WHITE" />
             <Button fx:id="selectAnnotationBtn" layoutX="35.0" layoutY="578.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="170.0" styleClass="blue-ui-btn" text="Select Annotations" textFill="WHITE" />
             <Text fill="WHITE" layoutX="11.0" layoutY="649.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Selection" />
-            <ComboBox fx:id="boatSelectionComboBox" layoutX="37.0" layoutY="664.0" prefHeight="25.0" prefWidth="170.0" promptText="Select Boat" styleClass="blue" />
+            <ComboBox fx:id="boatSelectionComboBox" layoutX="37.0" layoutY="664.0" prefHeight="25.0" prefWidth="170.0" promptText="Select Boat" styleClass="combo-box-base" />
             </children>
         </AnchorPane>
         <AnchorPane fx:id="contentAnchorPane" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">

From 110143ae6e62491c5f1b5a2e9cb26e48c63395d5 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 17:09:12 +1200
Subject: [PATCH 17/36] Added a dynamically updating course limits file to the
 model.

This will make manual testing of the course limits easier. When the race starts, the limits encapsulate the start line but soon after the race starts the course limits close off around the start line (this is for the model). This means the model acts in a very similar way to the actual live stream.

#story[889]
---
 src/main/java/seng302/App.java                |   4 +-
 .../seng302/models/parsers/StreamParser.java  |   6 +-
 .../java/seng302/server/ServerThread.java     |  26 ++++-
 .../resources/server_config/courseLimits.xml  | 105 ++++++++++++++++++
 src/main/resources/server_config/race.xml     |   6 +-
 5 files changed, 138 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/server_config/courseLimits.xml

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 960511f8..efed20d6 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,9 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
 //            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index 9260ae9e..af644692 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -297,9 +297,9 @@ public class StreamParser extends Thread{
         byte[] payload = packet.getPayload();
 
         int messageType = payload[9];
-        long messagelength = bytesToLong(Arrays.copyOfRange(payload,12,14));
-        String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messagelength)))).trim();
-        //System.out.println("xmlMessage2 = " + xmlMessage);
+        long messageLength = bytesToLong(Arrays.copyOfRange(payload,12,14));
+        String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messageLength)))).trim();
+        System.out.println("xmlMessage = " + xmlMessage);
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
diff --git a/src/main/java/seng302/server/ServerThread.java b/src/main/java/seng302/server/ServerThread.java
index c09eb8dc..e76ed822 100644
--- a/src/main/java/seng302/server/ServerThread.java
+++ b/src/main/java/seng302/server/ServerThread.java
@@ -235,6 +235,27 @@ public class ServerThread implements Runnable, Observer {
         }
     }
 
+    /**
+     * Send the post-start race course information
+     */
+    private void sendPostStartCourseXml(){
+        Timer t = new Timer();
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    Message raceData = getXmlMessage("/server_config/courseLimits.xml", XMLMessageSubType.RACE);
+                    if (raceData != null) {
+                        server.send(raceData);
+                        serverLog("Sending race data", 0);
+                    }
+                }catch (IOException e) {
+                    serverLog("Couldn't send an XML Message: " + e.getMessage(), 0);
+                }
+            }
+        },25000);
+    }
+
     public void run() {
         try{
             server = new StreamingServerSocket(PORT_NUMBER);
@@ -252,12 +273,13 @@ public class ServerThread implements Runnable, Observer {
         sendXml();
         startSendingRaceStartStatusMessages();
         startSendingRaceStatusMessages();
+        sendPostStartCourseXml();
     }
 
     /**
      * Start sending static boat position updates when race has finished
      */
-    private void startSendingRaceFinishedBoatPostions(){
+    private void startSendingRaceFinishedBoatPositions(){
         Timer t = new Timer();
         t.schedule(new TimerTask() {
             @Override
@@ -316,7 +338,7 @@ public class ServerThread implements Runnable, Observer {
         }
 
         if (numOfBoatsFinished == ((List<Boat>) arg).size()) {
-            startSendingRaceFinishedBoatPostions();
+            startSendingRaceFinishedBoatPositions();
         }
 
     }
diff --git a/src/main/resources/server_config/courseLimits.xml b/src/main/resources/server_config/courseLimits.xml
new file mode 100644
index 00000000..646f6ade
--- /dev/null
+++ b/src/main/resources/server_config/courseLimits.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Race>
+<CreationTimeDate>2015-08-29T13:12:40+02:00</CreationTimeDate>
+<RaceStartTime Start="2015-08-29T13:10:00+02:00" Postpone="False"/>
+<RaceID>15082901</RaceID>
+<RaceType>Fleet</RaceType>
+<Participants>
+  <Yacht SourceID="101"/>
+  <Yacht SourceID="102"/>
+  <Yacht SourceID="103"/>
+  <Yacht SourceID="104"/>
+  <Yacht SourceID="105"/>
+  <Yacht SourceID="106"/>
+</Participants>
+<Course>
+  <CompoundMark CompoundMarkID="1" Name="Mark0">
+    <Mark SeqID="1" Name="Start Line 1" TargetLat="57.6703330" TargetLng="11.8278330"
+      SourceID="122"/>
+    <Mark SeqID="2" Name="Start Line 2" TargetLat="57.6703330" TargetLng="11.8278330"
+      SourceID="123"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="2" Name="Mark1">
+    <Mark SeqID="1" Name="Mark1" TargetLat="57.6675700" TargetLng="11.8359880" SourceID="131"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="3" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="4" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="5" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="6" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="7" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="8" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="9" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="10" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="11" Name="Mark4">
+    <Mark SeqID="1" Name="Finish Line 1" TargetLat="57.6715240" TargetLng="11.8444950"
+      SourceID="128"/>
+    <Mark SeqID="2" Name="Finish Line 2" TargetLat="57.6715240" TargetLng="11.8444950"
+      SourceID="129"/>
+  </CompoundMark>
+</Course>
+<CompoundMarkSequence>
+  <Corner SeqID="1" CompoundMarkID="1" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="2" CompoundMarkID="2" Rounding="Port" ZoneSize="3"/>
+  <Corner SeqID="3" CompoundMarkID="3" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="4" CompoundMarkID="4" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="5" CompoundMarkID="5" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="6" CompoundMarkID="6" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="7" CompoundMarkID="7" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="8" CompoundMarkID="8" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="9" CompoundMarkID="9" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="10" CompoundMarkID="10" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="11" CompoundMarkID="11" Rounding="PS" ZoneSize="3"/>
+</CompoundMarkSequence>
+<CourseLimit>
+  <Limit SeqID="1" Lat="57.6739450" Lon="11.8417100"/>
+  <Limit SeqID="2" Lat="57.6709520" Lon="11.8485010"/>
+  <Limit SeqID="3" Lat="57.6690260" Lon="11.8472790"/>
+  <Limit SeqID="4" Lat="57.6693140" Lon="11.8457610"/>
+  <Limit SeqID="5" Lat="57.6665370" Lon="11.8432910"/>
+  <Limit SeqID="6" Lat="57.6641400" Lon="11.8385840"/>
+  <Limit SeqID="7" Lat="57.6629430" Lon="11.8332030"/>
+  <Limit SeqID="8" Lat="57.6629480" Lon="11.8249660"/>
+  <Limit SeqID="9" Lat="57.6686890" Lon="11.8250920"/>
+  <Limit SeqID="10" Lat="57.6708220" Lon="11.8321340"/>
+</CourseLimit>
+</Race>
\ No newline at end of file
diff --git a/src/main/resources/server_config/race.xml b/src/main/resources/server_config/race.xml
index 845f2044..06f4f626 100644
--- a/src/main/resources/server_config/race.xml
+++ b/src/main/resources/server_config/race.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Race>
-    <CreationTimeDate>2015-08-29T13:12:40+02:00</CreationTimeDate>
+    <CreationTimeDate>2015-08-29T11:27:15+02:00</CreationTimeDate>
     <RaceStartTime Start="2015-08-29T13:10:00+02:00" Postpone="False" />
     <RaceID>15082901</RaceID>
     <RaceType>Fleet</RaceType>
@@ -80,6 +80,8 @@
         <Limit SeqID="7" Lat="57.6629430" Lon="11.8332030" />
         <Limit SeqID="8" Lat="57.6629480" Lon="11.8249660" />
         <Limit SeqID="9" Lat="57.6686890" Lon="11.8250920" />
-        <Limit SeqID="10" Lat="57.6708220" Lon="11.8321340" />
+        <Limit SeqID="10" Lat="57.6692230" Lon="11.8231430" />
+        <Limit SeqID="11" Lat="57.6725370" Lon="11.8272480" />
+        <Limit SeqID="12" Lat="57.6708220" Lon="11.8321340" />
     </CourseLimit>
 </Race>
\ No newline at end of file

From fa501460cb4fb71c86d66b3984a3e42394417022 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 17:21:56 +1200
Subject: [PATCH 18/36] Cleaned up code for merge.

#story[889]
---
 src/main/java/seng302/App.java                |  2 -
 .../seng302/controllers/CanvasController.java |  5 +-
 .../seng302/models/parsers/PacketType.java    | 53 -------------------
 .../seng302/models/parsers/StreamPacket.java  | 44 ---------------
 .../seng302/models/parsers/StreamParser.java  | 19 ++++---
 .../java/seng302/server/ServerThread.java     |  1 +
 .../models/parsers/StreamReceiverTest.java    |  1 +
 7 files changed, 17 insertions(+), 108 deletions(-)
 delete mode 100644 src/main/java/seng302/models/parsers/PacketType.java
 delete mode 100644 src/main/java/seng302/models/parsers/StreamPacket.java

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index efed20d6..1a400afd 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -63,8 +63,6 @@ public class App extends Application
         //Change the StreamReceiver in this else block to change the default data source.
         else{
             sr = new StreamReceiver("localhost", 4949, "RaceStream");
-//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index c4fa7b58..0a7f699f 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -244,7 +244,7 @@ public class CanvasController {
     }
 
     private void checkForCourseChanges() {
-        if (StreamParser.isNewXmlRecieved()){
+        if (StreamParser.isNewRaceXmlReceived()){
             System.out.println("New Canvas found");
             gc.setFill(Color.SKYBLUE);
             gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
@@ -357,7 +357,8 @@ public class CanvasController {
      * Calculates x and y location for every marker that fits it to the canvas the race will be drawn on.
      */
     private void fitMarksToCanvas() {
-        StreamParser.isNewXmlRecieved();
+        //Check is called once to avoid unnecessarily change the course limits once the race is running
+        StreamParser.isNewRaceXmlReceived();
         findMinMaxPoint();
         double minLonToMaxLon = scaleRaceExtremities();
         calculateReferencePointLocation(minLonToMaxLon);
diff --git a/src/main/java/seng302/models/parsers/PacketType.java b/src/main/java/seng302/models/parsers/PacketType.java
deleted file mode 100644
index 66b86207..00000000
--- a/src/main/java/seng302/models/parsers/PacketType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package seng302.models.parsers;
-
-/**
- * Created by Kusal on 4/24/2017.
- */
-public enum PacketType {
-    HEARTBEAT,
-    RACE_STATUS,
-    DISPLAY_TEXT_MESSAGE,
-    XML_MESSAGE,
-    RACE_START_STATUS,
-    YACHT_EVENT_CODE,
-    YACHT_ACTION_CODE,
-    CHATTER_TEXT,
-    BOAT_LOCATION,
-    MARK_ROUNDING,
-    COURSE_WIND,
-    AVG_WIND,
-    OTHER;
-
-    static PacketType assignPacketType(int packetType){
-        switch(packetType){
-            case 1:
-                return HEARTBEAT;
-            case 12:
-                return RACE_STATUS;
-            case 20:
-                return DISPLAY_TEXT_MESSAGE;
-            case 26:
-                return XML_MESSAGE;
-            case 27:
-                return RACE_START_STATUS;
-            case 29:
-                return YACHT_EVENT_CODE;
-            case 31:
-                return YACHT_ACTION_CODE;
-            case 36:
-                return CHATTER_TEXT;
-            case 37:
-                return BOAT_LOCATION;
-            case 38:
-                return MARK_ROUNDING;
-            case 44:
-                return COURSE_WIND;
-            case 47:
-                return AVG_WIND;
-            default:
-        }
-        return OTHER;
-    }
-
-
-}
diff --git a/src/main/java/seng302/models/parsers/StreamPacket.java b/src/main/java/seng302/models/parsers/StreamPacket.java
deleted file mode 100644
index 5c2c0706..00000000
--- a/src/main/java/seng302/models/parsers/StreamPacket.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package seng302.models.parsers;
-
-/**
- * Created by kre39 on 23/04/17.
- */
-public class StreamPacket {
-
-    //Change int to an ENUM for the type
-    private PacketType type;
-
-    private long messageLength;
-    private long timeStamp;
-    private byte[] payload;
-
-    StreamPacket(int type, long messageLength, long timeStamp, byte[] payload) {
-        this.type = PacketType.assignPacketType(type);
-        this.messageLength = messageLength;
-        this.timeStamp = timeStamp;
-        this.payload = payload;
-//        System.out.println("type = " + this.type.toString());
-        //switch the packet type to deal with what ever specific packet you want to deal with
-//        if (this.type == PacketType.XML_MESSAGE){
-//            //System.out.println("--------");
-//            System.out.println(new String(payload));
-//            //StreamParser.parsePacket(this);
-//        }
-    }
-
-    PacketType getType() {
-        return type;
-    }
-
-    public long getMessageLength() {
-        return messageLength;
-    }
-
-    byte[] getPayload() {
-        return payload;
-    }
-
-    long getTimeStamp() {
-        return timeStamp;
-    }
-}
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index af644692..e13883ee 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -31,7 +31,7 @@ public class StreamParser extends Thread{
      public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatPositions = new ConcurrentHashMap<>();
      private String threadName;
      private Thread t;
-     private static boolean newXmlRecieved = false;
+     private static boolean newRaceXmlReceived = false;
      private static boolean raceStarted = false;
      private static XMLParser xmlObject;
      private static boolean raceFinished = false;
@@ -124,7 +124,7 @@ public class StreamParser extends Thread{
                      break;
                  case XML_MESSAGE:
                      System.out.println("XML MESSAGE GOT");
-                     newXmlRecieved = true;
+                     newRaceXmlReceived = true;
                      extractXmlMessage(packet);
                      break;
                  case RACE_START_STATUS:
@@ -299,7 +299,6 @@ public class StreamParser extends Thread{
         int messageType = payload[9];
         long messageLength = bytesToLong(Arrays.copyOfRange(payload,12,14));
         String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messageLength)))).trim();
-        System.out.println("xmlMessage = " + xmlMessage);
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -317,7 +316,7 @@ public class StreamParser extends Thread{
             boats = xmlObject.getBoatXML().getCompetingBoats();
         }
         if (messageType == 6) { //6 is race info xml
-            newXmlRecieved = true;
+            newRaceXmlReceived = true;
         }
     }
 
@@ -586,9 +585,15 @@ public class StreamParser extends Thread{
         System.out.println("[CLIENT] Shutting down stream parser");
     }
 
-    public static boolean isNewXmlRecieved(){
-        if (newXmlRecieved){
-            newXmlRecieved = false;
+    /**
+     * Used to check if a new un-processed xml has been found, if so will return true before
+     * toggling off so that the next check will return false.
+     *
+     * @return the status of if new xml has been received
+     */
+    public static boolean isNewRaceXmlReceived(){
+        if (newRaceXmlReceived){
+            newRaceXmlReceived = false;
             return true;
         } else {
             return false;
diff --git a/src/main/java/seng302/server/ServerThread.java b/src/main/java/seng302/server/ServerThread.java
index e76ed822..094845ab 100644
--- a/src/main/java/seng302/server/ServerThread.java
+++ b/src/main/java/seng302/server/ServerThread.java
@@ -254,6 +254,7 @@ public class ServerThread implements Runnable, Observer {
                 }
             }
         },25000);
+        //Delays the new course xml data for 25 seconds so the boats are able to pass the starting line
     }
 
     public void run() {
diff --git a/src/test/java/seng302/models/parsers/StreamReceiverTest.java b/src/test/java/seng302/models/parsers/StreamReceiverTest.java
index c7951e3b..698ee3c0 100644
--- a/src/test/java/seng302/models/parsers/StreamReceiverTest.java
+++ b/src/test/java/seng302/models/parsers/StreamReceiverTest.java
@@ -8,6 +8,7 @@ import java.lang.reflect.Method;
 import java.net.Socket;
 import java.util.Comparator;
 import java.util.concurrent.PriorityBlockingQueue;
+import seng302.models.parsers.packets.StreamPacket;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

From ed8d70c3b3e0fcb3e09b490d6c594f69531d58f6 Mon Sep 17 00:00:00 2001
From: Peter Galloway <ptg19@uclive.ac.nz>
Date: Mon, 15 May 2017 17:53:11 +1200
Subject: [PATCH 19/36] commented out buffered code and cleaned up some other
 areas to try and make the boatgroup clear enough to modify #story[923]

---
 .../seng302/controllers/CanvasController.java | 81 +++++++++----------
 src/main/java/seng302/models/BoatGroup.java   | 48 ++---------
 src/main/java/seng302/models/RaceObject.java  | 20 +----
 .../java/seng302/models/mark/MarkGroup.java   |  8 +-
 .../seng302/models/parsers/StreamPacket.java  | 44 ----------
 .../seng302/models/parsers/StreamParser.java  | 24 +++---
 .../models/parsers/StreamReceiverTest.java    |  1 +
 7 files changed, 61 insertions(+), 165 deletions(-)
 delete mode 100644 src/main/java/seng302/models/parsers/StreamPacket.java

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 4d57559b..37f45f1a 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -106,7 +106,7 @@ public class CanvasController {
 
 
         // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
-        drawBoats();
+        initializeBoats();
         timer = new AnimationTimer() {
 
             @Override
@@ -157,8 +157,8 @@ public class CanvasController {
             SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID());
             Limit thisPoint2 = courseLimits.get(i+1);
             SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID());
-            Point2D borderPoint1 = findScaledXY(thisMark1);
-            Point2D borderPoint2 = findScaledXY(thisMark2);
+            Point2D borderPoint1 = latLonToXY(thisMark1.getLatitude(), thisMark1.getLongitude());
+            Point2D borderPoint2 = latLonToXY(thisMark2.getLatitude(), thisMark2.getLongitude());
             gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(),
                     borderPoint2.getX(), borderPoint2.getY());
             xBoundaryPoints[i] = borderPoint1.getX();
@@ -168,8 +168,8 @@ public class CanvasController {
         SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID());
         Limit thisPoint2 = courseLimits.get(0);
         SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID());
-        Point2D borderPoint1 = findScaledXY(thisMark1);
-        Point2D borderPoint2 = findScaledXY(thisMark2);
+        Point2D borderPoint1 = latLonToXY(thisMark1.getLatitude(), thisMark1.getLongitude());
+        Point2D borderPoint2 = latLonToXY(thisMark2.getLatitude(), thisMark2.getLongitude());
         gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(),
                 borderPoint2.getX(), borderPoint2.getY());
         xBoundaryPoints[courseLimits.size()-1] = borderPoint1.getX();
@@ -207,8 +207,8 @@ public class CanvasController {
                         singleMark1.getLongitude());
 
                 markGroup = new MarkGroup(thisGateMark,
-                        findScaledXY(thisGateMark.getSingleMark1()),
-                        findScaledXY(thisGateMark.getSingleMark2()));
+                        latLonToXY(thisGateMark.getSingleMark1().getLatitude(), thisGateMark.getSingleMark1().getLongitude()),
+                        latLonToXY(thisGateMark.getSingleMark2().getLatitude(), thisGateMark.getSingleMark2().getLongitude()));
 
                 raceObjects.add(markGroup);
                 raceMarks.add(thisGateMark);
@@ -221,7 +221,7 @@ public class CanvasController {
                         singleMark.getTargetLng(),
                         singleMark.getSourceID());
 
-                markGroup = new MarkGroup(thisSingleMark, findScaledXY(thisSingleMark));
+                markGroup = new MarkGroup(thisSingleMark, latLonToXY(thisSingleMark.getLatitude(), thisSingleMark.getLongitude()));
                 raceObjects.add(markGroup);
                 raceMarks.add(thisSingleMark);
 
@@ -245,27 +245,30 @@ public class CanvasController {
     private void move(long id, RaceObject raceObject){
         PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(id);
         if (movementQueue.size() > 0){
-            BoatPositionPacket positionPacket = movementQueue.peek();
+//            BoatPositionPacket positionPacket = movementQueue.peek();
 
             //this code adds a delay to reading from the movementQueue
             //in case things being put into the movement queue are slightly
             //out of order
-            int delayTime = 1000;
-            int loopTime = delayTime * 10;
-            long timeDiff = (System.currentTimeMillis()%loopTime - positionPacket.getTimeValid()%loopTime);
-            if (timeDiff < 0){
-                timeDiff = loopTime + timeDiff;
-            }
-            if (timeDiff > delayTime) {
-                try {
-                    positionPacket = movementQueue.take();
-                    Point2D p2d = latLonToXY(positionPacket.getLat(), positionPacket.getLon());
-                    double heading = 360.0 / 0xffff * positionPacket.getHeading();
-                    raceObject.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), (int) id);
-                } catch (InterruptedException e){
-                    e.printStackTrace();
+//            int delayTime = 1000;
+//            int loopTime = delayTime * 10;
+//            long timeDiff = (System.currentTimeMillis()%loopTime - positionPacket.getTimeValid()%loopTime);
+//            if (timeDiff < 0){
+//                timeDiff = loopTime + timeDiff;
+//            }
+//            if (timeDiff > delayTime) {
+            try {
+                BoatPositionPacket positionPacket = movementQueue.take();
+                if (id == 104){
+                    System.out.println(positionPacket.getTimeValid());
                 }
+                Point2D p2d = latLonToXY(positionPacket.getLat(), positionPacket.getLon());
+                double heading = 360.0 / 0xffff * positionPacket.getHeading();
+                raceObject.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), (int) id);
+            } catch (InterruptedException e){
+                e.printStackTrace();
             }
+//            }
         }
     }
 
@@ -320,20 +323,13 @@ public class CanvasController {
     /**
      * Draws all the boats.
      */
-    private void drawBoats() {
-//        Map<Boat, TimelineInfo> timelineInfos = raceViewController.getTimelineInfos();
-//        List<Boat> boats  = raceViewController.getStartingBoats();
+    private void initializeBoats() {
         Map<Integer, Yacht> boats = StreamParser.getBoats();
-        Double startingX  = raceObjects.get(0).getLayoutX();
-        Double startingY  = raceObjects.get(0).getLayoutY();
         Group boatAnnotations = new Group();
 
         for (Yacht boat : boats.values()) {
-//        for (Boat boat : boats) {
             boat.setColour(Colors.getColor());
             BoatGroup boatGroup = new BoatGroup(boat, boat.getColour());
-            boatGroup.moveTo(startingX, startingY, 0d);
-            //boatGroup.setStage(raceViewController.getStage());
             raceObjects.add(boatGroup);
             boatAnnotations.getChildren().add(boatGroup.getLowPriorityAnnotations());
         }
@@ -456,10 +452,12 @@ public class CanvasController {
             if (!processed.contains(mark)) {
                 if (mark.getMarkType() != MarkType.SINGLE_MARK) {
                     GateMark gateMark = (GateMark) mark;
-                    markGroup = new MarkGroup(mark, findScaledXY(gateMark.getSingleMark1()), findScaledXY(gateMark.getSingleMark2()));
+                    markGroup = new MarkGroup(mark,
+                        latLonToXY(gateMark.getSingleMark1().getLatitude(), gateMark.getSingleMark1().getLongitude()),
+                        latLonToXY(gateMark.getSingleMark2().getLatitude(), gateMark.getSingleMark2().getLongitude()));
                     raceObjects.add(markGroup);
                 } else {
-                    markGroup = new MarkGroup(mark, findScaledXY(mark));
+                    markGroup = new MarkGroup(mark, latLonToXY(mark.getLatitude(), mark.getLongitude()));
                     raceObjects.add(markGroup);
                 }
                 processed.add(mark);
@@ -467,19 +465,18 @@ public class CanvasController {
         }
     }
 
-    private Point2D findScaledXY (Mark unscaled) {
-        return findScaledXY (minLatPoint.getLatitude(), minLatPoint.getLongitude(),
-                             unscaled.getLatitude(), unscaled.getLongitude());
-    }
 
-    private Point2D findScaledXY (double latA, double lonA, double latB, double lonB) {
+
+    private Point2D latLonToXY (double latitude, double longitude){
         double distanceFromReference;
         double angleFromReference;
         int xAxisLocation = (int) referencePointX;
         int yAxisLocation = (int) referencePointY;
 
-        angleFromReference = Mark.calculateHeadingRad(latA, lonA, latB, lonB);
-        distanceFromReference = Mark.calculateDistance(latA, lonA, latB, lonB);
+        double minLat = minLatPoint.getLatitude();
+        double minLon = minLatPoint.getLongitude();
+        angleFromReference = Mark.calculateHeadingRad(minLat, minLon, latitude, longitude);
+        distanceFromReference = Mark.calculateDistance(minLat, minLon, latitude, longitude);
         if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
             xAxisLocation += (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
             yAxisLocation -= (int) Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
@@ -529,10 +526,6 @@ public class CanvasController {
         }
     }
 
-    private Point2D latLonToXY (double latitude, double longitude) {
-        return findScaledXY(minLatPoint.getLatitude(), minLatPoint.getLongitude(), latitude, longitude);
-    }
-
     List<RaceObject> getRaceObjects() {
         return raceObjects;
     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 57dd48db..327ae1ba 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -122,7 +122,8 @@ public class BoatGroup extends RaceObject{
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
         wake.setLayoutX(wake.getLayoutX() + dx);
         wake.setLayoutY(wake.getLayoutY() + dy);
-        rotateTo(rotation + currentRotation);
+        currentRotation = rotation + currentRotation;
+        boatPoly.getTransforms().setAll(new Rotate(rotation));
     }
 
     /**
@@ -132,16 +133,8 @@ public class BoatGroup extends RaceObject{
      * @param rotation The heading in degrees from north the boat should rotate to.
      */
     public void moveTo (double x, double y, double rotation) {
-        rotateTo(rotation);
-        moveTo(x, y);
-    }
-
-    /**
-     * Moves the boat and its children annotations to coordinates specified
-     * @param x The X coordinate to move the boat to
-     * @param y The Y coordinate to move the boat to
-     */
-    public void moveTo (double x, double y) {
+        currentRotation = rotation;
+        boatPoly.getTransforms().setAll(new Rotate(rotation));
         boatPoly.setLayoutX(x);
         boatPoly.setLayoutY(y);
         teamNameObject.setLayoutX(x);
@@ -165,6 +158,7 @@ public class BoatGroup extends RaceObject{
             double rotation = rotationalVelocity * timeInterval;
             distanceTravelled += Math.abs(dx) + Math.abs(dy);
             moveGroupBy(dx, dy, rotation);
+
             //Draw a new section of the trail every 20 pixels of movement.
             if (distanceTravelled > 20) {
                 distanceTravelled = 0;
@@ -203,12 +197,6 @@ public class BoatGroup extends RaceObject{
                     currentRotation = 360 - currentRotation;
                 double dx = newXValue - boatPoly.getLayoutX();
                 double dy = newYValue - boatPoly.getLayoutY();
-                //Check movement is reasonable. Assumes a 1000 * 1000 canvas
-                if (Math.abs(dx) > 50 || Math.abs(dy) > 50) {
-                    dx = 0;
-                    dy = 0;
-                    moveTo(newXValue, newYValue);
-                }
 
                 pixelVelocityX = dx / expectedUpdateInterval;
                 pixelVelocityY = dy / expectedUpdateInterval;
@@ -217,7 +205,6 @@ public class BoatGroup extends RaceObject{
 
                 if (wakeGenerationDelay > 0) {
                     wake.rotate(rotationalGoal);
-                    rotateTo(rotationalGoal); //Need to test with this removed.
                     rotationalVelocity = 0;
                     wakeGenerationDelay--;
                 } else {
@@ -254,31 +241,6 @@ public class BoatGroup extends RaceObject{
         }
     }
 
-    public void setDestination (double newXValue, double newYValue, double groundSpeed, int... raceIDs) {
-        destinationSet = true;
-
-        if (hasRaceId(raceIDs)) {
-            double rotation = Math.abs(
-                    Math.toDegrees(
-                            Math.atan(
-                                    (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
-                            )
-                    )
-            );
-            setDestination(newXValue, newYValue, rotation, groundSpeed, raceIDs);
-        }
-    }
-
-    public void rotateTo (double rotation) {
-        currentRotation = rotation;
-        boatPoly.getTransforms().setAll(new Rotate(rotation));
-    }
-
-    public void forceRotation () {
-        rotateTo (rotationalGoal);
-        wake.rotate(rotationalGoal);
-    }
-
     public void setTeamNameObjectVisible(Boolean visible) {
         teamNameObject.setVisible(visible);
     }
diff --git a/src/main/java/seng302/models/RaceObject.java b/src/main/java/seng302/models/RaceObject.java
index 91f02971..706bfd48 100644
--- a/src/main/java/seng302/models/RaceObject.java
+++ b/src/main/java/seng302/models/RaceObject.java
@@ -47,10 +47,10 @@ public abstract class RaceObject extends Group {
             this.rotationalVelocity = (rotationalGoal - currentRotation) / expectedUpdateInterval;
         }
         //Sometimes the rotation is too large to be realistic. In that case just do it instantly.
-        if (Math.abs(rotationalVelocity) > 1) {
-            rotationalVelocity = 0;
-            rotateTo(rotationalGoal);
-        }
+//        if (Math.abs(rotationalVelocity) > 1) {
+//            rotationalVelocity = 0;
+//            rotateTo(rotationalGoal);
+//        }
     }
 
     /**
@@ -62,25 +62,13 @@ public abstract class RaceObject extends Group {
      * @param raceIds RaceID of the object to move.
      */
     public abstract void setDestination (double x, double y, double rotation, double groundSpeed, int... raceIds);
-    /**
-     * Sets the destination of everything within the RaceObject that has an ID in the array raceIds. The destination is
-     * set to the co-ordinates (x, y).
-     * @param x X co-ordinate to move the graphic to.
-     * @param y Y co-ordinate to move the graphic to.
-     * @param raceIds RaceID to the object to move.
-     */
-    public abstract void setDestination (double x, double y, double groundSpeed, int... raceIds);
 
     public abstract void updatePosition (long timeInterval);
 
     public abstract void moveTo (double x, double y, double rotation);
 
-    public abstract void moveTo (double x, double y);
-
     public abstract void moveGroupBy(double x, double y, double rotation);
 
-    public abstract void rotateTo (double rotation);
-
     public abstract boolean hasRaceId (int... raceIds);
 
     public abstract int[] getRaceIds ();
diff --git a/src/main/java/seng302/models/mark/MarkGroup.java b/src/main/java/seng302/models/mark/MarkGroup.java
index 29931e01..6bcd40f4 100644
--- a/src/main/java/seng302/models/mark/MarkGroup.java
+++ b/src/main/java/seng302/models/mark/MarkGroup.java
@@ -92,16 +92,12 @@ public class MarkGroup extends RaceObject {
     }
 
     public void setDestination (double x, double y, double rotation, double groundSpeed, int... raceIds) {
-        setDestination(x, y, 0, raceIds);
-        this.rotationalGoal = rotation;
-        calculateRotationalVelocity();
-    }
-
-    public void setDestination (double x, double y, double groundSpeed, int... raceIds) {
         for (int i = 0; i < marks.size(); i++)
             for (int id : raceIds)
                 if (id == marks.get(i).getId())
                     setDestinationChild(x, y, 0, Math.max(0, i-1));
+        this.rotationalGoal = rotation;
+        calculateRotationalVelocity();
     }
 
 
diff --git a/src/main/java/seng302/models/parsers/StreamPacket.java b/src/main/java/seng302/models/parsers/StreamPacket.java
deleted file mode 100644
index 5c2c0706..00000000
--- a/src/main/java/seng302/models/parsers/StreamPacket.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package seng302.models.parsers;
-
-/**
- * Created by kre39 on 23/04/17.
- */
-public class StreamPacket {
-
-    //Change int to an ENUM for the type
-    private PacketType type;
-
-    private long messageLength;
-    private long timeStamp;
-    private byte[] payload;
-
-    StreamPacket(int type, long messageLength, long timeStamp, byte[] payload) {
-        this.type = PacketType.assignPacketType(type);
-        this.messageLength = messageLength;
-        this.timeStamp = timeStamp;
-        this.payload = payload;
-//        System.out.println("type = " + this.type.toString());
-        //switch the packet type to deal with what ever specific packet you want to deal with
-//        if (this.type == PacketType.XML_MESSAGE){
-//            //System.out.println("--------");
-//            System.out.println(new String(payload));
-//            //StreamParser.parsePacket(this);
-//        }
-    }
-
-    PacketType getType() {
-        return type;
-    }
-
-    public long getMessageLength() {
-        return messageLength;
-    }
-
-    byte[] getPayload() {
-        return payload;
-    }
-
-    long getTimeStamp() {
-        return timeStamp;
-    }
-}
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..890f37f6 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -66,20 +66,20 @@ public class StreamParser extends Thread{
                  Thread.sleep(1);
              }
              while (appRunning){
-                 StreamPacket packet = StreamReceiver.packetBuffer.peek();
+//                 StreamPacket packet = StreamReceiver.packetBuffer.peek();
                  //this code adds a delay to reading from the packetBuffer so
                  //out of order packets have time to order themselves in the queue
-                 int delayTime = 1000;
-                 int loopTime = delayTime * 10;
-                 long transitTime = (System.currentTimeMillis()%loopTime - packet.getTimeStamp()%loopTime);
-                 if (transitTime < 0){
-                     transitTime = loopTime + transitTime;
-                 }
-                 if (transitTime < delayTime) {
-                     long sleepTime = delayTime - (transitTime);
-                     Thread.sleep(sleepTime);
-                 }
-                 packet = StreamReceiver.packetBuffer.take();
+//                 int delayTime = 1000;
+//                 int loopTime = delayTime * 10;
+//                 long transitTime = (System.currentTimeMillis()%loopTime - packet.getTimeStamp()%loopTime);
+//                 if (transitTime < 0){
+//                     transitTime = loopTime + transitTime;
+//                 }
+//                 if (transitTime < delayTime) {
+//                     long sleepTime = delayTime - (transitTime);
+//                     Thread.sleep(sleepTime);
+//                 }
+                 StreamPacket packet = StreamReceiver.packetBuffer.take();
                  parsePacket(packet);
                  Thread.sleep(1);
                  while (StreamReceiver.packetBuffer.peek() == null) {
diff --git a/src/test/java/seng302/models/parsers/StreamReceiverTest.java b/src/test/java/seng302/models/parsers/StreamReceiverTest.java
index c7951e3b..d2dc6b82 100644
--- a/src/test/java/seng302/models/parsers/StreamReceiverTest.java
+++ b/src/test/java/seng302/models/parsers/StreamReceiverTest.java
@@ -2,6 +2,7 @@ package seng302.models.parsers;
 
 import org.junit.Before;
 import org.junit.Test;
+import seng302.models.parsers.packets.StreamPacket;
 
 import java.io.*;
 import java.lang.reflect.Method;

From 9c7144c918bfd93eca7e3a45ea5028c12313584e Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 17:55:06 +1200
Subject: [PATCH 20/36] Removed dud print statement

#story[889]
---
 src/main/java/seng302/App.java                      | 13 ++++++-------
 .../java/seng302/controllers/CanvasController.java  |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..b86b465d 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -9,8 +9,8 @@ import seng302.models.parsers.StreamParser;
 import seng302.models.parsers.StreamReceiver;
 import seng302.server.ServerThread;
 
-public class App extends Application
-{
+public class App extends Application {
+
     @Override
     public void start(Stage primaryStage) throws Exception {
         Parent root = FXMLLoader.load(getClass().getResource("/views/MainView.fxml"));
@@ -39,15 +39,15 @@ public class App extends Application
             e.printStackTrace();
         }
 
-        if (args.length == 1 && args[0].equals("-standalone")){
+        if (args.length == 1 && args[0].equals("-standalone")) {
             return;
         }
 
-        if (args.length == 3 && args[0].equals("-server")){
+        if (args.length == 3 && args[0].equals("-server")) {
 
             sr = new StreamReceiver(args[1], Integer.valueOf(args[2]), "RaceStream");
 
-        } else if(args.length == 2 && args[0].equals("-server")){
+        } else if (args.length == 2 && args[0].equals("-server")) {
             switch (args[1]) {
                 case "internal":
                     sr = new StreamReceiver("localhost", 4949, "RaceStream");
@@ -61,7 +61,7 @@ public class App extends Application
             }
         }
         //Change the StreamReceiver in this else block to change the default data source.
-        else{
+        else {
             sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
@@ -72,7 +72,6 @@ public class App extends Application
         launch(args);
 
 
-
     }
 }
 
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 0a7f699f..9a2a9797 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -245,7 +245,6 @@ public class CanvasController {
 
     private void checkForCourseChanges() {
         if (StreamParser.isNewRaceXmlReceived()){
-            System.out.println("New Canvas found");
             gc.setFill(Color.SKYBLUE);
             gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
             gc.restore();

From a9de005e1ae8af1acbefb582cbea2161daaa37f0 Mon Sep 17 00:00:00 2001
From: Michael Rausch <michael@michaelrausch.net>
Date: Mon, 15 May 2017 18:41:44 +1200
Subject: [PATCH 21/36] Removed a extraneous print stmt

---
 src/main/java/seng302/models/parsers/StreamParser.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index 73994d87..63019c3d 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -124,7 +124,6 @@ public class StreamParser extends Thread{
                      extractDisplayMessage(packet);
                      break;
                  case XML_MESSAGE:
-                     System.out.println("XML MESSAGE GOT");
                      newRaceXmlReceived = true;
                      extractXmlMessage(packet);
                      break;

From 9e3036e13460856b719f6010659bc48e65008057 Mon Sep 17 00:00:00 2001
From: Peter Galloway <ptg19@uclive.ac.nz>
Date: Mon, 15 May 2017 23:17:36 +1200
Subject: [PATCH 22/36] Stripped down the boatgroup to the basic movement
 components and then tried to adjust how position updates are being dealt with
 to make everything more logically understandable. I made some progress in
 terms of understanding but the position update is still not as reliable as I
 would like. I will be explaining to other team members how this part of the
 code is working so the time I have spent is not completely wasted #story[923]

---
 .../seng302/controllers/CanvasController.java | 152 ++++----
 .../java/seng302/controllers/Controller.java  |   3 +-
 .../controllers/RaceViewController.java       | 334 +++++-------------
 src/main/java/seng302/models/BoatGroup.java   | 193 +++-------
 .../java/seng302/models/mark/MarkGroup.java   | 193 +++-------
 .../seng302/models/stream/StreamParser.java   |  13 +-
 .../models/stream/StreamReceiverTest.java     |   2 +-
 7 files changed, 250 insertions(+), 640 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index a46c3481..c1a642fc 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -10,24 +10,13 @@ import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
-import seng302.models.BoatGroup;
-import seng302.models.Colors;
-import seng302.models.RaceObject;
-import seng302.models.Yacht;
 import seng302.models.*;
 import seng302.models.mark.*;
-import seng302.models.parsers.StreamParser;
-import seng302.models.parsers.XMLParser;
-import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark;
-import seng302.models.parsers.XMLParser.RaceXMLObject.Limit;
-import seng302.models.parsers.packets.BoatPositionPacket;
 import seng302.models.stream.StreamParser;
 import seng302.models.stream.packets.BoatPositionPacket;
 import seng302.models.stream.XMLParser;
 import seng302.models.stream.XMLParser.RaceXMLObject.Limit;
 import seng302.models.mark.Mark;
-
-import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.PriorityBlockingQueue;
 
@@ -62,16 +51,13 @@ public class CanvasController {
     private Mark maxLonPoint;
     private double referencePointX;
     private double referencePointY;
-    private List<RaceObject> raceObjects = new ArrayList<>();
-    private List<Mark> raceMarks = new ArrayList<>();
+    private List<MarkGroup> markGroups = new ArrayList<>();
+    private List<BoatGroup> boatGroups = new ArrayList<>();
 
     //FRAME RATE
-    private static final double UPDATE_TIME = 0.016666;     // 1 / 60 ie 60fps
     private final long[] frameTimes = new long[30];
     private int frameTimeIndex = 0;
     private boolean arrayFilled = false;
-    private DecimalFormat decimalFormat2dp = new DecimalFormat("0.00");
-    private double lastPacketTime = 0;
 
     public AnimationTimer timer;
 
@@ -94,8 +80,6 @@ public class CanvasController {
         // Bind canvas size to stack pane size.
         canvas.widthProperty().bind(new SimpleDoubleProperty(CANVAS_WIDTH));
         canvas.heightProperty().bind(new SimpleDoubleProperty(CANVAS_HEIGHT));
-        //group.minWidth(CANVAS_WIDTH);
-        //group.minHeight(CANVAS_HEIGHT);
     }
 
     public void initializeCanvas (){
@@ -109,7 +93,7 @@ public class CanvasController {
 
 
         // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
-        initializeBoats();
+        drawBoats();
         timer = new AnimationTimer() {
 
             @Override
@@ -132,7 +116,7 @@ public class CanvasController {
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
                 elapsedNanos = 1000 / 60;
-                updateRaceObjects();
+                updateGroups();
                 if (StreamParser.isRaceFinished()) {
                     this.stop();
                 }
@@ -160,10 +144,10 @@ public class CanvasController {
             SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID());
             Limit thisPoint2 = courseLimits.get(i+1);
             SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID());
-            Point2D borderPoint1 = latLonToXY(thisMark1.getLatitude(), thisMark1.getLongitude());
-            Point2D borderPoint2 = latLonToXY(thisMark2.getLatitude(), thisMark2.getLongitude());
+            Point2D borderPoint1 = findScaledXY(thisMark1);
+            Point2D borderPoint2 = findScaledXY(thisMark2);
             gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(),
-                    borderPoint2.getX(), borderPoint2.getY());
+                borderPoint2.getX(), borderPoint2.getY());
             xBoundaryPoints[i] = borderPoint1.getX();
             yBoundaryPoints[i] = borderPoint1.getY();
         }
@@ -171,52 +155,42 @@ public class CanvasController {
         SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID());
         Limit thisPoint2 = courseLimits.get(0);
         SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID());
-        Point2D borderPoint1 = latLonToXY(thisMark1.getLatitude(), thisMark1.getLongitude());
-        Point2D borderPoint2 = latLonToXY(thisMark2.getLatitude(), thisMark2.getLongitude());
+        Point2D borderPoint1 = findScaledXY(thisMark1);
+        Point2D borderPoint2 = findScaledXY(thisMark2);
         gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(),
-                borderPoint2.getX(), borderPoint2.getY());
+            borderPoint2.getX(), borderPoint2.getY());
         xBoundaryPoints[courseLimits.size()-1] = borderPoint1.getX();
         yBoundaryPoints[courseLimits.size()-1] = borderPoint1.getY();
         gc.setFill(Color.LIGHTBLUE);
         gc.fillPolygon(xBoundaryPoints,yBoundaryPoints,yBoundaryPoints.length);
     }
 
-    private void updateRaceObjects(){
-        for (RaceObject raceObject : raceObjects) {
-            raceObject.updatePosition(1000 / 60);
-            // some raceObjects will have multiply ID's (for instance gate marks)
-            for (long id : raceObject.getRaceIds()) {
-                //checking if the current "ID" has any updates associated with it
+    private void updateGroups(){
+        for (BoatGroup boatGroup : boatGroups) {
+            boatGroup.updatePosition();
+            // some raceObjects will have multiple ID's (for instance gate marks)
+            //checking if the current "ID" has any updates associated with it
+            if (StreamParser.boatPositions.containsKey(boatGroup.getRaceId())) {
+                moveBoatGroup(boatGroup);
+            }
+        }
+        for (MarkGroup markGroup : markGroups) {
+            for (int id : markGroup.getRaceIds()) {
                 if (StreamParser.boatPositions.containsKey(id)) {
-                    move(id, raceObject);
+                    moveMarkGroup(id, markGroup);
                 }
             }
         }
     }
 
-    private void move(long id, RaceObject raceObject){
-        PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(id);
+    private void moveBoatGroup(BoatGroup boatGroup) {
+        PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(boatGroup.getRaceId());
         if (movementQueue.size() > 0){
-//            BoatPositionPacket positionPacket = movementQueue.peek();
-//
-//            //this code adds a delay to reading from the movementQueue
-//            //in case things being put into the movement queue are slightly
-//            //out of order
-//            int delayTime = 1000;
-//            int loopTime = delayTime * 10;
-//            long timeDiff = (System.currentTimeMillis()%loopTime - positionPacket.getTimeValid()%loopTime);
-//            if (timeDiff < 0){
-//                timeDiff = loopTime + timeDiff;
-//            }
-//            if (timeDiff > delayTime) {
             try {
                 BoatPositionPacket positionPacket = movementQueue.take();
-                if (id == 104){
-                    System.out.println(positionPacket.getTimeValid());
-                }
-                Point2D p2d = latLonToXY(positionPacket.getLat(), positionPacket.getLon());
+                Point2D p2d = findScaledXY(positionPacket.getLat(), positionPacket.getLon());
                 double heading = 360.0 / 0xffff * positionPacket.getHeading();
-                raceObject.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), (int) id);
+                boatGroup.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), boatGroup.getRaceId());
             } catch (InterruptedException e){
                 e.printStackTrace();
             }
@@ -224,6 +198,19 @@ public class CanvasController {
         }
     }
 
+    void moveMarkGroup (int raceId, MarkGroup markGroup) {
+        PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(raceId);
+        if (movementQueue.size() > 0){
+            try {
+                BoatPositionPacket positionPacket = movementQueue.take();
+                Point2D p2d = findScaledXY(positionPacket.getLat(), positionPacket.getLon());
+                markGroup.moveMarkTo(p2d.getX(), p2d.getY(), raceId);
+            } catch (InterruptedException e){
+                e.printStackTrace();
+            }
+        }
+    }
+
     class ResizableCanvas extends Canvas {
 
         ResizableCanvas() {
@@ -275,18 +262,18 @@ public class CanvasController {
     /**
      * Draws all the boats.
      */
-    private void initializeBoats() {
+    private void drawBoats() {
         Map<Integer, Yacht> boats = StreamParser.getBoats();
         Group boatAnnotations = new Group();
 
         for (Yacht boat : boats.values()) {
             boat.setColour(Colors.getColor());
             BoatGroup boatGroup = new BoatGroup(boat, boat.getColour());
-            raceObjects.add(boatGroup);
+            boatGroups.add(boatGroup);
             boatAnnotations.getChildren().add(boatGroup.getLowPriorityAnnotations());
         }
         group.getChildren().add(boatAnnotations);
-        group.getChildren().addAll(raceObjects);
+        group.getChildren().addAll(boatGroups);
     }
 
     /**
@@ -362,6 +349,7 @@ public class CanvasController {
         }
     }
 
+
     /**
      * Finds the scale factor necessary to fit all race markers within the onscreen map and assigns it to distanceScaleFactor
      * Returns the max horizontal distance of the map.
@@ -395,36 +383,37 @@ public class CanvasController {
      * are scaled according to the distanceScaleFactor variable.
      */
     private void givePointsXY() {
-    List<XMLParser.RaceXMLObject.CompoundMark> allPoints = StreamParser.getXmlObject().getRaceXML().getCompoundMarks();
-    List<XMLParser.RaceXMLObject.CompoundMark> processed = new ArrayList<>();
-    RaceObject markGroup;
-
-        for (XMLParser.RaceXMLObject.CompoundMark mark : allPoints) {
-        if (!processed.contains(mark)) {
-            if (mark.getMarkType() != MarkType.SINGLE_MARK) {
-                markGroup = new MarkGroup(mark, findScaledXY(mark.getMarks().get(0)), findScaledXY(mark.getMarks().get(1)));
-                raceObjects.add(markGroup);
-                } else {
-                    markGroup = new MarkGroup(mark, findScaledXY(mark.getMarks().get(0)));
-                    raceObjects.add(markGroup);
-                }
-                processed.add(mark);
-            }
-        }
+//        List<XMLParser.RaceXMLObject.CompoundMark> allPoints = StreamParser.getXmlObject().getRaceXML().getCompoundMarks();
+//        List<XMLParser.RaceXMLObject.CompoundMark> processed = new ArrayList<>();
+//        MarkGroup markGroup;
+//
+//        for (XMLParser.RaceXMLObject.CompoundMark mark : allPoints) {
+//            if (!processed.contains(mark)) {
+//                if (mark.getMarkType() != MarkType.SINGLE_MARK) {
+//                    markGroup = new MarkGroup(mark, findScaledXY(mark.getMarks().get(0)), findScaledXY(mark.getMarks().get(1)));
+//                    markGroups.add(markGroup);
+//                } else {
+//                    markGroup = new MarkGroup(mark, findScaledXY(mark.getMarks().get(0)));
+//                    markGroups.add(markGroup);
+//                }
+//                processed.add(mark);
+//            }
+//        }
+        group.getChildren().addAll(boatGroups);
     }
 
+    private Point2D findScaledXY (Mark unscaled) {
+        return findScaledXY (unscaled.getLatitude(), unscaled.getLongitude());
+    }
 
-
-    private Point2D latLonToXY (double latitude, double longitude){
+    private Point2D findScaledXY (double unscaledLat, double unscaledLon) {
         double distanceFromReference;
         double angleFromReference;
         int xAxisLocation = (int) referencePointX;
         int yAxisLocation = (int) referencePointY;
 
-        double minLat = minLatPoint.getLatitude();
-        double minLon = minLatPoint.getLongitude();
-        angleFromReference = Mark.calculateHeadingRad(minLat, minLon, latitude, longitude);
-        distanceFromReference = Mark.calculateDistance(minLat, minLon, latitude, longitude);
+        angleFromReference = Mark.calculateHeadingRad(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, unscaledLon);
+        distanceFromReference = Mark.calculateDistance(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, unscaledLon);
         if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
             xAxisLocation += (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
             yAxisLocation -= (int) Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
@@ -444,12 +433,7 @@ public class CanvasController {
         return new Point2D(xAxisLocation, yAxisLocation);
     }
 
-
-    private Point2D latLonToXY (double latitude, double longitude) {
-        return findScaledXY(minLatPoint.getLatitude(), minLatPoint.getLongitude(), latitude, longitude);
-    }
-
-    List<RaceObject> getRaceObjects() {
-        return raceObjects;
+    List<BoatGroup> getBoatGroups() {
+        return boatGroups;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index da85b3ae..bebc57fd 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -15,14 +15,13 @@ import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import seng302.models.Yacht;
-import seng302.models.parsers.StreamParser;
-import seng302.models.parsers.XMLParser;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 import java.util.Timer;
 import java.util.TimerTask;
+import seng302.models.stream.StreamParser;
 
 public class Controller implements Initializable {
     @FXML
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 24ff0163..8a09619e 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,6 +1,6 @@
 package seng302.controllers;
 
-import javafx.animation.Animation;
+import java.io.IOException;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.beans.value.ChangeListener;
@@ -12,7 +12,6 @@ import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Slider;
 import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
@@ -25,16 +24,16 @@ import seng302.controllers.annotations.Annotation;
 import seng302.controllers.annotations.ImportantAnnotationController;
 import seng302.controllers.annotations.ImportantAnnotationDelegate;
 import seng302.controllers.annotations.ImportantAnnotationsState;
-import seng302.models.*;
-import seng302.models.parsers.StreamParser;
-
-import java.io.IOException;
-import java.util.*;
+import seng302.models.BoatGroup;
+import seng302.models.RaceObject;
+import seng302.models.Yacht;
+import seng302.models.stream.StreamParser;
 
 /**
  * Created by ptg19 on 29/03/17.
  */
-public class RaceViewController extends Thread implements ImportantAnnotationDelegate{
+public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
+
     @FXML
     private VBox positionVbox;
     @FXML
@@ -52,12 +51,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     @FXML
     private CanvasController includedCanvasController;
 
-    private ArrayList<Yacht> startingBoats = new ArrayList<>();
     private boolean displayFps;
     private Timeline timerTimeline;
-    private Map<Yacht, TimelineInfo> timelineInfos = new HashMap<>();
-    private ArrayList<Yacht> boatOrder = new ArrayList<>();
-    private Race race;
     private Stage stage;
     private ImportantAnnotationsState importantAnnotations;
 
@@ -65,24 +60,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         // Load a default important annotation state
         importantAnnotations = new ImportantAnnotationsState();
 
-        RaceController raceController = new RaceController();
-        raceController.initializeRace();
-        race = raceController.getRace();
-
-        for (Yacht boat : race.getBoats()) {
-            startingBoats.add(boat);
-        }
-
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
         initializeTimer();
         initializeSettings();
         initialiseWindDirection();
         initialisePositionVBox();
-        //set wind direction!!!!!!! can't find another place to put my code --haoming
-//        double windDirection = new ConfigParser("/config/config.xml").getWindDirection();
-//        windDirectionText.setText(String.format("%.1f°", windDirection));
-//        windArrowText.setRotate(windDirection);
         includedCanvasController.timer.start();
 
         selectAnnotationBtn.setOnAction(event -> {
@@ -92,11 +75,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
     /**
      * The important annotations have been changed, update this view
+     *
      * @param importantAnnotationsState The current state of the selected annotations
      */
-    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState){
+    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState) {
         this.importantAnnotations = importantAnnotationsState;
-        setAnnotations((int)annotationSlider.getValue()); // Refresh the displayed annotations
+        setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
     /**
@@ -108,11 +92,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             Stage stage = new Stage();
 
             // Set controller
-            ImportantAnnotationController controller = new ImportantAnnotationController(this, stage);
+            ImportantAnnotationController controller = new ImportantAnnotationController(this,
+                stage);
             fxmlLoader.setController(controller);
 
             // Load FXML and set CSS
-            fxmlLoader.setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
+            fxmlLoader
+                .setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
             Scene scene = new Scene(fxmlLoader.load(), 469, 248);
             scene.getStylesheets().add(getClass().getResource("/css/master.css").toString());
             stage.initStyle(StageStyle.UNDECORATED);
@@ -132,7 +118,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
         toggleFps.selectedProperty().addListener(new ChangeListener<Boolean>() {
             @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue,
+                Boolean newValue) {
                 displayFps = !displayFps;
             }
         });
@@ -141,10 +128,18 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
             public String toString(Double n) {
-                if (n == 0) return "None";
-                if (n == 1) return "Low";
-                if (n == 2) return "Important";
-                if (n == 3) return "All";
+                if (n == 0) {
+                    return "None";
+                }
+                if (n == 1) {
+                    return "Low";
+                }
+                if (n == 2) {
+                    return "Important";
+                }
+                if (n == 3) {
+                    return "All";
+                }
 
                 return "All";
             }
@@ -168,25 +163,25 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
 
         annotationSlider.valueProperty().addListener((obs, oldval, newVal) ->
-                    setAnnotations((int)annotationSlider.getValue()));
+            setAnnotations((int) annotationSlider.getValue()));
 
         annotationSlider.setValue(3);
     }
 
-    private void initializeTimer(){
+    private void initializeTimer() {
         timerTimeline = new Timeline();
         timerTimeline.setCycleCount(Timeline.INDEFINITE);
         // Run timer update every second
         timerTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            if (StreamParser.isRaceFinished()) {
-                                timerLabel.setFill(Color.RED);
-                                timerLabel.setText("Race Finished!");
-                            } else {
-                                timerLabel.setText(currentTimer());
-                            }
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    if (StreamParser.isRaceFinished()) {
+                        timerLabel.setFill(Color.RED);
+                        timerLabel.setText("Race Finished!");
+                    } else {
+                        timerLabel.setText(currentTimer());
+                    }
+                })
         );
 
         // Start the timer
@@ -197,11 +192,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Timeline windDirTimeline = new Timeline();
         windDirTimeline.setCycleCount(Timeline.INDEFINITE);
         windDirTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            windDirectionText.setText(String.format("%.1f°", StreamParser.getWindDirection()));
-                            windArrowText.setRotate(StreamParser.getWindDirection());
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    windDirectionText
+                        .setText(String.format("%.1f°", StreamParser.getWindDirection()));
+                    windArrowText.setRotate(StreamParser.getWindDirection());
+                })
         );
         windDirTimeline.playFromStart();
     }
@@ -211,137 +207,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Timeline posVBoxTimeline = new Timeline();
         posVBoxTimeline.setCycleCount(Timeline.INDEFINITE);
         posVBoxTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            showOrder();
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    showOrder();
+                })
         );
         posVBoxTimeline.playFromStart();
-
-    }
-
-    /**
-     * Generates time line for each boat, and stores time time into timelineInfos hash map
-     */
-    private void initializeTimelines() {
-        HashMap<Yacht, List> boat_events = race.getEvents();
-        for (Yacht boat : boat_events.keySet()) {
-            startingBoats.add(boat);
-//            // x, y are the real time coordinates
-//            DoubleProperty x = new SimpleDoubleProperty();
-//            DoubleProperty y = new SimpleDoubleProperty();
-//
-//            List<KeyFrame> keyFrames = new ArrayList<>();
-//            List<Event> events = boat_events.get(boat);
-//
-//            // iterates all events and convert each event to keyFrame, then add them into a list
-//            for (Event event : events) {
-//                if (event.getIsFinishingEvent()) {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished -> {race.setBoatFinished(boat); handleEvent(event);},
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                } else {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished ->{
-//                                        handleEvent(event);
-//                                        boat.setHeading(event.getBoatHeading());
-//                                    },
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                }
-//            }
-//            timelineInfos.put(boat, new TimelineInfo(new Timeline(keyFrames.toArray(new KeyFrame[keyFrames.size()])), x, y));
-        }
-        setRaceDuration();
-    }
-
-    private void setRaceDuration(){
-        Double maxDuration = 0.0;
-        Timeline maxTimeline = null;
-
-        for (TimelineInfo timelineInfo : timelineInfos.values()) {
-
-            Timeline timeline = timelineInfo.getTimeline();
-            if (timeline.getTotalDuration().toMillis() >= maxDuration) {
-                maxDuration = timeline.getTotalDuration().toMillis();
-                maxTimeline = timeline;
-            }
-
-            // Timelines are paused by default
-            timeline.play();
-            timeline.pause();
-        }
-
-        maxTimeline.setOnFinished(event -> {
-            race.setRaceFinished();
-            loadRaceResultView();
-        });
-    }
-
-    /**
-     * Play each boats timerTimeline
-     */
-    public void playTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.PAUSED){
-                timeline.play();
-            }
-        }
-    }
-
-    /**
-     * Pause each boats timerTimeline
-     */
-    public void pauseTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.RUNNING){
-                timeline.pause();
-            }
-        }
-    }
-
-    /**
-     * Display the list of boats in the order they finished the race
-     */
-    private void loadRaceResultView() {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/views/FinishView.fxml"));
-        loader.setController(new RaceResultController(race));
-
-        try {
-            contentAnchorPane.getChildren().removeAll();
-            contentAnchorPane.getChildren().clear();
-            contentAnchorPane.getChildren().addAll((Pane) loader.load());
-
-        } catch (javafx.fxml.LoadException e) {
-            System.err.println(e.getCause());
-        } catch (IOException e) {
-            System.err.println(e);
-        }
-    }
-
-    public void handleEvent(Event event) {
-        Yacht boat = event.getBoat();
-        boatOrder.remove(boat);
-        boat.setMarkLastPast(event.getMarkPosInRace());
-        boatOrder.add(boat);
-        boatOrder.sort(new Comparator<Yacht>() {
-            @Override
-            public int compare(Yacht b1, Yacht b2) {
-                return b2.getMarkLastPast() - b1.getMarkLastPast();
-            }
-        });
-        showOrder();
     }
 
     private void showOrder() {
@@ -349,20 +220,16 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         positionVbox.getChildren().removeAll();
         positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
 
-//        for (Boat boat : boatOrder) {
-//            positionVbox.getChildren().add(new Text(boat.getShortName() + " " + boat.getSpeedInKnots() + " Knots"));
-//        }
-
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " (Finished)");
+                    boat.getShortName() + " (Finished)");
                 textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                 positionVbox.getChildren().add(textToAdd);
 
             } else {
                 Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " ");
+                    boat.getShortName() + " ");
                 textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                 textToAdd.setStyle("");
                 positionVbox.getChildren().add(textToAdd);
@@ -404,118 +271,83 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return timerString;
     }
 
-    public void stopTimer() {
-        timerTimeline.stop();
-    }
-    public void startTimer() {
-        timerTimeline.play();
-    }
-
     public boolean isDisplayFps() {
         return displayFps;
     }
 
-    public Race getRace() {
-        return race;
-    }
-
-    public Map<Yacht, TimelineInfo> getTimelineInfos() {
-        return timelineInfos;
-    }
-
-    public ArrayList<Yacht> getStartingBoats(){
-        return startingBoats;
-    }
-
     /**
      * Display the important annotations for a specific BoatGroup
+     *
      * @param bg The boat group to set the annotations for
      */
-    private void setBoatGroupImportantAnnotations(BoatGroup bg){
-        if (importantAnnotations.getAnnotationState(Annotation.NAME)){
+    private void setBoatGroupImportantAnnotations(BoatGroup bg) {
+        if (importantAnnotations.getAnnotationState(Annotation.NAME)) {
             bg.setTeamNameObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setTeamNameObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.SPEED)){
+        if (importantAnnotations.getAnnotationState(Annotation.SPEED)) {
             bg.setVelocityObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setVelocityObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.TRACK)){
+        if (importantAnnotations.getAnnotationState(Annotation.TRACK)) {
             bg.setLineGroupVisible(true);
-        }
-        else{
+        } else {
             bg.setLineGroupVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.WAKE)){
+        if (importantAnnotations.getAnnotationState(Annotation.WAKE)) {
             bg.setWakeVisible(true);
-        }
-        else{
+        } else {
             bg.setWakeVisible(false);
         }
     }
 
     private void setAnnotations(Integer annotationLevel) {
         switch (annotationLevel) {
-            // No Annotations
             case 0:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        bg.setTeamNameObjectVisible(false);
-                        bg.setVelocityObjectVisible(false);
-                        bg.setLineGroupVisible(false);
-                        bg.setWakeVisible(false);
-                    }
+                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+                    bg.setTeamNameObjectVisible(false);
+                    bg.setVelocityObjectVisible(false);
+                    bg.setLineGroupVisible(false);
+                    bg.setWakeVisible(false);
                 }
                 break;
-            // Low Annotations
             case 1:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        bg.setTeamNameObjectVisible(true);
-                        bg.setVelocityObjectVisible(false);
-                        bg.setLineGroupVisible(false);
-                        bg.setWakeVisible(false);
-                    }
+                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+                    bg.setTeamNameObjectVisible(true);
+                    bg.setVelocityObjectVisible(false);
+                    bg.setLineGroupVisible(false);
+                    bg.setWakeVisible(false);
                 }
                 break;
-            // Important Annotations
             case 2:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        setBoatGroupImportantAnnotations(bg);
-                    }
+                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+                    bg.setTeamNameObjectVisible(true);
+                    bg.setVelocityObjectVisible(false);
+                    bg.setLineGroupVisible(true);
+                    bg.setWakeVisible(false);
                 }
                 break;
-            // All Annotations
             case 3:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        bg.setTeamNameObjectVisible(true);
-                        bg.setVelocityObjectVisible(true);
-                        bg.setLineGroupVisible(true);
-                        bg.setWakeVisible(true);
-                    }
+                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+                    bg.setTeamNameObjectVisible(true);
+                    bg.setVelocityObjectVisible(true);
+                    bg.setLineGroupVisible(true);
+                    bg.setWakeVisible(true);
                 }
                 break;
         }
     }
 
-    void setStage (Stage stage) {
+    void setStage(Stage stage) {
         this.stage = stage;
     }
 
-    Stage getStage () {
+    Stage getStage() {
         return stage;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 327ae1ba..ed594276 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -19,7 +19,7 @@ import java.util.List;
  * UpdatePosition is called unless the window is minimized in which case it attempts to store animations and apply them
  * when the window is maximised.
  */
-public class BoatGroup extends RaceObject{
+public class BoatGroup extends Group{
 
     //Constants for drawing
     private static final double TEAMNAME_X_OFFSET = 10d;
@@ -30,8 +30,15 @@ public class BoatGroup extends RaceObject{
     private static final double BOAT_WIDTH = 10d;
     //Variables for boat logic.
     private Point2D lastPoint;
-    private int wakeGenerationDelay = 10;
-    private double distanceTravelled;
+    double oldTime;
+    double newTime;
+    double lastYValue = 0;
+    double lastXValue = 0;
+    private double dx;
+    private double dy;
+    private double pixelVelocityX;
+    private double pixelVelocityY;
+    private static final int expectedUpdateInterval = 200;
     //Graphical objects
     private Yacht boat;
     private Group lineGroup = new Group();
@@ -39,14 +46,6 @@ public class BoatGroup extends RaceObject{
     private Text teamNameObject;
     private Text velocityObject;
     private Wake wake;
-    //Handles boat moving when connecting to a stream
-    private boolean setToInitialLocation = false;
-    private boolean destinationSet;
-    //Variables for handling minimization
-    private Stage stage;
-    private boolean isMaximized= true;
-    private List<Line> lineStorage = new ArrayList<>();
-    private int setCallCount = 5;
 
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
@@ -91,7 +90,6 @@ public class BoatGroup extends RaceObject{
         velocityObject.setX(VELOCITY_X_OFFSET);
         velocityObject.setY(VELOCITY_Y_OFFSET);
         velocityObject.relocate(velocityObject.getX(), velocityObject.getY());
-        destinationSet = false;
 
         wake = new Wake(0, -BOAT_HEIGHT);
         super.getChildren().addAll(teamNameObject, velocityObject, boatPoly);
@@ -103,9 +101,9 @@ public class BoatGroup extends RaceObject{
      */
     private void initChildren (Color color) {
         initChildren(color,
-                -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
-                0.0, -BOAT_HEIGHT / 2,
-                BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
+            -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
+            0.0, -BOAT_HEIGHT / 2,
+            BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
     }
 
     /**
@@ -113,7 +111,7 @@ public class BoatGroup extends RaceObject{
      * @param dx The amount to move the X coordinate by
      * @param dy The amount to move the Y coordinate by
      */
-    public void moveGroupBy(double dx, double dy, double rotation) {
+    public void moveGroupBy(double dx, double dy) {
         boatPoly.setLayoutX(boatPoly.getLayoutX() + dx);
         boatPoly.setLayoutY(boatPoly.getLayoutY() + dy);
         teamNameObject.setLayoutX(teamNameObject.getLayoutX() + dx);
@@ -122,19 +120,16 @@ public class BoatGroup extends RaceObject{
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
         wake.setLayoutX(wake.getLayoutX() + dx);
         wake.setLayoutY(wake.getLayoutY() + dy);
-        currentRotation = rotation + currentRotation;
-        boatPoly.getTransforms().setAll(new Rotate(rotation));
     }
 
+
     /**
      * Moves the boat and its children annotations to coordinates specified
      * @param x The X coordinate to move the boat to
      * @param y The Y coordinate to move the boat to
-     * @param rotation The heading in degrees from north the boat should rotate to.
      */
     public void moveTo (double x, double y, double rotation) {
-        currentRotation = rotation;
-        boatPoly.getTransforms().setAll(new Rotate(rotation));
+        rotateTo(rotation);
         boatPoly.setLayoutX(x);
         boatPoly.setLayoutY(y);
         teamNameObject.setLayoutX(x);
@@ -143,42 +138,14 @@ public class BoatGroup extends RaceObject{
         velocityObject.setLayoutY(y);
         wake.setLayoutX(x);
         wake.setLayoutY(y);
-        wake.rotate(currentRotation);
     }
 
-    /**
-     * Updates the position of all graphics in the BoatGroup based off of the given time interval.
-     * @param timeInterval The interval, in milliseconds, the boat should update it's position based on.
-     */
-    public void updatePosition (long timeInterval) {
-        //Calculate the movement of the boat.
-        if (isMaximized) {
-            double dx = pixelVelocityX * timeInterval;
-            double dy = pixelVelocityY * timeInterval;
-            double rotation = rotationalVelocity * timeInterval;
-            distanceTravelled += Math.abs(dx) + Math.abs(dy);
-            moveGroupBy(dx, dy, rotation);
+    public void rotateTo (double rotation) {
+        boatPoly.getTransforms().setAll(new Rotate(rotation));
+    }
 
-            //Draw a new section of the trail every 20 pixels of movement.
-            if (distanceTravelled > 20) {
-                distanceTravelled = 0;
-                if (lastPoint != null) {
-                    Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            boatPoly.getLayoutX(),
-                            boatPoly.getLayoutY()
-                    );
-                    l.getStrokeDashArray().setAll(3d, 7d);
-                    l.setStroke(boatPoly.getFill());
-                    lineGroup.getChildren().add(l);
-                }
-                if (destinationSet) { //Only begin drawing after the first destination is set
-                    lastPoint = new Point2D(boatPoly.getLayoutX(), boatPoly.getLayoutY());
-                }
-            }
-            wake.updatePosition(timeInterval);
-        }
+    public void updatePosition () {
+        moveGroupBy(dx, dy);
     }
 
     /**
@@ -188,59 +155,26 @@ public class BoatGroup extends RaceObject{
      * @param rotation Rotation to move graphics to.
      * @param raceIds RaceID of the object to move.
      */
-    public void setDestination (double newXValue, double newYValue, double rotation, double groundSpeed, int... raceIds) {
-        if (hasRaceId(raceIds)) {
-            if (setToInitialLocation) {
-                destinationSet = true;
-                boat.setVelocity(groundSpeed);
-                if (currentRotation < 0)
-                    currentRotation = 360 - currentRotation;
-                double dx = newXValue - boatPoly.getLayoutX();
-                double dy = newYValue - boatPoly.getLayoutY();
+    public void setDestination (double newXValue, double newYValue, double rotation, double groundSpeed, long raceIds) {
+        System.currentTimeMillis();
+        moveTo(lastXValue, lastYValue, rotation);
 
-                pixelVelocityX = dx / expectedUpdateInterval;
-                pixelVelocityY = dy / expectedUpdateInterval;
-                rotationalGoal = rotation;
-                calculateRotationalVelocity();
+        dx = (newXValue - lastXValue)/12;
+        dy = (newYValue - lastYValue)/12;
 
-                if (wakeGenerationDelay > 0) {
-                    wake.rotate(rotationalGoal);
-                    rotationalVelocity = 0;
-                    wakeGenerationDelay--;
-                } else {
-                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
-                }
-                velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
-            } else {
-                setToInitialLocation = true;
-                rotationalGoal = rotation;
-                moveTo(newXValue, newYValue, rotation);
-            }
-        }
-        //If minimized generate lines every 5 calls to set destination.
-        if (!isMaximized) {
-            setToInitialLocation = false;
-            wakeGenerationDelay = 2;
-            if(setCallCount-- == 0) {
-                setCallCount = 5;
-                if (lastPoint != null) {
-                    Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            newXValue,
-                            newYValue
-                    );
-                    l.getStrokeDashArray().setAll(3d, 7d);
-                    l.setStroke(boatPoly.getFill());
-                    lineStorage.add(l);
-                }
-                if (destinationSet) { //Only begin drawing after the first destination is set
-                    lastPoint = new Point2D(newXValue, newYValue);
-                }
-            }
-        }
+        lastXValue = newXValue;
+        lastYValue = newYValue;
+
+        boat.setVelocity(groundSpeed);
+        velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
     }
 
+
+
+
+
+
+
     public void setTeamNameObjectVisible(Boolean visible) {
         teamNameObject.setVisible(visible);
     }
@@ -261,27 +195,27 @@ public class BoatGroup extends RaceObject{
         return boat;
     }
 
-    /**
-     * Returns true if this BoatGroup contains at least one of the given IDs.
-     *
-     * @param raceIds The ID's to check the BoatGroup for.
-     * @return True if the BoatGroup contains at east one of the given IDs, false otherwise.
-     */
-    public boolean hasRaceId (int... raceIds) {
-        for (int id : raceIds) {
-            if (id == boat.getSourceID())
-                return true;
-        }
-        return false;
-    }
+//    /**
+//     * Returns true if this BoatGroup contains at least one of the given IDs.
+//     *
+//     * @param raceIds The ID's to check the BoatGroup for.
+//     * @return True if the BoatGroup contains at east one of the given IDs, false otherwise.
+//     */
+//    public boolean hasRaceId (long... raceIds) {
+//        for (long id : raceIds) {
+//            if (id == boat.getSourceID())
+//                return true;
+//        }
+//        return false;
+//    }
 
     /**
      * Returns all raceIds associated with this group. For BoatGroups the ID's are for the boat.
      *
      * @return An array containing all ID's associated with this RaceObject.
      */
-    public int[] getRaceIds () {
-        return new int[] {boat.getSourceID()};
+    public long getRaceId() {
+        return boat.getSourceID();
     }
 
     /**
@@ -296,25 +230,4 @@ public class BoatGroup extends RaceObject{
         group.getChildren().addAll(wake, lineGroup);
         return group;
     }
-
-    /**
-     * Use this function to let the BoatGroup know about the stage it is in. If it knows about it's stage then it will
-     * listen to the iconified property of that stage and change it's behaviour upon minimization. Without setting the
-     * Stage there is guarantee that the BoatGroup will draw properly when the stage is minimized.
-     *
-     * @param stage The stage that the BoatGroup is added to.
-     */
-    public void setStage (Stage stage) {
-        /* TODO: 4/05/17 cir27 - Find a way to get the stage to this point. Need to pass it through multiple controllers.
-                                 App.start() -> Controller.setContentPane -> RaceViewController -> CanvasController
-         */
-        this.stage = stage;
-        this.stage.iconifiedProperty().addListener(e -> {
-            isMaximized = !stage.isIconified();
-            if (!lineStorage.isEmpty()) {
-                lineGroup.getChildren().addAll(lineStorage);
-                lineStorage.clear();
-            }
-        });
-    }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/seng302/models/mark/MarkGroup.java b/src/main/java/seng302/models/mark/MarkGroup.java
index a4b134ad..0e886abc 100644
--- a/src/main/java/seng302/models/mark/MarkGroup.java
+++ b/src/main/java/seng302/models/mark/MarkGroup.java
@@ -1,12 +1,11 @@
 package seng302.models.mark;
 
 import javafx.geometry.Point2D;
-import javafx.scene.Node;
+import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Line;
 import javafx.scene.transform.Rotate;
-import seng302.models.RaceObject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +13,7 @@ import java.util.List;
 /**
  * Created by CJIRWIN on 26/04/2017.
  */
-public class MarkGroup extends RaceObject {
+public class MarkGroup extends Group {
 
     private static int MARK_RADIUS        = 5;
     private static int LINE_THICKNESS     = 2;
@@ -23,14 +22,8 @@ public class MarkGroup extends RaceObject {
 
     private List<Mark> marks = new ArrayList<>();
     private Mark mainMark;
-    private double[] nodePixelVelocitiesX;
-    private double[] nodePixelVelocitiesY;
-    private Point2D[] nodeDestinations;
 
     public MarkGroup (Mark mark, Point2D... points) {
-        nodePixelVelocitiesX = new double[points.length];
-        nodePixelVelocitiesY = new double[points.length];
-        nodeDestinations     = new Point2D[points.length];
         marks.add(mark);
         mainMark = mark;
         Color color = Color.BLACK;
@@ -42,45 +35,33 @@ public class MarkGroup extends RaceObject {
         Circle markCircle;
         if (mark.getMarkType() == MarkType.SINGLE_MARK) {
             markCircle = new Circle(
-                    points[0].getX(),
-                    points[0].getY(),
-                    MARK_RADIUS,
-                    color
+                points[0].getX(),
+                points[0].getY(),
+                MARK_RADIUS,
+                color
             );
-            nodeDestinations = new Point2D[]{
-                    new Point2D(markCircle.getCenterX(), markCircle.getCenterY()
-                    )
-            };
             super.getChildren().add(markCircle);
         } else {
-//            marks.add(((GateMark) mark).getSingleMark1());
-//            marks.add(((GateMark) mark).getSingleMark2());
-            nodePixelVelocitiesX = new double[]{0d,0d};
-            nodePixelVelocitiesY = new double[]{0d,0d};
-            nodeDestinations     = new Point2D[2];
-
             markCircle = new Circle(
-                    points[0].getX(),
-                    points[0].getY(),
-                    MARK_RADIUS,
-                    color
+                points[0].getX(),
+                points[0].getY(),
+                MARK_RADIUS,
+                color
             );
-            nodeDestinations[0] = new Point2D(markCircle.getCenterX(), markCircle.getCenterY());
             super.getChildren().add(markCircle);
 
             markCircle = new Circle(
-                    points[1].getX(),
-                    points[1].getY(),
-                    MARK_RADIUS,
-                    color
+                points[1].getX(),
+                points[1].getY(),
+                MARK_RADIUS,
+                color
             );
-            nodeDestinations[1] = new Point2D(markCircle.getCenterX(), markCircle.getCenterY());
             super.getChildren().add(markCircle);
             Line line = new Line(
-                    points[0].getX(),
-                    points[0].getY(),
-                    points[1].getX(),
-                    points[1].getY()
+                points[0].getX(),
+                points[0].getY(),
+                points[1].getX(),
+                points[1].getY()
             );
             line.setStrokeWidth(LINE_THICKNESS);
             line.setStroke(color);
@@ -91,132 +72,38 @@ public class MarkGroup extends RaceObject {
         }
     }
 
-    public void setDestination (double x, double y, double rotation, double groundSpeed, int... raceIds) {
-        for (int i = 0; i < marks.size(); i++)
-            for (int id : raceIds)
-                if (id == marks.get(i).getId())
-                    setDestinationChild(x, y, 0, Math.max(0, i-1));
-        this.rotationalGoal = rotation;
-        calculateRotationalVelocity();
-    }
-
-
-    private void setDestinationChild (double x, double y, double speed, int childIndex) {
-        //double relativeX = x - super.getLayoutX();
-        //double relativeY = y - super.getLayoutY();
-        Circle markCircle = (Circle) super.getChildren().get(childIndex);
-        this.nodeDestinations[childIndex] = new Point2D(x, y);
-        //if (Math.abs(relativeX - markCircle.getCenterX()) > 30 && Math.abs(relativeY - markCircle.getCenterY()) > 30) {
-            this.nodePixelVelocitiesX[childIndex] = (x - markCircle.getCenterX()) / expectedUpdateInterval;
-            this.nodePixelVelocitiesY[childIndex] = (y - markCircle.getCenterY()) / expectedUpdateInterval;
-        //}
-    }
-
-    public void rotateTo (double rotation) {
-        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
-            Line line = (Line) super.getChildren().get(2);
-            double xCenter = Math.abs(line.getEndX() - line.getStartX());
-            double yCenter = Math.abs(line.getEndY() - line.getStartY());
-            super.getTransforms().setAll(new Rotate(rotation, xCenter, yCenter));
-        }
-    }
-
-    public void updatePosition (long timeInterval) {
-        Circle markCircle = (Circle) super.getChildren().get(0);
-
-        if (nodePixelVelocitiesX[0] > 0 && markCircle.getCenterX() > nodeDestinations[0].getX() ||
-                nodePixelVelocitiesX[0] < 0 && markCircle.getCenterX() < nodeDestinations[0].getY())
-            nodePixelVelocitiesX[0] = 0;
-        else if (nodePixelVelocitiesX[0] != 0)
-            markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[0] * timeInterval);
-
-        if (nodePixelVelocitiesY[0] > 0 && markCircle.getCenterY() > nodeDestinations[0].getY() ||
-                nodePixelVelocitiesY[0] < 0 && markCircle.getCenterY() < nodeDestinations[0].getY())
-            nodePixelVelocitiesY[0] = 0;
-        else if (nodePixelVelocitiesY[0] != 0)
-            markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[0] * timeInterval);
-
-        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
-
-            Line line = (Line) super.getChildren().get(2);
-            line.setStartX(markCircle.getCenterX());
-            line.setStartY(markCircle.getCenterY());
-
-            markCircle = (Circle) super.getChildren().get(1);
-
-            if (nodePixelVelocitiesX[1] > 0 && markCircle.getCenterX() >= nodeDestinations[1].getX() ||
-                    nodePixelVelocitiesX[1] < 0 && markCircle.getCenterX() <= nodeDestinations[1].getX())
-                nodePixelVelocitiesX[1] = 0;
-            else if (nodePixelVelocitiesX[1] != 0)
-                markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[1] * timeInterval);
-
-            if (nodePixelVelocitiesY[1] > 0 && markCircle.getCenterY() > nodeDestinations[1].getY() ||
-                    nodePixelVelocitiesY[1] < 0 && markCircle.getCenterY() < nodeDestinations[1].getY())
-                nodePixelVelocitiesY[1] = 0;
-            else if (nodePixelVelocitiesY[1] != 0)
-                markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[1] * timeInterval);
-            line.setEndX(markCircle.getCenterX());
-            line.setEndY(markCircle.getCenterY());
-        }
-    }
-
-    public void moveGroupBy (double x, double y, double rotation) {
-        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
-            Line line = (Line) super.getChildren().get(2);
-            for (int childIndex = 0; childIndex < 2; childIndex++){
-                Circle mark = (Circle) super.getChildren().get(childIndex);
-                mark.setCenterY(mark.getCenterY() + y);
-                mark.setCenterX(mark.getCenterX() + x);
-            }
-            line.setStartX(line.getStartX() + x);
-            line.setStartY(line.getStartY() + y);
-            line.setEndX(line.getEndX() + x);
-            line.setEndY(line.getEndY() + y);
-        } else {
-            Circle mark = (Circle) super.getChildren().get(0);
-            mark.setCenterY(mark.getCenterY() + y);
-            mark.setCenterX(mark.getCenterX() + x);
-        }
-        rotateTo(currentRotation + rotation);
-    }
-
-    public void moveTo (double x, double y, double rotation) {
-        moveTo(x, y);
-        rotateTo(rotation);
-    }
-
-    public void moveTo (double x, double y) {
-        Circle markCircle = (Circle) super.getChildren().get(0);
-        markCircle.setCenterX(x);
-        markCircle.setCenterY(y);
-        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
-            markCircle = (Circle) super.getChildren().get(1);
+    public void moveMarkTo (double x, double y, int raceId)
+    {
+        if (mainMark.getMarkType() == MarkType.SINGLE_MARK) {
+            Circle markCircle = (Circle) super.getChildren().get(0);
             markCircle.setCenterX(x);
             markCircle.setCenterY(y);
-            Line line = (Line) super.getChildren().get(2);
-            line.setStartX(x);
-            line.setStartY(y);
-            line.setEndX(x);
-            line.setEndY(y);
+        } else {
+            Circle markCircle1 = (Circle) super.getChildren().get(0);
+            Circle markCircle2 = (Circle) super.getChildren().get(1);
+            Line connectingLine = (Line) super.getChildren().get(2);
+            if (marks.get(1).getId() == raceId) {
+                markCircle1.setCenterX(x);
+                markCircle1.setCenterY(y);
+                connectingLine.setStartX(markCircle1.getCenterX());
+                connectingLine.setStartY(markCircle1.getCenterY());
+            } else if (marks.get(2).getId() == raceId) {
+                markCircle2.setCenterX(x);
+                markCircle2.setCenterY(y);
+                connectingLine.setEndX(markCircle2.getCenterX());
+                connectingLine.setEndY(markCircle2.getCenterY());
+            }
         }
     }
 
     public boolean hasRaceId (int... raceIds) {
         for (int id : raceIds)
             for (Mark mark : marks)
-            if (id == mark.getId())
-                return true;
+                if (id == mark.getId())
+                    return true;
         return false;
     }
 
-    public static int getMarkRadius() {
-        return MARK_RADIUS;
-    }
-
-    public static void setMarkRadius(int markRadius) {
-        MARK_RADIUS = markRadius;
-    }
-
     public int[] getRaceIds () {
         int[] idArray = new int[marks.size()];
         int i = 0;
@@ -224,4 +111,4 @@ public class MarkGroup extends RaceObject {
             idArray[i++] = mark.getId();
         return idArray;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/seng302/models/stream/StreamParser.java b/src/main/java/seng302/models/stream/StreamParser.java
index e703941d..51769a1d 100644
--- a/src/main/java/seng302/models/stream/StreamParser.java
+++ b/src/main/java/seng302/models/stream/StreamParser.java
@@ -205,7 +205,6 @@ public class StreamParser extends Thread{
                 raceFinished = false;
                 System.out.println("[CLIENT] Race has started");
             }
-            //System.out.println("Time since start: " + -1 * timeTillStart + " Seconds");
             timeSinceStart = timeTillStart;
         }
         long windDir = bytesToLong(Arrays.copyOfRange(payload,18,20));
@@ -214,11 +213,10 @@ public class StreamParser extends Thread{
         long windSpeed = bytesToLong(Arrays.copyOfRange(payload,20,22));
         int noBoats = payload[22];
         int raceType = payload[23];
-//        ArrayList<String> boatStatuses = new ArrayList<>();
         boatsPos = new TreeMap<>();
         for (int i = 0; i < noBoats; i++){
-            Long boatStatusSourceID = bytesToLong(Arrays.copyOfRange(payload,24 + (i * 20),28+ (i * 20)));
-            Yacht boat = boats.get((int)(long) boatStatusSourceID);
+            long boatStatusSourceID = bytesToLong(Arrays.copyOfRange(payload,24 + (i * 20),28+ (i * 20)));
+            Yacht boat = boats.get((int) boatStatusSourceID);
             boat.setBoatStatus((int)payload[28 + (i * 20)]);
             boat.setLegNumber((int)payload[29 + (i * 20)]);
             boat.setPenaltiesAwarded((int)payload[29 + (i * 20)]);
@@ -281,7 +279,6 @@ public class StreamParser extends Thread{
         int messageType = payload[9];
         long messagelength = bytesToLong(Arrays.copyOfRange(payload,12,14));
         String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messagelength)))).trim();
-        //System.out.println("xmlMessage2 = " + xmlMessage);
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -344,7 +341,6 @@ public class StreamParser extends Thread{
         long subjectId = bytesToLong(Arrays.copyOfRange(payload,9,13));
         long incidentId = bytesToLong(Arrays.copyOfRange(payload,13,17));
         int eventId = payload[17];
-//        System.out.println("eventId = " + eventId);
     }
 
     /**
@@ -382,19 +378,18 @@ public class StreamParser extends Thread{
         double groundSpeed = bytesToLong(Arrays.copyOfRange(payload,38,40))/1000.0;
 
         //type 1 is a racing yacht and type 3 is a mark, needed for updating positions of the mark and boat
-        if (deviceType == 1 || deviceType == 3){
+        if (deviceType == 1){
             BoatPositionPacket boatPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, heading, groundSpeed);
 
             //add a new priority que to the boatPositions HashMap
             if (!boatPositions.containsKey(boatId)){
-                boatPositions.put(boatId, new PriorityBlockingQueue<BoatPositionPacket>(256, new Comparator<BoatPositionPacket>() {
+                boatPositions.put(boatId, new PriorityBlockingQueue<>(256, new Comparator<BoatPositionPacket>() {
                     @Override
                     public int compare(BoatPositionPacket p1, BoatPositionPacket p2) {
                         return (int) (p1.getTimeValid() - p2.getTimeValid());
                     }
                 }));
             }
-            //Adding the boatPacket to the priority que
             boatPositions.get(boatId).put(boatPacket);
         }
     }
diff --git a/src/test/java/seng302/models/stream/StreamReceiverTest.java b/src/test/java/seng302/models/stream/StreamReceiverTest.java
index d713efda..4d0bea44 100644
--- a/src/test/java/seng302/models/stream/StreamReceiverTest.java
+++ b/src/test/java/seng302/models/stream/StreamReceiverTest.java
@@ -2,13 +2,13 @@ package seng302.models.stream;
 
 import org.junit.Before;
 import org.junit.Test;
-import seng302.models.parsers.packets.StreamPacket;
 
 import java.io.*;
 import java.lang.reflect.Method;
 import java.net.Socket;
 import java.util.Comparator;
 import java.util.concurrent.PriorityBlockingQueue;
+import seng302.models.stream.packets.StreamPacket;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

From 2d5a7a8a494cddec670cd5d8824dd1f3de68773c Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Tue, 16 May 2017 15:06:01 +1200
Subject: [PATCH 23/36] Large tidying of RaceViewController class. Fixing
 updating for combo boxes

 #story[955]
---
 src/main/java/seng302/App.java                |   4 +-
 .../seng302/controllers/RaceController.java   |   2 +-
 .../controllers/RaceViewController.java       | 290 ++++++------------
 .../java/seng302/models/mark/MarkGroup.java   |   1 +
 .../seng302/models/parsers/StreamParser.java  |   1 -
 5 files changed, 95 insertions(+), 203 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 3b88fd00..17da9945 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,8 +62,8 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
 
         }
 
diff --git a/src/main/java/seng302/controllers/RaceController.java b/src/main/java/seng302/controllers/RaceController.java
index d0ea0d42..e5e95d59 100644
--- a/src/main/java/seng302/controllers/RaceController.java
+++ b/src/main/java/seng302/controllers/RaceController.java
@@ -25,7 +25,7 @@ public class RaceController {
         String teamsConfigFile = "/config/teams.xml";
 
         try {
-            race = createRace(raceConfigFile, teamsConfigFile);
+            race = createRace(raceConfigFile, teamsConfigFile);     //These config files arent actually used
         } catch (Exception e) {
             System.out.println("There was an error creating the race.");
         }
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 1f015913..69c51e23 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,12 +1,8 @@
 package seng302.controllers;
 
-import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableArray;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -62,15 +58,17 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private boolean displayFps;
     private Timeline timerTimeline;
     private Map<Yacht, TimelineInfo> timelineInfos = new HashMap<>();
-    private ArrayList<Yacht> boatOrder = new ArrayList<>();
     private Race race;
     private Stage stage;
+
     private ImportantAnnotationsState importantAnnotations;
+    private Yacht selectedBoat;
 
     public void initialize() {
         // Load a default important annotation state
         importantAnnotations = new ImportantAnnotationsState();
 
+        //Initialise race controller
         RaceController raceController = new RaceController();
         raceController.initializeRace();
         race = raceController.getRace();
@@ -79,15 +77,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
-        initializeTimer();
-        initializeSettings();
-        initialiseWindDirection();
-        initialisePositionVBox();
+        initializeUpdateTimer();
+        initialiseFPSCheckBox();
+        initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
-        //set wind direction!!!!!!! can't find another place to put my code --haoming
-//        double windDirection = new ConfigParser("/config/config.xml").getWindDirection();
-//        windDirectionText.setText(String.format("%.1f°", windDirection));
-//        windArrowText.setRotate(windDirection);
         includedCanvasController.timer.start();
 
         selectAnnotationBtn.setOnAction(event -> {
@@ -132,17 +125,14 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
-    private void initializeSettings() {
+
+    private void initialiseFPSCheckBox() {
         displayFps = true;
+        toggleFps.selectedProperty().addListener(
+            (observable, oldValue, newValue) -> displayFps = !displayFps);
+    }
 
-        toggleFps.selectedProperty().addListener(new ChangeListener<Boolean>() {
-            @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                displayFps = !displayFps;
-            }
-        });
-
-        //SLIDER STUFF BELOW
+    private void initialiseAnnotationSlider() {
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
             public String toString(Double n) {
@@ -175,19 +165,24 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
-    private void initializeTimer(){
+
+    /**
+     * Initalises a timer which updates elements of the RaceView such as wind direction, boat
+     * orderings etc.. which are dependent on the info from the stream parser constantly.
+     * Updates of each of these attributes are called ONCE EACH SECOND
+     */
+    private void initializeUpdateTimer(){
         timerTimeline = new Timeline();
         timerTimeline.setCycleCount(Timeline.INDEFINITE);
         // Run timer update every second
         timerTimeline.getKeyFrames().add(
                 new KeyFrame(Duration.seconds(1),
                         event -> {
-                            if (StreamParser.isRaceFinished()) {
-                                timerLabel.setFill(Color.RED);
-                                timerLabel.setText("Race Finished!");
-                            } else {
-                                timerLabel.setText(currentTimer());
-                            }
+                            updateRaceTime();
+                            updateWindDirection();
+                            updateOrder();
+                            updateBoatSelectionComboBox();
+
                         })
         );
 
@@ -195,133 +190,82 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         timerTimeline.playFromStart();
     }
 
-    private void initialiseWindDirection() {
-        Timeline windDirTimeline = new Timeline();
-        windDirTimeline.setCycleCount(Timeline.INDEFINITE);
-        windDirTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            windDirectionText.setText(String.format("%.1f°", StreamParser.getWindDirection()));
-                            windArrowText.setRotate(StreamParser.getWindDirection());
-                        })
-        );
-        windDirTimeline.playFromStart();
+
+    /**
+     * Updates the wind direction arrow and text as from info from the StreamParser
+     */
+    private void updateWindDirection() {
+        windDirectionText.setText(String.format("%.1f°", StreamParser.getWindDirection()));
+        windArrowText.setRotate(StreamParser.getWindDirection());
     }
 
-    private void initialisePositionVBox() {
-
-        Timeline posVBoxTimeline = new Timeline();
-        posVBoxTimeline.setCycleCount(Timeline.INDEFINITE);
-        posVBoxTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            showOrder();
-                        })
-        );
-        posVBoxTimeline.playFromStart();
 
+    /**
+     * Updates the clock for the race
+     */
+    private void updateRaceTime() {
+        if (StreamParser.isRaceFinished()) {
+            timerLabel.setFill(Color.RED);
+            timerLabel.setText("Race Finished!");
+        } else {
+            timerLabel.setText(getTimeSinceStartOfRace());
+        }
     }
 
-    private void initialiseBoatSelectionComboBox() {
 
-        ObservableList<Yacht> observableBoats =  FXCollections.observableArrayList(startingBoats);
+    /**
+     * Grabs the boats currently in the race as from the StreamParser and sets them to be selectable
+     * in the boat selection combo box
+     */
+    private void updateBoatSelectionComboBox() {
+        ObservableList<Yacht> observableBoats =  FXCollections.observableArrayList(StreamParser.getBoatsPos().values());
         boatSelectionComboBox.setItems(observableBoats);
+    }
+
+
+    /**
+     * Updates the order of the boats as from the StreamParser and sets them in the boat order section
+     */
+    private void updateOrder() {
+        positionVbox.getChildren().clear();
+        positionVbox.getChildren().removeAll();
+        positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+
+        for (Yacht boat : StreamParser.getBoatsPos().values()) {
+            if (boat.getBoatStatus() == 3) {  // 3 is finish status
+                Text textToAdd = new Text(boat.getPosition() + ". " +
+                    boat.getShortName() + " (Finished)");
+                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+                positionVbox.getChildren().add(textToAdd);
+
+            } else {
+                Text textToAdd = new Text(boat.getPosition() + ". " +
+                    boat.getShortName() + " ");
+                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+                textToAdd.setStyle("");
+                positionVbox.getChildren().add(textToAdd);
+            }
+
+        }
+    }
+
+
+    /**
+     * Initialised the combo box with any boats currently in the race and adds the required listener
+     * for the combobox to take action upon selection
+     */
+    private void initialiseBoatSelectionComboBox() {
+        updateBoatSelectionComboBox();
         boatSelectionComboBox.valueProperty().addListener((observable, oldValue, newValue) -> {
-            Yacht thisYacht = (Yacht) newValue;
-            setSelectedBoat(thisYacht);
+            //This listener is fired whenever the combo box changes. This means when the values are updated
+            //We dont want to set the selected value if the values are updated but nothing clicked (null)
+            if (newValue != null && newValue != selectedBoat) {
+                Yacht thisYacht = (Yacht) newValue;
+                setSelectedBoat(thisYacht);
+            }
         });
     }
 
-    /**
-     * Generates time line for each boat, and stores time time into timelineInfos hash map
-     */
-    private void initializeTimelines() {
-        HashMap<Yacht, List> boat_events = race.getEvents();
-        for (Yacht boat : boat_events.keySet()) {
-            startingBoats.add(boat);
-//            // x, y are the real time coordinates
-//            DoubleProperty x = new SimpleDoubleProperty();
-//            DoubleProperty y = new SimpleDoubleProperty();
-//
-//            List<KeyFrame> keyFrames = new ArrayList<>();
-//            List<Event> events = boat_events.get(boat);
-//
-//            // iterates all events and convert each event to keyFrame, then add them into a list
-//            for (Event event : events) {
-//                if (event.getIsFinishingEvent()) {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished -> {race.setBoatFinished(boat); handleEvent(event);},
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                } else {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished ->{
-//                                        handleEvent(event);
-//                                        boat.setHeading(event.getBoatHeading());
-//                                    },
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                }
-//            }
-//            timelineInfos.put(boat, new TimelineInfo(new Timeline(keyFrames.toArray(new KeyFrame[keyFrames.size()])), x, y));
-        }
-        setRaceDuration();
-    }
-
-    private void setRaceDuration(){
-        Double maxDuration = 0.0;
-        Timeline maxTimeline = null;
-
-        for (TimelineInfo timelineInfo : timelineInfos.values()) {
-
-            Timeline timeline = timelineInfo.getTimeline();
-            if (timeline.getTotalDuration().toMillis() >= maxDuration) {
-                maxDuration = timeline.getTotalDuration().toMillis();
-                maxTimeline = timeline;
-            }
-
-            // Timelines are paused by default
-            timeline.play();
-            timeline.pause();
-        }
-
-        maxTimeline.setOnFinished(event -> {
-            race.setRaceFinished();
-            loadRaceResultView();
-        });
-    }
-
-    /**
-     * Play each boats timerTimeline
-     */
-    public void playTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.PAUSED){
-                timeline.play();
-            }
-        }
-    }
-
-    /**
-     * Pause each boats timerTimeline
-     */
-    public void pauseTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.RUNNING){
-                timeline.pause();
-            }
-        }
-    }
 
     /**
      * Display the list of boats in the order they finished the race
@@ -342,46 +286,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
-    public void handleEvent(Event event) {
-        Yacht boat = event.getBoat();
-        boatOrder.remove(boat);
-        boat.setMarkLastPast(event.getMarkPosInRace());
-        boatOrder.add(boat);
-        boatOrder.sort(new Comparator<Yacht>() {
-            @Override
-            public int compare(Yacht b1, Yacht b2) {
-                return b2.getMarkLastPast() - b1.getMarkLastPast();
-            }
-        });
-        showOrder();
-    }
-
-    private void showOrder() {
-        positionVbox.getChildren().clear();
-        positionVbox.getChildren().removeAll();
-        positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
-
-//        for (Boat boat : boatOrder) {
-//            positionVbox.getChildren().add(new Text(boat.getShortName() + " " + boat.getSpeedInKnots() + " Knots"));
-//        }
-
-        for (Yacht boat : StreamParser.getBoatsPos().values()) {
-            if (boat.getBoatStatus() == 3) {  // 3 is finish status
-                Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " (Finished)");
-                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
-                positionVbox.getChildren().add(textToAdd);
-
-            } else {
-                Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " ");
-                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
-                textToAdd.setStyle("");
-                positionVbox.getChildren().add(textToAdd);
-            }
-
-        }
-    }
 
     /**
      * Convert seconds to a string of the format mm:ss
@@ -396,7 +300,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return String.format("%02d:%02d", time / 60, time % 60);
     }
 
-    private String currentTimer() {
+    private String getTimeSinceStartOfRace() {
         String timerString = "0:00";
         if (StreamParser.getTimeSinceStart() > 0) {
             String timerMinute = Long.toString(StreamParser.getTimeSinceStart() / 60);
@@ -416,12 +320,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return timerString;
     }
 
-    public void stopTimer() {
-        timerTimeline.stop();
-    }
-    public void startTimer() {
-        timerTimeline.play();
-    }
 
     public boolean isDisplayFps() {
         return displayFps;
@@ -431,13 +329,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return race;
     }
 
-    public Map<Yacht, TimelineInfo> getTimelineInfos() {
-        return timelineInfos;
-    }
-
-    public ArrayList<Yacht> getStartingBoats(){
-        return startingBoats;
-    }
 
     /**
      * Display the important annotations for a specific BoatGroup
@@ -524,6 +415,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 //are to toggle its annotations, there is no other backwards knowledge of a yacht to its boatgroup.
                 if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
                     bg.setIsSelected(true);
+                    selectedBoat = yacht;
                 } else {
                     bg.setIsSelected(false);
                 }
diff --git a/src/main/java/seng302/models/mark/MarkGroup.java b/src/main/java/seng302/models/mark/MarkGroup.java
index 29931e01..d58f3b78 100644
--- a/src/main/java/seng302/models/mark/MarkGroup.java
+++ b/src/main/java/seng302/models/mark/MarkGroup.java
@@ -1,6 +1,7 @@
 package seng302.models.mark;
 
 import javafx.geometry.Point2D;
+import javafx.scene.CacheHint;
 import javafx.scene.Node;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..32d0b850 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -24,7 +24,6 @@ import java.util.concurrent.PriorityBlockingQueue;
  * and parsed in by turning the byte arrays into useful data. There are two public static hashmaps
  * that are threadsafe so the visualiser can always access the latest speed and position available
  * Created by kre39 on 23/04/17.
- *
  */
 public class StreamParser extends Thread{
 

From afd97d6e05ce5a2dec2704cd8522bab9908aab58 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Wed, 17 May 2017 00:34:36 +1200
Subject: [PATCH 24/36] Reformating of code to google style.

 #story[955]
---
 .../controllers/RaceViewController.java       | 84 +++++++++++--------
 1 file changed, 47 insertions(+), 37 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 69c51e23..27edd1f2 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -34,7 +34,8 @@ import java.util.*;
 /**
  * Created by ptg19 on 29/03/17.
  */
-public class RaceViewController extends Thread implements ImportantAnnotationDelegate{
+public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
+
     @FXML
     private VBox positionVbox;
     @FXML
@@ -90,11 +91,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
     /**
      * The important annotations have been changed, update this view
+     *
      * @param importantAnnotationsState The current state of the selected annotations
      */
-    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState){
+    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState) {
         this.importantAnnotations = importantAnnotationsState;
-        setAnnotations((int)annotationSlider.getValue()); // Refresh the displayed annotations
+        setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
     /**
@@ -106,11 +108,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             Stage stage = new Stage();
 
             // Set controller
-            ImportantAnnotationController controller = new ImportantAnnotationController(this, stage);
+            ImportantAnnotationController controller = new ImportantAnnotationController(this,
+                stage);
             fxmlLoader.setController(controller);
 
             // Load FXML and set CSS
-            fxmlLoader.setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
+            fxmlLoader
+                .setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
             Scene scene = new Scene(fxmlLoader.load(), 469, 248);
             scene.getStylesheets().add(getClass().getResource("/css/master.css").toString());
             stage.initStyle(StageStyle.UNDECORATED);
@@ -136,9 +140,15 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
             public String toString(Double n) {
-                if (n == 0) return "None";
-                if (n == 1) return "Important";
-                if (n == 2) return "All";
+                if (n == 0) {
+                    return "None";
+                }
+                if (n == 1) {
+                    return "Important";
+                }
+                if (n == 2) {
+                    return "All";
+                }
 
                 return "All";
             }
@@ -160,7 +170,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
 
         annotationSlider.valueProperty().addListener((obs, oldval, newVal) ->
-                    setAnnotations((int)annotationSlider.getValue()));
+            setAnnotations((int) annotationSlider.getValue()));
 
         annotationSlider.setValue(2);
     }
@@ -171,19 +181,19 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
      * orderings etc.. which are dependent on the info from the stream parser constantly.
      * Updates of each of these attributes are called ONCE EACH SECOND
      */
-    private void initializeUpdateTimer(){
+    private void initializeUpdateTimer() {
         timerTimeline = new Timeline();
         timerTimeline.setCycleCount(Timeline.INDEFINITE);
         // Run timer update every second
         timerTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            updateRaceTime();
-                            updateWindDirection();
-                            updateOrder();
-                            updateBoatSelectionComboBox();
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    updateRaceTime();
+                    updateWindDirection();
+                    updateOrder();
+                    updateBoatSelectionComboBox();
 
-                        })
+                })
         );
 
         // Start the timer
@@ -218,13 +228,15 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
      * in the boat selection combo box
      */
     private void updateBoatSelectionComboBox() {
-        ObservableList<Yacht> observableBoats =  FXCollections.observableArrayList(StreamParser.getBoatsPos().values());
+        ObservableList<Yacht> observableBoats = FXCollections
+            .observableArrayList(StreamParser.getBoatsPos().values());
         boatSelectionComboBox.setItems(observableBoats);
     }
 
 
     /**
-     * Updates the order of the boats as from the StreamParser and sets them in the boat order section
+     * Updates the order of the boats as from the StreamParser and sets them in the boat order
+     * section
      */
     private void updateOrder() {
         positionVbox.getChildren().clear();
@@ -332,34 +344,31 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
     /**
      * Display the important annotations for a specific BoatGroup
+     *
      * @param bg The boat group to set the annotations for
      */
-    private void setBoatGroupImportantAnnotations(BoatGroup bg){
-        if (importantAnnotations.getAnnotationState(Annotation.NAME)){
+    private void setBoatGroupImportantAnnotations(BoatGroup bg) {
+        if (importantAnnotations.getAnnotationState(Annotation.NAME)) {
             bg.setTeamNameObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setTeamNameObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.SPEED)){
+        if (importantAnnotations.getAnnotationState(Annotation.SPEED)) {
             bg.setVelocityObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setVelocityObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.TRACK)){
+        if (importantAnnotations.getAnnotationState(Annotation.TRACK)) {
             bg.setLineGroupVisible(true);
-        }
-        else{
+        } else {
             bg.setLineGroupVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.WAKE)){
+        if (importantAnnotations.getAnnotationState(Annotation.WAKE)) {
             bg.setWakeVisible(true);
-        }
-        else{
+        } else {
             bg.setWakeVisible(false);
         }
     }
@@ -369,7 +378,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // No Annotations
             case 0:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(false);
                         bg.setVelocityObjectVisible(false);
@@ -381,7 +390,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // Important Annotations
             case 1:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         setBoatGroupImportantAnnotations(bg);
                     }
@@ -390,7 +399,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // All Annotations
             case 2:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(true);
@@ -405,6 +414,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
     /**
      * Sets all the annotations of the selected boat to be visible and all others to be hidden
+     *
      * @param yacht The yacht for which we want to view all annotations
      */
     private void setSelectedBoat(Yacht yacht) {
@@ -423,11 +433,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
-    void setStage (Stage stage) {
+    void setStage(Stage stage) {
         this.stage = stage;
     }
 
-    Stage getStage () {
+    Stage getStage() {
         return stage;
     }
 }
\ No newline at end of file

From 1acb0fbac44666f3fe0188602de6c2a0c1a7ba00 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Wed, 17 May 2017 10:04:28 +1200
Subject: [PATCH 25/36] Merge on to develop

story[955]
---
 src/main/java/seng302/App.java              |  1 -
 src/main/java/seng302/models/BoatGroup.java | 34 ++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index c945e03b..3625db47 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -64,7 +64,6 @@ public class App extends Application {
         else{
 //            sr = new StreamReceiver("localhost", 4949, "RaceStream");
             sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
-
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index e07c57ee..535cc412 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -1,5 +1,6 @@
 package seng302.models;
 
+import com.sun.xml.internal.bind.v2.TODO;
 import javafx.geometry.Point2D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
@@ -49,6 +50,7 @@ public class BoatGroup extends RaceObject {
     private Text estTimeToNextMarkObject;
     private Text legTimeObject;
     private Wake wake;
+    private boolean isSelected = true;  //Boats annotations are visible by default at the start
     //Handles boat moving when connecting to a stream
     private boolean setToInitialLocation = false;
     private boolean destinationSet;
@@ -95,6 +97,9 @@ public class BoatGroup extends RaceObject {
     private void initChildren(Color color, double... points) {
         boatPoly = new Polygon(points);
         boatPoly.setFill(color);
+        boatPoly.setOnMouseEntered(event -> boatPoly.setFill(Color.FLORALWHITE));
+        boatPoly.setOnMouseExited(event -> boatPoly.setFill(color));
+        boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected));
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
@@ -228,7 +233,7 @@ public class BoatGroup extends RaceObject {
                         boatPoly.getLayoutY()
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
-                    l.setStroke(boatPoly.getFill());
+                    l.setStroke(boat.getColour());
                     lineGroup.getChildren().add(l);
                 }
                 if (destinationSet) { //Only begin drawing after the first destination is set
@@ -349,6 +354,10 @@ public class BoatGroup extends RaceObject {
         wake.rotate(rotationalGoal);
     }
 
+    public void paintBoat(Color color) {
+        boatPoly.setFill(color);
+    }
+
     public void setTeamNameObjectVisible(Boolean visible) {
         teamNameObject.setVisible(visible);
     }
@@ -377,6 +386,24 @@ public class BoatGroup extends RaceObject {
         return boat;
     }
 
+    /**
+     * This function sets the boats isSelected property AS WELL as actually acting upon the value of
+     * that selection. (Painting or not painting annotations)
+     *
+     * @param isSelected A Boolean indicating whether or not the boat is selected
+     */
+    public void setIsSelected(Boolean isSelected) {
+        this.isSelected = isSelected;
+        setTeamNameObjectVisible(isSelected);
+        setVelocityObjectVisible(isSelected);
+        setLineGroupVisible(isSelected);
+        setWakeVisible(isSelected);
+        setEstTimeToNextMarkObjectVisible(isSelected);
+        setLegTimeObjectVisible(isSelected);
+        // TODO: 17/05/17 wmu16 - this should iterate over some list of annotations which we should make to easily make extensible
+//        paintBoat((isSelected) ? Color.WHITE : boat.getColour());
+    }
+
     /**
      * Returns true if this BoatGroup contains at least one of the given IDs.
      *
@@ -435,4 +462,9 @@ public class BoatGroup extends RaceObject {
             }
         });
     }
+
+    @Override
+    public String toString() {
+        return boat.toString();
+    }
 }

From 6a85b0800f0ebd37864429790de7880cf2471479 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Wed, 17 May 2017 10:06:50 +1200
Subject: [PATCH 26/36] Merge on to develop

story[955]
---
 src/main/java/seng302/models/BoatGroup.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 535cc412..c82811a1 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -1,6 +1,5 @@
 package seng302.models;
 
-import com.sun.xml.internal.bind.v2.TODO;
 import javafx.geometry.Point2D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;

From 1c01aab1e728341d4bbd9f950ff077d28ba01089 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Wed, 17 May 2017 10:34:00 +1200
Subject: [PATCH 27/36] Merge on to develop

story[955]
---
 src/main/java/seng302/models/BoatGroup.java | 76 ++++++++++-----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index c82811a1..bea2f04b 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -62,8 +62,8 @@ public class BoatGroup extends RaceObject {
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
      *
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
-     * to tell which BoatGroup to update.
+     * @param boat  The boat that the BoatGroup will represent. Must contain an ID which will be used
+     *              to tell which BoatGroup to update.
      * @param color The colour of the boat polygon and the trailing line.
      */
     public BoatGroup(Yacht boat, Color color) {
@@ -75,11 +75,11 @@ public class BoatGroup extends RaceObject {
      * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be
      * at point (0,0).
      *
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
-     * to tell which BoatGroup to update.
-     * @param color The colour of the boat polygon and the trailing line.
+     * @param boat   The boat that the BoatGroup will represent. Must contain an ID which will be used
+     *               to tell which BoatGroup to update.
+     * @param color  The colour of the boat polygon and the trailing line.
      * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
-     * polygon.
+     *               polygon.
      */
     public BoatGroup(Yacht boat, Color color, double... points) {
         this.boat = boat;
@@ -89,9 +89,9 @@ public class BoatGroup extends RaceObject {
     /**
      * Creates the javafx objects that will be the in the group by default.
      *
-     * @param color The colour of the boat polygon and the trailing line.
+     * @param color  The colour of the boat polygon and the trailing line.
      * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
-     * polygon.
+     *               polygon.
      */
     private void initChildren(Color color, double... points) {
         boatPoly = new Polygon(points);
@@ -104,11 +104,11 @@ public class BoatGroup extends RaceObject {
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
         DateFormat format = new SimpleDateFormat("mm:ss");
         String timeToNextMark = format
-            .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+                .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
         estTimeToNextMarkObject = new Text("Next mark: " + timeToNextMark);
         if (boat.getMarkRoundingTime() != null) {
             String elapsedTime = format
-                .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
+                    .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
             legTimeObject = new Text("Last mark: " + elapsedTime);
         } else {
             legTimeObject = new Text("Last mark: -");
@@ -126,7 +126,7 @@ public class BoatGroup extends RaceObject {
         estTimeToNextMarkObject.setX(ESTTIMETONEXTMARK_X_OFFSET);
         estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
         estTimeToNextMarkObject
-            .relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
+                .relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
 
         legTimeObject.setX(LEGTIME_X_OFFSET);
         legTimeObject.setY(LEGTIME_Y_OFFSET);
@@ -134,8 +134,8 @@ public class BoatGroup extends RaceObject {
 
         wake = new Wake(0, -BOAT_HEIGHT);
         super.getChildren()
-            .addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject,
-                legTimeObject);
+                .addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject,
+                        legTimeObject);
     }
 
     /**
@@ -145,9 +145,9 @@ public class BoatGroup extends RaceObject {
      */
     private void initChildren(Color color) {
         initChildren(color,
-            -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
-            0.0, -BOAT_HEIGHT / 2,
-            BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
+                -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
+                0.0, -BOAT_HEIGHT / 2,
+                BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
     }
 
     /**
@@ -176,8 +176,8 @@ public class BoatGroup extends RaceObject {
     /**
      * Moves the boat and its children annotations to coordinates specified
      *
-     * @param x The X coordinate to move the boat to
-     * @param y The Y coordinate to move the boat to
+     * @param x        The X coordinate to move the boat to
+     * @param y        The Y coordinate to move the boat to
      * @param rotation The heading in degrees from north the boat should rotate to.
      */
     public void moveTo(double x, double y, double rotation) {
@@ -211,7 +211,7 @@ public class BoatGroup extends RaceObject {
      * Updates the position of all graphics in the BoatGroup based off of the given time interval.
      *
      * @param timeInterval The interval, in milliseconds, the boat should update it's position based
-     * on.
+     *                     on.
      */
     public void updatePosition(long timeInterval) {
         //Calculate the movement of the boat.
@@ -226,10 +226,10 @@ public class BoatGroup extends RaceObject {
                 distanceTravelled = 0;
                 if (lastPoint != null) {
                     Line l = new Line(
-                        lastPoint.getX(),
-                        lastPoint.getY(),
-                        boatPoly.getLayoutX(),
-                        boatPoly.getLayoutY()
+                            lastPoint.getX(),
+                            lastPoint.getY(),
+                            boatPoly.getLayoutX(),
+                            boatPoly.getLayoutY()
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boat.getColour());
@@ -248,11 +248,11 @@ public class BoatGroup extends RaceObject {
      *
      * @param newXValue The X co-ordinate the boat needs to move to.
      * @param newYValue The Y co-ordinate the boat needs to move to.
-     * @param rotation Rotation to move graphics to.
-     * @param raceIds RaceID of the object to move.
+     * @param rotation  Rotation to move graphics to.
+     * @param raceIds   RaceID of the object to move.
      */
     public void setDestination(double newXValue, double newYValue, double rotation,
-        double groundSpeed, int... raceIds) {
+                               double groundSpeed, int... raceIds) {
         if (hasRaceId(raceIds)) {
             if (setToInitialLocation) {
                 destinationSet = true;
@@ -281,18 +281,18 @@ public class BoatGroup extends RaceObject {
                     wakeGenerationDelay--;
                 } else {
                     wake.setRotationalVelocity(rotationalVelocity, rotationalGoal,
-                        boat.getVelocity());
+                            boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
                 DateFormat format = new SimpleDateFormat("mm:ss");
                 // estimate time to next mark
                 String timeToNextMark = format
-                    .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+                        .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
                 estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark);
                 // elapsed time
                 if (boat.getMarkRoundingTime() != null) {
                     String elapsedTime = format
-                        .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
+                            .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
                     legTimeObject.setText("Last mark: " + elapsedTime);
                 } else {
                     legTimeObject.setText("Last mark: -");
@@ -311,10 +311,10 @@ public class BoatGroup extends RaceObject {
                 setCallCount = 5;
                 if (lastPoint != null) {
                     Line l = new Line(
-                        lastPoint.getX(),
-                        lastPoint.getY(),
-                        newXValue,
-                        newYValue
+                            lastPoint.getX(),
+                            lastPoint.getY(),
+                            newXValue,
+                            newYValue
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
@@ -328,16 +328,16 @@ public class BoatGroup extends RaceObject {
     }
 
     public void setDestination(double newXValue, double newYValue, double groundSpeed,
-        int... raceIDs) {
+                               int... raceIDs) {
         destinationSet = true;
 
         if (hasRaceId(raceIDs)) {
             double rotation = Math.abs(
-                Math.toDegrees(
-                    Math.atan(
-                        (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
+                    Math.toDegrees(
+                            Math.atan(
+                                    (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
+                            )
                     )
-                )
             );
             setDestination(newXValue, newYValue, rotation, groundSpeed, raceIDs);
         }

From 4da8c1645e8f385a8e95de3bac7ad901929e93e6 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Wed, 17 May 2017 12:56:13 +1200
Subject: [PATCH 28/36] Split Start Screen out from Main View view and
 controller.

#story[923]
---
 .../java/seng302/controllers/Controller.java  | 109 +-----------
 .../controllers/StartScreenController.java    | 160 ++++++++++++++++++
 src/main/resources/views/MainView.fxml        |  56 +-----
 src/main/resources/views/StartScreenView.fxml |  60 +++++++
 4 files changed, 222 insertions(+), 163 deletions(-)
 create mode 100644 src/main/java/seng302/controllers/StartScreenController.java
 create mode 100644 src/main/resources/views/StartScreenView.fxml

diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index da85b3ae..ba6a8e28 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -27,26 +27,6 @@ import java.util.TimerTask;
 public class Controller implements Initializable {
     @FXML
     private AnchorPane contentPane;
-    @FXML
-    private Label timeTillLive;
-    @FXML
-    private Button streamButton;
-    @FXML
-    private Button switchToRaceViewButton;
-    @FXML
-    private TableView<Yacht> teamList;
-    @FXML
-    private TableColumn<Yacht, String> boatNameCol;
-    @FXML
-    private TableColumn<Yacht, String> shortNameCol;
-    @FXML
-    private TableColumn<Yacht, String> countryCol;
-    @FXML
-    private TableColumn<Yacht, String> posCol;
-    @FXML
-    private Label realTime;
-
-    private boolean switchedToRaceView = false;
 
     private void setContentPane(String jfxUrl){
         try{
@@ -66,93 +46,6 @@ public class Controller implements Initializable {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
-        teamList.getStylesheets().add(getClass().getResource("/css/master.css").toString());
-    }
-
-    /**
-     * Running a timer to update the livestream status on welcome screen. Update interval is 1 second.
-     */
-    public void startStream() {
-        if (StreamParser.isStreamStatus()) {
-            streamButton.setVisible(false);
-            realTime.setVisible(true);
-            timeTillLive.setVisible(true);
-            timeTillLive.setTextFill(Color.GREEN);
-            timeTillLive.setText("Connecting...");
-            Timer timer = new Timer();
-            timer.scheduleAtFixedRate(new TimerTask() {
-                @Override
-                public void run() {
-                    Platform.runLater(() -> {
-                        if (StreamParser.isRaceStarted()) {
-                            if (!switchedToRaceView) {
-                                switchToRaceView();
-                            }
-                            timer.cancel();
-                        }
-                        if (StreamParser.isRaceFinished()) {
-                            realTime.setText(StreamParser.getCurrentTimeString());
-                            timeTillLive.setTextFill(Color.RED);
-                            timeTillLive.setText("Race finished! Waiting for new race...");
-                            switchToRaceViewButton.setDisable(true);
-                        } else if (StreamParser.getTimeSinceStart() > 0) {
-                            realTime.setText(StreamParser.getCurrentTimeString());
-                            updateTeamList();
-                            timeTillLive.setTextFill(Color.RED);
-                            switchToRaceViewButton.setDisable(false);
-                            String timerMinute = Long.toString(StreamParser.getTimeSinceStart() / 60);
-                            String timerSecond = Long.toString(StreamParser.getTimeSinceStart() % 60);
-                            if (timerSecond.length() == 1) {
-                                timerSecond = "0" + timerSecond;
-                            }
-                            String timerString = "-" + timerMinute + ":" + timerSecond;
-                            timeTillLive.setText(timerString);
-                        } else {
-                            realTime.setText(StreamParser.getCurrentTimeString());
-                            updateTeamList();
-                            timeTillLive.setTextFill(Color.BLACK);
-                            switchToRaceViewButton.setDisable(false);
-                            String timerMinute = Long.toString(-1 * StreamParser.getTimeSinceStart() / 60);
-                            String timerSecond = Long.toString(-1 * StreamParser.getTimeSinceStart() % 60);
-                            if (timerSecond.length() == 1) {
-                                timerSecond = "0" + timerSecond;
-                            }
-                            String timerString = timerMinute + ":" + timerSecond;
-                            timeTillLive.setText(timerString);
-                        }
-                    });
-                }
-            }, 0, 1000);
-        } else {
-            timeTillLive.setText("Stream not available.");
-            timeTillLive.setTextFill(Color.RED);
-        }
-    }
-
-    public void switchToRaceView() {
-        switchedToRaceView = true;
-        setContentPane("/views/RaceView.fxml");
-    }
-
-    private void updateTeamList() {
-        ObservableList<Yacht> data = FXCollections.observableArrayList();
-
-        teamList.setItems(data);
-
-        boatNameCol.setCellValueFactory(
-                new PropertyValueFactory<>("boatName")
-        );
-        shortNameCol.setCellValueFactory(
-                new PropertyValueFactory<>("shortName")
-        );
-        countryCol.setCellValueFactory(
-                new PropertyValueFactory<>("country")
-        );
-        posCol.setCellValueFactory(
-                new PropertyValueFactory<>("position")
-        );
-
-        data.addAll(StreamParser.getBoatsPos().values());
-        teamList.refresh();
+        setContentPane("/views/StartScreenView.fxml");
     }
 }
diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java
new file mode 100644
index 00000000..8a4d563b
--- /dev/null
+++ b/src/main/java/seng302/controllers/StartScreenController.java
@@ -0,0 +1,160 @@
+package seng302.controllers;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ResourceBundle;
+import java.util.Timer;
+import java.util.TimerTask;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.fxml.Initializable;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import seng302.models.Yacht;
+import seng302.models.parsers.StreamParser;
+
+public class StartScreenController implements Initializable {
+    @FXML
+    private GridPane gridPane;
+    @FXML
+    private Label timeTillLive;
+    @FXML
+    private Button streamButton;
+    @FXML
+    private Button switchToRaceViewButton;
+    @FXML
+    private TableView<Yacht> teamList;
+    @FXML
+    private TableColumn<Yacht, String> boatNameCol;
+    @FXML
+    private TableColumn<Yacht, String> shortNameCol;
+    @FXML
+    private TableColumn<Yacht, String> countryCol;
+    @FXML
+    private TableColumn<Yacht, String> posCol;
+    @FXML
+    private Label realTime;
+
+    private boolean switchedToRaceView = false;
+
+    private void setContentPane(String jfxUrl){
+        try{
+            // get the main controller anchor pane (MainView.fxml)
+            AnchorPane contentPane = (AnchorPane) gridPane.getParent();
+            contentPane.getChildren().removeAll();
+            contentPane.getChildren().clear();
+            contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+            contentPane.getChildren().addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
+        }
+        catch(javafx.fxml.LoadException e){
+            System.err.println(e.getCause());
+        }
+        catch(IOException e){
+            System.err.println(e);
+        }
+    }
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        gridPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+        teamList.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+    }
+
+    /**
+     * Running a timer to update the livestream status on welcome screen. Update interval is 1 second.
+     */
+    public void startStream() {
+        if (StreamParser.isStreamStatus()) {
+            streamButton.setVisible(false);
+            realTime.setVisible(true);
+            timeTillLive.setVisible(true);
+            timeTillLive.setTextFill(Color.GREEN);
+            timeTillLive.setText("Connecting...");
+            Timer timer = new Timer();
+            timer.scheduleAtFixedRate(new TimerTask() {
+                @Override
+                public void run() {
+                    Platform.runLater(() -> {
+                        if (StreamParser.isRaceStarted()) {
+                            if (!switchedToRaceView) {
+                                switchToRaceView();
+                            }
+                            timer.cancel();
+                        }
+                        if (StreamParser.isRaceFinished()) {
+                            realTime.setText(StreamParser.getCurrentTimeString());
+                            timeTillLive.setTextFill(Color.RED);
+                            timeTillLive.setText("Race finished! Waiting for new race...");
+                            switchToRaceViewButton.setDisable(true);
+                        } else if (StreamParser.getTimeSinceStart() > 0) {
+                            realTime.setText(StreamParser.getCurrentTimeString());
+                            updateTeamList();
+                            timeTillLive.setTextFill(Color.RED);
+                            switchToRaceViewButton.setDisable(false);
+                            String timerMinute = Long.toString(StreamParser.getTimeSinceStart() / 60);
+                            String timerSecond = Long.toString(StreamParser.getTimeSinceStart() % 60);
+                            if (timerSecond.length() == 1) {
+                                timerSecond = "0" + timerSecond;
+                            }
+                            String timerString = "-" + timerMinute + ":" + timerSecond;
+                            timeTillLive.setText(timerString);
+                        } else {
+                            realTime.setText(StreamParser.getCurrentTimeString());
+                            updateTeamList();
+                            timeTillLive.setTextFill(Color.BLACK);
+                            switchToRaceViewButton.setDisable(false);
+                            String timerMinute = Long.toString(-1 * StreamParser.getTimeSinceStart() / 60);
+                            String timerSecond = Long.toString(-1 * StreamParser.getTimeSinceStart() % 60);
+                            if (timerSecond.length() == 1) {
+                                timerSecond = "0" + timerSecond;
+                            }
+                            String timerString = timerMinute + ":" + timerSecond;
+                            timeTillLive.setText(timerString);
+                        }
+                    });
+                }
+            }, 0, 1000);
+        } else {
+            timeTillLive.setText("Stream not available.");
+            timeTillLive.setTextFill(Color.RED);
+        }
+    }
+
+    public void switchToRaceView() {
+        switchedToRaceView = true;
+        setContentPane("/views/RaceView.fxml");
+    }
+
+    private void updateTeamList() {
+        ObservableList<Yacht> data = FXCollections.observableArrayList();
+
+        teamList.setItems(data);
+
+        boatNameCol.setCellValueFactory(
+                new PropertyValueFactory<>("boatName")
+        );
+        shortNameCol.setCellValueFactory(
+                new PropertyValueFactory<>("shortName")
+        );
+        countryCol.setCellValueFactory(
+                new PropertyValueFactory<>("country")
+        );
+        posCol.setCellValueFactory(
+                new PropertyValueFactory<>("position")
+        );
+
+        data.addAll(StreamParser.getBoatsPos().values());
+        teamList.refresh();
+    }
+}
diff --git a/src/main/resources/views/MainView.fxml b/src/main/resources/views/MainView.fxml
index 054dd6cd..dab6e135 100644
--- a/src/main/resources/views/MainView.fxml
+++ b/src/main/resources/views/MainView.fxml
@@ -7,58 +7,4 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane fx:id="contentPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.Controller">
-   <children>
-      <GridPane nodeOrientation="LEFT_TO_RIGHT" prefWidth="800.0" style="-fx-background-color: #2C2c36;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="52.0" minHeight="52.0" prefHeight="52.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="0.0" percentHeight="8.0" prefHeight="0.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="28.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="55.0" minHeight="55.0" percentHeight="9.0" prefHeight="55.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="0.0" minHeight="0.0" percentHeight="29.0" prefHeight="0.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="93.0" minHeight="72.0" prefHeight="72.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="283.0" minHeight="262.0" prefHeight="283.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <Label alignment="CENTER" text="Welcome to Race Vision" textFill="WHITE" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
-               <font>
-                  <Font size="40.0" />
-               </font>
-            </Label>
-            <Label text="Your live AC35 livestream" textFill="WHITE" GridPane.halignment="CENTER" GridPane.rowIndex="1">
-               <font>
-                  <Font size="20.0" />
-               </font>
-            </Label>
-            <Label text="Livestream Status:" textFill="WHITE" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
-               <font>
-                  <Font size="28.0" />
-               </font>
-            </Label>
-            <Label fx:id="timeTillLive" text="0:00 minutes" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="4">
-               <font>
-                  <Font size="27.0" />
-               </font>
-            </Label>
-            <Button fx:id="streamButton" mnemonicParsing="false" onAction="#startStream" styleClass="blue-ui-btn" text="Click to stream" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
-            <Button fx:id="switchToRaceViewButton" disable="true" mnemonicParsing="false" onAction="#switchToRaceView" styleClass="blue-ui-btn" text="Watch Race" GridPane.halignment="CENTER" GridPane.rowIndex="7" GridPane.valignment="TOP" />
-            <TableView fx:id="teamList" maxWidth="661.0" prefHeight="324.0" prefWidth="629.0" styleClass="ui-table" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="5" GridPane.vgrow="NEVER">
-              <columns>
-                  <TableColumn fx:id="posCol" editable="false" maxWidth="74.0" minWidth="74.0" prefWidth="74.0" resizable="false" sortable="false" text="Position" />
-                <TableColumn fx:id="boatNameCol" editable="false" maxWidth="171.0" minWidth="171.0" prefWidth="171.0" resizable="false" sortable="false" text="Boat Name" />
-                <TableColumn fx:id="shortNameCol" editable="false" maxWidth="155.18472290039062" minWidth="107.0" prefWidth="155.18472290039062" resizable="false" sortable="false" text="Short Name" />
-                  <TableColumn fx:id="countryCol" editable="false" maxWidth="258.9999694824219" minWidth="147.0" prefWidth="258.9999694824219" resizable="false" sortable="false" text="Country" />
-              </columns>
-               <GridPane.margin>
-                  <Insets top="10.0" />
-               </GridPane.margin>
-            </TableView>
-            <Label fx:id="realTime" text="Local time" textFill="WHITE" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="BOTTOM" />
-         </children>
-      </GridPane>
-   </children>
-</AnchorPane>
+<AnchorPane fx:id="contentPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.Controller" />
diff --git a/src/main/resources/views/StartScreenView.fxml b/src/main/resources/views/StartScreenView.fxml
new file mode 100644
index 00000000..e7dd3dea
--- /dev/null
+++ b/src/main/resources/views/StartScreenView.fxml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.canvas.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<GridPane fx:id="gridPane" nodeOrientation="LEFT_TO_RIGHT" prefWidth="800.0" style="-fx-background-color: #2C2c36;" 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.StartScreenController">
+    <columnConstraints>
+      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+    </columnConstraints>
+    <rowConstraints>
+      <RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
+        <RowConstraints maxHeight="52.0" minHeight="52.0" prefHeight="52.0" vgrow="SOMETIMES" />
+        <RowConstraints maxHeight="0.0" percentHeight="8.0" prefHeight="0.0" vgrow="SOMETIMES" />
+        <RowConstraints maxHeight="28.0" vgrow="SOMETIMES" />
+        <RowConstraints maxHeight="55.0" minHeight="55.0" percentHeight="9.0" prefHeight="55.0" vgrow="SOMETIMES" />
+        <RowConstraints maxHeight="0.0" minHeight="0.0" percentHeight="29.0" prefHeight="0.0" vgrow="SOMETIMES" />
+        <RowConstraints maxHeight="93.0" minHeight="72.0" prefHeight="72.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="283.0" minHeight="262.0" prefHeight="283.0" vgrow="SOMETIMES" />
+    </rowConstraints>
+     <children>
+        <Label alignment="CENTER" text="Welcome to Race Vision" textFill="WHITE" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
+           <font>
+              <Font size="40.0" />
+           </font>
+        </Label>
+        <Label text="Your live AC35 livestream" textFill="WHITE" GridPane.halignment="CENTER" GridPane.rowIndex="1">
+           <font>
+              <Font size="20.0" />
+           </font>
+        </Label>
+        <Label text="Livestream Status:" textFill="WHITE" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
+           <font>
+              <Font size="28.0" />
+           </font>
+        </Label>
+        <Label fx:id="timeTillLive" text="0:00 minutes" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="4">
+           <font>
+              <Font size="27.0" />
+           </font>
+        </Label>
+        <Button fx:id="streamButton" mnemonicParsing="false" onAction="#startStream" styleClass="blue-ui-btn" text="Click to stream" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+        <Button fx:id="switchToRaceViewButton" disable="true" mnemonicParsing="false" onAction="#switchToRaceView" styleClass="blue-ui-btn" text="Watch Race" GridPane.halignment="CENTER" GridPane.rowIndex="7" GridPane.valignment="TOP" />
+        <TableView fx:id="teamList" maxWidth="661.0" prefHeight="324.0" prefWidth="629.0" styleClass="ui-table" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="5" GridPane.vgrow="NEVER">
+          <columns>
+              <TableColumn fx:id="posCol" editable="false" maxWidth="74.0" minWidth="74.0" prefWidth="74.0" resizable="false" sortable="false" text="Position" />
+            <TableColumn fx:id="boatNameCol" editable="false" maxWidth="171.0" minWidth="171.0" prefWidth="171.0" resizable="false" sortable="false" text="Boat Name" />
+            <TableColumn fx:id="shortNameCol" editable="false" maxWidth="155.18472290039062" minWidth="107.0" prefWidth="155.18472290039062" resizable="false" sortable="false" text="Short Name" />
+              <TableColumn fx:id="countryCol" editable="false" maxWidth="258.9999694824219" minWidth="147.0" prefWidth="258.9999694824219" resizable="false" sortable="false" text="Country" />
+          </columns>
+           <GridPane.margin>
+              <Insets top="10.0" />
+           </GridPane.margin>
+        </TableView>
+        <Label fx:id="realTime" text="Local time" textFill="WHITE" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="BOTTOM" />
+     </children>
+</GridPane>

From 7d160eaf545927dfb0aecbaca50f53d59c1011b7 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Wed, 17 May 2017 13:16:00 +1200
Subject: [PATCH 29/36] Removed unused imports from controller.java

---
 .../java/seng302/controllers/Controller.java  | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index ba6a8e28..a1488a84 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -1,44 +1,30 @@
 package seng302.controllers;
 
-import javafx.application.Platform;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
-import javafx.scene.paint.Color;
-import seng302.models.Yacht;
-import seng302.models.parsers.StreamParser;
-import seng302.models.parsers.XMLParser;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
-import java.util.Timer;
-import java.util.TimerTask;
 
 public class Controller implements Initializable {
+
     @FXML
     private AnchorPane contentPane;
 
-    private void setContentPane(String jfxUrl){
-        try{
+    private void setContentPane(String jfxUrl) {
+        try {
             contentPane.getChildren().removeAll();
             contentPane.getChildren().clear();
             contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
-            contentPane.getChildren().addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
-        }
-        catch(javafx.fxml.LoadException e){
+            contentPane.getChildren()
+                .addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
+        } catch (javafx.fxml.LoadException e) {
             System.err.println(e.getCause());
-        }
-        catch(IOException e){
+        } catch (IOException e) {
             System.err.println(e);
         }
     }

From 3c418b2aa4825c38993dfe5a72f3b75ec1e41e00 Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Wed, 17 May 2017 14:57:31 +1200
Subject: [PATCH 30/36] Changed boat location message to milliseconds

---
 .../java/seng302/server/messages/BoatLocationMessage.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/seng302/server/messages/BoatLocationMessage.java b/src/main/java/seng302/server/messages/BoatLocationMessage.java
index 6cf0739d..5e605170 100644
--- a/src/main/java/seng302/server/messages/BoatLocationMessage.java
+++ b/src/main/java/seng302/server/messages/BoatLocationMessage.java
@@ -1,10 +1,7 @@
 package seng302.server.messages;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.nio.channels.Channels;
 import java.nio.channels.SocketChannel;
-import java.nio.channels.WritableByteChannel;
 
 public class BoatLocationMessage extends Message {
     private final int MESSAGE_SIZE = 56;
@@ -44,7 +41,7 @@ public class BoatLocationMessage extends Message {
     public BoatLocationMessage(int sourceId, int sequenceNum, double latitude, double longitude, double heading, long boatSpeed){
         boatSpeed /= 10;
         messageVersionNumber = 1;
-        time = System.currentTimeMillis() / 1000L;
+        time = System.currentTimeMillis();
         this.sourceId = sourceId;
         this.sequenceNum = sequenceNum;
         this.deviceType = DeviceType.RACING_YACHT;

From ade926e2f2c44ad59dd21f45979c98d86f00f3de Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Wed, 17 May 2017 16:44:05 +1200
Subject: [PATCH 31/36] StreamParser class now only shares thread safe classes.

#story[923] #bug
---
 src/main/java/seng302/models/parsers/StreamParser.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index ef35a7ff..837f459f 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -17,6 +17,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.PriorityBlockingQueue;
 
 /**
@@ -36,8 +37,8 @@ public class StreamParser extends Thread{
      private static boolean raceFinished = false;
      private static boolean streamStatus = false;
      private static long timeSinceStart = -1;
-     private static Map<Integer, Yacht> boats = new HashMap<>();
-     private static Map<Long, Yacht> boatsPos = new TreeMap<>();
+     private static Map<Integer, Yacht> boats = new ConcurrentHashMap<>();
+     private static Map<Long, Yacht> boatsPos = new ConcurrentSkipListMap<>();
      private static double windDirection = 0;
      private static Long currentTimeLong;
      private static String currentTimeString;

From aaa3dc93f13ba639b044ee78723b0efa4a60b006 Mon Sep 17 00:00:00 2001
From: Peter Galloway <ptg19@uclive.ac.nz>
Date: Wed, 17 May 2017 17:34:47 +1200
Subject: [PATCH 32/36] boat movement working reliably now, still need to fix
 one bug at initialization #story[923]

---
 src/main/java/seng302/App.java                |  2 +-
 .../seng302/controllers/CanvasController.java | 65 +++++++++++--------
 src/main/java/seng302/models/BoatGroup.java   | 55 +++++++++++-----
 .../server/messages/BoatLocationMessage.java  |  2 +-
 4 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 92aab87a..aab0a8eb 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,7 +62,7 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index c1a642fc..d2e7ce02 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -51,10 +51,12 @@ public class CanvasController {
     private Mark maxLonPoint;
     private double referencePointX;
     private double referencePointY;
+
     private List<MarkGroup> markGroups = new ArrayList<>();
     private List<BoatGroup> boatGroups = new ArrayList<>();
 
     //FRAME RATE
+    private Double frameRate = 60.0;
     private final long[] frameTimes = new long[30];
     private int frameTimeIndex = 0;
     private boolean arrayFilled = false;
@@ -93,7 +95,7 @@ public class CanvasController {
 
 
         // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
-        drawBoats();
+        initializeBoats();
         timer = new AnimationTimer() {
 
             @Override
@@ -110,7 +112,7 @@ public class CanvasController {
                 if (arrayFilled) {
                     elapsedNanos = now - oldFrameTime ;
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
-                    Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
+                    frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
                 }
 
@@ -167,30 +169,38 @@ public class CanvasController {
 
     private void updateGroups(){
         for (BoatGroup boatGroup : boatGroups) {
-            boatGroup.updatePosition();
             // some raceObjects will have multiple ID's (for instance gate marks)
             //checking if the current "ID" has any updates associated with it
             if (StreamParser.boatPositions.containsKey(boatGroup.getRaceId())) {
-                moveBoatGroup(boatGroup);
+                if (boatGroup.isStopped()) {
+                    updateBoatGroup(boatGroup);
+                }
             }
+            boatGroup.move();
         }
         for (MarkGroup markGroup : markGroups) {
             for (int id : markGroup.getRaceIds()) {
                 if (StreamParser.boatPositions.containsKey(id)) {
-                    moveMarkGroup(id, markGroup);
+                    UpdateMarkGroup(id, markGroup);
                 }
             }
         }
     }
 
-    private void moveBoatGroup(BoatGroup boatGroup) {
+    private void updateBoatGroup(BoatGroup boatGroup) {
         PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(boatGroup.getRaceId());
-        if (movementQueue.size() > 0){
+        // giving the movementQueue a 5 packet buffer to account for slightly out of order packets
+        if (movementQueue.size() > 5){
             try {
                 BoatPositionPacket positionPacket = movementQueue.take();
                 Point2D p2d = findScaledXY(positionPacket.getLat(), positionPacket.getLon());
+                if (boatGroup.getRaceId() == 106){
+//                    System.out.println("p2d.getX() = " + p2d.getX());
+//                    System.out.println("p2d.getY() = " + p2d.getY());
+//                    System.out.println("positionPacket.getTimeValid() = " + positionPacket.getTimeValid());
+                }
                 double heading = 360.0 / 0xffff * positionPacket.getHeading();
-                boatGroup.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), boatGroup.getRaceId());
+                boatGroup.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), positionPacket.getTimeValid(), frameRate, boatGroup.getRaceId());
             } catch (InterruptedException e){
                 e.printStackTrace();
             }
@@ -198,7 +208,7 @@ public class CanvasController {
         }
     }
 
-    void moveMarkGroup (int raceId, MarkGroup markGroup) {
+    void UpdateMarkGroup (int raceId, MarkGroup markGroup) {
         PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(raceId);
         if (movementQueue.size() > 0){
             try {
@@ -211,6 +221,23 @@ public class CanvasController {
         }
     }
 
+    /**
+     * Draws all the boats.
+     */
+    private void initializeBoats() {
+        Map<Integer, Yacht> boats = StreamParser.getBoats();
+        Group boatAnnotations = new Group();
+
+        for (Yacht boat : boats.values()) {
+            boat.setColour(Colors.getColor());
+            BoatGroup boatGroup = new BoatGroup(boat, boat.getColour());
+            boatGroups.add(boatGroup);
+            boatAnnotations.getChildren().add(boatGroup.getLowPriorityAnnotations());
+        }
+        group.getChildren().add(boatAnnotations);
+        group.getChildren().addAll(boatGroups);
+    }
+
     class ResizableCanvas extends Canvas {
 
         ResizableCanvas() {
@@ -236,11 +263,11 @@ public class CanvasController {
         public double prefWidth(double height) {
             return getWidth();
         }
-
         @Override
         public double prefHeight(double width) {
             return getHeight();
         }
+
     }
 
     private void drawFps(int fps){
@@ -259,23 +286,6 @@ public class CanvasController {
         }
     }
 
-    /**
-     * Draws all the boats.
-     */
-    private void drawBoats() {
-        Map<Integer, Yacht> boats = StreamParser.getBoats();
-        Group boatAnnotations = new Group();
-
-        for (Yacht boat : boats.values()) {
-            boat.setColour(Colors.getColor());
-            BoatGroup boatGroup = new BoatGroup(boat, boat.getColour());
-            boatGroups.add(boatGroup);
-            boatAnnotations.getChildren().add(boatGroup.getLowPriorityAnnotations());
-        }
-        group.getChildren().add(boatAnnotations);
-        group.getChildren().addAll(boatGroups);
-    }
-
     /**
      * Calculates x and y location for every marker that fits it to the canvas the race will be drawn on.
      */
@@ -382,6 +392,7 @@ public class CanvasController {
      * Give all markers in the course an x,y location relative to a given reference with a known x,y location. Distances
      * are scaled according to the distanceScaleFactor variable.
      */
+    // DEPRECATED create an initialize marks method like the initialize boats method
     private void givePointsXY() {
 //        List<XMLParser.RaceXMLObject.CompoundMark> allPoints = StreamParser.getXmlObject().getRaceXML().getCompoundMarks();
 //        List<XMLParser.RaceXMLObject.CompoundMark> processed = new ArrayList<>();
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index ed594276..3de6d3a8 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -29,13 +29,16 @@ public class BoatGroup extends Group{
     private static final double BOAT_HEIGHT = 15d;
     private static final double BOAT_WIDTH = 10d;
     //Variables for boat logic.
+    private boolean isStopped = true;
+    private double xIncrement;
+    private double yIncrement;
+    private long lastTimeValid = 0;
+    private long framesToMove;
     private Point2D lastPoint;
     double oldTime;
     double newTime;
     double lastYValue = 0;
     double lastXValue = 0;
-    private double dx;
-    private double dy;
     private double pixelVelocityX;
     private double pixelVelocityY;
     private static final int expectedUpdateInterval = 200;
@@ -118,8 +121,6 @@ public class BoatGroup extends Group{
         teamNameObject.setLayoutY(teamNameObject.getLayoutY() + dy);
         velocityObject.setLayoutX(velocityObject.getLayoutX() + dx);
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
-        wake.setLayoutX(wake.getLayoutX() + dx);
-        wake.setLayoutY(wake.getLayoutY() + dy);
     }
 
 
@@ -136,16 +137,18 @@ public class BoatGroup extends Group{
         teamNameObject.setLayoutY(y);
         velocityObject.setLayoutX(x);
         velocityObject.setLayoutY(y);
-        wake.setLayoutX(x);
-        wake.setLayoutY(y);
     }
 
     public void rotateTo (double rotation) {
         boatPoly.getTransforms().setAll(new Rotate(rotation));
     }
 
-    public void updatePosition () {
-        moveGroupBy(dx, dy);
+    public void move() {
+        moveGroupBy(xIncrement, yIncrement);
+        framesToMove = framesToMove - 1;
+        if (framesToMove <= 0){
+            isStopped = true;
+        }
     }
 
     /**
@@ -153,20 +156,32 @@ public class BoatGroup extends Group{
      * @param newXValue The X co-ordinate the boat needs to move to.
      * @param newYValue The Y co-ordinate the boat needs to move to.
      * @param rotation Rotation to move graphics to.
-     * @param raceIds RaceID of the object to move.
+     * @param timeValid the time the position values are valid for
      */
-    public void setDestination (double newXValue, double newYValue, double rotation, double groundSpeed, long raceIds) {
-        System.currentTimeMillis();
-        moveTo(lastXValue, lastYValue, rotation);
+    public void setDestination (double newXValue, double newYValue, double rotation, double groundSpeed, long timeValid, double frameRate, long id) {
+        if (lastTimeValid == 0){
+            lastTimeValid = timeValid - 200;
+            moveTo(newXValue, newYValue, rotation);
+        }
 
-        dx = (newXValue - lastXValue)/12;
-        dy = (newYValue - lastYValue)/12;
 
-        lastXValue = newXValue;
-        lastYValue = newYValue;
+        rotateTo(rotation);
+        framesToMove = Math.round((frameRate/(1000.0f/(timeValid-lastTimeValid))));
 
-        boat.setVelocity(groundSpeed);
-        velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
+        double dx = newXValue - boatPoly.getLayoutX();
+        double dy = newYValue - boatPoly.getLayoutY();
+
+        xIncrement = dx/framesToMove;
+        yIncrement = dy/framesToMove;
+
+        if (id == 106){
+            System.out.println(framesToMove);
+            System.out.println("xIncrement = " + xIncrement);
+        }
+
+        velocityObject.setText(String.format("%.2f m/s", groundSpeed));
+        lastTimeValid = timeValid;
+        isStopped = false;
     }
 
 
@@ -230,4 +245,8 @@ public class BoatGroup extends Group{
         group.getChildren().addAll(wake, lineGroup);
         return group;
     }
+
+    public boolean isStopped() {
+        return isStopped;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/server/messages/BoatLocationMessage.java b/src/main/java/seng302/server/messages/BoatLocationMessage.java
index 6cf0739d..57f31dd6 100644
--- a/src/main/java/seng302/server/messages/BoatLocationMessage.java
+++ b/src/main/java/seng302/server/messages/BoatLocationMessage.java
@@ -44,7 +44,7 @@ public class BoatLocationMessage extends Message {
     public BoatLocationMessage(int sourceId, int sequenceNum, double latitude, double longitude, double heading, long boatSpeed){
         boatSpeed /= 10;
         messageVersionNumber = 1;
-        time = System.currentTimeMillis() / 1000L;
+        time = System.currentTimeMillis();
         this.sourceId = sourceId;
         this.sequenceNum = sequenceNum;
         this.deviceType = DeviceType.RACING_YACHT;

From 95e353c14ee96d82f6c85019fd3375d887436a27 Mon Sep 17 00:00:00 2001
From: Peter Galloway <ptg19@uclive.ac.nz>
Date: Wed, 17 May 2017 17:55:21 +1200
Subject: [PATCH 33/36] fixed initialization bug #story[923]

---
 src/main/java/seng302/controllers/CanvasController.java | 1 +
 src/main/java/seng302/controllers/Controller.java       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index d2e7ce02..22096b58 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -188,6 +188,7 @@ public class CanvasController {
     }
 
     private void updateBoatGroup(BoatGroup boatGroup) {
+        System.out.println("StreamParser.boatPositions.size()2 = " + StreamParser.boatPositions.size());
         PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(boatGroup.getRaceId());
         // giving the movementQueue a 5 packet buffer to account for slightly out of order packets
         if (movementQueue.size() > 5){
diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index bebc57fd..00397dee 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -1,5 +1,7 @@
 package seng302.controllers;
 
+import static seng302.models.stream.StreamParser.boatPositions;
+
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -131,6 +133,8 @@ public class Controller implements Initializable {
     public void switchToRaceView() {
         switchedToRaceView = true;
         setContentPane("/views/RaceView.fxml");
+        System.out.println("boatPositions.size()1 = " + boatPositions.size());
+        StreamParser.boatPositions.clear();
     }
 
     private void updateTeamList() {

From 2e375978bd345dad487d3d38ea4eec70f7df66fb Mon Sep 17 00:00:00 2001
From: Peter Galloway <ptg19@uclive.ac.nz>
Date: Wed, 17 May 2017 19:18:31 +1200
Subject: [PATCH 34/36] cleaned up code for merging back to develop #story[923]

---
 .../seng302/controllers/CanvasController.java | 33 +-------
 .../java/seng302/controllers/Controller.java  |  1 -
 .../controllers/RaceViewController.java       |  1 -
 src/main/java/seng302/models/BoatGroup.java   | 43 +----------
 src/main/java/seng302/models/RaceObject.java  | 75 -------------------
 5 files changed, 2 insertions(+), 151 deletions(-)
 delete mode 100644 src/main/java/seng302/models/RaceObject.java

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 22096b58..26d7fec7 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -188,18 +188,12 @@ public class CanvasController {
     }
 
     private void updateBoatGroup(BoatGroup boatGroup) {
-        System.out.println("StreamParser.boatPositions.size()2 = " + StreamParser.boatPositions.size());
         PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(boatGroup.getRaceId());
         // giving the movementQueue a 5 packet buffer to account for slightly out of order packets
-        if (movementQueue.size() > 5){
+        if (movementQueue.size() > 0){
             try {
                 BoatPositionPacket positionPacket = movementQueue.take();
                 Point2D p2d = findScaledXY(positionPacket.getLat(), positionPacket.getLon());
-                if (boatGroup.getRaceId() == 106){
-//                    System.out.println("p2d.getX() = " + p2d.getX());
-//                    System.out.println("p2d.getY() = " + p2d.getY());
-//                    System.out.println("positionPacket.getTimeValid() = " + positionPacket.getTimeValid());
-                }
                 double heading = 360.0 / 0xffff * positionPacket.getHeading();
                 boatGroup.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), positionPacket.getTimeValid(), frameRate, boatGroup.getRaceId());
             } catch (InterruptedException e){
@@ -389,31 +383,6 @@ public class CanvasController {
         return horiDistance;
     }
 
-    /**
-     * Give all markers in the course an x,y location relative to a given reference with a known x,y location. Distances
-     * are scaled according to the distanceScaleFactor variable.
-     */
-    // DEPRECATED create an initialize marks method like the initialize boats method
-    private void givePointsXY() {
-//        List<XMLParser.RaceXMLObject.CompoundMark> allPoints = StreamParser.getXmlObject().getRaceXML().getCompoundMarks();
-//        List<XMLParser.RaceXMLObject.CompoundMark> processed = new ArrayList<>();
-//        MarkGroup markGroup;
-//
-//        for (XMLParser.RaceXMLObject.CompoundMark mark : allPoints) {
-//            if (!processed.contains(mark)) {
-//                if (mark.getMarkType() != MarkType.SINGLE_MARK) {
-//                    markGroup = new MarkGroup(mark, findScaledXY(mark.getMarks().get(0)), findScaledXY(mark.getMarks().get(1)));
-//                    markGroups.add(markGroup);
-//                } else {
-//                    markGroup = new MarkGroup(mark, findScaledXY(mark.getMarks().get(0)));
-//                    markGroups.add(markGroup);
-//                }
-//                processed.add(mark);
-//            }
-//        }
-        group.getChildren().addAll(boatGroups);
-    }
-
     private Point2D findScaledXY (Mark unscaled) {
         return findScaledXY (unscaled.getLatitude(), unscaled.getLongitude());
     }
diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index 00397dee..c27e6192 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -133,7 +133,6 @@ public class Controller implements Initializable {
     public void switchToRaceView() {
         switchedToRaceView = true;
         setContentPane("/views/RaceView.fxml");
-        System.out.println("boatPositions.size()1 = " + boatPositions.size());
         StreamParser.boatPositions.clear();
     }
 
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 8a09619e..85029772 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -25,7 +25,6 @@ import seng302.controllers.annotations.ImportantAnnotationController;
 import seng302.controllers.annotations.ImportantAnnotationDelegate;
 import seng302.controllers.annotations.ImportantAnnotationsState;
 import seng302.models.BoatGroup;
-import seng302.models.RaceObject;
 import seng302.models.Yacht;
 import seng302.models.stream.StreamParser;
 
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 3de6d3a8..0218a70b 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -1,16 +1,10 @@
 package seng302.models;
 
-import javafx.geometry.Point2D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
-import javafx.scene.shape.Line;
 import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
-import javafx.stage.Stage;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2 dimensional boat.
@@ -34,14 +28,6 @@ public class BoatGroup extends Group{
     private double yIncrement;
     private long lastTimeValid = 0;
     private long framesToMove;
-    private Point2D lastPoint;
-    double oldTime;
-    double newTime;
-    double lastYValue = 0;
-    double lastXValue = 0;
-    private double pixelVelocityX;
-    private double pixelVelocityY;
-    private static final int expectedUpdateInterval = 200;
     //Graphical objects
     private Yacht boat;
     private Group lineGroup = new Group();
@@ -163,21 +149,12 @@ public class BoatGroup extends Group{
             lastTimeValid = timeValid - 200;
             moveTo(newXValue, newYValue, rotation);
         }
-
-
-        rotateTo(rotation);
         framesToMove = Math.round((frameRate/(1000.0f/(timeValid-lastTimeValid))));
-
         double dx = newXValue - boatPoly.getLayoutX();
         double dy = newYValue - boatPoly.getLayoutY();
-
         xIncrement = dx/framesToMove;
         yIncrement = dy/framesToMove;
-
-        if (id == 106){
-            System.out.println(framesToMove);
-            System.out.println("xIncrement = " + xIncrement);
-        }
+        rotateTo(rotation);
 
         velocityObject.setText(String.format("%.2f m/s", groundSpeed));
         lastTimeValid = timeValid;
@@ -186,10 +163,6 @@ public class BoatGroup extends Group{
 
 
 
-
-
-
-
     public void setTeamNameObjectVisible(Boolean visible) {
         teamNameObject.setVisible(visible);
     }
@@ -210,20 +183,6 @@ public class BoatGroup extends Group{
         return boat;
     }
 
-//    /**
-//     * Returns true if this BoatGroup contains at least one of the given IDs.
-//     *
-//     * @param raceIds The ID's to check the BoatGroup for.
-//     * @return True if the BoatGroup contains at east one of the given IDs, false otherwise.
-//     */
-//    public boolean hasRaceId (long... raceIds) {
-//        for (long id : raceIds) {
-//            if (id == boat.getSourceID())
-//                return true;
-//        }
-//        return false;
-//    }
-
     /**
      * Returns all raceIds associated with this group. For BoatGroups the ID's are for the boat.
      *
diff --git a/src/main/java/seng302/models/RaceObject.java b/src/main/java/seng302/models/RaceObject.java
deleted file mode 100644
index 706bfd48..00000000
--- a/src/main/java/seng302/models/RaceObject.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package seng302.models;
-
-import javafx.geometry.Point2D;
-import javafx.scene.Group;
-
-/**
- * RaceObject defines the behaviour that animated objects whose position is updated from a yacht race data stream must
- * adhere to.
- */
-public abstract class RaceObject extends Group {
-
-    //Time between sections of race
-    protected static double expectedUpdateInterval = 200;
-
-    protected double rotationalGoal;
-    protected double currentRotation;
-    protected double rotationalVelocity;
-    protected double pixelVelocityX;
-    protected double pixelVelocityY;
-
-    public Point2D getPosition () {
-        return new Point2D(super.getLayoutX(), getLayoutY());
-    }
-
-    public static double getExpectedUpdateInterval() {
-        return expectedUpdateInterval;
-    }
-
-    /**
-     *
-     */
-    public static void setExpectedUpdateInterval(double expectedUpdateInterval) {
-        RaceObject.expectedUpdateInterval = expectedUpdateInterval;
-    }
-
-    /**
-     * Calculates the rotational velocity required to reach the rotationalGoal from the currentRotation.
-     */
-    protected void calculateRotationalVelocity () {
-        if (Math.abs(rotationalGoal - currentRotation) > 180) {
-            if (rotationalGoal - currentRotation >= 0) {
-                this.rotationalVelocity = ((rotationalGoal - currentRotation) - 360) / expectedUpdateInterval;
-            } else {
-                this.rotationalVelocity = (360 + (rotationalGoal - currentRotation)) / expectedUpdateInterval;
-            }
-        } else {
-            this.rotationalVelocity = (rotationalGoal - currentRotation) / expectedUpdateInterval;
-        }
-        //Sometimes the rotation is too large to be realistic. In that case just do it instantly.
-//        if (Math.abs(rotationalVelocity) > 1) {
-//            rotationalVelocity = 0;
-//            rotateTo(rotationalGoal);
-//        }
-    }
-
-    /**
-     * Sets the destination of everything within the RaceObject that has an ID in the array raceIds. The destination is
-     * set to the co-ordinates (x, y) with the given rotation.
-     * @param x X co-ordinate to move the graphics to.
-     * @param y Y co-ordinate to move the graphics to.
-     * @param rotation Rotation to move graphics to.
-     * @param raceIds RaceID of the object to move.
-     */
-    public abstract void setDestination (double x, double y, double rotation, double groundSpeed, int... raceIds);
-
-    public abstract void updatePosition (long timeInterval);
-
-    public abstract void moveTo (double x, double y, double rotation);
-
-    public abstract void moveGroupBy(double x, double y, double rotation);
-
-    public abstract boolean hasRaceId (int... raceIds);
-
-    public abstract int[] getRaceIds ();
-}

From 0f79353936aee8ac7110ece2755746dc0af0131c Mon Sep 17 00:00:00 2001
From: Peter Galloway <ptg19@uclive.ac.nz>
Date: Wed, 17 May 2017 20:15:47 +1200
Subject: [PATCH 35/36] fixes from merge #story[923]

---
 .../controllers/RaceViewController.java       | 103 +++++++-----------
 .../controllers/StartScreenController.java    |   2 +-
 .../seng302/models/stream/StreamParser.java   |   7 +-
 3 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 22c96f13..b00963be 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -26,7 +26,7 @@ import seng302.controllers.annotations.ImportantAnnotationController;
 import seng302.controllers.annotations.ImportantAnnotationDelegate;
 import seng302.controllers.annotations.ImportantAnnotationsState;
 import seng302.models.*;
-import seng302.models.parsers.StreamParser;
+import seng302.models.stream.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
@@ -58,7 +58,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private ArrayList<Yacht> startingBoats = new ArrayList<>();
     private boolean displayFps;
     private Timeline timerTimeline;
-    private Race race;
     private Stage stage;
 
     private ImportantAnnotationsState importantAnnotations;
@@ -68,13 +67,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         // Load a default important annotation state
         importantAnnotations = new ImportantAnnotationsState();
 
-        //Initialise race controller
-        RaceController raceController = new RaceController();
-        raceController.initializeRace();
-        race = raceController.getRace();
-
-        startingBoats = new ArrayList<>(Arrays.asList(race.getBoats()));
-
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
         initializeUpdateTimer();
@@ -282,7 +274,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
      */
     private void loadRaceResultView() {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/views/FinishView.fxml"));
-        loader.setController(new RaceResultController(race));
 
         try {
             contentAnchorPane.getChildren().removeAll();
@@ -335,11 +326,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return displayFps;
     }
 
-    public Race getRace() {
-        return race;
-    }
-
-
     /**
      * Display the important annotations for a specific BoatGroup
      * @param bg The boat group to set the annotations for
@@ -368,57 +354,48 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         } else {
             bg.setWakeVisible(false);
         }
-
-        if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
-            bg.setEstTimeToNextMarkObjectVisible(true);
-        } else {
-            bg.setEstTimeToNextMarkObjectVisible(false);
-        }
-
-        if (importantAnnotations.getAnnotationState(Annotation.LEGTIME)) {
-            bg.setLegTimeObjectVisible(true);
-        } else {
-            bg.setLegTimeObjectVisible(false);
-        }
+        //TODO fix boat annotations with new boatgroup
+//        if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
+//            bg.setEstTimeToNextMarkObjectVisible(true);
+//        } else {
+//            bg.setEstTimeToNextMarkObjectVisible(false);
+//        }
+//
+//        if (importantAnnotations.getAnnotationState(Annotation.LEGTIME)) {
+//            bg.setLegTimeObjectVisible(true);
+//        } else {
+//            bg.setLegTimeObjectVisible(false);
+//        }
     }
 
     private void setAnnotations(Integer annotationLevel) {
         switch (annotationLevel) {
             // No Annotations
             case 0:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if (ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        bg.setTeamNameObjectVisible(false);
-                        bg.setVelocityObjectVisible(false);
-                        bg.setEstTimeToNextMarkObjectVisible(false);
-                        bg.setLegTimeObjectVisible(false);
-                        bg.setLineGroupVisible(false);
-                        bg.setWakeVisible(false);
-                    }
+                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+                    bg.setTeamNameObjectVisible(false);
+                    bg.setVelocityObjectVisible(false);
+//                    bg.setEstTimeToNextMarkObjectVisible(false);
+//                    bg.setLegTimeObjectVisible(false);
+                    bg.setLineGroupVisible(false);
+                    bg.setWakeVisible(false);
                 }
                 break;
             // Important Annotations
             case 1:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if (ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        setBoatGroupImportantAnnotations(bg);
-                    }
+                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+                    setBoatGroupImportantAnnotations(bg);
                 }
                 break;
             // All Annotations
             case 2:
-                for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if (ro instanceof BoatGroup) {
-                        BoatGroup bg = (BoatGroup) ro;
-                        bg.setTeamNameObjectVisible(true);
-                        bg.setVelocityObjectVisible(true);
-                        bg.setEstTimeToNextMarkObjectVisible(true);
-                        bg.setLegTimeObjectVisible(true);
-                        bg.setLineGroupVisible(true);
-                        bg.setWakeVisible(true);
-                    }
+                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+                    bg.setTeamNameObjectVisible(true);
+                    bg.setVelocityObjectVisible(true);
+//                    bg.setEstTimeToNextMarkObjectVisible(true);
+//                    bg.setLegTimeObjectVisible(true);
+                    bg.setLineGroupVisible(true);
+                    bg.setWakeVisible(true);
                 }
                 break;
         }
@@ -431,18 +408,16 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
      * @param yacht The yacht for which we want to view all annotations
      */
     private void setSelectedBoat(Yacht yacht) {
-        for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-            if (ro instanceof BoatGroup) {
-                BoatGroup bg = (BoatGroup) ro;
-                //We need to iterate over all race groups to get the matching boat group belonging to this boat if we
-                //are to toggle its annotations, there is no other backwards knowledge of a yacht to its boatgroup.
-                if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
-                    bg.setIsSelected(true);
-                    selectedBoat = yacht;
-                } else {
-                    bg.setIsSelected(false);
-                }
-            }
+        for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
+            //We need to iterate over all race groups to get the matching boat group belonging to this boat if we
+            //are to toggle its annotations, there is no other backwards knowledge of a yacht to its boatgroup.
+            //TODO fix boat selection with new boatgroup
+//            if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
+//                bg.setIsSelected(true);
+//                selectedBoat = yacht;
+//            } else {
+//                bg.setIsSelected(false);
+//            }
         }
     }
 
diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java
index 8a4d563b..94851d05 100644
--- a/src/main/java/seng302/controllers/StartScreenController.java
+++ b/src/main/java/seng302/controllers/StartScreenController.java
@@ -22,7 +22,7 @@ import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import seng302.models.Yacht;
-import seng302.models.parsers.StreamParser;
+import seng302.models.stream.StreamParser;
 
 public class StartScreenController implements Initializable {
     @FXML
diff --git a/src/main/java/seng302/models/stream/StreamParser.java b/src/main/java/seng302/models/stream/StreamParser.java
index b6f0f0be..f7093306 100644
--- a/src/main/java/seng302/models/stream/StreamParser.java
+++ b/src/main/java/seng302/models/stream/StreamParser.java
@@ -1,12 +1,12 @@
-package seng302.models.parsers;
+package seng302.models.stream;
 
 
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import seng302.models.Yacht;
-import seng302.models.parsers.packets.BoatPositionPacket;
-import seng302.models.parsers.packets.StreamPacket;
+import seng302.models.stream.packets.BoatPositionPacket;
+import seng302.models.stream.packets.StreamPacket;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -19,6 +19,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.PriorityBlockingQueue;
+import seng302.models.stream.XMLParser;
 
 /**
  * The purpose of this class is to take in the stream of divided packets so they can be read

From a2123df0c5311b81a94a603081119ad79311aaa6 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Thu, 18 May 2017 14:41:08 +1200
Subject: [PATCH 36/36] Fixed Boat selection and lost annotations (Estimated
 and Leg Time)

Trails and Wakes, however,  are still not re implemented yet.

story[923]
---
 .../controllers/RaceViewController.java       | 43 +++++-----
 src/main/java/seng302/models/BoatGroup.java   | 86 ++++++++++++++++++-
 2 files changed, 104 insertions(+), 25 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index b00963be..8492015b 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -355,17 +355,17 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             bg.setWakeVisible(false);
         }
         //TODO fix boat annotations with new boatgroup
-//        if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
-//            bg.setEstTimeToNextMarkObjectVisible(true);
-//        } else {
-//            bg.setEstTimeToNextMarkObjectVisible(false);
-//        }
-//
-//        if (importantAnnotations.getAnnotationState(Annotation.LEGTIME)) {
-//            bg.setLegTimeObjectVisible(true);
-//        } else {
-//            bg.setLegTimeObjectVisible(false);
-//        }
+        if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
+            bg.setEstTimeToNextMarkObjectVisible(true);
+        } else {
+            bg.setEstTimeToNextMarkObjectVisible(false);
+        }
+
+        if (importantAnnotations.getAnnotationState(Annotation.LEGTIME)) {
+            bg.setLegTimeObjectVisible(true);
+        } else {
+            bg.setLegTimeObjectVisible(false);
+        }
     }
 
     private void setAnnotations(Integer annotationLevel) {
@@ -375,8 +375,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
                     bg.setTeamNameObjectVisible(false);
                     bg.setVelocityObjectVisible(false);
-//                    bg.setEstTimeToNextMarkObjectVisible(false);
-//                    bg.setLegTimeObjectVisible(false);
+                    bg.setEstTimeToNextMarkObjectVisible(false);
+                    bg.setLegTimeObjectVisible(false);
                     bg.setLineGroupVisible(false);
                     bg.setWakeVisible(false);
                 }
@@ -392,8 +392,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
                     bg.setTeamNameObjectVisible(true);
                     bg.setVelocityObjectVisible(true);
-//                    bg.setEstTimeToNextMarkObjectVisible(true);
-//                    bg.setLegTimeObjectVisible(true);
+                    bg.setEstTimeToNextMarkObjectVisible(true);
+                    bg.setLegTimeObjectVisible(true);
                     bg.setLineGroupVisible(true);
                     bg.setWakeVisible(true);
                 }
@@ -411,13 +411,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
             //We need to iterate over all race groups to get the matching boat group belonging to this boat if we
             //are to toggle its annotations, there is no other backwards knowledge of a yacht to its boatgroup.
-            //TODO fix boat selection with new boatgroup
-//            if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
-//                bg.setIsSelected(true);
-//                selectedBoat = yacht;
-//            } else {
-//                bg.setIsSelected(false);
-//            }
+            if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
+                bg.setIsSelected(true);
+                selectedBoat = yacht;
+            } else {
+                bg.setIsSelected(false);
+            }
         }
     }
 
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 0218a70b..28e9561f 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -1,10 +1,18 @@
 package seng302.models;
 
+import javafx.event.EventHandler;
+import javafx.scene.CacheHint;
 import javafx.scene.Group;
+import javafx.scene.input.MouseDragEvent;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
+import seng302.models.stream.StreamParser;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 
 /**
  * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2 dimensional boat.
@@ -17,9 +25,13 @@ public class BoatGroup extends Group{
 
     //Constants for drawing
     private static final double TEAMNAME_X_OFFSET = 10d;
-    private static final double TEAMNAME_Y_OFFSET = -15d;
+    private static final double TEAMNAME_Y_OFFSET = -29d;
     private static final double VELOCITY_X_OFFSET = 10d;
-    private static final double VELOCITY_Y_OFFSET = -5d;
+    private static final double VELOCITY_Y_OFFSET = -17d;
+    private static final double ESTTIMETONEXTMARK_X_OFFSET = 10d;
+    private static final double ESTTIMETONEXTMARK_Y_OFFSET = -5d;
+    private static final double LEGTIME_X_OFFSET = 10d;
+    private static final double LEGTIME_Y_OFFSET = 7d;
     private static final double BOAT_HEIGHT = 15d;
     private static final double BOAT_WIDTH = 10d;
     //Variables for boat logic.
@@ -34,8 +46,12 @@ public class BoatGroup extends Group{
     private Polygon boatPoly;
     private Text teamNameObject;
     private Text velocityObject;
+    private Text estTimeToNextMarkObject;
+    private Text legTimeObject;
     private Wake wake;
 
+    private Boolean isSelected = true;  //All boats are initalised as selected
+
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
      * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used to tell which
@@ -68,9 +84,30 @@ public class BoatGroup extends Group{
     private void initChildren (Color color, double... points) {
         boatPoly = new Polygon(points);
         boatPoly.setFill(color);
+        boatPoly.setOnMouseEntered(event -> boatPoly.setFill(Color.FLORALWHITE));
+        boatPoly.setOnMouseExited(event -> boatPoly.setFill(color));
+        boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected));
+        boatPoly.setCache(true);
+        boatPoly.setCacheHint(CacheHint.SPEED);
+
 
         teamNameObject = new Text(boat.getShortName());
+        teamNameObject.setCache(true);
+        teamNameObject.setCacheHint(CacheHint.SPEED);
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
+        DateFormat format = new SimpleDateFormat("mm:ss");
+        String timeToNextMark = format
+                .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+        estTimeToNextMarkObject = new Text("Next mark: " + timeToNextMark);
+        if (boat.getMarkRoundingTime() != null) {
+            String elapsedTime = format
+                    .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
+            legTimeObject = new Text("Last mark: " + elapsedTime);
+        } else {
+            legTimeObject = new Text("Last mark: -");
+        }
+        velocityObject.setCache(true);
+        velocityObject.setCacheHint(CacheHint.SPEED);
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -80,8 +117,19 @@ public class BoatGroup extends Group{
         velocityObject.setY(VELOCITY_Y_OFFSET);
         velocityObject.relocate(velocityObject.getX(), velocityObject.getY());
 
+        estTimeToNextMarkObject.setX(ESTTIMETONEXTMARK_X_OFFSET);
+        estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
+        estTimeToNextMarkObject
+                .relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
+
+        legTimeObject.setX(LEGTIME_X_OFFSET);
+        legTimeObject.setY(LEGTIME_Y_OFFSET);
+        legTimeObject.relocate(legTimeObject.getX(), legTimeObject.getY());
+
         wake = new Wake(0, -BOAT_HEIGHT);
-        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly);
+        super.getChildren()
+                .addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject,
+                        legTimeObject);
     }
 
     /**
@@ -107,6 +155,10 @@ public class BoatGroup extends Group{
         teamNameObject.setLayoutY(teamNameObject.getLayoutY() + dy);
         velocityObject.setLayoutX(velocityObject.getLayoutX() + dx);
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
+        estTimeToNextMarkObject.setLayoutX(estTimeToNextMarkObject.getLayoutX() + dx);
+        estTimeToNextMarkObject.setLayoutY(estTimeToNextMarkObject.getLayoutY() + dy);
+        legTimeObject.setLayoutX(legTimeObject.getLayoutX() + dx);
+        legTimeObject.setLayoutY(legTimeObject.getLayoutY() + dy);
     }
 
 
@@ -123,6 +175,10 @@ public class BoatGroup extends Group{
         teamNameObject.setLayoutY(y);
         velocityObject.setLayoutX(x);
         velocityObject.setLayoutY(y);
+        estTimeToNextMarkObject.setLayoutX(x);
+        estTimeToNextMarkObject.setLayoutY(y);
+        legTimeObject.setLayoutX(x);
+        legTimeObject.setLayoutY(y);
     }
 
     public void rotateTo (double rotation) {
@@ -162,6 +218,17 @@ public class BoatGroup extends Group{
     }
 
 
+    public void setIsSelected(Boolean isSelected) {
+        this.isSelected = isSelected;
+        setTeamNameObjectVisible(isSelected);
+        setVelocityObjectVisible(isSelected);
+        setLineGroupVisible(isSelected);
+        setWakeVisible(isSelected);
+        setEstTimeToNextMarkObjectVisible(isSelected);
+        setLegTimeObjectVisible(isSelected);
+    }
+
+
 
     public void setTeamNameObjectVisible(Boolean visible) {
         teamNameObject.setVisible(visible);
@@ -171,6 +238,14 @@ public class BoatGroup extends Group{
         velocityObject.setVisible(visible);
     }
 
+    public void setEstTimeToNextMarkObjectVisible(Boolean visible) {
+        estTimeToNextMarkObject.setVisible(visible);
+    }
+
+    public void setLegTimeObjectVisible(Boolean visible) {
+        legTimeObject.setVisible(visible);
+    }
+
     public void setLineGroupVisible(Boolean visible) {
         lineGroup.setVisible(visible);
     }
@@ -208,4 +283,9 @@ public class BoatGroup extends Group{
     public boolean isStopped() {
         return isStopped;
     }
+
+    @Override
+    public String toString() {
+        return boat.toString();
+    }
 }
\ No newline at end of file