Merge branch 'Development' into story_64_sails

# Conflicts:
#	racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
#	racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
#	racevisionGame/src/test/java/mock/model/MockBoatTest.java

racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java

@@ -1,5 +1,8 @@
 package visualiser.gameController;
 
+import mock.model.RaceLogic;
+import mock.model.commandFactory.Command;
+import mock.model.commandFactory.CommandFactory;
 import network.BinaryMessageDecoder;
 import network.MessageDecoders.BoatActionDecoder;
 import network.Messages.Enums.BoatActionEnum;
@@ -7,11 +10,12 @@ import network.Messages.Enums.BoatActionEnum;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.Socket;
+import java.util.Observable;
 
 /**
  * Service for dispatching key press data to race from client
  */
-public class ControllerServer implements Runnable {
+public class ControllerServer extends Observable implements Runnable {
     /**
      * Socket to client
      */
@@ -20,13 +24,23 @@ public class ControllerServer implements Runnable {
      * Wrapper for input from client
      */
     private DataInputStream inputStream;
+    /**
+     * Last received boat action
+     */
+    private BoatActionEnum action;
+    /**
+     *
+     */
+    private RaceLogic rc;
 
     /**
      * Initialise server-side controller with live client socket
      * @param socket to client
      */
-    public ControllerServer(Socket socket) {
+    public ControllerServer(Socket socket, RaceLogic rc) {
         this.socket = socket;
+        this.rc = rc;
+        this.addObserver(rc);
         try {
             this.inputStream = new DataInputStream(this.socket.getInputStream());
         } catch (IOException e) {
@@ -34,6 +48,10 @@ public class ControllerServer implements Runnable {
         }
     }
 
+    public BoatActionEnum getAction() {
+        return action;
+    }
+
     /**
      * Wait for controller key input from client and loop.
      */
@@ -46,8 +64,11 @@ public class ControllerServer implements Runnable {
                     inputStream.read(message);
                     BinaryMessageDecoder encodedMessage = new BinaryMessageDecoder(message);
                     BoatActionDecoder boatActionDecoder = new BoatActionDecoder(encodedMessage.getMessageBody());
-                    BoatActionEnum decodedMessage = boatActionDecoder.getBoatAction();
-                    System.out.println("Received key: " + decodedMessage);
+                    action = boatActionDecoder.getBoatAction();
+
+                    // Notify observers of most recent action
+                    this.notifyObservers();
+                    this.setChanged();
                 }
             } catch (IOException e) {
                 e.printStackTrace();

racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java

@@ -27,8 +27,8 @@ public class KeyFactory {
         keyState.put("SPACE", new VMGKey("VMG"));
         keyState.put("SHIFT", new SailsToggleKey("Toggle Sails"));
         keyState.put("ENTER", new TackGybeKey("Tack/Gybe"));
-        keyState.put("PAGE_UP", new UpWindKey("Upwind"));
-        keyState.put("PAGE_DOWN", new DownWindKey("Downwind"));
+        keyState.put("UP", new UpWindKey("Upwind"));
+        keyState.put("DOWN", new DownWindKey("Downwind"));
     }
 
     /**

racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java

@@ -1,14 +1,14 @@
 package visualiser.model;
 
+
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.transform.Rotate;
 import network.Messages.Enums.BoatStatusEnum;
 import shared.dataInput.RaceDataSource;
-import shared.model.GPSCoordinate;
-import shared.model.Mark;
-import shared.model.RaceClock;
+import shared.enums.RoundingType;
+import shared.model.*;
 
 import java.util.List;
 
@@ -466,10 +466,148 @@ public class ResizableRaceCanvas extends ResizableCanvas {
         clear();    // clear the previous canvas
 
         drawBoundary();
+
+        //Guiding Line
+        drawRaceLine();
+
+        //Boats.
         drawBoats();
         drawMarks();
     }
 
+    /**
+     * draws a transparent line around the course that shows the paths boats must travel
+     */
+    public void drawRaceLine(){
+        List<Leg> legs = this.visualiserRace.getLegs();
+        GPSCoordinate legStartPoint = legs.get(0).getStartCompoundMark().getAverageGPSCoordinate();
+        GPSCoordinate nextStartPoint;
+        for (int i = 0; i < legs.size() -1; i++) {
+            nextStartPoint = drawLineRounding(legs, i, legStartPoint);
+            legStartPoint = nextStartPoint;
+        }
+    }
+
+    /**
+     * Draws a line around a course that shows where boats need to go. This method
+     * draws the line leg by leg
+     * @param legs the legs of a race
+     * @param index the index of the current leg to use
+     * @return the end point of the current leg that has been drawn
+     */
+    private GPSCoordinate drawLineRounding(List<Leg> legs, int index, GPSCoordinate legStartPoint){
+        GPSCoordinate startDirectionLinePoint;
+        GPSCoordinate endDirectionLinePoint;
+        Bearing bearingOfDirectionLine;
+
+        GPSCoordinate startNextDirectionLinePoint;
+        GPSCoordinate endNextDirectionLinePoint;
+        Bearing bearingOfNextDirectionLine;
+
+        //finds the direction of the current leg as a bearing
+        startDirectionLinePoint = legStartPoint;
+        GPSCoordinate tempEndDirectionLinePoint = legs.get(index).getEndCompoundMark().getAverageGPSCoordinate();
+
+        bearingOfDirectionLine = GPSCoordinate.calculateBearing(startDirectionLinePoint, tempEndDirectionLinePoint);
+
+        //after finding the initial bearing pick the mark used for rounding
+        endDirectionLinePoint = legs.get(index).getEndCompoundMark().getMarkForRounding(bearingOfDirectionLine).getPosition();
+        bearingOfDirectionLine = GPSCoordinate.calculateBearing(startDirectionLinePoint, endDirectionLinePoint);
+
+        //finds the direction of the next leg as a bearing
+        if (index < legs.size() -2){ // not last leg
+            startNextDirectionLinePoint = legs.get(index + 1).getStartCompoundMark().getMark1Position();
+            endNextDirectionLinePoint = legs.get(index + 1).getEndCompoundMark().getMark1Position();
+            bearingOfNextDirectionLine = GPSCoordinate.calculateBearing(startNextDirectionLinePoint, endNextDirectionLinePoint);
+
+            double degreesToAdd;
+            //find which side is need to be used
+            if (legs.get(index).getEndCompoundMark().getRoundingType() == RoundingType.Port ||
+                    legs.get(index).getEndCompoundMark().getRoundingType() == RoundingType.SP){
+                degreesToAdd = 90;
+            }else{
+                degreesToAdd = -90;
+            }
+
+            //use the direction line to find a point parallel to it by the mark
+            GPSCoordinate pointToStartCurve = GPSCoordinate.calculateNewPosition(endDirectionLinePoint,
+                    100, Azimuth.fromDegrees(bearingOfDirectionLine.degrees()+degreesToAdd));
+
+            //use the direction line to find a point to curve too
+            GPSCoordinate pointToEndCurve = GPSCoordinate.calculateNewPosition(endDirectionLinePoint,
+                    100, Azimuth.fromDegrees(bearingOfNextDirectionLine.degrees()+degreesToAdd));
+
+            //use the curve points to find the two control points for the bezier curve
+            GPSCoordinate controlPoint;
+            GPSCoordinate controlPoint2;
+            Bearing bearingOfCurveLine = GPSCoordinate.calculateBearing(pointToStartCurve, pointToEndCurve);
+            if ((bearingOfDirectionLine.degrees() - bearingOfNextDirectionLine.degrees() +360)%360< 145){
+                //small turn
+                controlPoint = GPSCoordinate.calculateNewPosition(pointToStartCurve,
+                        50, Azimuth.fromDegrees(bearingOfCurveLine.degrees()+(degreesToAdd/2)));
+                controlPoint2 = controlPoint;
+            }else{
+                //large turn
+                controlPoint = GPSCoordinate.calculateNewPosition(pointToStartCurve,
+                        150, Azimuth.fromDegrees(bearingOfCurveLine.degrees()+degreesToAdd));
+                controlPoint2 = GPSCoordinate.calculateNewPosition(pointToEndCurve,
+                        150, Azimuth.fromDegrees(bearingOfCurveLine.degrees()+degreesToAdd));
+            }
+
+
+            //change all gps into graph coordinate
+            GraphCoordinate startPath = this.map.convertGPS(startDirectionLinePoint);
+            GraphCoordinate curvePoint = this.map.convertGPS(pointToStartCurve);
+            GraphCoordinate curvePointEnd = this.map.convertGPS(pointToEndCurve);
+            GraphCoordinate c1 = this.map.convertGPS(controlPoint);
+            GraphCoordinate c2 = this.map.convertGPS(controlPoint2);
+
+            gc.setLineWidth(2);
+            gc.setStroke(Color.MEDIUMAQUAMARINE);
+
+            gc.beginPath();
+            gc.moveTo(startPath.getX(), startPath.getY());
+            gc.lineTo(curvePoint.getX(), curvePoint.getY());
+            drawArrowHead(startDirectionLinePoint, pointToStartCurve);
+            gc.bezierCurveTo(c1.getX(), c1.getY(), c2.getX(), c2.getY(), curvePointEnd.getX(), curvePointEnd.getY());
+            gc.stroke();
+            gc.closePath();
+            gc.save();
+
+            return pointToEndCurve;
+        }else{//last leg so no curve
+            GraphCoordinate startPath = this.map.convertGPS(legStartPoint);
+            GraphCoordinate endPath = this.map.convertGPS(legs.get(index).getEndCompoundMark().getAverageGPSCoordinate());
+
+            gc.beginPath();
+            gc.moveTo(startPath.getX(), startPath.getY());
+            gc.lineTo(endPath.getX(), endPath.getY());
+            gc.stroke();
+            gc.closePath();
+            gc.save();
+            drawArrowHead(legStartPoint, legs.get(index).getEndCompoundMark().getAverageGPSCoordinate());
+            return null;
+        }
+    }
+
+    private void drawArrowHead(GPSCoordinate start, GPSCoordinate end){
+
+        GraphCoordinate lineStart = this.map.convertGPS(start);
+        GraphCoordinate lineEnd = this.map.convertGPS(end);
+
+        double arrowAngle = Math.toRadians(45.0);
+        double arrowLength = 10.0;
+        double dx = lineStart.getX() - lineEnd.getX();
+        double dy = lineStart.getY() - lineEnd.getY();
+        double angle = Math.atan2(dy, dx);
+        double x1 = Math.cos(angle + arrowAngle) * arrowLength + lineEnd.getX();
+        double y1 = Math.sin(angle + arrowAngle) * arrowLength + lineEnd.getY();
+
+        double x2 = Math.cos(angle - arrowAngle) * arrowLength + lineEnd.getX();
+        double y2 = Math.sin(angle - arrowAngle) * arrowLength + lineEnd.getY();
+        gc.strokeLine(lineEnd.getX(), lineEnd.getY(), x1, y1);
+        gc.strokeLine(lineEnd.getX(), lineEnd.getY(), x2, y2);
+    }
 
 
 
@@ -480,7 +618,6 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      * @see TrackPoint
      */
     private void drawTrack(VisualiserBoat boat) {
-
         //Check that track points are enabled.
         if (this.annoPath) {