From b17bba3629c8dfa3e9b79d29adbe9fe5b4fed4ec Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Thu, 18 May 2017 12:18:51 +1200
Subject: [PATCH 01/18] Fixed leaderboard on start screen and race view to show
 all boats correctly during pre-race.

#story[923]
---
 .../seng302/controllers/RaceController.java   | 13 +-----
 .../controllers/RaceViewController.java       | 26 +++++++----
 .../controllers/StartScreenController.java    | 43 +++++++++++--------
 src/main/java/seng302/models/Yacht.java       | 18 +++++---
 4 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceController.java b/src/main/java/seng302/controllers/RaceController.java
index d0ea0d42..4e40e001 100644
--- a/src/main/java/seng302/controllers/RaceController.java
+++ b/src/main/java/seng302/controllers/RaceController.java
@@ -2,7 +2,6 @@ package seng302.controllers;
 
 import seng302.models.Race;
 import seng302.models.Yacht;
-import seng302.models.parsers.ConfigParser;
 import seng302.models.parsers.CourseParser;
 import seng302.models.parsers.StreamParser;
 
@@ -18,6 +17,7 @@ import java.util.Random;
  * the CanvasController then uses the event data to make the animations
  */
 public class RaceController {
+
     Race race = null;
 
     public void initializeRace() {
@@ -39,24 +39,13 @@ public class RaceController {
 
     public Race createRace(String configFile, String teamsConfigFile) throws Exception {
         Race race = new Race();
-//        StreamParser.xmlObject
-        // Read team names from file
-//        TeamsParser tp = new TeamsParser(teamsConfigFile);
-
-        // Read course from file
-//        ConfigParser config = new ConfigParser(configFile);
 
         ArrayList<String> boatNames = new ArrayList<>();
-//        ArrayList<Boat> teams = tp.getBoats();
         Map<Long, Yacht> teams = StreamParser.getBoatsPos();
 
         //get race size
         int numberOfBoats = teams.size();
 
-        //get time scale
-//        double timeScale = config.getTimeScale();
-//        race.setTimeScale(timeScale);
-
         for (Yacht boat : teams.values()) {
             boatNames.add(boat.getBoatName());
             race.addBoat(boat);
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index aa09d9d1..4cfa1d92 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -251,21 +251,31 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         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);
+        if (StreamParser.isRaceStarted()) {
+            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 {
+                } else {
+                    Text textToAdd = new Text(boat.getPosition() + ". " +
+                        boat.getShortName() + " ");
+                    textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+                    textToAdd.setStyle("");
+                    positionVbox.getChildren().add(textToAdd);
+                }
+
+            }
+        } else {
+            for (Yacht boat : StreamParser.getBoats().values()) {
                 Text textToAdd = new Text(boat.getPosition() + ". " +
                     boat.getShortName() + " ");
                 textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                 textToAdd.setStyle("");
                 positionVbox.getChildren().add(textToAdd);
             }
-
         }
     }
 
diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java
index 8a4d563b..39e44be1 100644
--- a/src/main/java/seng302/controllers/StartScreenController.java
+++ b/src/main/java/seng302/controllers/StartScreenController.java
@@ -25,6 +25,7 @@ import seng302.models.Yacht;
 import seng302.models.parsers.StreamParser;
 
 public class StartScreenController implements Initializable {
+
     @FXML
     private GridPane gridPane;
     @FXML
@@ -48,19 +49,18 @@ public class StartScreenController implements Initializable {
 
     private boolean switchedToRaceView = false;
 
-    private void setContentPane(String jfxUrl){
-        try{
+    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){
+            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);
         }
     }
@@ -72,7 +72,8 @@ public class StartScreenController implements Initializable {
     }
 
     /**
-     * Running a timer to update the livestream status on welcome screen. Update interval is 1 second.
+     * Running a timer to update the livestream status on welcome screen. Update interval is 1
+     * second.
      */
     public void startStream() {
         if (StreamParser.isStreamStatus()) {
@@ -102,8 +103,10 @@ public class StartScreenController implements Initializable {
                             updateTeamList();
                             timeTillLive.setTextFill(Color.RED);
                             switchToRaceViewButton.setDisable(false);
-                            String timerMinute = Long.toString(StreamParser.getTimeSinceStart() / 60);
-                            String timerSecond = Long.toString(StreamParser.getTimeSinceStart() % 60);
+                            String timerMinute = Long
+                                .toString(StreamParser.getTimeSinceStart() / 60);
+                            String timerSecond = Long
+                                .toString(StreamParser.getTimeSinceStart() % 60);
                             if (timerSecond.length() == 1) {
                                 timerSecond = "0" + timerSecond;
                             }
@@ -114,8 +117,10 @@ public class StartScreenController implements Initializable {
                             updateTeamList();
                             timeTillLive.setTextFill(Color.BLACK);
                             switchToRaceViewButton.setDisable(false);
-                            String timerMinute = Long.toString(-1 * StreamParser.getTimeSinceStart() / 60);
-                            String timerSecond = Long.toString(-1 * StreamParser.getTimeSinceStart() % 60);
+                            String timerMinute = Long
+                                .toString(-1 * StreamParser.getTimeSinceStart() / 60);
+                            String timerSecond = Long
+                                .toString(-1 * StreamParser.getTimeSinceStart() % 60);
                             if (timerSecond.length() == 1) {
                                 timerSecond = "0" + timerSecond;
                             }
@@ -142,19 +147,23 @@ public class StartScreenController implements Initializable {
         teamList.setItems(data);
 
         boatNameCol.setCellValueFactory(
-                new PropertyValueFactory<>("boatName")
+            new PropertyValueFactory<>("boatName")
         );
         shortNameCol.setCellValueFactory(
-                new PropertyValueFactory<>("shortName")
+            new PropertyValueFactory<>("shortName")
         );
         countryCol.setCellValueFactory(
-                new PropertyValueFactory<>("country")
+            new PropertyValueFactory<>("country")
         );
         posCol.setCellValueFactory(
-                new PropertyValueFactory<>("position")
+            new PropertyValueFactory<>("position")
         );
 
-        data.addAll(StreamParser.getBoatsPos().values());
+        if (StreamParser.isRaceStarted()) {
+            data.addAll(StreamParser.getBoatsPos().values());
+        } else {
+            data.addAll(StreamParser.getBoats().values());
+        }
         teamList.refresh();
     }
 }
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index e21384f9..fbfe952f 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -9,9 +9,10 @@ import java.text.SimpleDateFormat;
  * Yacht class for the racing boat.
  *
  * Class created to store more variables (eg. boat statuses) compared to the XMLParser boat class,
- *  also done outside Boat class because some old variables are not used anymore.
+ * 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;
@@ -38,25 +39,27 @@ public class Yacht {
      *
      * @param boatName Create a yacht object with name.
      */
-    public Yacht (String boatName) {
+    public Yacht(String boatName) {
         this.boatName = boatName;
     }
 
     /**
      * Used in BoatGroupTest.
      *
-     * @param boatName     The name of the team sailing the boat
+     * @param boatName The name of the team sailing the boat
      * @param boatVelocity The speed of the boat in meters/second
-     * @param shortName    A shorter version of the teams name
+     * @param shortName A shorter version of the teams name
      */
     public Yacht(String boatName, double boatVelocity, String shortName, int id) {
         this.boatName = boatName;
         this.velocity = boatVelocity;
         this.shortName = shortName;
         this.sourceID = id;
+        this.position = "-";
     }
 
-    public Yacht(String boatType, Integer sourceID, String hullID, String shortName, String boatName, String country) {
+    public Yacht(String boatType, Integer sourceID, String hullID, String shortName,
+        String boatName, String country) {
         this.boatType = boatType;
         this.sourceID = sourceID;
         this.hullID = hullID;
@@ -68,18 +71,23 @@ public class Yacht {
     public String getBoatType() {
         return boatType;
     }
+
     public Integer getSourceID() {
         return sourceID;
     }
+
     public String getHullID() {
         return hullID;
     }
+
     public String getShortName() {
         return shortName;
     }
+
     public String getBoatName() {
         return boatName;
     }
+
     public String getCountry() {
         return country;
     }

From ecc0e722b5f2ea50a2af20bd73d07735f8263ef0 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 18 May 2017 13:19:59 +1200
Subject: [PATCH 02/18] Started sparkline prototype

#story[952]
---
 src/main/resources/views/RaceView.fxml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index cfb36f23..49c9d188 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.chart.*?>
 <?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
@@ -61,6 +62,14 @@
             <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="combo-box-base" />
+            <LineChart fx:id="raceSparkLine" layoutX="12.0" layoutY="790.0" prefHeight="188.0" prefWidth="217.0">
+              <xAxis>
+                <CategoryAxis side="BOTTOM" />
+              </xAxis>
+              <yAxis>
+                <NumberAxis side="LEFT" tickLabelGap="1.0" upperBound="6.0" />
+              </yAxis>
+            </LineChart>
             </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 390aabc78f4c2987f5d035db3039c7396971c999 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 18 May 2017 14:44:10 +1200
Subject: [PATCH 03/18] Adding race yacht series to the sparkline.

Next step is to make the series of the boats update when new position information is received.

#story[952]
---
 src/main/java/seng302/App.java                |  3 +-
 .../controllers/RaceViewController.java       | 21 +++++++++++-
 src/main/java/seng302/models/Yacht.java       | 32 +++++++++++++++++++
 src/main/resources/views/RaceView.fxml        | 12 +++----
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index afcd3430..524b3d40 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -63,7 +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 = 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/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 22c96f13..577f985f 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,5 +1,6 @@
 package seng302.controllers;
 
+import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.collections.FXCollections;
@@ -7,6 +8,10 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
+import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
@@ -36,6 +41,8 @@ import java.util.*;
  */
 public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
+
+    public LineChart raceSparkLine;
     @FXML
     private VBox positionVbox;
     @FXML
@@ -61,6 +68,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Race race;
     private Stage stage;
 
+    private int index = 0;
+
     private ImportantAnnotationsState importantAnnotations;
     private Yacht selectedBoat;
 
@@ -82,7 +91,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
         includedCanvasController.timer.start();
-
+        initializeSparkline();
         selectAnnotationBtn.setOnAction(event -> {
             loadSelectAnnotationView();
         });
@@ -173,6 +182,16 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
+    private void initializeSparkline(){
+        raceSparkLine.setTitle("Boat Positions");
+        for (Yacht yacht: startingBoats){
+            if (raceSparkLine.getData().contains(yacht.getSparklinePosition())) {
+                raceSparkLine.getData().remove(yacht.getSparklinePosition());
+            }
+            raceSparkLine.getData().add(yacht.getSparklinePosition());
+            System.out.println("Here");
+        }
+    }
 
     /**
      * Initalises a timer which updates elements of the RaceView such as wind direction, boat
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 23ba616a..2c2ff186 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -1,5 +1,9 @@
 package seng302.models;
 
+import java.util.concurrent.ConcurrentLinkedQueue;
+import javafx.scene.chart.XYChart;
+import javafx.scene.chart.XYChart.Data;
+import javafx.scene.chart.XYChart.Series;
 import javafx.scene.paint.Color;
 
 import java.text.DateFormat;
@@ -16,6 +20,9 @@ public class Yacht {
     private Color colour;
     private double velocity;
 
+    private int index;
+    private ConcurrentLinkedQueue<Number> dataQ1;
+
     private String boatType;
     private Integer sourceID;
     private String hullID; //matches HullNum in the XML spec.
@@ -33,6 +40,9 @@ public class Yacht {
     // Mark rounding
     private Long markRoundingTime;
 
+    // Used for sparkline
+    private XYChart.Series<Number, Number> sparklinePosition;
+
     /**
      * Used in EventTest and RaceTest.
      *
@@ -54,6 +64,11 @@ public class Yacht {
         this.velocity = boatVelocity;
         this.shortName = shortName;
         this.sourceID = id;
+        this.sparklinePosition = new XYChart.Series<>();
+        this.sparklinePosition.setName(boatName);
+        index = 0;
+        dataQ1 = new ConcurrentLinkedQueue<>();
+
     }
 
     public Yacht(String boatType, Integer sourceID, String hullID, String shortName, String boatName, String country) {
@@ -63,6 +78,10 @@ public class Yacht {
         this.shortName = shortName;
         this.boatName = boatName;
         this.country = country;
+        this.sparklinePosition = new XYChart.Series<>();
+        this.sparklinePosition.setName(boatName);
+        index = 0;
+        dataQ1 = new ConcurrentLinkedQueue<>();
     }
 
     public String getBoatType() {
@@ -140,6 +159,15 @@ public class Yacht {
     }
 
     public void setPosition(String position) {
+            try {
+                if (Integer.parseInt(position) != Integer.parseInt(this.position)){
+                dataQ1.add(Integer.parseInt(position));
+                sparklinePosition.getData().add(new XYChart.Data<>(index++, dataQ1.remove()));
+                System.out.println("new position found for " + boatName + " in position " + position + " old(" + this.position + ")");
+                }
+            } catch (NumberFormatException e) {
+                System.out.println("No position found");
+            }
         this.position = position;
     }
 
@@ -167,6 +195,10 @@ public class Yacht {
         this.markRoundingTime = markRoundingTime;
     }
 
+    public Series<Number, Number> getSparklinePosition() {
+        return sparklinePosition;
+    }
+
     @Override
     public String toString() {
         return boatName;
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 49c9d188..3260cec2 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -62,7 +62,12 @@
             <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="combo-box-base" />
-            <LineChart fx:id="raceSparkLine" layoutX="12.0" layoutY="790.0" prefHeight="188.0" prefWidth="217.0">
+            </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">
+         <children>
+            <fx:include fx:id="includedCanvas" source="CanvasView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+            <LineChart fx:id="raceSparkLine" layoutX="43.0" layoutY="597.0" prefHeight="277.0" prefWidth="727.0">
               <xAxis>
                 <CategoryAxis side="BOTTOM" />
               </xAxis>
@@ -70,11 +75,6 @@
                 <NumberAxis side="LEFT" tickLabelGap="1.0" upperBound="6.0" />
               </yAxis>
             </LineChart>
-            </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">
-         <children>
-            <fx:include fx:id="includedCanvas" source="CanvasView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
          </children></AnchorPane>
     </children>
 </GridPane>

From 951a7263096b2084a7653b1fc26a00ac4c718511 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 18 May 2017 20:56:42 +1200
Subject: [PATCH 04/18] The line chart now has series which display on it.

Need to get the right data to display on the linechart when it updates.

#story[952]
---
 .../seng302/controllers/CanvasController.java | 15 ++++++++----
 .../controllers/RaceViewController.java       | 23 +++++++++++++++----
 src/main/java/seng302/models/Yacht.java       | 12 ----------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 9a2a9797..aaea906b 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -22,10 +22,7 @@ import seng302.models.parsers.XMLParser.RaceXMLObject.Limit;
 import seng302.models.parsers.packets.BoatPositionPacket;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.PriorityBlockingQueue;
 
 /**
@@ -104,7 +101,13 @@ public class CanvasController {
         gc.restore();
         fitMarksToCanvas();
 
+        Timer t = new Timer();
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
 
+            }
+        },1000);
         // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
         drawBoats();
         timer = new AnimationTimer() {
@@ -125,6 +128,10 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
+                    System.out.println(elapsedNanos);
+                    if (elapsedNanos % 10 == 0) {
+                        raceViewController.updateSparkLine();
+                    }
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 577f985f..61ada899 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -67,6 +67,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Race race;
     private Stage stage;
+    private ArrayList<XYChart.Series<String, Double>> sparklineData = new ArrayList<>();
+    private int time;
 
     private int index = 0;
 
@@ -95,6 +97,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         selectAnnotationBtn.setOnAction(event -> {
             loadSelectAnnotationView();
         });
+        time = 0;
     }
 
     /**
@@ -185,12 +188,24 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private void initializeSparkline(){
         raceSparkLine.setTitle("Boat Positions");
         for (Yacht yacht: startingBoats){
-            if (raceSparkLine.getData().contains(yacht.getSparklinePosition())) {
-                raceSparkLine.getData().remove(yacht.getSparklinePosition());
-            }
-            raceSparkLine.getData().add(yacht.getSparklinePosition());
+            XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), Double.parseDouble(yacht.getPosition())));
+            sparklineData.add(yachtData);
             System.out.println("Here");
         }
+        for (Series<String, Double> spark:
+        sparklineData){
+            raceSparkLine.getData().add(spark);
+
+        }
+    }
+
+    public void updateSparkLine(){
+        for (int i = 0; i < startingBoats.size();i++){
+            sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time),Double.parseDouble(startingBoats.get(i).getPosition())));
+            System.out.println("Here");
+        }
+        time++;
     }
 
     /**
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 2c2ff186..5777fc25 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -2,7 +2,6 @@ package seng302.models;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.scene.chart.XYChart;
-import javafx.scene.chart.XYChart.Data;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.paint.Color;
 
@@ -40,8 +39,6 @@ public class Yacht {
     // Mark rounding
     private Long markRoundingTime;
 
-    // Used for sparkline
-    private XYChart.Series<Number, Number> sparklinePosition;
 
     /**
      * Used in EventTest and RaceTest.
@@ -64,8 +61,6 @@ public class Yacht {
         this.velocity = boatVelocity;
         this.shortName = shortName;
         this.sourceID = id;
-        this.sparklinePosition = new XYChart.Series<>();
-        this.sparklinePosition.setName(boatName);
         index = 0;
         dataQ1 = new ConcurrentLinkedQueue<>();
 
@@ -78,8 +73,6 @@ public class Yacht {
         this.shortName = shortName;
         this.boatName = boatName;
         this.country = country;
-        this.sparklinePosition = new XYChart.Series<>();
-        this.sparklinePosition.setName(boatName);
         index = 0;
         dataQ1 = new ConcurrentLinkedQueue<>();
     }
@@ -162,7 +155,6 @@ public class Yacht {
             try {
                 if (Integer.parseInt(position) != Integer.parseInt(this.position)){
                 dataQ1.add(Integer.parseInt(position));
-                sparklinePosition.getData().add(new XYChart.Data<>(index++, dataQ1.remove()));
                 System.out.println("new position found for " + boatName + " in position " + position + " old(" + this.position + ")");
                 }
             } catch (NumberFormatException e) {
@@ -195,10 +187,6 @@ public class Yacht {
         this.markRoundingTime = markRoundingTime;
     }
 
-    public Series<Number, Number> getSparklinePosition() {
-        return sparklinePosition;
-    }
-
     @Override
     public String toString() {
         return boatName;

From 422dcd4501fa6f52d439d1177f15e44bc24b4e39 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Fri, 19 May 2017 15:15:05 +1200
Subject: [PATCH 05/18] Sparklines now update with boat position change.

Need to make it work for any amount of boats in the race and to work when the race first starts as it currently only shows one boat.
#story[952]
---
 src/main/java/seng302/App.java                |  4 +-
 .../seng302/controllers/CanvasController.java |  7 +--
 .../controllers/RaceViewController.java       | 55 ++++++++++++++++---
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 524b3d40..108d44aa 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -63,8 +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("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "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 aaea906b..4ba21c00 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -128,10 +128,7 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
-                    System.out.println(elapsedNanos);
-                    if (elapsedNanos % 10 == 0) {
-                        raceViewController.updateSparkLine();
-                    }
+                    raceViewController.checkForPositionChange();
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
@@ -319,6 +316,8 @@ public class CanvasController {
         }
     }
 
+
+
     private void drawFps(int fps){
         if (raceViewController.isDisplayFps()){
             gc.clearRect(5,5,50,20);
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 61ada899..6eb3439f 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,5 +1,6 @@
 package seng302.controllers;
 
+import java.time.Year;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
@@ -7,6 +8,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.NumberAxis;
@@ -35,6 +37,7 @@ import seng302.models.parsers.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Created by ptg19 on 29/03/17.
@@ -68,6 +71,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Race race;
     private Stage stage;
     private ArrayList<XYChart.Series<String, Double>> sparklineData = new ArrayList<>();
+    private ArrayList<String> positions;
     private int time;
 
     private int index = 0;
@@ -83,7 +87,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         RaceController raceController = new RaceController();
         raceController.initializeRace();
         race = raceController.getRace();
-
+        positions = new ArrayList<>();
         startingBoats = new ArrayList<>(Arrays.asList(race.getBoats()));
 
         includedCanvasController.setup(this);
@@ -93,11 +97,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
         includedCanvasController.timer.start();
-        initializeSparkline();
+        time = 0;
         selectAnnotationBtn.setOnAction(event -> {
             loadSelectAnnotationView();
         });
-        time = 0;
     }
 
     /**
@@ -189,21 +192,53 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         raceSparkLine.setTitle("Boat Positions");
         for (Yacht yacht: startingBoats){
             XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), Double.parseDouble(yacht.getPosition())));
+            yachtData.setName(yacht.getBoatName());
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(yacht.getPosition())));
             sparklineData.add(yachtData);
-            System.out.println("Here");
         }
-        for (Series<String, Double> spark:
-        sparklineData){
+        for (Series<String, Double> spark: sparklineData){
             raceSparkLine.getData().add(spark);
+        }
+        Set<Node> nodes = raceSparkLine.lookupAll(".series");
+        for (Node n : nodes) {
+            StringBuilder style = new StringBuilder();
+            style.append("-fx-stroke: red; -fx-background-color: red, white; ");
+            n.setStyle(style.toString());
+        }
+        time++;
+    }
 
+
+    public void checkForPositionChange(){
+        // initialize position array
+        if (positions.size() == 0 && startingBoats.size() == 6){
+            Boolean positionsAssigned = true;
+            for (Yacht yacht: startingBoats){
+                if (Objects.equals(yacht.getPosition(), "-")) {
+                    positionsAssigned = false;
+                }
+            }
+            if (positionsAssigned){
+                initializeSparkline();
+                positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
+            }
+        } else {
+            ArrayList<String> currentPositions = startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toCollection(ArrayList::new));
+            if (!positions.equals(currentPositions)){
+                updateSparkLine();
+            }
+            positions.clear();
+            positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
         }
     }
 
+
+
     public void updateSparkLine(){
         for (int i = 0; i < startingBoats.size();i++){
-            sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time),Double.parseDouble(startingBoats.get(i).getPosition())));
-            System.out.println("Here");
+            if (!Objects.equals(startingBoats.get(i).getPosition(), "-")) {
+                sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(startingBoats.get(i).getPosition())));
+            }
         }
         time++;
     }
@@ -365,6 +400,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
 
+
+
     public boolean isDisplayFps() {
         return displayFps;
     }

From 48d58ea6602992c035d288ddf5ce68706938cb06 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Fri, 19 May 2017 18:08:26 +1200
Subject: [PATCH 06/18] Sparklines now update when a boat passes a mark.

There are issue of initialising the sparkline before the race starts and when the race is being viewed when it starts. It works great though when you join a race halfway.
#story[952]
---
 src/main/java/seng302/App.java                |  2 +-
 .../controllers/RaceViewController.java       | 54 +++++++++----------
 src/main/java/seng302/models/Yacht.java       | 16 ++----
 3 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 108d44aa..bd39a80d 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("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");
         }
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 6eb3439f..5adba02c 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -70,7 +70,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Race race;
     private Stage stage;
-    private ArrayList<XYChart.Series<String, Double>> sparklineData = new ArrayList<>();
+    private static HashMap<Integer, Series<String, Double>> sparklineData = new HashMap<>();
     private ArrayList<String> positions;
     private int time;
 
@@ -193,25 +193,39 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         for (Yacht yacht: startingBoats){
             XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
             yachtData.setName(yacht.getBoatName());
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(yacht.getPosition())));
-            sparklineData.add(yachtData);
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()), Double.parseDouble(yacht.getPosition())));
+            sparklineData.put(yacht.getSourceID(),yachtData);
         }
-        for (Series<String, Double> spark: sparklineData){
+        List<XYChart.Series<String, Double>> positions = new ArrayList<XYChart.Series<String, Double>>(sparklineData.values());
+
+        Collections.sort(positions, new Comparator<XYChart.Series>() {
+            @Override
+            public int compare(Series o1, Series o2) {
+                Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
+                Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
+                if (leg2 < leg1){
+                    return 1;
+                } else {
+                    return -1;
+                }
+            }
+        });
+        for (Series<String, Double> spark: positions){
             raceSparkLine.getData().add(spark);
         }
-        Set<Node> nodes = raceSparkLine.lookupAll(".series");
-        for (Node n : nodes) {
-            StringBuilder style = new StringBuilder();
-            style.append("-fx-stroke: red; -fx-background-color: red, white; ");
-            n.setStyle(style.toString());
-        }
-        time++;
+
+    }
+
+
+    public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
+        XYChart.Series<String, Double> positionData =  sparklineData.get(yacht.getSourceID());
+        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), Double.parseDouble(yacht.getPosition())));
     }
 
 
     public void checkForPositionChange(){
         // initialize position array
-        if (positions.size() == 0 && startingBoats.size() == 6){
+        if (startingBoats.size() == 6 && raceSparkLine.getData().size() != 6){
             Boolean positionsAssigned = true;
             for (Yacht yacht: startingBoats){
                 if (Objects.equals(yacht.getPosition(), "-")) {
@@ -220,28 +234,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             }
             if (positionsAssigned){
                 initializeSparkline();
-                positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
             }
-        } else {
-            ArrayList<String> currentPositions = startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toCollection(ArrayList::new));
-            if (!positions.equals(currentPositions)){
-                updateSparkLine();
-            }
-            positions.clear();
-            positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
         }
     }
 
 
 
-    public void updateSparkLine(){
-        for (int i = 0; i < startingBoats.size();i++){
-            if (!Objects.equals(startingBoats.get(i).getPosition(), "-")) {
-                sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(startingBoats.get(i).getPosition())));
-            }
-        }
-        time++;
-    }
 
     /**
      * Initalises a timer which updates elements of the RaceView such as wind direction, boat
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 5777fc25..ec1110a3 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -4,6 +4,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.paint.Color;
+import seng302.controllers.RaceViewController;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -20,7 +21,6 @@ public class Yacht {
     private double velocity;
 
     private int index;
-    private ConcurrentLinkedQueue<Number> dataQ1;
 
     private String boatType;
     private Integer sourceID;
@@ -62,7 +62,6 @@ public class Yacht {
         this.shortName = shortName;
         this.sourceID = id;
         index = 0;
-        dataQ1 = new ConcurrentLinkedQueue<>();
 
     }
 
@@ -74,7 +73,6 @@ public class Yacht {
         this.boatName = boatName;
         this.country = country;
         index = 0;
-        dataQ1 = new ConcurrentLinkedQueue<>();
     }
 
     public String getBoatType() {
@@ -109,7 +107,11 @@ public class Yacht {
     }
 
     public void setLegNumber(Integer legNumber) {
+        if (legNumber != this.legNumber && colour != null && position != "-") {
+            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+        }
         this.legNumber = legNumber;
+
     }
 
     public Integer getPenaltiesAwarded() {
@@ -152,14 +154,6 @@ public class Yacht {
     }
 
     public void setPosition(String position) {
-            try {
-                if (Integer.parseInt(position) != Integer.parseInt(this.position)){
-                dataQ1.add(Integer.parseInt(position));
-                System.out.println("new position found for " + boatName + " in position " + position + " old(" + this.position + ")");
-                }
-            } catch (NumberFormatException e) {
-                System.out.println("No position found");
-            }
         this.position = position;
     }
 

From 8e147bd1bd746303f4ce73e02d5bbad51f5b4073 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Sun, 21 May 2017 14:56:05 +1200
Subject: [PATCH 07/18] Making the boat sparkline initialise after the race
 screen is shown.

#story[952]
---
 src/main/java/seng302/controllers/CanvasController.java   | 2 +-
 src/main/java/seng302/controllers/RaceViewController.java | 7 +++++++
 src/main/java/seng302/models/Yacht.java                   | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 4ba21c00..7d0db4ed 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -128,7 +128,7 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
-                    raceViewController.checkForPositionChange();
+//                    raceViewController.checkForPositionChange();
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 5adba02c..e7eb3b90 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -522,4 +522,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     Stage getStage() {
         return stage;
     }
+
+    public static boolean sparkLineStatus(Integer yachtId) {
+        if (sparklineData.containsKey(yachtId)){
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index ec1110a3..5b19046f 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -107,9 +107,9 @@ public class Yacht {
     }
 
     public void setLegNumber(Integer legNumber) {
-        if (legNumber != this.legNumber && colour != null && position != "-") {
-            RaceViewController.updateYachtPositionSparkline(this, legNumber);
-        }
+//        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
+//            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+//        }
         this.legNumber = legNumber;
 
     }

From 8f81060a18526507a604bf891f84ad8f08316b3f Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Sun, 21 May 2017 19:49:11 +1200
Subject: [PATCH 08/18] Managed to make the sparklines coordinate with their
 colour.

 However the symbols had to be removed. The sparkline can also be intialised at any time now but this might need to be tested further to ensure that it works.

#story[952]
---
 .../seng302/controllers/CanvasController.java |  2 +-
 .../controllers/RaceViewController.java       | 76 +++++++++----------
 src/main/java/seng302/models/Yacht.java       |  6 +-
 src/main/resources/css/master.css             | 20 ++++-
 src/main/resources/views/RaceView.fxml        | 16 ++--
 5 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 7d0db4ed..c5609cad 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -128,7 +128,7 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
-//                    raceViewController.checkForPositionChange();
+                    raceViewController.updateSparkLine();
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index e7eb3b90..0f2fabef 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,17 +1,13 @@
 package seng302.controllers;
 
-import java.time.Year;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.chart.LineChart;
-import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Button;
@@ -37,7 +33,6 @@ import seng302.models.parsers.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Created by ptg19 on 29/03/17.
@@ -70,7 +65,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Race race;
     private Stage stage;
-    private static HashMap<Integer, Series<String, Double>> sparklineData = new HashMap<>();
+    private static HashMap<Integer, Series<String, Double>> sparkLineData = new HashMap<>();
     private ArrayList<String> positions;
     private int time;
 
@@ -188,54 +183,57 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
-    private void initializeSparkline(){
-        raceSparkLine.setTitle("Boat Positions");
+    public void updateSparkLine(){
+        ArrayList<Yacht> sparkLineCandidates = new ArrayList<>();
         for (Yacht yacht: startingBoats){
+            if (!sparkLineData.containsKey(yacht.getSourceID()) && yacht.getPosition() != "-") {
+                sparkLineCandidates.add(yacht);
+            }
+        }
+        for (Yacht yacht: sparkLineCandidates){
             XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
             yachtData.setName(yacht.getBoatName());
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()), Double.parseDouble(yacht.getPosition())));
-            sparklineData.put(yacht.getSourceID(),yachtData);
-        }
-        List<XYChart.Series<String, Double>> positions = new ArrayList<XYChart.Series<String, Double>>(sparklineData.values());
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()),1 + sparkLineCandidates.size() - Double.parseDouble(yacht.getPosition())));
+            sparkLineData.put(yacht.getSourceID(), yachtData);
+       }
 
-        Collections.sort(positions, new Comparator<XYChart.Series>() {
-            @Override
-            public int compare(Series o1, Series o2) {
-                Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
-                Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
-                if (leg2 < leg1){
-                    return 1;
-                } else {
-                    return -1;
-                }
+        // Lambda function to sort the series in order of leg (later legs shown more to the right)
+        List<XYChart.Series<String, Double>> positions = new ArrayList<>(sparkLineData.values());
+        Collections.sort(positions, (o1, o2) -> {
+            Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
+            Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
+            if (leg2 < leg1){
+                return 1;
+            } else {
+                return -1;
             }
         });
+        raceSparkLine.setCreateSymbols(false);
         for (Series<String, Double> spark: positions){
-            raceSparkLine.getData().add(spark);
+            if (!raceSparkLine.getData().contains(spark)) {
+                raceSparkLine.getData().add(spark);
+                spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()).toString());
+            }
         }
-
     }
 
 
     public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
-        XYChart.Series<String, Double> positionData =  sparklineData.get(yacht.getSourceID());
-        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), Double.parseDouble(yacht.getPosition())));
+        XYChart.Series<String, Double> positionData =  sparkLineData.get(yacht.getSourceID());
+        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), 1 + sparkLineData.size() - Double.parseDouble(yacht.getPosition())));
     }
 
-
-    public void checkForPositionChange(){
-        // initialize position array
-        if (startingBoats.size() == 6 && raceSparkLine.getData().size() != 6){
-            Boolean positionsAssigned = true;
-            for (Yacht yacht: startingBoats){
-                if (Objects.equals(yacht.getPosition(), "-")) {
-                    positionsAssigned = false;
-                }
-            }
-            if (positionsAssigned){
-                initializeSparkline();
+    private String getBoatColorAsRGB(String boatName){
+        Color color = Color.WHITE;
+        for (Yacht yacht: startingBoats){
+            if (yacht.getBoatName() == boatName){
+                color = yacht.getColour();
             }
         }
+        return String.format( "#%02X%02X%02X",
+            (int)( color.getRed() * 255 ),
+            (int)( color.getGreen() * 255 ),
+            (int)( color.getBlue() * 255 ) );
     }
 
 
@@ -524,7 +522,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
     public static boolean sparkLineStatus(Integer yachtId) {
-        if (sparklineData.containsKey(yachtId)){
+        if (sparkLineData.containsKey(yachtId)){
             return true;
         }
         return false;
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 5b19046f..22472810 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -107,9 +107,9 @@ public class Yacht {
     }
 
     public void setLegNumber(Integer legNumber) {
-//        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
-//            RaceViewController.updateYachtPositionSparkline(this, legNumber);
-//        }
+        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
+            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+        }
         this.legNumber = legNumber;
 
     }
diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
index 8223fc00..a97dcfa5 100644
--- a/src/main/resources/css/master.css
+++ b/src/main/resources/css/master.css
@@ -181,4 +181,22 @@ Remove scroll bars
     -fx-background-radius: 0;
     -fx-background-insets: 0;
     -fx-padding: 0;
-}
\ No newline at end of file
+}
+
+/**
+SparkLine elements
+ */
+
+
+/*.spark-line-yaxis{*/
+    /*-fx-font-color: white;*/
+    /*-fx-tick-label-fill: #ffffff;}*/
+
+/*.spark-line-xaxis{*/
+    /*-fx-font-color: white;*/
+    /*-fx-tick-label-fill: #ffffff;*/
+/*}*/
+
+.chart{
+    -fx-background-color: #ffffff;
+}
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 3260cec2..970f8200 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -62,19 +62,19 @@
             <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="combo-box-base" />
+            <LineChart fx:id="raceSparkLine" layoutX="-15.0" layoutY="719.0" legendVisible="false" prefHeight="277.0" prefWidth="260.0" title="Boat Positions">
+              <xAxis>
+                <CategoryAxis label="Leg Number" side="BOTTOM" styleClass="spark-line-xaxis" />
+              </xAxis>
+              <yAxis>
+                <NumberAxis label="Position" minorTickCount="1" minorTickLength="1.0" side="LEFT" styleClass="spark-line-yaxis" tickLabelGap="1.0" tickUnit="1.0" upperBound="7.0" />
+              </yAxis>
+            </LineChart>
             </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">
          <children>
             <fx:include fx:id="includedCanvas" source="CanvasView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-            <LineChart fx:id="raceSparkLine" layoutX="43.0" layoutY="597.0" prefHeight="277.0" prefWidth="727.0">
-              <xAxis>
-                <CategoryAxis side="BOTTOM" />
-              </xAxis>
-              <yAxis>
-                <NumberAxis side="LEFT" tickLabelGap="1.0" upperBound="6.0" />
-              </yAxis>
-            </LineChart>
          </children></AnchorPane>
     </children>
 </GridPane>

From 2686dac62e74e2e1d4d207c1068b6fce17f3824d Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Tue, 23 May 2017 11:53:23 +1200
Subject: [PATCH 09/18] Fixed Yacht position initialise. TO-DO: check if the
 boat is participating before showing up on leaderboard.

---
 src/main/java/seng302/models/Yacht.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index b018319b..9644e5f1 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -55,7 +55,6 @@ public class Yacht {
         this.velocity = boatVelocity;
         this.shortName = shortName;
         this.sourceID = id;
-        this.position = "-";
     }
 
     public Yacht(String boatType, Integer sourceID, String hullID, String shortName,
@@ -66,6 +65,7 @@ public class Yacht {
         this.shortName = shortName;
         this.boatName = boatName;
         this.country = country;
+        this.position = "-";
     }
 
     public String getBoatType() {

From 6d7c36e31f7e79a40b6ee8e344c9cc1ae9570257 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Tue, 23 May 2017 20:00:23 +1200
Subject: [PATCH 10/18] Updated code to check if boat is in the race before
 displaying in the leaderboard

#story[923]
---
 .../controllers/RaceViewController.java       | 44 ++++++++++++-------
 .../controllers/StartScreenController.java    | 36 +++++++++++----
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index e83a651b..b3a01fa6 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -30,6 +30,7 @@ import seng302.models.stream.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
+import seng302.models.stream.XMLParser.RaceXMLObject.Participant;
 
 /**
  * Created by ptg19 on 29/03/17.
@@ -82,6 +83,7 @@ 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) {
@@ -233,30 +235,41 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         positionVbox.getChildren().removeAll();
         positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
 
+        // list of racing boat id
+        ArrayList<Participant> participants = StreamParser.getXmlObject().getRaceXML()
+            .getParticipants();
+        ArrayList<Integer> participantIDs = new ArrayList<>();
+        for (Participant p : participants) {
+            participantIDs.add(p.getsourceID());
+        }
+
         if (StreamParser.isRaceStarted()) {
             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);
+                if (participantIDs.contains(boat.getSourceID())) {  // check if the boat is racing
+                    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 {
+                    } else {
+                        Text textToAdd = new Text(boat.getPosition() + ". " +
+                            boat.getShortName() + " ");
+                        textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+                        textToAdd.setStyle("");
+                        positionVbox.getChildren().add(textToAdd);
+                    }
+                }
+            }
+        } else {
+            for (Yacht boat : StreamParser.getBoats().values()) {
+                if (participantIDs.contains(boat.getSourceID())) {  // check if the boat is racing
                     Text textToAdd = new Text(boat.getPosition() + ". " +
                         boat.getShortName() + " ");
                     textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                     textToAdd.setStyle("");
                     positionVbox.getChildren().add(textToAdd);
                 }
-
-            }
-        } else {
-            for (Yacht boat : StreamParser.getBoats().values()) {
-                Text textToAdd = new Text(boat.getPosition() + ". " +
-                    boat.getShortName() + " ");
-                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
-                textToAdd.setStyle("");
-                positionVbox.getChildren().add(textToAdd);
             }
         }
     }
@@ -338,6 +351,7 @@ 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) {
diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java
index 177cf907..22e5dd1b 100644
--- a/src/main/java/seng302/controllers/StartScreenController.java
+++ b/src/main/java/seng302/controllers/StartScreenController.java
@@ -2,6 +2,7 @@ package seng302.controllers;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.ResourceBundle;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -23,6 +24,7 @@ import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import seng302.models.Yacht;
 import seng302.models.stream.StreamParser;
+import seng302.models.stream.XMLParser.RaceXMLObject.Participant;
 
 public class StartScreenController implements Initializable {
 
@@ -56,12 +58,11 @@ public class StartScreenController implements Initializable {
             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) {
             e.printStackTrace();
-        }
-        catch(IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }
@@ -161,10 +162,27 @@ public class StartScreenController implements Initializable {
             new PropertyValueFactory<>("position")
         );
 
-        if (StreamParser.isRaceStarted()) {
-            data.addAll(StreamParser.getBoatsPos().values());
-        } else {
-            data.addAll(StreamParser.getBoats().values());
+        // check if the boat is racing
+        ArrayList<Participant> participants = StreamParser.getXmlObject().getRaceXML()
+            .getParticipants();
+        ArrayList<Integer> participantIDs = new ArrayList<>();
+        for (Participant p : participants) {
+            participantIDs.add(p.getsourceID());
+        }
+
+        // add boats to the start screen list
+        if (StreamParser.isRaceStarted()) {  // if race is started, use StreamParser.getBoatsPos()
+            for (Yacht boat : StreamParser.getBoatsPos().values()) {
+                if (participantIDs.contains(boat.getSourceID())) {
+                    data.add(boat);
+                }
+            }
+        } else {  // else use StreamParser.getBoats()
+            for (Yacht boat : StreamParser.getBoats().values()) {
+                if (participantIDs.contains(boat.getSourceID())) {
+                    data.add(boat);
+                }
+            }
         }
         teamList.refresh();
     }

From 7abb36c362c0eac173000891517d4d595ee3f081 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 14:42:41 +1200
Subject: [PATCH 11/18] The axis is labeled correctly and is scaled
 accordingly.

The sparkline should work from the start of a race now also. We now have the boat in first place listed at the top along with the axis labeling and marking matching the position (eg, 1st at top. 6th at bottom). Boats picked up on the visualiser park way through the race are able to added and drawn onto the sparkline.

#story[952]
---
 src/main/java/seng302/App.java                |   5 +-
 .../controllers/RaceViewController.java       | 105 ++++++++++--------
 src/main/resources/views/RaceView.fxml        |   2 +-
 3 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index ac264db6..64ccaea8 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,8 +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 = 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/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 71f542ae..95214921 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -6,8 +6,10 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Side;
 import javafx.scene.Scene;
 import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Button;
@@ -33,14 +35,18 @@ import seng302.models.stream.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
+ *
  * Created by ptg19 on 29/03/17.
  */
 public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
-
-    public LineChart raceSparkLine;
+    @FXML
+    private LineChart raceSparkLine;
+    @FXML
+    private NumberAxis sparklineYAxis;
     @FXML
     private VBox positionVbox;
     @FXML
@@ -65,11 +71,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Stage stage;
     private static HashMap<Integer, Series<String, Double>> sparkLineData = new HashMap<>();
-    private ArrayList<String> positions;
-    private int time;
-
-    private int index = 0;
-
+    private static ArrayList<Yacht> racingBoats = new ArrayList<>();
     private ImportantAnnotationsState importantAnnotations;
     private Yacht selectedBoat;
 
@@ -77,12 +79,13 @@ 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();
-        positions = new ArrayList<>();
-        startingBoats = new ArrayList<>(Arrays.asList(race.getBoats()));
+        //Format the yaxis of the sparkline
+        raceSparkLine.getYAxis().setRotate(180);
+        raceSparkLine.getYAxis().setTickLabelRotation(180);
+        raceSparkLine.getYAxis().setTranslateX(15);
+        raceSparkLine.getYAxis().setAutoRanging(false);
+
+        startingBoats = new ArrayList<>(StreamParser.getBoats().values());
 
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
@@ -91,12 +94,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
         includedCanvasController.timer.start();
-        time = 0;
-        selectAnnotationBtn.setOnAction(event -> {
-            loadSelectAnnotationView();
-        });
+        selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
     }
 
+
     /**
      * The important annotations have been changed, update this view
      * @param importantAnnotationsState The current state of the selected annotations
@@ -106,6 +107,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
+
     /**
      * Loads the "select annotations" view in a new window
      */
@@ -143,6 +145,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             (observable, oldValue, newValue) -> displayFps = !displayFps);
     }
 
+
     private void initialiseAnnotationSlider() {
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
@@ -182,50 +185,65 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
-    public void updateSparkLine(){
-        ArrayList<Yacht> sparkLineCandidates = new ArrayList<>();
-        for (Yacht yacht: startingBoats){
-            if (!sparkLineData.containsKey(yacht.getSourceID()) && yacht.getPosition() != "-") {
-                sparkLineCandidates.add(yacht);
-            }
-        }
-        for (Yacht yacht: sparkLineCandidates){
-            XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
+    void updateSparkLine(){
+        // Goes through and collects the racing boats that aren't already in the chart
+        ArrayList<Yacht> sparkLineCandidates = startingBoats.stream().filter(yacht -> !sparkLineData.containsKey(yacht.getSourceID())
+                && yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
+
+        racingBoats = startingBoats.stream().filter(yacht ->
+        yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
+
+        // Creates new data series for boats to the data series on the line chart
+        sparkLineCandidates.stream().filter(yacht -> yacht.getPosition() != null).forEach(yacht -> {
+            Series<String, Double> yachtData = new Series<>();
             yachtData.setName(yacht.getBoatName());
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()),1 + sparkLineCandidates.size() - Double.parseDouble(yacht.getPosition())));
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()), 1 + racingBoats.size() - Double.parseDouble(yacht.getPosition())));
             sparkLineData.put(yacht.getSourceID(), yachtData);
-       }
+        });
 
         // Lambda function to sort the series in order of leg (later legs shown more to the right)
         List<XYChart.Series<String, Double>> positions = new ArrayList<>(sparkLineData.values());
         Collections.sort(positions, (o1, o2) -> {
-            Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
-            Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
+            Integer leg1 =  Integer.parseInt(o1.getData().get(o1.getData().size()-1).getXValue());
+            Integer leg2 =  Integer.parseInt(o2.getData().get(o2.getData().size()-1).getXValue());
             if (leg2 < leg1){
                 return 1;
             } else {
                 return -1;
             }
         });
+
+
+        sparklineYAxis.setUpperBound(racingBoats.size() + 1);
+        // Adds the new data series to the sparkline
         raceSparkLine.setCreateSymbols(false);
-        for (Series<String, Double> spark: positions){
-            if (!raceSparkLine.getData().contains(spark)) {
-                raceSparkLine.getData().add(spark);
-                spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()).toString());
-            }
-        }
+        positions.stream().filter(spark -> !raceSparkLine.getData().contains(spark)).forEach(spark -> {
+            raceSparkLine.getData().add(spark);
+            spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()));
+        });
     }
 
 
+    /**
+     * UUpdates the yachts sparkline of the desired boat and using the new leg number
+     * @param yacht
+     * @param legNumber
+     */
     public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
         XYChart.Series<String, Double> positionData =  sparkLineData.get(yacht.getSourceID());
-        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), 1 + sparkLineData.size() - Double.parseDouble(yacht.getPosition())));
+        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), 1 + racingBoats.size() - Double.parseDouble(yacht.getPosition())));
     }
 
+
+    /**
+     * gets the rgb string of the boats colour to use for the chart via css
+     * @param boatName boat passed in to get the boats colour
+     * @return
+     */
     private String getBoatColorAsRGB(String boatName){
         Color color = Color.WHITE;
         for (Yacht yacht: startingBoats){
-            if (yacht.getBoatName() == boatName){
+            if (Objects.equals(yacht.getBoatName(), boatName)){
                 color = yacht.getColour();
             }
         }
@@ -394,7 +412,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
 
-    public boolean isDisplayFps() {
+    boolean isDisplayFps() {
         return displayFps;
     }
 
@@ -455,9 +473,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 break;
             // Important Annotations
             case 1:
-                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
-                    setBoatGroupImportantAnnotations(bg);
-                }
+                includedCanvasController.getBoatGroups().forEach(this::setBoatGroupImportantAnnotations);
                 break;
             // All Annotations
             case 2:
@@ -501,9 +517,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
     public static boolean sparkLineStatus(Integer yachtId) {
-        if (sparkLineData.containsKey(yachtId)){
-            return true;
-        }
-        return false;
+        return sparkLineData.containsKey(yachtId);
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 13ecaa7e..1a8f74ac 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -56,7 +56,7 @@
                 <CategoryAxis label="Leg Number" side="BOTTOM" styleClass="spark-line-xaxis" />
               </xAxis>
               <yAxis>
-                <NumberAxis label="Position" minorTickCount="1" minorTickLength="1.0" side="LEFT" styleClass="spark-line-yaxis" tickLabelGap="1.0" tickUnit="1.0" upperBound="7.0" />
+                <NumberAxis fx:id="sparklineYAxis" minorTickCount="1" minorTickLength="1.0" side="LEFT" styleClass="spark-line-yaxis" tickLabelGap="1.0" tickUnit="1.0" upperBound="7.0" />
               </yAxis>
             </LineChart>
             </children>

From 8ab57e4e614d75a448bd3707d7157954ce4655ee Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:43:50 +1200
Subject: [PATCH 12/18] Cleaned up code for review.

#story[952]
---
 .../controllers/RaceViewController.java       | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 95214921..e9a3d423 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -79,7 +79,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         // Load a default important annotation state
         importantAnnotations = new ImportantAnnotationsState();
 
-        //Format the yaxis of the sparkline
+        //Formatting the y axis of the sparkline
         raceSparkLine.getYAxis().setRotate(180);
         raceSparkLine.getYAxis().setTickLabelRotation(180);
         raceSparkLine.getYAxis().setTranslateX(15);
@@ -185,15 +185,21 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
+
+    /**
+     * Used to add any new boats into the race that may have started late or not have had data received yet
+     */
     void updateSparkLine(){
-        // Goes through and collects the racing boats that aren't already in the chart
+        // Collect the racing boats that aren't already in the chart
         ArrayList<Yacht> sparkLineCandidates = startingBoats.stream().filter(yacht -> !sparkLineData.containsKey(yacht.getSourceID())
                 && yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
 
+        // Obtain the qualifying boats to set the max on the Y axis
         racingBoats = startingBoats.stream().filter(yacht ->
         yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
+        sparklineYAxis.setUpperBound(racingBoats.size() + 1);
 
-        // Creates new data series for boats to the data series on the line chart
+        // Create a new data series for new boats
         sparkLineCandidates.stream().filter(yacht -> yacht.getPosition() != null).forEach(yacht -> {
             Series<String, Double> yachtData = new Series<>();
             yachtData.setName(yacht.getBoatName());
@@ -214,8 +220,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
 
 
-        sparklineYAxis.setUpperBound(racingBoats.size() + 1);
-        // Adds the new data series to the sparkline
+        // Adds the new data series to the sparkline (and set the colour of the series)
         raceSparkLine.setCreateSymbols(false);
         positions.stream().filter(spark -> !raceSparkLine.getData().contains(spark)).forEach(spark -> {
             raceSparkLine.getData().add(spark);
@@ -225,9 +230,9 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
 
     /**
-     * UUpdates the yachts sparkline of the desired boat and using the new leg number
-     * @param yacht
-     * @param legNumber
+     * Updates the yachts sparkline of the desired boat and using the new leg number
+     * @param yacht The yacht to be updated on the sparkline
+     * @param legNumber the leg number that the position will be assigned to
      */
     public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
         XYChart.Series<String, Double> positionData =  sparkLineData.get(yacht.getSourceID());
@@ -238,7 +243,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     /**
      * gets the rgb string of the boats colour to use for the chart via css
      * @param boatName boat passed in to get the boats colour
-     * @return
+     * @return the colour as an rgb string
      */
     private String getBoatColorAsRGB(String boatName){
         Color color = Color.WHITE;
@@ -254,8 +259,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
 
-
-
     /**
      * 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.
@@ -272,7 +275,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                     updateWindDirection();
                     updateOrder();
                     updateBoatSelectionComboBox();
-
                 })
         );
 
@@ -516,6 +518,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return stage;
     }
 
+    /**
+     * Used for when the boat attempts to add data to the sparkline (first checks if the sparkline contains info on it)
+     * @param yachtId
+     * @return
+     */
     public static boolean sparkLineStatus(Integer yachtId) {
         return sparkLineData.containsKey(yachtId);
     }

From 46f5fc517236465ea7240c9ac047406077bcb411 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:47:27 +1200
Subject: [PATCH 13/18] Merge with develop.

#story[952]
---
 src/main/java/seng302/App.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 93dcd998..64cf5e2c 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -64,9 +64,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();

From 34c3899ec4ff0d11612ea3d844bd7e1218e32958 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:51:52 +1200
Subject: [PATCH 14/18] Removed unused css for charts

---
 src/main/resources/css/master.css | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
index a97dcfa5..bef93923 100644
--- a/src/main/resources/css/master.css
+++ b/src/main/resources/css/master.css
@@ -183,20 +183,6 @@ Remove scroll bars
     -fx-padding: 0;
 }
 
-/**
-SparkLine elements
- */
-
-
-/*.spark-line-yaxis{*/
-    /*-fx-font-color: white;*/
-    /*-fx-tick-label-fill: #ffffff;}*/
-
-/*.spark-line-xaxis{*/
-    /*-fx-font-color: white;*/
-    /*-fx-tick-label-fill: #ffffff;*/
-/*}*/
-
 .chart{
     -fx-background-color: #ffffff;
 }

From e6aed881889486586b0b2020db78f2855d983b96 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:56:56 +1200
Subject: [PATCH 15/18] Merge with develop.

#story[952]
---
 src/main/java/seng302/models/Yacht.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 6358003d..c5bdcbb7 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -1,8 +1,6 @@
 package seng302.models;
 
-import java.util.concurrent.ConcurrentLinkedQueue;
-import javafx.scene.chart.XYChart;
-import javafx.scene.chart.XYChart.Series;
+
 import javafx.scene.paint.Color;
 import seng302.controllers.RaceViewController;
 
@@ -21,8 +19,6 @@ public class Yacht {
     private Color colour;
     private double velocity;
 
-    private int index;
-
     private String boatType;
     private Integer sourceID;
     private String hullID; //matches HullNum in the XML spec.

From d2e55bf96436fe06432f6595986a29e8448f6070 Mon Sep 17 00:00:00 2001
From: Haoming Yin <hyi25@uclive.ac.nz>
Date: Wed, 24 May 2017 19:33:24 +1200
Subject: [PATCH 16/18] Removed the FPS background, and lowered the update
 frequency so it doesn't flip too fast.

#story[923]
---
 .../seng302/controllers/CanvasController.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 6fa9b773..647a2488 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -120,6 +120,9 @@ public class CanvasController {
         initializeMarks();
         timer = new AnimationTimer() {
 
+            private int UPDATE_FPM_PERIOD = 50; // update FPM label every 50 frames
+            private int updateFPMCounter = 100;
+
             @Override
             public void handle(long now) {
 
@@ -135,7 +138,10 @@ public class CanvasController {
                     elapsedNanos = now - oldFrameTime ;
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
-                    drawFps(frameRate.intValue());
+                    if (updateFPMCounter++ > UPDATE_FPM_PERIOD) {
+                        updateFPMCounter = 0;
+                        drawFps(frameRate.intValue());
+                    }
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
@@ -348,17 +354,14 @@ public class CanvasController {
 
     private void drawFps(int fps){
         if (raceViewController.isDisplayFps()){
-            gc.clearRect(5,5,50,20);
-            gc.setFill(Color.SKYBLUE);
-            gc.fillRect(4,4,51,21);
-            gc.setFill(Color.BLACK);
-            gc.setFont(new Font(14));
-            gc.setLineWidth(3);
+            gc.clearRect(5, 5, 60, 30);
+            gc.setFont(new Font(16));
+            gc.setLineWidth(4);
+            gc.setGlobalAlpha(0.75);
             gc.fillText(fps + " FPS", 5, 20);
+            gc.setGlobalAlpha(0.5);
         } else {
-            gc.clearRect(5,5,50,20);
-            gc.setFill(Color.SKYBLUE);
-            gc.fillRect(4,4,51,21);
+            gc.clearRect(5,5,60,30);
         }
     }
 

From a6d9c66fc9faaf040fcd0c5bd9ede3490161a618 Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Thu, 25 May 2017 10:20:39 +1200
Subject: [PATCH 17/18] Removed unused import statements and class variables.
 Removed non error print statements.

---
 src/main/java/seng302/App.java                |   1 -
 .../seng302/controllers/CanvasController.java |  35 +-
 .../seng302/controllers/RaceController.java   |   0
 .../controllers/StartScreenController.java    |   1 -
 src/main/java/seng302/models/BoatGroup.java   |   4 -
 src/main/java/seng302/models/Colors.java      |   2 +-
 src/main/java/seng302/models/Event.java       |   1 -
 src/main/java/seng302/models/Leg.java         | 116 -----
 .../java/seng302/models/TimelineInfo.java     |  31 --
 src/main/java/seng302/models/mark/Mark.java   |  41 +-
 .../java/seng302/models/mark/MarkGroup.java   |   2 +-
 .../java/seng302/models/mark/MarkType.java    |   2 +-
 .../seng302/models/stream/StreamParser.java   | 406 +++++++++---------
 .../seng302/models/stream/StreamReceiver.java |   2 -
 .../java/seng302/server/ServerThread.java     |  24 +-
 .../seng302/server/StreamingServerSocket.java |   2 -
 .../seng302/server/simulator/Simulator.java   |   3 -
 src/test/java/seng302/LegTest.java            |  54 ---
 .../models/stream/StreamReceiverTest.java     |   2 +-
 19 files changed, 254 insertions(+), 475 deletions(-)
 delete mode 100644 src/main/java/seng302/controllers/RaceController.java
 delete mode 100644 src/main/java/seng302/models/Leg.java
 delete mode 100644 src/main/java/seng302/models/TimelineInfo.java
 delete mode 100644 src/test/java/seng302/LegTest.java

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 64cf5e2c..a3d5f49f 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -24,7 +24,6 @@ public class App extends Application {
         primaryStage.setOnCloseRequest(e -> {
             StreamParser.appClose();
             StreamReceiver.noMoreBytes();
-            System.out.println("[CLIENT] Exiting program");
             System.exit(0);
         });
 
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 25530b60..b353ab9a 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -45,17 +45,12 @@ public class CanvasController {
     private Group group;
     private GraphicsContext gc;
     private ImageView mapImage;
-
-    private final int MARK_SIZE     = 10;
+    
     private final int BUFFER_SIZE   = 50;
-    private final int PANEL_WIDTH = 1260; // it should be 1280 but, minors 40 to cancel the bias.
-    private final int PANEL_HEIGHT = 960;
+    private final int PANEL_WIDTH   = 1260; // it should be 1280 but, minors 40 to cancel the bias.
+    private final int PANEL_HEIGHT  = 960;
     private final int CANVAS_WIDTH  = 720;
     private final int CANVAS_HEIGHT = 720;
-    private final int LHS_BUFFER    = BUFFER_SIZE;
-    private final int RHS_BUFFER    = BUFFER_SIZE;
-    private final int TOP_BUFFER    = BUFFER_SIZE;
-    private final int BOT_BUFFER    = TOP_BUFFER;
     private boolean horizontalInversion = false;
 
     private double distanceScaleFactor;
@@ -113,8 +108,6 @@ public class CanvasController {
         gc.setGlobalAlpha(0.5);
         fitMarksToCanvas();
         drawGoogleMap();
-
-
         // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
         initializeBoats();
         initializeMarks();
@@ -418,24 +411,24 @@ public class CanvasController {
 
         if (scaleDirection == ScaleDirection.HORIZONTAL) {
             referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, minLonPoint));
-            referencePointX = LHS_BUFFER + distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
+            referencePointX = BUFFER_SIZE + distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
 
             referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, maxLatPoint));
-            referencePointY  = CANVAS_HEIGHT - (TOP_BUFFER + BOT_BUFFER);
+            referencePointY  = CANVAS_HEIGHT - (BUFFER_SIZE + BUFFER_SIZE);
             referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint);
             referencePointY  = referencePointY / 2;
-            referencePointY += TOP_BUFFER;
+            referencePointY += BUFFER_SIZE;
             referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint);
         } else {
-            referencePointY = CANVAS_HEIGHT - BOT_BUFFER;
+            referencePointY = CANVAS_HEIGHT - BUFFER_SIZE;
 
             referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, minLonPoint));
-            referencePointX  = LHS_BUFFER;
+            referencePointX  = BUFFER_SIZE;
             referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
-            referencePointX += ((CANVAS_WIDTH - (LHS_BUFFER + RHS_BUFFER)) - (minLonToMaxLon * distanceScaleFactor)) / 2;
+            referencePointX += ((CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE)) - (minLonToMaxLon * distanceScaleFactor)) / 2;
         }
         if(horizontalInversion) {
-            referencePointX = CANVAS_WIDTH - RHS_BUFFER - (referencePointX - LHS_BUFFER);
+            referencePointX = CANVAS_WIDTH - BUFFER_SIZE - (referencePointX - BUFFER_SIZE);
         }
     }
 
@@ -456,10 +449,10 @@ public class CanvasController {
             horiAngle = horiAngle - (Math.PI / 2);
         double horiDistance = Math.cos(horiAngle) * Mark.calculateDistance(minLonPoint, maxLonPoint);
 
-        double vertScale = (CANVAS_HEIGHT - (TOP_BUFFER + BOT_BUFFER)) / vertDistance;
+        double vertScale = (CANVAS_HEIGHT - (BUFFER_SIZE + BUFFER_SIZE)) / vertDistance;
 
-        if ((horiDistance * vertScale) > (CANVAS_WIDTH - (RHS_BUFFER + LHS_BUFFER))) {
-            distanceScaleFactor = (CANVAS_WIDTH - (RHS_BUFFER + LHS_BUFFER)) / horiDistance;
+        if ((horiDistance * vertScale) > (CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE))) {
+            distanceScaleFactor = (CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE)) / horiDistance;
             scaleDirection = ScaleDirection.HORIZONTAL;
         } else {
             distanceScaleFactor = vertScale;
@@ -497,7 +490,7 @@ public class CanvasController {
             yAxisLocation += (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
         }
         if(horizontalInversion) {
-            xAxisLocation = CANVAS_WIDTH - RHS_BUFFER - (xAxisLocation - LHS_BUFFER);
+            xAxisLocation = CANVAS_WIDTH - BUFFER_SIZE - (xAxisLocation - BUFFER_SIZE);
         }
         return new Point2D(xAxisLocation, yAxisLocation);
     }
diff --git a/src/main/java/seng302/controllers/RaceController.java b/src/main/java/seng302/controllers/RaceController.java
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java
index 22e5dd1b..5fe0036c 100644
--- a/src/main/java/seng302/controllers/StartScreenController.java
+++ b/src/main/java/seng302/controllers/StartScreenController.java
@@ -12,7 +12,6 @@ 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;
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 3e97df5e..b50cd155 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -1,13 +1,9 @@
 package seng302.models;
 
-import javafx.event.EventHandler;
 import javafx.geometry.Point2D;
 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.paint.Paint;
 import javafx.scene.shape.Line;
 import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
diff --git a/src/main/java/seng302/models/Colors.java b/src/main/java/seng302/models/Colors.java
index 8d1b9c25..0078e505 100644
--- a/src/main/java/seng302/models/Colors.java
+++ b/src/main/java/seng302/models/Colors.java
@@ -3,7 +3,7 @@ package seng302.models;
 import javafx.scene.paint.Color;
 
 /**
- * Created by ryan_ on 16/03/2017.
+ * Enum for randomly generating colours.
  */
 public enum Colors {
     RED, PERU, SEAGREEN, GREEN, BLUE, PURPLE;
diff --git a/src/main/java/seng302/models/Event.java b/src/main/java/seng302/models/Event.java
index 80f688c7..325afdf0 100644
--- a/src/main/java/seng302/models/Event.java
+++ b/src/main/java/seng302/models/Event.java
@@ -92,7 +92,6 @@ public class Event {
         if (this.isFinishingEvent) {
             return (this.getTimeString() + ", " + this.getBoat().getBoatName() + " finished the race");
         }
-//        System.out.println(this.getDistanceBetweenMarks());
         return (this.getTimeString() + ", " + this.getBoat().getBoatName() + " passed " + this.mark1.getName() + " going heading " + this.getBoatHeading() + "°");
     }
 
diff --git a/src/main/java/seng302/models/Leg.java b/src/main/java/seng302/models/Leg.java
deleted file mode 100644
index 8f21a6ea..00000000
--- a/src/main/java/seng302/models/Leg.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package seng302.models;
-
-import seng302.models.mark.SingleMark;
-
-/**
-* Represents the leg of a race.
-*/
-public class Leg {
-    private int heading;
-    private int distance;
-    private boolean isFinishingLeg;
-    private SingleMark startingSingleMark;
-
-    /**
-     * Create a new leg
-     *
-     * @param heading,  the magnetic heading of this leg
-     * @param distance, the total distance of this leg in meters
-     * @param singleMark,   the singleMark this leg starts on
-     */
-    public Leg(int heading, int distance, SingleMark singleMark) {
-        this.heading = heading;
-        this.distance = distance;
-        this.startingSingleMark = singleMark;
-        this.isFinishingLeg = false;
-    }
-
-    /**
-     * Create a new leg
-     *
-     * @param heading,    the magnetic heading of this leg
-     * @param distance,   the total distance of this leg in meters
-     * @param markerName, the name of the marker this leg starts on
-     */
-    public Leg(int heading, int distance, String markerName) {
-        this.heading = heading;
-        this.distance = distance;
-        this.startingSingleMark = new SingleMark(markerName);
-        this.isFinishingLeg = false;
-    }
-
-    /**
-     * Get the heading of this leg
-     * @return int
-     */
-    public int getHeading() {
-        return this.heading;
-    }
-
-    /**
-     * Set the heading for this leg
-     * @param heading
-     */
-    public void setHeading(int heading) {
-        this.heading = heading;
-    }
-
-    /**
-     * Get the total distance of this leg in meters
-     * @return int
-     */
-    public int getDistance() {
-        return this.distance;
-    }
-
-    /**
-     * Set the distance of this leg in meters
-     * @param distance
-     */
-    public void setDistance(int distance) {
-        this.distance = distance;
-    }
-
-    /**
-     * Returns the marker this leg started on
-     * @return SingleMark
-     */
-    public SingleMark getMarker() {
-        return this.startingSingleMark;
-    }
-
-    /**
-     * Set the singleMark this leg starts on
-     * @param singleMark
-     */
-    public void setMarker(SingleMark singleMark) {
-        this.startingSingleMark = singleMark;
-    }
-
-    /**
-     * Returns the name of the marker this leg started on
-     * @return String
-     */
-    public String getMarkerLabel() {
-        return this.startingSingleMark.getName();
-    }
-
-
-
-    /**
-     * Specify whether or not the race finishes on this leg
-     *
-     * @param isFinishingLeg whether or not the race finishes on this leg
-     */
-    public void setFinishingLeg(boolean isFinishingLeg) {
-        this.isFinishingLeg = isFinishingLeg;
-    }
-
-    /**
-     * Returns whether or not the race finishes after this leg
-     * @return true if this the race finishes after this leg
-     */
-    public boolean getIsFinishingLeg() {
-        return this.isFinishingLeg;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/seng302/models/TimelineInfo.java b/src/main/java/seng302/models/TimelineInfo.java
deleted file mode 100644
index 867ce67b..00000000
--- a/src/main/java/seng302/models/TimelineInfo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package seng302.models;
-
-import javafx.animation.Timeline;
-import javafx.beans.property.DoubleProperty;
-
-
-/**
- * Created by zyt10 on 17/03/17.
- * this class is literally just to associate a timeline with a DoubleProperty x and y
- */
-public class TimelineInfo {
-    private Timeline timeline;
-    private DoubleProperty x;
-    private DoubleProperty y;
-
-    public TimelineInfo(Timeline timeline, DoubleProperty x, DoubleProperty y) {
-        this.timeline = timeline;
-        this.x = x;
-        this.y = y;
-    }
-
-    public Timeline getTimeline() {
-        return timeline;
-    }
-    public DoubleProperty getX() {
-        return x;
-    }
-    public DoubleProperty getY() {
-        return y;
-    }
-}
diff --git a/src/main/java/seng302/models/mark/Mark.java b/src/main/java/seng302/models/mark/Mark.java
index 1ca1f608..acb61ea1 100644
--- a/src/main/java/seng302/models/mark/Mark.java
+++ b/src/main/java/seng302/models/mark/Mark.java
@@ -14,10 +14,11 @@ public abstract class Mark {
 
     /**
      * Create a mark instance by passing its name and type
+     *
      * @param name the name of the mark
      * @param markType the type of mark. either GATE_MARK or SINGLE_MARK.
      */
-    public Mark (String name, MarkType markType, int id) {
+    public Mark(String name, MarkType markType, int id) {
         this.name = name;
         this.markType = markType;
         this.id = id;
@@ -47,20 +48,24 @@ public abstract class Mark {
     }
 
     /**
-     * Calculate the heading in radians from geographical location with latitude1, longitude 1 to geographical
-     * latitude2, longitude 2
+     * Calculate the heading in radians from geographical location with latitude1, longitude 1 to
+     * geographical latitude2, longitude 2
+     *
      * @param longitude1 Longitude of first point in degrees
      * @param longitude2 Longitude of second point in degrees
-     * @param latitude1  Latitude of first point in degrees
+     * @param latitude1 Latitude of first point in degrees
      * @param latitude2 Latitude of first  point in degrees
      * @return Heading in radians
      */
-    public static double calculateHeadingRad (Double latitude1, Double longitude1, Double latitude2, Double longitude2) {
+    public static double calculateHeadingRad(Double latitude1, Double longitude1, Double latitude2,
+        Double longitude2) {
         latitude1 = Math.toRadians(latitude1);
         latitude2 = Math.toRadians(latitude2);
-        Double longDiff= Math.toRadians(longitude2-longitude1);
-        Double y = Math.sin(longDiff)*Math.cos(latitude2);
-        Double x = Math.cos(latitude1)*Math.sin(latitude2)-Math.sin(latitude1)*Math.cos(latitude2)*Math.cos(longDiff);
+        Double longDiff = Math.toRadians(longitude2 - longitude1);
+        Double y = Math.sin(longDiff) * Math.cos(latitude2);
+        Double x =
+            Math.cos(latitude1) * Math.sin(latitude2) - Math.sin(latitude1) * Math.cos(latitude2)
+                * Math.cos(longDiff);
         return Math.atan2(y, x);
     }
 
@@ -80,33 +85,35 @@ public abstract class Mark {
     }
 
     /**
-     * Calculate the distance in meters from geographical location with latitude1, longitude 1 to geographical
-     * latitude2, longitude 2
+     * Calculate the distance in meters from geographical location with latitude1, longitude 1 to
+     * geographical latitude2, longitude 2
      *
      * @param longitude1 Longitude of first point in degrees
      * @param longitude2 Longitude of second point in degrees
-     * @param latitude1  Latitude of first point in degrees
+     * @param latitude1 Latitude of first point in degrees
      * @param latitude2 Latitude of first  point in degrees
      * @return Distance in meters
      */
-    public static Double calculateDistance (Double latitude1, Double longitude1, Double latitude2, Double longitude2) {
+    public static Double calculateDistance(Double latitude1, Double longitude1, Double latitude2,
+        Double longitude2) {
         Double theta = longitude1 - longitude2;
         Double dist = Math.sin(Math.toRadians(latitude1)) * Math.sin(Math.toRadians(latitude2)) +
-                Math.cos(Math.toRadians(latitude1)) * Math.cos(Math.toRadians(latitude2)) *
-                        Math.cos(Math.toRadians(theta));
+            Math.cos(Math.toRadians(latitude1)) * Math.cos(Math.toRadians(latitude2)) *
+                Math.cos(Math.toRadians(theta));
         dist = Math.acos(dist);
         dist = Math.toDegrees(dist);
-        dist = dist * 60 * 1.1508; //nautical mile (distance between two degrees) * (degrees in a minute)
+        dist = dist * 60
+            * 1.1508; //nautical mile (distance between two degrees) * (degrees in a minute)
         dist = dist * 1609.344;    //ratio of miles to metres
         return dist;
     }
-    
+
     public String getName() {
         return name;
     }
 
     public void setName(String name) {
-            this.name = name;
+        this.name = name;
     }
 
     public MarkType getMarkType() {
diff --git a/src/main/java/seng302/models/mark/MarkGroup.java b/src/main/java/seng302/models/mark/MarkGroup.java
index c87ae174..661f45de 100644
--- a/src/main/java/seng302/models/mark/MarkGroup.java
+++ b/src/main/java/seng302/models/mark/MarkGroup.java
@@ -9,7 +9,7 @@ import javafx.scene.shape.Circle;
 import javafx.scene.shape.Line;
 
 /**
- * Created by CJIRWIN on 26/04/2017.
+ * Grouping of javaFX objects needed to represent a Mark on screen.
  */
 public class MarkGroup extends Group {
 
diff --git a/src/main/java/seng302/models/mark/MarkType.java b/src/main/java/seng302/models/mark/MarkType.java
index 4ac6a9e3..92b3c93b 100644
--- a/src/main/java/seng302/models/mark/MarkType.java
+++ b/src/main/java/seng302/models/mark/MarkType.java
@@ -5,5 +5,5 @@ package seng302.models.mark;
  * Created by Haoming Yin (hyi25) on 17/3/17.
  */
 public enum MarkType {
-    SINGLE_MARK, OPEN_GATE, CLOSED_GATE
+    SINGLE_MARK, OPEN_GATE
 }
diff --git a/src/main/java/seng302/models/stream/StreamParser.java b/src/main/java/seng302/models/stream/StreamParser.java
index f800379c..15b45237 100644
--- a/src/main/java/seng302/models/stream/StreamParser.java
+++ b/src/main/java/seng302/models/stream/StreamParser.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.TreeMap;
@@ -31,69 +32,65 @@ import seng302.models.stream.packets.StreamPacket;
  * 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{
+public class StreamParser extends Thread {
 
-     public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> markPositions = new ConcurrentHashMap<>();
-     public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatPositions = new ConcurrentHashMap<>();
-     private String threadName;
-     private Thread t;
-     private static boolean newRaceXmlReceived = false;
-     private static boolean raceStarted = false;
-     private static XMLParser xmlObject;
-     private static boolean raceFinished = false;
-     private static boolean streamStatus = false;
-     private static long timeSinceStart = -1;
-     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;
-     private static boolean appRunning;
+    public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> markPositions = new ConcurrentHashMap<>();
+    public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatPositions = new ConcurrentHashMap<>();
+    private String threadName;
+    private Thread t;
+    private static boolean newRaceXmlReceived = false;
+    private static boolean raceStarted = false;
+    private static XMLParser xmlObject;
+    private static boolean raceFinished = false;
+    private static boolean streamStatus = false;
+    private static long timeSinceStart = -1;
+    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;
+    private static boolean appRunning;
 
     /**
      * Used to initialise the thread name and stream parser object so a thread can be executed
      *
      * @param threadName name of the thread
      */
-     public StreamParser(String threadName){
-         this.threadName = threadName;
-     }
+    public StreamParser(String threadName) {
+        this.threadName = threadName;
+    }
 
     /**
-     * Used to within threading so when the stream parser thread runs, it will keep looking for a packet to
-     * process until it is unable to find anymore packets
-     *
+     * Used to within threading so when the stream parser thread runs, it will keep looking for a
+     * packet to process until it is unable to find anymore packets
      */
-    public void run(){
+    public void run() {
         appRunning = true;
-         try {
-             System.out.println("[CLIENT] Start of stream");
-             streamStatus = true;
-             xmlObject = new XMLParser();
-             while (StreamReceiver.packetBuffer == null || StreamReceiver.packetBuffer.size() < 1) {
-                 Thread.sleep(1);
-             }
-             while (appRunning){
-                 StreamPacket packet = StreamReceiver.packetBuffer.take();
-                 parsePacket(packet);
-                 Thread.sleep(1);
-                 while (StreamReceiver.packetBuffer.peek() == null) {
-                 }
-             }
-         } catch (Exception e){
-             e.printStackTrace();
-         }
-     }
+        try {
+            streamStatus = true;
+            xmlObject = new XMLParser();
+            while (StreamReceiver.packetBuffer == null || StreamReceiver.packetBuffer.size() < 1) {
+                Thread.sleep(1);
+            }
+            while (appRunning) {
+                StreamPacket packet = StreamReceiver.packetBuffer.take();
+                parsePacket(packet);
+                Thread.sleep(1);
+                while (StreamReceiver.packetBuffer.peek() == null) {
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     /**
      * Used to start the stream parser thread when multithreading
-     *
      */
-    public void start () {
-        System.out.println("[CLIENT] Starting " +  threadName );
+    public void start() {
         if (t == null) {
-            t = new Thread (this, threadName);
-            t.start ();
+            t = new Thread(this, threadName);
+            t.start();
         }
     }
 
@@ -103,55 +100,53 @@ public class StreamParser extends Thread{
      *
      * @param packet the packet to be looked at and processed
      */
-     private static void parsePacket(StreamPacket packet) {
-         try{
-             switch (packet.getType()){
-                 case HEARTBEAT:
-                     extractHeartBeat(packet);
-                     break;
-                 case RACE_STATUS:
-                     extractRaceStatus(packet);
-                     break;
-                 case DISPLAY_TEXT_MESSAGE:
-                     extractDisplayMessage(packet);
-                     break;
-                 case XML_MESSAGE:
-                     newRaceXmlReceived = true;
-                     extractXmlMessage(packet);
-                     break;
-                 case RACE_START_STATUS:
-                     extractRaceStartStatus(packet);
-                     break;
-                 case YACHT_EVENT_CODE:
-                     extractYachtEventCode(packet);
-                     break;
-                 case YACHT_ACTION_CODE:
-                     extractYachtActionCode(packet);
-                     break;
-                 case CHATTER_TEXT:
-                     extractChatterText(packet);
-                     break;
-                 case BOAT_LOCATION:
-                     extractBoatLocation(packet);
-                     break;
-                 case MARK_ROUNDING:
-                     extractMarkRounding(packet);
-                     break;
-                 case COURSE_WIND:
-                     extractCourseWind(packet);
-                     break;
-                 case AVG_WIND:
-                     extractAvgWind(packet);
-                     break;
-                 default:
-                     break;
-                 //System.out.println(packet.getType().toString());
-             }
-         }
-         catch (NullPointerException e){
-             System.out.println("Error parsing packet");
-         }
-     }
+    private static void parsePacket(StreamPacket packet) {
+        try {
+            switch (packet.getType()) {
+                case HEARTBEAT:
+                    extractHeartBeat(packet);
+                    break;
+                case RACE_STATUS:
+                    extractRaceStatus(packet);
+                    break;
+                case DISPLAY_TEXT_MESSAGE:
+                    extractDisplayMessage(packet);
+                    break;
+                case XML_MESSAGE:
+                    newRaceXmlReceived = true;
+                    extractXmlMessage(packet);
+                    break;
+                case RACE_START_STATUS:
+                    extractRaceStartStatus(packet);
+                    break;
+                case YACHT_EVENT_CODE:
+                    extractYachtEventCode(packet);
+                    break;
+                case YACHT_ACTION_CODE:
+                    extractYachtActionCode(packet);
+                    break;
+                case CHATTER_TEXT:
+                    extractChatterText(packet);
+                    break;
+                case BOAT_LOCATION:
+                    extractBoatLocation(packet);
+                    break;
+                case MARK_ROUNDING:
+                    extractMarkRounding(packet);
+                    break;
+                case COURSE_WIND:
+                    extractCourseWind(packet);
+                    break;
+                case AVG_WIND:
+                    extractAvgWind(packet);
+                    break;
+                default:
+                    break;
+            }
+        } catch (NullPointerException e) {
+            System.out.println("Error parsing packet");
+        }
+    }
 
     /**
      * Extracts the seq num used in the heartbeat packet
@@ -179,42 +174,41 @@ public class StreamParser extends Thread{
     }
 
     /**
-     * Extracts the useful race status data from race status type packets. This method will also print to the
-     * console the current state of the race (if it has started/finished or is about to start), along side
-     * this it'll also display the amount of time since the race has started or time till it starts
+     * Extracts the useful race status data from race status type packets. This method will also
+     * print to the console the current state of the race (if it has started/finished or is about to
+     * start), along side this it'll also display the amount of time since the race has started or
+     * time till it starts
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractRaceStatus(StreamPacket packet){
+    private static void extractRaceStatus(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
-        long currentTime = bytesToLong(Arrays.copyOfRange(payload,1,7));
-        long raceId = bytesToLong(Arrays.copyOfRange(payload,7,11));
+        long currentTime = bytesToLong(Arrays.copyOfRange(payload, 1, 7));
+        long raceId = bytesToLong(Arrays.copyOfRange(payload, 7, 11));
         int raceStatus = payload[11];
-        long expectedStartTime = bytesToLong(Arrays.copyOfRange(payload,12,18));
-        long windDir = bytesToLong(Arrays.copyOfRange(payload,18,20));
-        long windSpeed = bytesToLong(Arrays.copyOfRange(payload,20,22));
+        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()));
-            currentTimeString = format.format((new Date (currentTime)).getTime());
+            currentTimeString = format.format((new Date(currentTime)).getTime());
         }
-        long timeTillStart = ((new Date (expectedStartTime)).getTime() - (new Date (currentTime)).getTime())/1000;
+        long timeTillStart =
+            ((new Date(expectedStartTime)).getTime() - (new Date(currentTime)).getTime()) / 1000;
 
         if (timeTillStart > 0) {
             timeSinceStart = timeTillStart;
-            //System.out.println("Time till start: " + timeTillStart + " Seconds");
         } else {
-            if (raceStatus == 4 || raceStatus == 8){
+            if (raceStatus == 4 || raceStatus == 8) {
                 raceFinished = true;
                 raceStarted = false;
-                System.out.println("[CLIENT] Race has finished");
-            } else if (!raceStarted){
+            } else if (!raceStarted) {
                 raceStarted = true;
                 raceFinished = false;
-                System.out.println("[CLIENT] Race has started");
             }
             timeSinceStart = timeTillStart;
         }
@@ -225,18 +219,20 @@ public class StreamParser extends Thread{
         int noBoats = payload[22];
         int raceType = payload[23];
         boatsPos = new TreeMap<>();
-        for (int i = 0; i < noBoats; i++){
-            long boatStatusSourceID = bytesToLong(Arrays.copyOfRange(payload,24 + (i * 20),28+ (i * 20)));
+        for (int i = 0; i < noBoats; i++) {
+            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[30 + (i * 20)]);
-            boat.setPenaltiesServed((int)payload[31 + (i * 20)]);
-            Long estTimeAtNextMark = bytesToLong(Arrays.copyOfRange(payload,32 + (i * 20),38+ (i * 20)));
+            boat.setBoatStatus((int) payload[28 + (i * 20)]);
+            boat.setLegNumber((int) payload[29 + (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,38 + (i * 20),44+ (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;
 //            boatStatus += "\nBoat Status: " + (int)payload[28 + (i * 20)];
 //            boatStatus += "\nLegNumber: " + (int)payload[29 + (i * 20)];
@@ -264,15 +260,16 @@ public class StreamParser extends Thread{
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractDisplayMessage(StreamPacket packet){
+    private static void extractDisplayMessage(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
         int numOfLines = payload[3];
         int totalLen = 0;
-        for (int i = 0; i < numOfLines; i++){
+        for (int i = 0; i < numOfLines; i++) {
             int lineNum = payload[4 + totalLen];
             int textLength = payload[5 + totalLen];
-            byte[] messageTextBytes = Arrays.copyOfRange(payload,6 + totalLen,6 + textLength + totalLen);
+            byte[] messageTextBytes = Arrays
+                .copyOfRange(payload, 6 + totalLen, 6 + textLength + totalLen);
             String messageText = new String(messageTextBytes);
             totalLen += 2 + textLength;
         }
@@ -283,13 +280,14 @@ public class StreamParser extends Thread{
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractXmlMessage(StreamPacket packet){
+    private static void extractXmlMessage(StreamPacket packet) {
 
         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();
+        long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
+        String xmlMessage = new String(
+            (Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -318,12 +316,12 @@ public class StreamParser extends Thread{
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractRaceStartStatus(StreamPacket packet){
+    private static void extractRaceStartStatus(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
-        long timeStamp = bytesToLong(Arrays.copyOfRange(payload,1,7));
-        long raceStartTime = bytesToLong(Arrays.copyOfRange(payload,9,15));
-        long raceId = bytesToLong(Arrays.copyOfRange(payload,15,19));
+        long timeStamp = bytesToLong(Arrays.copyOfRange(payload, 1, 7));
+        long raceStartTime = bytesToLong(Arrays.copyOfRange(payload, 9, 15));
+        long raceId = bytesToLong(Arrays.copyOfRange(payload, 15, 19));
         int notificationType = payload[19];
     }
 
@@ -333,28 +331,28 @@ public class StreamParser extends Thread{
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractYachtEventCode(StreamPacket packet){
+    private static void extractYachtEventCode(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
-        long timeStamp = bytesToLong(Arrays.copyOfRange(payload,1,7));
-        long raceId = bytesToLong(Arrays.copyOfRange(payload,9,13));
-        long subjectId = bytesToLong(Arrays.copyOfRange(payload,13,17));
-        long incidentId = bytesToLong(Arrays.copyOfRange(payload,17,21));
+        long timeStamp = bytesToLong(Arrays.copyOfRange(payload, 1, 7));
+        long raceId = bytesToLong(Arrays.copyOfRange(payload, 9, 13));
+        long subjectId = bytesToLong(Arrays.copyOfRange(payload, 13, 17));
+        long incidentId = bytesToLong(Arrays.copyOfRange(payload, 17, 21));
         int eventId = payload[21];
     }
 
     /**
-     * When a yacht action occurs this will parse the parse the byte array to retrieve the necessary info,
-     * currently unused
+     * When a yacht action occurs this will parse the parse the byte array to retrieve the necessary
+     * info, currently unused
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractYachtActionCode(StreamPacket packet){
+    private static void extractYachtActionCode(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
-        long timeStamp = bytesToLong(Arrays.copyOfRange(payload,1,7));
-        long subjectId = bytesToLong(Arrays.copyOfRange(payload,9,13));
-        long incidentId = bytesToLong(Arrays.copyOfRange(payload,13,17));
+        long timeStamp = bytesToLong(Arrays.copyOfRange(payload, 1, 7));
+        long subjectId = bytesToLong(Arrays.copyOfRange(payload, 9, 13));
+        long incidentId = bytesToLong(Arrays.copyOfRange(payload, 13, 17));
         int eventId = payload[17];
     }
 
@@ -363,51 +361,54 @@ public class StreamParser extends Thread{
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractChatterText(StreamPacket packet){
+    private static void extractChatterText(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
         int messageType = payload[1];
         int length = payload[2];
-        String message = new String(Arrays.copyOfRange(payload,3,3 + length));
+        String message = new String(Arrays.copyOfRange(payload, 3, 3 + length));
     }
 
     /**
-     * Used to breakdown the boatlocation packets so the boat coordinates, id and groundspeed are all used
-     * All the other extra data is still being read and translated however is unused.
+     * Used to breakdown the boatlocation packets so the boat coordinates, id and groundspeed are
+     * all used All the other extra data is still being read and translated however is unused.
      *
      * @param packet Packet parsed in to use the payload
      */
-    private static void extractBoatLocation(StreamPacket packet){
+    private static void extractBoatLocation(StreamPacket packet) {
         byte[] payload = packet.getPayload();
 
-        int deviceType = (int)payload[15];
-        long timeValid = bytesToLong(Arrays.copyOfRange(payload,1,7));
-        long seq = bytesToLong(Arrays.copyOfRange(payload,11,15));
-        long boatId = bytesToLong(Arrays.copyOfRange(payload,7,11));
-        long rawLat = bytesToLong(Arrays.copyOfRange(payload,16,20));
-        long rawLon = bytesToLong(Arrays.copyOfRange(payload,20,24));
+        int deviceType = (int) payload[15];
+        long timeValid = bytesToLong(Arrays.copyOfRange(payload, 1, 7));
+        long seq = bytesToLong(Arrays.copyOfRange(payload, 11, 15));
+        long boatId = bytesToLong(Arrays.copyOfRange(payload, 7, 11));
+        long rawLat = bytesToLong(Arrays.copyOfRange(payload, 16, 20));
+        long rawLon = bytesToLong(Arrays.copyOfRange(payload, 20, 24));
         //Converts the double to a usable lat/lon
-        double lat = ((180d * (double)rawLat)/Math.pow(2,31));
-        double lon = ((180d *(double)rawLon)/Math.pow(2,31));
-        long heading = bytesToLong(Arrays.copyOfRange(payload,28,30));
-        double groundSpeed = bytesToLong(Arrays.copyOfRange(payload,38,40))/1000.0;
+        double lat = ((180d * (double) rawLat) / Math.pow(2, 31));
+        double lon = ((180d * (double) rawLon) / Math.pow(2, 31));
+        long heading = bytesToLong(Arrays.copyOfRange(payload, 28, 30));
+        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){
-            BoatPositionPacket boatPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, heading, groundSpeed);
+        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<>(256, new Comparator<BoatPositionPacket>() {
-                    @Override
-                    public int compare(BoatPositionPacket p1, BoatPositionPacket p2) {
-                        return (int) (p1.getTimeValid() - p2.getTimeValid());
-                    }
-                }));
+            if (!boatPositions.containsKey(boatId)) {
+                boatPositions.put(boatId,
+                    new PriorityBlockingQueue<>(256, new Comparator<BoatPositionPacket>() {
+                        @Override
+                        public int compare(BoatPositionPacket p1, BoatPositionPacket p2) {
+                            return (int) (p1.getTimeValid() - p2.getTimeValid());
+                        }
+                    }));
             }
             boatPositions.get(boatId).put(boatPacket);
-        } else if (deviceType == 3){
-            BoatPositionPacket markPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, heading, groundSpeed);
+        } else if (deviceType == 3) {
+            BoatPositionPacket markPacket = new BoatPositionPacket(boatId, timeValid, lat, lon,
+                heading, groundSpeed);
 
             //add a new priority que to the boatPositions HashMap
             if (!markPositions.containsKey(boatId)) {
@@ -428,19 +429,19 @@ public class StreamParser extends Thread{
      *
      * @param packet The packet containing the payload
      */
-    private static void extractMarkRounding(StreamPacket packet){
+    private static void extractMarkRounding(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
-        long timeStamp = bytesToLong(Arrays.copyOfRange(payload,1,7));
-        long raceId = bytesToLong(Arrays.copyOfRange(payload,9,13));
-        long subjectId = bytesToLong(Arrays.copyOfRange(payload,13,17));
+        long timeStamp = bytesToLong(Arrays.copyOfRange(payload, 1, 7));
+        long raceId = bytesToLong(Arrays.copyOfRange(payload, 9, 13));
+        long subjectId = bytesToLong(Arrays.copyOfRange(payload, 13, 17));
         int boatStatus = payload[17];
         int roundingSide = payload[18];
         int markType = payload[19];
         int markId = payload[20];
 
         // assign mark rounding time to boat
-        boats.get((int)subjectId).setMarkRoundingTime(timeStamp);
+        boats.get((int) subjectId).setMarkRoundingTime(timeStamp);
     }
 
     /**
@@ -448,21 +449,29 @@ public class StreamParser extends Thread{
      *
      * @param packet The packet containing the payload
      */
-    private static void extractCourseWind(StreamPacket packet){
+    private static void extractCourseWind(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
         int selectedWindId = payload[1];
         int loopCount = payload[2];
         ArrayList<String> windInfo = new ArrayList<>();
-        for (int i = 0; i < loopCount; i++){
+        for (int i = 0; i < loopCount; i++) {
             String wind = "WindId: " + payload[3 + (20 * i)];
-            wind += "\nTime: " + bytesToLong(Arrays.copyOfRange(payload,4 + (20 * i),10 + (20 * i)));
-            wind += "\nRaceId: " + bytesToLong(Arrays.copyOfRange(payload,10 + (20 * i),14 + (20 * i)));
-            wind += "\nWindDirection: " + bytesToLong(Arrays.copyOfRange(payload,14 + (20 * i),16 + (20 * i)));
-            wind += "\nWindSpeed: " + bytesToLong(Arrays.copyOfRange(payload,16 + (20 * i),18 + (20 * i)));
-            wind += "\nBestUpWindAngle: " + bytesToLong(Arrays.copyOfRange(payload,18 + (20 * i),20 + (20 * i)));
-            wind += "\nBestDownWindAngle: " + bytesToLong(Arrays.copyOfRange(payload,20 + (20 * i),22 + (20 * i)));
-            wind += "\nFlags: " + String.format("%8s", Integer.toBinaryString(payload[22 + (20 * i)] & 0xFF)).replace(' ', '0');
+            wind +=
+                "\nTime: " + bytesToLong(Arrays.copyOfRange(payload, 4 + (20 * i), 10 + (20 * i)));
+            wind += "\nRaceId: " + bytesToLong(
+                Arrays.copyOfRange(payload, 10 + (20 * i), 14 + (20 * i)));
+            wind += "\nWindDirection: " + bytesToLong(
+                Arrays.copyOfRange(payload, 14 + (20 * i), 16 + (20 * i)));
+            wind += "\nWindSpeed: " + bytesToLong(
+                Arrays.copyOfRange(payload, 16 + (20 * i), 18 + (20 * i)));
+            wind += "\nBestUpWindAngle: " + bytesToLong(
+                Arrays.copyOfRange(payload, 18 + (20 * i), 20 + (20 * i)));
+            wind += "\nBestDownWindAngle: " + bytesToLong(
+                Arrays.copyOfRange(payload, 20 + (20 * i), 22 + (20 * i)));
+            wind += "\nFlags: " + String
+                .format("%8s", Integer.toBinaryString(payload[22 + (20 * i)] & 0xFF))
+                .replace(' ', '0');
             windInfo.add(wind);
         }
     }
@@ -472,18 +481,18 @@ public class StreamParser extends Thread{
      *
      * @param packet The packet containing the paylaod
      */
-    private static void extractAvgWind(StreamPacket packet){
+    private static void extractAvgWind(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
-        long timeStamp = bytesToLong(Arrays.copyOfRange(payload,1,7));
-        long rawPeriod = bytesToLong(Arrays.copyOfRange(payload,7,9));
-        long rawSamplePeriod = bytesToLong(Arrays.copyOfRange(payload,9,11));
-        long period2 = bytesToLong(Arrays.copyOfRange(payload,11,13));
-        long speed2 = bytesToLong(Arrays.copyOfRange(payload,13,15));
-        long period3 = bytesToLong(Arrays.copyOfRange(payload,15,17));
-        long speed3 = bytesToLong(Arrays.copyOfRange(payload,17,19));
-        long period4 = bytesToLong(Arrays.copyOfRange(payload,19,21));
-        long speed4 = bytesToLong(Arrays.copyOfRange(payload,21,23));
+        long timeStamp = bytesToLong(Arrays.copyOfRange(payload, 1, 7));
+        long rawPeriod = bytesToLong(Arrays.copyOfRange(payload, 7, 9));
+        long rawSamplePeriod = bytesToLong(Arrays.copyOfRange(payload, 9, 11));
+        long period2 = bytesToLong(Arrays.copyOfRange(payload, 11, 13));
+        long speed2 = bytesToLong(Arrays.copyOfRange(payload, 13, 15));
+        long period3 = bytesToLong(Arrays.copyOfRange(payload, 15, 17));
+        long speed3 = bytesToLong(Arrays.copyOfRange(payload, 17, 19));
+        long period4 = bytesToLong(Arrays.copyOfRange(payload, 19, 21));
+        long speed4 = bytesToLong(Arrays.copyOfRange(payload, 21, 23));
     }
 
     /**
@@ -492,11 +501,11 @@ public class StreamParser extends Thread{
      *
      * @return a positive long if there is less than 7 bytes -1 otherwise
      */
-    private static long bytesToLong(byte[] bytes){
+    private static long bytesToLong(byte[] bytes) {
         long partialLong = 0;
         int index = 0;
-        for (byte b: bytes){
-            if (index > 6){
+        for (byte b : bytes) {
+            if (index > 6) {
                 return -1;
             }
             partialLong = partialLong | (b & 0xFFL) << (index * 8);
@@ -596,9 +605,8 @@ public class StreamParser extends Thread{
         return currentTimeLong;
     }
 
-    public static void appClose(){
+    public static void appClose() {
         appRunning = false;
-        System.out.println("[CLIENT] Shutting down stream parser");
     }
 
     /**
@@ -607,8 +615,8 @@ public class StreamParser extends Thread{
      *
      * @return the status of if new xml has been received
      */
-    public static boolean isNewRaceXmlReceived(){
-        if (newRaceXmlReceived){
+    public static boolean isNewRaceXmlReceived() {
+        if (newRaceXmlReceived) {
             newRaceXmlReceived = false;
             return true;
         } else {
diff --git a/src/main/java/seng302/models/stream/StreamReceiver.java b/src/main/java/seng302/models/stream/StreamReceiver.java
index b3303806..b1ddb996 100644
--- a/src/main/java/seng302/models/stream/StreamReceiver.java
+++ b/src/main/java/seng302/models/stream/StreamReceiver.java
@@ -44,7 +44,6 @@ public class StreamReceiver extends Thread {
     }
 
     public void start () {
-        System.out.println("[CLIENT] Starting " +  threadName );
         if (t == null) {
             t = new Thread (this, threadName);
             t.start ();
@@ -155,6 +154,5 @@ public class StreamReceiver extends Thread {
 
     public static void noMoreBytes(){
         moreBytes = false;
-        System.out.println("[CLIENT] Shutting down stream receiver");
     }
 }
diff --git a/src/main/java/seng302/server/ServerThread.java b/src/main/java/seng302/server/ServerThread.java
index 094845ab..98038ea2 100644
--- a/src/main/java/seng302/server/ServerThread.java
+++ b/src/main/java/seng302/server/ServerThread.java
@@ -29,8 +29,6 @@ public class ServerThread implements Runnable, Observer {
         Thread runner = new Thread(this, threadName);
         runner.setDaemon(true);
 
-        serverLog("Spawning Server", 0);
-
         raceSimulator = new Simulator(BOAT_LOCATION_PERIOD);
         raceSimulator.addObserver(this);
         // run race simulator, so it can send boats' static location.
@@ -134,7 +132,6 @@ public class ServerThread implements Runnable, Observer {
      * Starts an instance of the race simulator
      */
     private void startRaceSim(){
-        serverLog("Starting Running Race Simulator", 0);
         // set race started to true, so the simulator will start moving boats
         raceSimulator.setRaceStarted(true);
     }
@@ -142,8 +139,7 @@ public class ServerThread implements Runnable, Observer {
     /**
      * Starts sending heartbeat messages to the client
      */
-    private void startSendingHeartbeats(){
-        serverLog("Sending Heartbeats", 0);
+    private void startSendingHeartbeats() {
         Timer t = new Timer();
 
         t.schedule(new TimerTask() {
@@ -154,7 +150,7 @@ public class ServerThread implements Runnable, Observer {
                 try {
                     server.send(heartbeat);
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, HEARTBEAT_PERIOD);
@@ -174,14 +170,13 @@ public class ServerThread implements Runnable, Observer {
                     if (startTime < System.currentTimeMillis() && !raceStarted){
                         startRaceSim();
                         raceStarted = true;
-                        serverLog("Race Started", 0);
                     }
                     else{
                         server.send(raceStartStatusMessage);
                     }
 
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, RACE_START_STATUS_PERIOD);
@@ -191,7 +186,6 @@ public class ServerThread implements Runnable, Observer {
      * Start sending race start status messages until race starts
      */
     private void startSendingRaceStatusMessages(){
-        serverLog("Sending race status messages", 0);
         Timer t = new Timer();
         t.schedule(new TimerTask() {
             @Override
@@ -199,9 +193,8 @@ public class ServerThread implements Runnable, Observer {
                 Message raceStatusMessage = getRaceStatusMessage();
                 try {
                     server.send(raceStatusMessage);
-
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, RACE_STATUS_PERIOD);
@@ -218,17 +211,12 @@ public class ServerThread implements Runnable, Observer {
 
             if (raceData != null){
                 server.send(raceData);
-                serverLog("Sending race data", 0);
             }
-
             if (boatData != null){
                 server.send(boatData);
-                serverLog("Sending boat data", 0);
             }
-
              if (regatta != null){
                  server.send(regatta);
-                 serverLog("Sending regatta data", 0);
             }
         } catch (IOException e) {
             serverLog("Couldn't send an XML Message: " + e.getMessage(), 0);
@@ -247,7 +235,6 @@ public class ServerThread implements Runnable, Observer {
                     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);
@@ -295,7 +282,7 @@ public class ServerThread implements Runnable, Observer {
                     }
 
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, BOAT_LOCATION_PERIOD);
@@ -322,7 +309,6 @@ public class ServerThread implements Runnable, Observer {
                     numOfBoatsFinished ++;
                     if (!boatsFinished.get(boat.getSourceID())) {
                         boatsFinished.put(boat.getSourceID(), true);
-                        serverLog("Boat " + boat.getSourceID() + " finished the race", 1);
                     }
                 }
                 Message m = new BoatLocationMessage(boat.getSourceID(), 1, boat.getLat(),
diff --git a/src/main/java/seng302/server/StreamingServerSocket.java b/src/main/java/seng302/server/StreamingServerSocket.java
index dc249ea4..35297f9f 100644
--- a/src/main/java/seng302/server/StreamingServerSocket.java
+++ b/src/main/java/seng302/server/StreamingServerSocket.java
@@ -28,7 +28,6 @@ class StreamingServerSocket {
     }
 
     void start(){
-        ServerThread.serverLog("Listening For Connections",0);
         try {
             client = socket.accept();
         } catch (IOException e) {
@@ -39,7 +38,6 @@ class StreamingServerSocket {
         }
         else{
             isServerStarted = true;
-            ServerThread.serverLog("client connected from " + client.socket().getInetAddress(),0);
         }
     }
 
diff --git a/src/main/java/seng302/server/simulator/Simulator.java b/src/main/java/seng302/server/simulator/Simulator.java
index 72d2717a..514ecc25 100644
--- a/src/main/java/seng302/server/simulator/Simulator.java
+++ b/src/main/java/seng302/server/simulator/Simulator.java
@@ -54,7 +54,6 @@ public class Simulator extends Observable implements Runnable {
 					numOfFinishedBoats += moveBoat(boat, lapse);
 				}
 			}
-			//System.out.println(boats.get(0));
 
 			setChanged();
 			notifyObservers(boats);
@@ -65,8 +64,6 @@ public class Simulator extends Observable implements Runnable {
 				e.printStackTrace();
 			}
 		}
-
-		System.out.println("[SERVER] Race simulator has been terminated");
 	}
 
 	/**
diff --git a/src/test/java/seng302/LegTest.java b/src/test/java/seng302/LegTest.java
deleted file mode 100644
index 9bb64b6c..00000000
--- a/src/test/java/seng302/LegTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package seng302;
-
-import org.junit.Test;
-import seng302.models.Leg;
-import seng302.models.mark.SingleMark;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Unit test for the Leg class.
- */
-public class LegTest {
-
-    /**
-     * Test creation of the leg by specifying a string
-     * for the marker label
-     */
-    @Test
-    public void testLegCreationUsingMarkerLabel() {
-        Leg leg = new Leg(010, 100, "SingleMark");
-
-        assertEquals(leg.getHeading(), 010);
-        assertEquals(leg.getDistance(), 100);
-        assertEquals(leg.getMarkerLabel(), "SingleMark");
-        assertEquals(leg.getIsFinishingLeg(), false);
-    }
-
-    /**
-     * Test creation of the leg by providing a
-     * SingleMark object
-     */
-    @Test
-    public void testLegCreation() {
-        Leg leg = new Leg(010, 100, new SingleMark("SingleMark"));
-
-        assertEquals(leg.getHeading(), 010);
-        assertEquals(leg.getDistance(), 100);
-        assertEquals(leg.getMarkerLabel(), "SingleMark");
-        assertEquals(leg.getIsFinishingLeg(), false);
-    }
-
-    /**
-     * Test changing whether or not a
-     * leg is the finishing leg
-     */
-    @Test
-    public void testSetFinishLeg() {
-        Leg leg = new Leg(010, 100, "SingleMark");
-
-        leg.setFinishingLeg(true);
-        assertEquals(leg.getIsFinishingLeg(), true);
-    }
-
-}
diff --git a/src/test/java/seng302/models/stream/StreamReceiverTest.java b/src/test/java/seng302/models/stream/StreamReceiverTest.java
index 4d0bea44..96f89b93 100644
--- a/src/test/java/seng302/models/stream/StreamReceiverTest.java
+++ b/src/test/java/seng302/models/stream/StreamReceiverTest.java
@@ -99,7 +99,7 @@ public class StreamReceiverTest {
             byte[] emptyArray = {};
             assert bytesToLong.invoke(streamReceiver, emptyArray).equals(0L);
         } catch (Exception e){
-            System.out.println("");
+            e.printStackTrace();
         }
     }
 

From adbb9ffe3b26b4abd5ad1676de7fe552b852359b Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Thu, 25 May 2017 10:31:37 +1200
Subject: [PATCH 18/18] Removed completed TODO request.

---
 src/main/java/seng302/controllers/CanvasController.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index b353ab9a..96e719e6 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -137,9 +137,6 @@ public class CanvasController {
                     }
                     raceViewController.updateSparkLine();
                 }
-
-                // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
-                elapsedNanos = 1000 / 60;
                 updateGroups();
                 if (StreamParser.isRaceFinished()) {
                     this.stop();