Merged master.

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

@@ -395,7 +395,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
      */
     private void drawSails(VisualiserBoat boat) {
         GraphCoordinate boatPos =
-                this.map.convertGPS(boat.getCurrentPosition());
+                this.map.convertGPS(boat.getPosition());
         double xPos = boatPos.getX();       // x pos of sail (on boat)
         double yPos = boatPos.getY() - 6;   // y pos of sail (on boat)
         double boatBearing = boat.getBearing().degrees();