From 64e96a1b8b935598464de5b668f5211399f8b0da Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Tue, 29 Aug 2017 12:14:28 +1200
Subject: [PATCH 01/51] Class for shifting wind. #story[1187]

---
 .../src/main/java/mock/app/Event.java         | 10 +---
 .../src/main/java/mock/model/MockRace.java    |  5 +-
 .../{ => wind}/ConstantWindGenerator.java     |  4 +-
 .../model/{ => wind}/RandomWindGenerator.java |  2 +-
 .../model/wind/ShiftingWindGenerator.java     | 51 +++++++++++++++++++
 .../mock/model/{ => wind}/WindGenerator.java  |  2 +-
 .../mock/model/ConstantWindGeneratorTest.java |  2 +
 .../test/java/mock/model/MockRaceTest.java    |  5 +-
 .../mock/model/RandomWindGeneratorTest.java   |  1 +
 9 files changed, 62 insertions(+), 20 deletions(-)
 rename racevisionGame/src/main/java/mock/model/{ => wind}/ConstantWindGenerator.java (96%)
 rename racevisionGame/src/main/java/mock/model/{ => wind}/RandomWindGenerator.java (99%)
 create mode 100644 racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
 rename racevisionGame/src/main/java/mock/model/{ => wind}/WindGenerator.java (96%)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index 228534c2..f36ac714 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -4,6 +4,8 @@ import mock.dataInput.PolarParser;
 import mock.exceptions.EventConstructionException;
 import mock.model.*;
 import mock.model.commandFactory.CompositeCommand;
+import mock.model.wind.RandomWindGenerator;
+import mock.model.wind.WindGenerator;
 import mock.xml.RaceXMLCreator;
 import network.Messages.LatestMessages;
 import org.xml.sax.SAXException;
@@ -18,16 +20,8 @@ import shared.model.Constants;
 
 import javax.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 
 /**
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 379123af..ed7b6fd2 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -1,9 +1,6 @@
 package mock.model;
 
-import javafx.animation.AnimationTimer;
-import mock.xml.*;
-import network.Messages.BoatLocation;
-import network.Messages.BoatStatus;
+import mock.model.wind.WindGenerator;
 import network.Messages.Enums.BoatStatusEnum;
 import network.Messages.Enums.RaceStatusEnum;
 import shared.dataInput.BoatDataSource;
diff --git a/racevisionGame/src/main/java/mock/model/ConstantWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ConstantWindGenerator.java
similarity index 96%
rename from racevisionGame/src/main/java/mock/model/ConstantWindGenerator.java
rename to racevisionGame/src/main/java/mock/model/wind/ConstantWindGenerator.java
index ae14daac..6cdfafe9 100644
--- a/racevisionGame/src/main/java/mock/model/ConstantWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ConstantWindGenerator.java
@@ -1,11 +1,9 @@
-package mock.model;
+package mock.model.wind;
 
 
 import shared.model.Bearing;
 import shared.model.Wind;
 
-import java.util.Random;
-
 /**
  * This class generates Wind objects for use in a MockRace.
  * Initialised with a baseline wind speed and direction, and keeps it constant.
diff --git a/racevisionGame/src/main/java/mock/model/RandomWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/RandomWindGenerator.java
similarity index 99%
rename from racevisionGame/src/main/java/mock/model/RandomWindGenerator.java
rename to racevisionGame/src/main/java/mock/model/wind/RandomWindGenerator.java
index 4f981b8d..bd7b13c3 100644
--- a/racevisionGame/src/main/java/mock/model/RandomWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/RandomWindGenerator.java
@@ -1,4 +1,4 @@
-package mock.model;
+package mock.model.wind;
 
 
 import shared.model.Bearing;
diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
new file mode 100644
index 00000000..4a1c158e
--- /dev/null
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -0,0 +1,51 @@
+package mock.model.wind;
+
+import shared.model.Bearing;
+import shared.model.Wind;
+
+/**
+ * Created by jjg64 on 28/08/17.
+ */
+public class ShiftingWindGenerator implements WindGenerator {
+    Bearing baselineBearing;
+    double baseLineSpeed;
+    double maxBearingVariance = 5;  // In degrees
+    double oscillationPeriod = 3e6;  // In milliseconds
+
+    public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) {
+        this.baselineBearing = baselineBearing;
+        this.baseLineSpeed = baseLineSpeed;
+    }
+
+    @Override
+    public Wind generateBaselineWind() {
+        return new Wind(baselineBearing, baseLineSpeed);
+    }
+
+    @Override
+    public Wind generateNextWind(Wind currentWind) {
+        return changeWind(currentWind);
+    }
+
+    private Wind changeWind(Wind currentWind) {
+        currentWind = oscillateWind(currentWind);
+        currentWind = shiftWind(currentWind);
+        return currentWind;
+    }
+
+    private Wind oscillateWind(Wind currentWind) {
+        return currentWind;
+    }
+
+    private Wind shiftWind(Wind currentWind) {
+        return currentWind;
+    }
+
+    public void setMaxBearingVariance(double maxBearingVariance) {
+        this.maxBearingVariance = maxBearingVariance;
+    }
+
+    public void setOscillationPeriod(double oscillationPeriod) {
+        this.oscillationPeriod = oscillationPeriod;
+    }
+}
diff --git a/racevisionGame/src/main/java/mock/model/WindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/WindGenerator.java
similarity index 96%
rename from racevisionGame/src/main/java/mock/model/WindGenerator.java
rename to racevisionGame/src/main/java/mock/model/wind/WindGenerator.java
index 8285d5d3..52ee2cd6 100644
--- a/racevisionGame/src/main/java/mock/model/WindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/WindGenerator.java
@@ -1,4 +1,4 @@
-package mock.model;
+package mock.model.wind;
 
 import shared.model.Wind;
 
diff --git a/racevisionGame/src/test/java/mock/model/ConstantWindGeneratorTest.java b/racevisionGame/src/test/java/mock/model/ConstantWindGeneratorTest.java
index 6f67dc30..f7c69acf 100644
--- a/racevisionGame/src/test/java/mock/model/ConstantWindGeneratorTest.java
+++ b/racevisionGame/src/test/java/mock/model/ConstantWindGeneratorTest.java
@@ -1,5 +1,7 @@
 package mock.model;
 
+import mock.model.wind.ConstantWindGenerator;
+import mock.model.wind.WindGenerator;
 import org.junit.Before;
 import org.junit.Test;
 import shared.model.Bearing;
diff --git a/racevisionGame/src/test/java/mock/model/MockRaceTest.java b/racevisionGame/src/test/java/mock/model/MockRaceTest.java
index 4f3f7705..f53b2970 100644
--- a/racevisionGame/src/test/java/mock/model/MockRaceTest.java
+++ b/racevisionGame/src/test/java/mock/model/MockRaceTest.java
@@ -1,7 +1,8 @@
 package mock.model;
 
 import mock.dataInput.PolarParserTest;
-import network.Messages.LatestMessages;
+import mock.model.wind.ConstantWindGenerator;
+import mock.model.wind.WindGenerator;
 import shared.dataInput.*;
 import shared.exceptions.InvalidBoatDataException;
 import shared.exceptions.InvalidRaceDataException;
@@ -9,8 +10,6 @@ import shared.exceptions.InvalidRegattaDataException;
 import shared.model.Bearing;
 import shared.model.Constants;
 
-import static org.junit.Assert.*;
-
 public class MockRaceTest {
 //TODO
 
diff --git a/racevisionGame/src/test/java/mock/model/RandomWindGeneratorTest.java b/racevisionGame/src/test/java/mock/model/RandomWindGeneratorTest.java
index 76eed977..0f60bcea 100644
--- a/racevisionGame/src/test/java/mock/model/RandomWindGeneratorTest.java
+++ b/racevisionGame/src/test/java/mock/model/RandomWindGeneratorTest.java
@@ -1,5 +1,6 @@
 package mock.model;
 
+import mock.model.wind.RandomWindGenerator;
 import org.junit.Before;
 import org.junit.Test;
 import shared.model.Bearing;

From 12e2ae9c0150ad6e3e5de6ca77ff606cb11fcbf8 Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Tue, 29 Aug 2017 13:21:34 +1200
Subject: [PATCH 02/51] Started implementing wind oscillation. #story[1187]

---
 .../src/main/java/mock/app/Event.java         | 17 ++++---
 .../model/wind/ShiftingWindGenerator.java     | 49 ++++++++++++++-----
 .../src/main/java/shared/model/Wind.java      |  7 +++
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index f36ac714..096705bb 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -5,6 +5,7 @@ import mock.exceptions.EventConstructionException;
 import mock.model.*;
 import mock.model.commandFactory.CompositeCommand;
 import mock.model.wind.RandomWindGenerator;
+import mock.model.wind.ShiftingWindGenerator;
 import mock.model.wind.WindGenerator;
 import mock.xml.RaceXMLCreator;
 import network.Messages.LatestMessages;
@@ -124,13 +125,17 @@ public class Event {
         this.latestMessages = new LatestMessages();
 
         //Create and start race.
-        WindGenerator windGenerator = new RandomWindGenerator(
+//        WindGenerator windGenerator = new RandomWindGenerator(
+//                Bearing.fromDegrees(225),
+//                Bearing.fromDegrees(215),
+//                Bearing.fromDegrees(235),
+//                12d,
+//                8d,
+//                16d );
+        WindGenerator windGenerator = new ShiftingWindGenerator(
                 Bearing.fromDegrees(225),
-                Bearing.fromDegrees(215),
-                Bearing.fromDegrees(235),
-                12d,
-                8d,
-                16d );
+                12
+        );
         RaceLogic newRace = new RaceLogic(
                 new MockRace(
                         boatDataSource,
diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index 4a1c158e..fc3e3dc2 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -3,18 +3,28 @@ package mock.model.wind;
 import shared.model.Bearing;
 import shared.model.Wind;
 
+import java.util.Random;
+
 /**
  * Created by jjg64 on 28/08/17.
  */
 public class ShiftingWindGenerator implements WindGenerator {
     Bearing baselineBearing;
     double baseLineSpeed;
-    double maxBearingVariance = 5;  // In degrees
+    double speedVariance = 4;
+    double bearingVariance = 5;  // In degrees
     double oscillationPeriod = 3e6;  // In milliseconds
 
+    double timeOfLastOscillationReset = 0;
+    double timeSinceLastChange = 0;
+    double timeSinceLastShift = 0; // Back / veer
+
+    boolean oscillationLeft = false;
+
     public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) {
         this.baselineBearing = baselineBearing;
         this.baseLineSpeed = baseLineSpeed;
+        initialiseOscillationDirection();
     }
 
     @Override
@@ -27,22 +37,39 @@ public class ShiftingWindGenerator implements WindGenerator {
         return changeWind(currentWind);
     }
 
-    private Wind changeWind(Wind currentWind) {
-        currentWind = oscillateWind(currentWind);
-        currentWind = shiftWind(currentWind);
-        return currentWind;
+    private Wind changeWind(Wind wind) {
+        Wind newWind = new Wind(wind.getWindDirection(), wind.getWindSpeed());
+        oscillateWind(newWind);
+        shiftWind(newWind);
+        changeWindSpeed(newWind);
+        return newWind;
+    }
+
+    private void oscillateWind(Wind wind) {
+        double timeSinceLastOscillationReset = System.currentTimeMillis() - timeOfLastOscillationReset;
+        if (oscillationLeft) {
+
+        }
+    }
+
+    private void shiftWind(Wind wind) {
+    }
+
+    private void changeWindSpeed(Wind wind) {
+
     }
 
-    private Wind oscillateWind(Wind currentWind) {
-        return currentWind;
+    private void initialiseOscillationDirection() {
+        oscillationLeft = new Random().nextBoolean();
+        timeOfLastOscillationReset = System.currentTimeMillis();
     }
 
-    private Wind shiftWind(Wind currentWind) {
-        return currentWind;
+    public void setBearingVariance(double maxBearingVariance) {
+        this.bearingVariance = maxBearingVariance;
     }
 
-    public void setMaxBearingVariance(double maxBearingVariance) {
-        this.maxBearingVariance = maxBearingVariance;
+    public void setSpeedVariance(double speedVariance) {
+        this.speedVariance = speedVariance;
     }
 
     public void setOscillationPeriod(double oscillationPeriod) {
diff --git a/racevisionGame/src/main/java/shared/model/Wind.java b/racevisionGame/src/main/java/shared/model/Wind.java
index 08d391c2..531d8473 100644
--- a/racevisionGame/src/main/java/shared/model/Wind.java
+++ b/racevisionGame/src/main/java/shared/model/Wind.java
@@ -48,4 +48,11 @@ public class Wind {
         return windSpeed;
     }
 
+    public void setWindSpeed(double windSpeed) {
+        this.windSpeed = windSpeed;
+    }
+
+    public void setWindDirection(Bearing windDirection) {
+        this.windDirection = windDirection;
+    }
 }

From d0ba7b93e09187be12f07df2b5a8facc852888fc Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Tue, 29 Aug 2017 14:40:52 +1200
Subject: [PATCH 03/51] Wind oscillates, replaces random wind with shifting
 wind. #story[1187]

---
 .../src/main/java/mock/app/Event.java         |  2 ++
 .../model/wind/ShiftingWindGenerator.java     | 33 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index d75307cf..c7f7d5ff 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -23,6 +23,8 @@ import javax.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 
 
 /**
diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index fc3e3dc2..cb94e55c 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -13,10 +13,11 @@ public class ShiftingWindGenerator implements WindGenerator {
     double baseLineSpeed;
     double speedVariance = 4;
     double bearingVariance = 5;  // In degrees
-    double oscillationPeriod = 3e6;  // In milliseconds
+    double oscillationVariance = 0.25;
+    double oscillationPeriod = 1e3 * 60 * 1;  // In milliseconds
 
     double timeOfLastOscillationReset = 0;
-    double timeSinceLastChange = 0;
+    double timeOfLastChange = 0;
     double timeSinceLastShift = 0; // Back / veer
 
     boolean oscillationLeft = false;
@@ -42,13 +43,39 @@ public class ShiftingWindGenerator implements WindGenerator {
         oscillateWind(newWind);
         shiftWind(newWind);
         changeWindSpeed(newWind);
+        timeOfLastChange = System.currentTimeMillis();
         return newWind;
     }
 
     private void oscillateWind(Wind wind) {
         double timeSinceLastOscillationReset = System.currentTimeMillis() - timeOfLastOscillationReset;
+        double timeSinceLastChange = System.currentTimeMillis() - timeOfLastChange;
+        double newBearing = wind.getWindDirection().degrees();
+        double degreeChange = timeSinceLastChange * 2 * bearingVariance / oscillationPeriod;
+        degreeChange = (1 - oscillationVariance) * degreeChange + (2 * oscillationVariance) * degreeChange * Math.random();
+
+        if (timeSinceLastOscillationReset >= oscillationPeriod) {
+            timeOfLastOscillationReset = System.currentTimeMillis();
+            oscillationLeft = !oscillationLeft;
+        }
         if (oscillationLeft) {
-
+            newBearing -= degreeChange;
+            if (newBearing < baselineBearing.degrees() - bearingVariance) {
+                System.out.println(timeSinceLastOscillationReset);
+                oscillationLeft = !oscillationLeft;
+                timeOfLastOscillationReset = System.currentTimeMillis();
+            } else {
+                wind.setWindDirection(Bearing.fromDegrees(newBearing % 360));
+            }
+        } else {
+            newBearing += degreeChange;
+            if (newBearing > baselineBearing.degrees() + bearingVariance) {
+                System.out.println(timeSinceLastOscillationReset);
+                oscillationLeft = !oscillationLeft;
+                timeOfLastOscillationReset = System.currentTimeMillis();
+            } else {
+                wind.setWindDirection(Bearing.fromDegrees(newBearing % 360));
+            }
         }
     }
 

From b0f7c5e73475f18a13e085c7aa726b15b26d4b2d Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Tue, 29 Aug 2017 15:53:41 +1200
Subject: [PATCH 04/51] Wind speed changes depending on where the wind
 direction is. #story[1187]

---
 .../model/wind/ShiftingWindGenerator.java     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index cb94e55c..f9e5a4be 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -11,7 +11,7 @@ import java.util.Random;
 public class ShiftingWindGenerator implements WindGenerator {
     Bearing baselineBearing;
     double baseLineSpeed;
-    double speedVariance = 4;
+    double speedVariance = 2;
     double bearingVariance = 5;  // In degrees
     double oscillationVariance = 0.25;
     double oscillationPeriod = 1e3 * 60 * 1;  // In milliseconds
@@ -20,7 +20,7 @@ public class ShiftingWindGenerator implements WindGenerator {
     double timeOfLastChange = 0;
     double timeSinceLastShift = 0; // Back / veer
 
-    boolean oscillationLeft = false;
+    boolean anticlockwise = false;
 
     public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) {
         this.baselineBearing = baselineBearing;
@@ -56,13 +56,13 @@ public class ShiftingWindGenerator implements WindGenerator {
 
         if (timeSinceLastOscillationReset >= oscillationPeriod) {
             timeOfLastOscillationReset = System.currentTimeMillis();
-            oscillationLeft = !oscillationLeft;
+            anticlockwise = !anticlockwise;
         }
-        if (oscillationLeft) {
+        if (anticlockwise) {
             newBearing -= degreeChange;
             if (newBearing < baselineBearing.degrees() - bearingVariance) {
                 System.out.println(timeSinceLastOscillationReset);
-                oscillationLeft = !oscillationLeft;
+                anticlockwise = !anticlockwise;
                 timeOfLastOscillationReset = System.currentTimeMillis();
             } else {
                 wind.setWindDirection(Bearing.fromDegrees(newBearing % 360));
@@ -71,7 +71,7 @@ public class ShiftingWindGenerator implements WindGenerator {
             newBearing += degreeChange;
             if (newBearing > baselineBearing.degrees() + bearingVariance) {
                 System.out.println(timeSinceLastOscillationReset);
-                oscillationLeft = !oscillationLeft;
+                anticlockwise = !anticlockwise;
                 timeOfLastOscillationReset = System.currentTimeMillis();
             } else {
                 wind.setWindDirection(Bearing.fromDegrees(newBearing % 360));
@@ -83,11 +83,14 @@ public class ShiftingWindGenerator implements WindGenerator {
     }
 
     private void changeWindSpeed(Wind wind) {
-
+        double deg = wind.getWindDirection().degrees();
+        double offset = deg - baselineBearing.degrees();
+        double newSpeed = offset / bearingVariance * speedVariance + baseLineSpeed;
+        wind.setWindSpeed(newSpeed);
     }
 
     private void initialiseOscillationDirection() {
-        oscillationLeft = new Random().nextBoolean();
+        anticlockwise = new Random().nextBoolean();
         timeOfLastOscillationReset = System.currentTimeMillis();
     }
 

From 0927e62ea36d13a4d9fa0cd536a30b2a68814e52 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Wed, 30 Aug 2017 12:46:05 +1200
Subject: [PATCH 05/51] Changed dependency to see if it will pass the CI runner
 #story[1191]

---
 racevisionGame/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/pom.xml b/racevisionGame/pom.xml
index 16afe756..20282320 100644
--- a/racevisionGame/pom.xml
+++ b/racevisionGame/pom.xml
@@ -55,8 +55,8 @@
         </dependency>
 
         <dependency>
-            <groupId>InteractiveMesh</groupId>
-            <artifactId>STLImporter</artifactId>
+            <groupId>JavaInteractiveMesh</groupId>
+            <artifactId>ModelImporters</artifactId>
             <version>0_4_1</version>
         </dependency>
 
@@ -79,7 +79,7 @@
 
         <repository>
             <id>interactivemesh</id>
-            <name>Interactive Mesh </name>
+            <name>Interactive Mesh</name>
             <url>http://umbrasheep.com:8888/repository/internal/</url>
         </repository>
 

From 921e0999b8373d6c65d43f44e9fc3839d126c140 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Wed, 30 Aug 2017 13:01:37 +1200
Subject: [PATCH 06/51] Testing if dependency for stl works this time
 #story[1191]

---
 racevisionGame/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/racevisionGame/pom.xml b/racevisionGame/pom.xml
index 20282320..f154cf77 100644
--- a/racevisionGame/pom.xml
+++ b/racevisionGame/pom.xml
@@ -56,8 +56,8 @@
 
         <dependency>
             <groupId>JavaInteractiveMesh</groupId>
-            <artifactId>ModelImporters</artifactId>
-            <version>0_4_1</version>
+            <artifactId>STLImporter</artifactId>
+            <version>0.7</version>
         </dependency>
 
     </dependencies>

From 4910d2712cb0c8d1be6196cbb2188678e87db481 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Wed, 30 Aug 2017 13:56:57 +1200
Subject: [PATCH 07/51] Changed STL Importers Version #story[1191]

---
 racevisionGame/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/racevisionGame/pom.xml b/racevisionGame/pom.xml
index f154cf77..4a3c65a4 100644
--- a/racevisionGame/pom.xml
+++ b/racevisionGame/pom.xml
@@ -46,8 +46,6 @@
             <version>15.0</version>
         </dependency>
 
-
-
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-referencing</artifactId>

From e7164d8a78668c73ffa417dc0d24942215936a29 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Wed, 30 Aug 2017 13:57:15 +1200
Subject: [PATCH 08/51] View3D perspective camera is now operational

#story[1196]
---
 .../Controllers/HostController.java           |  3 +-
 .../main/java/visualiser/model/View3D.java    | 54 +++++++++----------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index a085041b..9293d1f0 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -7,6 +7,7 @@ import javafx.scene.control.SplitPane;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.shape.Box;
 import mock.app.Event;
 import mock.exceptions.EventConstructionException;
 import visualiser.model.View3D;
@@ -57,7 +58,7 @@ public class HostController extends Controller {
     public void initialize(URL location, ResourceBundle resources) {
         fancyStuff = new View3D();
         playerContainer.add(fancyStuff, 0,0);
-        fancyStuff.spinBox();
+        fancyStuff.addShape(new Box(100,100,100));
     }
 
     /**
diff --git a/racevisionGame/src/main/java/visualiser/model/View3D.java b/racevisionGame/src/main/java/visualiser/model/View3D.java
index f6937755..42674c33 100644
--- a/racevisionGame/src/main/java/visualiser/model/View3D.java
+++ b/racevisionGame/src/main/java/visualiser/model/View3D.java
@@ -1,49 +1,43 @@
 package visualiser.model;
 
-import javafx.animation.AnimationTimer;
 import javafx.scene.Group;
 import javafx.scene.PerspectiveCamera;
 import javafx.scene.SubScene;
 import javafx.scene.layout.Pane;
-import javafx.scene.shape.Box;
-import javafx.scene.shape.CullFace;
-import javafx.scene.transform.Rotate;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Shape3D;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by connortaylorbrown on 30/08/17.
  */
 public class View3D extends Pane {
     SubScene scene;
-    PerspectiveCamera camera;
-    Box box;
+    Group world;
+    List<Shape3D> shapes;
 
     public View3D() {
-        scene = new SubScene(this, 500, 500);
-        camera = new PerspectiveCamera();
+        shapes = new ArrayList<>();
+        world = new Group();
+
+        scene = new SubScene(world, 300, 300);
+        scene.widthProperty().bind(this.widthProperty());
+        scene.heightProperty().bind(this.heightProperty());
+        scene.setFill(Color.BLACK);
+
+        PerspectiveCamera camera = new PerspectiveCamera(true);
+        camera.setNearClip(0.1);
+        camera.setFarClip(1000.0);
+        camera.setTranslateZ(-500);
         scene.setCamera(camera);
-    }
-
-    public void spinBox() {
-        camera.getTransforms().add(new Rotate(-20, Rotate.X_AXIS));
-
-        box = new Box(50,50,50);
-        box.setTranslateX(100);
-        box.setTranslateY(100);
-        box.setCullFace(CullFace.BACK);
 
-        Rotate ry = new Rotate(0, 0,0,0, Rotate.Y_AXIS);
-        box.getTransforms().add(ry);
-
-        this.getChildren().add(camera);
-        this.getChildren().add(box);
-
-        AnimationTimer rotation = new AnimationTimer() {
-            @Override
-            public void handle(long now) {
-                ry.setAngle(ry.getAngle() + 0.1);
-            }
-        };
+        this.getChildren().add(scene);
+    }
 
-        rotation.start();
+    public void addShape(Shape3D shape) {
+        shapes.add(shape);
+        world.getChildren().add(shape);
     }
 }

From bb7eb7cb44bb3cef7d11b6e6a81cfec1e9c1fe46 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Wed, 30 Aug 2017 15:05:08 +1200
Subject: [PATCH 09/51] Added adapter interface for PerspectiveCamera frustum
 and transformations in View3D. - Tested interface while initialising
 HostController

#story[1196]
---
 .../Controllers/HostController.java           |  13 +-
 .../main/java/visualiser/model/View3D.java    | 111 ++++++++++++++++--
 2 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index 9293d1f0..6d11e65e 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -52,13 +52,18 @@ public class HostController extends Controller {
 
     private Event game;
 
-    private View3D fancyStuff;
+    private View3D view3D;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        fancyStuff = new View3D();
-        playerContainer.add(fancyStuff, 0,0);
-        fancyStuff.addShape(new Box(100,100,100));
+        view3D = new View3D();
+        playerContainer.add(view3D, 0,0);
+
+        Box box = new Box(100, 100, 100);
+        view3D.addShape(box);
+        view3D.setPivot(box);
+        view3D.setDistance(500);
+        view3D.setPitch(20);
     }
 
     /**
diff --git a/racevisionGame/src/main/java/visualiser/model/View3D.java b/racevisionGame/src/main/java/visualiser/model/View3D.java
index 42674c33..9748fc8f 100644
--- a/racevisionGame/src/main/java/visualiser/model/View3D.java
+++ b/racevisionGame/src/main/java/visualiser/model/View3D.java
@@ -6,38 +6,129 @@ import javafx.scene.SubScene;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created by connortaylorbrown on 30/08/17.
+ * Control for rendering 3D objects visible through a PerspectiveCamera. Implements Adapter Pattern to
+ * interface with camera, and allows clients to add shapes to the scene. All scenes contain sea plane and
+ * sky box, whose textures are set with special methods.
  */
 public class View3D extends Pane {
-    SubScene scene;
-    Group world;
-    List<Shape3D> shapes;
+    private Group world;
+    private List<Shape3D> shapes;
 
+    private double nearClip;
+    private double farClip;
+
+    /**
+     * Position camera pivots around
+     */
+    private Translate pivot;
+    /**
+     * Distance of camera from pivot point
+     */
+    private Translate distance;
+    /**
+     * Angle along ground between z-axis and camera
+     */
+    private Rotate yaw;
+    /**
+     * Angle between ground plane and camera direction
+     */
+    private Rotate pitch;
+
+    /**
+     * Default constructor for View3D. Sets up Scene and PerspectiveCamera.
+     */
     public View3D() {
         shapes = new ArrayList<>();
         world = new Group();
 
-        scene = new SubScene(world, 300, 300);
+        SubScene scene = new SubScene(world, 300, 300);
         scene.widthProperty().bind(this.widthProperty());
         scene.heightProperty().bind(this.heightProperty());
         scene.setFill(Color.BLACK);
 
-        PerspectiveCamera camera = new PerspectiveCamera(true);
-        camera.setNearClip(0.1);
-        camera.setFarClip(1000.0);
-        camera.setTranslateZ(-500);
-        scene.setCamera(camera);
+        scene.setCamera(buildCamera());
 
         this.getChildren().add(scene);
     }
 
+    /**
+     * Sets up camera view frustum and binds transformations
+     * @return perspective camera
+     */
+    private PerspectiveCamera buildCamera() {
+        PerspectiveCamera camera = new PerspectiveCamera(true);
+
+        // Set up view frustum
+        nearClip = 0.1;
+        farClip = 1000.0;
+        camera.setNearClip(nearClip);
+        camera.setFarClip(farClip);
+
+        // Set up transformations
+        pivot = new Translate();
+        distance = new Translate();
+        yaw = new Rotate(0, Rotate.Y_AXIS);
+        pitch = new Rotate(0, Rotate.X_AXIS);
+        camera.getTransforms().addAll(pivot, yaw, pitch, distance);
+
+        return camera;
+    }
+
+    /**
+     * Adds new Shape3D object to scene
+     * @param shape to add
+     */
     public void addShape(Shape3D shape) {
         shapes.add(shape);
         world.getChildren().add(shape);
     }
+
+    public void setNearClip(double nearClip) {
+        this.nearClip = nearClip;
+    }
+
+    public void setFarClip(double farClip) {
+        this.farClip = farClip;
+    }
+
+    /**
+     * Set object to centre on camera
+     * @param pivot centred object
+     */
+    public void setPivot(Shape3D pivot) {
+        this.pivot.setX(pivot.getTranslateX());
+        this.pivot.setY(pivot.getTranslateY());
+        this.pivot.setZ(pivot.getTranslateZ());
+    }
+
+    /**
+     * Set distance of camera from pivot
+     * @param distance in units
+     */
+    public void setDistance(double distance) {
+        this.distance.setZ(-distance);
+    }
+
+    /**
+     * Set angle of camera from z-axis along ground
+     * @param yaw in degrees
+     */
+    public void setYaw(double yaw) {
+        this.yaw.setAngle(yaw);
+    }
+
+    /**
+     * Set elevation of camera
+     * @param pitch in degrees
+     */
+    public void setPitch(double pitch) {
+        this.pitch.setAngle(-pitch);
+    }
 }

From cc66d63096939e5dcdc64f7c8dd582cafe22e40e Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Wed, 30 Aug 2017 15:18:08 +1200
Subject: [PATCH 10/51] Removed unused shapes list from View3D

#story[1196]
---
 .../src/main/java/visualiser/model/View3D.java     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/model/View3D.java b/racevisionGame/src/main/java/visualiser/model/View3D.java
index 9748fc8f..936b7fbc 100644
--- a/racevisionGame/src/main/java/visualiser/model/View3D.java
+++ b/racevisionGame/src/main/java/visualiser/model/View3D.java
@@ -18,12 +18,18 @@ import java.util.List;
  * sky box, whose textures are set with special methods.
  */
 public class View3D extends Pane {
+    /**
+     * Rendering container for shapes
+     */
     private Group world;
-    private List<Shape3D> shapes;
-
+    /**
+     * Near limit of view frustum
+     */
     private double nearClip;
+    /**
+     * Far limit of view frustum
+     */
     private double farClip;
-
     /**
      * Position camera pivots around
      */
@@ -45,7 +51,6 @@ public class View3D extends Pane {
      * Default constructor for View3D. Sets up Scene and PerspectiveCamera.
      */
     public View3D() {
-        shapes = new ArrayList<>();
         world = new Group();
 
         SubScene scene = new SubScene(world, 300, 300);
@@ -86,7 +91,6 @@ public class View3D extends Pane {
      * @param shape to add
      */
     public void addShape(Shape3D shape) {
-        shapes.add(shape);
         world.getChildren().add(shape);
     }
 

From c2fd5c9baeba84c87663d70e004890c7e9e0c63e Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Wed, 30 Aug 2017 15:49:20 +1200
Subject: [PATCH 11/51] Changed box to boat mesh - Mesh needs to be rotated -90
 degrees on X - STL file has been added to assets

#story[1196]
---
 .../Controllers/HostController.java           |  20 ++++++++++++++----
 .../main/java/visualiser/model/View3D.java    |   3 ---
 .../resources/assets/V1.2 Complete Boat.stl   | Bin 0 -> 30984 bytes
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 racevisionGame/src/main/resources/assets/V1.2 Complete Boat.stl

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index 6d11e65e..ed34a2c6 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -1,5 +1,6 @@
 package visualiser.Controllers;
 
+import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -8,6 +9,9 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.shape.Box;
+import javafx.scene.shape.Mesh;
+import javafx.scene.shape.MeshView;
+import javafx.scene.transform.Rotate;
 import mock.app.Event;
 import mock.exceptions.EventConstructionException;
 import visualiser.model.View3D;
@@ -59,10 +63,18 @@ public class HostController extends Controller {
         view3D = new View3D();
         playerContainer.add(view3D, 0,0);
 
-        Box box = new Box(100, 100, 100);
-        view3D.addShape(box);
-        view3D.setPivot(box);
-        view3D.setDistance(500);
+        URL asset = HostController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl");
+
+        StlMeshImporter importer = new StlMeshImporter();
+        importer.read(asset);
+        MeshView mesh = new MeshView(importer.getImport());
+
+        mesh.getTransforms().add(new Rotate(-90, Rotate.X_AXIS));
+
+        view3D.addShape(mesh);
+        view3D.setPivot(mesh);
+        view3D.setDistance(50);
+        view3D.setYaw(45);
         view3D.setPitch(20);
     }
 
diff --git a/racevisionGame/src/main/java/visualiser/model/View3D.java b/racevisionGame/src/main/java/visualiser/model/View3D.java
index 936b7fbc..bd4b4dd0 100644
--- a/racevisionGame/src/main/java/visualiser/model/View3D.java
+++ b/racevisionGame/src/main/java/visualiser/model/View3D.java
@@ -9,9 +9,6 @@ import javafx.scene.shape.Shape3D;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Translate;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Control for rendering 3D objects visible through a PerspectiveCamera. Implements Adapter Pattern to
  * interface with camera, and allows clients to add shapes to the scene. All scenes contain sea plane and
diff --git a/racevisionGame/src/main/resources/assets/V1.2 Complete Boat.stl b/racevisionGame/src/main/resources/assets/V1.2 Complete Boat.stl
new file mode 100644
index 0000000000000000000000000000000000000000..a952ca7739aa8326a2ba076af6254834bb61886a
GIT binary patch
literal 30984
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
R=Y0-)**hm-9cXEy{{uDtPM`n)

literal 0
HcmV?d00001


From ad0e26e88238ddc9cc2b677f676e0c4a9051aa64 Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Wed, 30 Aug 2017 17:16:15 +1200
Subject: [PATCH 12/51] Created scene to view/update current key bindings.

- Current key bindings are shown on buttons
- Added button action events to store the clicked button
- Added key press event to entire pane
- Button text is updated to display its key
- Added functionality to keyFactory to update key bindings
- CSS styling for some components

#story[1197]
---
 .../Controllers/KeyBindingsController.java    | 116 ++++++++++++++++++
 .../src/main/java/visualiser/app/App.java     |  12 +-
 .../gameController/Keys/KeyFactory.java       |   8 ++
 .../src/main/resources/css/keyBindings.css    |  35 ++++++
 .../visualiser/scenes/keyBindings.fxml        |  25 ++++
 5 files changed, 192 insertions(+), 4 deletions(-)
 create mode 100644 racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
 create mode 100644 racevisionGame/src/main/resources/css/keyBindings.css
 create mode 100644 racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
new file mode 100644
index 00000000..77b6687f
--- /dev/null
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -0,0 +1,116 @@
+package visualiser.Controllers;
+
+import javafx.application.Platform;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.input.KeyEvent;
+import visualiser.gameController.Keys.ControlKey;
+import visualiser.gameController.Keys.KeyFactory;
+import java.util.Map;
+
+public class KeyBindingsController {
+    @FXML Button btnSave;
+    @FXML Button btnCancel;
+    @FXML Button btnReset;
+    @FXML ListView lstControl;
+    @FXML ListView lstKey;
+    @FXML ListView lstDescription;
+    @FXML Label lblTitle;
+    String currentButton = null;
+    KeyFactory keyFactory = KeyFactory.getFactory();
+
+    public void initialize(){
+
+        lstKey.getItems().add("Key");
+        lstControl.getItems().add("Command");
+        lstDescription.getItems().add("Description");
+
+
+
+        for (Map.Entry<String, ControlKey> entry : keyFactory.getKeyState().entrySet()) {
+            Button button = new Button(entry.getKey());
+            button.setMinWidth(120);
+            button.setOnAction(new EventHandler<ActionEvent>() {
+                @Override public void handle(ActionEvent e) {
+                    currentButton = button.getText();
+                    System.out.println("Button clicked");
+                }
+            });
+            lstKey.getItems().add(button);
+            lstControl.getItems().add(entry.getValue());
+            lstDescription.getItems().add(entry.getValue().getProtocolCode());
+        }
+
+        lstKey.getSelectionModel().select(0);
+        lstControl.getSelectionModel().select(0);
+        lstDescription.getSelectionModel().select(0);
+
+        lstKey.getSelectionModel().selectedItemProperty()
+                .addListener((observable, oldvalue, newValue) -> {
+                    Platform.runLater(new Runnable() {
+                        public void run() {
+                            lstKey.getSelectionModel().select(0);
+                        }
+                    });
+                });
+        lstDescription.getSelectionModel().selectedItemProperty()
+                .addListener((observable, oldvalue, newValue) -> {
+                    Platform.runLater(new Runnable() {
+                        public void run() {
+                            lstDescription.getSelectionModel().select(0);
+                        }
+                    });
+                });
+        lstControl.getSelectionModel().selectedItemProperty()
+                .addListener((observable, oldvalue, newValue) -> {
+                    Platform.runLater(new Runnable() {
+                        public void run() {
+                            lstControl.getSelectionModel().select(0);
+                        }
+                    });
+                });
+
+        lstKey.sceneProperty().addListener((obs, oldScene, newScene) -> {
+            if (newScene != null) {
+                newScene.getStylesheets().add("/css/keyBindings.css");
+            }
+
+        });
+    }
+
+    public void cancel(){
+        System.out.println("cancel clicked");
+    }
+
+    public void reset(){
+        System.out.println("reset clicked");
+    }
+
+    public void save(){
+        System.out.println("save clicked");
+    }
+
+    public void onKey(KeyEvent e){
+        System.out.println("key pressed");
+        // if a button was clicked
+        if (currentButton!=null){
+            // update text on the button
+            ObservableList buttons = lstKey.getItems();
+            for (int i = 1; i < buttons.size(); i++) {
+                if (currentButton == ((Button)buttons.get(i)).getText()) {
+                    ((Button)buttons.get(i)).setText(e.getCode().toString());
+                    break;
+                }
+            }
+            // update the control key
+            keyFactory.updateKey(currentButton, e.getCode().toString());
+            // remove current button selection
+            currentButton = null;
+        }
+    }
+}
diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java
index eeae5a5d..92cb3096 100644
--- a/racevisionGame/src/main/java/visualiser/app/App.java
+++ b/racevisionGame/src/main/java/visualiser/app/App.java
@@ -3,7 +3,6 @@ package visualiser.app;
 import javafx.animation.FadeTransition;
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
@@ -15,7 +14,6 @@ import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.effect.DropShadow;
 import javafx.scene.image.Image;
@@ -30,8 +28,6 @@ import javafx.stage.WindowEvent;
 import javafx.util.Duration;
 import visualiser.Controllers.MainController;
 
-import java.io.IOException;
-
 public class App extends Application {
 
 
@@ -170,6 +166,14 @@ public class App extends Application {
                 System.exit(0);
             }
         });
+
+        // TODO: remove later, just for testing
+        Parent root2 = FXMLLoader.load(getClass().getResource
+                ("/visualiser/scenes/keyBindings.fxml"));
+        Stage stage2 = new Stage();
+        stage2.setScene(new Scene(root2));
+        stage2.centerOnScreen();
+        stage2.show();
     }
 
     /**
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
index be95abd3..26267d84 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
@@ -48,4 +48,12 @@ public class KeyFactory {
         return keyState.get(key);
     }
 
+    public Map<String, ControlKey> getKeyState() {
+        return keyState;
+    }
+
+    public void updateKey(String oldKey, String newKey){
+        ControlKey controlKey = keyState.get(oldKey);
+        keyState.put(newKey, controlKey);
+    }
 }
diff --git a/racevisionGame/src/main/resources/css/keyBindings.css b/racevisionGame/src/main/resources/css/keyBindings.css
new file mode 100644
index 00000000..a1dc8242
--- /dev/null
+++ b/racevisionGame/src/main/resources/css/keyBindings.css
@@ -0,0 +1,35 @@
+.list-view .list-cell {
+    -fx-cell-size: 40;
+    -fx-font-family: "Tahoma";
+    -fx-background-color: #fffff0;
+    -fx-alignment: center;
+}
+
+.list-view .list-cell:even {
+    -fx-background-color: #ffffdc;
+}
+
+.list-view .list-cell:selected {
+    -fx-background-color: #f9e5c3;
+    -fx-font-family: "Comic Sans MS";
+    -fx-font-weight: bold;
+    -fx-font-size: 18;
+}
+
+.button {
+    -fx-background-color: linear-gradient(#acdeff 50%, #a9c8ff 100%);
+    -fx-background-radius: 4px;
+    -fx-border-radius: 4px;
+    -fx-text-fill: #242d35;
+    -fx-font-size: 12px;
+    -fx-font-family: "Courier New";
+}
+
+.button:focused {
+    -fx-background-color: white;
+    -fx-border-color: #0056bd;
+}
+
+#anchor {
+    -fx-background-color: #fdfac3;
+}
\ No newline at end of file
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml b/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
new file mode 100644
index 00000000..9f881b21
--- /dev/null
+++ b/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane id="anchor" maxHeight="-Infinity" maxWidth="-Infinity"
+        minHeight="-Infinity"
+            minWidth="-Infinity" onKeyPressed="#onKey" prefHeight="471.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.KeyBindingsController">
+   <children>
+      <Label fx:id="lblTitle" layoutX="172.0" layoutY="14.0" text="Key Bindings">
+         <font>
+            <Font name="Comic Sans MS" size="44.0" />
+         </font>
+      </Label>
+      <Button fx:id="btnCancel" layoutX="430.0" layoutY="428.0" mnemonicParsing="false" onAction="#cancel" prefWidth="160.0" text="Cancel" AnchorPane.bottomAnchor="18.0" AnchorPane.rightAnchor="20.0" />
+      <ListView fx:id="lstControl" focusTraversable="false" layoutX="27.0" layoutY="88.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="322.0" prefWidth="150.0" />
+      <ListView fx:id="lstKey" focusTraversable="false" layoutX="176.0" layoutY="88.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="322.0" prefWidth="150.0" />
+      <ListView fx:id="lstDescription" focusTraversable="false" layoutX="325.0" layoutY="88.0" prefHeight="322.0" prefWidth="250.0" />
+      <Button fx:id="btnSave" layoutX="220.0" layoutY="428.0" mnemonicParsing="false" onAction="#save" prefWidth="160.0" text="Save" AnchorPane.bottomAnchor="18.0" />
+      <Button fx:id="btnReset" layoutX="20.0" layoutY="428.0" mnemonicParsing="false" onAction="#reset" prefWidth="160.0" text="Reset to Default" AnchorPane.bottomAnchor="18.0" AnchorPane.leftAnchor="20.0" />
+   </children>
+</AnchorPane>

From b6e56d815c141f2c6744499e9fd9ad6d2522a3f2 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Wed, 30 Aug 2017 18:52:29 +1200
Subject: [PATCH 13/51] ResizableRaceCanvas no longer depends on
 VisualiserRaceEvent

#story[1196]
---
 .../Controllers/RaceController.java           |  2 +-
 .../visualiser/model/ResizableRaceCanvas.java | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
index 4fcda581..b6a53f0b 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
@@ -356,7 +356,7 @@ public class RaceController extends Controller {
     private void initialiseRaceCanvas(VisualiserRaceEvent race) {
 
         //Create canvas.
-        raceCanvas = new ResizableRaceCanvas(race);
+        raceCanvas = new ResizableRaceCanvas(race.getVisualiserRaceState());
 
         //Set properties.
         raceCanvas.setMouseTransparent(true);
diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
index fc6a0858..03e86e27 100644
--- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
@@ -39,9 +39,9 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     private Image sailsLuff = new Image("/images/sailsLuff.gif", 25, 10, false, false);
 
     /**
-     * The race we read data from and draw.
+     * The race state we read data from and draw.
      */
-    private VisualiserRaceEvent visualiserRace;
+    private VisualiserRaceState raceState;
 
 
     private boolean annoName = true;
@@ -56,14 +56,14 @@ public class ResizableRaceCanvas extends ResizableCanvas {
 
     /**
      * Constructs a {@link ResizableRaceCanvas} using a given {@link VisualiserRaceEvent}.
-     * @param visualiserRace The race that data is read from in order to be drawn.
+     * @param raceState The race state to be drawn.
      */
-    public ResizableRaceCanvas(VisualiserRaceEvent visualiserRace) {
+    public ResizableRaceCanvas(VisualiserRaceState raceState) {
         super();
 
-        this.visualiserRace = visualiserRace;
+        this.raceState = raceState;
 
-        RaceDataSource raceData = visualiserRace.getVisualiserRaceState().getRaceDataSource();
+        RaceDataSource raceData = raceState.getRaceDataSource();
 
         double lat1 = raceData.getMapTopLeft().getLatitude();
         double long1 = raceData.getMapTopLeft().getLongitude();
@@ -276,8 +276,8 @@ public class ResizableRaceCanvas extends ResizableCanvas {
                 boat.getCountry(),
                 boat.getCurrentSpeed(),
                 this.map.convertGPS(boat.getPosition()),
-                boat.getTimeToNextMarkFormatted(this.visualiserRace.getVisualiserRaceState().getRaceClock().getCurrentTime()),
-                boat.getTimeSinceLastMarkFormatted(this.visualiserRace.getVisualiserRaceState().getRaceClock().getCurrentTime()),
+                boat.getTimeToNextMarkFormatted(raceState.getRaceClock().getCurrentTime()),
+                boat.getTimeSinceLastMarkFormatted(raceState.getRaceClock().getCurrentTime()),
                 Color.BLACK,
                 20  );
 
@@ -291,7 +291,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      */
     private void drawBoats() {
 
-        List<VisualiserBoat> boats = new ArrayList<>(visualiserRace.getVisualiserRaceState().getBoats());
+        List<VisualiserBoat> boats = new ArrayList<>(raceState.getBoats());
         //Sort to ensure we draw boats in consistent order.
         boats.sort(Comparator.comparingInt(Boat::getSourceID));
 
@@ -510,7 +510,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      */
     private void drawMarks() {
 
-        for (Mark mark : new ArrayList<>(visualiserRace.getVisualiserRaceState().getMarks())) {
+        for (Mark mark : new ArrayList<>(raceState.getMarks())) {
             drawMark(mark);
         }
     }
@@ -574,7 +574,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
 
 
         //Calculate the screen coordinates of the boundary.
-        List<GPSCoordinate> boundary = new ArrayList<>(visualiserRace.getVisualiserRaceState().getBoundary());
+        List<GPSCoordinate> boundary = new ArrayList<>(raceState.getBoundary());
         double[] xpoints = new double[boundary.size()];
         double[] ypoints = new double[boundary.size()];
 
@@ -601,8 +601,8 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     public void drawRace() {
 
         //Update RaceMap with new GPS values of race.
-        this.map.setGPSTopLeft(visualiserRace.getVisualiserRaceState().getRaceDataSource().getMapTopLeft());
-        this.map.setGPSBotRight(visualiserRace.getVisualiserRaceState().getRaceDataSource().getMapBottomRight());
+        this.map.setGPSTopLeft(raceState.getRaceDataSource().getMapTopLeft());
+        this.map.setGPSBotRight(raceState.getRaceDataSource().getMapBottomRight());
 
 
         clear();
@@ -627,7 +627,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      * draws a transparent line around the course that shows the paths boats must travel
      */
     public void drawRaceLine(){
-        List<Leg> legs = this.visualiserRace.getVisualiserRaceState().getLegs();
+        List<Leg> legs = raceState.getLegs();
         GPSCoordinate legStartPoint = legs.get(0).getStartCompoundMark().getAverageGPSCoordinate();
         GPSCoordinate nextStartPoint;
         for (int i = 0; i < legs.size() -1; i++) {

From fb7bf572d83a752d5532c581761524ae17f92e3e Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Thu, 31 Aug 2017 00:59:36 +1200
Subject: [PATCH 14/51] Changed View3D add-remove interface to an
 ObservableList

#story[1196]
---
 .../Controllers/HostController.java           |  9 ++++++--
 .../main/java/visualiser/model/View3D.java    | 22 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index ed34a2c6..5a72f11e 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -1,6 +1,8 @@
 package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -11,6 +13,7 @@ import javafx.scene.layout.GridPane;
 import javafx.scene.shape.Box;
 import javafx.scene.shape.Mesh;
 import javafx.scene.shape.MeshView;
+import javafx.scene.shape.Shape3D;
 import javafx.scene.transform.Rotate;
 import mock.app.Event;
 import mock.exceptions.EventConstructionException;
@@ -60,7 +63,10 @@ public class HostController extends Controller {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        ObservableList<Shape3D> shapes = FXCollections.observableArrayList();
+
         view3D = new View3D();
+        view3D.setItems(shapes);
         playerContainer.add(view3D, 0,0);
 
         URL asset = HostController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl");
@@ -68,10 +74,9 @@ public class HostController extends Controller {
         StlMeshImporter importer = new StlMeshImporter();
         importer.read(asset);
         MeshView mesh = new MeshView(importer.getImport());
-
         mesh.getTransforms().add(new Rotate(-90, Rotate.X_AXIS));
+        shapes.add(mesh);
 
-        view3D.addShape(mesh);
         view3D.setPivot(mesh);
         view3D.setDistance(50);
         view3D.setYaw(45);
diff --git a/racevisionGame/src/main/java/visualiser/model/View3D.java b/racevisionGame/src/main/java/visualiser/model/View3D.java
index bd4b4dd0..6affb906 100644
--- a/racevisionGame/src/main/java/visualiser/model/View3D.java
+++ b/racevisionGame/src/main/java/visualiser/model/View3D.java
@@ -1,5 +1,7 @@
 package visualiser.model;
 
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
 import javafx.scene.Group;
 import javafx.scene.PerspectiveCamera;
 import javafx.scene.SubScene;
@@ -15,6 +17,10 @@ import javafx.scene.transform.Translate;
  * sky box, whose textures are set with special methods.
  */
 public class View3D extends Pane {
+    /**
+     * Observable list of renderable items
+     */
+    private ObservableList<Shape3D> items;
     /**
      * Rendering container for shapes
      */
@@ -83,12 +89,16 @@ public class View3D extends Pane {
         return camera;
     }
 
-    /**
-     * Adds new Shape3D object to scene
-     * @param shape to add
-     */
-    public void addShape(Shape3D shape) {
-        world.getChildren().add(shape);
+    public void setItems(ObservableList<Shape3D> items) {
+        this.items = items;
+        this.items.addListener((ListChangeListener<? super Shape3D>) c -> {
+            while(c.next()) {
+                if (c.wasRemoved() || c.wasAdded()) {
+                    for (Shape3D shape : c.getRemoved()) world.getChildren().remove(shape);
+                    for (Shape3D shape : c.getAddedSubList()) world.getChildren().add(shape);
+                }
+            }
+        });
     }
 
     public void setNearClip(double nearClip) {

From 3cc806dc4538f342831227e616d328c135f6b747 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Thu, 31 Aug 2017 01:06:33 +1200
Subject: [PATCH 15/51] Returned rotation to boat in lobby

#story[1196]
---
 .../java/visualiser/Controllers/HostController.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index 5a72f11e..ba70e03b 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -1,6 +1,7 @@
 package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import javafx.animation.AnimationTimer;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -74,13 +75,23 @@ public class HostController extends Controller {
         StlMeshImporter importer = new StlMeshImporter();
         importer.read(asset);
         MeshView mesh = new MeshView(importer.getImport());
-        mesh.getTransforms().add(new Rotate(-90, Rotate.X_AXIS));
         shapes.add(mesh);
 
         view3D.setPivot(mesh);
         view3D.setDistance(50);
         view3D.setYaw(45);
         view3D.setPitch(20);
+
+        Rotate rotation = new Rotate(0, Rotate.Y_AXIS);
+        mesh.getTransforms().addAll(rotation, new Rotate(-90, Rotate.X_AXIS));
+
+        AnimationTimer rotate = new AnimationTimer() {
+            @Override
+            public void handle(long now) {
+                rotation.setAngle(rotation.getAngle() + 0.1);
+            }
+        };
+        rotate.start();
     }
 
     /**

From 0de7780020563dc70d427238c4fed2ef20024079 Mon Sep 17 00:00:00 2001
From: Joseph <jjg64@uclive.ac.nz>
Date: Thu, 31 Aug 2017 12:26:30 +1200
Subject: [PATCH 16/51] Changed wind speed to be non-linear. #story[1187]

---
 .../mock/model/wind/ShiftingWindGenerator.java   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index f9e5a4be..d36a843b 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -11,7 +11,7 @@ import java.util.Random;
 public class ShiftingWindGenerator implements WindGenerator {
     Bearing baselineBearing;
     double baseLineSpeed;
-    double speedVariance = 2;
+    double windSpeedVariance = 5;
     double bearingVariance = 5;  // In degrees
     double oscillationVariance = 0.25;
     double oscillationPeriod = 1e3 * 60 * 1;  // In milliseconds
@@ -61,7 +61,6 @@ public class ShiftingWindGenerator implements WindGenerator {
         if (anticlockwise) {
             newBearing -= degreeChange;
             if (newBearing < baselineBearing.degrees() - bearingVariance) {
-                System.out.println(timeSinceLastOscillationReset);
                 anticlockwise = !anticlockwise;
                 timeOfLastOscillationReset = System.currentTimeMillis();
             } else {
@@ -70,7 +69,6 @@ public class ShiftingWindGenerator implements WindGenerator {
         } else {
             newBearing += degreeChange;
             if (newBearing > baselineBearing.degrees() + bearingVariance) {
-                System.out.println(timeSinceLastOscillationReset);
                 anticlockwise = !anticlockwise;
                 timeOfLastOscillationReset = System.currentTimeMillis();
             } else {
@@ -83,10 +81,10 @@ public class ShiftingWindGenerator implements WindGenerator {
     }
 
     private void changeWindSpeed(Wind wind) {
-        double deg = wind.getWindDirection().degrees();
-        double offset = deg - baselineBearing.degrees();
-        double newSpeed = offset / bearingVariance * speedVariance + baseLineSpeed;
-        wind.setWindSpeed(newSpeed);
+        double offsetAngle = (wind.getWindDirection().radians() - baselineBearing.radians());
+        double offset = Math.sin(offsetAngle) * windSpeedVariance;
+        double newWindSpeed = baseLineSpeed + offset;
+        wind.setWindSpeed(newWindSpeed);
     }
 
     private void initialiseOscillationDirection() {
@@ -98,8 +96,8 @@ public class ShiftingWindGenerator implements WindGenerator {
         this.bearingVariance = maxBearingVariance;
     }
 
-    public void setSpeedVariance(double speedVariance) {
-        this.speedVariance = speedVariance;
+    public void setWindSpeedVariance(double windSpeedVariance) {
+        this.windSpeedVariance = windSpeedVariance;
     }
 
     public void setOscillationPeriod(double oscillationPeriod) {

From 8250226bdec95461c6b5f6b480d3973edab4a22b Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Thu, 31 Aug 2017 15:00:37 +1200
Subject: [PATCH 17/51] Key bindings can be updated with any key.

- Changed key press from FXML key event to a listener
- UP, DOWN, ENTER keys now work
- Keys no longer change cells or press buttons
- Added placeholder buttons Cancel, Reset and Save
- Added some JavaDoc

#story[1197]
---
 .../Controllers/KeyBindingsController.java    | 65 +++++++++++--------
 .../gameController/Keys/KeyFactory.java       |  6 ++
 .../visualiser/scenes/keyBindings.fxml        |  4 +-
 3 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index 77b6687f..356430a0 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -6,13 +6,16 @@ import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.AnchorPane;
 import visualiser.gameController.Keys.ControlKey;
 import visualiser.gameController.Keys.KeyFactory;
 import java.util.Map;
 
+/**
+ * Controller for the scene used to display and update current key bindings.
+ */
 public class KeyBindingsController {
     @FXML Button btnSave;
     @FXML Button btnCancel;
@@ -20,18 +23,21 @@ public class KeyBindingsController {
     @FXML ListView lstControl;
     @FXML ListView lstKey;
     @FXML ListView lstDescription;
-    @FXML Label lblTitle;
+    @FXML AnchorPane anchor;
     String currentButton = null;
     KeyFactory keyFactory = KeyFactory.getFactory();
 
     public void initialize(){
 
+        // headings for each column
         lstKey.getItems().add("Key");
         lstControl.getItems().add("Command");
         lstDescription.getItems().add("Description");
+        lstKey.getSelectionModel().select(0);
+        lstControl.getSelectionModel().select(0);
+        lstDescription.getSelectionModel().select(0);
 
-
-
+        // populate columns with current key bindings and buttons to update
         for (Map.Entry<String, ControlKey> entry : keyFactory.getKeyState().entrySet()) {
             Button button = new Button(entry.getKey());
             button.setMinWidth(120);
@@ -46,10 +52,7 @@ public class KeyBindingsController {
             lstDescription.getItems().add(entry.getValue().getProtocolCode());
         }
 
-        lstKey.getSelectionModel().select(0);
-        lstControl.getSelectionModel().select(0);
-        lstDescription.getSelectionModel().select(0);
-
+        // stop the columns from being selectable, so only the buttons are
         lstKey.getSelectionModel().selectedItemProperty()
                 .addListener((observable, oldvalue, newValue) -> {
                     Platform.runLater(new Runnable() {
@@ -75,11 +78,39 @@ public class KeyBindingsController {
                     });
                 });
 
+        // add CSS stylesheet once the scene has been created
         lstKey.sceneProperty().addListener((obs, oldScene, newScene) -> {
             if (newScene != null) {
                 newScene.getStylesheets().add("/css/keyBindings.css");
             }
+        });
+
+        setKeyListener();
+    }
 
+    /**
+     * Creates a listener for the base anchorpane for key presses.
+     * It updates the current key bindings if required.
+     */
+    public void setKeyListener(){
+        anchor.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            // if a button was clicked
+            if (currentButton != null) {
+                // update text on the button
+                ObservableList buttons = lstKey.getItems();
+                for (int i = 1; i < buttons.size(); i++) {
+                    if (currentButton == ((Button)buttons.get(i)).getText()) {
+                        ((Button)buttons.get(i)).setText(event.getCode().toString
+                                ());
+                        break;
+                    }
+                }
+                // update the control key
+                keyFactory.updateKey(currentButton, event.getCode().toString());
+                // remove current button selection
+                currentButton = null;
+            }
+            event.consume();
         });
     }
 
@@ -95,22 +126,4 @@ public class KeyBindingsController {
         System.out.println("save clicked");
     }
 
-    public void onKey(KeyEvent e){
-        System.out.println("key pressed");
-        // if a button was clicked
-        if (currentButton!=null){
-            // update text on the button
-            ObservableList buttons = lstKey.getItems();
-            for (int i = 1; i < buttons.size(); i++) {
-                if (currentButton == ((Button)buttons.get(i)).getText()) {
-                    ((Button)buttons.get(i)).setText(e.getCode().toString());
-                    break;
-                }
-            }
-            // update the control key
-            keyFactory.updateKey(currentButton, e.getCode().toString());
-            // remove current button selection
-            currentButton = null;
-        }
-    }
 }
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
index 26267d84..555cafff 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
@@ -52,8 +52,14 @@ public class KeyFactory {
         return keyState;
     }
 
+    /**
+     * Update the key bound to a particular command in the keystate.
+     * @param oldKey the existing key to updated
+     * @param newKey the new key value to replace the old
+     */
     public void updateKey(String oldKey, String newKey){
         ControlKey controlKey = keyState.get(oldKey);
+        keyState.remove(oldKey, controlKey);
         keyState.put(newKey, controlKey);
     }
 }
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml b/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
index 9f881b21..6ce15890 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
@@ -6,9 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane id="anchor" maxHeight="-Infinity" maxWidth="-Infinity"
-        minHeight="-Infinity"
-            minWidth="-Infinity" onKeyPressed="#onKey" prefHeight="471.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.KeyBindingsController">
+<AnchorPane id="anchor" fx:id="anchor" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="471.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.KeyBindingsController">
    <children>
       <Label fx:id="lblTitle" layoutX="172.0" layoutY="14.0" text="Key Bindings">
          <font>

From 9a5d20bdf28bae996d0d2ffb14f46b4f57f560a1 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Thu, 31 Aug 2017 17:39:17 +1200
Subject: [PATCH 18/51] Added new polar function, currently it does not
 distinguish between up wind and downwind and doesn't find it in the correct
 quadrant #story[1186]

---
 .../main/java/mock/dataInput/PolarParser.java |  1 +
 .../src/main/java/mock/model/MockRace.java    | 32 ++++++------
 .../src/main/java/mock/model/Polars.java      | 49 +++++++++++++++++--
 .../src/main/java/mock/model/RaceServer.java  |  4 +-
 .../src/main/java/mock/model/VMG.java         |  4 ++
 5 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/dataInput/PolarParser.java b/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
index d33c0ac5..3fa3e6de 100644
--- a/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
+++ b/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
@@ -89,6 +89,7 @@ public class PolarParser {
                     Bearing angle = Bearing.fromDegrees(angleDegrees);
                     double boatSpeedKnots = Double.parseDouble(row[i + 1]);
                     polarTable.addEstimate(windSpeedKnots, angle, boatSpeedKnots);
+                    polarTable.addPolars(windSpeedKnots, angle, boatSpeedKnots);
 
                 } catch (NumberFormatException e) {
                     throw new InvalidPolarFileException("Could not convert (Row,Col): (" + rowNumber + "," + i +") = " + row[i] + " to a double.", e);
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 379123af..2c19ea10 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -356,14 +356,15 @@ public class MockRace extends Race {
 
         if (boat.getTimeSinceTackChange() > tackPeriod) {
             //Calculate the new VMG.
-            VMG newVMG = boat.getPolars().calculateVMG(
-                    this.getWindDirection(),
-                    this.getWindSpeed(),
-                    boat.calculateBearingToNextMarker(),
-                    Bearing.fromDegrees(0d),
-                    Bearing.fromDegrees(359.99999d));
-
-
+//            VMG newVMG = boat.getPolars().calculateVMG(
+//                    this.getWindDirection(),
+//                    this.getWindSpeed(),
+//                    boat.calculateBearingToNextMarker(),
+//                    Bearing.fromDegrees(0d),
+//                    Bearing.fromDegrees(359.99999d));
+
+            VMG newVMG = boat.getPolars().setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
+            System.out.println(newVMG);
             //If the new vmg improves velocity, use it.
             if (improvesVelocity(boat, newVMG)) {
                 boat.setVMG(newVMG);
@@ -372,12 +373,13 @@ public class MockRace extends Race {
     }
 
     private void setBoatSpeed(MockBoat boat) {
-        VMG vmg = boat.getPolars().calculateVMG(
-                this.getWindDirection(),
-                this.getWindSpeed(),
-                boat.getBearing(),
-                Bearing.fromDegrees(boat.getBearing().degrees() - 1),
-                Bearing.fromDegrees(boat.getBearing().degrees() + 1));
+//        VMG vmg = boat.getPolars().calculateVMG(
+//                this.getWindDirection(),
+//                this.getWindSpeed(),
+//                boat.getBearing(),
+//                Bearing.fromDegrees(boat.getBearing().degrees() - 1),
+//                Bearing.fromDegrees(boat.getBearing().degrees() + 1));
+        VMG vmg = boat.getPolars().setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
         if (vmg.getSpeed() > 0) {
             boat.setCurrentSpeed(vmg.getSpeed());
         }
@@ -527,7 +529,7 @@ public class MockRace extends Race {
                 if (boat.isStarboardSide(roundingMark) &&
                         GPSCoordinate.passesLine(roundingMark.getPosition(),
                                 roundingChecks.get(0), boat.getPosition(), legBearing) &&
-                                gateCheck &&
+                        gateCheck &&
                         boat.isBetweenGate(roundingMark, Mark.tempMark(roundingChecks.get(0)))) {
                     boat.increaseRoundingStatus();
                     if (boat.getCurrentLeg().getLegNumber() + 2 >= legs.size()){
diff --git a/racevisionGame/src/main/java/mock/model/Polars.java b/racevisionGame/src/main/java/mock/model/Polars.java
index 32ee8842..a18aa627 100644
--- a/racevisionGame/src/main/java/mock/model/Polars.java
+++ b/racevisionGame/src/main/java/mock/model/Polars.java
@@ -3,10 +3,7 @@ package mock.model;
 import javafx.util.Pair;
 import shared.model.Bearing;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Encapsulates an entire polar table. Has a function to calculate VMG.
@@ -25,6 +22,8 @@ public class Polars {
      */
     private HashMap<Double, List<Bearing>> polarAngles = new HashMap<>();
 
+    //true wind speed, <true wind angle, best boat angle>
+    private HashMap<Double, HashMap<Double, Double>> polars = new HashMap<>();
 
 
 
@@ -78,7 +77,49 @@ public class Polars {
 
     }
 
+    public void addPolars(double trueWindSpeed, Bearing trueWindAngle, double boatSpeed){
+        double tws = trueWindSpeed;
+        double bs = boatSpeed;
+        double twa = trueWindAngle.degrees();
+        if (!polars.containsKey(tws)){
+            polars.put(tws, new HashMap<>());
+        }
+        polars.get(tws).put(twa, bs);
+    }
+
+    public double getClosest(double value, Set<Double> set){
+        double closestVal = 0;
+        double smallestDiff = Double.MAX_VALUE;
+        for (double d: set){
+            double diff = Math.abs(value - d);
+            if (diff < smallestDiff){
+                closestVal = d;
+                smallestDiff = diff;
+            }
+        }
+        return closestVal;
+    }
 
+    /**
+     *
+     * @param trueWindAngle
+     * @param trueWindSpeed
+     * @param boatAngle
+     * @return
+     */
+    public VMG setBestVMG(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
+        //speed
+        double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
+
+        //not using true vmg using general concept
+        double angle = Math.abs(trueWindAngle.degrees() - boatAngle.degrees());
+
+        double closestAngle = getClosest(angle, polars.get(closestSpeed).keySet());
+
+        Bearing vmgAngle = Bearing.fromDegrees(closestAngle);
+        double boatSpeed = Math.abs(closestSpeed * Math.cos(vmgAngle.radians())) * 4;
+        return new VMG(boatSpeed, vmgAngle);
+    }
 
     /**
      * Calculates the VMG for a given wind angle, wind speed, and angle to destination. Will only return VMGs that have a true bearing (angle) within a given bound - this is to ensure that you can calculate VMGs without going out of bounds.
diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java
index cbbe1971..a28f389d 100644
--- a/racevisionGame/src/main/java/mock/model/RaceServer.java
+++ b/racevisionGame/src/main/java/mock/model/RaceServer.java
@@ -151,7 +151,7 @@ public class RaceServer {
         List<BoatStatus> boatStatuses = new ArrayList<>();
 
         //Add each boat status to the status list.
-        for (MockBoat boat : race.getBoats()) {
+        /*for (MockBoat boat : race.getBoats()) {
 
             BoatStatus boatStatus = new BoatStatus(
                     boat.getSourceID(),
@@ -160,7 +160,7 @@ public class RaceServer {
                     boat.getEstimatedTimeAtNextMark().toInstant().toEpochMilli() );
 
             boatStatuses.add(boatStatus);
-        }
+        }*/
 
 
 
diff --git a/racevisionGame/src/main/java/mock/model/VMG.java b/racevisionGame/src/main/java/mock/model/VMG.java
index 905fadce..370df835 100644
--- a/racevisionGame/src/main/java/mock/model/VMG.java
+++ b/racevisionGame/src/main/java/mock/model/VMG.java
@@ -45,4 +45,8 @@ public class VMG {
         return bearing;
     }
 
+    public String toString(){
+        return String.format("VMG Object: Speed %f, Bearing %f.", speed, bearing.degrees());
+    }
+
 }

From 3176e76c8cd1b0350327040213d805029d263c90 Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Thu, 31 Aug 2017 21:06:13 +1200
Subject: [PATCH 19/51] MockRace: Now uses RaceState as its base class, rather
 than Race. This aligns it with VisualiserRace. RaceState contains the shared
 race state between the client and server, and stores most of its data in
 RaceDataSource etc..., instead of maintaining its own copy. Moved collider
 registry member to MockRace.

XMLUtilities:
Added documentation to two important functions, and updated them to use generics instead of Objects.
#story[1188]
---
 .../src/main/java/mock/app/Event.java         |   5 +-
 .../src/main/java/mock/model/MockRace.java    |  60 ++--
 .../main/java/mock/xml/RaceXMLCreator.java    |  12 +-
 .../src/main/java/shared/model/Race.java      | 318 ------------------
 .../main/java/shared/xml/XMLUtilities.java    |  27 +-
 5 files changed, 71 insertions(+), 351 deletions(-)
 delete mode 100644 racevisionGame/src/main/java/shared/model/Race.java

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index c054e2fb..526223ba 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -25,6 +25,8 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -118,7 +120,8 @@ public class Event {
 
         }
 
-        this.sourceIdAllocator = new SourceIdAllocator(raceDataSource.getParticipants());
+        List<Integer> potentialParticipants = new ArrayList<>(boatDataSource.getBoats().keySet());
+        this.sourceIdAllocator = new SourceIdAllocator(potentialParticipants);
         this.compositeCommand = new CompositeCommand();
         this.latestMessages = new LatestMessages();
 
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 379123af..357d34ce 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -1,6 +1,7 @@
 package mock.model;
 
 import javafx.animation.AnimationTimer;
+import mock.model.collider.ColliderRegistry;
 import mock.xml.*;
 import network.Messages.BoatLocation;
 import network.Messages.BoatStatus;
@@ -13,7 +14,6 @@ import shared.exceptions.BoatNotFoundException;
 import shared.enums.RoundingType;
 import shared.model.*;
 import shared.model.Bearing;
-import shared.model.Race;
 
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
@@ -27,7 +27,7 @@ import static java.lang.Math.cos;
  * Has a course, boats, boundaries, etc...
  * Is responsible for simulating the race, and sending messages to a MockOutput instance.
  */
-public class MockRace extends Race {
+public class MockRace extends RaceState {
 
     /**
      * An observable list of boats in the race.
@@ -40,6 +40,12 @@ public class MockRace extends Race {
     private List<GPSCoordinate> shrinkBoundary;
 
 
+    /**
+     * Registry for all collider object in this race
+     */
+    protected ColliderRegistry colliderRegistry;
+
+
     /**
      * The scale factor of the race.
      * See {@link Constants#RaceTimeScale}.
@@ -51,6 +57,8 @@ public class MockRace extends Race {
      */
     private WindGenerator windGenerator;
 
+
+
     /**
      * Constructs a race object with a given RaceDataSource, BoatDataSource, and RegattaDataSource and sends events to the given mockOutput.
      * @param boatDataSource Data source for boat related data (yachts and marker boats).
@@ -62,13 +70,15 @@ public class MockRace extends Race {
      */
     public MockRace(BoatDataSource boatDataSource, RaceDataSource raceDataSource, RegattaDataSource regattaDataSource, Polars polars, int timeScale, WindGenerator windGenerator) {
 
-        super(boatDataSource, raceDataSource, regattaDataSource);
+        this.setBoatDataSource(boatDataSource);
+        this.setRaceDataSource(raceDataSource);
+        this.setRegattaDataSource(regattaDataSource);
 
         this.scaleFactor = timeScale;
 
         this.boats = this.generateMockBoats(boatDataSource.getBoats(), raceDataSource.getParticipants(), polars);
 
-        this.shrinkBoundary = GPSCoordinate.getShrinkBoundary(this.boundary);
+        this.shrinkBoundary = GPSCoordinate.getShrinkBoundary(this.getBoundary());
 
 
         this.windGenerator = windGenerator;
@@ -76,9 +86,19 @@ public class MockRace extends Race {
         //Wind.
         this.setWind(windGenerator.generateBaselineWind());
 
+
+        // Set up colliders
+        this.colliderRegistry = new ColliderRegistry();
+
+        for(CompoundMark mark: this.getCompoundMarks()) {
+            colliderRegistry.addCollider(mark.getMark1());
+            if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2());
+        }
+
         this.colliderRegistry.addAllColliders(boats);
     }
 
+
     /**
      * Generates a list of MockBoats given a list of Boats, and a list of participating boats.
      * @param boats The map of Boats describing boats that are potentially in the race. Maps boat sourceID to boat.
@@ -108,12 +128,17 @@ public class MockRace extends Race {
     }
 
 
+    public ColliderRegistry getColliderRegistry() {
+        return colliderRegistry;
+    }
+
+
     /**
      * Updates the race time to a specified value, in milliseconds since the unix epoch.
      * @param currentTime Milliseconds since unix epoch.
      */
     public void updateRaceTime(long currentTime) {
-        this.raceClock.setUTCTime(currentTime);
+        this.getRaceClock().setUTCTime(currentTime);
     }
 
 
@@ -123,7 +148,7 @@ public class MockRace extends Race {
     public void updateRaceStatusEnum() {
 
         //The millisecond duration of the race. Negative means it hasn't started, so we flip sign.
-        long timeToStart = - this.raceClock.getDurationMilli();
+        long timeToStart = - this.getRaceClock().getDurationMilli();
 
 
         if (timeToStart > Constants.RacePreStartTime) {
@@ -194,7 +219,7 @@ public class MockRace extends Race {
 
 
             //The boat starts on the first leg of the race.
-            boat.setCurrentLeg(this.legs.get(0));
+            boat.setCurrentLeg(this.getLegs().get(0));
 
             //Boats start with 0 knots speed.
             boat.setCurrentSpeed(0d);
@@ -223,7 +248,7 @@ public class MockRace extends Race {
     private List<GPSCoordinate> getSpreadStartingPositions() {
 
         //The first compound marker of the race - the starting gate.
-        CompoundMark compoundMark = this.legs.get(0).getStartCompoundMark();
+        CompoundMark compoundMark = this.getLegs().get(0).getStartCompoundMark();
 
         //The position of the two markers from the compound marker.
         GPSCoordinate mark1Position = compoundMark.getMark1Position();
@@ -485,7 +510,7 @@ public class MockRace extends Race {
                                 roundingChecks.get(0), boat.getPosition(), legBearing) &&
                         gateCheck && boat.isBetweenGate(roundingMark, Mark.tempMark(roundingChecks.get(0)))) {
                     boat.increaseRoundingStatus();
-                    if (boat.getCurrentLeg().getLegNumber() + 2 >= legs.size()){
+                    if (boat.getCurrentLeg().getLegNumber() + 2 >= getLegs().size()){
                         //boat has finished race
                         boat.increaseRoundingStatus();
                     }
@@ -503,7 +528,7 @@ public class MockRace extends Race {
             case 2://has traveled 180 degrees around the mark
                 //Move boat on to next leg.
                 boat.resetRoundingStatus();
-                Leg nextLeg = this.legs.get(boat.getCurrentLeg().getLegNumber() + 1);
+                Leg nextLeg = this.getLegs().get(boat.getCurrentLeg().getLegNumber() + 1);
                 boat.setCurrentLeg(nextLeg);
                 break;
         }
@@ -530,7 +555,7 @@ public class MockRace extends Race {
                                 gateCheck &&
                         boat.isBetweenGate(roundingMark, Mark.tempMark(roundingChecks.get(0)))) {
                     boat.increaseRoundingStatus();
-                    if (boat.getCurrentLeg().getLegNumber() + 2 >= legs.size()){
+                    if (boat.getCurrentLeg().getLegNumber() + 2 >= getLegs().size()){
                         //boat has finished race
                         boat.increaseRoundingStatus();
                     }
@@ -547,7 +572,7 @@ public class MockRace extends Race {
             case 2://has traveled 180 degrees around the mark
                 //Move boat on to next leg.
                 boat.resetRoundingStatus();
-                Leg nextLeg = this.legs.get(boat.getCurrentLeg().getLegNumber() + 1);
+                Leg nextLeg = this.getLegs().get(boat.getCurrentLeg().getLegNumber() + 1);
                 boat.setCurrentLeg(nextLeg);
                 break;
         }
@@ -585,7 +610,7 @@ public class MockRace extends Race {
 
             GPSCoordinate roundCheck2;
             try{
-                Leg nextLeg = legs.get(legs.indexOf(boat.getCurrentLeg()) + 1);
+                Leg nextLeg = getLegs().get(getLegs().indexOf(boat.getCurrentLeg()) + 1);
 
                 GPSCoordinate startNextDirectionLinePoint = nextLeg.getStartCompoundMark().getMark1Position();
                 GPSCoordinate endNextDirectionLinePoint = nextLeg.getEndCompoundMark().getMark1Position();
@@ -681,7 +706,7 @@ public class MockRace extends Race {
      */
     public void changeWindDirection() {
 
-        Wind nextWind = windGenerator.generateNextWind(raceWind.getValue());
+        Wind nextWind = windGenerator.generateNextWind(windProperty().getValue());
 
         setWind(nextWind);
     }
@@ -702,13 +727,10 @@ public class MockRace extends Race {
             long timeFromNow = (long) (1000 * boat.calculateDistanceToNextMarker() / velocityToMark);
 
             //Calculate time at which it will reach mark.
-            ZonedDateTime timeAtMark = this.raceClock.getCurrentTime().plus(timeFromNow, ChronoUnit.MILLIS);
+            ZonedDateTime timeAtMark = this.getRaceClock().getCurrentTime().plus(timeFromNow, ChronoUnit.MILLIS);
             boat.setEstimatedTimeAtNextMark(timeAtMark);
         }
 
     }
 
-    public List<CompoundMark> getCompoundMarks() {
-        return compoundMarks;
-    }
-}
\ No newline at end of file
+}
diff --git a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
index f1b83479..5cb74625 100644
--- a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
+++ b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
@@ -77,7 +77,8 @@ public class RaceXMLCreator {
     public static String alterRaceToWind(String s, double degrees) throws XMLReaderException, InvalidRaceDataException, JAXBException, IOException, SAXException, ParserConfigurationException {
         RaceXMLReader reader = new RaceXMLReader(s, XMLFileType.ResourcePath);
 
-        XMLRace race = (XMLRace) XMLUtilities.xmlToClass(RaceXMLCreator.class.getClassLoader().getResourceAsStream(s),
+        XMLRace race = XMLUtilities.xmlToClass(
+                RaceXMLCreator.class.getClassLoader().getResourceAsStream(s),
                 RaceXMLCreator.class.getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd"),
                 XMLRace.class);
 
@@ -89,14 +90,7 @@ public class RaceXMLCreator {
 
         alterRaceRotation(race, degreesToRotate);
 
-        JAXBContext context = JAXBContext.newInstance(XMLRace.class);
-        Marshaller jaxbMarshaller = context.createMarshaller();
-        jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-
-        StringWriter sw = new StringWriter();
-
-        jaxbMarshaller.marshal(race, sw);
-        return sw.toString();
+        return XMLUtilities.classToXML(race);
     }
 
     /**
diff --git a/racevisionGame/src/main/java/shared/model/Race.java b/racevisionGame/src/main/java/shared/model/Race.java
deleted file mode 100644
index a15e2edd..00000000
--- a/racevisionGame/src/main/java/shared/model/Race.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package shared.model;
-
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.Property;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import mock.model.collider.ColliderRegistry;
-import network.Messages.Enums.RaceStatusEnum;
-import network.Messages.Enums.RaceTypeEnum;
-import shared.dataInput.BoatDataSource;
-import shared.dataInput.RaceDataSource;
-import shared.dataInput.RegattaDataSource;
-
-import java.util.List;
-
-
-/**
- * Represents a yacht race.
- * Has a course, state, wind, boundaries, etc.... Boats are added by inheriting classes (see {@link Boat}, {@link mock.model.MockBoat}, {@link visualiser.model.VisualiserBoat}.
- */
-public abstract class Race {
-    /**
-     * The source of race related data.
-     */
-    protected RaceDataSource raceDataSource;
-    /**
-     * The source of boat related data.
-     */
-    protected BoatDataSource boatDataSource;
-    /**
-     * The source of regatta related data.
-     */
-    protected RegattaDataSource regattaDataSource;
-    /**
-     * A list of compound marks in the race.
-     */
-    protected List<CompoundMark> compoundMarks;
-    /**
-     * A list of legs in the race.
-     */
-    protected List<Leg> legs;
-    /**
-     * A list of coordinates describing the boundary of the course.
-     */
-    protected List<GPSCoordinate> boundary;
-    /**
-     * The clock which tracks the race's start time, current time, and elapsed duration.
-     */
-    protected RaceClock raceClock;
-    /**
-     * The race ID of the course.
-     */
-    protected int raceId;
-    /**
-     * The name of the regatta.
-     */
-    protected String regattaName;
-    /**
-     * The current status of the race.
-     */
-    protected RaceStatusEnum raceStatusEnum;
-    /**
-     * The type of race this is.
-     */
-    protected RaceTypeEnum raceType;
-    /**
-     * The race's wind.
-     */
-    protected Property<Wind> raceWind = new SimpleObjectProperty<>();
-    /**
-     * Registry for all collider object in this race
-     */
-    protected ColliderRegistry colliderRegistry;
-    /**
-     * The number of frames per second.
-     * We essentially track the number of frames generated per second, over a one second period. When {@link #lastFpsResetTime} reaches 1 second, currentFps is reset.
-     */
-    private int currentFps = 0;
-    /**
-     * The number of frames per second we generated over the last 1 second period.
-     */
-    private IntegerProperty lastFps = new SimpleIntegerProperty(0);
-    /**
-     * The time, in milliseconds, since we last reset our {@link #currentFps} counter.
-     */
-    private long lastFpsResetTime;
-
-    /**
-     * Constructs a race object with a given BoatDataSource, RaceDataSource, and RegattaDataSource.
-     * @param boatDataSource Data source for boat related data (yachts and marker boats).
-     * @param raceDataSource Data source for race related data (participating boats, legs, etc...).
-     * @param regattaDataSource Data source for race related data (course name, location, timezone, etc...).
-     */
-    public Race(BoatDataSource boatDataSource, RaceDataSource raceDataSource, RegattaDataSource regattaDataSource) {
-
-        //Keep a reference to data sources.
-        this.raceDataSource = raceDataSource;
-        this.boatDataSource = boatDataSource;
-        this.regattaDataSource = regattaDataSource;
-
-        //Marks.
-        this.compoundMarks = raceDataSource.getCompoundMarks();
-        //Boundaries.
-        this.boundary = raceDataSource.getBoundary();
-        //Legs.
-        this.useLegsList(raceDataSource.getLegs());
-        //Race ID.
-        this.raceId = raceDataSource.getRaceId();
-        //Regatta name.
-        this.regattaName = regattaDataSource.getRegattaName();
-        //Race clock.
-        this.raceClock = new RaceClock(this.raceDataSource.getStartDateTime());
-        //Race status.
-        this.setRaceStatusEnum(RaceStatusEnum.NOT_ACTIVE);
-        //Race type.
-        this.raceType = raceDataSource.getRaceType();
-        //Wind.
-        this.setWind(Bearing.fromDegrees(0), 0);
-        // Set up colliders
-        this.colliderRegistry = new ColliderRegistry();
-
-        for(CompoundMark mark: compoundMarks) {
-            colliderRegistry.addCollider(mark.getMark1());
-            if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2());
-        }
-    }
-
-    public ColliderRegistry getColliderRegistry() {
-        return colliderRegistry;
-    }
-
-    /**
-     * Initialise the boats in the race.
-     * This sets their starting positions and current legs.
-     */
-    protected abstract void initialiseBoats();
-
-    /**
-     * Updates the race to use a new list of legs, and adds a dummy "Finish" leg at the end.
-     * @param legs The new list of legs to use.
-     */
-    protected void useLegsList(List<Leg> legs) {
-        //We add a "dummy" leg at the end of the race.
-        this.legs = legs;
-        this.legs.add(new Leg("Finish", this.legs.size()));
-    }
-
-    /**
-     * Determines whether or not a specific leg is the last leg in the race.
-     * @param leg The leg to check.
-     * @return Returns true if it is the last, false otherwise.
-     */
-    protected boolean isLastLeg(Leg leg) {
-
-        //Get the last leg.
-        Leg lastLeg = this.legs.get(this.legs.size() - 1);
-
-        //Check its ID.
-        int lastLegID = lastLeg.getLegNumber();
-
-        //Get the specified leg's ID.
-        int legID = leg.getLegNumber();
-
-
-        //Check if they are the same.
-        return legID == lastLegID;
-    }
-
-    /**
-     * Returns the current race status.
-     * @return The current race status.
-     */
-    public RaceStatusEnum getRaceStatusEnum() {
-        return raceStatusEnum;
-    }
-
-    /**
-     * Sets the current race status.
-     * @param raceStatusEnum The new status of the race.
-     */
-    public void setRaceStatusEnum(RaceStatusEnum raceStatusEnum) {
-        this.raceStatusEnum = raceStatusEnum;
-    }
-
-    /**
-     * Returns the type of race this is.
-     * @return The type of race this is.
-     */
-    public RaceTypeEnum getRaceType() {
-        return raceType;
-    }
-
-    /**
-     * Returns the name of the regatta.
-     * @return The name of the regatta.
-     */
-    public String getRegattaName() {
-        return regattaName;
-    }
-
-    /**
-     * Updates the race to have a specified wind bearing and speed.
-     * @param windBearing New wind bearing.
-     * @param windSpeedKnots New wind speed, in knots.
-     */
-    protected void setWind(Bearing windBearing, double windSpeedKnots) {
-        Wind wind = new Wind(windBearing, windSpeedKnots);
-        setWind(wind);
-    }
-
-    /**
-     * Updates the race to have a specified wind (bearing and speed).
-     * @param wind New wind.
-     */
-    protected void setWind(Wind wind) {
-        this.raceWind.setValue(wind);
-    }
-
-    /**
-     * Returns the wind bearing.
-     * @return The wind bearing.
-     */
-    public Bearing getWindDirection() {
-        return raceWind.getValue().getWindDirection();
-    }
-
-    /**
-     * Returns the wind speed.
-     * Measured in knots.
-     * @return The wind speed.
-     */
-    public double getWindSpeed() {
-        return raceWind.getValue().getWindSpeed();
-    }
-
-    /**
-     * Returns the RaceClock for this race.
-     * This is used to track the start time, current time, and elapsed duration of the race.
-     * @return The RaceClock for the race.
-     */
-    public RaceClock getRaceClock() {
-        return raceClock;
-    }
-
-    /**
-     * Returns the RaceDataSource used for the race.
-     * @return The RaceDataSource used for the race.
-     */
-    public RaceDataSource getRaceDataSource() {
-        return raceDataSource;
-    }
-
-    /**
-     * Returns the number of legs in the race.
-     * @return The number of legs in the race.
-     */
-    public int getLegCount() {
-        //We minus one, as we have added an extra "dummy" leg.
-        return legs.size() - 1;
-    }
-
-    /**
-     * Returns the race boundary.
-     * @return The race boundary.
-     */
-    public List<GPSCoordinate> getBoundary() {
-        return boundary;
-    }
-
-
-    /**
-     * Returns the marks of the race.
-     * @return Marks of the race.
-     */
-    public List<CompoundMark> getCompoundMarks() {
-        return compoundMarks;
-    }
-
-    /**
-     * Returns the legs of the race.
-     * @return Legs of the race.
-     */
-    public List<Leg> getLegs() {
-        return legs;
-    }
-
-    /**
-     * Returns the fps property.
-     * @return The fps property.
-     */
-    public IntegerProperty fpsProperty() {
-        return  lastFps;
-    }
-
-    /**
-     * Increments the FPS counter, and adds timePeriod milliseconds to our FPS reset timer.
-     * @param timePeriod Time, in milliseconds, to add to {@link #lastFpsResetTime}.
-     */
-    protected void incrementFps(long timePeriod) {
-        //Increment.
-        this.currentFps++;
-
-        //Add period to timer.
-        this.lastFpsResetTime += timePeriod;
-
-        //If we have reached 1 second period, snapshot the framerate and reset.
-        if (this.lastFpsResetTime > 1000) {
-            this.lastFps.set(this.currentFps);
-
-            this.currentFps = 0;
-            this.lastFpsResetTime = 0;
-        }
-    }
-
-    public int getRaceId() {
-        return raceId;
-    }
-}
diff --git a/racevisionGame/src/main/java/shared/xml/XMLUtilities.java b/racevisionGame/src/main/java/shared/xml/XMLUtilities.java
index 8e01cb76..0a50f77d 100644
--- a/racevisionGame/src/main/java/shared/xml/XMLUtilities.java
+++ b/racevisionGame/src/main/java/shared/xml/XMLUtilities.java
@@ -20,10 +20,17 @@ import java.io.*;
 import java.net.URL;
 
 /**
- * Created by fwy13 on 13/08/17.
+ * Contains utility functions to convert between xml files and xml class objects.
  */
 public class XMLUtilities {
 
+
+    /**
+     * Converts an XML class object to an XML string.
+     * @param o The XML class object to convert.
+     * @return String containing the serialised XML data.
+     * @throws JAXBException Thrown if the object is cannot be serialised to XML.
+     */
     public static String classToXML(Object o) throws JAXBException {
         JAXBContext context = JAXBContext.newInstance(o.getClass());
         Marshaller jaxbMarshaller = context.createMarshaller();
@@ -49,14 +56,26 @@ public class XMLUtilities {
         return xmlToClass(document, schemaURL, c);
     }
 
-    public static Object xmlToClass(InputStream i, URL schemaURL, Class c) throws ParserConfigurationException, IOException, SAXException, JAXBException {
+    /**
+     * Converts an XML file to an XML class (e.g., {@link shared.xml.Race.XMLRace}).
+     * @param i The input stream for the XML file.
+     * @param schemaURL URL for the XML schema.
+     * @param c The XML class to convert to.
+     * @param <T> The XML class to convert to.
+     * @return The XML class object.
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     * @throws JAXBException
+     */
+    public static <T> T xmlToClass(InputStream i, URL schemaURL, Class<T> c) throws ParserConfigurationException, IOException, SAXException, JAXBException {
         DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
         Document document = parser.parse(i);
 
         return xmlToClass(document, schemaURL, c);
     }
 
-    public static Object xmlToClass(Document document, URL schemaURL, Class c) throws ParserConfigurationException, IOException, SAXException, JAXBException {
+    public static <T> T xmlToClass(Document document, URL schemaURL, Class<T> c) throws ParserConfigurationException, IOException, SAXException, JAXBException {
         JAXBContext jc = JAXBContext.newInstance(c);
         Unmarshaller unmarshaller = jc.createUnmarshaller();
 
@@ -64,7 +83,7 @@ public class XMLUtilities {
         Schema schema = sf.newSchema(schemaURL);
         unmarshaller.setSchema(schema);
 
-        return unmarshaller.unmarshal(new DOMSource(document));
+        return (T) unmarshaller.unmarshal(new DOMSource(document));
     }
 
     public static boolean validateXML(String file, URL schemaURL){

From 2188ddc3a328403c5764cd63c488b14d586d10b9 Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Thu, 31 Aug 2017 21:59:28 +1200
Subject: [PATCH 20/51] Fixed errors in making the keybinding replaceable.

- Changed KeyFactory to not be a singleton
- Simplified keyBindings initializer
- Modified and simplified keyListener
- Added method to copy existing keyState
- Changed button events
- Changed to newer lambda functions
- Modified updateKey method
- Left option for multiple keys bound to one command
- Updated and wrote new JavaDoc

#story[1197]
---
 .../Controllers/KeyBindingsController.java    | 141 ++++++++++--------
 .../Controllers/RaceController.java           |   5 +-
 .../src/main/java/visualiser/app/App.java     |   2 +
 .../gameController/InputChecker.java          |   5 +-
 .../gameController/Keys/DownWindKey.java      |   6 +-
 .../gameController/Keys/KeyFactory.java       |  48 +++---
 .../gameController/Keys/SailsToggleKey.java   |   6 +-
 .../gameController/Keys/TackGybeKey.java      |   6 +-
 .../gameController/Keys/UpWindKey.java        |   6 +-
 .../gameController/Keys/VMGKey.java           |   7 +-
 .../gameController/Keys/ZoomInKey.java        |   4 +-
 .../gameController/Keys/ZoomOutKey.java       |   6 +-
 12 files changed, 120 insertions(+), 122 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index 356430a0..528f3869 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -1,9 +1,6 @@
 package visualiser.Controllers;
 
 import javafx.application.Platform;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
@@ -11,25 +8,40 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
 import visualiser.gameController.Keys.ControlKey;
 import visualiser.gameController.Keys.KeyFactory;
+
+import java.util.HashMap;
 import java.util.Map;
 
+import static visualiser.app.App.keyFactory;
+
 /**
  * Controller for the scene used to display and update current key bindings.
  */
 public class KeyBindingsController {
-    @FXML Button btnSave;
-    @FXML Button btnCancel;
-    @FXML Button btnReset;
-    @FXML ListView lstControl;
-    @FXML ListView lstKey;
-    @FXML ListView lstDescription;
-    @FXML AnchorPane anchor;
-    String currentButton = null;
-    KeyFactory keyFactory = KeyFactory.getFactory();
+    private @FXML Button btnSave;
+    private @FXML Button btnCancel;
+    private @FXML Button btnReset;
+    private @FXML ListView lstControl;
+    private @FXML ListView lstKey;
+    private @FXML ListView lstDescription;
+    private @FXML AnchorPane anchor;
+    private Button currentButton = null;
+    private KeyFactory newKeyFactory;
 
     public void initialize(){
+        // create new key factory to modify, keeping the existing one safe
+        newKeyFactory = copyExistingFactory();
+        initializeTable();
+        populateTable();
+        setKeyListener();
+    }
 
-        // headings for each column
+    /**
+     * Sets up table before populating it.
+     * Set up includes headings, CSS styling and modifying default properties.
+     */
+    public void initializeTable(){
+        // set the headings for each column
         lstKey.getItems().add("Key");
         lstControl.getItems().add("Command");
         lstDescription.getItems().add("Description");
@@ -37,47 +49,6 @@ public class KeyBindingsController {
         lstControl.getSelectionModel().select(0);
         lstDescription.getSelectionModel().select(0);
 
-        // populate columns with current key bindings and buttons to update
-        for (Map.Entry<String, ControlKey> entry : keyFactory.getKeyState().entrySet()) {
-            Button button = new Button(entry.getKey());
-            button.setMinWidth(120);
-            button.setOnAction(new EventHandler<ActionEvent>() {
-                @Override public void handle(ActionEvent e) {
-                    currentButton = button.getText();
-                    System.out.println("Button clicked");
-                }
-            });
-            lstKey.getItems().add(button);
-            lstControl.getItems().add(entry.getValue());
-            lstDescription.getItems().add(entry.getValue().getProtocolCode());
-        }
-
-        // stop the columns from being selectable, so only the buttons are
-        lstKey.getSelectionModel().selectedItemProperty()
-                .addListener((observable, oldvalue, newValue) -> {
-                    Platform.runLater(new Runnable() {
-                        public void run() {
-                            lstKey.getSelectionModel().select(0);
-                        }
-                    });
-                });
-        lstDescription.getSelectionModel().selectedItemProperty()
-                .addListener((observable, oldvalue, newValue) -> {
-                    Platform.runLater(new Runnable() {
-                        public void run() {
-                            lstDescription.getSelectionModel().select(0);
-                        }
-                    });
-                });
-        lstControl.getSelectionModel().selectedItemProperty()
-                .addListener((observable, oldvalue, newValue) -> {
-                    Platform.runLater(new Runnable() {
-                        public void run() {
-                            lstControl.getSelectionModel().select(0);
-                        }
-                    });
-                });
-
         // add CSS stylesheet once the scene has been created
         lstKey.sceneProperty().addListener((obs, oldScene, newScene) -> {
             if (newScene != null) {
@@ -85,7 +56,54 @@ public class KeyBindingsController {
             }
         });
 
-        setKeyListener();
+        // stop the columns from being selectable, so only the buttons are
+        lstKey.getSelectionModel().selectedItemProperty()
+                .addListener((observable, oldvalue, newValue) ->
+                        Platform.runLater(() ->
+                        lstKey.getSelectionModel().select(0)));
+        lstDescription.getSelectionModel().selectedItemProperty()
+                .addListener((observable, oldvalue, newValue) ->
+                        Platform.runLater(() ->
+                        lstDescription.getSelectionModel().select(0)));
+        lstControl.getSelectionModel().selectedItemProperty()
+                .addListener((observable, oldvalue, newValue) ->
+                        Platform.runLater(() ->
+                        lstControl.getSelectionModel().select(0)));
+    }
+
+    /**
+     * Populates the table with commands and their key binding details.
+     */
+    public void populateTable(){
+        // add each command to the table
+        for (Map.Entry<String, ControlKey> entry : newKeyFactory.getKeyState().entrySet()) {
+            // create button for command
+            Button button = new Button(entry.getKey());
+            button.setMinWidth(120);
+            button.setId(entry.getValue().toString());
+            button.setOnAction(e -> currentButton = button);
+            // display details for command in table
+            lstControl.getItems().add(entry.getValue());
+            lstKey.getItems().add(button);
+            lstDescription.getItems().add(entry.getValue().getProtocolCode());
+        }
+    }
+
+    /**
+     * Makes a copy of the keyfactory that does not modify the original.
+     * @return new keyfactory to be modified
+     */
+    public KeyFactory copyExistingFactory(){
+        newKeyFactory = new KeyFactory();
+        Map<String, ControlKey> newKeyState = newKeyFactory.getKeyState();
+        Map<String, ControlKey> oldKeyState = keyFactory.getKeyState();
+        newKeyState = new HashMap<>();  // clear default keys
+
+        // copy over commands and their keys
+        for (Map.Entry<String, ControlKey> entry : oldKeyState.entrySet()){
+            newKeyState.put(entry.getKey(), entry.getValue());
+        }
+        return newKeyFactory;
     }
 
     /**
@@ -96,17 +114,12 @@ public class KeyBindingsController {
         anchor.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             // if a button was clicked
             if (currentButton != null) {
+                System.out.println("button is clicked");
                 // update text on the button
-                ObservableList buttons = lstKey.getItems();
-                for (int i = 1; i < buttons.size(); i++) {
-                    if (currentButton == ((Button)buttons.get(i)).getText()) {
-                        ((Button)buttons.get(i)).setText(event.getCode().toString
-                                ());
-                        break;
-                    }
-                }
+                currentButton.setText(event.getCode().toString());
                 // update the control key
-                keyFactory.updateKey(currentButton, event.getCode().toString());
+                newKeyFactory.updateKey(event.getCode().toString(),
+                        currentButton.getId());
                 // remove current button selection
                 currentButton = null;
             }
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
index 4fcda581..395b4a6b 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
@@ -10,7 +10,6 @@ import javafx.collections.transformation.SortedList;
 import javafx.fxml.FXML;
 import javafx.scene.chart.LineChart;
 import javafx.scene.control.*;
-import javafx.scene.control.Label;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
@@ -23,7 +22,6 @@ import shared.model.Leg;
 import visualiser.app.App;
 import visualiser.gameController.ControllerClient;
 import visualiser.gameController.Keys.ControlKey;
-import visualiser.gameController.Keys.KeyFactory;
 import visualiser.model.*;
 
 import java.io.IOException;
@@ -33,6 +31,7 @@ import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static visualiser.app.App.keyFactory;
 
 
 /**
@@ -113,7 +112,7 @@ public class RaceController extends Controller {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        KeyFactory keyFactory = KeyFactory.getFactory();
+//        KeyFactory keyFactory = KeyFactory.getFactory();
         infoTableShow = true;
 
         // Initialise keyboard handler
diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java
index 92cb3096..9a1a7132 100644
--- a/racevisionGame/src/main/java/visualiser/app/App.java
+++ b/racevisionGame/src/main/java/visualiser/app/App.java
@@ -27,6 +27,7 @@ import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
 import javafx.util.Duration;
 import visualiser.Controllers.MainController;
+import visualiser.gameController.Keys.KeyFactory;
 
 public class App extends Application {
 
@@ -37,6 +38,7 @@ public class App extends Application {
     private Label progressText;
     private static final int SPLASH_WIDTH = 676;
     private static final int SPLASH_HEIGHT = 227;
+    public static KeyFactory keyFactory = new KeyFactory();
 
     public static App app;
 
diff --git a/racevisionGame/src/main/java/visualiser/gameController/InputChecker.java b/racevisionGame/src/main/java/visualiser/gameController/InputChecker.java
index 057b5721..b4b3de9b 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/InputChecker.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/InputChecker.java
@@ -3,10 +3,11 @@ package visualiser.gameController;
 import javafx.animation.AnimationTimer;
 import javafx.scene.Scene;
 import visualiser.gameController.Keys.ControlKey;
-import visualiser.gameController.Keys.KeyFactory;
 
 import java.util.HashMap;
 
+import static visualiser.app.App.keyFactory;
+
 /**
  * Class for checking what keys are currently being used
  */
@@ -18,7 +19,7 @@ public class InputChecker {
      * @param scene Scene the controller is to run in parallel with.
      */
     public void runWithScene(Scene scene){
-        KeyFactory keyFactory = KeyFactory.getFactory();
+//        KeyFactory keyFactory = KeyFactory.getFactory();
 
         scene.setOnKeyPressed(event -> {
             String codeString = event.getCode().toString();
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/DownWindKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/DownWindKey.java
index e4b5455a..6c974972 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/DownWindKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/DownWindKey.java
@@ -9,11 +9,9 @@ public class DownWindKey extends ControlKey {
 
     /**
      * Constructor for Control
-     *  @param name    name of the key
-     *
      */
-    public DownWindKey(String name) {
-        super(name, BoatActionEnum.DOWNWIND);
+    public DownWindKey() {
+        super("Downwind", BoatActionEnum.DOWNWIND);
     }
 
     @Override
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
index 555cafff..d896f6c6 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
@@ -13,30 +13,17 @@ public class KeyFactory {
     private Map<String, ControlKey> keyState;
 
     /**
-     * Singleton instance to enforce consistent key state
+     * Constructor for key state, set up initial state of each action.
      */
-    private static KeyFactory theFactory = new KeyFactory();
-
-    /**
-     * Singleton constructor for key state, set up initial state of each action.
-     */
-    private KeyFactory() {
+    public KeyFactory() {
         this.keyState = new HashMap<>();
-        keyState.put("Z", new ZoomInKey("Zoom In"));
-        keyState.put("X", new ZoomOutKey("Zoom Out"));
-        keyState.put("SPACE", new VMGKey("VMG"));
-        keyState.put("SHIFT", new SailsToggleKey("Toggle Sails"));
-        keyState.put("ENTER", new TackGybeKey("Tack/Gybe"));
-        keyState.put("UP", new UpWindKey("Upwind"));
-        keyState.put("DOWN", new DownWindKey("Downwind"));
-    }
-
-    /**
-     * Get singleton instance of KeyFactory to interact with key state
-     * @return automatically constructed KeyFactory
-     */
-    public static KeyFactory getFactory() {
-        return theFactory;
+        keyState.put("Z", new ZoomInKey());
+        keyState.put("X", new ZoomOutKey());
+        keyState.put("SPACE", new VMGKey());
+        keyState.put("SHIFT", new SailsToggleKey());
+        keyState.put("ENTER", new TackGybeKey());
+        keyState.put("UP", new UpWindKey());
+        keyState.put("DOWN", new DownWindKey());
     }
 
     /**
@@ -54,12 +41,21 @@ public class KeyFactory {
 
     /**
      * Update the key bound to a particular command in the keystate.
-     * @param oldKey the existing key to updated
-     * @param newKey the new key value to replace the old
+     * @param newKey the new key value for the command
+     * @param command the command to be updated
      */
-    public void updateKey(String oldKey, String newKey){
-        ControlKey controlKey = keyState.get(oldKey);
+    public void updateKey(String newKey, String command){
+        ControlKey controlKey = null;
+        String oldKey = null;
+        for (Map.Entry<String, ControlKey> entry : keyState.entrySet()) {
+            // if this is the correct command
+            if (entry.getValue().toString()==command){
+                controlKey = entry.getValue();
+                oldKey = entry.getKey();
+            }
+        }
         keyState.remove(oldKey, controlKey);
         keyState.put(newKey, controlKey);
     }
+
 }
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
index f1e4d65b..a04b7d77 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
@@ -10,11 +10,9 @@ public class SailsToggleKey extends ControlKey {
 
     /**
      * Constructor for Control
-     *  @param name    name of the key
-     *
      */
-    public SailsToggleKey(String name) {
-        super(name, BoatActionEnum.NOT_A_STATUS);
+    public SailsToggleKey() {
+        super("Toggle Sails", BoatActionEnum.NOT_A_STATUS);
     }
 
     /**
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/TackGybeKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/TackGybeKey.java
index 80252e73..5c164443 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/TackGybeKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/TackGybeKey.java
@@ -9,11 +9,9 @@ public class TackGybeKey extends ControlKey {
 
     /**
      * Constructor for Control
-     *  @param name    name of the key
-     *
      */
-    public TackGybeKey(String name) {
-        super(name, BoatActionEnum.TACK_GYBE);
+    public TackGybeKey() {
+        super("Tack/Gybe", BoatActionEnum.TACK_GYBE);
     }
 
     @Override
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/UpWindKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/UpWindKey.java
index 333e5f1f..b4bbf489 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/UpWindKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/UpWindKey.java
@@ -9,11 +9,9 @@ public class UpWindKey extends ControlKey {
 
     /**
      * Constructor for Control
-     *  @param name    name of the key
-     *
      */
-    public UpWindKey(String name) {
-        super(name, BoatActionEnum.UPWIND);
+    public UpWindKey() {
+        super("Upwind", BoatActionEnum.UPWIND);
     }
 
     @Override
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java
index c01658bb..2c7237f0 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java
@@ -1,6 +1,5 @@
 package visualiser.gameController.Keys;
 
-import javafx.scene.input.KeyCode;
 import network.Messages.Enums.BoatActionEnum;
 
 /**
@@ -10,11 +9,9 @@ public class VMGKey extends ControlKey{
 
     /**
      * Constructor for Control
-     *
-     * @param name    name of the key
      */
-    public VMGKey(String name) {
-        super(name, BoatActionEnum.AUTO_PILOT);
+    public VMGKey() {
+        super("VMG", BoatActionEnum.AUTO_PILOT);
     }
 
     @Override
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomInKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomInKey.java
index 51f98a58..e9a8ad7b 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomInKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomInKey.java
@@ -5,8 +5,8 @@ package visualiser.gameController.Keys;
  */
 public class ZoomInKey extends ControlKey {
 
-    public ZoomInKey(String name) {
-        super(name);
+    public ZoomInKey() {
+        super("Zoom In");
     }
 
     @Override
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomOutKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomOutKey.java
index 6da2210c..cbba97fc 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomOutKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomOutKey.java
@@ -7,11 +7,9 @@ public class ZoomOutKey extends ControlKey{
 
     /**
      * Constructor for Control
-     *  @param name    name of the key
-     *
      */
-    public ZoomOutKey(String name) {
-        super(name);
+    public ZoomOutKey() {
+        super("Zoom Out");
     }
 
     @Override

From ce47b0d81369645e58233339c657e436fe526493 Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Thu, 31 Aug 2017 22:28:55 +1200
Subject: [PATCH 21/51] When a new key is bound other commands bound to this
 key are removed

- On binding new key existing keys are searched
- If key is in use the old one is removed
- ControlKey is updated with a placeholder key value

#story[1197]
---
 .../visualiser/Controllers/KeyBindingsController.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index 528f3869..621e91ef 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -114,7 +114,15 @@ public class KeyBindingsController {
         anchor.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             // if a button was clicked
             if (currentButton != null) {
-                System.out.println("button is clicked");
+                // check if a button is already mapped to this key
+                for (int i = 1; i < lstKey.getItems().size(); i++) {
+                    Button button = (Button)lstKey.getItems().get(i);
+                    // update buttons text and remove key binding from command
+                    if (button.getText() == event.getCode().toString()) {
+                        button.setText("");
+                        newKeyFactory.updateKey(button.getId(), button.getId());
+                    }
+                }
                 // update text on the button
                 currentButton.setText(event.getCode().toString());
                 // update the control key

From 278fb65852ccc0fa900e860221fbd74e87e4f6c7 Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Thu, 31 Aug 2017 22:39:19 +1200
Subject: [PATCH 22/51] Pressing ESC cancels the selected command's key from
 being replaced

- focus is shifted away on esc
- focus is shifted away after successful change

#story[1197]
---
 .../visualiser/Controllers/KeyBindingsController.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index 621e91ef..aa8cf66f 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -4,6 +4,7 @@ import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
+import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
 import visualiser.gameController.Keys.ControlKey;
@@ -112,8 +113,13 @@ public class KeyBindingsController {
      */
     public void setKeyListener(){
         anchor.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            // if esc, cancel current button click
+            if (event.getCode() == KeyCode.ESCAPE){
+                btnCancel.requestFocus();
+                currentButton = null;
+            }
             // if a button was clicked
-            if (currentButton != null) {
+            else if (currentButton != null) {
                 // check if a button is already mapped to this key
                 for (int i = 1; i < lstKey.getItems().size(); i++) {
                     Button button = (Button)lstKey.getItems().get(i);
@@ -130,6 +136,7 @@ public class KeyBindingsController {
                         currentButton.getId());
                 // remove current button selection
                 currentButton = null;
+                btnCancel.requestFocus();
             }
             event.consume();
         });

From 3e720a9e16d69b310dfbe7574235dc0eace6ccec Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Thu, 31 Aug 2017 22:47:57 +1200
Subject: [PATCH 23/51] Modified key bindings can be saved to use in a race.

- new key bindings replace old new bindings on save
- javadoc save method and small updates

#story[1197]
---
 .../visualiser/Controllers/KeyBindingsController.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index aa8cf66f..5822179c 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -91,7 +91,7 @@ public class KeyBindingsController {
     }
 
     /**
-     * Makes a copy of the keyfactory that does not modify the original.
+     * Makes a copy of the {@link KeyFactory} that does not modify the original.
      * @return new keyfactory to be modified
      */
     public KeyFactory copyExistingFactory(){
@@ -109,7 +109,8 @@ public class KeyBindingsController {
 
     /**
      * Creates a listener for the base anchorpane for key presses.
-     * It updates the current key bindings if required.
+     * It updates the current key bindings of the {@link KeyFactory} if
+     * required.
      */
     public void setKeyListener(){
         anchor.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
@@ -150,8 +151,11 @@ public class KeyBindingsController {
         System.out.println("reset clicked");
     }
 
+    /**
+     * Replace existing {@link KeyFactory} with the modified key bindings.
+     */
     public void save(){
-        System.out.println("save clicked");
+        keyFactory = newKeyFactory;
     }
 
 }

From 716a99aac77c2f17d7441903a78c2f26ccbaafb7 Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Thu, 31 Aug 2017 22:58:35 +1200
Subject: [PATCH 24/51] Reset to default button is now functional.

- keybindings are reset to built in default
- the table is cleared and reloaded

#story[1197]
---
 .../visualiser/Controllers/KeyBindingsController.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index 5822179c..d43f22eb 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -147,8 +147,16 @@ public class KeyBindingsController {
         System.out.println("cancel clicked");
     }
 
+    /**
+     * Resets all key bindings to the built-in defaults.
+     */
     public void reset(){
-        System.out.println("reset clicked");
+        lstKey.getItems().clear();
+        lstControl.getItems().clear();
+        lstDescription.getItems().clear();
+        newKeyFactory = new KeyFactory();
+        initializeTable();
+        populateTable();
     }
 
     /**

From d0eebcdb2f86ab03c3af53f43124068e706e660d Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Fri, 1 Sep 2017 01:14:43 +1200
Subject: [PATCH 25/51] SourceIdAllocator now allocates from the BoatDataSource
 and RaceDataSource exposed by MockRace, instead of having its own source IDs.
 Can only allocate ids during PRESTART period. RaceLogic now calls
 MockRace.initialiseBoats() after the prestart period has finished. MockRace
 create a VisualiserBoat when a source ID is allocated. MockOutput now sends
 updated XML messages during the race, instead of only at the start.
 #story[1188]

---
 .../src/main/java/mock/app/MockOutput.java    | 24 +++++++--
 .../src/main/java/mock/model/MockRace.java    | 51 +++++++++++--------
 .../src/main/java/mock/model/RaceLogic.java   | 32 ++++++++++++
 .../java/mock/model/SourceIdAllocator.java    | 39 +++++++-------
 .../src/main/java/shared/model/RaceState.java | 15 +++++-
 5 files changed, 117 insertions(+), 44 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/MockOutput.java b/racevisionGame/src/main/java/mock/app/MockOutput.java
index 68136ea0..023235cc 100644
--- a/racevisionGame/src/main/java/mock/app/MockOutput.java
+++ b/racevisionGame/src/main/java/mock/app/MockOutput.java
@@ -27,7 +27,12 @@ public class MockOutput implements RunnableWithFramePeriod {
      */
     private LatestMessages latestMessages;
 
+    //These sequence number track the last race/boat/regatta xml message we've sent.
+    private int lastSentRaceNumber = -1;
 
+    private int lastSentBoatNumber = -1;
+
+    private int lastSentRegattaNumber = -1;
 
 
 
@@ -69,7 +74,6 @@ public class MockOutput implements RunnableWithFramePeriod {
 
 
         long previousFrameTime = System.currentTimeMillis();
-        boolean sentXMLs = false;
 
 
 
@@ -82,16 +86,26 @@ public class MockOutput implements RunnableWithFramePeriod {
                 previousFrameTime = currentFrameTime;
 
 
-                //Send XML messages.
-                if (!sentXMLs) {
 
+                //Send XML messages if needed.
+
+                if (lastSentRaceNumber != latestMessages.getRaceXMLMessage().getSequenceNumber()) {
+                    lastSentRaceNumber = latestMessages.getRaceXMLMessage().getSequenceNumber();
                     outgoingMessages.put(latestMessages.getRaceXMLMessage());
-                    outgoingMessages.put(latestMessages.getRegattaXMLMessage());
+                }
+
+                if (lastSentBoatNumber != latestMessages.getBoatXMLMessage().getSequenceNumber()) {
+                    lastSentBoatNumber = latestMessages.getBoatXMLMessage().getSequenceNumber();
                     outgoingMessages.put(latestMessages.getBoatXMLMessage());
+                }
 
-                    sentXMLs = true;
+                if (lastSentRegattaNumber != latestMessages.getRegattaXMLMessage().getSequenceNumber()) {
+                    lastSentRegattaNumber = latestMessages.getRegattaXMLMessage().getSequenceNumber();
+                    outgoingMessages.put(latestMessages.getRegattaXMLMessage());
                 }
 
+
+
                 List<AC35Data> snapshot = latestMessages.getSnapshot();
                 for (AC35Data message : snapshot) {
                     outgoingMessages.put(message);
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 357d34ce..9bcece2c 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -43,7 +43,7 @@ public class MockRace extends RaceState {
     /**
      * Registry for all collider object in this race
      */
-    protected ColliderRegistry colliderRegistry;
+    private ColliderRegistry colliderRegistry;
 
 
     /**
@@ -58,6 +58,12 @@ public class MockRace extends RaceState {
     private WindGenerator windGenerator;
 
 
+    /**
+     * The polars file to use for each boat.
+     */
+    private Polars polars;
+
+
 
     /**
      * Constructs a race object with a given RaceDataSource, BoatDataSource, and RegattaDataSource and sends events to the given mockOutput.
@@ -74,9 +80,10 @@ public class MockRace extends RaceState {
         this.setRaceDataSource(raceDataSource);
         this.setRegattaDataSource(regattaDataSource);
 
+        this.polars = polars;
         this.scaleFactor = timeScale;
 
-        this.boats = this.generateMockBoats(boatDataSource.getBoats(), raceDataSource.getParticipants(), polars);
+        this.boats = new ArrayList<>();
 
         this.shrinkBoundary = GPSCoordinate.getShrinkBoundary(this.getBoundary());
 
@@ -100,31 +107,35 @@ public class MockRace extends RaceState {
 
 
     /**
-     * Generates a list of MockBoats given a list of Boats, and a list of participating boats.
-     * @param boats The map of Boats describing boats that are potentially in the race. Maps boat sourceID to boat.
-     * @param sourceIDs The list of boat sourceIDs describing which specific boats are actually participating.
-     * @param polars The polars table to be used for boat simulation.
-     * @return A list of MockBoats that are participating in the race.
+     * Generates a MockBoat from the BoatDataSource, given a source ID. Also adds it to the participant list.
+     * @param sourceID The source ID to assign the boat.
+     * @return A MockBoat that is now participating in the race.
      */
-    private List<MockBoat> generateMockBoats(Map<Integer, Boat> boats, List<Integer> sourceIDs, Polars polars) {
-
-        List<MockBoat> mockBoats = new ArrayList<>(sourceIDs.size());
+    public void generateMockBoat(Integer sourceID) {
 
-        //For each sourceID participating...
-        for (int sourceID : sourceIDs) {
+        //Get the boat associated with the sourceID.
+        Boat boat = getBoatDataSource().getBoats().get(sourceID);
 
-            //Get the boat associated with the sourceID.
-            Boat boat = boats.get(sourceID);
+        //Construct a MockBoat using the Boat and Polars.
+        MockBoat mockBoat = new MockBoat(boat, polars);
+        mockBoat.setCurrentLeg(this.getLegs().get(0));
 
-            //Construct a MockBoat using the Boat and Polars.
-            MockBoat mockBoat = new MockBoat(boat, polars);
+        //Update participant list.
+        getRaceDataSource().getParticipants().add(sourceID);
 
-            mockBoats.add(mockBoat);
+        this.boats.add(mockBoat);
 
-        }
-
-        return mockBoats;
+        getRaceDataSource().incrementSequenceNumber();
+    }
 
+    /**
+     * Removes a MockBoat from the race, by sourceID. Also removes it from the participant list.
+     * @param sourceID Source ID of boat to remove.
+     */
+    public void removeMockBoat(Integer sourceID) {
+        this.boats.removeIf(mockBoat -> mockBoat.getSourceID() == sourceID);
+        getRaceDataSource().getParticipants().remove(sourceID);
+        getRaceDataSource().incrementSequenceNumber();
     }
 
 
diff --git a/racevisionGame/src/main/java/mock/model/RaceLogic.java b/racevisionGame/src/main/java/mock/model/RaceLogic.java
index 5b35d449..a1bddd9a 100644
--- a/racevisionGame/src/main/java/mock/model/RaceLogic.java
+++ b/racevisionGame/src/main/java/mock/model/RaceLogic.java
@@ -48,6 +48,9 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer {
      */
     @Override
     public void run() {
+
+        prestartCountdown();
+
         race.initialiseBoats();
 
         countdown();
@@ -60,6 +63,35 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer {
     }
 
 
+    /**
+     * The countdown timer until the prestart period is finished. This timer will stop 3 minutes before the race starts, and players can no longer start participating.
+     */
+    private void prestartCountdown() {
+
+        long previousFrameTime = System.currentTimeMillis();
+
+        while (((race.getRaceStatusEnum() == RaceStatusEnum.PRESTART)
+                || (race.getRaceStatusEnum() == RaceStatusEnum.NOT_ACTIVE)) && loopBool) {
+
+            long currentTime = System.currentTimeMillis();
+
+            //Update race time.
+            race.updateRaceTime(currentTime);
+
+            //Update the race status based on the current time.
+            race.updateRaceStatusEnum();
+
+            //Provide boat's with an estimated time at next mark until the race starts.
+            race.setBoatsTimeNextMark(race.getRaceClock().getCurrentTime());
+
+            //Parse the race snapshot.
+            server.parseSnapshot();
+
+            waitForFramePeriod(previousFrameTime, currentTime, 50);
+            previousFrameTime = currentTime;
+        }
+    }
+
     /**
      * Countdown timer until race starts.
      */
diff --git a/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java b/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
index 3b62a8a7..b609e5a5 100644
--- a/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
+++ b/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
@@ -2,6 +2,7 @@ package mock.model;
 
 
 import mock.exceptions.SourceIDAllocationException;
+import network.Messages.Enums.RaceStatusEnum;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,24 +14,18 @@ public class SourceIdAllocator {
 
 
     /**
-     * This list contains all unallocated source IDs.
+     * The race we are allocating for.
      */
-    List<Integer> unallocatedIDs = new ArrayList<>();
+    private MockRace mockRace;
 
 
-    /**
-     * This list contains all allocated source IDs.
-     */
-    List<Integer> allocatedIDs = new ArrayList<>();
-
 
     /**
-     * Creates a source ID allocator, using the given list of unallocated source IDs.
-     * @param unallocatedIDs List of unallocated source IDs.
+     * Creates a SourceIdAllocator for a given race.
+     * @param mockRace Race to allocate source IDs for.
      */
-    public SourceIdAllocator(List<Integer> unallocatedIDs) {
-        //We need to copy the list.
-        this.unallocatedIDs.addAll(unallocatedIDs);
+    public SourceIdAllocator(MockRace mockRace) {
+        this.mockRace = mockRace;
     }
 
 
@@ -41,11 +36,23 @@ public class SourceIdAllocator {
      */
     public synchronized int  allocateSourceID() throws SourceIDAllocationException {
 
+        if (mockRace.getRaceStatusEnum() != RaceStatusEnum.PRESTART) {
+            throw new SourceIDAllocationException("Could not allocate a source ID. Can only allocate during pre-start period. It is currently: " + mockRace.getRaceStatusEnum());
+        }
+
+        List<Integer> allocatedIDs = mockRace.getRaceDataSource().getParticipants();
+        List<Integer> allIDs = new ArrayList<>(mockRace.getBoatDataSource().getBoats().keySet());
+
+        //Get list of unallocated ids.
+        List<Integer> unallocatedIDs = new ArrayList<>(allIDs);
+        unallocatedIDs.removeAll(allocatedIDs);
+
+
         if (!unallocatedIDs.isEmpty()) {
 
             int sourceID = unallocatedIDs.remove(0);
 
-            allocatedIDs.add(sourceID);
+            mockRace.generateMockBoat(sourceID);
 
             return sourceID;
 
@@ -61,10 +68,6 @@ public class SourceIdAllocator {
      * @param sourceID Source ID to return.
      */
     public void returnSourceID(Integer sourceID) {
-
-        //We remove an Integer, not an int, so that we remove by value not by index.
-        allocatedIDs.remove(sourceID);
-
-        unallocatedIDs.add(sourceID);
+        mockRace.removeMockBoat(sourceID);
     }
 }
diff --git a/racevisionGame/src/main/java/shared/model/RaceState.java b/racevisionGame/src/main/java/shared/model/RaceState.java
index 19a1a52c..48361da2 100644
--- a/racevisionGame/src/main/java/shared/model/RaceState.java
+++ b/racevisionGame/src/main/java/shared/model/RaceState.java
@@ -188,7 +188,20 @@ public abstract class RaceState {
      * @return List of mark boats.
      */
     public List<Mark> getMarks() {
-        return new ArrayList<>(boatDataSource.getMarkerBoats().values());
+        //BoatDataSource contains a collection of Marks, and RaceDataSource contains a collection of Compound marks (which contain marks). RaceDataSource is the "definitive" source of mark data.
+        List<Mark> marks = new ArrayList<>(getCompoundMarks().size() * 2);
+
+        for (CompoundMark compoundMark : getCompoundMarks()) {
+            if (compoundMark.getMark1() != null) {
+                marks.add(compoundMark.getMark1());
+            }
+
+            if (compoundMark.getMark2() != null) {
+                marks.add(compoundMark.getMark2());
+            }
+        }
+
+        return marks;
     }
 
     /**

From 9156bde8af94a2eb9e10d8b6a35cf5bdc46c8de4 Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Fri, 1 Sep 2017 01:19:17 +1200
Subject: [PATCH 26/51] Moved XML message creation to RaceServer instead of
 ConnectionAcceptor. RaceServer does not currently generate new XMLMessages -
 NYI. Added a sequence number to RaceDataSource - this is used to indicate
 that the data source has been modified. #story[1188]

---
 .../java/mock/app/ConnectionAcceptor.java     | 78 +--------------
 .../src/main/java/mock/app/Event.java         |  4 +-
 .../src/main/java/mock/model/RaceServer.java  | 96 +++++++++++++++++++
 .../java/network/Messages/LatestMessages.java |  1 +
 .../shared/dataInput/EmptyRaceDataSource.java | 12 +++
 .../java/shared/dataInput/RaceDataSource.java | 12 +++
 .../java/shared/dataInput/RaceXMLReader.java  | 12 +++
 .../src/main/java/shared/model/Constants.java |  9 +-
 .../Controllers/FinishController.java         |  6 +-
 .../main/resources/mock/mockXML/raceTest.xml  |  7 +-
 .../mock/model/SourceIdAllocatorTest.java     | 29 ++----
 .../test/resources/mock/mockXML/raceTest.xml  |  8 +-
 12 files changed, 154 insertions(+), 120 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java b/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
index ee8ea216..b4ed1d2a 100644
--- a/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
+++ b/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
@@ -61,12 +61,7 @@ public class ConnectionAcceptor implements Runnable {
      */
     private SourceIdAllocator sourceIdAllocator;
 
-    //race xml sequence number
-    private short raceXMLSequenceNumber;
-    //boat xml sequence number
-    private short boatXMLSequenceNumber;
-    //regatta xml sequence number
-    private short regattaXMLSequenceNumber;
+
     //
     private RaceLogic raceLogic = null;
 
@@ -209,77 +204,6 @@ public class ConnectionAcceptor implements Runnable {
             }
         }
     }
-    
-    /**
-     * Sets the Race XML to send.
-     * @param raceXml XML to send to the Client.
-     */
-    public void setRaceXml(String raceXml) {
-        //Create the message.
-        XMLMessage message = this.createXMLMessage(raceXml, XMLMessageType.RACE);
 
-        //Place it in LatestMessages.
-        this.latestMessages.setRaceXMLMessage(message);
-    }
-
-    /**
-     * Sets the Regatta XMl to send.
-     * @param regattaXml XML to send to Client.
-     */
-    public void setRegattaXml(String regattaXml) {
-        //Create the message.
-        XMLMessage message = this.createXMLMessage(regattaXml, XMLMessageType.REGATTA);
 
-        //Place it in LatestMessages.
-        this.latestMessages.setRegattaXMLMessage(message);
-    }
-
-    /**
-     * Sets the Boats XML to send.
-     * @param boatsXml XMl to send to the Client.
-     */
-    public void setBoatsXml(String boatsXml) {
-        //Create the message.
-        XMLMessage message = this.createXMLMessage(boatsXml, XMLMessageType.BOAT);
-
-        //Place it in LatestMessages.
-        this.latestMessages.setBoatXMLMessage(message);
-    }
-
-    /**
-     * Creates an XMLMessage of a specified subtype using the xml contents string.
-     * @param xmlString The contents of the xml file.
-     * @param messageType The subtype of xml message (race, regatta, boat).
-     * @return The created XMLMessage object.
-     */
-    private XMLMessage createXMLMessage(String xmlString, XMLMessageType messageType) {
-
-        //Get the correct sequence number to use, and increment it.
-        short sequenceNumber = 0;
-        if (messageType == XMLMessageType.RACE) {
-            sequenceNumber = this.raceXMLSequenceNumber;
-            this.raceXMLSequenceNumber++;
-
-        } else if (messageType == XMLMessageType.BOAT) {
-            sequenceNumber = this.boatXMLSequenceNumber;
-            this.boatXMLSequenceNumber++;
-
-        } else if (messageType == XMLMessageType.REGATTA) {
-            sequenceNumber = this.regattaXMLSequenceNumber;
-            this.regattaXMLSequenceNumber++;
-
-        }
-
-        //Create the message.
-        XMLMessage message = new XMLMessage(
-                XMLMessage.currentVersionNumber,
-                AckSequencer.getNextAckNum(),
-                System.currentTimeMillis(),
-                messageType,
-                sequenceNumber,
-                xmlString);
-
-
-        return message;
-    }
 }
diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index 526223ba..27e2103c 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -120,8 +120,7 @@ public class Event {
 
         }
 
-        List<Integer> potentialParticipants = new ArrayList<>(boatDataSource.getBoats().keySet());
-        this.sourceIdAllocator = new SourceIdAllocator(potentialParticipants);
+
         this.compositeCommand = new CompositeCommand();
         this.latestMessages = new LatestMessages();
 
@@ -149,6 +148,7 @@ public class Event {
 
 
         //Create connection acceptor.
+        this.sourceIdAllocator = new SourceIdAllocator(newRace.getRace());
 
         try {
             this.connectionAcceptor = new ConnectionAcceptor(latestMessages, compositeCommand, sourceIdAllocator, newRace);
diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java
index cbbe1971..45a4f6e0 100644
--- a/racevisionGame/src/main/java/mock/model/RaceServer.java
+++ b/racevisionGame/src/main/java/mock/model/RaceServer.java
@@ -1,7 +1,9 @@
 package mock.model;
 
+import network.AckSequencer;
 import network.Messages.*;
 import network.Messages.Enums.BoatLocationDeviceEnum;
+import network.Messages.Enums.XMLMessageType;
 import shared.model.Bearing;
 import shared.model.CompoundMark;
 import shared.model.Mark;
@@ -22,10 +24,29 @@ public class RaceServer {
      */
     private int boatLocationSequenceNumber = 1;
 
+    /**
+     * The sequence number of race XML messages.
+     */
+    private int raceXMLSeqNumber;
+
+    /**
+     * The sequence number of boat XML messages.
+     */
+    private int boatXMLSeqNumber;
+
+    /**
+     * The sequence number of regatta XML messages.
+     */
+    private int regattaXMLSeqNumber;
+
 
     public RaceServer(MockRace race, LatestMessages latestMessages) {
         this.race = race;
         this.latestMessages = latestMessages;
+
+        this.raceXMLSeqNumber = race.getRaceDataSource().getSequenceNumber();
+        //this.boatXMLSeqNumber = race.getBoatDataSource().getSequenceNumber();
+        //this.regattaXMLSeqNumber = race.getRegattaDataSource().getSequenceNumber();
     }
 
     /**
@@ -45,8 +66,46 @@ public class RaceServer {
         snapshotMessages.add(parseRaceStatus());
 
         latestMessages.setSnapshot(snapshotMessages);
+
+        updateXMLFiles();
+    }
+
+
+    /**
+     * Checks if the race/boat/regatta data sources have changed, and if they have, update their xml representations.
+     */
+    private void updateXMLFiles() {
+        updateRaceXMLFile();
+        //updateBoatXMLFile();
+        //updateRegattaXMLFile();
+    }
+
+    /**
+     * Checks if the race data source has changed, and if it has, updates LatestMessages' race xml message.
+     */
+    private void updateRaceXMLFile() {
+        if (raceXMLSeqNumber != race.getRaceDataSource().getSequenceNumber()) {
+            //TODO generate XML string from race data source
+            String raceXMLString = "test";//TODO
+            XMLMessage message = createXMLMessage(raceXMLString, XMLMessageType.RACE);
+            latestMessages.setXMLMessage(message);
+            raceXMLSeqNumber = race.getRaceDataSource().getSequenceNumber();
+        }
+    }
+
+    /**
+     * Checks if the boat data source has changed, and if it has, updates LatestMessages' boat xml message.
+     */
+    private void updateBoatXMLFile() {
+
     }
 
+    /**
+     * Checks if the regatta data source has changed, and if it has, updates LatestMessages' regatta xml message.
+     */
+    private void updateRegattaXMLFile() {
+
+    }
 
     /**
      * Parses an individual marker boat, and returns it.
@@ -178,4 +237,41 @@ public class RaceServer {
 
         return raceStatus;
     }
+
+
+
+
+    /**
+     * Creates an XMLMessage of a specified subtype using the xml contents string.
+     * @param xmlString The contents of the xml file.
+     * @param messageType The subtype of xml message (race, regatta, boat).
+     * @return The created XMLMessage object.
+     */
+    private XMLMessage createXMLMessage(String xmlString, XMLMessageType messageType) {
+
+        //Get the correct sequence number to use.
+        int sequenceNumber = 0;
+        if (messageType == XMLMessageType.RACE) {
+            sequenceNumber = this.raceXMLSeqNumber;
+
+        } else if (messageType == XMLMessageType.BOAT) {
+            sequenceNumber = this.boatXMLSeqNumber;
+
+        } else if (messageType == XMLMessageType.REGATTA) {
+            sequenceNumber = this.regattaXMLSeqNumber;
+
+        }
+
+        //Create the message.
+        XMLMessage message = new XMLMessage(
+                XMLMessage.currentVersionNumber,
+                AckSequencer.getNextAckNum(),
+                System.currentTimeMillis(),
+                messageType,
+                sequenceNumber,
+                xmlString);
+
+
+        return message;
+    }
 }
diff --git a/racevisionGame/src/main/java/network/Messages/LatestMessages.java b/racevisionGame/src/main/java/network/Messages/LatestMessages.java
index 738b3ae6..c16d722f 100644
--- a/racevisionGame/src/main/java/network/Messages/LatestMessages.java
+++ b/racevisionGame/src/main/java/network/Messages/LatestMessages.java
@@ -35,6 +35,7 @@ public class LatestMessages extends Observable {
 
 
 
+
     /**
      * Ctor.
      */
diff --git a/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java b/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java
index 74ccbaf5..ffacaa93 100644
--- a/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java
@@ -76,6 +76,8 @@ public class EmptyRaceDataSource implements RaceDataSource {
     private RaceTypeEnum raceType = RaceTypeEnum.NOT_A_RACE_TYPE;
 
 
+    private int sequenceNumber = 0;
+
 
     public EmptyRaceDataSource() {
     }
@@ -126,4 +128,14 @@ public class EmptyRaceDataSource implements RaceDataSource {
     public List<Integer> getParticipants() {
         return participants;
     }
+
+    @Override
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    @Override
+    public void incrementSequenceNumber() {
+        sequenceNumber++;
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java b/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java
index b89dc45d..c1a4b370 100644
--- a/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java
@@ -83,4 +83,16 @@ public interface RaceDataSource {
      * @return Bottom right GPS coordinate.
      */
     GPSCoordinate getMapBottomRight();
+
+
+    /**
+     * Returns the sequence number associated with this data source. Used to indicate when it has changed.
+     * @return Sequence number.
+     */
+    int getSequenceNumber();
+
+    /**
+     * Increments the sequence number for this data source. Used to indicate that it has changed.
+     */
+    void incrementSequenceNumber();
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java b/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
index c2faea69..6165bf44 100644
--- a/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
+++ b/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
@@ -84,6 +84,8 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource {
     private RaceTypeEnum raceType;
 
 
+    private int sequenceNumber = 0;
+
 
 
     /**
@@ -491,4 +493,14 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource {
     public List<Corner> getCornersList() {
         return cornersList;
     }
+
+    @Override
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    @Override
+    public void incrementSequenceNumber() {
+        sequenceNumber++;
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/model/Constants.java b/racevisionGame/src/main/java/shared/model/Constants.java
index a6fe3844..c5595d7a 100644
--- a/racevisionGame/src/main/java/shared/model/Constants.java
+++ b/racevisionGame/src/main/java/shared/model/Constants.java
@@ -33,20 +33,23 @@ public class Constants {
      * Frame periods are multiplied by this to get the amount of time a single frame represents.
      * E.g., frame period = 20ms, scale = 5, frame represents 20 * 5 = 100ms, and so boats are simulated for 100ms, even though only 20ms actually occurred.
      */
-    public static final int RaceTimeScale = 10;
+    public static final int RaceTimeScale = 1;//10;
 
     /**
      * The race pre-start time, in milliseconds. 3 minutes.
      */
-    public static final long RacePreStartTime = 1 * 10 * 1000;
+    public static final long RacePreStartTime = 3 * 60 * 1000;
 
 
     /**
-     * The race preparatory time, in milliseconds. 1 minutes.
+     * The race preparatory time, in milliseconds. 1 minute.
      */
     public static final long RacePreparatoryTime = 1 * 60 * 1000;
 
 
+
+
+
     /**
      * The number of milliseconds in one hour.
      * <br>
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/FinishController.java b/racevisionGame/src/main/java/visualiser/Controllers/FinishController.java
index c5356495..6de6dcdf 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/FinishController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/FinishController.java
@@ -71,8 +71,10 @@ public class FinishController extends Controller {
 
 
         //Winner label.
-        raceWinnerLabel.setText("Winner: "+ boatNameColumn.getCellObservableValue(0).getValue());
-        raceWinnerLabel.setWrapText(true);
+        if (boats.size() > 0) {
+            raceWinnerLabel.setText("Winner: " + boatNameColumn.getCellObservableValue(0).getValue());
+            raceWinnerLabel.setWrapText(true);
+        }
 
     }
 
diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml b/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml
index ad14d931..6ae04ef8 100644
--- a/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml
+++ b/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml
@@ -5,12 +5,7 @@
     <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
     <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
     <Participants>
-        <Yacht SourceID="121"/>
-        <Yacht SourceID="122"/>
-        <Yacht SourceID="123"/>
-        <Yacht SourceID="124"/>
-        <Yacht SourceID="125"/>
-        <Yacht SourceID="126"/>
+
     </Participants>
     <CompoundMarkSequence>
         <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
diff --git a/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java b/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java
index 7240e01b..a1568044 100644
--- a/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java
+++ b/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java
@@ -15,30 +15,16 @@ import static org.junit.Assert.*;
  */
 public class SourceIdAllocatorTest {
 
-    /**
-     * This is the list of source IDs that we start with.
-     */
-    private List<Integer> originalSourceIDs;
-
-    /**
-     * Used to allocate source IDs.
-     */
+    private MockRace mockRace;
     private SourceIdAllocator sourceIdAllocator;
 
 
     @Before
     public void setUp() throws Exception {
 
-        originalSourceIDs = new ArrayList<>();
-        originalSourceIDs.add(120);
-        originalSourceIDs.add(121);
-        originalSourceIDs.add(122);
-        originalSourceIDs.add(123);
-        originalSourceIDs.add(124);
-        originalSourceIDs.add(125);
-
+        mockRace = MockRaceTest.createMockRace();
 
-        sourceIdAllocator = new SourceIdAllocator(originalSourceIDs);
+        sourceIdAllocator = new SourceIdAllocator(mockRace);
 
     }
 
@@ -49,11 +35,12 @@ public class SourceIdAllocatorTest {
     @Test
     public void emptyAllocationTest() {
 
-        SourceIdAllocator allocator = new SourceIdAllocator(new ArrayList<>());
+        mockRace.getRaceDataSource().getParticipants().removeAll(mockRace.getBoatDataSource().getBoats().keySet());
+        mockRace.getRaceDataSource().getParticipants().addAll(mockRace.getBoatDataSource().getBoats().keySet());
 
 
         try {
-            int sourceID = allocator.allocateSourceID();
+            int sourceID = sourceIdAllocator.allocateSourceID();
 
             fail("Exception should have been thrown, but wasn't.");
 
@@ -108,10 +95,6 @@ public class SourceIdAllocatorTest {
     @Test
     public void reallocationTest() throws Exception {
 
-        List<Integer> sourceIDList = new ArrayList<>();
-        sourceIDList.add(123);
-
-        SourceIdAllocator sourceIdAllocator = new SourceIdAllocator(sourceIDList);
 
         //Allocate.
         int sourceID = sourceIdAllocator.allocateSourceID();
diff --git a/racevisionGame/src/test/resources/mock/mockXML/raceTest.xml b/racevisionGame/src/test/resources/mock/mockXML/raceTest.xml
index 4ad5f88f..b10a0158 100644
--- a/racevisionGame/src/test/resources/mock/mockXML/raceTest.xml
+++ b/racevisionGame/src/test/resources/mock/mockXML/raceTest.xml
@@ -5,12 +5,6 @@
     <CreationTimeDate>2017-04-19T15:30:00+1200</CreationTimeDate>
     <RaceStartTime Postpone="false" Time="2017-04-19T15:33:00+1200"/>
     <Participants>
-        <Yacht SourceID="121"/>
-        <Yacht SourceID="122"/>
-        <Yacht SourceID="123"/>
-        <Yacht SourceID="124"/>
-        <Yacht SourceID="125"/>
-        <Yacht SourceID="126"/>
     </Participants>
     <CompoundMarkSequence>
         <Corner CompoundMarkID="1" SeqID="1"/>
@@ -54,4 +48,4 @@
         <Limit Lat="32.297164" Lon="-64.856394" SeqID="10"/>
         <Limit Lat="32.296148" Lon="-64.849184" SeqID="11"/>
     </CourseLimit>
-</Race>
\ No newline at end of file
+</Race>

From ec5bc9c6aa8ecc08acdd534b46d1cde601d5f0fe Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Fri, 1 Sep 2017 13:19:59 +1200
Subject: [PATCH 27/51] Wind now will occasionally back and veer (in some
 games, takes ~20min for full 180 degree rotation) #story[1188]

---
 .../model/wind/ShiftingWindGenerator.java     | 54 +++++++++++++------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index d36a843b..1b995a81 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -5,22 +5,23 @@ import shared.model.Wind;
 
 import java.util.Random;
 
-/**
- * Created by jjg64 on 28/08/17.
- */
 public class ShiftingWindGenerator implements WindGenerator {
-    Bearing baselineBearing;
-    double baseLineSpeed;
-    double windSpeedVariance = 5;
-    double bearingVariance = 5;  // In degrees
-    double oscillationVariance = 0.25;
-    double oscillationPeriod = 1e3 * 60 * 1;  // In milliseconds
-
-    double timeOfLastOscillationReset = 0;
-    double timeOfLastChange = 0;
-    double timeSinceLastShift = 0; // Back / veer
-
-    boolean anticlockwise = false;
+    private Bearing baselineBearing;
+    private double baseLineSpeed;
+    private double windSpeedVariance = 5;
+    private double bearingVariance = 5;  // In degrees
+    private double oscillationVariance = 0.25;
+    private double oscillationPeriod = 1e3 * 60 * 1;  // In milliseconds
+    private double shiftTime = 1e3 * 60;
+    private double shiftedSoFar = 0;
+
+    private double timeOfLastOscillationReset = 0;
+    private double timeOfLastChange = 0;
+    private double timeOfLastShift = 0; // Back / veer
+
+    private boolean anticlockwise = false;
+    private boolean shiftAnticlockwise = false;//true for Back, false for veer
+    private boolean shiftThisRace = Math.random() > 0.5;
 
     public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) {
         this.baselineBearing = baselineBearing;
@@ -41,7 +42,7 @@ public class ShiftingWindGenerator implements WindGenerator {
     private Wind changeWind(Wind wind) {
         Wind newWind = new Wind(wind.getWindDirection(), wind.getWindSpeed());
         oscillateWind(newWind);
-        shiftWind(newWind);
+        if (shiftThisRace){shiftWind(newWind);}
         changeWindSpeed(newWind);
         timeOfLastChange = System.currentTimeMillis();
         return newWind;
@@ -78,6 +79,27 @@ public class ShiftingWindGenerator implements WindGenerator {
     }
 
     private void shiftWind(Wind wind) {
+        double timeSinceLastShift = System.currentTimeMillis() - timeOfLastShift;
+        double newBearing = wind.getWindDirection().degrees();
+        double degreeChange = 7;
+
+        if (timeSinceLastShift >= shiftTime){
+            shiftedSoFar += degreeChange;
+            if (shiftedSoFar >= 180){
+                shiftAnticlockwise = Math.random() > 0.5;
+                shiftedSoFar = 0;
+                System.out.println("Swapping");
+            }
+
+            timeOfLastShift = System.currentTimeMillis();
+            if (shiftAnticlockwise){
+                newBearing -= degreeChange;
+                wind.setWindDirection(Bearing.fromDegrees(newBearing % 360));
+            } else {
+                newBearing += degreeChange;
+                wind.setWindDirection(Bearing.fromDegrees(newBearing % 360));
+            }
+        }
     }
 
     private void changeWindSpeed(Wind wind) {

From 086206a6237052e325182479d596745873be6388 Mon Sep 17 00:00:00 2001
From: David Wu <zwu18@uclive.ac.nz>
Date: Fri, 1 Sep 2017 13:44:09 +1200
Subject: [PATCH 28/51] Controls button in title screen now opens the key
 mapping menu. #story[1197]

---
 .../main/java/visualiser/Controllers/TitleController.java | 2 +-
 racevisionGame/src/main/java/visualiser/app/App.java      | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
index 32e033c8..94fff748 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
@@ -89,7 +89,7 @@ public class TitleController extends Controller {
      */
     public void controlBtnPressed(){
         FXMLLoader loader = new FXMLLoader();
-        loader.setLocation(getClass().getResource("/visualiser/scenes/controls.fxml"));
+        loader.setLocation(getClass().getResource("/visualiser/scenes/keyBindings.fxml"));
         Parent layout;
         try {
             layout = loader.load();
diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java
index 9a1a7132..ac063b94 100644
--- a/racevisionGame/src/main/java/visualiser/app/App.java
+++ b/racevisionGame/src/main/java/visualiser/app/App.java
@@ -168,14 +168,6 @@ public class App extends Application {
                 System.exit(0);
             }
         });
-
-        // TODO: remove later, just for testing
-        Parent root2 = FXMLLoader.load(getClass().getResource
-                ("/visualiser/scenes/keyBindings.fxml"));
-        Stage stage2 = new Stage();
-        stage2.setScene(new Scene(root2));
-        stage2.centerOnScreen();
-        stage2.show();
     }
 
     /**

From 3fdfbd83e0c28755d5ac6f5b18798462cf004672 Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Fri, 1 Sep 2017 14:29:18 +1200
Subject: [PATCH 29/51] User can save, reset or cancel.

- Created a notification popups for errors
- Added functionality to save, cancel and reset buttons
- Key bindings are only saved if they're valid
- Added window close event
- Can not exit without saving correctly
- CSS to cancel, save and reset buttons to differentiate between key buttons
- Javadocd

#story[1197]
---
 .../Controllers/KeyBindingsController.java    | 88 +++++++++++++++++--
 .../Controllers/NotificationController.java   | 35 ++++++++
 .../Controllers/TitleController.java          | 26 ++++++
 .../gameController/Keys/KeyFactory.java       |  4 +
 .../src/main/resources/css/keyBindings.css    | 10 +++
 .../visualiser/scenes/keyBindings.fxml        |  7 +-
 .../visualiser/scenes/notification.fxml       | 19 ++++
 7 files changed, 180 insertions(+), 9 deletions(-)
 create mode 100644 racevisionGame/src/main/java/visualiser/Controllers/NotificationController.java
 create mode 100644 racevisionGame/src/main/resources/visualiser/scenes/notification.fxml

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index d43f22eb..d19a4f5d 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -2,14 +2,20 @@ package visualiser.Controllers;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 import visualiser.gameController.Keys.ControlKey;
 import visualiser.gameController.Keys.KeyFactory;
-
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -26,8 +32,9 @@ public class KeyBindingsController {
     private @FXML ListView lstKey;
     private @FXML ListView lstDescription;
     private @FXML AnchorPane anchor;
-    private Button currentButton = null;
+    private Button currentButton = null;    // last button clicked
     private KeyFactory newKeyFactory;
+    private Boolean changed = false;    // keybindings have been modified
 
     public void initialize(){
         // create new key factory to modify, keeping the existing one safe
@@ -96,14 +103,14 @@ public class KeyBindingsController {
      */
     public KeyFactory copyExistingFactory(){
         newKeyFactory = new KeyFactory();
-        Map<String, ControlKey> newKeyState = newKeyFactory.getKeyState();
         Map<String, ControlKey> oldKeyState = keyFactory.getKeyState();
-        newKeyState = new HashMap<>();  // clear default keys
+        Map<String, ControlKey> newKeyState = new HashMap<>();
 
         // copy over commands and their keys
         for (Map.Entry<String, ControlKey> entry : oldKeyState.entrySet()){
             newKeyState.put(entry.getKey(), entry.getValue());
         }
+        newKeyFactory.setKeyState(newKeyState);
         return newKeyFactory;
     }
 
@@ -137,14 +144,20 @@ public class KeyBindingsController {
                         currentButton.getId());
                 // remove current button selection
                 currentButton = null;
+                changed = true;
                 btnCancel.requestFocus();
             }
             event.consume();
         });
     }
 
+    /**
+     * Cancel and exits the key bindings menu. Changes are not forced to be
+     * saved or fixed if invalid, and instead are defaulted back to the last
+     * successful saved state.
+     */
     public void cancel(){
-        System.out.println("cancel clicked");
+        ((Stage)btnCancel.getScene().getWindow()).close();
     }
 
     /**
@@ -157,13 +170,76 @@ public class KeyBindingsController {
         newKeyFactory = new KeyFactory();
         initializeTable();
         populateTable();
+        changed = true;
     }
 
     /**
      * Replace existing {@link KeyFactory} with the modified key bindings.
      */
     public void save(){
-        keyFactory = newKeyFactory;
+        if (isFactoryValid()) {
+            keyFactory = newKeyFactory;
+            newKeyFactory = new KeyFactory();
+            changed = false;
+            loadNotification("Key bindings were successfully saved.", false);
+        } else {
+            loadNotification("One or more key bindings are missing. " +
+                    "Failed to save.", true);
+        }
+    }
+
+    /**
+     * Checks the {@link KeyFactory} being modified is valid and that no
+     * commands are missing a key binding.
+     * @return True if valid, false if invalid
+     */
+    public Boolean isFactoryValid(){
+        for (Map.Entry<String, ControlKey> entry : newKeyFactory.getKeyState().entrySet
+                ()) {
+            if (entry.getKey().toString()==entry.getValue().toString()){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Method used to stop a user from exiting key bindings without saving
+     * their changes to the {@link KeyFactory}.
+     * @param we {@link WindowEvent} close request to be consumed if settings
+     *                             have not been successfully saved.
+     */
+    public void onExit(WindowEvent we){
+        // if modified KeyFactory hasn't been saved
+        if (keyFactory!=newKeyFactory && changed==true){
+            loadNotification("Please cancel or save your changes before exiting" +
+                    ".", true);
+            we.consume();
+        }
+    }
+
+    /**
+     * Loads a popup window giving confirmation/warning of user activity.
+     * @param message the message to be displayed to the user
+     * @param warning true if the message to be displayed is due to user error
+     */
+    public void loadNotification(String message, Boolean warning){
+        Parent root = null;
+        FXMLLoader loader = new FXMLLoader(getClass().getResource
+                ("/visualiser/scenes/notification.fxml"));
+        try {
+            root = loader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        NotificationController controller = loader.getController();
+        Stage stage = new Stage();
+        stage.setScene(new Scene(root));
+        stage.centerOnScreen();
+        stage.initModality(Modality.APPLICATION_MODAL);
+        stage.show();
+        // displays given message in the window
+        controller.setMessage(message, warning);
     }
 
 }
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NotificationController.java b/racevisionGame/src/main/java/visualiser/Controllers/NotificationController.java
new file mode 100644
index 00000000..d122ec80
--- /dev/null
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NotificationController.java
@@ -0,0 +1,35 @@
+package visualiser.Controllers;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+
+/**
+ * Controller for a popup notification regarding user activity.
+ */
+public class NotificationController {
+    private @FXML Label lblDescription;
+    private @FXML Text txtMessage;
+
+    /**
+     * Closes the popup window once clicked.
+     */
+    public void ok(){
+        ((Stage)lblDescription.getScene().getWindow()).close();
+    }
+
+    /**
+     * Displays the appropriate popup notification.
+     * @param message message for the user
+     * @param warning if true warning text shown, if false success text shown
+     */
+    public void setMessage(String message, Boolean warning){
+        lblDescription.setText(message);
+        if (!warning){
+            txtMessage.setText("Success!");
+            txtMessage.setFill(Color.GREEN);
+        }
+    }
+}
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
index 94fff748..21e3dcc7 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
@@ -1,5 +1,6 @@
 package visualiser.Controllers;
 
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -9,6 +10,7 @@ import javafx.scene.control.RadioButton;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 import visualiser.app.App;
 
 import java.io.IOException;
@@ -88,6 +90,22 @@ public class TitleController extends Controller {
      * Called when control button is pressed. New pop up window displaying controls
      */
     public void controlBtnPressed(){
+
+//        Parent root2 = loader2.load();
+//        KeyBindingsController controller = loader2.getController();
+//        Stage stage2 = new Stage();
+//        stage2.setScene(new Scene(root2));
+//        stage2.centerOnScreen();
+//        stage2.initModality(Modality.APPLICATION_MODAL);
+//        stage2.show();
+//        stage2.setOnCloseRequest(new EventHandler<WindowEvent>() {
+//            public void handle(WindowEvent we) {
+//                if (we.getEventType() == WindowEvent.WINDOW_CLOSE_REQUEST) {
+//                    controller.onExit(we);
+//                }
+//            }
+//        });
+
         FXMLLoader loader = new FXMLLoader();
         loader.setLocation(getClass().getResource("/visualiser/scenes/keyBindings.fxml"));
         Parent layout;
@@ -100,6 +118,14 @@ public class TitleController extends Controller {
             popupStage.initModality(Modality.WINDOW_MODAL);
             popupStage.setScene(scene);
             popupStage.showAndWait();
+            KeyBindingsController controller = loader.getController();
+            popupStage.setOnCloseRequest(new EventHandler<WindowEvent>() {
+                public void handle(WindowEvent we) {
+                    if (we.getEventType() == WindowEvent.WINDOW_CLOSE_REQUEST) {
+                        controller.onExit(we);
+                    }
+                }
+            });
         } catch (Exception  e){
             e.printStackTrace();
         }
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
index d896f6c6..ecf0b1af 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
@@ -39,6 +39,10 @@ public class KeyFactory {
         return keyState;
     }
 
+    public void setKeyState(Map<String, ControlKey> keyState) {
+        this.keyState = keyState;
+    }
+
     /**
      * Update the key bound to a particular command in the keystate.
      * @param newKey the new key value for the command
diff --git a/racevisionGame/src/main/resources/css/keyBindings.css b/racevisionGame/src/main/resources/css/keyBindings.css
index a1dc8242..a572116e 100644
--- a/racevisionGame/src/main/resources/css/keyBindings.css
+++ b/racevisionGame/src/main/resources/css/keyBindings.css
@@ -23,6 +23,7 @@
     -fx-text-fill: #242d35;
     -fx-font-size: 12px;
     -fx-font-family: "Courier New";
+    -fx-border-color: #a9c8ff;
 }
 
 .button:focused {
@@ -32,4 +33,13 @@
 
 #anchor {
     -fx-background-color: #fdfac3;
+}
+#menu{
+    -fx-background-color: linear-gradient(#acdeff 50%, #a9c8ff 100%);
+    -fx-background-radius: 4px;
+    -fx-border-radius: 4px;
+    -fx-text-fill: #242d35;
+    -fx-font-size: 12px;
+    -fx-font-family: "Verdana";
+    -fx-border-color: #a9c8ff;
 }
\ No newline at end of file
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml b/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
index 6ce15890..40217567 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/keyBindings.fxml
@@ -13,11 +13,12 @@
             <Font name="Comic Sans MS" size="44.0" />
          </font>
       </Label>
-      <Button fx:id="btnCancel" layoutX="430.0" layoutY="428.0" mnemonicParsing="false" onAction="#cancel" prefWidth="160.0" text="Cancel" AnchorPane.bottomAnchor="18.0" AnchorPane.rightAnchor="20.0" />
+      <Button id="menu" fx:id="btnCancel" layoutX="430.0" layoutY="428.0"
+              mnemonicParsing="false" onAction="#cancel" prefWidth="160.0" text="Cancel" AnchorPane.bottomAnchor="18.0" AnchorPane.rightAnchor="20.0" />
       <ListView fx:id="lstControl" focusTraversable="false" layoutX="27.0" layoutY="88.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="322.0" prefWidth="150.0" />
       <ListView fx:id="lstKey" focusTraversable="false" layoutX="176.0" layoutY="88.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="322.0" prefWidth="150.0" />
       <ListView fx:id="lstDescription" focusTraversable="false" layoutX="325.0" layoutY="88.0" prefHeight="322.0" prefWidth="250.0" />
-      <Button fx:id="btnSave" layoutX="220.0" layoutY="428.0" mnemonicParsing="false" onAction="#save" prefWidth="160.0" text="Save" AnchorPane.bottomAnchor="18.0" />
-      <Button fx:id="btnReset" layoutX="20.0" layoutY="428.0" mnemonicParsing="false" onAction="#reset" prefWidth="160.0" text="Reset to Default" AnchorPane.bottomAnchor="18.0" AnchorPane.leftAnchor="20.0" />
+      <Button id="menu" fx:id="btnSave" layoutX="220.0" layoutY="428.0" mnemonicParsing="false" onAction="#save" prefWidth="160.0" text="Save" AnchorPane.bottomAnchor="18.0" />
+      <Button id="menu" fx:id="btnReset" layoutX="20.0" layoutY="428.0" mnemonicParsing="false" onAction="#reset" prefWidth="160.0" text="Reset to Default" AnchorPane.bottomAnchor="18.0" AnchorPane.leftAnchor="20.0" />
    </children>
 </AnchorPane>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/notification.fxml b/racevisionGame/src/main/resources/visualiser/scenes/notification.fxml
new file mode 100644
index 00000000..0e4a7c5b
--- /dev/null
+++ b/racevisionGame/src/main/resources/visualiser/scenes/notification.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="100.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.NotificationController">
+   <children>
+      <Button fx:id="btnOk" layoutX="110.0" layoutY="65.0" mnemonicParsing="false" onAction="#ok" prefWidth="80.0" text="Ok" />
+      <Text fx:id="txtMessage" fill="RED" layoutY="23.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Warning!" textAlignment="CENTER" wrappingWidth="300.0">
+         <font>
+            <Font name="System Bold" size="14.0" />
+         </font>
+      </Text>
+      <Label fx:id="lblDescription" alignment="CENTER" layoutY="36.0" prefHeight="17.0" prefWidth="300.0" textAlignment="CENTER" />
+   </children>
+</Pane>

From 34cfe48df0d205f62c7d237ad1344c95596235ca Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Fri, 1 Sep 2017 20:30:28 +1200
Subject: [PATCH 30/51] Got VMG quad detection working, however, the speeds are
 completley wrong. #story[1186]

---
 .../src/main/java/mock/model/MockRace.java    |  3 +-
 .../src/main/java/mock/model/Polars.java      | 47 ++++++++++++++++---
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 2c19ea10..276fc329 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -379,7 +379,8 @@ public class MockRace extends Race {
 //                boat.getBearing(),
 //                Bearing.fromDegrees(boat.getBearing().degrees() - 1),
 //                Bearing.fromDegrees(boat.getBearing().degrees() + 1));
-        VMG vmg = boat.getPolars().setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
+        //VMG vmg = boat.getPolars().setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
+        VMG vmg = new VMG(Math.cos (boat.getBearing().radians() - this.getWindDirection().radians()) * this.getWindSpeed() * 4, boat.getBearing()) ;
         if (vmg.getSpeed() > 0) {
             boat.setCurrentSpeed(vmg.getSpeed());
         }
diff --git a/racevisionGame/src/main/java/mock/model/Polars.java b/racevisionGame/src/main/java/mock/model/Polars.java
index a18aa627..35a22fc4 100644
--- a/racevisionGame/src/main/java/mock/model/Polars.java
+++ b/racevisionGame/src/main/java/mock/model/Polars.java
@@ -23,7 +23,7 @@ public class Polars {
     private HashMap<Double, List<Bearing>> polarAngles = new HashMap<>();
 
     //true wind speed, <true wind angle, best boat angle>
-    private HashMap<Double, HashMap<Double, Double>> polars = new HashMap<>();
+    private Map<Double, HashMap<Double, Double>> polars = new TreeMap<>();
 
 
 
@@ -87,7 +87,7 @@ public class Polars {
         polars.get(tws).put(twa, bs);
     }
 
-    public double getClosest(double value, Set<Double> set){
+    private static double getClosest(double value, Set<Double> set){
         double closestVal = 0;
         double smallestDiff = Double.MAX_VALUE;
         for (double d: set){
@@ -100,6 +100,39 @@ public class Polars {
         return closestVal;
     }
 
+    /**
+     * Determines which quadrant degrees are in
+     *           0/360 Degrees
+     * Quadrant 4 | Quadrant 1
+     * -----------------------
+     * Quadrant 3 | Quadrant 2
+     * @param degrees
+     * @return
+     */
+    private static int getQuadrant(double degrees){
+        return ((int) degrees % 360) / 90 + 1;
+    }
+
+    private static double getBestSpeedInQuadrant(int quad, HashMap<Double, Double> set){
+        double quadVal = (double)((quad - 1) % 2);// this is as the hash map only has values 0 - 180
+        double min = quadVal* 90;
+        double max = (quadVal + 1) * 90;
+        double maxAngle = 0;
+        double maxSpeed = 0;
+        for (Double s: set.keySet()){
+            if (s >= min && s < max){
+                if (set.get(s) > maxSpeed){
+                    maxAngle = s;
+                    maxSpeed = set.get(s);
+                }
+            }
+        }
+        if (quad > 2){
+            maxAngle += 180;
+        }
+        return maxAngle;
+    }
+
     /**
      *
      * @param trueWindAngle
@@ -111,13 +144,15 @@ public class Polars {
         //speed
         double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
 
-        //not using true vmg using general concept
+        //not using true vmg, using general concept
         double angle = Math.abs(trueWindAngle.degrees() - boatAngle.degrees());
 
-        double closestAngle = getClosest(angle, polars.get(closestSpeed).keySet());
+        int quad = getQuadrant(boatAngle.degrees());
+        double bestAngle = getBestSpeedInQuadrant(quad, polars.get(closestSpeed));
+
+        Bearing vmgAngle = Bearing.fromDegrees((bestAngle + trueWindSpeed) % 360);
+        double boatSpeed = Math.abs(trueWindSpeed * Math.cos(vmgAngle.radians())) * 4;
 
-        Bearing vmgAngle = Bearing.fromDegrees(closestAngle);
-        double boatSpeed = Math.abs(closestSpeed * Math.cos(vmgAngle.radians())) * 4;
         return new VMG(boatSpeed, vmgAngle);
     }
 

From ec58f0c847a3cdba2a1b8c76c5ae92060d1afc0e Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Sat, 2 Sep 2017 00:27:44 +1200
Subject: [PATCH 31/51] Participants can now join during the warning period as
 well. Added RaceDataSourceToXML. RaceServer now create an XMLMessage when the
 race's RaceDataSource changes. #story[1188]

---
 .../src/main/java/mock/app/Event.java         |  14 --
 .../java/mock/model/ClientConnection.java     |  11 +-
 .../src/main/java/mock/model/RaceLogic.java   |   4 +-
 .../src/main/java/mock/model/RaceServer.java  |  30 ++--
 .../java/mock/model/SourceIdAllocator.java    |   3 +-
 .../network/Messages/Enums/RaceTypeEnum.java  |  12 ++
 .../java/shared/dataInput/BoatDataSource.java |  12 ++
 .../java/shared/dataInput/BoatXMLReader.java  |  13 ++
 .../shared/dataInput/EmptyBoatDataSource.java |  13 ++
 .../shared/dataInput/EmptyRaceDataSource.java |  13 ++
 .../dataInput/EmptyRegattaDataSource.java     |  13 ++
 .../java/shared/dataInput/RaceDataSource.java |   8 ++
 .../java/shared/dataInput/RaceXMLReader.java  |   6 +-
 .../shared/dataInput/RegattaDataSource.java   |  10 ++
 .../shared/dataInput/RegattaXMLReader.java    |  12 ++
 .../main/java/shared/enums/RoundingType.java  |  15 ++
 .../shared/xml/Race/RaceDataSourceToXML.java  | 131 ++++++++++++++++++
 .../main/resources/mock/mockXML/boatTest.xml  |   1 -
 18 files changed, 289 insertions(+), 32 deletions(-)
 create mode 100644 racevisionGame/src/main/java/shared/xml/Race/RaceDataSourceToXML.java

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index 27e2103c..dcc5b407 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -161,8 +161,6 @@ public class Event {
         this.connectionThread = new Thread(connectionAcceptor, "Event.Start()->ConnectionAcceptor thread");
         connectionThread.start();
 
-        sendXMLs();
-
 
     }
 
@@ -175,18 +173,6 @@ public class Event {
 
 
 
-    /**
-     * Sends out each xml string, via the mock output
-     */
-    private void sendXMLs() {
-
-        connectionAcceptor.setRegattaXml(regattaXML);
-
-        connectionAcceptor.setRaceXml(raceXML);
-
-        connectionAcceptor.setBoatsXml(boatXML);
-    }
-
 
     //TODO remove this after demo on 18th august!
     /**
diff --git a/racevisionGame/src/main/java/mock/model/ClientConnection.java b/racevisionGame/src/main/java/mock/model/ClientConnection.java
index d2ca7609..2b0caacf 100644
--- a/racevisionGame/src/main/java/mock/model/ClientConnection.java
+++ b/racevisionGame/src/main/java/mock/model/ClientConnection.java
@@ -109,6 +109,11 @@ public class ClientConnection implements Runnable {
      */
     private ConnectionStateEnum connectionState = ConnectionStateEnum.UNKNOWN;
 
+    /**
+     * The source ID that has been allocated to the client.
+     * 0 means not allocated.
+     */
+    private int allocatedSourceID = 0;
 
 
 
@@ -178,7 +183,7 @@ public class ClientConnection implements Runnable {
 
         RequestToJoin requestToJoin = waitForRequestToJoin();
 
-        int allocatedSourceID = 0;
+        allocatedSourceID = 0;
 
         //If they want to participate, give them a source ID number.
         if (requestToJoin.getRequestType() == RequestToJoinEnum.PARTICIPANT) {
@@ -283,6 +288,10 @@ public class ClientConnection implements Runnable {
         if (this.controllerServerThread != null) {
             this.controllerServerThread.interrupt();
         }
+
+        if (allocatedSourceID != 0) {
+            sourceIdAllocator.returnSourceID(allocatedSourceID);
+        }
     }
 
 }
diff --git a/racevisionGame/src/main/java/mock/model/RaceLogic.java b/racevisionGame/src/main/java/mock/model/RaceLogic.java
index a1bddd9a..d1ef39e0 100644
--- a/racevisionGame/src/main/java/mock/model/RaceLogic.java
+++ b/racevisionGame/src/main/java/mock/model/RaceLogic.java
@@ -71,7 +71,8 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer {
         long previousFrameTime = System.currentTimeMillis();
 
         while (((race.getRaceStatusEnum() == RaceStatusEnum.PRESTART)
-                || (race.getRaceStatusEnum() == RaceStatusEnum.NOT_ACTIVE)) && loopBool) {
+                || (race.getRaceStatusEnum() == RaceStatusEnum.NOT_ACTIVE)
+                || (race.getRaceStatusEnum() == RaceStatusEnum.WARNING)) && loopBool) {
 
             long currentTime = System.currentTimeMillis();
 
@@ -87,6 +88,7 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer {
             //Parse the race snapshot.
             server.parseSnapshot();
 
+
             waitForFramePeriod(previousFrameTime, currentTime, 50);
             previousFrameTime = currentTime;
         }
diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java
index 45a4f6e0..37c21194 100644
--- a/racevisionGame/src/main/java/mock/model/RaceServer.java
+++ b/racevisionGame/src/main/java/mock/model/RaceServer.java
@@ -7,9 +7,15 @@ import network.Messages.Enums.XMLMessageType;
 import shared.model.Bearing;
 import shared.model.CompoundMark;
 import shared.model.Mark;
+import shared.xml.Race.RaceDataSourceToXML;
+import shared.xml.boats.BoatDataSourceToXML;
+import shared.xml.regatta.RegattaDataSourceToXML;
 
+import javax.xml.bind.JAXBException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Created by connortaylorbrown on 2/08/17.
@@ -27,26 +33,22 @@ public class RaceServer {
     /**
      * The sequence number of race XML messages.
      */
-    private int raceXMLSeqNumber;
+    private int raceXMLSeqNumber = -1;
 
     /**
      * The sequence number of boat XML messages.
      */
-    private int boatXMLSeqNumber;
+    private int boatXMLSeqNumber = -1;
 
     /**
      * The sequence number of regatta XML messages.
      */
-    private int regattaXMLSeqNumber;
+    private int regattaXMLSeqNumber = -1;
 
 
     public RaceServer(MockRace race, LatestMessages latestMessages) {
         this.race = race;
         this.latestMessages = latestMessages;
-
-        this.raceXMLSeqNumber = race.getRaceDataSource().getSequenceNumber();
-        //this.boatXMLSeqNumber = race.getBoatDataSource().getSequenceNumber();
-        //this.regattaXMLSeqNumber = race.getRegattaDataSource().getSequenceNumber();
     }
 
     /**
@@ -85,11 +87,17 @@ public class RaceServer {
      */
     private void updateRaceXMLFile() {
         if (raceXMLSeqNumber != race.getRaceDataSource().getSequenceNumber()) {
-            //TODO generate XML string from race data source
-            String raceXMLString = "test";//TODO
-            XMLMessage message = createXMLMessage(raceXMLString, XMLMessageType.RACE);
-            latestMessages.setXMLMessage(message);
+
             raceXMLSeqNumber = race.getRaceDataSource().getSequenceNumber();
+            try {
+                String raceXMLString = RaceDataSourceToXML.toString(race.getRaceDataSource());
+                XMLMessage message = createXMLMessage(raceXMLString, XMLMessageType.RACE);
+                latestMessages.setXMLMessage(message);
+
+            } catch (JAXBException e) {
+                Logger.getGlobal().log(Level.WARNING, "Could not serialise: " + race.getRaceDataSource(), e);
+            }
+
         }
     }
 
diff --git a/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java b/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
index b609e5a5..17a7e85f 100644
--- a/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
+++ b/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
@@ -36,7 +36,8 @@ public class SourceIdAllocator {
      */
     public synchronized int  allocateSourceID() throws SourceIDAllocationException {
 
-        if (mockRace.getRaceStatusEnum() != RaceStatusEnum.PRESTART) {
+        if (!((mockRace.getRaceStatusEnum() == RaceStatusEnum.PRESTART)
+                || (mockRace.getRaceStatusEnum() == RaceStatusEnum.WARNING))) {
             throw new SourceIDAllocationException("Could not allocate a source ID. Can only allocate during pre-start period. It is currently: " + mockRace.getRaceStatusEnum());
         }
 
diff --git a/racevisionGame/src/main/java/network/Messages/Enums/RaceTypeEnum.java b/racevisionGame/src/main/java/network/Messages/Enums/RaceTypeEnum.java
index 6a03b37e..4c75cc52 100644
--- a/racevisionGame/src/main/java/network/Messages/Enums/RaceTypeEnum.java
+++ b/racevisionGame/src/main/java/network/Messages/Enums/RaceTypeEnum.java
@@ -71,6 +71,8 @@ public enum RaceTypeEnum {
     }
 
 
+
+
     /**
      * Stores a mapping between Byte values and RaceStatusEnum values.
      */
@@ -107,4 +109,14 @@ public enum RaceTypeEnum {
     }
 
 
+    @Override
+    public String toString() {
+        if (fromByte(value) == FLEET_RACE) {
+            return "fleet";
+        } else if (fromByte(value) == MATCH_RACE) {
+            return "match";
+        } else {
+            return super.toString();
+        }
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/BoatDataSource.java b/racevisionGame/src/main/java/shared/dataInput/BoatDataSource.java
index 40f12c75..17bb7c45 100644
--- a/racevisionGame/src/main/java/shared/dataInput/BoatDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/BoatDataSource.java
@@ -22,4 +22,16 @@ public interface BoatDataSource {
      * @return Map between source ID and mark.
      */
     Map<Integer, Mark> getMarkerBoats();
+
+
+    /**
+     * Returns the sequence number associated with this data source. Used to indicate when it has changed.
+     * @return Sequence number.
+     */
+    int getSequenceNumber();
+
+    /**
+     * Increments the sequence number for this data source. Used to indicate that it has changed.
+     */
+    void incrementSequenceNumber();
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/BoatXMLReader.java b/racevisionGame/src/main/java/shared/dataInput/BoatXMLReader.java
index 885309c0..25c956d9 100644
--- a/racevisionGame/src/main/java/shared/dataInput/BoatXMLReader.java
+++ b/racevisionGame/src/main/java/shared/dataInput/BoatXMLReader.java
@@ -29,6 +29,8 @@ public class BoatXMLReader extends XMLReader implements BoatDataSource {
     private final Map<Integer, Mark> markerMap = new HashMap<>();
 
 
+    private int sequenceNumber = 0;
+
     /**
      * Constructor for Boat XML using a file.
      *
@@ -174,4 +176,15 @@ public class BoatXMLReader extends XMLReader implements BoatDataSource {
     public Map<Integer, Mark> getMarkerBoats() {
         return markerMap;
     }
+
+
+    @Override
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    @Override
+    public void incrementSequenceNumber() {
+        sequenceNumber++;
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/EmptyBoatDataSource.java b/racevisionGame/src/main/java/shared/dataInput/EmptyBoatDataSource.java
index 1de4251e..7a8d2151 100644
--- a/racevisionGame/src/main/java/shared/dataInput/EmptyBoatDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/EmptyBoatDataSource.java
@@ -22,6 +22,8 @@ public class EmptyBoatDataSource implements BoatDataSource {
     private final Map<Integer, Mark> markerMap = new HashMap<>();
 
 
+    private int sequenceNumber = 0;
+
 
     public EmptyBoatDataSource() {
     }
@@ -44,4 +46,15 @@ public class EmptyBoatDataSource implements BoatDataSource {
     public Map<Integer, Mark> getMarkerBoats() {
         return markerMap;
     }
+
+
+    @Override
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    @Override
+    public void incrementSequenceNumber() {
+        sequenceNumber++;
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java b/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java
index ffacaa93..676d7e70 100644
--- a/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java
@@ -2,8 +2,10 @@ package shared.dataInput;
 
 import network.Messages.Enums.RaceTypeEnum;
 import shared.model.CompoundMark;
+import shared.model.Corner;
 import shared.model.GPSCoordinate;
 import shared.model.Leg;
+import shared.xml.Race.XMLCorner;
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -48,6 +50,12 @@ public class EmptyRaceDataSource implements RaceDataSource {
      */
     private final List<Leg> legs = new ArrayList<>();
 
+    /**
+     * Corners in race.
+     */
+    private final List<Corner> corners = new ArrayList<>();
+
+
 
     /**
      * The time that the race.xml file was created.
@@ -100,6 +108,11 @@ public class EmptyRaceDataSource implements RaceDataSource {
         return legs;
     }
 
+    @Override
+    public List<Corner> getCorners() {
+        return corners;
+    }
+
     public List<CompoundMark> getCompoundMarks() {
         return new ArrayList<>(compoundMarkMap.values());
     }
diff --git a/racevisionGame/src/main/java/shared/dataInput/EmptyRegattaDataSource.java b/racevisionGame/src/main/java/shared/dataInput/EmptyRegattaDataSource.java
index 05a0fcf9..1546972e 100644
--- a/racevisionGame/src/main/java/shared/dataInput/EmptyRegattaDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/EmptyRegattaDataSource.java
@@ -60,6 +60,8 @@ public class EmptyRegattaDataSource implements RegattaDataSource {
 
 
 
+    private int sequenceNumber = 0;
+
 
     public EmptyRegattaDataSource() {
     }
@@ -119,4 +121,15 @@ public class EmptyRegattaDataSource implements RegattaDataSource {
     public GPSCoordinate getGPSCoordinate() {
         return new GPSCoordinate(centralLatitude, centralLongitude);
     }
+
+
+    @Override
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    @Override
+    public void incrementSequenceNumber() {
+        sequenceNumber++;
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java b/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java
index c1a4b370..765098f2 100644
--- a/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/RaceDataSource.java
@@ -2,8 +2,10 @@ package shared.dataInput;
 
 import network.Messages.Enums.RaceTypeEnum;
 import shared.model.CompoundMark;
+import shared.model.Corner;
 import shared.model.GPSCoordinate;
 import shared.model.Leg;
+import shared.xml.Race.XMLCorner;
 
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -27,6 +29,12 @@ public interface RaceDataSource {
      */
     List<Leg> getLegs();
 
+    /**
+     * Returns the list of corners in the race - two adjacent corners form a leg.
+     * @return List of corners in race.
+     */
+    List<Corner> getCorners();
+
     /**
      * Returns a list of coordinates representing the boundary of the race.
      * @return The boundary of the race.
diff --git a/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java b/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
index 6165bf44..41d60e5f 100644
--- a/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
+++ b/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
@@ -345,7 +345,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource {
 
         int cornerSeq = Integer.parseInt(getAttribute(cornerElement, "SeqID"));
 
-        cornersList.add(new Corner(cornerID, cornerSeq, "SP", 3));
+        cornersList.add(new Corner(cornerID, cornerSeq, cornerRounding, 3));
 
         //Gets the CompoundMark associated with this corner.
         CompoundMark lastCompoundMark = this.compoundMarkMap.get(cornerID);
@@ -368,7 +368,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource {
 
             cornerSeq = Integer.parseInt(getAttribute(cornerElement, "SeqID"));
 
-            cornersList.add(new Corner(cornerID, cornerSeq, "Port", 3));
+            cornersList.add(new Corner(cornerID, cornerSeq, getCompoundMarkRounding(cornerElement), 3));
             //gets the Rounding of this corner element
             cornerRounding = getCompoundMarkRounding(cornerElement);
 
@@ -490,7 +490,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource {
         return participants;
     }
 
-    public List<Corner> getCornersList() {
+    public List<Corner> getCorners() {
         return cornersList;
     }
 
diff --git a/racevisionGame/src/main/java/shared/dataInput/RegattaDataSource.java b/racevisionGame/src/main/java/shared/dataInput/RegattaDataSource.java
index eb198cb2..9af55217 100644
--- a/racevisionGame/src/main/java/shared/dataInput/RegattaDataSource.java
+++ b/racevisionGame/src/main/java/shared/dataInput/RegattaDataSource.java
@@ -66,5 +66,15 @@ public interface RegattaDataSource {
     float getMagneticVariation();
 
 
+    /**
+     * Returns the sequence number associated with this data source. Used to indicate when it has changed.
+     * @return Sequence number.
+     */
+    int getSequenceNumber();
+
+    /**
+     * Increments the sequence number for this data source. Used to indicate that it has changed.
+     */
+    void incrementSequenceNumber();
 
 }
diff --git a/racevisionGame/src/main/java/shared/dataInput/RegattaXMLReader.java b/racevisionGame/src/main/java/shared/dataInput/RegattaXMLReader.java
index 0a756b03..36743105 100644
--- a/racevisionGame/src/main/java/shared/dataInput/RegattaXMLReader.java
+++ b/racevisionGame/src/main/java/shared/dataInput/RegattaXMLReader.java
@@ -59,6 +59,8 @@ public class RegattaXMLReader extends XMLReader implements RegattaDataSource {
     private float magneticVariation;
 
 
+    private int sequenceNumber = 0;
+
 
     /**
      * Constructor for Regatta XML using a file.
@@ -209,4 +211,14 @@ public class RegattaXMLReader extends XMLReader implements RegattaDataSource {
     public GPSCoordinate getGPSCoordinate() {
         return new GPSCoordinate(centralLatitude, centralLongitude);
     }
+
+    @Override
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    @Override
+    public void incrementSequenceNumber() {
+        sequenceNumber++;
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/enums/RoundingType.java b/racevisionGame/src/main/java/shared/enums/RoundingType.java
index 8f8e719a..e9faef80 100644
--- a/racevisionGame/src/main/java/shared/enums/RoundingType.java
+++ b/racevisionGame/src/main/java/shared/enums/RoundingType.java
@@ -46,4 +46,19 @@ public enum RoundingType {
                 return null;
         }
     }
+
+    public static String getStringOf(RoundingType value) {
+        switch (value) {
+            case Port:
+                return "Port";
+            case Starboard:
+                return "Starboard";
+            case SP:
+                return "SP";
+            case PS:
+                return "PS";
+            default:
+                return null;
+        }
+    }
 }
diff --git a/racevisionGame/src/main/java/shared/xml/Race/RaceDataSourceToXML.java b/racevisionGame/src/main/java/shared/xml/Race/RaceDataSourceToXML.java
new file mode 100644
index 00000000..3e3b5f8c
--- /dev/null
+++ b/racevisionGame/src/main/java/shared/xml/Race/RaceDataSourceToXML.java
@@ -0,0 +1,131 @@
+package shared.xml.Race;
+
+import shared.dataInput.RaceDataSource;
+import shared.enums.RoundingType;
+import shared.model.CompoundMark;
+import shared.model.Corner;
+import shared.model.GPSCoordinate;
+import shared.model.Leg;
+import shared.xml.XMLUtilities;
+
+import javax.xml.bind.JAXBException;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+
+/**
+ * Has functions to convert a {@link shared.dataInput.RaceDataSource} to an {@link XMLRace} object.
+ */
+public class RaceDataSourceToXML {
+
+
+    /**
+     * Converts a race data source to an XMLRace object.
+     * @param raceDataSource The data source to convert.
+     * @return The XMLRace file.
+     */
+    public static XMLRace toXML(RaceDataSource raceDataSource) {
+
+        //Kind of ugly. Could be refactored/split up a bit.
+
+
+        XMLRace race = new XMLRace();
+
+
+        race.setRaceID(raceDataSource.getRaceId());
+        race.setRaceType(raceDataSource.getRaceType().toString());
+
+
+        race.setCreationTimeDate(raceDataSource.getCreationDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ")));
+
+
+        XMLRaceStartTime startTime = new XMLRaceStartTime();
+        startTime.setPostpone(String.valueOf(raceDataSource.getPostponed()));
+        startTime.setTime(raceDataSource.getStartDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ")));
+        race.setRaceStartTime(startTime);
+
+
+        XMLParticipants participants = new XMLParticipants();
+        participants.yacht = new ArrayList<>();
+        for (int i : raceDataSource.getParticipants()) {
+            XMLYacht yacht = new XMLYacht();
+            yacht.setSourceID(i);
+            participants.yacht.add(yacht);
+        }
+        race.setParticipants(participants);
+
+
+        XMLCourseLimit courseLimit = new XMLCourseLimit();
+        courseLimit.limit = new ArrayList<>();
+        for (int i = 0; i < raceDataSource.getBoundary().size(); i++) {
+            XMLLimit limit = new XMLLimit();
+            limit.setLat(raceDataSource.getBoundary().get(i).getLatitude());
+            limit.setLon(raceDataSource.getBoundary().get(i).getLongitude());
+            limit.setSeqID(i + 1);
+            courseLimit.limit.add(limit);
+        }
+        race.setCourseLimit(courseLimit);
+
+
+        XMLCourse course = new XMLCourse();
+        course.compoundMark = new ArrayList<>();
+        for (CompoundMark compoundMark : raceDataSource.getCompoundMarks()) {
+            XMLCompoundMark xmlCompoundMark = new XMLCompoundMark();
+            xmlCompoundMark.setCompoundMarkID(compoundMark.getCompoundMarkID());
+            xmlCompoundMark.setName(compoundMark.getName());
+
+            if (compoundMark.getMark1() != null) {
+                XMLMark xmlMark = new XMLMark();
+                xmlMark.setName(compoundMark.getMark1().getName());
+                xmlMark.setSourceID(compoundMark.getMark1().getSourceID());
+                xmlMark.setSeqId(1);
+                xmlMark.setTargetLat(compoundMark.getMark1().getPosition().getLatitude());
+                xmlMark.setTargetLng(compoundMark.getMark1().getPosition().getLongitude());
+
+                xmlCompoundMark.getMark().add(xmlMark);
+            }
+            if (compoundMark.getMark2() != null) {
+                XMLMark xmlMark = new XMLMark();
+                xmlMark.setName(compoundMark.getMark2().getName());
+                xmlMark.setSourceID(compoundMark.getMark2().getSourceID());
+                xmlMark.setSeqId(2);
+                xmlMark.setTargetLat(compoundMark.getMark2().getPosition().getLatitude());
+                xmlMark.setTargetLng(compoundMark.getMark2().getPosition().getLongitude());
+
+                xmlCompoundMark.getMark().add(xmlMark);
+            }
+
+            course.compoundMark.add(xmlCompoundMark);
+        }
+        race.setCourse(course);
+
+        XMLCompoundMarkSequence compoundMarkSequence = new XMLCompoundMarkSequence();
+        compoundMarkSequence.corner = new ArrayList<>();
+        for (Corner corner : raceDataSource.getCorners()) {
+            XMLCorner xmlCorner = new XMLCorner();
+            xmlCorner.setZoneSize(corner.getZoneSize());
+            xmlCorner.setSeqID(corner.getSeqID());
+            xmlCorner.setCompoundMarkID(corner.getCompoundMarkID());
+            xmlCorner.setRounding(corner.getRounding());
+
+            compoundMarkSequence.corner.add(xmlCorner);
+        }
+        race.setCompoundMarkSequence(compoundMarkSequence);
+
+
+        return race;
+    }
+
+
+    /**
+     * Converts a race data source to an xml string.
+     * @param raceDataSource Data source to convert.
+     * @return String containing xml file.
+     * @throws JAXBException Thrown if it cannot be converted.
+     */
+    public static String toString(RaceDataSource raceDataSource) throws JAXBException {
+        XMLRace race = toXML(raceDataSource);
+        return XMLUtilities.classToXML(race);
+    }
+
+
+}
diff --git a/racevisionGame/src/main/resources/mock/mockXML/boatTest.xml b/racevisionGame/src/main/resources/mock/mockXML/boatTest.xml
index 9295dc07..59e2f79d 100644
--- a/racevisionGame/src/main/resources/mock/mockXML/boatTest.xml
+++ b/racevisionGame/src/main/resources/mock/mockXML/boatTest.xml
@@ -32,7 +32,6 @@
             <GPSposition X= "-64.83626" Y="32.317257" Z="0"/>
         </Boat>
 
-        <!--Participants-->
         <!--Participants-->
         <Boat BoatName="Emirates Team New Zealand" HullNum="RG01" ShapeID="0" ShortName="NZL" SourceID="121" StoweName="NZL" Type="Yacht">
             <GPSposition X="-64.854304" Y="32.296577" Z="0"/>

From 298fcd03dc3b87979d4dd497a880e3cfb36d470e Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Sat, 2 Sep 2017 00:33:09 +1200
Subject: [PATCH 32/51] Added regatta schema. RaceServer now creates an
 XMLMessage when the race's RegattaDataSource changes. #story[1188]

---
 .../src/main/java/mock/model/RaceServer.java  |  13 ++
 .../shared/xml/regatta/ObjectFactory.java     |  47 ++++
 .../shared/xml/regatta/RegattaConfig.java     | 219 ++++++++++++++++++
 .../xml/regatta/RegattaDataSourceToXML.java   |  54 +++++
 .../mock/mockXML/schema/regattaSchema.xsd     |  17 ++
 5 files changed, 350 insertions(+)
 create mode 100644 racevisionGame/src/main/java/shared/xml/regatta/ObjectFactory.java
 create mode 100644 racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java
 create mode 100644 racevisionGame/src/main/java/shared/xml/regatta/RegattaDataSourceToXML.java
 create mode 100644 racevisionGame/src/main/resources/mock/mockXML/schema/regattaSchema.xsd

diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java
index 37c21194..585fe615 100644
--- a/racevisionGame/src/main/java/mock/model/RaceServer.java
+++ b/racevisionGame/src/main/java/mock/model/RaceServer.java
@@ -112,7 +112,20 @@ public class RaceServer {
      * Checks if the regatta data source has changed, and if it has, updates LatestMessages' regatta xml message.
      */
     private void updateRegattaXMLFile() {
+        if (regattaXMLSeqNumber != race.getRegattaDataSource().getSequenceNumber()) {
 
+            regattaXMLSeqNumber = race.getRegattaDataSource().getSequenceNumber();
+
+            try {
+                String regattaXMLString = RegattaDataSourceToXML.toString(race.getRegattaDataSource());
+                XMLMessage message = createXMLMessage(regattaXMLString, XMLMessageType.REGATTA);
+                latestMessages.setXMLMessage(message);
+
+            } catch (JAXBException e) {
+                Logger.getGlobal().log(Level.WARNING, "Could not serialise: " + race.getRegattaDataSource(), e);
+            }
+
+        }
     }
 
     /**
diff --git a/racevisionGame/src/main/java/shared/xml/regatta/ObjectFactory.java b/racevisionGame/src/main/java/shared/xml/regatta/ObjectFactory.java
new file mode 100644
index 00000000..7fc72202
--- /dev/null
+++ b/racevisionGame/src/main/java/shared/xml/regatta/ObjectFactory.java
@@ -0,0 +1,47 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2017.09.01 at 10:37:23 PM NZST 
+//
+
+
+package shared.xml.regatta;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the aaa package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: aaa
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link RegattaConfig }
+     * 
+     */
+    public RegattaConfig createRegattaConfig() {
+        return new RegattaConfig();
+    }
+
+}
diff --git a/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java b/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java
new file mode 100644
index 00000000..cf72ed5b
--- /dev/null
+++ b/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java
@@ -0,0 +1,219 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2017.09.01 at 10:37:23 PM NZST 
+//
+
+
+package shared.xml.regatta;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="RegattaID" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="RegattaName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="CourseName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="CentralLatitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         &lt;element name="CentralLongitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         &lt;element name="CentralAltitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         &lt;element name="UtcOffset" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         &lt;element name="MagneticVariation" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "regattaID",
+    "regattaName",
+    "courseName",
+    "centralLatitude",
+    "centralLongitude",
+    "centralAltitude",
+    "utcOffset",
+    "magneticVariation"
+})
+@XmlRootElement(name = "RegattaConfig")
+public class RegattaConfig {
+
+    @XmlElement(name = "RegattaID")
+    protected int regattaID;
+    @XmlElement(name = "RegattaName", required = true)
+    protected String regattaName;
+    @XmlElement(name = "CourseName", required = true)
+    protected String courseName;
+    @XmlElement(name = "CentralLatitude")
+    protected double centralLatitude;
+    @XmlElement(name = "CentralLongitude")
+    protected double centralLongitude;
+    @XmlElement(name = "CentralAltitude")
+    protected double centralAltitude;
+    @XmlElement(name = "UtcOffset")
+    protected double utcOffset;
+    @XmlElement(name = "MagneticVariation")
+    protected double magneticVariation;
+
+    /**
+     * Gets the value of the regattaID property.
+     * 
+     */
+    public int getRegattaID() {
+        return regattaID;
+    }
+
+    /**
+     * Sets the value of the regattaID property.
+     * 
+     */
+    public void setRegattaID(int value) {
+        this.regattaID = value;
+    }
+
+    /**
+     * Gets the value of the regattaName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRegattaName() {
+        return regattaName;
+    }
+
+    /**
+     * Sets the value of the regattaName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRegattaName(String value) {
+        this.regattaName = value;
+    }
+
+    /**
+     * Gets the value of the courseName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCourseName() {
+        return courseName;
+    }
+
+    /**
+     * Sets the value of the courseName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCourseName(String value) {
+        this.courseName = value;
+    }
+
+    /**
+     * Gets the value of the centralLatitude property.
+     * 
+     */
+    public double getCentralLatitude() {
+        return centralLatitude;
+    }
+
+    /**
+     * Sets the value of the centralLatitude property.
+     * 
+     */
+    public void setCentralLatitude(double value) {
+        this.centralLatitude = value;
+    }
+
+    /**
+     * Gets the value of the centralLongitude property.
+     * 
+     */
+    public double getCentralLongitude() {
+        return centralLongitude;
+    }
+
+    /**
+     * Sets the value of the centralLongitude property.
+     * 
+     */
+    public void setCentralLongitude(double value) {
+        this.centralLongitude = value;
+    }
+
+    /**
+     * Gets the value of the centralAltitude property.
+     * 
+     */
+    public double getCentralAltitude() {
+        return centralAltitude;
+    }
+
+    /**
+     * Sets the value of the centralAltitude property.
+     * 
+     */
+    public void setCentralAltitude(double value) {
+        this.centralAltitude = value;
+    }
+
+    /**
+     * Gets the value of the utcOffset property.
+     * 
+     */
+    public double getUtcOffset() {
+        return utcOffset;
+    }
+
+    /**
+     * Sets the value of the utcOffset property.
+     * 
+     */
+    public void setUtcOffset(double value) {
+        this.utcOffset = value;
+    }
+
+    /**
+     * Gets the value of the magneticVariation property.
+     * 
+     */
+    public double getMagneticVariation() {
+        return magneticVariation;
+    }
+
+    /**
+     * Sets the value of the magneticVariation property.
+     * 
+     */
+    public void setMagneticVariation(double value) {
+        this.magneticVariation = value;
+    }
+
+}
diff --git a/racevisionGame/src/main/java/shared/xml/regatta/RegattaDataSourceToXML.java b/racevisionGame/src/main/java/shared/xml/regatta/RegattaDataSourceToXML.java
new file mode 100644
index 00000000..bbe1dce6
--- /dev/null
+++ b/racevisionGame/src/main/java/shared/xml/regatta/RegattaDataSourceToXML.java
@@ -0,0 +1,54 @@
+package shared.xml.regatta;
+
+import shared.dataInput.RegattaDataSource;
+import shared.xml.Race.XMLRace;
+import shared.xml.XMLUtilities;
+
+import javax.xml.bind.JAXBException;
+
+/**
+ * Has functions to convert a {@link shared.dataInput.RegattaDataSource} to an {@link RegattaConfig} object.
+ */
+public class RegattaDataSourceToXML {
+
+
+    /**
+     * Converts a regatta data source to an XMLRace object.
+     * @param regattaDataSource The data source to convert.
+     * @return The XMLRace file.
+     */
+    public static RegattaConfig toXML(RegattaDataSource regattaDataSource) {
+
+        RegattaConfig regatta = new RegattaConfig();
+
+        regatta.setCentralAltitude(regattaDataSource.getCentralAltitude());
+        regatta.setCentralLatitude(regattaDataSource.getCentralLatitude());
+        regatta.setCentralLongitude(regattaDataSource.getCentralLongitude());
+
+        regatta.setCourseName(regattaDataSource.getCourseName());
+
+        regatta.setRegattaName(regattaDataSource.getRegattaName());
+
+        regatta.setMagneticVariation(regattaDataSource.getMagneticVariation());
+
+        regatta.setRegattaID(regattaDataSource.getRegattaID());
+
+        regatta.setUtcOffset(regattaDataSource.getUtcOffset());
+
+        return regatta;
+    }
+
+
+    /**
+     * Converts a regatta data source to an xml string.
+     * @param regattaDataSource Data source to convert.
+     * @return String containing xml file.
+     * @throws JAXBException Thrown if it cannot be converted.
+     */
+    public static String toString(RegattaDataSource regattaDataSource) throws JAXBException {
+        RegattaConfig regatta = toXML(regattaDataSource);
+        return XMLUtilities.classToXML(regatta);
+    }
+
+
+}
diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/regattaSchema.xsd b/racevisionGame/src/main/resources/mock/mockXML/schema/regattaSchema.xsd
new file mode 100644
index 00000000..5c9fb774
--- /dev/null
+++ b/racevisionGame/src/main/resources/mock/mockXML/schema/regattaSchema.xsd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="RegattaConfig">
+    <xs:complexType>
+    <xs:sequence>
+      <xs:element type="xs:int" name="RegattaID" minOccurs="1"/>
+      <xs:element type="xs:string" name="RegattaName" minOccurs="1"/>
+      <xs:element type="xs:string" name="CourseName" minOccurs="1"/>
+      <xs:element name="CentralLatitude" type="xs:double" minOccurs="1"/>
+      <xs:element name="CentralLongitude" type="xs:double" minOccurs="1"/>
+      <xs:element name="CentralAltitude" type="xs:double" minOccurs="1"/>
+      <xs:element type="xs:double" name="UtcOffset" minOccurs="1"/>
+      <xs:element name="MagneticVariation" type="xs:double" minOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+  </xs:element>
+</xs:schema>

From 8c76d6c26ef3c21f46c473ea171d6426b87709da Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Sat, 2 Sep 2017 00:34:41 +1200
Subject: [PATCH 33/51] Added boats.xml schema. RaceServer now creates an
 XMLMessage when the race's BoatDataSource changes. #story[1188]

---
 .../src/main/java/mock/model/RaceServer.java  |  16 +-
 .../java/shared/xml/boats/BoatConfig.java     | 533 ++++++++++++++++++
 .../shared/xml/boats/BoatDataSourceToXML.java |  86 +++
 .../java/shared/xml/boats/ObjectFactory.java  |  71 +++
 .../mock/mockXML/schema/boatsSchema.xsd       |  36 ++
 5 files changed, 740 insertions(+), 2 deletions(-)
 create mode 100644 racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java
 create mode 100644 racevisionGame/src/main/java/shared/xml/boats/BoatDataSourceToXML.java
 create mode 100644 racevisionGame/src/main/java/shared/xml/boats/ObjectFactory.java
 create mode 100644 racevisionGame/src/main/resources/mock/mockXML/schema/boatsSchema.xsd

diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java
index 585fe615..b7ccef12 100644
--- a/racevisionGame/src/main/java/mock/model/RaceServer.java
+++ b/racevisionGame/src/main/java/mock/model/RaceServer.java
@@ -78,8 +78,8 @@ public class RaceServer {
      */
     private void updateXMLFiles() {
         updateRaceXMLFile();
-        //updateBoatXMLFile();
-        //updateRegattaXMLFile();
+        updateBoatXMLFile();
+        updateRegattaXMLFile();
     }
 
     /**
@@ -105,7 +105,19 @@ public class RaceServer {
      * Checks if the boat data source has changed, and if it has, updates LatestMessages' boat xml message.
      */
     private void updateBoatXMLFile() {
+        if (boatXMLSeqNumber != race.getBoatDataSource().getSequenceNumber()) {
 
+            boatXMLSeqNumber = race.getBoatDataSource().getSequenceNumber();
+            try {
+                String boatXMLString = BoatDataSourceToXML.toString(race.getBoatDataSource());
+                XMLMessage message = createXMLMessage(boatXMLString, XMLMessageType.BOAT);
+                latestMessages.setXMLMessage(message);
+
+            } catch (JAXBException e) {
+                Logger.getGlobal().log(Level.WARNING, "Could not serialise: " + race.getBoatDataSource(), e);
+            }
+
+        }
     }
 
     /**
diff --git a/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java b/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java
new file mode 100644
index 00000000..c517c830
--- /dev/null
+++ b/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java
@@ -0,0 +1,533 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2017.09.01 at 11:12:43 PM NZST 
+//
+
+
+package shared.xml.boats;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Boats">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="Boat" maxOccurs="unbounded">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="GPSposition">
+ *                               &lt;complexType>
+ *                                 &lt;complexContent>
+ *                                   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                   &lt;/restriction>
+ *                                 &lt;/complexContent>
+ *                               &lt;/complexType>
+ *                             &lt;/element>
+ *                           &lt;/sequence>
+ *                           &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "boats"
+})
+@XmlRootElement(name = "BoatConfig")
+public class BoatConfig {
+
+    @XmlElement(name = "Boats", required = true)
+    protected BoatConfig.Boats boats;
+
+    /**
+     * Gets the value of the boats property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BoatConfig.Boats }
+     *     
+     */
+    public BoatConfig.Boats getBoats() {
+        return boats;
+    }
+
+    /**
+     * Sets the value of the boats property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BoatConfig.Boats }
+     *     
+     */
+    public void setBoats(BoatConfig.Boats value) {
+        this.boats = value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *         &lt;element name="Boat" maxOccurs="unbounded">
+     *           &lt;complexType>
+     *             &lt;complexContent>
+     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 &lt;sequence>
+     *                   &lt;element name="GPSposition">
+     *                     &lt;complexType>
+     *                       &lt;complexContent>
+     *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         &lt;/restriction>
+     *                       &lt;/complexContent>
+     *                     &lt;/complexType>
+     *                   &lt;/element>
+     *                 &lt;/sequence>
+     *                 &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                 &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                 &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                 &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                 &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *               &lt;/restriction>
+     *             &lt;/complexContent>
+     *           &lt;/complexType>
+     *         &lt;/element>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "boat"
+    })
+    public static class Boats {
+
+        @XmlElement(name = "Boat", required = true)
+        protected List<BoatConfig.Boats.Boat> boat;
+
+        /**
+         * Gets the value of the boat property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the boat property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getBoat().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link BoatConfig.Boats.Boat }
+         * 
+         * 
+         */
+        public List<BoatConfig.Boats.Boat> getBoat() {
+            if (boat == null) {
+                boat = new ArrayList<BoatConfig.Boats.Boat>();
+            }
+            return this.boat;
+        }
+
+
+        /**
+         * <p>Java class for anonymous complex type.
+         * 
+         * <p>The following schema fragment specifies the expected content contained within this class.
+         * 
+         * <pre>
+         * &lt;complexType>
+         *   &lt;complexContent>
+         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       &lt;sequence>
+         *         &lt;element name="GPSposition">
+         *           &lt;complexType>
+         *             &lt;complexContent>
+         *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               &lt;/restriction>
+         *             &lt;/complexContent>
+         *           &lt;/complexType>
+         *         &lt;/element>
+         *       &lt;/sequence>
+         *       &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *       &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *       &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *       &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *       &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *     &lt;/restriction>
+         *   &lt;/complexContent>
+         * &lt;/complexType>
+         * </pre>
+         * 
+         * 
+         */
+        @XmlAccessorType(XmlAccessType.FIELD)
+        @XmlType(name = "", propOrder = {
+            "gpSposition"
+        })
+        public static class Boat {
+
+            @XmlElement(name = "GPSposition", required = true)
+            protected BoatConfig.Boats.Boat.GPSposition gpSposition;
+            @XmlAttribute(name = "Type", required = true)
+            protected String type;
+            @XmlAttribute(name = "BoatName", required = true)
+            protected String boatName;
+            @XmlAttribute(name = "SourceID", required = true)
+            protected int sourceID;
+            @XmlAttribute(name = "HullNum")
+            protected String hullNum;
+            @XmlAttribute(name = "ShortName")
+            protected String shortName;
+            @XmlAttribute(name = "ShapeID")
+            protected Integer shapeID;
+            @XmlAttribute(name = "StoweName")
+            protected String stoweName;
+
+            /**
+             * Gets the value of the gpSposition property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link BoatConfig.Boats.Boat.GPSposition }
+             *     
+             */
+            public BoatConfig.Boats.Boat.GPSposition getGPSposition() {
+                return gpSposition;
+            }
+
+            /**
+             * Sets the value of the gpSposition property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link BoatConfig.Boats.Boat.GPSposition }
+             *     
+             */
+            public void setGPSposition(BoatConfig.Boats.Boat.GPSposition value) {
+                this.gpSposition = value;
+            }
+
+            /**
+             * Gets the value of the type property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getType() {
+                return type;
+            }
+
+            /**
+             * Sets the value of the type property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setType(String value) {
+                this.type = value;
+            }
+
+            /**
+             * Gets the value of the boatName property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getBoatName() {
+                return boatName;
+            }
+
+            /**
+             * Sets the value of the boatName property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setBoatName(String value) {
+                this.boatName = value;
+            }
+
+            /**
+             * Gets the value of the sourceID property.
+             * 
+             */
+            public int getSourceID() {
+                return sourceID;
+            }
+
+            /**
+             * Sets the value of the sourceID property.
+             * 
+             */
+            public void setSourceID(int value) {
+                this.sourceID = value;
+            }
+
+            /**
+             * Gets the value of the hullNum property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getHullNum() {
+                return hullNum;
+            }
+
+            /**
+             * Sets the value of the hullNum property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setHullNum(String value) {
+                this.hullNum = value;
+            }
+
+            /**
+             * Gets the value of the shortName property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getShortName() {
+                return shortName;
+            }
+
+            /**
+             * Sets the value of the shortName property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setShortName(String value) {
+                this.shortName = value;
+            }
+
+            /**
+             * Gets the value of the shapeID property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link Integer }
+             *     
+             */
+            public Integer getShapeID() {
+                return shapeID;
+            }
+
+            /**
+             * Sets the value of the shapeID property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link Integer }
+             *     
+             */
+            public void setShapeID(Integer value) {
+                this.shapeID = value;
+            }
+
+            /**
+             * Gets the value of the stoweName property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getStoweName() {
+                return stoweName;
+            }
+
+            /**
+             * Sets the value of the stoweName property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setStoweName(String value) {
+                this.stoweName = value;
+            }
+
+
+            /**
+             * <p>Java class for anonymous complex type.
+             * 
+             * <p>The following schema fragment specifies the expected content contained within this class.
+             * 
+             * <pre>
+             * &lt;complexType>
+             *   &lt;complexContent>
+             *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     &lt;/restriction>
+             *   &lt;/complexContent>
+             * &lt;/complexType>
+             * </pre>
+             * 
+             * 
+             */
+            @XmlAccessorType(XmlAccessType.FIELD)
+            @XmlType(name = "")
+            public static class GPSposition {
+
+                @XmlAttribute(name = "X", required = true)
+                protected Double x;
+                @XmlAttribute(name = "Y", required = true)
+                protected double y;
+                @XmlAttribute(name = "Z", required = true)
+                protected double z;
+
+                /**
+                 * Gets the value of the x property.
+                 * 
+                 * @return
+                 *     possible object is
+                 *     {@link Double }
+                 *     
+                 */
+                public Double getX() {
+                    return x;
+                }
+
+                /**
+                 * Sets the value of the x property.
+                 * 
+                 * @param value
+                 *     allowed object is
+                 *     {@link Double }
+                 *     
+                 */
+                public void setX(Double value) {
+                    this.x = value;
+                }
+
+                /**
+                 * Gets the value of the y property.
+                 * 
+                 */
+                public double getY() {
+                    return y;
+                }
+
+                /**
+                 * Sets the value of the y property.
+                 * 
+                 */
+                public void setY(double value) {
+                    this.y = value;
+                }
+
+                /**
+                 * Gets the value of the z property.
+                 * 
+                 */
+                public double getZ() {
+                    return z;
+                }
+
+                /**
+                 * Sets the value of the z property.
+                 * 
+                 */
+                public void setZ(double value) {
+                    this.z = value;
+                }
+
+            }
+
+        }
+
+    }
+
+}
diff --git a/racevisionGame/src/main/java/shared/xml/boats/BoatDataSourceToXML.java b/racevisionGame/src/main/java/shared/xml/boats/BoatDataSourceToXML.java
new file mode 100644
index 00000000..d24bee56
--- /dev/null
+++ b/racevisionGame/src/main/java/shared/xml/boats/BoatDataSourceToXML.java
@@ -0,0 +1,86 @@
+package shared.xml.boats;
+
+import shared.dataInput.BoatDataSource;
+import shared.dataInput.RaceDataSource;
+import shared.enums.RoundingType;
+import shared.model.Boat;
+import shared.model.CompoundMark;
+import shared.model.Leg;
+import shared.model.Mark;
+import shared.xml.Race.*;
+import shared.xml.XMLUtilities;
+
+import javax.xml.bind.JAXBException;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+
+/**
+ * Has functions to convert a {@link shared.dataInput.BoatDataSource} to an {@link BoatConfig} object.
+ */
+public class BoatDataSourceToXML {
+
+
+    /**
+     * Converts a boat data source to an XMLRace object.
+     * @param boatDataSource The data source to convert.
+     * @return The XMLRace file.
+     */
+    public static BoatConfig toXML(BoatDataSource boatDataSource) {
+        BoatConfig boatConfig = new BoatConfig();
+
+        boatConfig.boats = new BoatConfig.Boats();
+        boatConfig.boats.boat = new ArrayList<>();
+
+
+        for (Boat boat : boatDataSource.getBoats().values()) {
+            BoatConfig.Boats.Boat xmlBoat = new BoatConfig.Boats.Boat();
+
+            xmlBoat.setType("Yacht");
+            xmlBoat.setBoatName(boat.getName());
+            xmlBoat.setSourceID(boat.getSourceID());
+            xmlBoat.setStoweName(boat.getCountry());
+            xmlBoat.setShortName(boat.getCountry());
+
+            BoatConfig.Boats.Boat.GPSposition position = new BoatConfig.Boats.Boat.GPSposition();
+            position.setX(boat.getPosition().getLongitude());
+            position.setY(boat.getPosition().getLatitude());
+            position.setZ(0);
+            xmlBoat.setGPSposition(position);
+
+            boatConfig.boats.boat.add(xmlBoat);
+        }
+
+
+        for (Mark mark : boatDataSource.getMarkerBoats().values()) {
+            BoatConfig.Boats.Boat xmlBoat = new BoatConfig.Boats.Boat();
+
+            xmlBoat.setType("Mark");
+            xmlBoat.setBoatName(mark.getName());
+            xmlBoat.setSourceID(mark.getSourceID());
+
+            BoatConfig.Boats.Boat.GPSposition position = new BoatConfig.Boats.Boat.GPSposition();
+            position.setX(mark.getPosition().getLongitude());
+            position.setY(mark.getPosition().getLatitude());
+            position.setZ(0);
+            xmlBoat.setGPSposition(position);
+
+            boatConfig.boats.boat.add(xmlBoat);
+        }
+
+        return boatConfig;
+    }
+
+
+    /**
+     * Converts a boat data source to an xml string.
+     * @param boatDataSource Data source to convert.
+     * @return String containing xml file.
+     * @throws JAXBException Thrown if it cannot be converted.
+     */
+    public static String toString(BoatDataSource boatDataSource) throws JAXBException {
+        BoatConfig boats = toXML(boatDataSource);
+        return XMLUtilities.classToXML(boats);
+    }
+
+
+}
diff --git a/racevisionGame/src/main/java/shared/xml/boats/ObjectFactory.java b/racevisionGame/src/main/java/shared/xml/boats/ObjectFactory.java
new file mode 100644
index 00000000..0319de9a
--- /dev/null
+++ b/racevisionGame/src/main/java/shared/xml/boats/ObjectFactory.java
@@ -0,0 +1,71 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2017.09.01 at 11:12:43 PM NZST 
+//
+
+
+package shared.xml.boats;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the aaa package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: aaa
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link BoatConfig }
+     * 
+     */
+    public BoatConfig createBoatConfig() {
+        return new BoatConfig();
+    }
+
+    /**
+     * Create an instance of {@link BoatConfig.Boats }
+     * 
+     */
+    public BoatConfig.Boats createBoatConfigBoats() {
+        return new BoatConfig.Boats();
+    }
+
+    /**
+     * Create an instance of {@link BoatConfig.Boats.Boat }
+     * 
+     */
+    public BoatConfig.Boats.Boat createBoatConfigBoatsBoat() {
+        return new BoatConfig.Boats.Boat();
+    }
+
+    /**
+     * Create an instance of {@link BoatConfig.Boats.Boat.GPSposition }
+     * 
+     */
+    public BoatConfig.Boats.Boat.GPSposition createBoatConfigBoatsBoatGPSposition() {
+        return new BoatConfig.Boats.Boat.GPSposition();
+    }
+
+}
diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/boatsSchema.xsd b/racevisionGame/src/main/resources/mock/mockXML/schema/boatsSchema.xsd
new file mode 100644
index 00000000..6d5af617
--- /dev/null
+++ b/racevisionGame/src/main/resources/mock/mockXML/schema/boatsSchema.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="BoatConfig">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="Boats">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Boat" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="GPSposition" maxOccurs="1">
+                                            <xs:complexType>
+                                                <xs:attribute name="X" type="xs:double" use="required"/>
+                                                <xs:attribute name="Y" type="xs:double" use="required"/>
+                                                <xs:attribute name="Z" type="xs:double" use="required"/>
+                                            </xs:complexType>
+                                        </xs:element>
+                                    </xs:sequence>
+                                    <xs:attribute name="Type" type="xs:string" use="required"/>
+                                    <xs:attribute name="BoatName" type="xs:string" use="required"/>
+                                    <xs:attribute name="SourceID" type="xs:int" use="required"/>
+                                    <xs:attribute name="HullNum" type="xs:string"/>
+                                    <xs:attribute name="ShortName" type="xs:string"/>
+                                    <xs:attribute name="ShapeID" type="xs:int"/>
+                                    <xs:attribute name="StoweName" type="xs:string"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
+

From 16bf57e3331e73e49289d2a396a1cac3b1e7b92b Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Sat, 2 Sep 2017 00:45:08 +1200
Subject: [PATCH 34/51] javadoc fixes.

---
 .../src/main/java/mock/model/MockRace.java    |   1 -
 .../java/shared/xml/boats/BoatConfig.java     | 234 +++++++++---------
 .../shared/xml/regatta/RegattaConfig.java     |  32 +--
 3 files changed, 133 insertions(+), 134 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 9bcece2c..f606c29d 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -109,7 +109,6 @@ public class MockRace extends RaceState {
     /**
      * Generates a MockBoat from the BoatDataSource, given a source ID. Also adds it to the participant list.
      * @param sourceID The source ID to assign the boat.
-     * @return A MockBoat that is now participating in the race.
      */
     public void generateMockBoat(Integer sourceID) {
 
diff --git a/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java b/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java
index c517c830..c0361b52 100644
--- a/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java
+++ b/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java
@@ -24,52 +24,52 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Boats">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;element name="Boat" maxOccurs="unbounded">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           &lt;sequence>
- *                             &lt;element name="GPSposition">
- *                               &lt;complexType>
- *                                 &lt;complexContent>
- *                                   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                   &lt;/restriction>
- *                                 &lt;/complexContent>
- *                               &lt;/complexType>
- *                             &lt;/element>
- *                           &lt;/sequence>
- *                           &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="Boats"&gt;
+ *           &lt;complexType&gt;
+ *             &lt;complexContent&gt;
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *                 &lt;sequence&gt;
+ *                   &lt;element name="Boat" maxOccurs="unbounded"&gt;
+ *                     &lt;complexType&gt;
+ *                       &lt;complexContent&gt;
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *                           &lt;sequence&gt;
+ *                             &lt;element name="GPSposition"&gt;
+ *                               &lt;complexType&gt;
+ *                                 &lt;complexContent&gt;
+ *                                   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *                                     &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+ *                                     &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+ *                                     &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+ *                                   &lt;/restriction&gt;
+ *                                 &lt;/complexContent&gt;
+ *                               &lt;/complexType&gt;
+ *                             &lt;/element&gt;
+ *                           &lt;/sequence&gt;
+ *                           &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ *                           &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ *                           &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
+ *                           &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ *                           &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ *                           &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
+ *                           &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ *                         &lt;/restriction&gt;
+ *                       &lt;/complexContent&gt;
+ *                     &lt;/complexType&gt;
+ *                   &lt;/element&gt;
+ *                 &lt;/sequence&gt;
+ *               &lt;/restriction&gt;
+ *             &lt;/complexContent&gt;
+ *           &lt;/complexType&gt;
+ *         &lt;/element&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
  * </pre>
  * 
  * 
@@ -115,42 +115,42 @@ public class BoatConfig {
      * <p>The following schema fragment specifies the expected content contained within this class.
      * 
      * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="Boat" maxOccurs="unbounded">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="GPSposition">
-     *                     &lt;complexType>
-     *                       &lt;complexContent>
-     *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         &lt;/restriction>
-     *                       &lt;/complexContent>
-     *                     &lt;/complexType>
-     *                   &lt;/element>
-     *                 &lt;/sequence>
-     *                 &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
+     * &lt;complexType&gt;
+     *   &lt;complexContent&gt;
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+     *       &lt;sequence&gt;
+     *         &lt;element name="Boat" maxOccurs="unbounded"&gt;
+     *           &lt;complexType&gt;
+     *             &lt;complexContent&gt;
+     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+     *                 &lt;sequence&gt;
+     *                   &lt;element name="GPSposition"&gt;
+     *                     &lt;complexType&gt;
+     *                       &lt;complexContent&gt;
+     *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+     *                           &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+     *                           &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+     *                           &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+     *                         &lt;/restriction&gt;
+     *                       &lt;/complexContent&gt;
+     *                     &lt;/complexType&gt;
+     *                   &lt;/element&gt;
+     *                 &lt;/sequence&gt;
+     *                 &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+     *                 &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+     *                 &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
+     *                 &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+     *                 &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+     *                 &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
+     *                 &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+     *               &lt;/restriction&gt;
+     *             &lt;/complexContent&gt;
+     *           &lt;/complexType&gt;
+     *         &lt;/element&gt;
+     *       &lt;/sequence&gt;
+     *     &lt;/restriction&gt;
+     *   &lt;/complexContent&gt;
+     * &lt;/complexType&gt;
      * </pre>
      * 
      * 
@@ -200,32 +200,32 @@ public class BoatConfig {
          * <p>The following schema fragment specifies the expected content contained within this class.
          * 
          * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       &lt;sequence>
-         *         &lt;element name="GPSposition">
-         *           &lt;complexType>
-         *             &lt;complexContent>
-         *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               &lt;/restriction>
-         *             &lt;/complexContent>
-         *           &lt;/complexType>
-         *         &lt;/element>
-         *       &lt;/sequence>
-         *       &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
+         * &lt;complexType&gt;
+         *   &lt;complexContent&gt;
+         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+         *       &lt;sequence&gt;
+         *         &lt;element name="GPSposition"&gt;
+         *           &lt;complexType&gt;
+         *             &lt;complexContent&gt;
+         *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+         *                 &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+         *                 &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+         *                 &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+         *               &lt;/restriction&gt;
+         *             &lt;/complexContent&gt;
+         *           &lt;/complexType&gt;
+         *         &lt;/element&gt;
+         *       &lt;/sequence&gt;
+         *       &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+         *       &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+         *       &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
+         *       &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+         *       &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+         *       &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
+         *       &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+         *     &lt;/restriction&gt;
+         *   &lt;/complexContent&gt;
+         * &lt;/complexType&gt;
          * </pre>
          * 
          * 
@@ -444,15 +444,15 @@ public class BoatConfig {
              * <p>The following schema fragment specifies the expected content contained within this class.
              * 
              * <pre>
-             * &lt;complexType>
-             *   &lt;complexContent>
-             *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     &lt;/restriction>
-             *   &lt;/complexContent>
-             * &lt;/complexType>
+             * &lt;complexType&gt;
+             *   &lt;complexContent&gt;
+             *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+             *       &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+             *       &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+             *       &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
+             *     &lt;/restriction&gt;
+             *   &lt;/complexContent&gt;
+             * &lt;/complexType&gt;
              * </pre>
              * 
              * 
diff --git a/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java b/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java
index cf72ed5b..d8cc1613 100644
--- a/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java
+++ b/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java
@@ -21,22 +21,22 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="RegattaID" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         &lt;element name="RegattaName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="CourseName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="CentralLatitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         &lt;element name="CentralLongitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         &lt;element name="CentralAltitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         &lt;element name="UtcOffset" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         &lt;element name="MagneticVariation" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="RegattaID" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
+ *         &lt;element name="RegattaName" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *         &lt;element name="CourseName" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *         &lt;element name="CentralLatitude" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
+ *         &lt;element name="CentralLongitude" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
+ *         &lt;element name="CentralAltitude" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
+ *         &lt;element name="UtcOffset" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
+ *         &lt;element name="MagneticVariation" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
  * </pre>
  * 
  * 

From ac891fa91cb9d51d354aa6f981adae01d118cf73 Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Sat, 2 Sep 2017 01:03:47 +1200
Subject: [PATCH 35/51] Fixed tests.

---
 .../src/test/java/mock/model/MockBoatTest.java     |  8 ++++++++
 .../java/mock/model/SourceIdAllocatorTest.java     |  3 +++
 .../mock/model/commandFactory/WindCommandTest.java | 14 +++++++++-----
 .../network/ConnectionToServerParticipantTest.java |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/racevisionGame/src/test/java/mock/model/MockBoatTest.java b/racevisionGame/src/test/java/mock/model/MockBoatTest.java
index 8d1f45ee..98b4ca27 100644
--- a/racevisionGame/src/test/java/mock/model/MockBoatTest.java
+++ b/racevisionGame/src/test/java/mock/model/MockBoatTest.java
@@ -3,6 +3,7 @@ package mock.model;
 import org.junit.Before;
 import org.junit.Test;
 import shared.model.Bearing;
+import shared.model.Boat;
 import shared.model.GPSCoordinate;
 import shared.model.Mark;
 
@@ -13,6 +14,13 @@ public class MockBoatTest {
     private Mark near;
     private Mark far;
 
+
+    public static MockBoat createMockBoat() {
+        Boat boat = new Boat(121, "Test boat", "TS");
+        MockBoat mockBoat = new MockBoat(boat, null);
+        return mockBoat;
+    }
+
     @Before
     public void setUp() {
         boat = new MockBoat(0, "Bob", "NZ", null);
diff --git a/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java b/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java
index a1568044..ad310540 100644
--- a/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java
+++ b/racevisionGame/src/test/java/mock/model/SourceIdAllocatorTest.java
@@ -1,6 +1,7 @@
 package mock.model;
 
 import mock.exceptions.SourceIDAllocationException;
+import network.Messages.Enums.RaceStatusEnum;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -60,6 +61,7 @@ public class SourceIdAllocatorTest {
     @Test
     public void allocationTest() throws Exception {
 
+        mockRace.setRaceStatusEnum(RaceStatusEnum.PRESTART);
 
         int sourceID = sourceIdAllocator.allocateSourceID();
 
@@ -95,6 +97,7 @@ public class SourceIdAllocatorTest {
     @Test
     public void reallocationTest() throws Exception {
 
+        mockRace.setRaceStatusEnum(RaceStatusEnum.PRESTART);
 
         //Allocate.
         int sourceID = sourceIdAllocator.allocateSourceID();
diff --git a/racevisionGame/src/test/java/mock/model/commandFactory/WindCommandTest.java b/racevisionGame/src/test/java/mock/model/commandFactory/WindCommandTest.java
index 2193eb7a..158c43d6 100644
--- a/racevisionGame/src/test/java/mock/model/commandFactory/WindCommandTest.java
+++ b/racevisionGame/src/test/java/mock/model/commandFactory/WindCommandTest.java
@@ -1,11 +1,11 @@
 package mock.model.commandFactory;
 
 import mock.exceptions.CommandConstructionException;
-import mock.model.MockBoat;
-import mock.model.MockRace;
-import mock.model.MockRaceTest;
+import mock.exceptions.SourceIDAllocationException;
+import mock.model.*;
 import network.Messages.BoatAction;
 import network.Messages.Enums.BoatActionEnum;
+import network.Messages.Enums.RaceStatusEnum;
 import org.junit.Before;
 import org.junit.Test;
 import shared.exceptions.InvalidBoatDataException;
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock;
  */
 public class WindCommandTest {
     private MockRace race;
+    private SourceIdAllocator allocator;
     private MockBoat boat;
     private Command upwind;
     private Command downwind;
@@ -29,12 +30,15 @@ public class WindCommandTest {
     private double offset = 3.0;
 
     @Before
-    public void setUp() throws CommandConstructionException, InvalidBoatDataException, InvalidRegattaDataException, InvalidRaceDataException {
+    public void setUp() throws CommandConstructionException, InvalidBoatDataException, InvalidRegattaDataException, InvalidRaceDataException, SourceIDAllocationException {
         race = MockRaceTest.createMockRace();
-
+        allocator = new SourceIdAllocator(race);
+        race.setRaceStatusEnum(RaceStatusEnum.PRESTART);
+        allocator.allocateSourceID();
         boat = race.getBoats().get(0);
 
 
+
         //when(race.getWindDirection()).thenReturn(Bearing.fromDegrees(0.0));
         boat.setBearing(Bearing.fromDegrees(45.0));
 
diff --git a/racevisionGame/src/test/java/visualiser/network/ConnectionToServerParticipantTest.java b/racevisionGame/src/test/java/visualiser/network/ConnectionToServerParticipantTest.java
index 64fdfcb5..4b6ed5e3 100644
--- a/racevisionGame/src/test/java/visualiser/network/ConnectionToServerParticipantTest.java
+++ b/racevisionGame/src/test/java/visualiser/network/ConnectionToServerParticipantTest.java
@@ -94,7 +94,7 @@ public class ConnectionToServerParticipantTest {
         incomingCommands.put(command);
 
         //Need to wait for connection thread to execute commands.
-        Thread.sleep(250);
+        Thread.sleep(500);
 
         assertEquals(ConnectionToServerState.CONNECTED, connectionToServer.getConnectionState());
         assertTrue(connectionToServer.getJoinAcceptance() != null);

From e3cbb6d482c54b5e35910f55b4032b181dc5b222 Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Sun, 3 Sep 2017 16:39:59 +1200
Subject: [PATCH 36/51] Start game button actually starts the game.

---
 .../main/java/visualiser/Controllers/HostController.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index ba70e03b..008276ef 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -96,9 +96,8 @@ public class HostController extends Controller {
 
     /**
      * Hosts a game
-     * @throws IOException if socket cannot be connected to
      */
-    public void hostGamePressed() throws IOException{
+    public void hostGamePressed() {
         try {
             this.game = new Event(false);
             connectSocket("localhost", 4942);
@@ -159,7 +158,8 @@ public class HostController extends Controller {
      * Start button pressed. Currently only prints out start
      */
     public void startBtnPressed(){
-        System.out.println("Should start the race. This button is only visible for the host");
+        //System.out.println("Should start the race. This button is only visible for the host");
+        hostGamePressed();
     }
 
 }

From cfa6fc37e0a0cf04a7ed4998d4482dcc94d1ef4a Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Sun, 3 Sep 2017 20:44:27 +1200
Subject: [PATCH 37/51] User modified keybindings are persistently saved

- Works on windows computers
- KeyFactory processes its own XML saving/loading
- Does not work with Jar yet
- Changed keyFactory to static temporarily to work with existing FXML loading architecture

#story[1197]
---
 .../Controllers/KeyBindingsController.java    | 10 +++--
 .../Controllers/TitleController.java          | 26 +++--------
 .../src/main/java/visualiser/app/App.java     |  4 +-
 .../gameController/Keys/KeyFactory.java       | 43 +++++++++++++++++++
 .../visualiser/userSettings/keyFactory.xml    | 33 ++++++++++++++
 5 files changed, 89 insertions(+), 27 deletions(-)
 create mode 100644 racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
index d19a4f5d..84d82e91 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/KeyBindingsController.java
@@ -15,6 +15,7 @@ import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import visualiser.gameController.Keys.ControlKey;
 import visualiser.gameController.Keys.KeyFactory;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -32,9 +33,9 @@ public class KeyBindingsController {
     private @FXML ListView lstKey;
     private @FXML ListView lstDescription;
     private @FXML AnchorPane anchor;
-    private Button currentButton = null;    // last button clicked
     private KeyFactory newKeyFactory;
-    private Boolean changed = false;    // keybindings have been modified
+    private Boolean changed = false;    // keyBindings have been modified
+    private Button currentButton = null;    // last button clicked
 
     public void initialize(){
         // create new key factory to modify, keeping the existing one safe
@@ -132,7 +133,7 @@ public class KeyBindingsController {
                 for (int i = 1; i < lstKey.getItems().size(); i++) {
                     Button button = (Button)lstKey.getItems().get(i);
                     // update buttons text and remove key binding from command
-                    if (button.getText() == event.getCode().toString()) {
+                    if (button.getText().equals(event.getCode().toString())) {
                         button.setText("");
                         newKeyFactory.updateKey(button.getId(), button.getId());
                     }
@@ -181,6 +182,7 @@ public class KeyBindingsController {
             keyFactory = newKeyFactory;
             newKeyFactory = new KeyFactory();
             changed = false;
+            keyFactory.save();  // save persistently
             loadNotification("Key bindings were successfully saved.", false);
         } else {
             loadNotification("One or more key bindings are missing. " +
@@ -211,7 +213,7 @@ public class KeyBindingsController {
      */
     public void onExit(WindowEvent we){
         // if modified KeyFactory hasn't been saved
-        if (keyFactory!=newKeyFactory && changed==true){
+        if (changed){
             loadNotification("Please cancel or save your changes before exiting" +
                     ".", true);
             we.consume();
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
index 21e3dcc7..57b4c44d 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
@@ -90,34 +90,18 @@ public class TitleController extends Controller {
      * Called when control button is pressed. New pop up window displaying controls
      */
     public void controlBtnPressed(){
-
-//        Parent root2 = loader2.load();
-//        KeyBindingsController controller = loader2.getController();
-//        Stage stage2 = new Stage();
-//        stage2.setScene(new Scene(root2));
-//        stage2.centerOnScreen();
-//        stage2.initModality(Modality.APPLICATION_MODAL);
-//        stage2.show();
-//        stage2.setOnCloseRequest(new EventHandler<WindowEvent>() {
-//            public void handle(WindowEvent we) {
-//                if (we.getEventType() == WindowEvent.WINDOW_CLOSE_REQUEST) {
-//                    controller.onExit(we);
-//                }
-//            }
-//        });
-
-        FXMLLoader loader = new FXMLLoader();
-        loader.setLocation(getClass().getResource("/visualiser/scenes/keyBindings.fxml"));
-        Parent layout;
         try {
-            layout = loader.load();
+            FXMLLoader loader = new FXMLLoader();
+            loader.setLocation(getClass().getResource("/visualiser/scenes/keyBindings.fxml"));
+            Parent layout = loader.load();
             Scene scene = new Scene(layout);
             Stage popupStage = new Stage();
             popupStage.setResizable(false);
             popupStage.setTitle("Game Controls");
             popupStage.initModality(Modality.WINDOW_MODAL);
+            popupStage.centerOnScreen();
             popupStage.setScene(scene);
-            popupStage.showAndWait();
+            popupStage.show();
             KeyBindingsController controller = loader.getController();
             popupStage.setOnCloseRequest(new EventHandler<WindowEvent>() {
                 public void handle(WindowEvent we) {
diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java
index ac063b94..cc3b0e1e 100644
--- a/racevisionGame/src/main/java/visualiser/app/App.java
+++ b/racevisionGame/src/main/java/visualiser/app/App.java
@@ -31,7 +31,6 @@ import visualiser.gameController.Keys.KeyFactory;
 
 public class App extends Application {
 
-
     private static Stage stage;
     private Pane splashLayout;
     private ProgressBar loadProgress;
@@ -39,7 +38,6 @@ public class App extends Application {
     private static final int SPLASH_WIDTH = 676;
     private static final int SPLASH_HEIGHT = 227;
     public static KeyFactory keyFactory = new KeyFactory();
-
     public static App app;
 
     /**
@@ -53,6 +51,8 @@ public class App extends Application {
 
     @Override
     public void init() {
+        keyFactory.load();
+
         ImageView splash = new ImageView(new Image(
                 getClass().getClassLoader().getResourceAsStream("images/splashScreen.png")
         ));
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
index ecf0b1af..b4d55201 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
@@ -1,5 +1,9 @@
 package visualiser.gameController.Keys;
 
+import java.beans.XMLDecoder;
+import java.beans.XMLEncoder;
+import java.io.*;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -62,4 +66,43 @@ public class KeyFactory {
         keyState.put(newKey, controlKey);
     }
 
+    /**
+     * Persistently saves the keybindings the user has set.
+     */
+    public void save(){
+        try {
+            XMLEncoder encoder = new XMLEncoder(new BufferedOutputStream(
+                    new FileOutputStream(getClass().getResource(
+                            "/visualiser/userSettings/keyFactory.xml")
+                            .toURI().getPath())));
+            encoder.writeObject(this.keyState);
+            encoder.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Loads the persistently saved keybindings the user has set.
+     */
+    public void load(){
+        try {
+            XMLDecoder decoder = new XMLDecoder(new BufferedInputStream(
+                    new FileInputStream(getClass().getResource(
+                            "/visualiser/userSettings/keyFactory.xml")
+                            .toURI().getPath())));
+
+            Map<String, ControlKey> savedKeyState
+                    = (Map<String, ControlKey>)decoder.readObject();
+            decoder.close();
+            this.keyState = savedKeyState;
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+    }
+
 }
diff --git a/racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml b/racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml
new file mode 100644
index 00000000..ae05a188
--- /dev/null
+++ b/racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.8.0_121" class="java.beans.XMLDecoder">
+    <object class="java.util.HashMap">
+        <void method="put">
+            <string>SPACE</string>
+            <object class="visualiser.gameController.Keys.VMGKey"/>
+        </void>
+        <void method="put">
+            <string>SHIFT</string>
+            <object class="visualiser.gameController.Keys.SailsToggleKey"/>
+        </void>
+        <void method="put">
+            <string>DOWN</string>
+            <object class="visualiser.gameController.Keys.DownWindKey"/>
+        </void>
+        <void method="put">
+            <string>X</string>
+            <object class="visualiser.gameController.Keys.ZoomOutKey"/>
+        </void>
+        <void method="put">
+            <string>ENTER</string>
+            <object class="visualiser.gameController.Keys.TackGybeKey"/>
+        </void>
+        <void method="put">
+            <string>Z</string>
+            <object class="visualiser.gameController.Keys.ZoomInKey"/>
+        </void>
+        <void method="put">
+            <string>UP</string>
+            <object class="visualiser.gameController.Keys.UpWindKey"/>
+        </void>
+    </object>
+</java>
\ No newline at end of file

From 368bb8ddb382154c742798ec42d6521bdda5e932 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Sun, 3 Sep 2017 23:35:18 +1200
Subject: [PATCH 38/51] Changed reporting plugin settings and specified central
 repository

---
 dedicatedServer/pom.xml | 3 +++
 pom.xml                 | 8 ++++++++
 racevisionGame/pom.xml  | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/dedicatedServer/pom.xml b/dedicatedServer/pom.xml
index 8702f4f9..c7a7d668 100644
--- a/dedicatedServer/pom.xml
+++ b/dedicatedServer/pom.xml
@@ -106,6 +106,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.8.1</version>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>
diff --git a/pom.xml b/pom.xml
index 4f4983fc..ee4cba6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,4 +14,12 @@
 
     <url>https://eng-git.canterbury.ac.nz/SENG302-2016/team-7</url>
 
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Central</name>
+            <url>http://repo1.maven.org/maven2/</url>
+        </repository>
+    </repositories>
+
 </project>
diff --git a/racevisionGame/pom.xml b/racevisionGame/pom.xml
index 4a3c65a4..8b195d5f 100644
--- a/racevisionGame/pom.xml
+++ b/racevisionGame/pom.xml
@@ -170,6 +170,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.8.1</version>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>

From 361856ea1db17d864a9e0dc03b6410a8884e1445 Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Mon, 4 Sep 2017 11:38:45 +1200
Subject: [PATCH 39/51] Updated timescale.

---
 racevisionGame/src/main/java/shared/model/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/shared/model/Constants.java b/racevisionGame/src/main/java/shared/model/Constants.java
index c5595d7a..bb7ec598 100644
--- a/racevisionGame/src/main/java/shared/model/Constants.java
+++ b/racevisionGame/src/main/java/shared/model/Constants.java
@@ -33,7 +33,7 @@ public class Constants {
      * Frame periods are multiplied by this to get the amount of time a single frame represents.
      * E.g., frame period = 20ms, scale = 5, frame represents 20 * 5 = 100ms, and so boats are simulated for 100ms, even though only 20ms actually occurred.
      */
-    public static final int RaceTimeScale = 1;//10;
+    public static final int RaceTimeScale = 2;//10;
 
     /**
      * The race pre-start time, in milliseconds. 3 minutes.

From 85eb66d508fca2a93ce9f2b11735e809d4ea8ecd Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Mon, 4 Sep 2017 12:30:01 +1200
Subject: [PATCH 40/51] Keybindings can be saved and loaded, and work when
 Jar'd!

- trying to solve jar file reading issue
- learnt a lot about jars including their lack of file structure
- changed location of keybindings settings to outside of jar
- added new folder/file that is generated on first run

#story[1197]
---
 .../src/main/java/visualiser/app/App.java     |  1 +
 .../gameController/Keys/KeyFactory.java       | 47 ++++++++++++-------
 .../visualiser/userSettings/keyFactory.xml    | 33 -------------
 3 files changed, 32 insertions(+), 49 deletions(-)
 delete mode 100644 racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml

diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java
index cc3b0e1e..186bc094 100644
--- a/racevisionGame/src/main/java/visualiser/app/App.java
+++ b/racevisionGame/src/main/java/visualiser/app/App.java
@@ -51,6 +51,7 @@ public class App extends Application {
 
     @Override
     public void init() {
+        // load the user's personalised key bindings
         keyFactory.load();
 
         ImageView splash = new ImageView(new Image(
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
index b4d55201..a783f268 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
@@ -3,7 +3,6 @@ package visualiser.gameController.Keys;
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
 import java.io.*;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -71,16 +70,15 @@ public class KeyFactory {
      */
     public void save(){
         try {
-            XMLEncoder encoder = new XMLEncoder(new BufferedOutputStream(
-                    new FileOutputStream(getClass().getResource(
-                            "/visualiser/userSettings/keyFactory.xml")
-                            .toURI().getPath())));
-            encoder.writeObject(this.keyState);
-            encoder.close();
+            // open the filestream and write to it
+            FileOutputStream fos = new FileOutputStream(
+                    System.getProperty("user.dir")+
+                            "/settings/keyBindings.xml");
+            XMLEncoder xmlEncoder = new XMLEncoder(fos);
+            xmlEncoder.writeObject(this.keyState);
+            xmlEncoder.close();
         } catch (FileNotFoundException e) {
             e.printStackTrace();
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
         }
     }
 
@@ -89,18 +87,35 @@ public class KeyFactory {
      */
     public void load(){
         try {
-            XMLDecoder decoder = new XMLDecoder(new BufferedInputStream(
-                    new FileInputStream(getClass().getResource(
-                            "/visualiser/userSettings/keyFactory.xml")
-                            .toURI().getPath())));
+            // access settings folder, create if it doesn't exist
+            File settingsFolder = new File(
+                    System.getProperty("user.dir")+"/settings");
+            if (!settingsFolder.exists()){
+                settingsFolder.mkdir();
+            }
 
+            // access keybindings xml file, create if it doesn't exist
+            File savedFile = new File(
+                    settingsFolder+"/keyBindings.xml");
+            if (!savedFile.exists()){
+                savedFile.createNewFile();
+                FileOutputStream fos = new FileOutputStream(savedFile);
+                XMLEncoder xmlEncoder = new XMLEncoder(fos);
+                xmlEncoder.writeObject(this.keyState);
+                xmlEncoder.close();
+            }
+
+            // load the saved settings into the game
+            InputStream is = new FileInputStream(savedFile);
+            XMLDecoder xmlDecoder = new XMLDecoder(is);
             Map<String, ControlKey> savedKeyState
-                    = (Map<String, ControlKey>)decoder.readObject();
-            decoder.close();
+                    = (Map<String, ControlKey>)xmlDecoder.readObject();
+            xmlDecoder.close();
             this.keyState = savedKeyState;
+
         } catch (FileNotFoundException e) {
             e.printStackTrace();
-        } catch (URISyntaxException e) {
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }
diff --git a/racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml b/racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml
deleted file mode 100644
index ae05a188..00000000
--- a/racevisionGame/src/main/resources/visualiser/userSettings/keyFactory.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.8.0_121" class="java.beans.XMLDecoder">
-    <object class="java.util.HashMap">
-        <void method="put">
-            <string>SPACE</string>
-            <object class="visualiser.gameController.Keys.VMGKey"/>
-        </void>
-        <void method="put">
-            <string>SHIFT</string>
-            <object class="visualiser.gameController.Keys.SailsToggleKey"/>
-        </void>
-        <void method="put">
-            <string>DOWN</string>
-            <object class="visualiser.gameController.Keys.DownWindKey"/>
-        </void>
-        <void method="put">
-            <string>X</string>
-            <object class="visualiser.gameController.Keys.ZoomOutKey"/>
-        </void>
-        <void method="put">
-            <string>ENTER</string>
-            <object class="visualiser.gameController.Keys.TackGybeKey"/>
-        </void>
-        <void method="put">
-            <string>Z</string>
-            <object class="visualiser.gameController.Keys.ZoomInKey"/>
-        </void>
-        <void method="put">
-            <string>UP</string>
-            <object class="visualiser.gameController.Keys.UpWindKey"/>
-        </void>
-    </object>
-</java>
\ No newline at end of file

From 71dcc8ee6c0d608cd61378223b0edd1ffc443bbb Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Mon, 4 Sep 2017 14:17:13 +1200
Subject: [PATCH 41/51] Added POlar Linear Interpolation #story[1186]

---
 .../src/main/java/mock/app/Event.java         |   1 +
 .../main/java/mock/dataInput/PolarParser.java |  89 ++++++++++-
 .../src/main/java/mock/model/MockRace.java    |   8 +-
 .../src/main/java/mock/model/NewPolars.java   | 151 ++++++++++++++++++
 .../src/main/java/mock/model/Polars.java      |  81 ----------
 5 files changed, 246 insertions(+), 84 deletions(-)
 create mode 100644 racevisionGame/src/main/java/mock/model/NewPolars.java

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index c054e2fb..2e758ad5 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -104,6 +104,7 @@ public class Event {
         this.xmlFileType = XMLFileType.Contents;
 
         this.boatPolars = PolarParser.parse("mock/polars/acc_polars.csv");
+        PolarParser.parseNewPolars("mock/polars/acc_polars.csv");
 
 
         //Parse the XML files into data sources.
diff --git a/racevisionGame/src/main/java/mock/dataInput/PolarParser.java b/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
index 3fa3e6de..0e87696b 100644
--- a/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
+++ b/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
@@ -3,6 +3,7 @@ package mock.dataInput;
 
 
 import mock.exceptions.InvalidPolarFileException;
+import mock.model.NewPolars;
 import mock.model.Polars;
 import shared.model.Bearing;
 
@@ -89,7 +90,6 @@ public class PolarParser {
                     Bearing angle = Bearing.fromDegrees(angleDegrees);
                     double boatSpeedKnots = Double.parseDouble(row[i + 1]);
                     polarTable.addEstimate(windSpeedKnots, angle, boatSpeedKnots);
-                    polarTable.addPolars(windSpeedKnots, angle, boatSpeedKnots);
 
                 } catch (NumberFormatException e) {
                     throw new InvalidPolarFileException("Could not convert (Row,Col): (" + rowNumber + "," + i +") = " + row[i] + " to a double.", e);
@@ -105,4 +105,91 @@ public class PolarParser {
         return polarTable;
     }
 
+    /**
+     * Given a filename, this function parses it and generates a Polar object, which can be queried for polar information.
+     * @param filename The filename to load and read data from (loaded as a resource).
+     * @return A Polar table containing data from the given file.
+     */
+    public static void parseNewPolars(String filename) throws InvalidPolarFileException {
+        NewPolars newPolars = new NewPolars();
+
+
+        //Open the file for reading.
+        InputStream fileStream = PolarParser.class.getClassLoader().getResourceAsStream(filename);
+        if (fileStream == null) {
+            throw new InvalidPolarFileException("Could not open polar data file: " + filename);
+        }
+        //Wrap it with buffered input stream to set encoding and buffer.
+        InputStreamReader in = null;
+        try {
+            in = new InputStreamReader(fileStream, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new InvalidPolarFileException("Unsupported encoding: UTF-8", e);
+        }
+        BufferedReader inputStream = new BufferedReader(in);
+
+
+        //We expect the polar data file to have the column headings:
+        // Tws, Twa0, Bsp0, Twa1, Bsp1, UpTwa, UpBsp, Twa2, Bsp2, Twa3, Bsp3, Twa4, Bsp4, Twa5, Bsp5, Twa6, Bsp6, DnTwa, DnBsp, Twa7, Bsp7
+        //and to have 7 rows of data.
+        //Angles are expected to be in degrees, and velocities in knots.
+
+
+        //We read data rows, and split them into arrays of elements.
+        ArrayList<String[]> dataRows = new ArrayList<>(7);
+        try {
+            //Heading row.
+            //We skip the heading row by reading it.
+            String headingRow = inputStream.readLine();
+
+            //Data rows.
+            while (inputStream.ready()) {
+                //Read line.
+                String dataRow = inputStream.readLine();
+
+                //Split line.
+                String[] dataElements = dataRow.split(",");
+
+                //Add to collection.
+                dataRows.add(dataElements);
+
+            }
+
+        } catch (IOException e) {
+            throw new InvalidPolarFileException("Could not read from polar data file: " + filename, e);
+        }
+
+        //Finished reading in data, now we need to construct polar rows and table from it.
+        //For each row...
+        int rowNumber = 0;
+        for (String[] row : dataRows) {
+
+            //For each pair of columns (the pair is angle, speed).
+            //We start at column 1 since column 0 is the wind speed column.
+            for (int i = 1; i < row.length; i += 2) {
+
+                //Add angle+speed=velocity estimate to polar table.
+                try {
+
+                    //Add the polar value to the polar table
+                    double windSpeedKnots = Double.parseDouble(row[0]);
+                    double angleDegrees = Double.parseDouble(row[i]);
+                    Bearing angle = Bearing.fromDegrees(angleDegrees);
+                    double boatSpeedKnots = Double.parseDouble(row[i + 1]);
+                    newPolars.addPolars(windSpeedKnots, angle, boatSpeedKnots);
+
+                } catch (NumberFormatException e) {
+                    throw new InvalidPolarFileException("Could not convert (Row,Col): (" + rowNumber + "," + i +") = " + row[i] + " to a double.", e);
+
+                }
+            }
+
+            //Increment row number.
+            rowNumber++;
+
+        }
+        newPolars.linearInterpolatePolars();
+
+    }
+
 }
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 276fc329..77e7b04d 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -363,7 +363,7 @@ public class MockRace extends Race {
 //                    Bearing.fromDegrees(0d),
 //                    Bearing.fromDegrees(359.99999d));
 
-            VMG newVMG = boat.getPolars().setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
+            VMG newVMG = NewPolars.setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
             System.out.println(newVMG);
             //If the new vmg improves velocity, use it.
             if (improvesVelocity(boat, newVMG)) {
@@ -380,7 +380,11 @@ public class MockRace extends Race {
 //                Bearing.fromDegrees(boat.getBearing().degrees() - 1),
 //                Bearing.fromDegrees(boat.getBearing().degrees() + 1));
         //VMG vmg = boat.getPolars().setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
-        VMG vmg = new VMG(Math.cos (boat.getBearing().radians() - this.getWindDirection().radians()) * this.getWindSpeed() * 4, boat.getBearing()) ;
+        VMG vmg = new VMG(NewPolars.calculateSpeed(
+                this.getWindDirection(),
+                this.getWindSpeed(),
+                boat.getBearing()
+        ), boat.getBearing()) ;
         if (vmg.getSpeed() > 0) {
             boat.setCurrentSpeed(vmg.getSpeed());
         }
diff --git a/racevisionGame/src/main/java/mock/model/NewPolars.java b/racevisionGame/src/main/java/mock/model/NewPolars.java
new file mode 100644
index 00000000..1810ce52
--- /dev/null
+++ b/racevisionGame/src/main/java/mock/model/NewPolars.java
@@ -0,0 +1,151 @@
+package mock.model;
+
+import shared.model.Bearing;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * Created by fwy13 on 4/09/17.
+ */
+public class NewPolars {
+
+
+    //true wind speed, <true wind angle, best boat angle>
+    private static Map<Double, TreeMap<Double, Double>> polars = new TreeMap<>();
+
+    public static NewPolars newPolars = null;
+
+    public NewPolars(){
+        newPolars = this;
+    }
+
+    public static void addPolars(double trueWindSpeed, Bearing trueWindAngle, double boatSpeed){
+        double tws = trueWindSpeed;
+        double bs = boatSpeed;
+        double twa = trueWindAngle.degrees();
+        if (!polars.containsKey(tws)){
+            polars.put(tws, new TreeMap<>());
+        }
+        polars.get(tws).put(twa, bs);
+    }
+
+    public static void linearInterpolatePolars(){
+//        double maxTWS = 0;
+//        for (double key: polars.keySet()){
+//            if (maxTWS < key){
+//                maxTWS = key;
+//            }
+//        }
+        TreeMap<Double, Double> prevTWS = null;
+        for (TreeMap<Double, Double> tws: polars.values()){
+            if (prevTWS == null){
+                prevTWS = tws;
+                continue;
+            }
+            double previousTWA = -1;
+            TreeMap<Double, Double> iterableTWS = new TreeMap<>(tws);
+            for (double twa: iterableTWS.keySet()){
+                if (previousTWA == -1){
+                    previousTWA = twa;
+                    continue;
+                }
+                double twaDiff = twa - previousTWA;
+                double speedDiff = iterableTWS.get(twa) - iterableTWS.get(previousTWA);
+                double prevSpeed  = iterableTWS.get(previousTWA);
+                double diff = speedDiff/twaDiff;
+                for (double i = previousTWA; i < twa; i ++){
+                    double mult = i - previousTWA;
+                    double newSpeed = diff * mult + prevSpeed;
+                    System.out.println(newS);
+                    tws.put(i, newSpeed);
+                }
+            }
+        }
+    }
+
+    private static double getClosest(double value, Set<Double> set){
+        double closestVal = 0;
+        double smallestDiff = Double.MAX_VALUE;
+        for (double d: set){
+            double diff = Math.abs(value - d);
+            if (diff < smallestDiff){
+                closestVal = d;
+                smallestDiff = diff;
+            }
+        }
+        return closestVal;
+    }
+
+    /**
+     * Determines which quadrant degrees are in
+     *           0/360 Degrees
+     * Quadrant 4 | Quadrant 1
+     * -----------------------
+     * Quadrant 3 | Quadrant 2
+     * @param degrees
+     * @return
+     */
+    private static int getQuadrant(double degrees){
+        return ((int) degrees % 360) / 90 + 1;
+    }
+
+    private static double getBestSpeedInQuadrant(int quad, Map<Double, Double> set){
+        double quadVal = (double)((quad - 1) % 2);// this is as the hash map only has values 0 - 180
+        double min = quadVal* 90;
+        double max = (quadVal + 1) * 90;
+        double maxAngle = 0;
+        double maxSpeed = 0;
+        for (Double s: set.keySet()){
+            if (s >= min && s < max){
+                if (set.get(s) > maxSpeed){
+                    maxAngle = s;
+                    maxSpeed = set.get(s);
+                }
+            }
+        }
+        if (quad > 2){
+            maxAngle += 180;
+        }
+        return maxAngle;
+    }
+
+    /**
+     *
+     * @param trueWindAngle
+     * @param trueWindSpeed
+     * @param boatAngle
+     * @return
+     */
+    public static VMG setBestVMG(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
+        //speed
+        double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
+
+        //not using true vmg, using general concept
+        double angle = Math.abs(trueWindAngle.degrees() - boatAngle.degrees());
+
+        int quad = getQuadrant(boatAngle.degrees());
+        double bestAngle = getBestSpeedInQuadrant(quad, polars.get(closestSpeed));
+
+        Bearing vmgAngle = Bearing.fromDegrees((bestAngle) % 360);
+        double boatSpeed = polars.get(closestSpeed).get(bestAngle);
+
+        return new VMG(boatSpeed, Bearing.fromDegrees(vmgAngle.degrees() + trueWindAngle.degrees()));
+    }
+
+    public static double calculateSpeed(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
+        //speed
+        double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
+
+        double angleDiff = Math.abs(trueWindAngle.degrees() - boatAngle.degrees()) % 180;
+        double closestAngle = getClosest(angleDiff, polars.get(closestSpeed).keySet());
+
+        double boatSpeed = polars.get(closestSpeed).get(closestAngle);
+
+        return boatSpeed;
+
+
+    }
+
+}
diff --git a/racevisionGame/src/main/java/mock/model/Polars.java b/racevisionGame/src/main/java/mock/model/Polars.java
index 35a22fc4..943214cf 100644
--- a/racevisionGame/src/main/java/mock/model/Polars.java
+++ b/racevisionGame/src/main/java/mock/model/Polars.java
@@ -22,8 +22,6 @@ public class Polars {
      */
     private HashMap<Double, List<Bearing>> polarAngles = new HashMap<>();
 
-    //true wind speed, <true wind angle, best boat angle>
-    private Map<Double, HashMap<Double, Double>> polars = new TreeMap<>();
 
 
 
@@ -77,85 +75,6 @@ public class Polars {
 
     }
 
-    public void addPolars(double trueWindSpeed, Bearing trueWindAngle, double boatSpeed){
-        double tws = trueWindSpeed;
-        double bs = boatSpeed;
-        double twa = trueWindAngle.degrees();
-        if (!polars.containsKey(tws)){
-            polars.put(tws, new HashMap<>());
-        }
-        polars.get(tws).put(twa, bs);
-    }
-
-    private static double getClosest(double value, Set<Double> set){
-        double closestVal = 0;
-        double smallestDiff = Double.MAX_VALUE;
-        for (double d: set){
-            double diff = Math.abs(value - d);
-            if (diff < smallestDiff){
-                closestVal = d;
-                smallestDiff = diff;
-            }
-        }
-        return closestVal;
-    }
-
-    /**
-     * Determines which quadrant degrees are in
-     *           0/360 Degrees
-     * Quadrant 4 | Quadrant 1
-     * -----------------------
-     * Quadrant 3 | Quadrant 2
-     * @param degrees
-     * @return
-     */
-    private static int getQuadrant(double degrees){
-        return ((int) degrees % 360) / 90 + 1;
-    }
-
-    private static double getBestSpeedInQuadrant(int quad, HashMap<Double, Double> set){
-        double quadVal = (double)((quad - 1) % 2);// this is as the hash map only has values 0 - 180
-        double min = quadVal* 90;
-        double max = (quadVal + 1) * 90;
-        double maxAngle = 0;
-        double maxSpeed = 0;
-        for (Double s: set.keySet()){
-            if (s >= min && s < max){
-                if (set.get(s) > maxSpeed){
-                    maxAngle = s;
-                    maxSpeed = set.get(s);
-                }
-            }
-        }
-        if (quad > 2){
-            maxAngle += 180;
-        }
-        return maxAngle;
-    }
-
-    /**
-     *
-     * @param trueWindAngle
-     * @param trueWindSpeed
-     * @param boatAngle
-     * @return
-     */
-    public VMG setBestVMG(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
-        //speed
-        double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
-
-        //not using true vmg, using general concept
-        double angle = Math.abs(trueWindAngle.degrees() - boatAngle.degrees());
-
-        int quad = getQuadrant(boatAngle.degrees());
-        double bestAngle = getBestSpeedInQuadrant(quad, polars.get(closestSpeed));
-
-        Bearing vmgAngle = Bearing.fromDegrees((bestAngle + trueWindSpeed) % 360);
-        double boatSpeed = Math.abs(trueWindSpeed * Math.cos(vmgAngle.radians())) * 4;
-
-        return new VMG(boatSpeed, vmgAngle);
-    }
-
     /**
      * Calculates the VMG for a given wind angle, wind speed, and angle to destination. Will only return VMGs that have a true bearing (angle) within a given bound - this is to ensure that you can calculate VMGs without going out of bounds.
      * <br>

From 7aaa880f40cac02136e848ca5985c983a3cff49e Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Tue, 5 Sep 2017 13:05:37 +1200
Subject: [PATCH 42/51] VMG now works with some edge cases issues #story[1182]

---
 .../src/main/java/mock/model/NewPolars.java   | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/NewPolars.java b/racevisionGame/src/main/java/mock/model/NewPolars.java
index 1810ce52..3f070a3a 100644
--- a/racevisionGame/src/main/java/mock/model/NewPolars.java
+++ b/racevisionGame/src/main/java/mock/model/NewPolars.java
@@ -2,6 +2,7 @@ package mock.model;
 
 import shared.model.Bearing;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -28,7 +29,9 @@ public class NewPolars {
         if (!polars.containsKey(tws)){
             polars.put(tws, new TreeMap<>());
         }
-        polars.get(tws).put(twa, bs);
+        polars.get(tws).putIfAbsent(twa, bs);
+        polars.get(tws).putIfAbsent(360d - twa, bs);
+        System.out.println(String.format("tws %f, twa %f, bs %f", tws, twa, bs));
     }
 
     public static void linearInterpolatePolars(){
@@ -38,8 +41,15 @@ public class NewPolars {
 //                maxTWS = key;
 //            }
 //        }
+        /*for (double windSpeed: polars.keySet()){
+            if (!polars.get(windSpeed).containsKey(180d)){
+                polars.get(windSpeed).put(180d, windSpeed);
+            }
+        }*/
         TreeMap<Double, Double> prevTWS = null;
-        for (TreeMap<Double, Double> tws: polars.values()){
+        TreeMap<Double, TreeMap<Double, Double>> iterablePolars = new TreeMap<>(polars);
+        for (double windSpeed: iterablePolars.keySet()){
+            TreeMap<Double, Double> tws = iterablePolars.get(windSpeed);
             if (prevTWS == null){
                 prevTWS = tws;
                 continue;
@@ -58,9 +68,11 @@ public class NewPolars {
                 for (double i = previousTWA; i < twa; i ++){
                     double mult = i - previousTWA;
                     double newSpeed = diff * mult + prevSpeed;
-                    System.out.println(newS);
+                    //System.out.println(newSpeed);
+                    System.out.println(String.format("tws %f, twa %f, bs %f", windSpeed, i, newSpeed));
                     tws.put(i, newSpeed);
                 }
+                previousTWA = twa;
             }
         }
     }
@@ -88,13 +100,12 @@ public class NewPolars {
      * @return
      */
     private static int getQuadrant(double degrees){
-        return ((int) degrees % 360) / 90 + 1;
+        return ((((int) degrees % 360) + 360) % 360) / 90 + 1;
     }
 
     private static double getBestSpeedInQuadrant(int quad, Map<Double, Double> set){
-        double quadVal = (double)((quad - 1) % 2);// this is as the hash map only has values 0 - 180
-        double min = quadVal* 90;
-        double max = (quadVal + 1) * 90;
+        double min = quad* 90;
+        double max = (quad + 1) * 90;
         double maxAngle = 0;
         double maxSpeed = 0;
         for (Double s: set.keySet()){

From 7331ad1a20212dff99903c01a8858d18f9477db9 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Tue, 5 Sep 2017 19:26:06 +1200
Subject: [PATCH 43/51] VMG now works however some little bug in the
 interpolation in some quadrant that is making the speed all the same in the
 quadrant #story[1182]

---
 racevisionGame/pom.xml                        |  24 +++-
 .../main/java/mock/dataInput/PolarParser.java |   1 -
 .../src/main/java/mock/model/MockRace.java    |   8 +-
 .../src/main/java/mock/model/NewPolars.java   |  25 ++--
 .../test/java/mock/model/NewPolarsTest.java   | 107 ++++++++++++++++++
 5 files changed, 148 insertions(+), 17 deletions(-)
 create mode 100644 racevisionGame/src/test/java/mock/model/NewPolarsTest.java

diff --git a/racevisionGame/pom.xml b/racevisionGame/pom.xml
index 41157414..b137baa8 100644
--- a/racevisionGame/pom.xml
+++ b/racevisionGame/pom.xml
@@ -25,10 +25,30 @@
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <artifactId>mockito-core</artifactId>
+            <version>2.9.0</version>
         </dependency>
 
+        <!-- Maven Dependencies block START-->
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>1.7.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-agent</artifactId>
+            <version>1.7.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>2.6</version>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- Maven Dependencies block END-->
 
 
         <dependency>
diff --git a/racevisionGame/src/main/java/mock/dataInput/PolarParser.java b/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
index 0e87696b..9a94d1f0 100644
--- a/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
+++ b/racevisionGame/src/main/java/mock/dataInput/PolarParser.java
@@ -108,7 +108,6 @@ public class PolarParser {
     /**
      * Given a filename, this function parses it and generates a Polar object, which can be queried for polar information.
      * @param filename The filename to load and read data from (loaded as a resource).
-     * @return A Polar table containing data from the given file.
      */
     public static void parseNewPolars(String filename) throws InvalidPolarFileException {
         NewPolars newPolars = new NewPolars();
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 77e7b04d..4e5858f3 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -209,7 +209,9 @@ public class MockRace extends Race {
             boat.setStatus(BoatStatusEnum.PRESTART);
 
             //We set a large time since tack change so that it calculates a new VMG when the simulation starts.
-            boat.setTimeSinceTackChange(Long.MAX_VALUE);
+            //boat.setTimeSinceTackChange(Long.MAX_VALUE);
+            boat.setTimeSinceTackChange(0);
+
         }
 
     }
@@ -353,8 +355,8 @@ public class MockRace extends Race {
 
     private void newOptimalVMG(MockBoat boat) {
         long tackPeriod = 1000;
-
         if (boat.getTimeSinceTackChange() > tackPeriod) {
+            //System.out.println("optim called");
             //Calculate the new VMG.
 //            VMG newVMG = boat.getPolars().calculateVMG(
 //                    this.getWindDirection(),
@@ -364,7 +366,7 @@ public class MockRace extends Race {
 //                    Bearing.fromDegrees(359.99999d));
 
             VMG newVMG = NewPolars.setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
-            System.out.println(newVMG);
+            //System.out.println(newVMG);
             //If the new vmg improves velocity, use it.
             if (improvesVelocity(boat, newVMG)) {
                 boat.setVMG(newVMG);
diff --git a/racevisionGame/src/main/java/mock/model/NewPolars.java b/racevisionGame/src/main/java/mock/model/NewPolars.java
index 3f070a3a..71b041ed 100644
--- a/racevisionGame/src/main/java/mock/model/NewPolars.java
+++ b/racevisionGame/src/main/java/mock/model/NewPolars.java
@@ -31,7 +31,7 @@ public class NewPolars {
         }
         polars.get(tws).putIfAbsent(twa, bs);
         polars.get(tws).putIfAbsent(360d - twa, bs);
-        System.out.println(String.format("tws %f, twa %f, bs %f", tws, twa, bs));
+        //System.out.println(String.format("tws %f, twa %f, bs %f", tws, twa, bs));
     }
 
     public static void linearInterpolatePolars(){
@@ -69,7 +69,7 @@ public class NewPolars {
                     double mult = i - previousTWA;
                     double newSpeed = diff * mult + prevSpeed;
                     //System.out.println(newSpeed);
-                    System.out.println(String.format("tws %f, twa %f, bs %f", windSpeed, i, newSpeed));
+                    //System.out.println(String.format("tws %f, twa %f, bs %f", windSpeed, i, newSpeed));
                     tws.put(i, newSpeed);
                 }
                 previousTWA = twa;
@@ -104,8 +104,10 @@ public class NewPolars {
     }
 
     private static double getBestSpeedInQuadrant(int quad, Map<Double, Double> set){
-        double min = quad* 90;
-        double max = (quad + 1) * 90;
+        double min = (quad - 1)* 90;
+        double max = quad * 90;
+        System.out.println(quad);
+        System.out.println(min + " " + max);
         double maxAngle = 0;
         double maxSpeed = 0;
         for (Double s: set.keySet()){
@@ -116,9 +118,6 @@ public class NewPolars {
                 }
             }
         }
-        if (quad > 2){
-            maxAngle += 180;
-        }
         return maxAngle;
     }
 
@@ -130,13 +129,12 @@ public class NewPolars {
      * @return
      */
     public static VMG setBestVMG(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
+        //System.out.println("VMG AUTO CALLED");
         //speed
         double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
 
-        //not using true vmg, using general concept
-        double angle = Math.abs(trueWindAngle.degrees() - boatAngle.degrees());
-
-        int quad = getQuadrant(boatAngle.degrees());
+        double angle = ((boatAngle.degrees() - trueWindAngle.degrees()) % 360 + 360) % 360;
+        int quad = getQuadrant(angle);
         double bestAngle = getBestSpeedInQuadrant(quad, polars.get(closestSpeed));
 
         Bearing vmgAngle = Bearing.fromDegrees((bestAngle) % 360);
@@ -159,4 +157,9 @@ public class NewPolars {
 
     }
 
+    private Map<Double, TreeMap<Double, Double>> getPolars(){
+        //this function is just for testing so therefore it is private
+        return polars;
+    }
+
 }
diff --git a/racevisionGame/src/test/java/mock/model/NewPolarsTest.java b/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
new file mode 100644
index 00000000..4b5a0c80
--- /dev/null
+++ b/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
@@ -0,0 +1,107 @@
+package mock.model;
+
+import mock.dataInput.PolarParser;
+import org.junit.Before;
+import org.junit.Test;
+import shared.model.Bearing;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+/**
+ * Created by fwy13 on 5/09/17.
+ */
+public class NewPolarsTest {
+
+    @Before
+    public void setUp(){
+        PolarParser.parseNewPolars("mock/polars/acc_polars.csv");
+        NewPolars.linearInterpolatePolars();
+    }
+
+    @Test
+    public void testQuads() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        //reflection for private class
+        Class[] parameterTypes = new Class[1];
+        parameterTypes[0] = Double.TYPE;
+        Method getQuads = NewPolars.class.getDeclaredMethod("getQuadrant", parameterTypes);
+        getQuads.setAccessible(true);
+
+        //start invoking
+        Object[] paras1 = new Object[1];
+        paras1[0] = (new Double(0)).doubleValue();
+        int q1 = (int) getQuads.invoke(NewPolars.newPolars, paras1);
+        assertEquals(q1, 1);
+
+        //start invoking
+        Object[] paras2 = new Object[1];
+        paras2[0] = (new Double(90)).doubleValue();
+        int q2 = (int) getQuads.invoke(NewPolars.newPolars, paras2);
+        assertEquals(q2, 2);
+
+        //start invoking
+        Object[] paras3 = new Object[1];
+        paras3[0] = (new Double(180)).doubleValue();
+        int q3 = (int) getQuads.invoke(NewPolars.newPolars, paras3);
+        assertEquals(q3, 3);
+
+        //start invoking
+        Object[] paras4 = new Object[1];
+        paras4[0] = (new Double(270)).doubleValue();
+        int q4 = (int) getQuads.invoke(NewPolars.newPolars, paras4);
+        assertEquals(q4, 4);
+
+        //start invoking
+        Object[] paras5 = new Object[1];
+        paras5[0] = (new Double(360)).doubleValue();
+        int q5 = (int) getQuads.invoke(NewPolars.newPolars, paras5);
+        assertEquals(q5, 1);
+
+    }
+
+    @Test
+    public void testEdgeSpeeds(){
+        //just make sure that speeds at certain angles do not throw a null exception and are not negative
+        double maxTWS = 15;
+
+        for (double tws = 0; tws < maxTWS; tws += 0.1){
+            for (double j = 0; j < 360; j++){
+                Bearing twa = Bearing.fromDegrees(j);
+                for (double i = 0; i < 360; i++){
+                    Bearing boatBearing = Bearing.fromDegrees(i);
+                    double speed = NewPolars.calculateSpeed(twa, tws, boatBearing);
+                    assertTrue(speed >= 0);
+                }
+            }
+        }
+
+    }
+
+    @Test
+    public void testClosestSpeeds() throws NoSuchMethodException, NoSuchFieldException, InvocationTargetException, IllegalAccessException {
+        //reflection for private class
+        Method getClosest = NewPolars.class.getDeclaredMethod("getClosest", double.class, Set.class);
+        getClosest.setAccessible(true);
+
+        Method getPolars = NewPolars.class.getDeclaredMethod("getPolars");
+        getPolars.setAccessible(true);
+
+        double maxTWS = 15;
+
+        //only catches for nulls
+        for (double tws = 0; tws < maxTWS; tws += 0.1){
+            Map<Double, TreeMap<Double, Double>> polars = (Map<Double, TreeMap<Double, Double>>) getPolars.invoke(NewPolars.newPolars);
+            double speed = (double) getClosest.invoke(NewPolars.newPolars, tws, polars.keySet());
+            assertTrue(speed >= 0);
+        }
+    }
+
+}

From d602c1ec6fe0102c5842cb807363e698a1ae418d Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Tue, 5 Sep 2017 21:03:19 +1200
Subject: [PATCH 44/51] VMG is now working and fixed, however, it feels a bit
 odd #story[1182]

---
 .../src/main/java/mock/model/MockRace.java    |  6 +--
 .../src/main/java/mock/model/NewPolars.java   | 31 +++++++++++---
 .../test/java/mock/model/NewPolarsTest.java   | 40 +++++++++++++++++--
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 4e5858f3..8ffc2ba2 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -368,9 +368,9 @@ public class MockRace extends Race {
             VMG newVMG = NewPolars.setBestVMG(this.getWindDirection(), this.getWindSpeed(), boat.getBearing());
             //System.out.println(newVMG);
             //If the new vmg improves velocity, use it.
-            if (improvesVelocity(boat, newVMG)) {
-                boat.setVMG(newVMG);
-            }
+            /*if (improvesVelocity(boat, newVMG)) {
+            }*/
+            boat.setVMG(newVMG);
         }
     }
 
diff --git a/racevisionGame/src/main/java/mock/model/NewPolars.java b/racevisionGame/src/main/java/mock/model/NewPolars.java
index 71b041ed..a1fafeeb 100644
--- a/racevisionGame/src/main/java/mock/model/NewPolars.java
+++ b/racevisionGame/src/main/java/mock/model/NewPolars.java
@@ -106,18 +106,25 @@ public class NewPolars {
     private static double getBestSpeedInQuadrant(int quad, Map<Double, Double> set){
         double min = (quad - 1)* 90;
         double max = quad * 90;
-        System.out.println(quad);
-        System.out.println(min + " " + max);
+        //System.out.println(quad);
+        //System.out.println(min + " " + max);
         double maxAngle = 0;
         double maxSpeed = 0;
+        double dupAngle = 0;//index where speed is duplicated
         for (Double s: set.keySet()){
             if (s >= min && s < max){
                 if (set.get(s) > maxSpeed){
+                    dupAngle = 0;
                     maxAngle = s;
                     maxSpeed = set.get(s);
+                } else if (set.get(s) == maxSpeed){
+                    dupAngle = s;
                 }
             }
-        }
+        }/*
+        if (dupAngle != 0 ){
+            return getClosest((dupAngle + maxAngle) / 2, set.keySet());
+        }*/
         return maxAngle;
     }
 
@@ -140,14 +147,16 @@ public class NewPolars {
         Bearing vmgAngle = Bearing.fromDegrees((bestAngle) % 360);
         double boatSpeed = polars.get(closestSpeed).get(bestAngle);
 
-        return new VMG(boatSpeed, Bearing.fromDegrees(vmgAngle.degrees() + trueWindAngle.degrees()));
+        double newAngle = (bestAngle + trueWindAngle.degrees() % 360 + 360) % 360;
+
+        return new VMG(boatSpeed, Bearing.fromDegrees(newAngle));
     }
 
     public static double calculateSpeed(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
         //speed
         double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
 
-        double angleDiff = Math.abs(trueWindAngle.degrees() - boatAngle.degrees()) % 180;
+        double angleDiff = ((boatAngle.degrees() - trueWindAngle.degrees()) % 360 + 360) % 360;
         double closestAngle = getClosest(angleDiff, polars.get(closestSpeed).keySet());
 
         double boatSpeed = polars.get(closestSpeed).get(closestAngle);
@@ -162,4 +171,16 @@ public class NewPolars {
         return polars;
     }
 
+    private void printOutLinearInterpolated(){
+        for (double tws: polars.keySet()){
+            System.out.println("==================================================");
+            System.out.println("Speed: " + tws);
+            System.out.println("==================================================");
+            for (double twa: polars.get(tws).keySet()){
+                System.out.println("TWA: " + twa + ", Boat Speed: " + polars.get(tws).get(twa));
+                //System.out.println("--------------------------------------------------");
+            }
+        }
+    }
+
 }
diff --git a/racevisionGame/src/test/java/mock/model/NewPolarsTest.java b/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
index 4b5a0c80..24aa0b0f 100644
--- a/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
+++ b/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
@@ -25,6 +25,21 @@ public class NewPolarsTest {
     public void setUp(){
         PolarParser.parseNewPolars("mock/polars/acc_polars.csv");
         NewPolars.linearInterpolatePolars();
+
+        Method getPolars = null;
+        try {
+            getPolars = NewPolars.class.getDeclaredMethod("printOutLinearInterpolated");
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+        getPolars.setAccessible(true);
+        try {
+            getPolars.invoke(NewPolars.newPolars);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
     }
 
     @Test
@@ -70,9 +85,9 @@ public class NewPolarsTest {
     @Test
     public void testEdgeSpeeds(){
         //just make sure that speeds at certain angles do not throw a null exception and are not negative
-        double maxTWS = 15;
+        double maxTWS = 30;
 
-        for (double tws = 0; tws < maxTWS; tws += 0.1){
+        for (double tws = 0; tws < maxTWS; tws += 1){
             for (double j = 0; j < 360; j++){
                 Bearing twa = Bearing.fromDegrees(j);
                 for (double i = 0; i < 360; i++){
@@ -94,14 +109,31 @@ public class NewPolarsTest {
         Method getPolars = NewPolars.class.getDeclaredMethod("getPolars");
         getPolars.setAccessible(true);
 
-        double maxTWS = 15;
+        double maxTWS = 30;
 
         //only catches for nulls
-        for (double tws = 0; tws < maxTWS; tws += 0.1){
+        for (double tws = 0; tws < maxTWS; tws += 1){
             Map<Double, TreeMap<Double, Double>> polars = (Map<Double, TreeMap<Double, Double>>) getPolars.invoke(NewPolars.newPolars);
             double speed = (double) getClosest.invoke(NewPolars.newPolars, tws, polars.keySet());
             assertTrue(speed >= 0);
         }
     }
 
+    @Test
+    public void testAutoVSCalculated(){
+        //test that the auto chosen speed is the same speed that is calculated
+        double maxTWS = 30;
+        for (double tws = 0; tws < maxTWS; tws ++){
+            for (double twa = 0; twa < 360; twa ++){
+                Bearing TW = Bearing.fromDegrees(twa);
+                for (double ba = 0; ba < 360; ba ++){
+                    Bearing boatBearing = Bearing.fromDegrees(ba);
+                    VMG autoVMG = NewPolars.setBestVMG(TW, tws, boatBearing);
+                    double speed = NewPolars.calculateSpeed(TW, tws, autoVMG.getBearing());
+                    assertTrue(autoVMG.getSpeed() == speed);
+                }
+            }
+        }
+    }
+
 }

From 06517b7b47a3a267da92fcbe43c3f4ad1dc74d8c Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Tue, 5 Sep 2017 21:37:33 +1200
Subject: [PATCH 45/51] Tidied up code - Removed prints from tests - Added
 Javadocs in necessary places - Reenabled boat status message to send - Added
 boat average angle - pulled out modulateAngle function - Commented harder to
 read loops - Disabled toggled VMG #story[1182]

---
 .../src/main/java/mock/model/MockRace.java    |  1 +
 .../src/main/java/mock/model/NewPolars.java   | 80 ++++++++++++-------
 .../src/main/java/mock/model/RaceServer.java  |  4 +-
 .../Controllers/MainController.java           |  1 +
 .../test/java/mock/model/NewPolarsTest.java   | 30 +++----
 5 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 8ffc2ba2..6a112e93 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -343,6 +343,7 @@ public class MockRace extends Race {
 
             if (boat.getAutoVMG()) {
                 newOptimalVMG(boat);
+                boat.setAutoVMG(false);
             }
 
         } else {
diff --git a/racevisionGame/src/main/java/mock/model/NewPolars.java b/racevisionGame/src/main/java/mock/model/NewPolars.java
index a1fafeeb..c525316c 100644
--- a/racevisionGame/src/main/java/mock/model/NewPolars.java
+++ b/racevisionGame/src/main/java/mock/model/NewPolars.java
@@ -8,7 +8,8 @@ import java.util.Set;
 import java.util.TreeMap;
 
 /**
- * Created by fwy13 on 4/09/17.
+ * New Polars are the revampe of the old Polars class which interpolates the data after being parsed from the Polar Parser
+ * There can only be one NewPolars instance stored statically however if a boat does happen to have a special case it can be assigned.
  */
 public class NewPolars {
 
@@ -22,6 +23,12 @@ public class NewPolars {
         newPolars = this;
     }
 
+    /**
+     * Add polars from the polar table
+     * @param trueWindSpeed True Wind Speed that the true wind angle and speed corresponds to
+     * @param trueWindAngle True Wind Angle of the race
+     * @param boatSpeed The speed the boat should be going at given the true wind angle
+     */
     public static void addPolars(double trueWindSpeed, Bearing trueWindAngle, double boatSpeed){
         double tws = trueWindSpeed;
         double bs = boatSpeed;
@@ -31,31 +38,33 @@ public class NewPolars {
         }
         polars.get(tws).putIfAbsent(twa, bs);
         polars.get(tws).putIfAbsent(360d - twa, bs);
-        //System.out.println(String.format("tws %f, twa %f, bs %f", tws, twa, bs));
     }
 
+    /**
+     * Linearly Interpolates this should only be called once per parsing of a polar table
+     */
     public static void linearInterpolatePolars(){
-//        double maxTWS = 0;
-//        for (double key: polars.keySet()){
-//            if (maxTWS < key){
-//                maxTWS = key;
-//            }
-//        }
-        /*for (double windSpeed: polars.keySet()){
-            if (!polars.get(windSpeed).containsKey(180d)){
-                polars.get(windSpeed).put(180d, windSpeed);
-            }
-        }*/
         TreeMap<Double, Double> prevTWS = null;
         TreeMap<Double, TreeMap<Double, Double>> iterablePolars = new TreeMap<>(polars);
+        //this loop averages out the speed between tow angles
+        //Example: Pair one: 0 degrees, 0 knots
+        //         Pair two: 3 degrees, 6 knots
+        //This loop will add
+        //Pair one: 0 degrees, 0 knots
+        //Pair two: 1 degrees, 2 knots
+        //Pair three: 2 degrees, 4 knots
+        //Pair four: 3 degrees, 6 knots
         for (double windSpeed: iterablePolars.keySet()){
             TreeMap<Double, Double> tws = iterablePolars.get(windSpeed);
+
             if (prevTWS == null){
                 prevTWS = tws;
                 continue;
             }
+
             double previousTWA = -1;
             TreeMap<Double, Double> iterableTWS = new TreeMap<>(tws);
+
             for (double twa: iterableTWS.keySet()){
                 if (previousTWA == -1){
                     previousTWA = twa;
@@ -65,11 +74,10 @@ public class NewPolars {
                 double speedDiff = iterableTWS.get(twa) - iterableTWS.get(previousTWA);
                 double prevSpeed  = iterableTWS.get(previousTWA);
                 double diff = speedDiff/twaDiff;
+
                 for (double i = previousTWA; i < twa; i ++){
                     double mult = i - previousTWA;
                     double newSpeed = diff * mult + prevSpeed;
-                    //System.out.println(newSpeed);
-                    //System.out.println(String.format("tws %f, twa %f, bs %f", windSpeed, i, newSpeed));
                     tws.put(i, newSpeed);
                 }
                 previousTWA = twa;
@@ -100,17 +108,18 @@ public class NewPolars {
      * @return
      */
     private static int getQuadrant(double degrees){
-        return ((((int) degrees % 360) + 360) % 360) / 90 + 1;
+        return (int) modulateAngle(degrees) / 90 + 1;
     }
 
     private static double getBestSpeedInQuadrant(int quad, Map<Double, Double> set){
         double min = (quad - 1)* 90;
         double max = quad * 90;
-        //System.out.println(quad);
-        //System.out.println(min + " " + max);
         double maxAngle = 0;
         double maxSpeed = 0;
-        double dupAngle = 0;//index where speed is duplicated
+        double dupAngle = 0;
+        //DupAngle will average the angle between maxAngles that have the same speed
+        //Example: if 150 degrees, 180 degrees, and 210 degrees all go at 10 knots
+        //then the average will be taken as (150 + 210) / 2 and the angle will be returned on that.
         for (Double s: set.keySet()){
             if (s >= min && s < max){
                 if (set.get(s) > maxSpeed){
@@ -121,42 +130,48 @@ public class NewPolars {
                     dupAngle = s;
                 }
             }
-        }/*
+        }
         if (dupAngle != 0 ){
             return getClosest((dupAngle + maxAngle) / 2, set.keySet());
-        }*/
+        }
         return maxAngle;
     }
 
     /**
-     *
-     * @param trueWindAngle
-     * @param trueWindSpeed
-     * @param boatAngle
-     * @return
+     * Returns the best VMG that the boat can change to given it's current diagonal heading direction.
+     * @param trueWindAngle True wind angle of the race
+     * @param trueWindSpeed True wind speed of the race
+     * @param boatAngle Angle that the boat is currently at
+     * @return the best vmg that the boat can change to
      */
     public static VMG setBestVMG(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
         //System.out.println("VMG AUTO CALLED");
         //speed
         double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
 
-        double angle = ((boatAngle.degrees() - trueWindAngle.degrees()) % 360 + 360) % 360;
+        double angle = modulateAngle(boatAngle.degrees() - trueWindAngle.degrees());
         int quad = getQuadrant(angle);
         double bestAngle = getBestSpeedInQuadrant(quad, polars.get(closestSpeed));
 
-        Bearing vmgAngle = Bearing.fromDegrees((bestAngle) % 360);
         double boatSpeed = polars.get(closestSpeed).get(bestAngle);
 
-        double newAngle = (bestAngle + trueWindAngle.degrees() % 360 + 360) % 360;
+        double newAngle = modulateAngle(bestAngle + trueWindAngle.degrees());
 
         return new VMG(boatSpeed, Bearing.fromDegrees(newAngle));
     }
 
+    /**
+     * Calculates the speed that a certain angle should be doing
+     * @param trueWindAngle TrueWind Angle of the race
+     * @param trueWindSpeed True Wind Speed of the race
+     * @param boatAngle Angle that the boat is current at
+     * @return the speed that the boat should be traveling at.
+     */
     public static double calculateSpeed(Bearing trueWindAngle, double trueWindSpeed, Bearing boatAngle){
         //speed
         double closestSpeed = getClosest(trueWindSpeed, polars.keySet());
 
-        double angleDiff = ((boatAngle.degrees() - trueWindAngle.degrees()) % 360 + 360) % 360;
+        double angleDiff = modulateAngle(boatAngle.degrees() - trueWindAngle.degrees());
         double closestAngle = getClosest(angleDiff, polars.get(closestSpeed).keySet());
 
         double boatSpeed = polars.get(closestSpeed).get(closestAngle);
@@ -166,6 +181,10 @@ public class NewPolars {
 
     }
 
+    public static double modulateAngle(double angle){
+        return (angle % 360 + 360) % 360;
+    }
+
     private Map<Double, TreeMap<Double, Double>> getPolars(){
         //this function is just for testing so therefore it is private
         return polars;
@@ -178,7 +197,6 @@ public class NewPolars {
             System.out.println("==================================================");
             for (double twa: polars.get(tws).keySet()){
                 System.out.println("TWA: " + twa + ", Boat Speed: " + polars.get(tws).get(twa));
-                //System.out.println("--------------------------------------------------");
             }
         }
     }
diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java
index a28f389d..cbbe1971 100644
--- a/racevisionGame/src/main/java/mock/model/RaceServer.java
+++ b/racevisionGame/src/main/java/mock/model/RaceServer.java
@@ -151,7 +151,7 @@ public class RaceServer {
         List<BoatStatus> boatStatuses = new ArrayList<>();
 
         //Add each boat status to the status list.
-        /*for (MockBoat boat : race.getBoats()) {
+        for (MockBoat boat : race.getBoats()) {
 
             BoatStatus boatStatus = new BoatStatus(
                     boat.getSourceID(),
@@ -160,7 +160,7 @@ public class RaceServer {
                     boat.getEstimatedTimeAtNextMark().toInstant().toEpochMilli() );
 
             boatStatuses.add(boatStatus);
-        }*/
+        }
 
 
 
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
index 57d18830..9e557d38 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
@@ -40,6 +40,7 @@ public class MainController extends Controller {
      * Transitions from the StartController screen (displays pre-race information) to the RaceController (displays the actual race).
      * @param visualiserRace The object modelling the race.
      * @param controllerClient Socket Client that manipulates the controller.
+     * @param isHost whether this window is the host of the race or not.
      */
     public void beginRace(VisualiserRaceEvent visualiserRace, ControllerClient controllerClient, Boolean isHost) {
         raceController.startRace(visualiserRace, controllerClient, isHost);
diff --git a/racevisionGame/src/test/java/mock/model/NewPolarsTest.java b/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
index 24aa0b0f..dcbcc6cc 100644
--- a/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
+++ b/racevisionGame/src/test/java/mock/model/NewPolarsTest.java
@@ -26,20 +26,22 @@ public class NewPolarsTest {
         PolarParser.parseNewPolars("mock/polars/acc_polars.csv");
         NewPolars.linearInterpolatePolars();
 
-        Method getPolars = null;
-        try {
-            getPolars = NewPolars.class.getDeclaredMethod("printOutLinearInterpolated");
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-        getPolars.setAccessible(true);
-        try {
-            getPolars.invoke(NewPolars.newPolars);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
+
+//        Uncomment if you want to read the linear interpolation in text
+//        Method getPolars = null;
+//        try {
+//            getPolars = NewPolars.class.getDeclaredMethod("printOutLinearInterpolated");
+//        } catch (NoSuchMethodException e) {
+//            e.printStackTrace();
+//        }
+//        getPolars.setAccessible(true);
+//        try {
+//            getPolars.invoke(NewPolars.newPolars);
+//        } catch (IllegalAccessException e) {
+//            e.printStackTrace();
+//        } catch (InvocationTargetException e) {
+//            e.printStackTrace();
+//        }
     }
 
     @Test

From dbd4703e741980cd03653e8f58d4695c4c7c7319 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Tue, 5 Sep 2017 23:21:49 +1200
Subject: [PATCH 46/51] javadoc fix

---
 .../src/main/java/visualiser/Controllers/MainController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
index 57d18830..a80f44e7 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
@@ -3,7 +3,6 @@ package visualiser.Controllers;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.layout.AnchorPane;
-import visualiser.app.App;
 import visualiser.gameController.ControllerClient;
 import visualiser.model.VisualiserBoat;
 import visualiser.model.VisualiserRaceEvent;
@@ -40,6 +39,7 @@ public class MainController extends Controller {
      * Transitions from the StartController screen (displays pre-race information) to the RaceController (displays the actual race).
      * @param visualiserRace The object modelling the race.
      * @param controllerClient Socket Client that manipulates the controller.
+     * @param isHost true if this is a host
      */
     public void beginRace(VisualiserRaceEvent visualiserRace, ControllerClient controllerClient, Boolean isHost) {
         raceController.startRace(visualiserRace, controllerClient, isHost);

From 2382585c15132597635d455ed8374a2c60a9e15a Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Wed, 6 Sep 2017 16:58:27 +1200
Subject: [PATCH 47/51] Fixed Javadoc and also made some variables private
 #story[1187]

---
 .../model/wind/ShiftingWindGenerator.java     | 24 +++++++++----------
 .../Controllers/MainController.java           |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index d36a843b..efba7c79 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -9,18 +9,18 @@ import java.util.Random;
  * Created by jjg64 on 28/08/17.
  */
 public class ShiftingWindGenerator implements WindGenerator {
-    Bearing baselineBearing;
-    double baseLineSpeed;
-    double windSpeedVariance = 5;
-    double bearingVariance = 5;  // In degrees
-    double oscillationVariance = 0.25;
-    double oscillationPeriod = 1e3 * 60 * 1;  // In milliseconds
-
-    double timeOfLastOscillationReset = 0;
-    double timeOfLastChange = 0;
-    double timeSinceLastShift = 0; // Back / veer
-
-    boolean anticlockwise = false;
+    private Bearing baselineBearing;
+    private double baseLineSpeed;
+    private double windSpeedVariance = 5;
+    private double bearingVariance = 5;  // In degrees
+    private double oscillationVariance = 0.25;
+    private double oscillationPeriod = 1e3 * 60 * 1;  // In milliseconds
+
+    private double timeOfLastOscillationReset = 0;
+    private double timeOfLastChange = 0;
+    private double timeSinceLastShift = 0; // Back / veer
+
+    private boolean anticlockwise = false;
 
     public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) {
         this.baselineBearing = baselineBearing;
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
index 57d18830..5098bc26 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
@@ -40,6 +40,7 @@ public class MainController extends Controller {
      * Transitions from the StartController screen (displays pre-race information) to the RaceController (displays the actual race).
      * @param visualiserRace The object modelling the race.
      * @param controllerClient Socket Client that manipulates the controller.
+     * @param isHost if the client is the host of a race or not.
      */
     public void beginRace(VisualiserRaceEvent visualiserRace, ControllerClient controllerClient, Boolean isHost) {
         raceController.startRace(visualiserRace, controllerClient, isHost);

From 86f495a5512a30a510208152126f0f5e36d8a676 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Wed, 6 Sep 2017 17:04:15 +1200
Subject: [PATCH 48/51] javaDoc

---
 .../model/wind/ShiftingWindGenerator.java     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index 1b995a81..5d5e4995 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -23,6 +23,11 @@ public class ShiftingWindGenerator implements WindGenerator {
     private boolean shiftAnticlockwise = false;//true for Back, false for veer
     private boolean shiftThisRace = Math.random() > 0.5;
 
+    /**
+     * Constructor
+     * @param baselineBearing baseline bearing for wind
+     * @param baseLineSpeed base line speed for wind
+     */
     public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) {
         this.baselineBearing = baselineBearing;
         this.baseLineSpeed = baseLineSpeed;
@@ -39,6 +44,10 @@ public class ShiftingWindGenerator implements WindGenerator {
         return changeWind(currentWind);
     }
 
+    /**
+     * @param wind the wind to change
+     * @return the changed wind
+     */
     private Wind changeWind(Wind wind) {
         Wind newWind = new Wind(wind.getWindDirection(), wind.getWindSpeed());
         oscillateWind(newWind);
@@ -48,6 +57,10 @@ public class ShiftingWindGenerator implements WindGenerator {
         return newWind;
     }
 
+    /**
+     * moves the wind 5 degrees up and down
+     * @param wind the wind to oscillate
+     */
     private void oscillateWind(Wind wind) {
         double timeSinceLastOscillationReset = System.currentTimeMillis() - timeOfLastOscillationReset;
         double timeSinceLastChange = System.currentTimeMillis() - timeOfLastChange;
@@ -78,6 +91,10 @@ public class ShiftingWindGenerator implements WindGenerator {
         }
     }
 
+    /**
+     * Slowly shifts the wind up to 180 degrees from where it started
+     * @param wind the wind to change
+     */
     private void shiftWind(Wind wind) {
         double timeSinceLastShift = System.currentTimeMillis() - timeOfLastShift;
         double newBearing = wind.getWindDirection().degrees();
@@ -102,6 +119,10 @@ public class ShiftingWindGenerator implements WindGenerator {
         }
     }
 
+    /**
+     * Change the wind speed
+     * @param wind the wind to change
+     */
     private void changeWindSpeed(Wind wind) {
         double offsetAngle = (wind.getWindDirection().radians() - baselineBearing.radians());
         double offset = Math.sin(offsetAngle) * windSpeedVariance;
@@ -109,6 +130,9 @@ public class ShiftingWindGenerator implements WindGenerator {
         wind.setWindSpeed(newWindSpeed);
     }
 
+    /**
+     * starts the wind oscillation direction
+     */
     private void initialiseOscillationDirection() {
         anticlockwise = new Random().nextBoolean();
         timeOfLastOscillationReset = System.currentTimeMillis();

From 0886a609111ec7396283d990711e46038e750c85 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Wed, 6 Sep 2017 17:08:53 +1200
Subject: [PATCH 49/51] arrow Flip

---
 .../resources/visualiser/images/arrow.png     | Bin 16120 -> 9414 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/racevisionGame/src/main/resources/visualiser/images/arrow.png b/racevisionGame/src/main/resources/visualiser/images/arrow.png
index fab6e21d62803e12fb373e877e8f14edd8e9caae..ec5eb3cc6352cc9f1f90f73b41c35dd68d495f6c 100644
GIT binary patch
literal 9414
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

literal 16120
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


From 7024cac4264dc0e6ade4c42e6042162db8bd3559 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Wed, 6 Sep 2017 17:41:48 +1200
Subject: [PATCH 50/51] Rotated image of arrow direction #story[1187]

---
 .../resources/visualiser/images/arrow.png     | Bin 9414 -> 9439 bytes
 settings/keyBindings.xml                      |  33 ++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 settings/keyBindings.xml

diff --git a/racevisionGame/src/main/resources/visualiser/images/arrow.png b/racevisionGame/src/main/resources/visualiser/images/arrow.png
index ec5eb3cc6352cc9f1f90f73b41c35dd68d495f6c..cd7bab1036b743d28fe7f39d1d16bccca60a3a06 100644
GIT binary patch
literal 9439
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
Tbl<-(C-e+wcc-I{zKQ<_C5^gI

literal 9414
zcmeI23sj8x|Ho&hdzu=V3f(5Un2o24LLt?ZjY2z$!lY6mNz|keQ)*I6a>*o@iU!d#
zU95J9No?yDYcniLZtF54xrA81_w&s8pR+$}&-tCR|Nrm5XU{rk_WQh^&*%I3zMs$M
z^Zh>0Ia^-v<S&`}1NCV%8goK`AD>3k_9lP28n|P6d1Voera=o13h@WxADvETFc=yd
z8k(A#T3TA#+S)ogI=Z^LdU|^L`uctP^f53nU^1D8hK4K_t8d@F#>U3|`t@V8*(N3?
zrlzK5W@i2S_a8WLpt-rZg@uKsrKOdXm9@3Cjg8IV!GmpWZSCyr?CtFx92|xW8RF>Z
zICSXHVZ(+I1mWc5<l^Gu>gqat_;5EjH+OgU5hF&78a2wp!^6|lbIh1AUS3|_-rhbw
zKEA%bJRZ-_&(GiAfBg9I0RaIMCQO((abjR#U{Fxdlqpk!gM+6|of;AnGJX2=u&}W3
z@bDQkX3U&9Qy>sTMMcHL#KgtL&7C_pK0ZD%F)=AAY4PI4$;rtnDJepsaOu*eX=!Q8
zmMvScVns$q#>$l|SFKtl5{WW1Gqba^b8>RTVsUP6?wU1g^78WX^YhoPUAu1Gx`Kj&
z_3PIc78Y*UuwmoIjhi=bE-EV8vSo`zA}KB|-nw;bNlD4}?b~<k*s*ix&eGD-va+)B
z^77rgcUM$YNTt%fd-qmWR#sJ2$z-zX>gt-Bn!36=bvgd|?|&@=mT&GPkQ*R{KY1$6
z`<H8RBt!>(=|@|mWf=g_O9}{2rqK+W$RE9V(Y_em)Jd5z$zSKTp0<{@)5#tkD;kYM
zo8adYl6JkbO-~X#J-qq$(-1e?_^fQxK`e`CZ4(FAzI|==H<m5V|7KS<Eq`N&NZ;n0
zlSTJdAH6)^^Gc|2(T?RUR=0Z6y-t49(6i{({>Qy1mS|z2zrjC_{9~_jc0<=or;q2a
z+<Us}-d3|iCth!PL6e<dmGL@by2t(Yiy2odY4zt%tmyW0X&If~eQO6(q|yGqc-oT}
z&p!&iXs^>}*&DufchKzcof3E|c4zWLTFcQrMv`7xG9&5xo~K{s+O_xWsbwTxpFOdO
z?=*TC?OA$+*_P$)>GU_%lF-HzKD23RQ~MR%?cva#bziV+{?)#1D?P0_*Q9aw3r1Df
zcB?nmIkW})8V9y875$<+mRHlJb(w`ZzD<na99=)L(bIZqs_5o%spf+4V#bo*VK!l^
z343({Itg5ydPH~aHL?tQcC^K)@Y>wi$cBp^<GiDfYb{v4e1|pXkaeZPbdiUT_l!e%
z3e!X6#Z~{vuT_&-h03o7$xeSwUJS>@aPnd>E(VhqA8_#j7hALw?rPE*St6S5n&13%
z84O+gIGo@9bah3dPk$T^jWOtx->1RIz`qMd2L3b{$)5&9u+ORccV+)+FjDE?R2_%&
z+1v$)epA&yRfs>8yFXC(Z$0<lQKzf>`@Z|DtNTCRVxOz5?qt?KdHUpB`&^zr+q9qW
zvHy=M{=qS>`RU2~>8bl4KkA=3dH?b+ncu&)KF!<b-dO+Zx%=z90z3ZsRQMZw$o#?U
z?w?PE-+k}?&nqza>eX={Tjv<Hsr0g6J<WJnz1Qm_^N?QU`_A1CPrWuT>3$<=_~Kqy
z=dGmM<#o5-e|sdS>-byxbj$d(uF_*p*{@5-JuBf2vwpjCq_}=(>gn=5501HNzS^zR
zwrHPf^`i9oYaYtaF<%LKl&p(^i6iQ|HeMCaJAN;MXFj{Topr8HqI+F;mRWAV@!OMm
zqmQ>`2dqfeb4$5%!N%}ouSLl_(e&IQUiZCtGfTUlvYJ{Jij}DmR=#Q1V#P|U*WIi}
z$EU7!Jtm8c=(CcG${R{wy=IBF8H~Nz^~SluN&ds7CWi*Epl5q$#XLNzYI>4b|NW(A
z$98M`o}&j{UOunt$vxB7Ign@FlfJ5W`%HtCdW;3fZX5HQK0eWkj-M^eE0>JxVYnO~
zx0t-@!qu&0Tun*KEWW;*aCzBn<HVY}Twy1UIGCPUT;k-Kndo%~Gp$Ll*)QQgdnvBI
zZ14{1{E76hGh0*H(18V3{Q|dD&&Z`7Yegr*cIQLXlAik0mzwh+YV0G38vo<gHi=-)
z!@Jwst=}7Kb~&>6?-us-UzT=L)%0>@#~_~3qO^?STf9Wqx(D0Xc^#qC2V7s?c7vyB
zEtHfWE`8C>I(dT_UiVtV$;jpXh8qS8$3APb$=7L{JMYnl2+NaQdyideWgaqI{Jzqh
z+4;VDWNv^LO5ivpZSk7>A5fL&q8@Q%yZl^(*gm!0eAn9rJp*UF>2rwre9ZkgUdD;L
z-`MOj`tC;X4V?zJQz=JoFoi$+IP5=kv_1H$WBY(z?=pJK<KNXy7uQ>*HkDfq=4Yp_
zA8mN}eTA9$(ytfna%V)mILW$U*0yBdU84pkzaGb@9<5!05oULK=Z~~Jd-UQBU&hC~
z`+4b$(q{gkkh9rydHJ?gfj&_qDgv5-vAp~-z^_Ih(oYYQWMw4;Y{(aKhkP$)p8@&;
z3xFrZ?6<%{z(Sxx%;ttmvMvBO3%S>R5VOO9>wsH;r^M_$AQM<3<c3`kv%dpg0d5DL
z5wjlwLlXirK}}*d;)bTS8_EbR$7_XI+o}Q^HzWi!4pT}yhK#7_7@^`PX`1u9tkh!?
z#D$#~vu`%a*+XM^`Yo9DHKx^K+90@FsQ5AwlUpwma_cu^gxdOSjK%8l8XnmK(_YsQ
zS~{4ffoTz##=^9#Eq&;@5Hl95+u?o=Mkz)uj0~u;Fz3s%h1^liV)oEz0amur>VpRv
zjWDO-#vM@+=>d`XOzx;GtcJ(7I4x)2jOOVV#0c~gYizWdvFga53$u1(+5xzmsQ8gQ
zePuP_zYJul;#VAbVW{v_N&{NN?5a3Hek+#N2I7Geq6PVNz!AW6z!*V(1uzbXjItvI
z`Pm5pK6*e@gB>NvPXXEhQAze3L4F9(19%#UxqiT}fXF`^3)uqa1EU{&%Ol4|F*^hy
zHF4WSDb>9Q#QGgT)I}HSLJ;y2&>skOA+dsd8BhR(x)6jc0}6pq=Y~)sU>_jVxj|hL
za4-<++z=`lI2suH0B09Qw2&J@I^*^nAllDut{|TUTn@ZVo>gEP*i0!c-pS-XJSAsu
zs<qK-2$MuF8BtMYuHpxw0x5XZJY@V}RiMi-bN(fXkh>?Ar|(%yoUXv+rI@^t$?cDB
zu}4>ohfclDo3r|(GxyBl>1#vi8I(5)LBBwSIB;JB_dK|xtYV~OKFp0U8^b&b<}8@k
zV>arljkWb)wh5O+r@<Vol=j~abCHm%Jr}d_eC3dq33DXO^I+Zr^EM$@d^mYrR00?s
z+<zw++U%i?4tFjV8wGbmm<yQPVsxZ7r0#*#ax9hyGY4jSm?5<o+eI9O*~qaE%#UE!
zh1m;cNG-<p(1z4KkopweR8bZ9<5t{;M9&-F<v2U4_$f%2J<3@Cb1Tg2V8%A~thUjr
zttI>&5Nw%J`VbY;ghE3kRaYsUhYmRf`~}DYqC>JFa1RhUoQEFpL+-@DAwcwiCiIO5
zB8Br1>J-pE_31!z)W+=qrF0)cY9eK4fnmV2@B;1!MgkEs8!F?0NkH_E9~xvLFb#;1
zwveL_)K^M}Ak;nJ9iTA~>MEda7jO^|p<<veD>acCqjB36w-K@ea&QFt_yTbR#vp49
z;6$bL8e-T&4vs*d89+GS15N@)1L0f&bvOcjmMEp<5f}q?ML^^(3|kUv+!F%m)2jlj
zQI-x%rF7KwmIit|WDWkgkdatToc;>-BjJ)eD4%F5{EFe{rs5Bc<LTG07IIB-zHEoP
zKinRm%5-zSA|1i8bP`>~pM`uS*<eH}WVu4FA>5zfaaO~9Iik|wPKQ!#-Xt`|YaDJC
zP&_s@Q6~v!CxH&E$5Bt9S;FuZd2p?eVG2<LASSjdaIu)ljYRaDI5%W)pN#IXzzKZ>
z+6y4+23GkJ?!(|d7^~T1wI4C<3f#p)?!oJYjA_+G4uaqie1u8UYKS82mB?W#{+Z63
zbaJf3?GZAf2+tkaPsN{4BD}CgBGIN3NUSA_u$#+hD!v{tAI{hzWd;Zdx%$;a(OO`C
zgd!1hu|djgRs1|)J`fL4=8RAzA`}WyHb%wgKG~i^j(WJgUq+bVuqiWE@f)$i{%XRc
z1c-MNb~59O8o~tX%DzzXqe!eJOrWj|Z!jOy8Az%_G3dY&gd){3Rs7qCJP@HsbpsHJ
zM1&&M*{S%MPqxn`$0+hPV&H97hWCsO&=WE6vMbX;NT6IsxQ{jGdpjtl_Bdc3elKsu
z3xxh5Oj1Is9IWE^!wH!ZD~O+gI<!;;PC`>$+9s?dlP9kw-0e^n8g63;IBTl-KcR|i
z8|AGjsgs8}YpeL1zy?k7R=i5+8r6h*U$_Uu9q$llQ@EpN46r8NCG;kkwO|&(j1F`j
zgtbZY8F_0L%&Th%_fas*ssfofrJV^Cp9g6M=jE*mn0e4L6y^??A<@}W#b15hW1He3
z7<<PVDbzs!20>dA+&AI5`@?-G%s5M&ky0L{2Az_(dc!;wS`1*G1v4oXDP9dNLCx}3
zyin-<poQ%IwJ?)Xk?J<&!#-B9e>iT}RRs!h1Qtt#l?PKNbDW)2d`p=3#0mDB!+Z~B
zyb6kU3M&Z&dr?bVK^t?>f|jU=uZ*~YHs<K6`0Frf7Z44?K}SvkGOCFyg+R87e*w<X
zK(qh{4Z03^5{O!JI4V99IH-oWqG<8Zz!<s%w}+_sMTl_{SOi4hng9pY5}_M_I2f*A
zQWh`|i1rNy-T{*8kUtY3Uq*zI>hx6n9L%i&lIoB?f1q(S5lX7VN6Kk9F9Du!nNN-A
zOb#}xKW-aieY7A4S=)w5OKOP2c!6-ZD!w`JGLT%~1qf%?TH<gf&|Sqp0P98|b_8cE
z5LOv+7~f9F+yX#-v>+Z0L>n0{@q~|PDaOk!_`fBn!*0@kLEhRI3EvJs7x*p3Y^W8D
z4wuY8`zi(~rKaeCqyk|jzTfDx6!KOnIie@1@dtUU9r#I<;4uf&aRhpz_==TEsUdnJ
zNhGXnfY~BO5N`ytL`Dd0$g!Fbmhad^PeKow!A}OiWccBG@G)A9hVMc7YN)_xV;hb_
z1<ro*C``g;B9FpR`NGPXWLUHwjzSu~3m@Ysq<vXS2yqlDzEG0ds-gvGdWGkss}yZs
zL1BEQ8YRmF@edvt$s+CuxtO}GLLk9bkbQMojnY{Z3eHlfWlLeOpPa%R+nJ;_cw!BO
zrz>Vq7`%%@e`z>{)9}%b$T@auoP|#apowi5W#wfFD|eK-dNXfRdP0mTdEV~jYGkL8
zYP~0As?j8s!dM?Qnk}I)!-hgPRuYB%Zd1?gW}HBwW1|}T#Z$=3RHI28g)^g+($tk(
zXbZI{d6#Cbq2yU=Qt~dHeyQRkv+s&mQr-@m4h16d591!Iy(S$au$jyD=1~Gt+&kqs
zp+znBR1z<>ZB|d-M#)sr?5XTIXFsA87(}bnw!1h1C2-Jo&aYJ8k5T83x0O<;h_t7a
zIhRaOo9C(%s8JG0N>UVxXOoF^-gBGMU=ZI$NoyLoj4~^<BPer?I)erauTkdJ<|&l9
zORUy(94Sm)Nzm?^Q#n+y#Z+mX^VG=;nzN6Z_M$(PM1`L=RchxVWDhMC6o+>_ids7$
zhKiaZrn2W;PFI^Nd#Sv52-Q+6Td2J3xgw;zPkA0BlUf|!j8>Rp9U0fAo^|jiYStqm
z_53Vvd}d&czA02}mhTG+ecY($V~zib!o_Y>>RACz6qdVDkHHGsP2rDjlx)`IO%&4I
z)uH&WD0B&(ExG=7Ej@ZaRaH*aeo7|eKs{MxPF*~O(FeYzuzn(iClAz6n5j>p>pmHU
zId>@BI7A(4-7X5dhsY`GhAayCTy?0ez7*DQ>xjcICNN^AQd#u&)uQrHQI}4p$(wIZ
z6*%VbVhU$$qpY^yMo}1lfU@5EmMXjV5=ROvj!^ZYEuegp?w>W9Qqb8f_}DpBqvLGR
z$bt{i?a$tvr=>M7El@S9yj*DQuim+Qc%xHlMjQ8f{kh)fp{1s@XN-gQ@s~C9;pE=}
zyuE(;*6Q~=F6xU$kEyY>KGBiP=%_mJHt$^b;+}I}b~K{vKyL5z>?yjUuQNKY|GHw<
z@+%KC6cLM7-9Fyu#L;_w7WF33Mm_1hxbtn|rcHBCJex|7++cp__{*)$R%sp87mvMs
m%q-RZ8~l9$9>IIzN2BnhX?`yU7le>cG{Jwe-$CEVtbYLk{fxW-

diff --git a/settings/keyBindings.xml b/settings/keyBindings.xml
new file mode 100644
index 00000000..2b807e17
--- /dev/null
+++ b/settings/keyBindings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.8.0_111" class="java.beans.XMLDecoder">
+ <object class="java.util.HashMap">
+  <void method="put">
+   <string>SPACE</string>
+   <object class="visualiser.gameController.Keys.VMGKey"/>
+  </void>
+  <void method="put">
+   <string>SHIFT</string>
+   <object class="visualiser.gameController.Keys.SailsToggleKey"/>
+  </void>
+  <void method="put">
+   <string>DOWN</string>
+   <object class="visualiser.gameController.Keys.DownWindKey"/>
+  </void>
+  <void method="put">
+   <string>X</string>
+   <object class="visualiser.gameController.Keys.ZoomOutKey"/>
+  </void>
+  <void method="put">
+   <string>ENTER</string>
+   <object class="visualiser.gameController.Keys.TackGybeKey"/>
+  </void>
+  <void method="put">
+   <string>Z</string>
+   <object class="visualiser.gameController.Keys.ZoomInKey"/>
+  </void>
+  <void method="put">
+   <string>UP</string>
+   <object class="visualiser.gameController.Keys.UpWindKey"/>
+  </void>
+ </object>
+</java>

From dfd3cb96f38c72b5a74a974e6f906f1e2702442c Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Wed, 6 Sep 2017 20:05:54 +1200
Subject: [PATCH 51/51] removed System.out.println

---
 .../src/main/java/mock/model/wind/ShiftingWindGenerator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
index 5d5e4995..4ceff627 100644
--- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
+++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java
@@ -105,7 +105,7 @@ public class ShiftingWindGenerator implements WindGenerator {
             if (shiftedSoFar >= 180){
                 shiftAnticlockwise = Math.random() > 0.5;
                 shiftedSoFar = 0;
-                System.out.println("Swapping");
+//                System.out.println("Swapping");
             }
 
             timeOfLastShift = System.currentTimeMillis();