Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit

# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/StartController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml

racevisionGame/src/main/java/mock/app/Event.java

@@ -63,6 +63,8 @@ public class Event {
 
     private Thread connectionThread;
 
+    private int mapIndex;
+
 
 
 
@@ -76,8 +78,10 @@ public class Event {
 
 //        System.out.println(XMLUtilities.validateXML(this.getClass().getClassLoader().getResource("mock/mockXML/iMapLayout.xml").toString()
 //                , this.getClass().getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd")));
-
+        this.mapIndex = mapIndex;
         String raceXMLFile;
+        String boatsXMLFile = "mock/mockXML/boatTest.xml";
+        String regattaXMLFile = "mock/mockXML/regattaTest.xml";
         switch (mapIndex){
             case 0:raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
                 break;
@@ -87,11 +91,15 @@ public class Event {
                 break;
             case 3: raceXMLFile = "mock/mockXML/mMapLayout.xml";
                 break;
+            case 4:
+                raceXMLFile = "mock/mockXML/raceTutorial.xml";
+                boatsXMLFile = "mock/mockXML/boatTutorial.xml";
+                regattaXMLFile = "mock/mockXML/regattaTutorial.xml";
+                break;
             default: raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
 
         }
-        String boatsXMLFile = "mock/mockXML/boatTest.xml";
+
-        String regattaXMLFile = "mock/mockXML/regattaTest.xml";
 
         if (singlePlayer) {
             raceXMLFile = "mock/mockXML/raceSinglePlayer.xml";
@@ -103,7 +111,9 @@ public class Event {
             //this.raceXML = RaceXMLCreator.alterRaceToWind(raceXMLFile, 90);
             this.raceXML = XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8);
             this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8));
-
+            if(mapIndex==4){
+                this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8), 1000, 5000);
+            }
             this.boatXML = XMLReader.readXMLFileToString(boatsXMLFile, StandardCharsets.UTF_8);
             this.regattaXML = XMLReader.readXMLFileToString(regattaXMLFile, StandardCharsets.UTF_8);
 
@@ -186,9 +196,15 @@ public class Event {
      * @return String containing edited xml
      */
     public static String setRaceXMLAtCurrentTimeToNow(String raceXML) {
+        return setRaceXMLAtCurrentTimeToNow(raceXML, Constants.RacePreStartTime, Constants.RacePreparatoryTime);
+    }
 
+    public static String setRaceXMLAtCurrentTimeToNow(String raceXML, long racePreStartTime, long racePreparatoryTime){
         //The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute.
-        long millisecondsToAdd = Constants.RacePreStartTime + Constants.RacePreparatoryTime;
+
+        long millisecondsToAdd = racePreStartTime + racePreparatoryTime;
+
+
         long secondsToAdd = millisecondsToAdd / 1000;
         //Scale the time using our time scalar.
         secondsToAdd = secondsToAdd / Constants.RaceTimeScale;
@@ -198,7 +214,6 @@ public class Event {
         raceXML = raceXML.replace("RACE_CREATION_TIME", dateFormat.format(creationTime));
         raceXML = raceXML.replace("RACE_START_TIME", dateFormat.format(creationTime.plusSeconds(secondsToAdd)));
 
-
         return raceXML;
     }
 

racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java

@@ -62,7 +62,7 @@ public class RaceXMLCreator {
      * @throws SAXException error in schema file
      * @throws ParserConfigurationException error in parsing the schema file
      */
-    public static String alterRaceToWind(String s, double degrees) throws XMLReaderException, InvalidRaceDataException, JAXBException, IOException, SAXException, ParserConfigurationException {
+    public static String alterRaceToWind(String s, double degrees, boolean tutorial) throws XMLReaderException, InvalidRaceDataException, JAXBException, IOException, SAXException, ParserConfigurationException {
         RaceXMLReader reader = new RaceXMLReader(s, XMLFileType.ResourcePath);
 
         XMLRace race = XMLUtilities.xmlToClass(
@@ -70,7 +70,11 @@ public class RaceXMLCreator {
                 RaceXMLCreator.class.getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd"),
                 XMLRace.class);
 
+        if(tutorial){
+            setRaceXMLAtCurrentTimeToNow(race, 1000l, 5000l);
+        } else {
             setRaceXMLAtCurrentTimeToNow(race);
+        }
 
         double raceOriginalBearing = getLineAngle(getLeewardGate(reader).getMark1Position(), getWindwardGate(reader).getMark1Position());
 
@@ -81,6 +85,7 @@ public class RaceXMLCreator {
         return XMLUtilities.classToXML(race);
     }
 
+
     /**
      * Rotate the features in a race such as the boundary, and the marks.
      * @param race the race to alter
@@ -168,14 +173,11 @@ public class RaceXMLCreator {
     }
 
 
-    /**
-     * Sets the xml description of the race to show the race was created now, and starts in 4 minutes
-     * @param raceXML The race.xml contents.
-     */
-    public static void setRaceXMLAtCurrentTimeToNow(XMLRace raceXML) {
 
+
+    public static void setRaceXMLAtCurrentTimeToNow(XMLRace raceXML, long racePrestartTime, long racePreparatoryTime){
         //The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute.
-        long millisecondsToAdd = Constants.RacePreStartTime + Constants.RacePreparatoryTime;
+        long millisecondsToAdd = racePrestartTime + racePreparatoryTime;
         long secondsToAdd = millisecondsToAdd / 1000;
         //Scale the time using our time scalar.
         secondsToAdd = secondsToAdd / Constants.RaceTimeScale;
@@ -186,4 +188,13 @@ public class RaceXMLCreator {
         raceXML.getRaceStartTime().setTime(dateFormat.format(creationTime.plusSeconds(secondsToAdd)));
     }
 
+    /**
+     * Sets the xml description of the race to show the race was created now, and starts in 4 minutes
+     * @param raceXML The race.xml contents.
+     */
+    public static void setRaceXMLAtCurrentTimeToNow(XMLRace raceXML) {
+        setRaceXMLAtCurrentTimeToNow(raceXML, Constants.RacePreStartTime, Constants.RacePreparatoryTime);
+
+    }
+
 }

racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java

@@ -12,6 +12,7 @@ import javafx.scene.chart.LineChart;
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.MeshView;
@@ -23,9 +24,9 @@ import shared.dataInput.RaceDataSource;
 import shared.model.Leg;
 import shared.model.Mark;
 import visualiser.app.App;
+import visualiser.enums.TutorialState;
 import visualiser.gameController.ControllerClient;
 import visualiser.gameController.Keys.ControlKey;
-import visualiser.gameController.Keys.KeyFactory;
 import visualiser.layout.Subject3D;
 import visualiser.layout.View3D;
 import visualiser.model.Sparkline;
@@ -35,6 +36,7 @@ import visualiser.model.VisualiserRaceState;
 import visualiser.utils.GPSConverter;
 import java.io.IOException;
 import java.net.URL;
+import java.util.*;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -49,6 +51,10 @@ public class RaceViewController extends Controller {
     private KeyFactory keyFactory = new KeyFactory();
     private boolean infoTableShow = true;  // shown or hidden
     private boolean isHost;
+    private TutorialState currentState;
+    private ArrayList<TutorialState> tutorialStates;
+    private boolean isTutorial = false;
+    private String keyToPress;
     private View3D view3D;
     private ObservableList<Subject3D> viewSubjects;
 
@@ -68,6 +74,9 @@ public class RaceViewController extends Controller {
     private @FXML TableColumn<VisualiserBoat, Number> boatSpeedColumn;
     private @FXML LineChart<Number, Number> sparklineChart;
 
+    private @FXML Label tutorialText;
+
+
     /**
      * Displays a specified race.
      * Intended to be called on loading the scene.
@@ -101,11 +110,24 @@ public class RaceViewController extends Controller {
             if(controlKey != null) {
                 try {
                     controlKey.onAction();  // Change key state if applicable
+
+                    //Check if current race is a tutorial
+                    if (isTutorial){
+                        //Check if current tutorial state has the same boat protocol code as key press
+                        if (controlKey.getProtocolCode().equals(currentState.getAction())){
+                            //Update tutorial
+                            checkTutorialState();
+                        }
+                    }
+
                     controllerClient.sendKey(controlKey);
                     event.consume();
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
                     Logger.getGlobal().log(Level.WARNING, "RaceViewController was interrupted on thread: " + Thread.currentThread() + "while sending: " + controlKey, e);
+                    Logger.getGlobal().log(Level.WARNING, "RaceController was interrupted on thread: " + Thread.currentThread() + "while sending: " + controlKey, e);
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
 
@@ -145,6 +167,7 @@ public class RaceViewController extends Controller {
         initialiseFps();
         initialiseInfoTable();
         initialiseView3D();
+        initialiseArrow();
         initialiseRaceClock();
         raceTimer();    // start the timer
         new Sparkline(this.raceState, this.sparklineChart);
@@ -212,9 +235,33 @@ public class RaceViewController extends Controller {
             if (key != null) {
                 switch (key.toString()) {
                     case "Zoom In":
+                        //Check if race is a tutorial
+                        if (isTutorial) {
+                            //Check if the current tutorial state is zoom-in
+                            if (currentState.equals(TutorialState.ZOOMIN)) {
+                                try {
+                                    //Update tutorial
+                                    checkTutorialState();
+                                } catch (Exception e1) {
+                                    e1.printStackTrace();
+                                }
+                            }
+                        }
                         view3D.updateDistance(-10);
                         break;
                     case "Zoom Out":
+                        //Check if race is a tutorial
+                        if(isTutorial) {
+                            //Check if current tutorial state is zoom-out
+                            if (currentState.equals(TutorialState.ZOOMOUT)) {
+                                try {
+                                    //Update tutorial
+                                    checkTutorialState();
+                                } catch (Exception e1) {
+                                    e1.printStackTrace();
+                                }
+                            }
+                        }
                         view3D.updateDistance(10);
                         break;
                 }
@@ -222,6 +269,9 @@ public class RaceViewController extends Controller {
         });
     }
 
+
+
+
     /**
      * Initialises the frame rate functionality. This allows for toggling the
      * frame rate, and connect the fps label to the race's fps property.
@@ -324,6 +374,45 @@ public class RaceViewController extends Controller {
         });
     }
 
+
+
+    /**
+     * Displays a specified race.
+     * @param visualiserRace Object modelling the race.
+     * @param controllerClient Socket Client that manipulates the controller.
+     * @param isHost is user a host
+     */
+    public void startRace(VisualiserRaceEvent visualiserRace, ControllerClient controllerClient, Boolean isHost) {
+
+        this.visualiserRace = visualiserRace;
+        this.controllerClient = controllerClient;
+        this.isHost = isHost;
+
+
+        //Check if the game is a tutorial
+        if (parent.getGameType()==4){
+            isTutorial = true;
+            tutorialText.setVisible(true);
+            tutorialStates = new ArrayList<>(Arrays.asList(TutorialState.values()));
+
+            currentState = tutorialStates.get(0);
+            tutorialStates.remove(0);
+
+            searchMapForKey("Upwind");
+
+            tutorialText.setText("Welcome to the tutorial! Exit at anytime with ESC. \nWe will first learn how to turn upwind. Press " + keyToPress + " to turn upwind.");
+
+        } else {
+            isTutorial = false;
+            tutorialText.setVisible(false);
+        }
+
+        initialiseRace();
+
+        //Display this controller.
+        racePane.setVisible(true);
+    }
+
     /**
      * Transition from the race view to the finish view.
      */
@@ -333,6 +422,16 @@ public class RaceViewController extends Controller {
         fc.loadFinish(raceState.getBoats());
     }
 
+
+    /**
+     * Initialises the arrow controller with data from the race to observe.
+     * @param race The race to observe.
+     */
+    private void initialiseArrow(VisualiserRaceEvent race) {
+        arrowController.setWindProperty(race.getVisualiserRaceState().windProperty());
+    }
+
+
     /**
      * Timer which monitors the race.
      */
@@ -393,4 +492,108 @@ public class RaceViewController extends Controller {
         infoTableShow = !infoTableShow;
     }
 
+    /**
+     * Get the next tutorial state
+     */
+    private void updateTutorialState(){
+        //Next tutorial state is popped from list
+        currentState = tutorialStates.get(0);
+        tutorialStates.remove(0);
+    }
+
+    /**
+     * Search key map for key given string of command
+     * @param command the command of the key
+     */
+    private void searchMapForKey(String command){
+        //For loop through keyFactory
+        for (Map.Entry<String, ControlKey> entry: keyFactory.getKeyState().entrySet()){
+            if(entry.getValue().toString().equals(command)){
+
+                //Found next key required to press
+                keyToPress = entry.getKey();
+            }
+        }
+    }
+
+    /**
+     * Updates tutorial state and gui display for tutorial text
+     * @throws Exception Exception thrown
+     */
+    private void checkTutorialState() throws Exception {
+        //Switch statement to check what the current tutorial state is
+        switch (currentState){
+            case UPWIND:
+                //Set next key to press as the downwind key
+                searchMapForKey("Downwind");
+                //Update tutorial text
+                tutorialText.setText("Nice! To turn downwind press " + keyToPress + ".");
+                updateTutorialState();
+                break;
+            case DOWNWIND:
+                //Set next key to press as the tack/gybe key
+                searchMapForKey("Tack/Gybe");
+                //Update tutorial text
+                tutorialText.setText("Nice! To tack or gybe press " + keyToPress + ".");
+                updateTutorialState();
+                break;
+            case TACKGYBE:
+                //Set next key to press as the VMG key
+                searchMapForKey("VMG");
+                //Update tutorial text
+                tutorialText.setText("Nice! To use VMG press " + keyToPress + ". This will turn the boat.");
+                updateTutorialState();
+                break;
+            case VMG:
+                //Set next key to press as the sails-in key
+                searchMapForKey("Toggle Sails");
+                //Update tutorial text
+                tutorialText.setText("Nice! To sails in press " + keyToPress + ". This will stop the boat.");
+                updateTutorialState();
+                break;
+            case SAILSIN:
+                //Set next key to press as the sails-out key
+                searchMapForKey("Toggle Sails");
+                //Update tutorial text
+                tutorialText.setText("Nice! To sails out press " + keyToPress + " again. The will start moving again.");
+                updateTutorialState();
+                break;
+            case SAILSOUT:
+                //Set next key to press as the zoom-in key
+                searchMapForKey("Zoom In");
+                //Update tutorial text
+                tutorialText.setText("Nice! To zoom in press " + keyToPress + ".");
+                updateTutorialState();
+                break;
+            case ZOOMIN:
+                //Set next key to press as the zoom-out key
+                searchMapForKey("Zoom Out");
+                //Update tutorial text
+                tutorialText.setText("Nice! You will also be able to zoom into boats and marks by clicking them. To zoom out press " + keyToPress + ".");
+                updateTutorialState();
+                break;
+            case ZOOMOUT:
+                //Finished tutorial. Display pop-up for exiting the tutorial
+                tutorialText.setText("Congratulations! You're done!");
+                Alert alert = new Alert(Alert.AlertType.INFORMATION);
+                alert.setTitle("Finished Tutorial");
+                alert.setHeaderText("You have finished the tutorial.");
+                alert.setContentText("Now you know the controls you are ready to race!");
+                Optional<ButtonType> result = alert.showAndWait();
+                if (result.get() == ButtonType.OK) {
+                    parent.endEvent();
+                    racePane.setVisible(false);
+                    App.app.showMainStage(App.getStage());
+                }
+                break;
+            default:
+                //State not found. Exit tutorial to title menu
+                parent.endEvent();
+                racePane.setVisible(false);
+                App.app.showMainStage(App.getStage());
+                break;
+        }
+
+    }
+
 }

racevisionGame/src/main/java/visualiser/Controllers/TitleController.java

@@ -1,11 +1,28 @@
 package visualiser.Controllers;
 
 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.Label;
 import javafx.scene.control.RadioButton;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.Pane;
 import javafx.stage.Modality;
+import javafx.stage.Stage;
+import mock.app.Event;
+import mock.exceptions.EventConstructionException;
+import javafx.stage.WindowEvent;
 import visualiser.app.App;
 
 import java.io.IOException;
+import java.net.URL;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Controller for the opening title window.
@@ -16,6 +33,9 @@ import java.io.IOException;
 public class TitleController extends Controller {
     private @FXML RadioButton dayModeRD;
     private @FXML RadioButton nightModeRD;
+    private @FXML Label tutorialLabel;
+    private @FXML Pane menuPane;
+    private @FXML ImageView imgSun;
 
     /**
      * Method called when the 'host a game' button is pressed.
@@ -40,7 +60,10 @@ public class TitleController extends Controller {
      */
     public void setDayMode(){
         dayModeRD.getScene().getStylesheets().clear();
+        menuPane.getStylesheets().clear();
+        imgSun.setImage(new Image(getClass().getResource("/visualiser/images/sun.png").toExternalForm()));
         dayModeRD.getScene().getStylesheets().add("/css/dayMode.css");
+        menuPane.setStyle("-fx-background-color:  #6be6ff;");
         nightModeRD.setSelected(false);
         App.dayMode = true;
     }
@@ -50,7 +73,10 @@ public class TitleController extends Controller {
      */
     public void setNightMode(){
         nightModeRD.getScene().getStylesheets().clear();
+        menuPane.getStylesheets().clear();
+        imgSun.setImage(new Image(getClass().getResource("/visualiser/images/sunsleep.png").toExternalForm()));
         nightModeRD.getScene().getStylesheets().add("/css/nightMode.css");
+        menuPane.setStyle("-fx-background-color: #1f2c60;");
         dayModeRD.setSelected(false);
         App.dayMode = false;
     }
@@ -67,4 +93,12 @@ public class TitleController extends Controller {
         }
     }
 
+
+    public void tutorialStartPressed() throws IOException {
+        titleWrapper.setVisible(false);
+        parent.setGameType(4);
+        parent.beginGame();
+
+    }
+
 }

racevisionGame/src/main/java/visualiser/app/App.java

@@ -3,6 +3,7 @@ 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;
@@ -13,6 +14,7 @@ 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;
@@ -87,7 +89,7 @@ public class App extends Application {
                         );
 
                 updateMessage("Preparing ingredients . . .");
-                Thread.sleep(200);
+                Thread.sleep(100);
                 for (int i = 0; i < burgerFilling.size(); i++) {
                     Thread.sleep(100);
                     updateProgress(i + 1, burgerFilling.size());

racevisionGame/src/main/java/visualiser/enums/TutorialState.java

@@ -0,0 +1,66 @@
+package visualiser.enums;
+
+import javafx.scene.input.KeyCode;
+import network.Messages.BoatAction;
+import network.Messages.Enums.BoatActionEnum;
+import visualiser.gameController.Keys.ControlKey;
+import static visualiser.app.App.keyFactory;
+
+import java.util.ArrayList;
+
+/**
+ * State of which stage the tutorial is currently in
+ */
+public enum TutorialState {
+
+    /**
+     * State for upwind in tutorial
+     */
+    UPWIND(BoatActionEnum.UPWIND),
+
+    /**
+     * State for downwind in tutorial
+     */
+    DOWNWIND(BoatActionEnum.DOWNWIND),
+
+    /**
+     * State for tacking/gybing in tutorial
+     */
+    TACKGYBE(BoatActionEnum.TACK_GYBE),
+
+    /**
+     * State for vmg in tutorial
+     */
+    VMG(BoatActionEnum.AUTO_PILOT),
+
+    /**
+     * State for sails-in in tutorial
+     */
+    SAILSIN(BoatActionEnum.SAILS_IN),
+
+    /**
+     * State for sails-out in tutorial
+     */
+    SAILSOUT(BoatActionEnum.SAILS_OUT),
+
+    /**
+     * State for zoom-in in tutorial
+     */
+    ZOOMIN(null),
+
+    /**
+     * State for zoom-out in tutorial
+     */
+    ZOOMOUT(null);
+
+    private BoatActionEnum action;
+
+    TutorialState(BoatActionEnum action){
+        this.action = action;
+    }
+
+    public BoatActionEnum getAction(){
+        return action;
+    }
+
+}

racevisionGame/src/main/resources/mock/mockXML/boatTutorial.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<BoatConfig>
+    <Boats>
+
+        <!--Mark Boats-->
+        <Boat Type="Mark" BoatName="PRO" SourceID="101" >
+            <GPSposition X= "-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="PIN" SourceID="102" >
+            <GPSposition X= "-64.855242" Y="32.293771" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="FL" SourceID="108" >
+            <GPSposition X= "-64.839291" Y="32.317379" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="FR" SourceID="109" >
+            <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"/>
+        </Boat>
+        <!--<Boat BoatName="Land Rover BAR" HullNum="RG01" ShapeID="0" ShortName="GBR" SourceID="122" StoweName="GBR" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="SoftBank Team Japan" HullNum="RG01" ShapeID="0" ShortName="JPN" SourceID="123" StoweName="JPN" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="Groupama Team France" HullNum="RG01" ShapeID="0" ShortName="FRA" SourceID="124" StoweName="FRA" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="Artemis Racing" HullNum="RG01" ShapeID="0" ShortName="SWE" SourceID="125" StoweName="SWE" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="ORACLE TEAM USA" HullNum="RG01" ShapeID="0" ShortName="USA" SourceID="126" StoweName="USA" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>-->
+    </Boats>
+</BoatConfig>

racevisionGame/src/main/resources/mock/mockXML/raceSinglePlayer.xml

@@ -5,7 +5,6 @@
     <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
     <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
     <Participants>
-        <Yacht SourceID="126"/>
     </Participants>
     <CompoundMarkSequence>
         <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />

racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Race>
+    <RaceID>9999</RaceID>
+    <RaceType>FLEET</RaceType>
+    <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
+    <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
+    <Participants>
+        <!--<Yacht SourceID="121"/>-->
+    </Participants>
+    <CompoundMarkSequence>
+        <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
+        <Corner SeqID="2" CompoundMarkID="2" Rounding="SP" ZoneSize="3"/>
+    </CompoundMarkSequence>
+    <Course>
+        <CompoundMark CompoundMarkID="1" Name="Start Line">
+            <Mark SeqId="1" Name="PRO" TargetLat="32.288148" TargetLng="-64.852996" SourceID="101"/>
+            <Mark SeqId="2" Name="PIN" TargetLat="32.290148" TargetLng="-64.854996" SourceID="102"/>
+        </CompoundMark>
+        <CompoundMark CompoundMarkID="2" Name="Finish Line">
+            <Mark Name="FL" SeqId="1" TargetLat="42.315911" TargetLng="-64.846996" SourceID="108"/>
+            <Mark Name="FR" SeqId="2" TargetLat="42.315911" TargetLng="-64.848996" SourceID="109"/>
+        </CompoundMark>
+    </Course>
+    <CourseLimit>
+
+        <Limit Lat="32.317911" Lon="-64.836996" SeqID="1"/>
+        <Limit Lat="32.286148" Lon="-64.836996" SeqID="2"/>
+        <Limit Lat="32.286148" Lon="-64.856996" SeqID="3"/>
+        <Limit Lat="32.317911" Lon="-64.856996" SeqID="4"/>
+
+        <!--<Limit Lat="32.313922" Lon="-64.837168" SeqID="1"/>
+        <Limit Lat="32.317379" Lon="-64.839291" SeqID="2"/>
+        <Limit Lat="32.317911" Lon="-64.836996" SeqID="3"/>
+        <Limit Lat="32.317257" Lon="-64.83626" SeqID="4"/>
+        <Limit Lat="32.304273" Lon="-64.822834" SeqID="5"/>
+        <Limit Lat="32.279097" Lon="-64.841545" SeqID="6"/>
+        <Limit Lat="32.279604" Lon="-64.849871" SeqID="7"/>
+        <Limit Lat="32.289545" Lon="-64.854162" SeqID="8"/>
+        <Limit Lat="32.290198" Lon="-64.858711" SeqID="9"/>
+        <Limit Lat="32.297164" Lon="-64.856394" SeqID="10"/>
+        <Limit Lat="32.296148" Lon="-64.849184" SeqID="11"/>-->
+    </CourseLimit>
+</Race>

racevisionGame/src/main/resources/mock/mockXML/regattaTutorial.xml

@@ -0,0 +1,10 @@
+<RegattaConfig>
+    <RegattaID>0</RegattaID>
+    <RegattaName>Race Tutorial</RegattaName>
+    <CourseName>Tutorial</CourseName>
+    <CentralLatitude>-36.82791529</CentralLatitude>
+    <CentralLongitude>174.81218919</CentralLongitude>
+    <CentralAltitude>0.00</CentralAltitude>
+    <UtcOffset>12</UtcOffset>
+    <MagneticVariation>14.1</MagneticVariation>
+</RegattaConfig>

racevisionGame/src/main/resources/visualiser/mock/mockXML/raceXML/raceTutorial.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Race>
+
+    <RaceID>99999999</RaceID>
+
+    <RaceType>Match</RaceType>
+
+    <CreationTimeDate>2011-08-06T13:25:00-0000</CreationTimeDate>
+
+    <RaceStartTime Time="2011-08-06T13:30:00-0700" Postpone="false"/>
+
+    <Participants>
+
+        <Yacht SourceID="101" Entry="Port"/>
+
+        <Yacht SourceID="108" Entry="Stbd"/>
+
+    </Participants>
+
+    <Course>
+
+        <CompoundMark CompoundMarkID="1" Name="StartLine">
+
+            <Mark SeqID="1" Name="PRO" TargetLat="-36.83" TargetLng="174.83" SourceID="101"/>
+
+            <Mark SeqID="2" Name="PIN" TargetLat="-36.84" TargetLng="174.81" SourceID="102"/>
+
+        </CompoundMark>
+
+        <CompoundMark CompoundMarkID="2" Name="M1">
+
+            <Mark Name="M1" TargetLat="-36.63566590" TargetLng="174.88543944" SourceID="103"/>
+
+        </CompoundMark>
+
+        <CompoundMark CompoundMarkID="3" Name="M2">
+
+            <Mark Name="M2" TargetLat="-36.83" TargetLng="174.80" SourceID="102"/>
+
+        </CompoundMark>
+
+        <CompoundMark CompoundMarkID="4" Name="Gate">
+
+            <Mark SeqID="1" Name="G1" TargetLat="-36.63566590" TargetLng="174.97205159" SourceID="104"/>
+
+            <Mark SeqID="2" Name="G2" TargetLat="-36.64566590" TargetLng="174.98205159" SourceID="105"/>
+
+        </CompoundMark>
+
+    </Course>
+
+    <CompoundMarkSequence>
+
+        <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3"/>
+
+        <Corner SeqID="2" CompoundMarkID="2" Rounding="Port" ZoneSize="3"/>
+
+        <Corner SeqID="3" CompoundMarkID="3" Rounding="Stbd" ZoneSize="6"/>
+
+        <Corner SeqID="4" CompoundMarkID="4" Rounding="PS" ZoneSize="6"/>
+
+        <Corner SeqID="5" CompoundMarkID="1" Rounding="SP" ZoneSize="3"/>
+
+    </CompoundMarkSequence>
+
+    <CourseLimit>
+
+        <Limit SeqID="1" Lat="-36.8325" Lon="174.8325"/>
+
+        <Limit SeqID="2" Lat="-36.82883" Lon="174.81983"/>
+
+        <Limit SeqID="3" Lat="-36.82067" Lon="174.81983"/>
+
+        <Limit SeqID="4" Lat="-36.811" Lon="174.8265"/>
+
+        <Limit SeqID="5" Lat="-36.81033" Lon="174.83833"/>
+
+        <Limit SeqID="6" Lat="-36.81533" Lon="174.8525"/>
+
+        <Limit SeqID="7" Lat="-36.81533" Lon="174.86733"/>
+
+        <Limit SeqID="8" Lat="-36.81633" Lon="174.88217"/>
+
+        <Limit SeqID="9" Lat="-36.83383" Lon="174.87117"/>
+
+        <Limit SeqID="10" Lat="-36.83417" Lon="174.84767"/>
+
+    </CourseLimit>
+
+</Race>

racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.LineChart?>
 <?import javafx.scene.chart.NumberAxis?>
@@ -28,15 +34,19 @@
            AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8.0.65"
            xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
     <items>
-        <GridPane fx:id="canvasBase">
+      <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
+         <children>
+            <AnchorPane>
+               <children>
+                    <GridPane fx:id="canvasBase" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                         <columnConstraints>
                             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
                         </columnConstraints>
                         <rowConstraints>
                             <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                         </rowConstraints>
-            <children>
+                    </GridPane>
-                <Pane prefHeight="200.0" prefWidth="400.0" GridPane.halignment="LEFT" GridPane.valignment="TOP">
+                      <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
                           <children>
                               <Accordion>
                                   <panes>
@@ -56,7 +66,8 @@
                                                       <RadioButton fx:id="hideAnnoRBtn" mnemonicParsing="false" text="Hidden" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="200.0">
                                                           <toggleGroup>
                                                               <ToggleGroup fx:id="annoToggleGroup" />
-                                       </toggleGroup></RadioButton>
+                                                          </toggleGroup>
+                                          </RadioButton>
                                                       <RadioButton fx:id="showAnnoRBtn" mnemonicParsing="false" text="Visible" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="225.0" />
                                                       <RadioButton fx:id="partialAnnoRBtn" mnemonicParsing="false" text="Partial" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="250.0" />
                                                       <RadioButton fx:id="importantAnnoRBtn" mnemonicParsing="false" text="Important" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="275.0" />
@@ -78,31 +89,34 @@
                               </Accordion>
                           </children>
                       </Pane>
-                <Label fx:id="timer" layoutX="45.0" layoutY="146.0" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" GridPane.halignment="RIGHT" GridPane.valignment="BOTTOM">
+                      <Label fx:id="timer" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
                           <font>
                               <Font name="System Bold" size="15.0" />
                           </font>
                       </Label>
-                <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" GridPane.halignment="LEFT" GridPane.valignment="BOTTOM">
+                      <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
                           <font>
                               <Font name="System Bold" size="15.0" />
                           </font>
                       </Label>
-                <Label fx:id="timeZone" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="BOTTOM">
+                      <Label fx:id="timeZone" text="Label" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                    <GridPane.margin>
-                        <Insets bottom="20.0" />
-                    </GridPane.margin>
                           <font>
                               <Font name="System Bold" size="15.0" />
                           </font>
+                     <padding>
+                        <Insets bottom="20.0" />
+                     </padding>
                       </Label>
-                <StackPane fx:id="arrowPane" alignment="TOP_RIGHT" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false">
+                      <StackPane fx:id="arrowPane" alignment="TOP_RIGHT" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                           <children>
                               <fx:include fx:id="arrow" source="arrow.fxml" />
                           </children>
                       </StackPane>
+                  <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="100.0" />
                </children>
-        </GridPane>
+            </AnchorPane>
+         </children>
+      </StackPane>
         <AnchorPane layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" GridPane.columnIndex="1">
             <children>
                 <TableView fx:id="boatInfoTable" layoutX="-2.0" prefHeight="265.0" prefWidth="242.0" AnchorPane.bottomAnchor="164.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="-62.0" AnchorPane.topAnchor="0.0">

racevisionGame/src/main/resources/visualiser/scenes/title.fxml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
+
 <AnchorPane fx:id="titleWrapper" maxHeight="600.0" maxWidth="800.0" minHeight="600.0" minWidth="800.0" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
    <children>
       <GridPane layoutY="39.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -37,10 +40,10 @@
                   </Text>
                   <RadioButton fx:id="nightModeRD" layoutX="681.0" layoutY="168.0" mnemonicParsing="false" onAction="#setNightMode" text="Night Mode" />
                   <RadioButton fx:id="dayModeRD" layoutX="574.0" layoutY="168.0" mnemonicParsing="false" onAction="#setDayMode" selected="true" text="Day Mode" />
-                  <Button layoutX="28.0" layoutY="152.0" mnemonicParsing="false" onAction="#showControls" text="Controls" />
+                  <Button layoutX="28.0" layoutY="152.0" mnemonicParsing="false" onAction="#controlBtnPressed" text="Controls" />
                </children>
             </Pane>
-            <Pane prefHeight="20.0" prefWidth="20.0" style="-fx-background-color: #6be6ff;" GridPane.columnSpan="4" GridPane.rowSpan="4">
+            <Pane fx:id="menuPane" prefHeight="20.0" prefWidth="20.0" style="-fx-background-color: #6be6ff;" GridPane.columnSpan="4" GridPane.rowSpan="4">
                <children>
                   <ImageView fx:id="imgBoat" fitHeight="404.0" fitWidth="296.0" layoutX="268.0" pickOnBounds="true" preserveRatio="true">
                      <image>
@@ -77,6 +80,7 @@
                         <Font name="Comic Sans MS Bold" size="16.0" />
                      </font>
                   </Button>
+                  <Label fx:id="tutorialLabel" alignment="CENTER" layoutX="94.0" layoutY="223.0" onMouseClicked="#tutorialStartPressed" prefHeight="167.0" prefWidth="206.0" style="-fx-shape: &quot;M 45.673,0 C 67.781,0 85.703,12.475 85.703,27.862 C 85.703,43.249 67.781,55.724 45.673,55.724 C 38.742,55.724 32.224,54.497 26.539,52.34 C 15.319,56.564 0,64.542 0,64.542 C 0,64.542 9.989,58.887 14.107,52.021 C 15.159,50.266 15.775,48.426 16.128,46.659 C 9.618,41.704 5.643,35.106 5.643,27.862 C 5.643,12.475 23.565,0 45.673,0 M 45.673,2.22 C 24.824,2.22 7.862,13.723 7.862,27.863 C 7.862,34.129 11.275,40.177 17.472,44.893 L 18.576,45.734 L 18.305,47.094 C 17.86,49.324 17.088,51.366 16.011,53.163 C 15.67,53.73 15.294,54.29 14.891,54.837 C 18.516,53.191 22.312,51.561 25.757,50.264 L 26.542,49.968 L 27.327,50.266 C 32.911,52.385 39.255,53.505 45.673,53.505 C 66.522,53.505 83.484,42.002 83.484,27.862 C 83.484,13.722 66.522,2.22 45.673,2.22 L 45.673,2.22 z &quot;; -fx-background-color: black, white; -fx-background-insets: 0,1; -fx-padding: 50;" text="How do you play this game? Click here!" textAlignment="CENTER" />
                </children>
             </Pane>
          </children>

racevisionGame/src/test/java/shared/dataInput/BoatsXMLTest.java

@@ -1,47 +0,0 @@
-//package seng302.Mock;
-//
-//import org.junit.Before;
-//import org.junit.Test;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//import static org.junit.Assert.assertEquals;
-//
-///**
-// * Created by jjg64 on 21/04/17.
-// */
-//public class BoatsXMLTest {
-//    private BoatXMLReader boatXMLReader;
-//
-//    @Before
-//    public void setup() {
-//        try {
-//            boatXMLReader = new BoatXMLReader("mockXML/boatXML/boatTest.xml", false);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            //fail("Cannot find mockXML/raceXML/raceTest.xml in the resources folder");
-//        }
-//    }
-//
-//    @Test
-//    public void testInvalidParticipant() {
-//        Map<Integer, StreamedBoat> inputParticipants = new HashMap<>();
-//        inputParticipants.put(420, new StreamedBoat(420));
-//        boatXMLReader.setParticipants(inputParticipants);
-//        boatXMLReader.read();
-//        assertEquals(boatXMLReader.getBoats().size(), 0);
-//    }
-//
-//    @Test
-//    public void testValidParticipant() {
-//        Map<Integer, StreamedBoat> inputParticipants = new HashMap<>();
-//        inputParticipants.put(101, new StreamedBoat(101));
-//        boatXMLReader.setParticipants(inputParticipants);
-//        boatXMLReader.read();
-//        assertEquals(boatXMLReader.getBoats().size(), 1);
-//        StreamedBoat boat = (StreamedBoat) boatXMLReader.getBoats().get(0);
-//        assertEquals(boat.getSourceID(), 101);
-//    }
-//
-//}

racevisionGame/src/test/java/shared/dataInput/FailBoatXMLTest.java

@@ -1,26 +0,0 @@
-//package seng302.Mock;
-//
-//import org.junit.Test;
-//import org.xml.sax.SAXException;
-//
-//import javax.xml.parsers.ParserConfigurationException;
-//import java.io.IOException;
-//import java.text.ParseException;
-//
-///**
-// * Created by jjg64 on 1/05/17.
-// */
-//public class FailBoatXMLTest {
-//    private final String path = "mockXML/boatXML/";
-//
-//    @Test(expected = NumberFormatException.class)
-//    public void invalidSourceID() throws SAXException, ParserConfigurationException, ParseException, IOException {
-//       new BoatXMLReader(path + "invalidSourceID.xml");
-//    }
-//
-//    @Test(expected = NullPointerException.class)
-//    public void insufficientInformation() throws SAXException, ParserConfigurationException, ParseException, IOException {
-//        new BoatXMLReader(path + "insufficientInformation.xml");
-//    }
-//
-//}

racevisionGame/src/test/java/shared/model/RaceTest.java

@@ -1,345 +0,0 @@
-//package shared.model;
-//
-//
-//import mock.model.Polars;
-//import org.junit.Before;
-//import org.junit.Ignore;
-//import org.junit.Test;
-//import org.mockito.Mockito;
-//import org.xml.sax.SAXException;
-//
-//import javax.xml.parsers.ParserConfigurationException;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.ArrayList;
-//
-//import static org.junit.Assert.*;
-//import static org.mockito.Mockito.*;
-//
-///**
-// * Created by esa46 on 15/03/17.
-// */
-//public class RaceTest{
-//
-//
-//    private CompoundMark ORIGIN;
-//
-//    private CompoundMark THREE_NM_FROM_ORIGIN;
-//
-//    private CompoundMark FIFTEEN_NM_FROM_ORIGIN;
-//
-//    private ArrayList<Leg> TEST_LEGS = new ArrayList<>();
-//
-//    private int START_LEG_DISTANCE = 3;
-//    private int MIDDLE_LEG_DISTANCE = 12;
-//
-//    private Leg START_LEG;
-//
-//    private Leg MIDDLE_LEG;
-//
-//    private Leg FINISH_LEG;
-//
-//
-//    @Before
-//    public void setUp() {
-//
-//        ORIGIN = new CompoundMark(
-//                1,
-//                "origin compound",
-//                new Mark(1, "test origin 1", new GPSCoordinate(0, 0))   );
-//
-//
-//        THREE_NM_FROM_ORIGIN = new CompoundMark(
-//                2,
-//                "3 NM from origin compound",
-//                new Mark(2, "test mark 2", new GPSCoordinate(0.050246769, 0))   );
-//
-//
-//        FIFTEEN_NM_FROM_ORIGIN = new CompoundMark(
-//                3,
-//                "15 NM from origin compound",
-//                new Mark(3, "test mark 3", new GPSCoordinate(0.251233845, 0))   );
-//
-//
-//        START_LEG = new Leg("Start", ORIGIN, THREE_NM_FROM_ORIGIN, 0);
-//
-//
-//        MIDDLE_LEG = new Leg("Middle", THREE_NM_FROM_ORIGIN, FIFTEEN_NM_FROM_ORIGIN, 1);
-//
-//
-//        FINISH_LEG = new Leg("Finish", FIFTEEN_NM_FROM_ORIGIN, FIFTEEN_NM_FROM_ORIGIN, 2);
-//
-//
-//        TEST_LEGS.add(START_LEG);
-//        TEST_LEGS.add(MIDDLE_LEG);
-//        TEST_LEGS.add(FINISH_LEG);
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void countdownTimerSendsBoatLocations() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            BoatDataSource boatDataSource = new BoatXMLReader("mockXML/boatTest.xml", new Polars());
-//            RaceDataSource raceDataSource = new RaceXMLReader("mockXML/raceTest.xml", boatDataSource);
-//            Race testRace = new Race(raceDataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            testRace.countdownTimer.handle(1);
-//            verify(mockOutput, atLeast(boatDataSource.getBoats().size())).parseBoatLocation(anyInt(), anyDouble(), anyDouble(), anyDouble(), anyDouble(), anyLong());
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void countdownTimerSendsRaceStatusMessages() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            RaceDataSource dataSource = new RaceXMLReader("mockXML/raceTest.xml", new BoatXMLReader("mockXML/boatTest.xml", new Polars()));
-//            Race testRace = new Race(dataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            testRace.countdownTimer.handle(1);
-//            verify(mockOutput, atLeast(1)).parseRaceStatus(any());
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void checkPositionFinishedUpdatesNumberFinishedBoats() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            RaceDataSource dataSource = new RaceXMLReader("mockXML/raceTest.xml", new BoatXMLReader("mockXML/boatTest.xml", new Polars()));
-//            Race testRace = new Race(dataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(FINISH_LEG);
-//            testBoat.setDistanceTravelledInLeg(1);
-//            testRace.checkPosition(testBoat, 1);
-//
-//            assertEquals(testRace.getNumberOfActiveBoats(), 0);
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void checkPositionSetFinishedBoatVelocityTo0() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            RaceDataSource dataSource = new RaceXMLReader("mockXML/raceTest.xml", new BoatXMLReader("mockXML/boatTest.xml", new Polars()));
-//            Race testRace = new Race(dataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(FINISH_LEG);
-//            testBoat.setDistanceTravelledInLeg(1);
-//            testRace.checkPosition(testBoat, 1);
-//
-//            assertEquals(testBoat.getCurrentSpeed(), 0, 1e-8);
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void checkPositionSetsFinishTime() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            RaceDataSource dataSource = new RaceXMLReader("mockXML/raceTest.xml", new BoatXMLReader("mockXML/boatTest.xml", new Polars()));
-//            Race testRace = new Race(dataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(FINISH_LEG);
-//            testBoat.setDistanceTravelledInLeg(1);
-//            testRace.checkPosition(testBoat, 1);
-//
-//            assertEquals(testBoat.getTimeFinished(), 1, 1e-8);
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void checkPositionUnfinishedDoesntUpdateNumberFinishedBoats() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            RaceDataSource dataSource = new RaceXMLReader("mockXML/raceTest.xml", new BoatXMLReader("mockXML/boatTest.xml", new Polars()));
-//            Race testRace = new Race(dataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(START_LEG);
-//            testBoat.setDistanceTravelledInLeg(START_LEG_DISTANCE);
-//            testRace.checkPosition(testBoat, 1);
-//
-//            assertEquals(testRace.getNumberOfActiveBoats(), 1);
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//
-//    @Ignore
-//    @Test
-//    public void distanceTravelledBeforeUpdatingLegIsRetained() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            RaceDataSource dataSource = new RaceXMLReader("mockXML/raceTest.xml", new BoatXMLReader("mockXML/boatTest.xml", new Polars()));
-//            Race testRace = new Race(dataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(START_LEG);
-//            testBoat.setDistanceTravelledInLeg(START_LEG_DISTANCE + 1);
-//            testRace.checkPosition(testBoat, 0);
-//
-//            assertEquals(testBoat.getDistanceTravelledInLeg(), 1, 1e-7);
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void doNotFinishAnswersYesIf100PercentChance() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            BoatDataSource boatDataSource = new BoatXMLReader("mockXML/boatTest.xml", new Polars());
-//            RaceDataSource raceDataSource = new RaceXMLReader("mockXML/raceTest.xml", boatDataSource);
-//            Race testRace = new Race(raceDataSource, mockOutput);
-//
-//            testRace.setDnfChance(100);
-//            assertTrue(testRace.doNotFinish());
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void doNotFinishAnswersNoIf0PercentChance() {
-//
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            BoatDataSource boatDataSource = new BoatXMLReader("mockXML/boatTest.xml", new Polars());
-//            RaceDataSource raceDataSource = new RaceXMLReader("mockXML/raceTest.xml", boatDataSource);
-//            Race testRace = new Race(raceDataSource, mockOutput);
-//            testRace.setDnfChance(0);
-//            assertFalse(testRace.doNotFinish());
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void boatsAreSetToDNF() {
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            BoatDataSource boatDataSource = new BoatXMLReader("mockXML/boatTest.xml", new Polars());
-//            RaceDataSource raceDataSource = new RaceXMLReader("mockXML/raceTest.xml", boatDataSource);
-//            Race testRace = new Race(raceDataSource, mockOutput);
-//            testRace.setDnfChance(100);
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(START_LEG);
-//            testBoat.setDistanceTravelledInLeg(START_LEG_DISTANCE + 1);
-//            testRace.checkPosition(testBoat, 1);
-//            assertEquals(testBoat.getCurrentLeg().getName(), "DNF");
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void updatePositionIgnoresFinishedBoats() {
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            BoatDataSource boatDataSource = new BoatXMLReader("mockXML/boatTest.xml", new Polars());
-//            RaceDataSource raceDataSource = new RaceXMLReader("mockXML/raceTest.xml", boatDataSource);
-//            Race testRace = new Race(raceDataSource, mockOutput);
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(FINISH_LEG);
-//            testBoat.setCurrentPosition(ORIGIN.getAverageGPSCoordinate());
-//            testRace.updatePosition(testBoat, 1, 1);
-//            assertEquals(testBoat.getCurrentPosition(), ORIGIN.getAverageGPSCoordinate());
-//
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void updatePositionChangesBoatPosition() {
-//        try {
-//            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-//            BoatDataSource boatDataSource = new BoatXMLReader("mockXML/boatTest.xml", new Polars());
-//            RaceDataSource raceDataSource = new RaceXMLReader("mockXML/raceTest.xml", boatDataSource);
-//            Race testRace = new Race(raceDataSource, mockOutput);
-//            testRace.initialiseBoats();
-//            Boat testBoat = testRace.getBoats().get(0);
-//            testBoat.setCurrentLeg(START_LEG);
-//            testBoat.setDistanceTravelledInLeg(START_LEG_DISTANCE - 1);
-//            testBoat.setCurrentPosition(ORIGIN.getAverageGPSCoordinate());
-//            testRace.updatePosition(testBoat, 100, 100);
-//            assertFalse(testBoat.getCurrentPosition() == ORIGIN.getAverageGPSCoordinate());
-//        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-//            e.printStackTrace();
-//            fail();
-//        }
-//    }
-//
-//    @Ignore
-//    @Test
-//    public void windDirectionCorrectValues(){
-////        try {
-////            MockOutput mockOutput = Mockito.mock(MockOutput.class);
-////            BoatDataSource boatDataSource = new BoatXMLReader("mockXML/boatTest.xml");
-////            RaceDataSource raceDataSource = new RaceXMLReader("mockXML/raceTest.xml", boatDataSource);
-////            Race testRace = new Race(raceDataSource, mockOutput);
-////            testRace.setChangeWind(1);
-////            testRace.setWindDir(65535);
-////            testRace.changeWindDir();
-////            assertEquals(100, testRace.getWind());
-////        } catch (ParserConfigurationException | IOException | SAXException | ParseException | StreamedCourseXMLException e) {
-////            e.printStackTrace();
-////            fail();
-////        }
-//    }
-//
-//
-//}

racevisionGame/src/test/java/visualiser/model/VisualiserRaceTest.java

@@ -1,100 +0,0 @@
-//package visualiser.model;
-//
-//
-//import org.junit.Before;
-//import org.junit.Test;
-//import shared.dataInput.RaceXMLReader;
-//import shared.dataInput.XMLReader;
-//import shared.exceptions.InvalidRaceDataException;
-//import shared.model.GPSCoordinate;
-//
-//import java.nio.charset.StandardCharsets;
-//import java.util.List;
-//
-//import static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.fail;
-//
-///**
-// * Tests only work on the current version of mockXML/raceXML/raceTest.xml
-// */
-//public class VisualiserRaceTest {
-//    private RaceXMLReader streamedCourseXMLReader;
-//    private List<GPSCoordinate> boundary;
-//
-//    @Before
-//    public void setup() {
-//        try {
-//            streamedCourseXMLReader = new RaceXMLReader(XMLReader.readXMLFileToString("mockXML/raceXML/raceTest.xml", StandardCharsets.UTF_8));
-//            boundary = streamedCourseXMLReader.getBoundary();
-//        } catch (InvalidRaceDataException e) {
-//            e.printStackTrace();
-//            fail("Cannot find mockXML/raceXML/raceTest.xml in the resources folder");
-//        }
-//    }
-//
-//    @Test
-//    public void testAllBoundaryPointsRead() {
-//        assertEquals(boundary.size(), 10);
-//    }
-//
-//    @Test
-//    public void testBoundaryPointData() {
-//        // First point
-//        assertEquals(boundary.get(0).getLatitude(), -36.8325, 1e-6);
-//        assertEquals(boundary.get(0).getLongitude(), 174.8325, 1e-6);
-//
-//        // Last point
-//        assertEquals(boundary.get(boundary.size() - 1).getLatitude(), -36.83417, 1e-6);
-//        assertEquals(boundary.get(boundary.size() - 1).getLongitude(), 174.84767, 1e-6);
-//    }
-//
-//    @Test
-//    public void testMapEdges() {
-//        double maxLatitude = streamedCourseXMLReader.getMapBottomRight().getLatitude() - streamedCourseXMLReader.getPadding();
-//        double maxLongitude = streamedCourseXMLReader.getMapBottomRight().getLongitude() - streamedCourseXMLReader.getPadding();
-//        double minLatitude = streamedCourseXMLReader.getMapTopLeft().getLatitude() - streamedCourseXMLReader.getPadding();
-//        double minLongitude = streamedCourseXMLReader.getMapTopLeft().getLongitude() - streamedCourseXMLReader.getPadding();
-//
-//        assertEquals(maxLatitude, -36.81033, 1e-6);
-//        assertEquals(maxLongitude, 174.88217, 1e-6);
-//        assertEquals(minLatitude, -36.83417, 1e-6);
-//        assertEquals(minLongitude, 174.81983, 1e-6);
-//    }
-//
-//    @Test
-//    public void testRaceSettings() {
-//
-//    }
-//
-//    @Test
-//    public void correctLegSequence() {
-//        List<Leg> legs = streamedCourseXMLReader.getLegs();
-//        String[] expectedNames = {
-//                "StartLine",
-//                "M1",
-//                "M2",
-//                "Gate"
-//        };
-//        for(int i = 0; i < legs.size(); i++) {
-//            assertEquals(expectedNames[i], legs.get(i).getName());
-//        }
-//    }
-//
-//    /**
-//     * raceTest.xml is not compliant with this test. Markers are positioned far out of bounds.
-//     */
-//    @Test
-//    @Ignore
-//    public void markersWithinRaceBoundaries() {
-//        GPSCoordinate topLeft = streamedCourseXMLReader.getMapTopLeft();
-//        GPSCoordinate bottomRight = streamedCourseXMLReader.getMapBottomRight();
-//
-//        for(Marker compoundMark : streamedCourseXMLReader.getMarkers()) {
-//            GPSCoordinate centre = compoundMark.getAverageGPSCoordinate();
-//            assertTrue(centre.getLatitude() < bottomRight.getLatitude());
-//            assertTrue(centre.getLatitude() > topLeft.getLatitude());
-//            assertTrue(centre.getLongitude() > bottomRight.getLongitude());
-//            assertTrue(centre.getLongitude() < topLeft.getLongitude());
-//        }
-//    }
-//}

settings/keyBindings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<java version="1.8.0_111" class="java.beans.XMLDecoder">
+<java version="1.8.0_144" class="java.beans.XMLDecoder">
  <object class="java.util.HashMap">
   <void method="put">
    <string>SPACE</string>
@@ -10,8 +10,8 @@
    <object class="visualiser.gameController.Keys.SailsToggleKey"/>
   </void>
   <void method="put">
-   <string>DOWN</string>
+   <string>LEFT</string>
-   <object class="visualiser.gameController.Keys.DownWindKey"/>
+   <object class="visualiser.gameController.Keys.UpWindKey"/>
   </void>
   <void method="put">
    <string>X</string>
@@ -22,12 +22,12 @@
    <object class="visualiser.gameController.Keys.TackGybeKey"/>
   </void>
   <void method="put">
-   <string>Z</string>
+   <string>RIGHT</string>
-   <object class="visualiser.gameController.Keys.ZoomInKey"/>
+   <object class="visualiser.gameController.Keys.DownWindKey"/>
   </void>
   <void method="put">
-   <string>UP</string>
+   <string>Z</string>
-   <object class="visualiser.gameController.Keys.UpWindKey"/>
+   <object class="visualiser.gameController.Keys.ZoomInKey"/>
   </void>
  </object>
 </java>