From 89ef6e5277adc02799d3b370fcc9ca7b347db054 Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Sun, 14 May 2017 17:24:15 +1200
Subject: [PATCH 01/17] Wake calculation now changed to be based off of the
 separation between wakes.

This allows wakes to auto correct their position better and stops the system reliance on "realistic data".
Wakes have several options for behaviour until the ideal settings are decided upon.
Note that MarkGroup position updating is currently disabled.

#implement #refactor #issue[1] #story[923]
---
 src/main/java/seng302/App.java                |   3 +-
 src/main/java/seng302/models/BoatGroup.java   |  24 ++-
 src/main/java/seng302/models/Wake.java        | 143 +++++++++++++-----
 .../java/seng302/models/mark/MarkGroup.java   |  72 ++++-----
 4 files changed, 158 insertions(+), 84 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..4aa14563 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,7 +62,8 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 57dd48db..70b979ff 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -204,25 +204,23 @@ public class BoatGroup extends RaceObject{
                 double dx = newXValue - boatPoly.getLayoutX();
                 double dy = newYValue - boatPoly.getLayoutY();
                 //Check movement is reasonable. Assumes a 1000 * 1000 canvas
-                if (Math.abs(dx) > 50 || Math.abs(dy) > 50) {
-                    dx = 0;
-                    dy = 0;
-                    moveTo(newXValue, newYValue);
-                }
+//                if (Math.abs(dx) > 50 || Math.abs(dy) > 50) {
+//                    dx = 0;
+//                    dy = 0;
+//                    moveTo(newXValue, newYValue);
+//                }
 
                 pixelVelocityX = dx / expectedUpdateInterval;
                 pixelVelocityY = dy / expectedUpdateInterval;
                 rotationalGoal = rotation;
                 calculateRotationalVelocity();
-
-                if (wakeGenerationDelay > 0) {
-                    wake.rotate(rotationalGoal);
-                    rotateTo(rotationalGoal); //Need to test with this removed.
+                if (Math.abs(rotationalVelocity) > 0.075) {
+                    System.out.println("rotationalVelocity = " + rotationalVelocity);
                     rotationalVelocity = 0;
-                    wakeGenerationDelay--;
-                } else {
-                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
+                    rotateTo(rotationalGoal);
+                    wake.rotate(rotationalGoal);
                 }
+                wake.setRotationalVelocity(rotationalVelocity, boat.getVelocity());
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
             } else {
                 setToInitialLocation = true;
@@ -347,7 +345,7 @@ public class BoatGroup extends RaceObject{
                                  App.start() -> Controller.setContentPane -> RaceViewController -> CanvasController
          */
         this.stage = stage;
-        this.stage.iconifiedProperty().addListener(e -> {
+        this.stage.iconifiedProperty().addListener( e -> {
             isMaximized = !stage.isIconified();
             if (!lineStorage.isEmpty()) {
                 lineGroup.getChildren().addAll(lineStorage);
diff --git a/src/main/java/seng302/models/Wake.java b/src/main/java/seng302/models/Wake.java
index 55d4381c..9f6ef621 100644
--- a/src/main/java/seng302/models/Wake.java
+++ b/src/main/java/seng302/models/Wake.java
@@ -4,6 +4,7 @@ import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Arc;
 import javafx.scene.shape.ArcType;
+import javafx.scene.shape.StrokeLineCap;
 import javafx.scene.transform.Rotate;
 
 /**
@@ -15,13 +16,22 @@ import javafx.scene.transform.Rotate;
  */
 class Wake extends Group {
 
-    private int numWakes = 5;
-    private double[] velocities = new double[13];
+    //Wake Settings. Should probably be hard coded in when the final values are decided upon.
+    private enum functionType {LINEAR, LOGARITHMIC, POWER, ROOT, POWOUT_LOGIN}
+    private functionType wakeFunction = functionType.LOGARITHMIC;
+    private ArcType arcType = ArcType.OPEN;
+    private int numWakes = 10;
+    private double offSet = 0;
+    private final double MAX_DIFF = 75.0;
+    private final int UNIFICATION_SPEED = 500;
+    private final int POWER = 2;
+
     private Arc[] arcs = new Arc[numWakes];
+    private double[] rotationalVelocities = new double[numWakes];
     private double[] rotations = new double[numWakes];
-    private int[] velocityIndices = new int[numWakes];
-    private double sum = 0;
-    private static double max;
+    private double baseRad;
+    private boolean spawnNewWake = false;
+    private int count = 10;
 
     /**
      * Create a wake at the given location.
@@ -34,11 +44,22 @@ class Wake extends Group {
         Arc arc;
         for (int i = 0; i < numWakes; i++) {
             //Default triangle is -110 deg out of phase with a default wake and has angle of 40 deg.
-            arc = new Arc(0,0,0,0,-110,40);
-            //Opacity increases from 0.5 -> 0 evenly over the 5 wake arcs.
-            arc.setFill(new Color(0.18, 0.7, 1.0, 1.0 + -0.175 * i));
+            arc = new Arc(0, 0, 0, 0, -110, 40);
+
+            if (arcType == ArcType.ROUND) {
+            arc.setFill(new Color(0.18, 0.7, 1.0, 0.4 + (-0.35 / numWakes * i)));
             arc.setType(ArcType.ROUND);
-            arcs[i] = arc;
+            baseRad = 10;
+
+            } else if (arcType == ArcType.OPEN) {
+                arc.setType(ArcType.OPEN);
+                arc.setStroke(new Color(0.18, 0.7, 1.0, 1.0 + (-0.99 / numWakes * i)));
+                arc.setStrokeWidth(3.0);
+                arc.setStrokeLineCap(StrokeLineCap.ROUND);
+                arc.setFill(new Color(0.0, 0.0, 0.0, 0.0));
+                baseRad = (20 / numWakes);
+                arcs[i] = arc;
+            }
         }
         super.getChildren().addAll(arcs);
     }
@@ -47,38 +68,91 @@ class Wake extends Group {
      * Sets the rotationalVelocity of each arc. Each arc is 3 velocities behind the next smallest arc. The smallest uses
      * the latest given velocity.
      * @param rotationalVelocity The rotationalVelocity the wake should move at.
-     * @param rotationGoal Where the wake will rotate to if the wake is calculated to be on a straight section. This is
-     *                     used to prevent desynchronisation with the Boat polygon.
      * @param velocity The real world velocity of the boat in m/s.
      */
-    void setRotationalVelocity (double rotationalVelocity, double rotationGoal, double velocity) {
-        sum -= Math.abs(velocities[(velocityIndices[0] + 10) % 13]);
-        sum += Math.abs(rotationalVelocity);
-        max = Math.max(max, rotationalVelocity);
-        if (sum < (max / 3))
-            rotate (rotationGoal); //In relatively straight segments the wake snaps to match the boats current position.
-                                   //This stops the wake from eventually becoming out of sync with the boat.
-        //This accounts for rogue rotations that are greater than what would be realistic. Value is kinda rough.
-        //Basically just for our internal mock.
-        if (Math.abs(rotationalVelocity) > 0.05) {
-            rotationalVelocity = 0;
-            rotate(rotationGoal);
+    void setRotationalVelocity (double rotationalVelocity, double velocity) {
+        rotationalVelocities[0] = rotationalVelocity;
+        for (int i = 1; i < numWakes; i++) {
+            double difference = Math.atan2(
+                    Math.sin(
+                            Math.toRadians(
+                                    rotations[i - 1] - rotations[i]
+                            )
+                    ),
+                    Math.cos(
+                            Math.toRadians(
+                                    rotations[i - 1] - rotations[i]
+                            )
+                    )
+            );
+            difference = Math.toDegrees(difference);
+
+            if (wakeFunction == functionType.LOGARITHMIC) {
+                if (rotationalVelocities[i-1] < 0.01 && rotationalVelocities[i-1] > -0.01) {
+                    rotationalVelocities[i] = (MAX_DIFF / numWakes) / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes) * 1.5;
+                    if (difference < 0)
+                    {
+                        rotationalVelocities[i] = -rotationalVelocities[i];
+                    }
+                } else {
+                        rotationalVelocities[i] = rotationalVelocities[i-1] * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes);
+                }
+
+            } else if (wakeFunction == functionType.LINEAR) {
+                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
+                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * 2;
+                } else {
+                    if (difference < (MAX_DIFF / numWakes))
+                        rotationalVelocities[i] = rotationalVelocities[i - 1] * difference / (MAX_DIFF / numWakes);
+                    else
+                        rotationalVelocities[i] = rotationalVelocities[i - 1];
+                }
+            } else if (wakeFunction == functionType.POWER) {
+                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
+                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.pow(difference, POWER) / Math.pow((MAX_DIFF / numWakes), POWER);
+                } else {
+                    if (difference < (MAX_DIFF / numWakes))
+                        rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.pow(difference, POWER) / Math.pow((MAX_DIFF / numWakes), POWER);
+                    else
+                        rotationalVelocities[i] = rotationalVelocities[i - 1];
+                }
+            } else if (wakeFunction == functionType.ROOT) {
+                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
+                    rotationalVelocities[i] = (MAX_DIFF / numWakes) / UNIFICATION_SPEED * Math.sqrt(Math.abs(difference)) / Math.sqrt(MAX_DIFF / numWakes);
+                } else {
+                    if (difference < (MAX_DIFF / numWakes))
+                        rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.sqrt(Math.abs(difference)) / Math.sqrt(MAX_DIFF / numWakes);
+                    else
+                        rotationalVelocities[i] = rotationalVelocities[i - 1];
+                }
+                if (difference < 0)
+                    rotationalVelocities[i] = -rotationalVelocities[i];
+            } else if (wakeFunction == functionType.POWOUT_LOGIN) {
+                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
+                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes);
+                } else {
+                    if (difference < (MAX_DIFF / numWakes))
+                        rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.pow(difference, POWER) / Math.pow((MAX_DIFF / numWakes), POWER);
+                    else
+                        rotationalVelocities[i] = rotationalVelocities[i - 1];
+                }
+            }
+
         }
-        //Update the index of the array of recent velocities that each wake uses. Each wake is 3 velocities behind the
-        //next smallest wake.
-        velocityIndices[0] = (13 + (velocityIndices[0] - 1) % 13) % 13;
-        velocities[velocityIndices[0]] = rotationalVelocity;
-        for (int i = 1; i < numWakes; i++)
-            velocityIndices[i] = (velocityIndices[0] + 3 * i) % 13;
 
         //Scale wakes based on velocity.
-        double baseRad = 20;
-        double rad;
+//        if (count--  == 0)
+//        {
+//            count = 10;
+//            offSet = 0;
+//        } else {
+//            offSet += baseRad / 5;
+//        }
+        double rad = baseRad + velocity + offSet;
         for (Arc arc :arcs) {
-            rad = baseRad + velocity;
             arc.setRadiusX(rad);
             arc.setRadiusY(rad);
-            baseRad += 5 + (velocity / 2);
+            rad += (20 / numWakes) + (velocity / 2);
         }
     }
 
@@ -88,7 +162,7 @@ class Wake extends Group {
      */
     void updatePosition (long timeInterval) {
         for (int i = 0; i < numWakes; i++) {
-            rotations[i] = rotations[i] + velocities[velocityIndices[i]] * timeInterval;
+            rotations[i] = rotations[i] + rotationalVelocities[i] * timeInterval;
             arcs[i].getTransforms().setAll(new Rotate(rotations[i]));
         }
     }
@@ -100,6 +174,7 @@ class Wake extends Group {
     void rotate (double rotation) {
         for (int i = 0; i < arcs.length; i++) {
             rotations[i] = rotation;
+            rotationalVelocities[i] = 0;
             arcs[i].getTransforms().setAll(new Rotate(rotation));
         }
     }
diff --git a/src/main/java/seng302/models/mark/MarkGroup.java b/src/main/java/seng302/models/mark/MarkGroup.java
index 29931e01..a0f12dcc 100644
--- a/src/main/java/seng302/models/mark/MarkGroup.java
+++ b/src/main/java/seng302/models/mark/MarkGroup.java
@@ -126,42 +126,42 @@ public class MarkGroup extends RaceObject {
     }
 
     public void updatePosition (long timeInterval) {
-        Circle markCircle = (Circle) super.getChildren().get(0);
-
-        if (nodePixelVelocitiesX[0] > 0 && markCircle.getCenterX() > nodeDestinations[0].getX() ||
-                nodePixelVelocitiesX[0] < 0 && markCircle.getCenterX() < nodeDestinations[0].getY())
-            nodePixelVelocitiesX[0] = 0;
-        else if (nodePixelVelocitiesX[0] != 0)
-            markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[0] * timeInterval);
-
-        if (nodePixelVelocitiesY[0] > 0 && markCircle.getCenterY() > nodeDestinations[0].getY() ||
-                nodePixelVelocitiesY[0] < 0 && markCircle.getCenterY() < nodeDestinations[0].getY())
-            nodePixelVelocitiesY[0] = 0;
-        else if (nodePixelVelocitiesY[0] != 0)
-            markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[0] * timeInterval);
-
-        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
-
-            Line line = (Line) super.getChildren().get(2);
-            line.setStartX(markCircle.getCenterX());
-            line.setStartY(markCircle.getCenterY());
-
-            markCircle = (Circle) super.getChildren().get(1);
-
-            if (nodePixelVelocitiesX[1] > 0 && markCircle.getCenterX() >= nodeDestinations[1].getX() ||
-                    nodePixelVelocitiesX[1] < 0 && markCircle.getCenterX() <= nodeDestinations[1].getX())
-                nodePixelVelocitiesX[1] = 0;
-            else if (nodePixelVelocitiesX[1] != 0)
-                markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[1] * timeInterval);
-
-            if (nodePixelVelocitiesY[1] > 0 && markCircle.getCenterY() > nodeDestinations[1].getY() ||
-                    nodePixelVelocitiesY[1] < 0 && markCircle.getCenterY() < nodeDestinations[1].getY())
-                nodePixelVelocitiesY[1] = 0;
-            else if (nodePixelVelocitiesY[1] != 0)
-                markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[1] * timeInterval);
-            line.setEndX(markCircle.getCenterX());
-            line.setEndY(markCircle.getCenterY());
-        }
+//        Circle markCircle = (Circle) super.getChildren().get(0);
+//
+//        if (nodePixelVelocitiesX[0] > 0 && markCircle.getCenterX() > nodeDestinations[0].getX() ||
+//                nodePixelVelocitiesX[0] < 0 && markCircle.getCenterX() < nodeDestinations[0].getY())
+//            nodePixelVelocitiesX[0] = 0;
+//        else if (nodePixelVelocitiesX[0] != 0)
+//            markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[0] * timeInterval);
+//
+//        if (nodePixelVelocitiesY[0] > 0 && markCircle.getCenterY() > nodeDestinations[0].getY() ||
+//                nodePixelVelocitiesY[0] < 0 && markCircle.getCenterY() < nodeDestinations[0].getY())
+//            nodePixelVelocitiesY[0] = 0;
+//        else if (nodePixelVelocitiesY[0] != 0)
+//            markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[0] * timeInterval);
+//
+//        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
+//
+//            Line line = (Line) super.getChildren().get(2);
+//            line.setStartX(markCircle.getCenterX());
+//            line.setStartY(markCircle.getCenterY());
+//
+//            markCircle = (Circle) super.getChildren().get(1);
+//
+//            if (nodePixelVelocitiesX[1] > 0 && markCircle.getCenterX() >= nodeDestinations[1].getX() ||
+//                    nodePixelVelocitiesX[1] < 0 && markCircle.getCenterX() <= nodeDestinations[1].getX())
+//                nodePixelVelocitiesX[1] = 0;
+//            else if (nodePixelVelocitiesX[1] != 0)
+//                markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[1] * timeInterval);
+//
+//            if (nodePixelVelocitiesY[1] > 0 && markCircle.getCenterY() > nodeDestinations[1].getY() ||
+//                    nodePixelVelocitiesY[1] < 0 && markCircle.getCenterY() < nodeDestinations[1].getY())
+//                nodePixelVelocitiesY[1] = 0;
+//            else if (nodePixelVelocitiesY[1] != 0)
+//                markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[1] * timeInterval);
+//            line.setEndX(markCircle.getCenterX());
+//            line.setEndY(markCircle.getCenterY());
+//        }
     }
 
     public void moveGroupBy (double x, double y, double rotation) {

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

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

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

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

From 8fbb9d6d4e1d7729f44bf1484aec56252ae5da8b Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Mon, 15 May 2017 15:36:18 +1200
Subject: [PATCH 03/17] Added/improved documentation

#chore
---
 src/main/java/seng302/models/Wake.java        | 35 +++++----
 .../java/seng302/models/mark/MarkGroup.java   | 72 +++++++++----------
 2 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/src/main/java/seng302/models/Wake.java b/src/main/java/seng302/models/Wake.java
index 9f6ef621..94312780 100644
--- a/src/main/java/seng302/models/Wake.java
+++ b/src/main/java/seng302/models/Wake.java
@@ -8,30 +8,29 @@ import javafx.scene.shape.StrokeLineCap;
 import javafx.scene.transform.Rotate;
 
 /**
- * By default wake is a group containing 5 arcs. Each arc starts from the same point. Each arc is larger and more
- * transparent than the last. On calling updatePositions() arcs rotate at velocities given by setRotationalVelocity().
- * The larger and more transparent an arc is the longer the delay before it rotates at the latest velocity. It is
- * assumed that rotationalVelocities() are set regularly as wakes do not stop rotating and an array of velocities needs
- * to be populated for the class to work as expected.
+ * A group containing objects used to represent wakes onscreen. Contains functionality for their animation.
  */
 class Wake extends Group {
 
-    //Wake Settings. Should probably be hard coded in when the final values are decided upon.
+    //Wake Settings.
+    //Changes the relationship between separation of wakes and velocity. Only logarithmic is guaranteed to work always since it's my favourite :/.
     private enum functionType {LINEAR, LOGARITHMIC, POWER, ROOT, POWOUT_LOGIN}
     private functionType wakeFunction = functionType.LOGARITHMIC;
+    //Change the wake style. Currently can be ArcType.OPEN or ArcType.ROUND
     private ArcType arcType = ArcType.OPEN;
+    //The number of wakes
     private int numWakes = 10;
-    private double offSet = 0;
-    private final double MAX_DIFF = 75.0;
+    //The total possible difference between the first wake and the last. Increasing/Decreasing this will make wakes fan out more/less.
+    private final double MAX_DIFF = 75;
+    //Increasing/decreasing this will alter the speed that wakes converge when the heading stop changing. Anything over about 1500 may cause oscillation.
     private final int UNIFICATION_SPEED = 500;
+    //The power used for the power function. Changing this will probably break stuff in a cool way.
     private final int POWER = 2;
 
     private Arc[] arcs = new Arc[numWakes];
     private double[] rotationalVelocities = new double[numWakes];
     private double[] rotations = new double[numWakes];
     private double baseRad;
-    private boolean spawnNewWake = false;
-    private int count = 10;
 
     /**
      * Create a wake at the given location.
@@ -65,8 +64,8 @@ class Wake extends Group {
     }
 
     /**
-     * Sets the rotationalVelocity of each arc. Each arc is 3 velocities behind the next smallest arc. The smallest uses
-     * the latest given velocity.
+     * Sets the rotationalVelocity of each arc.
+     *
      * @param rotationalVelocity The rotationalVelocity the wake should move at.
      * @param velocity The real world velocity of the boat in m/s.
      */
@@ -89,11 +88,11 @@ class Wake extends Group {
 
             if (wakeFunction == functionType.LOGARITHMIC) {
                 if (rotationalVelocities[i-1] < 0.01 && rotationalVelocities[i-1] > -0.01) {
-                    rotationalVelocities[i] = (MAX_DIFF / numWakes) / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes) * 1.5;
-                    if (difference < 0)
-                    {
-                        rotationalVelocities[i] = -rotationalVelocities[i];
-                    }
+                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes) * 1.5;
+//                    if (difference < 0)
+//                    {
+//                        rotationalVelocities[i] = -rotationalVelocities[i];
+//                    }
                 } else {
                         rotationalVelocities[i] = rotationalVelocities[i-1] * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes);
                 }
@@ -148,7 +147,7 @@ class Wake extends Group {
 //        } else {
 //            offSet += baseRad / 5;
 //        }
-        double rad = baseRad + velocity + offSet;
+        double rad = baseRad + velocity;
         for (Arc arc :arcs) {
             arc.setRadiusX(rad);
             arc.setRadiusY(rad);
diff --git a/src/main/java/seng302/models/mark/MarkGroup.java b/src/main/java/seng302/models/mark/MarkGroup.java
index a0f12dcc..29931e01 100644
--- a/src/main/java/seng302/models/mark/MarkGroup.java
+++ b/src/main/java/seng302/models/mark/MarkGroup.java
@@ -126,42 +126,42 @@ public class MarkGroup extends RaceObject {
     }
 
     public void updatePosition (long timeInterval) {
-//        Circle markCircle = (Circle) super.getChildren().get(0);
-//
-//        if (nodePixelVelocitiesX[0] > 0 && markCircle.getCenterX() > nodeDestinations[0].getX() ||
-//                nodePixelVelocitiesX[0] < 0 && markCircle.getCenterX() < nodeDestinations[0].getY())
-//            nodePixelVelocitiesX[0] = 0;
-//        else if (nodePixelVelocitiesX[0] != 0)
-//            markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[0] * timeInterval);
-//
-//        if (nodePixelVelocitiesY[0] > 0 && markCircle.getCenterY() > nodeDestinations[0].getY() ||
-//                nodePixelVelocitiesY[0] < 0 && markCircle.getCenterY() < nodeDestinations[0].getY())
-//            nodePixelVelocitiesY[0] = 0;
-//        else if (nodePixelVelocitiesY[0] != 0)
-//            markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[0] * timeInterval);
-//
-//        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
-//
-//            Line line = (Line) super.getChildren().get(2);
-//            line.setStartX(markCircle.getCenterX());
-//            line.setStartY(markCircle.getCenterY());
-//
-//            markCircle = (Circle) super.getChildren().get(1);
-//
-//            if (nodePixelVelocitiesX[1] > 0 && markCircle.getCenterX() >= nodeDestinations[1].getX() ||
-//                    nodePixelVelocitiesX[1] < 0 && markCircle.getCenterX() <= nodeDestinations[1].getX())
-//                nodePixelVelocitiesX[1] = 0;
-//            else if (nodePixelVelocitiesX[1] != 0)
-//                markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[1] * timeInterval);
-//
-//            if (nodePixelVelocitiesY[1] > 0 && markCircle.getCenterY() > nodeDestinations[1].getY() ||
-//                    nodePixelVelocitiesY[1] < 0 && markCircle.getCenterY() < nodeDestinations[1].getY())
-//                nodePixelVelocitiesY[1] = 0;
-//            else if (nodePixelVelocitiesY[1] != 0)
-//                markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[1] * timeInterval);
-//            line.setEndX(markCircle.getCenterX());
-//            line.setEndY(markCircle.getCenterY());
-//        }
+        Circle markCircle = (Circle) super.getChildren().get(0);
+
+        if (nodePixelVelocitiesX[0] > 0 && markCircle.getCenterX() > nodeDestinations[0].getX() ||
+                nodePixelVelocitiesX[0] < 0 && markCircle.getCenterX() < nodeDestinations[0].getY())
+            nodePixelVelocitiesX[0] = 0;
+        else if (nodePixelVelocitiesX[0] != 0)
+            markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[0] * timeInterval);
+
+        if (nodePixelVelocitiesY[0] > 0 && markCircle.getCenterY() > nodeDestinations[0].getY() ||
+                nodePixelVelocitiesY[0] < 0 && markCircle.getCenterY() < nodeDestinations[0].getY())
+            nodePixelVelocitiesY[0] = 0;
+        else if (nodePixelVelocitiesY[0] != 0)
+            markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[0] * timeInterval);
+
+        if (mainMark.getMarkType() != MarkType.SINGLE_MARK) {
+
+            Line line = (Line) super.getChildren().get(2);
+            line.setStartX(markCircle.getCenterX());
+            line.setStartY(markCircle.getCenterY());
+
+            markCircle = (Circle) super.getChildren().get(1);
+
+            if (nodePixelVelocitiesX[1] > 0 && markCircle.getCenterX() >= nodeDestinations[1].getX() ||
+                    nodePixelVelocitiesX[1] < 0 && markCircle.getCenterX() <= nodeDestinations[1].getX())
+                nodePixelVelocitiesX[1] = 0;
+            else if (nodePixelVelocitiesX[1] != 0)
+                markCircle.setCenterX(markCircle.getCenterX() + nodePixelVelocitiesX[1] * timeInterval);
+
+            if (nodePixelVelocitiesY[1] > 0 && markCircle.getCenterY() > nodeDestinations[1].getY() ||
+                    nodePixelVelocitiesY[1] < 0 && markCircle.getCenterY() < nodeDestinations[1].getY())
+                nodePixelVelocitiesY[1] = 0;
+            else if (nodePixelVelocitiesY[1] != 0)
+                markCircle.setCenterY(markCircle.getCenterY() + nodePixelVelocitiesY[1] * timeInterval);
+            line.setEndX(markCircle.getCenterX());
+            line.setEndY(markCircle.getCenterY());
+        }
     }
 
     public void moveGroupBy (double x, double y, double rotation) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From c63c8e4d73036d4bec453d1c8082c2d5732b8e06 Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Wed, 17 May 2017 16:33:45 +1200
Subject: [PATCH 11/17] Stripped out excess code in Wake class.

---
 src/main/java/seng302/models/BoatGroup.java |  34 +++++--
 src/main/java/seng302/models/Wake.java      | 102 ++++----------------
 2 files changed, 44 insertions(+), 92 deletions(-)

diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 70b979ff..cc6b3e22 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -1,6 +1,7 @@
 package seng302.models;
 
 import javafx.geometry.Point2D;
+import javafx.scene.CacheHint;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Line;
@@ -47,6 +48,10 @@ public class BoatGroup extends RaceObject{
     private boolean isMaximized= true;
     private List<Line> lineStorage = new ArrayList<>();
     private int setCallCount = 5;
+    private int frameCount = 90;
+    
+    private double lastX;
+    private double lastY;
 
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
@@ -80,9 +85,16 @@ public class BoatGroup extends RaceObject{
     private void initChildren (Color color, double... points) {
         boatPoly = new Polygon(points);
         boatPoly.setFill(color);
+        boatPoly.setCache(true);
+        boatPoly.setCacheHint(CacheHint.SPEED);
+
 
         teamNameObject = new Text(boat.getShortName());
+        teamNameObject.setCache(true);
+        teamNameObject.setCacheHint(CacheHint.SPEED);
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
+        velocityObject.setCache(true);
+        velocityObject.setCacheHint(CacheHint.SPEED);
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -114,8 +126,8 @@ public class BoatGroup extends RaceObject{
      * @param dy The amount to move the Y coordinate by
      */
     public void moveGroupBy(double dx, double dy, double rotation) {
-        boatPoly.setLayoutX(boatPoly.getLayoutX() + dx);
-        boatPoly.setLayoutY(boatPoly.getLayoutY() + dy);
+        boatPoly.setLayoutX(lastX + dx);
+        boatPoly.setLayoutY(lastY + dy);
         teamNameObject.setLayoutX(teamNameObject.getLayoutX() + dx);
         teamNameObject.setLayoutY(teamNameObject.getLayoutY() + dy);
         velocityObject.setLayoutX(velocityObject.getLayoutX() + dx);
@@ -166,21 +178,21 @@ public class BoatGroup extends RaceObject{
             distanceTravelled += Math.abs(dx) + Math.abs(dy);
             moveGroupBy(dx, dy, rotation);
             //Draw a new section of the trail every 20 pixels of movement.
-            if (distanceTravelled > 20) {
-                distanceTravelled = 0;
+            if (frameCount-- == 0) {
+                frameCount = (int) (300 - boat.getVelocity() * 10);
                 if (lastPoint != null) {
                     Line l = new Line(
                             lastPoint.getX(),
                             lastPoint.getY(),
-                            boatPoly.getLayoutX(),
-                            boatPoly.getLayoutY()
+                            lastX,
+                            lastY
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
                     lineGroup.getChildren().add(l);
                 }
                 if (destinationSet) { //Only begin drawing after the first destination is set
-                    lastPoint = new Point2D(boatPoly.getLayoutX(), boatPoly.getLayoutY());
+                    lastPoint = new Point2D(lastX, lastY);
                 }
             }
             wake.updatePosition(timeInterval);
@@ -201,8 +213,8 @@ public class BoatGroup extends RaceObject{
                 boat.setVelocity(groundSpeed);
                 if (currentRotation < 0)
                     currentRotation = 360 - currentRotation;
-                double dx = newXValue - boatPoly.getLayoutX();
-                double dy = newYValue - boatPoly.getLayoutY();
+                double dx = newXValue - lastX;
+                double dy = newYValue - lastY;
                 //Check movement is reasonable. Assumes a 1000 * 1000 canvas
 //                if (Math.abs(dx) > 50 || Math.abs(dy) > 50) {
 //                    dx = 0;
@@ -212,6 +224,8 @@ public class BoatGroup extends RaceObject{
 
                 pixelVelocityX = dx / expectedUpdateInterval;
                 pixelVelocityY = dy / expectedUpdateInterval;
+                lastX = newXValue;
+                lastY = newYValue;
                 rotationalGoal = rotation;
                 calculateRotationalVelocity();
                 if (Math.abs(rotationalVelocity) > 0.075) {
@@ -259,7 +273,7 @@ public class BoatGroup extends RaceObject{
             double rotation = Math.abs(
                     Math.toDegrees(
                             Math.atan(
-                                    (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
+                                    (newYValue - lastY) / (newXValue - lastX)
                             )
                     )
             );
diff --git a/src/main/java/seng302/models/Wake.java b/src/main/java/seng302/models/Wake.java
index 94312780..664e7501 100644
--- a/src/main/java/seng302/models/Wake.java
+++ b/src/main/java/seng302/models/Wake.java
@@ -1,5 +1,6 @@
 package seng302.models;
 
+import javafx.scene.CacheHint;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Arc;
@@ -12,20 +13,13 @@ import javafx.scene.transform.Rotate;
  */
 class Wake extends Group {
 
-    //Wake Settings.
-    //Changes the relationship between separation of wakes and velocity. Only logarithmic is guaranteed to work always since it's my favourite :/.
-    private enum functionType {LINEAR, LOGARITHMIC, POWER, ROOT, POWOUT_LOGIN}
-    private functionType wakeFunction = functionType.LOGARITHMIC;
-    //Change the wake style. Currently can be ArcType.OPEN or ArcType.ROUND
-    private ArcType arcType = ArcType.OPEN;
     //The number of wakes
-    private int numWakes = 10;
+    private int numWakes = 8;
     //The total possible difference between the first wake and the last. Increasing/Decreasing this will make wakes fan out more/less.
     private final double MAX_DIFF = 75;
     //Increasing/decreasing this will alter the speed that wakes converge when the heading stop changing. Anything over about 1500 may cause oscillation.
     private final int UNIFICATION_SPEED = 500;
-    //The power used for the power function. Changing this will probably break stuff in a cool way.
-    private final int POWER = 2;
+
 
     private Arc[] arcs = new Arc[numWakes];
     private double[] rotationalVelocities = new double[numWakes];
@@ -34,6 +28,7 @@ class Wake extends Group {
 
     /**
      * Create a wake at the given location.
+     *
      * @param startingX x location where the tip of wake arcs will be.
      * @param startingY y location where the tip of wake arcs will be.
      */
@@ -44,21 +39,15 @@ class Wake extends Group {
         for (int i = 0; i < numWakes; i++) {
             //Default triangle is -110 deg out of phase with a default wake and has angle of 40 deg.
             arc = new Arc(0, 0, 0, 0, -110, 40);
-
-            if (arcType == ArcType.ROUND) {
-            arc.setFill(new Color(0.18, 0.7, 1.0, 0.4 + (-0.35 / numWakes * i)));
-            arc.setType(ArcType.ROUND);
-            baseRad = 10;
-
-            } else if (arcType == ArcType.OPEN) {
-                arc.setType(ArcType.OPEN);
-                arc.setStroke(new Color(0.18, 0.7, 1.0, 1.0 + (-0.99 / numWakes * i)));
-                arc.setStrokeWidth(3.0);
-                arc.setStrokeLineCap(StrokeLineCap.ROUND);
-                arc.setFill(new Color(0.0, 0.0, 0.0, 0.0));
-                baseRad = (20 / numWakes);
-                arcs[i] = arc;
-            }
+            arc.setCache(true);
+            arc.setCacheHint(CacheHint.SPEED);
+            arc.setType(ArcType.OPEN);
+            arc.setStroke(new Color(0.18, 0.7, 1.0, 1.0 + (-0.99 / numWakes * i)));
+            arc.setStrokeWidth(3.0);
+            arc.setStrokeLineCap(StrokeLineCap.ROUND);
+            arc.setFill(new Color(0.0, 0.0, 0.0, 0.0));
+            baseRad = (20 / numWakes);
+            arcs[i] = arc;
         }
         super.getChildren().addAll(arcs);
     }
@@ -86,67 +75,17 @@ class Wake extends Group {
             );
             difference = Math.toDegrees(difference);
 
-            if (wakeFunction == functionType.LOGARITHMIC) {
-                if (rotationalVelocities[i-1] < 0.01 && rotationalVelocities[i-1] > -0.01) {
-                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes) * 1.5;
-//                    if (difference < 0)
-//                    {
-//                        rotationalVelocities[i] = -rotationalVelocities[i];
-//                    }
-                } else {
-                        rotationalVelocities[i] = rotationalVelocities[i-1] * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes);
-                }
+            if (rotationalVelocities[i-1] < 0.01 && rotationalVelocities[i-1] > -0.01) {
+                rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes) * 1.5;
 
-            } else if (wakeFunction == functionType.LINEAR) {
-                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
-                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * 2;
-                } else {
-                    if (difference < (MAX_DIFF / numWakes))
-                        rotationalVelocities[i] = rotationalVelocities[i - 1] * difference / (MAX_DIFF / numWakes);
-                    else
-                        rotationalVelocities[i] = rotationalVelocities[i - 1];
-                }
-            } else if (wakeFunction == functionType.POWER) {
-                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
-                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.pow(difference, POWER) / Math.pow((MAX_DIFF / numWakes), POWER);
-                } else {
-                    if (difference < (MAX_DIFF / numWakes))
-                        rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.pow(difference, POWER) / Math.pow((MAX_DIFF / numWakes), POWER);
-                    else
-                        rotationalVelocities[i] = rotationalVelocities[i - 1];
-                }
-            } else if (wakeFunction == functionType.ROOT) {
-                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
-                    rotationalVelocities[i] = (MAX_DIFF / numWakes) / UNIFICATION_SPEED * Math.sqrt(Math.abs(difference)) / Math.sqrt(MAX_DIFF / numWakes);
-                } else {
-                    if (difference < (MAX_DIFF / numWakes))
-                        rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.sqrt(Math.abs(difference)) / Math.sqrt(MAX_DIFF / numWakes);
-                    else
-                        rotationalVelocities[i] = rotationalVelocities[i - 1];
-                }
-                if (difference < 0)
-                    rotationalVelocities[i] = -rotationalVelocities[i];
-            } else if (wakeFunction == functionType.POWOUT_LOGIN) {
-                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
-                    rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes);
-                } else {
-                    if (difference < (MAX_DIFF / numWakes))
-                        rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.pow(difference, POWER) / Math.pow((MAX_DIFF / numWakes), POWER);
-                    else
-                        rotationalVelocities[i] = rotationalVelocities[i - 1];
-                }
+            } else {
+                if (difference < (MAX_DIFF / numWakes))
+                    rotationalVelocities[i] = rotationalVelocities[i-1] * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes);
+                else
+                    rotationalVelocities[i] = rotationalVelocities[i - 1];
             }
-
         }
 
-        //Scale wakes based on velocity.
-//        if (count--  == 0)
-//        {
-//            count = 10;
-//            offSet = 0;
-//        } else {
-//            offSet += baseRad / 5;
-//        }
         double rad = baseRad + velocity;
         for (Arc arc :arcs) {
             arc.setRadiusX(rad);
@@ -177,5 +116,4 @@ class Wake extends Group {
             arcs[i].getTransforms().setAll(new Rotate(rotation));
         }
     }
-
 }

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

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

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

From 7c39368126ebf15519c92cc07a2406a1897038b3 Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Wed, 17 May 2017 17:23:10 +1200
Subject: [PATCH 13/17] Removed unnecessary constant

---
 src/main/java/seng302/models/BoatGroup.java   | 43 +++++++++----------
 src/main/java/seng302/models/Wake.java        |  2 +-
 .../seng302/models/parsers/StreamParser.java  |  5 ++-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index cc6b3e22..d4c08344 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -48,10 +48,6 @@ public class BoatGroup extends RaceObject{
     private boolean isMaximized= true;
     private List<Line> lineStorage = new ArrayList<>();
     private int setCallCount = 5;
-    private int frameCount = 90;
-    
-    private double lastX;
-    private double lastY;
 
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
@@ -126,8 +122,8 @@ public class BoatGroup extends RaceObject{
      * @param dy The amount to move the Y coordinate by
      */
     public void moveGroupBy(double dx, double dy, double rotation) {
-        boatPoly.setLayoutX(lastX + dx);
-        boatPoly.setLayoutY(lastY + dy);
+        boatPoly.setLayoutX(boatPoly.getLayoutX() + dx);
+        boatPoly.setLayoutY(boatPoly.getLayoutY() + dy);
         teamNameObject.setLayoutX(teamNameObject.getLayoutX() + dx);
         teamNameObject.setLayoutY(teamNameObject.getLayoutY() + dy);
         velocityObject.setLayoutX(velocityObject.getLayoutX() + dx);
@@ -178,21 +174,26 @@ public class BoatGroup extends RaceObject{
             distanceTravelled += Math.abs(dx) + Math.abs(dy);
             moveGroupBy(dx, dy, rotation);
             //Draw a new section of the trail every 20 pixels of movement.
-            if (frameCount-- == 0) {
-                frameCount = (int) (300 - boat.getVelocity() * 10);
+            if (distanceTravelled > 20) {
+                distanceTravelled = 0;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            lastX,
-                            lastY
+                            lastPoint.getX() * 3 - 1000,
+                            lastPoint.getY() * 3 - 1000,
+                            boatPoly.getLayoutX() * 3 - 1000,
+                            boatPoly.getLayoutY() * 3 - 1000
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
+                    if (lastPoint.getX() * 3 - 1000 < 0 || lastPoint.getY() * 3 - 1000 < 0 || boatPoly.getLayoutX() * 3 - 1000 < 0 || boatPoly.getLayoutY() * 3 - 1000 < 0)
+                        l.setVisible(false);
+                    else
+                        l.setVisible(true);
+
                     lineGroup.getChildren().add(l);
                 }
                 if (destinationSet) { //Only begin drawing after the first destination is set
-                    lastPoint = new Point2D(lastX, lastY);
+                    lastPoint = new Point2D(boatPoly.getLayoutX(), boatPoly.getLayoutY());
                 }
             }
             wake.updatePosition(timeInterval);
@@ -213,8 +214,8 @@ public class BoatGroup extends RaceObject{
                 boat.setVelocity(groundSpeed);
                 if (currentRotation < 0)
                     currentRotation = 360 - currentRotation;
-                double dx = newXValue - lastX;
-                double dy = newYValue - lastY;
+                double dx = newXValue - boatPoly.getLayoutX();
+                double dy = newYValue - boatPoly.getLayoutY();
                 //Check movement is reasonable. Assumes a 1000 * 1000 canvas
 //                if (Math.abs(dx) > 50 || Math.abs(dy) > 50) {
 //                    dx = 0;
@@ -224,8 +225,6 @@ public class BoatGroup extends RaceObject{
 
                 pixelVelocityX = dx / expectedUpdateInterval;
                 pixelVelocityY = dy / expectedUpdateInterval;
-                lastX = newXValue;
-                lastY = newYValue;
                 rotationalGoal = rotation;
                 calculateRotationalVelocity();
                 if (Math.abs(rotationalVelocity) > 0.075) {
@@ -250,10 +249,10 @@ public class BoatGroup extends RaceObject{
                 setCallCount = 5;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            newXValue,
-                            newYValue
+                            lastPoint.getX() * 1.5,
+                            lastPoint.getY() * 1.5,
+                            newXValue * 1.5,
+                            newYValue * 1.5
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
@@ -273,7 +272,7 @@ public class BoatGroup extends RaceObject{
             double rotation = Math.abs(
                     Math.toDegrees(
                             Math.atan(
-                                    (newYValue - lastY) / (newXValue - lastX)
+                                    (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
                             )
                     )
             );
diff --git a/src/main/java/seng302/models/Wake.java b/src/main/java/seng302/models/Wake.java
index 664e7501..7c9bb14c 100644
--- a/src/main/java/seng302/models/Wake.java
+++ b/src/main/java/seng302/models/Wake.java
@@ -18,7 +18,7 @@ class Wake extends Group {
     //The total possible difference between the first wake and the last. Increasing/Decreasing this will make wakes fan out more/less.
     private final double MAX_DIFF = 75;
     //Increasing/decreasing this will alter the speed that wakes converge when the heading stop changing. Anything over about 1500 may cause oscillation.
-    private final int UNIFICATION_SPEED = 500;
+    private final int UNIFICATION_SPEED = 750;
 
 
     private Arc[] arcs = new Arc[numWakes];
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..12e4b538 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -17,6 +17,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.PriorityBlockingQueue;
 
 /**
@@ -36,8 +37,8 @@ public class StreamParser extends Thread{
      private static boolean raceFinished = false;
      private static boolean streamStatus = false;
      private static long timeSinceStart = -1;
-     private static Map<Integer, Yacht> boats = new HashMap<>();
-     private static Map<Long, Yacht> boatsPos = new TreeMap<>();
+     private static Map<Integer, Yacht> boats = new ConcurrentHashMap<>();
+     private static Map<Long, Yacht> boatsPos = new ConcurrentSkipListMap<>();
      private static double windDirection = 0;
      private static String currentTimeString;
      private static boolean appRunning;

From f41858e2c7a2087422887cd58fb92b78b9386b29 Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Wed, 17 May 2017 17:35:59 +1200
Subject: [PATCH 14/17] Tidied variable names.

---
 src/main/java/seng302/models/Wake.java | 37 +++++++++++---------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/main/java/seng302/models/Wake.java b/src/main/java/seng302/models/Wake.java
index 7c9bb14c..630b075a 100644
--- a/src/main/java/seng302/models/Wake.java
+++ b/src/main/java/seng302/models/Wake.java
@@ -56,38 +56,31 @@ class Wake extends Group {
      * Sets the rotationalVelocity of each arc.
      *
      * @param rotationalVelocity The rotationalVelocity the wake should move at.
-     * @param velocity The real world velocity of the boat in m/s.
+     * @param velocity           The real world velocity of the boat in m/s.
      */
-    void setRotationalVelocity (double rotationalVelocity, double velocity) {
+    void setRotationalVelocity(double rotationalVelocity, double velocity) {
         rotationalVelocities[0] = rotationalVelocity;
         for (int i = 1; i < numWakes; i++) {
-            double difference = Math.atan2(
-                    Math.sin(
-                            Math.toRadians(
-                                    rotations[i - 1] - rotations[i]
-                            )
-                    ),
-                    Math.cos(
-                            Math.toRadians(
-                                    rotations[i - 1] - rotations[i]
-                            )
-                    )
+            double wakeSeparationRad = Math.toRadians(rotations[i - 1] - rotations[i]);
+            double shortestDistance = Math.atan2(
+                    Math.sin(wakeSeparationRad),
+                    Math.cos(wakeSeparationRad)
             );
-            difference = Math.toDegrees(difference);
+            double distDeg = Math.toDegrees(shortestDistance);
 
-            if (rotationalVelocities[i-1] < 0.01 && rotationalVelocities[i-1] > -0.01) {
-                rotationalVelocities[i] = difference / UNIFICATION_SPEED * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes) * 1.5;
+            if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
+                rotationalVelocities[i] = distDeg / UNIFICATION_SPEED * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes);
 
             } else {
-                if (difference < (MAX_DIFF / numWakes))
-                    rotationalVelocities[i] = rotationalVelocities[i-1] * Math.log(Math.abs(difference) + 1) / Math.log(MAX_DIFF / numWakes);
+                if (distDeg < (MAX_DIFF / numWakes))
+                    rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes);
                 else
                     rotationalVelocities[i] = rotationalVelocities[i - 1];
             }
         }
 
         double rad = baseRad + velocity;
-        for (Arc arc :arcs) {
+        for (Arc arc : arcs) {
             arc.setRadiusX(rad);
             arc.setRadiusY(rad);
             rad += (20 / numWakes) + (velocity / 2);
@@ -96,9 +89,10 @@ class Wake extends Group {
 
     /**
      * Arcs rotate based on the distance they would have travelled over the supplied time interval.
+     *
      * @param timeInterval the time interval, in microseconds, that the wake should move.
      */
-    void updatePosition (long timeInterval) {
+    void updatePosition(long timeInterval) {
         for (int i = 0; i < numWakes; i++) {
             rotations[i] = rotations[i] + rotationalVelocities[i] * timeInterval;
             arcs[i].getTransforms().setAll(new Rotate(rotations[i]));
@@ -107,9 +101,10 @@ class Wake extends Group {
 
     /**
      * Rotate all wakes to the given rotation.
+     *
      * @param rotation the from north angle in degrees to rotate to.
      */
-    void rotate (double rotation) {
+    void rotate(double rotation) {
         for (int i = 0; i < arcs.length; i++) {
             rotations[i] = rotation;
             rotationalVelocities[i] = 0;

From 8a3a41294aa2bcba5d8720b0ba078b57b044c5af Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Wed, 17 May 2017 17:41:45 +1200
Subject: [PATCH 15/17] Fixed error causing build failure.

#story[923] #bug #refactor
---
 src/main/java/seng302/models/BoatGroup.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index b2d72099..57950f24 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -286,8 +286,7 @@ public class BoatGroup extends RaceObject {
                     rotationalVelocity = 0;
                     wakeGenerationDelay--;
                 } else {
-                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal,
-                            boat.getVelocity());
+                    wake.setRotationalVelocity(rotationalVelocity, boat.getVelocity());
                     rotateTo(rotationalGoal);
                     wake.rotate(rotationalGoal);
                 }

From 45db731a60f65db00d9b0da3d6d0c4b25dc20785 Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Wed, 17 May 2017 18:06:36 +1200
Subject: [PATCH 16/17] Fixed a merge issue.

#story[923] #bug #refactor
---
 src/main/java/seng302/App.java              |  4 +-
 src/main/java/seng302/models/BoatGroup.java | 82 ++++++---------------
 2 files changed, 26 insertions(+), 60 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 3625db47..deb5656f 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,8 +62,8 @@ public class App extends Application {
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 57950f24..8a1446d0 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -222,33 +222,30 @@ public class BoatGroup extends RaceObject {
      *                     on.
      */
     public void updatePosition(long timeInterval) {
-        //Calculate the movement of the boat.
-        if (isMaximized) {
-            double dx = pixelVelocityX * timeInterval;
-            double dy = pixelVelocityY * timeInterval;
-            double rotation = rotationalVelocity * timeInterval;
-            distanceTravelled += Math.abs(dx) + Math.abs(dy);
-            moveGroupBy(dx, dy, rotation);
-            //Draw a new section of the trail every 20 pixels of movement.
-            if (distanceTravelled > 20) {
-                distanceTravelled = 0;
-                if (lastPoint != null) {
-                    Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            boatPoly.getLayoutX(),
-                            boatPoly.getLayoutY()
-                    );
-                    l.getStrokeDashArray().setAll(3d, 7d);
-                    l.setStroke(boat.getColour());
-                    lineGroup.getChildren().add(l);
-                }
-                if (destinationSet) { //Only begin drawing after the first destination is set
-                    lastPoint = new Point2D(boatPoly.getLayoutX(), boatPoly.getLayoutY());
-                }
+        double dx = pixelVelocityX * timeInterval;
+        double dy = pixelVelocityY * timeInterval;
+        double rotation = rotationalVelocity * timeInterval;
+        distanceTravelled += Math.abs(dx) + Math.abs(dy);
+        moveGroupBy(dx, dy, rotation);
+        //Draw a new section of the trail every 20 pixels of movement.
+        if (distanceTravelled > 20) {
+            distanceTravelled = 0;
+            if (lastPoint != null) {
+                Line l = new Line(
+                        lastPoint.getX(),
+                        lastPoint.getY(),
+                        boatPoly.getLayoutX(),
+                        boatPoly.getLayoutY()
+                );
+                l.getStrokeDashArray().setAll(3d, 7d);
+                l.setStroke(boat.getColour());
+                lineGroup.getChildren().add(l);
+            }
+            if (destinationSet) { //Only begin drawing after the first destination is set
+                lastPoint = new Point2D(boatPoly.getLayoutX(), boatPoly.getLayoutY());
             }
-            wake.updatePosition(timeInterval);
         }
+        wake.updatePosition(timeInterval);
     }
 
     /**
@@ -265,28 +262,18 @@ public class BoatGroup extends RaceObject {
             if (setToInitialLocation) {
                 destinationSet = true;
                 boat.setVelocity(groundSpeed);
-                if (currentRotation < 0) {
-                    currentRotation = 360 - currentRotation;
-                }
                 double dx = newXValue - boatPoly.getLayoutX();
                 double dy = newYValue - boatPoly.getLayoutY();
-                //Check movement is reasonable. Assumes a 1000 * 1000 canvas
-//                if (Math.abs(dx) > 50 || Math.abs(dy) > 50) {
-//                    dx = 0;
-//                    dy = 0;
-//                    moveTo(newXValue, newYValue);
-//                }
+
 
                 pixelVelocityX = dx / expectedUpdateInterval;
                 pixelVelocityY = dy / expectedUpdateInterval;
                 rotationalGoal = rotation;
                 calculateRotationalVelocity();
+
                 if (Math.abs(rotationalVelocity) > 0.075) {
                     System.out.println("rotationalVelocity = " + rotationalVelocity);
                     rotationalVelocity = 0;
-                    wakeGenerationDelay--;
-                } else {
-                    wake.setRotationalVelocity(rotationalVelocity, boat.getVelocity());
                     rotateTo(rotationalGoal);
                     wake.rotate(rotationalGoal);
                 }
@@ -312,27 +299,6 @@ public class BoatGroup extends RaceObject {
             }
         }
         //If minimized generate lines every 5 calls to set destination.
-        if (!isMaximized) {
-            setToInitialLocation = false;
-            wakeGenerationDelay = 2;
-            if (setCallCount-- == 0) {
-                setCallCount = 5;
-                if (lastPoint != null) {
-                    Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            newXValue,
-                            newYValue
-                    );
-                    l.getStrokeDashArray().setAll(3d, 7d);
-                    l.setStroke(boatPoly.getFill());
-                    lineStorage.add(l);
-                }
-                if (destinationSet) { //Only begin drawing after the first destination is set
-                    lastPoint = new Point2D(newXValue, newYValue);
-                }
-            }
-        }
     }
 
     public void setDestination(double newXValue, double newYValue, double groundSpeed,

From 73eeeb0ef9200b763f8fe53c98ed78852f2e0252 Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Thu, 18 May 2017 11:45:06 +1200
Subject: [PATCH 17/17] Removed extra print stmt and changed default server
 back to official

---
 src/main/java/seng302/App.java              | 4 ++--
 src/main/java/seng302/models/BoatGroup.java | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index deb5656f..afcd3430 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,8 +62,8 @@ public class App extends Application {
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+            //sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 8a1446d0..767ca893 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -272,7 +272,6 @@ public class BoatGroup extends RaceObject {
                 calculateRotationalVelocity();
 
                 if (Math.abs(rotationalVelocity) > 0.075) {
-                    System.out.println("rotationalVelocity = " + rotationalVelocity);
                     rotationalVelocity = 0;
                     rotateTo(rotationalGoal);
                     wake.rotate(rotationalGoal);