Merge branch 'master' into story_64_sails

# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
#	racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java

racevisionGame/src/main/java/mock/model/MockRace.java

@@ -1,5 +1,9 @@
 package mock.model;
 
+import javafx.animation.AnimationTimer;
+import mock.xml.*;
+import network.Messages.BoatLocation;
+import network.Messages.BoatStatus;
 import network.Messages.Enums.BoatStatusEnum;
 import network.Messages.Enums.RaceStatusEnum;
 import shared.dataInput.BoatDataSource;
@@ -8,6 +12,8 @@ import shared.dataInput.RegattaDataSource;
 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;
@@ -311,7 +317,7 @@ public class MockRace extends Race {
         //Checks if the current boat has finished the race or not.
         boolean finish = this.isLastLeg(boat.getCurrentLeg());
 
-        if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds & boat.isSailsOut()) {
+        if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && boat.isSailsOut()) {
 
             checkPosition(boat, totalElapsedMilliseconds);
 
@@ -389,7 +395,7 @@ public class MockRace extends Race {
         double lastAngle = -1;
         boolean lastAngleWasGood = false;
 
-        //Check all bearings between [0, 360).
+        //Check all bearings between [0, 360)
         for (double angle = 0; angle < 360; angle += 1) {
 
             //Create bearing from angle.
@@ -516,7 +522,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()){
@@ -625,7 +631,6 @@ public class MockRace extends Race {
     protected int getNumberOfActiveBoats() {
 
         int numberOfActiveBoats = 0;
-
         for (MockBoat boat : this.boats) {
 
             //If the boat is currently racing, count it.
@@ -698,6 +703,7 @@ public class MockRace extends Race {
 
     }
 
-
-
+    public List<CompoundMark> getCompoundMarks() {
+        return compoundMarks;
+    }
 }