Merge branch 'master' into CommandFactory

# Conflicts:
#	racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java

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

@@ -25,7 +25,7 @@ public class MockBoat extends Boat {
     /**
      * Stores whether the boat is on autoVMG or not
      */
-    private boolean autoVMG = true;
+    private boolean autoVMG = false;
 
 
 

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

@@ -484,4 +484,4 @@ public class MockRace extends Race {
     public List<CompoundMark> getCompoundMarks() {
         return compoundMarks;
     }
-}
+}

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

@@ -2,9 +2,11 @@ package mock.model;
 
 import network.Messages.BoatLocation;
 import network.Messages.BoatStatus;
+import network.Messages.Enums.BoatLocationDeviceEnum;
 import network.Messages.LatestMessages;
 import network.Messages.RaceStatus;
 import network.Utils.AC35UnitConverter;
+import shared.model.Bearing;
 import shared.model.CompoundMark;
 import shared.model.Constants;
 import shared.model.Mark;
@@ -47,7 +49,9 @@ public class RaceServer {
                 mark.getPosition().getLatitude(),
                 mark.getPosition().getLongitude(),
                 this.boatLocationSequenceNumber,
-                0, 0,
+                BoatLocationDeviceEnum.Mark,
+                Bearing.fromDegrees(0),
+                0,
                 race.getRaceClock().getCurrentTimeMilli());
 
         //Iterates the sequence number.
@@ -99,7 +103,8 @@ public class RaceServer {
                 boat.getCurrentPosition().getLatitude(),
                 boat.getCurrentPosition().getLongitude(),
                 this.boatLocationSequenceNumber,
-                boat.getBearing().degrees(),
+                BoatLocationDeviceEnum.RacingYacht,
+                boat.getBearing(),
                 boat.getCurrentSpeed(),
                 race.getRaceClock().getCurrentTimeMilli());
 
@@ -133,19 +138,17 @@ public class RaceServer {
         }
 
 
-        //Convert wind direction and speed to ints. //TODO this conversion should be done inside the racestatus class.
-        int windDirectionInt = AC35UnitConverter.encodeHeading(race.getWindDirection().degrees());
-        int windSpeedInt = (int) (race.getWindSpeed() * Constants.KnotsToMMPerSecond);
 
         //Create race status object, and send it.
         RaceStatus raceStatus = new RaceStatus(
+                RaceStatus.currentMessageVersionNumber,
                 System.currentTimeMillis(),
                 race.getRaceId(),
-                race.getRaceStatusEnum().getValue(),
+                race.getRaceStatusEnum(),
                 race.getRaceClock().getStartingTimeMilli(),
-                windDirectionInt,
-                windSpeedInt,
-                race.getRaceType().getValue(),
+                race.getWindDirection(),
+                race.getWindSpeed(),
+                race.getRaceType(),
                 boatStatuses);
 
         this.latestMessages.setRaceStatus(raceStatus);

racevisionGame/src/main/java/mock/model/commandFactory/CompositeCommand.java

@@ -1,23 +1,24 @@
 package mock.model.commandFactory;
 
-import java.util.Stack;
+import java.util.ArrayDeque;
+import java.util.Queue;
 
 /**
  * Wraps multiple commands into a composite to execute queued commands during a frame.
  */
 public class CompositeCommand implements Command {
-    private Stack<Command> commands;
+    private Queue<Command> commands;
 
     public CompositeCommand() {
-        this.commands = new Stack<>();
+        this.commands = new ArrayDeque<>();
     }
 
     public void addCommand(Command command) {
-        commands.push(command);
+        commands.add(command);
     }
 
     @Override
     public void execute() {
-        while(!commands.isEmpty()) commands.pop().execute();
+        while(!commands.isEmpty()) commands.remove().execute();
     }
 }

racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java

@@ -15,16 +15,23 @@ public class WindCommand implements Command {
     public WindCommand(MockRace race, MockBoat boat, boolean upwind) {
         this.race = race;
         this.boat = boat;
-        this.direction = upwind? 1 : -1;
+        this.direction = upwind? -1 : 1;
     }
 
     @Override
     public void execute() {
+
+        boat.setAutoVMG(false);
+
         double wind = race.getWindDirection().degrees();
         double heading = boat.getBearing().degrees();
 
-        double offset = 3;
-        if(wind - heading < 0) offset *= -1 * direction;
+        double offset = 3.0;
+
+        offset *= direction;
+        double headWindDelta = wind - heading;
+        if ((headWindDelta < 0) || (headWindDelta > 180)) offset *= -1;
+
         boat.setBearing(Bearing.fromDegrees(heading + offset));
     }
 }