Fixed alignment on room code label, and room code input

Tags: #story[1281]

README.md

@@ -1,29 +1,13 @@
-# Party Parrots At Sea
+# SENG302 Project Template
 
-**Authors:** Michael Rausch, William Muir, Haoming Yin, Alistair Mcintyre, Kusal Ekanayake, Calum Irwin, Peter Galloway, Tan Zhi You
+Basic Maven project with required Maven reporting setup and basic GitLab CI.
 
-### SENG302
-> The Software Engineering group project gives students in-depth experience in developing software applications in groups. Participants work in groups to develop a complex real application. At the end of this course you will have practiced the skills required to be a Software Engineer in the real world, including gaining the required skills to be able to develop complex applications, dealing with vague (and often conflicting) customer requirements, working under pressure and being a valuable member of a software development team.
+It is a requirement that your product should be completely built to a deliverable form using the Maven package goal.
 
-**Find out more:** www.canterbury.ac.nz/courseinfo/GetCourses.aspx?course=SENG302
-
-### Running the discovery server
-
-
-```
-  xvfb-run -a -e server.log java -jar app.jar -runAsDiscoveryServer
-```
-
-### Video
-
-https://youtu.be/aHxJsfZLg54
-
-### Screenshots
-
-![Party Parrots At Sea](https://i.imgur.com/Aw5RIS6.png)
-![Party Parrots At Sea](https://i.imgur.com/qOzlIet.png)
-![Party Parrots At Sea](https://i.imgur.com/UfO9YTg.png)
-![Party Parrots At Sea](https://i.imgur.com/BfMdDzM.png)
-![Party Parrots At Sea](https://i.imgur.com/jHDRFKQ.png)
-![Party Parrots At Sea](https://i.imgur.com/rerOeNo.png)
+Remember to set up your GitLab CI server (refer to the student guide for instructions).
 
+# Basic Project Structure
+ - `src/` Your application source
+ - `doc/` User and design documentation
+ - `doc/examples/` Demo example files for use with your application
+ 

pom.xml

@@ -109,12 +109,6 @@
             <version>3.4.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.fxyz3d</groupId>
-            <artifactId>fxyz3d</artifactId>
-            <version>0.1.1</version>
-        </dependency>
-
     </dependencies>
 
     <build>

src/main/java/seng302/App.java

@@ -77,28 +77,11 @@ public class App extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        ViewManager.getInstance().initialiseSplashScreen(primaryStage);
+        ViewManager.getInstance().initialStartView(primaryStage);
     }
 
-    private static void runDiscoveryServer() throws Exception {
-        while (true){
-            try {
-                new DiscoveryServer();
-            }
-            catch (Exception ignored){
-                ;
-            }
-        }
-    }
 
     public static void main(String[] args) throws Exception {
-//        new Timer().schedule(new TimerTask() {
-//            @Override
-//            public void run() {
-//                System.gc();
-//            }
-//        }, 0, 1_000);
-
         try {
             parseArgs(args);
         } catch (ParseException e) {
@@ -109,7 +92,7 @@ public class App extends Application {
             launch(args);
         }
         else{
-            runDiscoveryServer();
+            new DiscoveryServer();
         }
     }
 }

src/main/java/seng302/discoveryServer/DiscoveryServer.java

@@ -9,27 +9,21 @@ import seng302.model.stream.packets.PacketType;
 import seng302.discoveryServer.util.ServerListing;
 import seng302.discoveryServer.util.ServerRepoStreamParser;
 import seng302.discoveryServer.util.ServerTable;
-import seng302.visualiser.ServerListener;
 
-import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Random;
-import java.util.Timer;
 
 public class DiscoveryServer {
     public static final String ANSI_GREEN = "\u001B[32m";
     public static final String ANSI_YELLOW = "\u001B[33m";
     public static final String ANSI_BLUE = "\u001B[34m";
     public static final String ANSI_RESET = "\u001B[0m";
-    private static final int MAX_SERVER_TRIES = 10;
     public static String DISCOVERY_SERVER = "party.sydney.srv.michaelrausch.nz";
 
     private ServerTable serverTable;
     public static final Integer PORT_NUMBER = 9969;
-    private ServerSocket serverSocket;
 
     private final Logger logger = LoggerFactory.getLogger(DiscoveryServer.class);
 
@@ -48,7 +42,7 @@ public class DiscoveryServer {
                 "           .:;...'cxxxxxxxxxxxxoc;,::,..cdl;;l'   \n" +
                 "         .cl;':,'';oxxxxxxdxxxxxx:....,cooc,cO;   \n" +
                 "     .,,,::;,lxoc:,,:lxxxxxxxxxxxo:,,;lxxl;'oNc   \n" +
-                "   .cdxo;':lxxxxxxc'';cccccoxxxxxxxxxxxxo,.;lc.  " + ANSI_YELLOW + "Party-Parrots-At-Sea Discovery Server v1.0.0 (Release) " + selectedColor +"\n" +
+                "   .cdxo;':lxxxxxxc'';cccccoxxxxxxxxxxxxo,.;lc.  " + ANSI_YELLOW + "Party-Parrots-At-Sea Discovery Server v0.1 " + selectedColor +"\n" +
                 "  .loc'.'lxxxxxxxxocc;''''';ccoxxxxxxxxx:..oc     \n" +
                 "olc,..',:cccccccccccc:;;;;;;;;:ccccccccc,.'c,     \n" +
                 "Ol;......................................;l'  ");
@@ -59,6 +53,8 @@ public class DiscoveryServer {
         displayHeader();
         serverTable = new ServerTable();
 
+        ServerSocket serverSocket;
+
         try{
             serverSocket = new ServerSocket(PORT_NUMBER);
         }
@@ -70,17 +66,12 @@ public class DiscoveryServer {
 
         logger.info("Started successfully - Now accepting connections");
 
-        try{
-            while (true){
-                Socket clientSocket = serverSocket.accept();
+        while (true){
+            Socket clientSocket = serverSocket.accept();
 
-                parseRequest(clientSocket);
+            parseRequest(clientSocket);
 
-                clientSocket.close();
-            }
-        }
-        catch (Exception e){
-            close();
+            clientSocket.close();
         }
     }
 
@@ -107,22 +98,15 @@ public class DiscoveryServer {
 
                 case ROOM_CODE_REQUEST:
                     String desiredRoomCode = parser.getRoomCode();
-                    ServerListing serverListing;
-
-                    if (desiredRoomCode.equals("0000")){
-                        serverListing = getRandomFreeServer();
-                    }
-                    else {
-                        serverListing = serverTable.getServerByRoomCode(desiredRoomCode);
-                    }
 
+                    ServerListing serverListing = serverTable.getServerByRoomCode(desiredRoomCode);
                     Message response;
 
                     if (serverListing != null){
                         response = new ServerRegistrationMessage(serverListing.getServerName(), serverListing.getMapName(), serverListing.getAddress(), serverListing.getPortNumber(), 0, 0, desiredRoomCode);
                     }
                     else{
-                        response = ServerRegistrationMessage.getEmptyRegistration();
+                        response = new ServerRegistrationMessage("", "", "", 0, 0, 0, "");
                     }
 
                     clientSocket.getOutputStream().write(response.getBuffer());
@@ -130,41 +114,4 @@ public class DiscoveryServer {
             }
         }
     }
-
-    public ServerListing getRandomFreeServer() {
-        ServerListing serverToJoin;
-
-        List<ServerListing> servers = serverTable.getAllServers();
-
-        if (servers.size() <= 0){
-            return null;
-        }
-
-        if (servers.size() == 1){
-            return servers.get(0);
-        }
-
-        serverToJoin = servers.get(new Random().nextInt(servers.size()));
-
-        int tries = 0;
-
-        while (serverToJoin != null && serverToJoin.isMaxPlayersReached() && tries < MAX_SERVER_TRIES){
-            serverToJoin = servers.get(new Random().nextInt(servers.size()));
-            tries++;
-        }
-
-        if (serverToJoin != null && serverToJoin.isMaxPlayersReached()){
-            return null;
-        }
-
-        return serverToJoin;
-    }
-
-    public void close(){
-        try {
-            serverSocket.close();
-        } catch (IOException ignored) {
-            ;
-        }
-    }
 }

src/main/java/seng302/discoveryServer/DiscoveryServerClient.java

@@ -1,55 +1,27 @@
 package seng302.discoveryServer;
 
-import javafx.application.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.discoveryServer.util.ServerListing;
-import seng302.discoveryServer.util.ServerRepoStreamParser;
 import seng302.gameServer.messages.Message;
 import seng302.gameServer.messages.RoomCodeRequest;
 import seng302.gameServer.messages.ServerRegistrationMessage;
 import seng302.model.stream.packets.PacketType;
-import seng302.visualiser.controllers.ViewManager;
+import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.util.ServerRepoStreamParser;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.Socket;
-import java.net.URL;
 import java.util.Timer;
 import java.util.TimerTask;
 
 public class DiscoveryServerClient {
-    private final Integer UPDATE_INTERVAL_MS = 1000;
+    private final Integer UPDATE_INTERVAL_MS = 5000;
 
     private static String roomCode = null;
     private Timer serverListingUpdateTimer;
     private Logger logger = LoggerFactory.getLogger(DiscoveryServerClient.class);
-    private String ip = "";
-    private Boolean isInInvalidState = false;
 
     public DiscoveryServerClient() {
-        try {
-            ip = getInetIpAddr();
-        } catch (Exception e) {
-            failError();
-        }
-    }
 
-    public String getInetIp(){
-        return ip;
-    }
-
-    private void failError() {
-        isInInvalidState = true;
-        Platform.runLater(() -> {
-            ViewManager.getInstance().showErrorSnackBar("You do not appear to be able to connect to the internet. Matchmaking will be unavailable.");
-
-        });
-    }
-
-    public boolean didFail(){
-        return isInInvalidState;
     }
 
     /**
@@ -57,8 +29,6 @@ public class DiscoveryServerClient {
      * @param serverListing The listing to register
      */
     public void register(ServerListing serverListing){
-        if (isInInvalidState) return;
-
         if (serverListingUpdateTimer != null){
             serverListingUpdateTimer.cancel();
             serverListingUpdateTimer = null;
@@ -82,8 +52,7 @@ public class DiscoveryServerClient {
      * Stop updating the server registration updates
      */
     public void unregister(){
-        if (serverListingUpdateTimer != null)
-            serverListingUpdateTimer.cancel();
+        serverListingUpdateTimer.cancel();
     }
 
     /**
@@ -112,31 +81,6 @@ public class DiscoveryServerClient {
         return parser.getServerListing();
     }
 
-    public ServerListing getRandomServer() throws Exception {
-        Socket socket = new Socket(DiscoveryServer.DISCOVERY_SERVER, DiscoveryServer.PORT_NUMBER);
-        ServerRepoStreamParser parser = new ServerRepoStreamParser(socket.getInputStream());
-
-        Message request = new RoomCodeRequest("0000");
-        socket.getOutputStream().write(request.getBuffer());
-
-        PacketType packetType = parser.parse();
-
-        if (packetType != PacketType.SERVER_REGISTRATION){
-            logger.error("Incorrect packet type received");
-            return null;
-        }
-
-        socket.close();
-
-        ServerListing serverListing = parser.getServerListing();
-
-        if (serverListing == null || serverListing.equals(ServerRegistrationMessage.getEmptyRegistration())){
-            return null;
-        }
-
-        return serverListing;
-    }
-
     /**
      * Sends a registration update to the discovery server.
      *
@@ -173,27 +117,5 @@ public class DiscoveryServerClient {
     public static String getRoomCode(){
         return roomCode;
     }
-
-    public static String getInetIpAddr() throws Exception {
-        URL myIp = new URL("http://checkip.amazonaws.com");
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new InputStreamReader(
-                    myIp.openStream()));
-            String ip = in.readLine();
-            return ip;
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-
-
 }
 

src/main/java/seng302/discoveryServer/util/ServerListing.java

@@ -1,7 +1,7 @@
 package seng302.discoveryServer.util;
 
 public class ServerListing {
-    public final static int SERVER_TTL_DEFAULT = 5;
+    public final static int SERVER_TTL_DEFAULT = 10;
 
     private String serverName = "";
     private String mapName = "";
@@ -110,8 +110,4 @@ public class ServerListing {
     public void setTtl(Integer ttl){
         this.ttl = ttl;
     }
-
-    public boolean isMaxPlayersReached() {
-        return players >= capacity;
-    }
 }

src/main/java/seng302/discoveryServer/util/ServerTable.java

@@ -48,7 +48,7 @@ public class ServerTable {
            updateTtlForServer(server);
            return;
         }
-        logger.debug("Added new server - " + server.getServerName() + " at address: " + server.getAddress() + ":" + server.getPortNumber());
+        logger.debug("Added new server - " + server.getServerName());
         servers.add(server);
     }
 

src/main/java/seng302/gameServer/GameState.java

@@ -1,43 +1,23 @@
 package seng302.gameServer;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.BoatAction;
-import seng302.gameServer.messages.BoatStatus;
-import seng302.gameServer.messages.ChatterMessage;
-import seng302.gameServer.messages.CustomizeRequestType;
-import seng302.gameServer.messages.MarkRoundingMessage;
-import seng302.gameServer.messages.MarkType;
-import seng302.gameServer.messages.Message;
-import seng302.gameServer.messages.RoundingBoatStatus;
-import seng302.model.GeoPoint;
-import seng302.model.Limit;
-import seng302.model.Player;
-import seng302.model.PolarTable;
-import seng302.model.ServerYacht;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import seng302.gameServer.messages.*;
+import seng302.model.*;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Mark;
 import seng302.model.mark.MarkOrder;
-import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.token.Token;
 import seng302.model.token.TokenType;
 import seng302.utilities.GeoUtility;
-import seng302.utilities.RandomSpawn;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+import seng302.utilities.XMLParser;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.*;
 
 /**
  * A Static class to hold information about the current state of the game (model)
@@ -54,39 +34,25 @@ public class GameState implements Runnable {
     private static Logger logger = LoggerFactory.getLogger(GameState.class);
 
 
-    private static final Integer STATE_UPDATES_PER_SECOND = 60;
-
-    //Scheduling constants
     static final int WARNING_TIME = 10 * -1000;
     static final int PREPATORY_TIME = 5 * -1000;
     private static final int TIME_TILL_START = 10 * 1000;
 
-    //Wind Constants
-    private static final int MAX_WIND_SPEED = 12000;
-    private static final int MIN_WIND_SPEED = 8000;
+    private static final Long POWERUP_TIMEOUT_MS = 10_000L;
 
-    //Rounding Constants
-    private static final Double ROUNDING_DISTANCE = 50d; // TODO: 14/08/17 wmu16 - Look into this value further
-
-    //Collision constants
+    private static final Integer STATE_UPDATES_PER_SECOND = 60;
+    private static Double ROUNDING_DISTANCE = 50d; // TODO: 14/08/17 wmu16 - Look into this value further
     private static final Double MARK_COLLISION_DISTANCE = 15d;
-    public static final Double YACHT_COLLISION_DISTANCE = 15.0;
+    public static final Double YACHT_COLLISION_DISTANCE = 25.0;
     private static final Double BOUNCE_DISTANCE_MARK = 20.0;
     public static final Double BOUNCE_DISTANCE_YACHT = 30.0;
     private static final Double COLLISION_VELOCITY_PENALTY = 0.3;
-
-    //Powerup Constants
-    public static final Double VELOCITY_BOOST_MULTIPLIER = 2d;
-    public static final Integer HANDLING_BOOST_MULTIPLIER = 2;
-    private static final Double BAD_RANDOM_SPEED_PENALTY = 0.3;
-    public static final Long BUMPER_DISABLE_TIME = 5_000L;
-    private static final Long TOKEN_SPAWN_TIME = 30_000L;
+    private static final Integer VELOCITY_BOOST_MULTIPLIER = 2;
 
     private static Long previousUpdateTime;
     public static Double windDirection;
-    public static ReadOnlyDoubleWrapper windDirectionProperty = new ReadOnlyDoubleWrapper();
     private static Double windSpeed;
-    private static Double serverSpeedMultiplier;
+    private static Double speedMultiplier = 1d;
 
     private static Boolean customizationFlag; // dirty flag to tell if a player has customized their boat.
     private static Boolean playerHasLeftFlag;
@@ -94,47 +60,85 @@ public class GameState implements Runnable {
     private static String hostIpAddress;
     private static List<Player> players;
     private static Map<Integer, ServerYacht> yachts;
+    private static Boolean isRaceStarted;
     private static GameStages currentStage;
     private static MarkOrder markOrder;
     private static long startTime;
-    private static Set<Mark> marks = new HashSet<>();
-    private static List<Limit> courseLimit = new ArrayList<>();
-    private static Integer maxPlayers = 12;
+    private static Set<Mark> marks;
+    private static List<Limit> courseLimit;
+    private static Integer maxPlayers = 8;
 
+
+    private static List<Token> allTokens;
     private static List<Token> tokensInPlay;
-    private static RandomSpawn randomSpawn;
 
     private static List<NewMessageListener> newMessageListeners;
 
     private static Map<Player, String> playerStringMap = new HashMap<>();
-    private static boolean tokensEnabled = false;
 
-    public GameState() {
+    public GameState(String hostIpAddress) {
         windDirection = 180d;
-        windDirectionProperty.set(windDirection);
         windSpeed = 10000d;
         yachts = new HashMap<>();
-        tokensInPlay = new CopyOnWriteArrayList<>();
+        tokensInPlay = new ArrayList<>();
+
         players = new ArrayList<>();
+        GameState.hostIpAddress = hostIpAddress;
         customizationFlag = false;
         playerHasLeftFlag = false;
-        serverSpeedMultiplier = 1.0;
+        speedMultiplier = 1.0;
         currentStage = GameStages.LOBBYING;
+        isRaceStarted = false;
+        //set this when game stage changes to prerace
         previousUpdateTime = System.currentTimeMillis();
+        markOrder = new MarkOrder(); //This could be instantiated at some point with a select map?
         newMessageListeners = new ArrayList<>();
+        allTokens = makeTokens();
 
         resetStartTime();
 
         new Thread(this, "GameState").start();   //Run the auto updates on the game state
+
+        marks = new MarkOrder().getAllMarks();
+        setCourseLimit("/server_config/race.xml");
     }
 
-    public static void setRace(RaceXMLData raceXMLData) {
-        markOrder = new MarkOrder(raceXMLData);
-        for (CompoundMark compoundMark : raceXMLData.getCompoundMarks().values()){
-            marks.addAll(compoundMark.getMarks());
+    private void setCourseLimit(String url) {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setNamespaceAware(true);
+        DocumentBuilder documentBuilder;
+        Document document = null;
+        try {
+            documentBuilder = documentBuilderFactory.newDocumentBuilder();
+            document = documentBuilder.parse(new InputSource(getClass().getResourceAsStream(url)));
+        } catch (Exception e) {
+            // sorry, we have to catch general one, otherwise we have to catch five different exceptions.
+            logger.trace("Failed to load course limit for boundary collision detection.", e);
         }
-        randomSpawn = new RandomSpawn(markOrder.getOrderedUniqueCompoundMarks());
-        courseLimit = raceXMLData.getCourseLimit();
+        courseLimit = XMLParser.parseRace(document).getCourseLimit();
+    }
+
+
+    /**
+     * Make a pre defined set of tokensInPlay. //TODO wmu16 - Should read from some file for each
+     * race ideally
+     *
+     * @return A list of possible tokensInPlay for this race
+     */
+    private ArrayList<Token> makeTokens() {
+        Token token1 = new Token(TokenType.BOOST, 57.66946, 11.83154);
+        Token token2 = new Token(TokenType.BOOST, 57.66877, 11.83382);
+        Token token3 = new Token(TokenType.BOOST, 57.66914, 11.83965);
+        Token token4 = new Token(TokenType.BOOST, 57.66684, 11.83214);
+        return new ArrayList<>(Arrays.asList(token1, token2, token3, token4));
+    }
+
+    public static String getHostIpAddress() {
+        return hostIpAddress;
+    }
+
+    public static Set<Mark> getMarks() {
+        return Collections.unmodifiableSet(marks);
     }
 
     public static List<Player> getPlayers() {
@@ -145,10 +149,6 @@ public class GameState implements Runnable {
         return tokensInPlay;
     }
 
-    public static Set<Mark> getMarks() {
-        return Collections.unmodifiableSet(marks);
-    }
-
     public static void addPlayer(Player player) {
         players.add(player);
         String playerText = player.getYacht().getSourceId() + " " + player.getYacht().getBoatName()
@@ -169,6 +169,10 @@ public class GameState implements Runnable {
         yachts.remove(yachtId);
     }
 
+    public static Boolean getIsRaceStarted() {
+        return isRaceStarted;
+    }
+
     public static GameStages getCurrentStage() {
         return currentStage;
     }
@@ -195,7 +199,6 @@ public class GameState implements Runnable {
 
     public static void setWindDirection(Double newWindDirection) {
         windDirection = newWindDirection;
-        windDirectionProperty.set(newWindDirection);
     }
 
     public static void setWindSpeed(Double newWindSpeed) {
@@ -238,77 +241,16 @@ public class GameState implements Runnable {
             } catch (InterruptedException e) {
                 System.out.println("[GameState] interrupted exception");
             }
-            if (currentStage == GameStages.PRE_RACE) {
+            if (currentStage == GameStages.PRE_RACE || currentStage == GameStages.RACING) {
                 update();
-                if (System.currentTimeMillis() > startTime) {
-                    startSpawningTokens();
-                    startUpdatingWind();
-                    GameState.currentStage = GameStages.RACING;
-                }
             }
+
             if (currentStage == GameStages.RACING) {
                 update();
             }
         }
     }
 
-    /**
-     * Start spawning coins every 60s after the first minute
-     */
-    private void startSpawningTokens() {
-        Timer timer = new Timer("Token Spawning Timer");
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                if (tokensEnabled) {
-                    spawnNewToken();
-                    notifyMessageListeners(MessageFactory.getRaceXML());
-                }
-            }
-        }, 0, TOKEN_SPAWN_TIME);
-    }
-
-    // TODO: 29/08/17 wmu16 - This sort of update should be in game state
-    private static void startUpdatingWind() {
-        Timer timer = new Timer("Wind Updating Timer");
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                updateWind();
-            }
-        }, 0, 500);
-    }
-
-
-    private static void updateWind() {
-        Integer direction = GameState.getWindDirection().intValue();
-        Integer windSpeed = GameState.getWindSpeedMMS().intValue();
-
-        Random random = new Random();
-
-        if (Math.floorMod(random.nextInt(), 2) == 0) {
-            direction += random.nextInt(4);
-            windSpeed += random.nextInt(20) + 459;
-        } else {
-            direction -= random.nextInt(4);
-            windSpeed -= random.nextInt(20) + 459;
-        }
-
-        direction = Math.floorMod(direction, 360);
-
-        if (windSpeed > MAX_WIND_SPEED) {
-            windSpeed -= random.nextInt(500);
-        }
-
-        if (windSpeed <= MIN_WIND_SPEED) {
-            windSpeed += random.nextInt(500);
-        }
-
-        GameState.windSpeed = Double.valueOf(windSpeed);
-        GameState.windDirection = direction.doubleValue();
-    }
-
-
     public static void updateBoat(Integer sourceId, BoatAction actionType) {
         ServerYacht playerYacht = yachts.get(sourceId);
         switch (actionType) {
@@ -330,12 +272,6 @@ public class GameState implements Runnable {
             case DOWNWIND:
                 playerYacht.turnDownwind();
                 break;
-            case CONTINUOUSLY_TURNING:
-                playerYacht.setContinuouslyTurning(true);
-                break;
-            case DEFAULT_TURNING:
-                playerYacht.setContinuouslyTurning(false);
-                break;
         }
     }
 
@@ -343,13 +279,15 @@ public class GameState implements Runnable {
      * Randomly select a subset of tokensInPlay from a pre defined superset
      * Broadasts a new race status message to show this update
      */
-    private void spawnNewToken() {
+    public static void spawnNewToken() {
+        Random random = new Random();
         tokensInPlay.clear();
-        Token token = randomSpawn.getRandomToken();
-//        token.assignType(TokenType.WIND_WALKER);
-        logger.debug("Spawned token of type " + token.getTokenType());
+
+        //Get a random token location with random type
+        Token token = allTokens.get(random.nextInt(allTokens.size()));
+        token.assignRandomType();
+
         tokensInPlay.add(token);
-        MessageFactory.updateTokens(tokensInPlay);
     }
 
     /**
@@ -366,12 +304,14 @@ public class GameState implements Runnable {
 
         Double timeInterval = (System.currentTimeMillis() - previousUpdateTime) / 1000000.0;
         previousUpdateTime = System.currentTimeMillis();
-
+        if (System.currentTimeMillis() > startTime) {
+            GameState.setCurrentStage(GameStages.RACING);
+        }
         for (ServerYacht yacht : yachts.values()) {
             updateVelocity(yacht);
+            checkPowerUpTimeout(yacht);
             yacht.runAutoPilot();
             yacht.updateLocation(timeInterval);
-            preformTokenUpdates(yacht); //This update must be done before collision. Sorta hacky
             checkCollision(yacht);
             if (yacht.getBoatStatus() != BoatStatus.FINISHED) {
                 checkForLegProgression(yacht);
@@ -385,139 +325,17 @@ public class GameState implements Runnable {
     }
 
 
-    /**
-     * All token functionality entry points is taken care of here. So can be disabled and enabled
-     * easily
-     *
-     * @param yacht The yacht to perform token checks on
-     */
-    private void preformTokenUpdates(ServerYacht yacht) {
-        Token collidedToken = checkTokenPickUp(yacht);
-        if (collidedToken != null) {
-            tokensInPlay.remove(collidedToken);
-            powerUpYacht(yacht, collidedToken);
-            MessageFactory.updateTokens(tokensInPlay);
-            notifyMessageListeners(MessageFactory.getRaceXML());
-        }
-
-        checkPowerUpTimeout(yacht);
-        TokenType powerUp = yacht.getPowerUp();
-
-        if (powerUp != null) {
-            switch (powerUp) {
-                case WIND_WALKER:
-                    windWalk(yacht);
-                    break;
-                case BUMPER:
-                    ServerYacht collidedYacht = checkYachtCollision(yacht, true);
-                    if (collidedYacht != null) {
-                        yacht.powerDown();
-                        boatTempShutDown(collidedYacht);
-                        notifyMessageListeners(MessageFactory.makePowerDownMessage(yacht));
-                        notifyMessageListeners(
-                            MessageFactory.makeStatusEffectMessage(collidedYacht, powerUp));
-                    }
-                    break;
-                case RANDOM:
-                    yacht.setPowerUpSpeedMultiplier(BAD_RANDOM_SPEED_PENALTY);
-            }
-        }
-    }
-
-
-    /**
-     * Powers up a thisYacht with the given token type.
-     *
-     * @param thisYacht The yacht to be powered up
-     * @param collidedToken The token which this thisYacht collided with
-     */
-    private void powerUpYacht(ServerYacht thisYacht, Token collidedToken) {
-        //The random token has a 50% chance of becoming another token else becoming a speed detriment!
-        if (collidedToken.getTokenType() == TokenType.RANDOM && new Random().nextBoolean()) {
-            collidedToken.realiseRandom();
-        }
-
-        //If another yacht has the wind walker token, They should be powered down. Only one allowed!
-        else if (collidedToken.getTokenType() == TokenType.WIND_WALKER) {
-            for (ServerYacht otherYacht : yachts.values()) {
-                if (otherYacht != thisYacht && otherYacht.getPowerUp() == TokenType.WIND_WALKER) {
-                    powerDownYacht(otherYacht);
-                }
-            }
-        }
-
-        thisYacht.powerUp(collidedToken.getTokenType());
-        String logMessage =
-            thisYacht.getBoatName() + " has picked up a " + collidedToken.getTokenType().getName()
-                + " token";
-        notifyMessageListeners(
-            MessageFactory.makeChatterMessage(thisYacht.getSourceId(), logMessage));
-        notifyMessageListeners(MessageFactory.getRaceXML());
-        notifyMessageListeners(MessageFactory.makePickupMessage(thisYacht, collidedToken));
-        logger.debug(
-            "Yacht: " + thisYacht.getShortName() + " got powerup " + collidedToken.getTokenType());
-    }
-
-    private void powerDownYacht(ServerYacht yacht) {
-        String logMessage =
-            yacht.getBoatName() + "'s " + yacht.getPowerUp().getName() + "  expired";
-        notifyMessageListeners(
-            MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
-        notifyMessageListeners(MessageFactory.makePowerDownMessage(yacht));
-        logger.debug("Yacht: " + yacht.getShortName() + " powered down!");
-
-        yacht.powerDown();
-    }
-
-    // TODO: 23/09/17 wmu16 - This is a hacky way to have the boat power down. Need some sort of separation between token and status effect :/
-
-    /**
-     * Disables the given boat for BUMPER_DISABLE_TIME ms.
-     *
-     * @param yacht The yacht to disable
-     */
-    private void boatTempShutDown(ServerYacht yacht) {
-        yacht.setPowerUpSpeedMultiplier(0d);
-        Timer shutDownTimer = new Timer("Shutdown Timer");
-        shutDownTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                yacht.powerDown();  //Note this actually resets the boat to normal.
-            }
-        }, BUMPER_DISABLE_TIME);
-    }
-
-
-    /**
-     * Checks how long a powerup has been active for. If it has exceeded its timeout, it powers the
-     * yacht down.
-     *
-     * @param yacht The yacht to check to power down
-     */
     private void checkPowerUpTimeout(ServerYacht yacht) {
         if (yacht.getPowerUp() != null) {
-            if (System.currentTimeMillis() - yacht.getPowerUpStartTime() > yacht.getPowerUp()
-                .getTimeout()) {
-                powerDownYacht(yacht);
+            if (System.currentTimeMillis() - yacht.getPowerUpStartTime() > POWERUP_TIMEOUT_MS) {
+                yacht.powerDown();
+                sendServerMessage(yacht.getSourceId(), yacht.getBoatName() + "'s power-up token expired");
+                logger.debug("Yacht: " + yacht.getShortName() + " powered down!");
             }
         }
     }
 
 
-    /**
-     * This function changes the wind to be at an angle that causes the yacht in question to be at
-     * its fastest velocity
-     *
-     * @param yacht The yacht to fix the wind for
-     */
-    private void windWalk(ServerYacht yacht) {
-        Double optimalAngle = PolarTable.getOptimalAngle();
-        Double heading = yacht.getHeading();
-        windDirection = (double) Math.floorMod(Math.round(heading + optimalAngle), 360L);
-        windDirectionProperty.set(windDirection);
-    }
-
-
     /**
      * Check if the yacht has crossed the course limit
      *
@@ -531,7 +349,6 @@ public class GameState implements Runnable {
                 return true;
             }
         }
-
         if (GeoUtility.checkCrossedLine(courseLimit.get(courseLimit.size() - 1), courseLimit.get(0),
             yacht.getLastLocation(), yacht.getLocation()) != 0) {
             return true;
@@ -540,15 +357,13 @@ public class GameState implements Runnable {
     }
 
     /**
-     * Checks all tokensInPlay to see if a yacht has picked one up. If so, the yacht is powered up
-     * in the appropriate way
-     * @param yacht The yacht to check for collision with a token
-     *
-     * @return The token collided with
+     * Checks all tokensInPlay to see if a yacht has picked one up
+     * @return Token which was collided with
+     * @param serverYacht The yacht to check for collision with a token
      */
-    private Token checkTokenPickUp(ServerYacht yacht) {
+    private static Token checkTokenPickUp(ServerYacht serverYacht) {
         for (Token token : tokensInPlay) {
-            Double distance = GeoUtility.getDistance(token, yacht.getLocation());
+            Double distance = GeoUtility.getDistance(token, serverYacht.getLocation());
             if (distance < YACHT_COLLISION_DISTANCE) {
                 return token;
             }
@@ -571,8 +386,9 @@ public class GameState implements Runnable {
      */
     public static void checkCollision(ServerYacht serverYacht) {
         //Yacht Collision
-        ServerYacht collidedYacht = checkYachtCollision(serverYacht, false);
+        ServerYacht collidedYacht = checkYachtCollision(serverYacht);
         Mark collidedMark = checkMarkCollision(serverYacht);
+        Token collidedToken = checkTokenPickUp(serverYacht);
 
         if (collidedYacht != null) {
             GeoPoint originalLocation = serverYacht.getLocation();
@@ -615,36 +431,50 @@ public class GameState implements Runnable {
             );
             notifyMessageListeners(MessageFactory.makeCollisionMessage(serverYacht));
         }
+
+        //Token Collision
+        if (collidedToken != null) {
+            if (collidedToken.getTokenType() == TokenType.RANDOM) {
+                collidedToken.realiseRandom();
+            }
+            sendServerMessage(serverYacht.getSourceId(),
+                serverYacht.getBoatName() + " has picked up a " + collidedToken.getTokenType()
+                    .getName() + " token");
+            tokensInPlay.remove(collidedToken);
+            serverYacht.powerUp(collidedToken.getTokenType());
+            logger.debug("Yacht: " + serverYacht.getShortName() + " got powerup " + collidedToken
+                .getTokenType());
+            notifyMessageListeners(MessageFactory.getRaceXML());
+            notifyMessageListeners(MessageFactory.makePickupMessage(serverYacht, collidedToken));
+        }
     }
 
 
     private void updateVelocity(ServerYacht yacht) {
         Double trueWindAngle = Math.abs(windDirection - yacht.getHeading());
         Double boatSpeedInKnots = PolarTable.getBoatSpeed(getWindSpeedKnots(), trueWindAngle);
-        Double maxBoatSpeed =
-            GeoUtility.knotsToMMS(boatSpeedInKnots) * serverSpeedMultiplier * yacht
-                .getPowerUpSpeedMultiplier() * yacht.getBoatTypeSpeedMultiplier();
+        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots) * speedMultiplier;
+        if (yacht.getPowerUp() != null) {
+            if (yacht.getPowerUp().equals(TokenType.BOOST)) {
+                maxBoatSpeed *= VELOCITY_BOOST_MULTIPLIER;
+            }
+        }
 
         Double currentVelocity = yacht.getCurrentVelocity();
         // TODO: 15/08/17 remove magic numbers from these equations.
         if (yacht.getSailIn()) {
             if (currentVelocity < maxBoatSpeed - 500) {
-                yacht.changeVelocity(
-                    (maxBoatSpeed / 100) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(maxBoatSpeed / 100);
             } else if (currentVelocity > maxBoatSpeed + 500) {
-                yacht.changeVelocity(
-                    (-currentVelocity / 200) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 200);
             } else {
-                yacht
-                    .setCurrentVelocity((maxBoatSpeed) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.setCurrentVelocity(maxBoatSpeed);
             }
         } else {
             if (currentVelocity > 3000) {
-                yacht.changeVelocity(
-                    (-currentVelocity / 200) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 200);
             } else if (currentVelocity > 100) {
-                yacht.changeVelocity(
-                    (-currentVelocity / 50) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 50);
             } else if (currentVelocity <= 100) {
                 yacht.setCurrentVelocity(0d);
             }
@@ -707,10 +537,7 @@ public class GameState implements Runnable {
 
         if (hasProgressed) {
             if (currentMarkSeqID != 0 && !markOrder.isLastMark(currentMarkSeqID)) {
-
-                String logMessage = yacht.getBoatName() + " passed leg " + yacht.getLegNumber();
-                notifyMessageListeners(
-                    MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
+                sendServerMessage(yacht.getSourceId(), yacht.getBoatName() + " passed leg " + yacht.getLegNumber());
             }
             yacht.incrementLegNumber();
             sendMarkRoundingMessage(yacht);
@@ -731,10 +558,6 @@ public class GameState implements Runnable {
      * @param yacht The current yacht to check for
      */
     private Boolean checkStartLineCrossing(ServerYacht yacht) {
-        long timeTillStart = System.currentTimeMillis() - this.getStartTime();
-        if (timeTillStart < 0){
-            return false;
-        }
         Integer currentMarkSeqID = yacht.getCurrentMarkSeqID();
         CompoundMark currentMark = markOrder.getCurrentMark(currentMarkSeqID);
         GeoPoint lastLocation = yacht.getLastLocation();
@@ -750,9 +573,7 @@ public class GameState implements Runnable {
             if (crossedLine == 2 && isClockwiseCross || crossedLine == 1 && !isClockwiseCross) {
                 yacht.setClosestCurrentMark(mark1);
                 yacht.setBoatStatus(BoatStatus.RACING);
-                String logMessage = yacht.getBoatName() + " passed start line";
-                notifyMessageListeners(
-                    MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
+                sendServerMessage(yacht.getSourceId(), yacht.getBoatName() + " passed start line");
                 return true;
             }
         }
@@ -856,10 +677,7 @@ public class GameState implements Runnable {
             if (crossedLine == 1 && isClockwiseCross || crossedLine == 2 && !isClockwiseCross) {
                 yacht.setClosestCurrentMark(mark1);
                 yacht.setBoatStatus(BoatStatus.FINISHED);
-
-                String logMessage = yacht.getBoatName() + " passed finish line";
-                notifyMessageListeners(
-                    MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
+                sendServerMessage(yacht.getSourceId(), yacht.getBoatName() + " passed finish line");
                 return true;
             }
         }
@@ -882,20 +700,16 @@ public class GameState implements Runnable {
             String name = new String(customizeData);
             playerYacht.setBoatName(name);
         } else if (requestType.equals(CustomizeRequestType.COLOR)) {
-            //This low level stuff shouldnt be here alistair! In fact no logic LIKE THIS should! - wmu16
             int red = customizeData[0] & 0xFF;
             int green = customizeData[1] & 0xFF;
             int blue = customizeData[2] & 0xFF;
             Color yachtColor = Color.rgb(red, green, blue);
             playerYacht.setBoatColor(yachtColor);
-        } else if (requestType.equals(CustomizeRequestType.SHAPE)) {
-            String type = new String(customizeData);
-            playerYacht.setBoatType(BoatMeshType.valueOf(type));
         }
     }
 
     private static Mark checkMarkCollision(ServerYacht yacht) {
-        Set<Mark> marksInRace = new HashSet<>(marks);
+        Set<Mark> marksInRace = GameState.getMarks();
         for (Mark mark : marksInRace) {
             if (GeoUtility.getDistance(yacht.getLocation(), mark)
                 <= MARK_COLLISION_DISTANCE) {
@@ -924,22 +738,15 @@ public class GameState implements Runnable {
      * Collision detection which iterates through all the yachts and check if any yacht collided
      * with this yacht. Return collided yacht or null if no collision.
      *
-     * UPDATE: HACK!!! wmu16 - forBumperCollision is (the goddamn dirtiest) dirty flag to fix a
-     * weird bug where the bumper collision would not be registerd but the knock back collision would.
-     * In other words, only set the 'forBumperCollision' flag true if used for the bumper power up.
-     *
      * @return yacht to compare to all other yachts.
      */
-    private static ServerYacht checkYachtCollision(ServerYacht yacht, Boolean forBumperCollision) {
-        Double collisionDistance =
-            (forBumperCollision) ? YACHT_COLLISION_DISTANCE + 2.5 : YACHT_COLLISION_DISTANCE;
+    private static ServerYacht checkYachtCollision(ServerYacht yacht) {
 
         for (ServerYacht otherYacht : GameState.getYachts().values()) {
             if (otherYacht != yacht) {
                 Double distance = GeoUtility
                     .getDistance(otherYacht.getLocation(), yacht.getLocation());
-                ;
-                if (distance < collisionDistance) {
+                if (distance < YACHT_COLLISION_DISTANCE) {
                     return otherYacht;
                 }
             }
@@ -975,6 +782,13 @@ public class GameState implements Runnable {
                 roundingMark.getSourceID()));
     }
 
+
+    public static void sendServerMessage(Integer messageType, String message) {
+        notifyMessageListeners(new ChatterMessage(
+            messageType, "SERVER: " + message
+        ));
+    }
+
     public static void processChatter(ChatterMessage chatterMessage, boolean isHost) {
         String chatterText = chatterMessage.getMessage();
         String[] words = chatterText.split("\\s+");
@@ -982,19 +796,17 @@ public class GameState implements Runnable {
             switch (words[2].trim()) {
                 case "/speed":
                     try {
-                        serverSpeedMultiplier = Double.valueOf(words[3]);
-                        String logMessage = "Speed modifier set to x" + words[3];
-                        notifyMessageListeners(MessageFactory
-                            .makeChatterMessage(chatterMessage.getMessageType(), logMessage));
+                        setSpeedMultiplier(Double.valueOf(words[3]));
+                        sendServerMessage(chatterMessage.getMessage_type(),
+                                "Speed modifier set to x" + words[3]);
                     } catch (Exception e) {
                         Logger logger = LoggerFactory.getLogger(GameState.class);
                         logger.error("cannot parse >speed value");
                     }
                     return;
                 case "/finish":
-                    String logMessage = "Game will now finish";
-                    notifyMessageListeners(MessageFactory
-                        .makeChatterMessage(chatterMessage.getMessageType(), logMessage));
+                    sendServerMessage(chatterMessage.getMessage_type(),
+                            "Game will now finish");
                     endRace();
                     return;
             }
@@ -1044,12 +856,6 @@ public class GameState implements Runnable {
 
     public static void setMaxPlayers(Integer newMax){
         maxPlayers = newMax;
-
-        try {
-            ServerAdvertiser.getInstance().setCapacity(newMax);
-        } catch (IOException e) {
-            logger.warn("Couldn't update max players");
-        }
     }
 
     public static void endRace () {
@@ -1057,15 +863,11 @@ public class GameState implements Runnable {
         currentStage = GameStages.FINISHED;
     }
 
-    public static double getServerSpeedMultiplier() {
-        return serverSpeedMultiplier;
+    public static void setSpeedMultiplier (double multiplier) {
+        speedMultiplier = multiplier;
     }
 
-    public static void setTokensEnabled (boolean tokensEnabled) {
-        GameState.tokensEnabled = tokensEnabled;
-    }
-
-    public static ReadOnlyDoubleWrapper getWindDirectionProperty() {
-        return windDirectionProperty;
+    public static double getSpeedMultiplier () {
+        return speedMultiplier;
     }
 }

src/main/java/seng302/gameServer/MainServerThread.java

@@ -1,23 +1,30 @@
 package seng302.gameServer;
 
 import java.io.IOException;
+import java.io.StringReader;
 import java.net.ServerSocket;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.Random;
 import java.util.Timer;
 import java.util.TimerTask;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import seng302.gameServer.messages.Message;
 import seng302.model.GeoPoint;
 import seng302.model.Player;
 import seng302.model.PolarTable;
 import seng302.model.ServerYacht;
-import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.mark.CompoundMark;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.utilities.GeoUtility;
-
+import seng302.utilities.XMLGenerator;
+import seng302.utilities.XMLParser;
 
 /**
  * A class describing the overall server, which creates and collects server threads for each client
@@ -25,34 +32,42 @@ import seng302.utilities.GeoUtility;
  */
 public class MainServerThread implements Runnable, ClientConnectionDelegate {
 
-    private static final int PORT = 4942;
-    private static int selectedPort = PORT;
-    private static final Integer CLIENT_UPDATES_PER_SECOND = 60;
     private Logger logger = LoggerFactory.getLogger(MainServerThread.class);
+
+    private static final int PORT = 4942;
+    private static final Integer CLIENT_UPDATES_PER_SECOND = 60;
+
+    private static final int MAX_WIND_SPEED = 12000;
+    private static final int MIN_WIND_SPEED = 8000;
+
     private boolean terminated;
 
-    private boolean hasStarted = false;
+    private Thread thread;
 
     private ServerSocket serverSocket = null;
-    private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();
-    private RaceXMLData raceXMLData;
-    private RegattaXMLData regattaXMLData;
-
-    public MainServerThread() {
-        new GameState();
-        try {
-            serverSocket = new ServerSocket(0);
-            selectedPort = serverSocket.getLocalPort();
-        } catch (IOException e) {
-            logger.trace("IO error in server thread handler upon trying to make new server socket",
-                0);
-        }
-        terminated = false;
-        Thread thread = new Thread(this, "MainServer");
-        thread.start();
-    }
+    private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();;
+    private static Integer capacity;
 
     private void startAdvertisingServer() {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db;
+        Document doc;
+        XMLGenerator generator = new XMLGenerator();
+
+        try {
+            db = dbf.newDocumentBuilder();
+            String regatta = generator.getRegattaAsXml();
+            StringReader stringReader = new StringReader(regatta);
+            InputSource is = new InputSource(stringReader);
+            doc = db.parse(is);
+        } catch (ParserConfigurationException | IOException | SAXException e) {
+            logger.warn("Couldn't load race regatta");
+            return;
+        }
+
+        RegattaXMLData regattaXMLData = XMLParser.parseRegatta(doc);
+
+
         Integer capacity = GameState.getCapacity();
         Integer numPlayers = GameState.getNumberOfPlayers();
         Integer spacesLeft = capacity - numPlayers;
@@ -64,33 +79,39 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
 
         // Start advertising server
         try {
-            ServerAdvertiser.getInstance()
-                .setMapName(regattaXMLData.getCourseName())
-                .setCapacity(capacity)
-                .setNumberOfPlayers(numPlayers - 1)
-                .registerGame(selectedPort, regattaXMLData.getRegattaName());
+            ServerAdvertiser.getInstance().setMapName(regattaXMLData.getCourseName()).setCapacity(capacity).setNumberOfPlayers(numPlayers);
+            ServerAdvertiser.getInstance().registerGame(PORT, regattaXMLData.getRegattaName());
         } catch (IOException e) {
             logger.warn("Could not register server");
         }
     }
 
-    private void startServer() {
-        PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
-        MessageFactory.updateXMLGenerator(raceXMLData, regattaXMLData);
-        GameState.setRace(raceXMLData);
-        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
+    public MainServerThread() {
+        new GameState("localhost");
+        try {
+            serverSocket = new ServerSocket(PORT);
+        } catch (IOException e) {
+            logger.trace("IO error in server thread handler upon trying to make new server socket",
+                0);
+        }
+
         startAdvertisingServer();
+
+        PolarTable.parsePolarFile(getClass().getResourceAsStream("/config/acc_polars.csv"));
         GameState.addMessageEventListener(this::broadcastMessage);
-        sendSetupMessages();
+        terminated = false;
+        thread = new Thread(this, "MainServer");
+        startUpdatingWind();
+        startSpawningTokens();
+        thread.start();
     }
 
+
     public void run() {
 
         new HeartbeatThread(this);
         new ServerListenThread(serverSocket, this);
 
-        hasStarted = true;
-
         //You should handle interrupts in some way, so that the thread won't keep on forever if you exit the app.
         while (!terminated) {
             if (GameState.getPlayerHasLeftFlag()) {
@@ -114,7 +135,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             }
             if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState
                 .getCustomizationFlag()) {
-                MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
                 sendSetupMessages();
                 GameState.resetCustomizationFlag();
             }
@@ -132,8 +152,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             else if (GameState.getCurrentStage() == GameStages.FINISHED) {
                 broadcastMessage(MessageFactory.getRaceStatusMessage());
                 try {
-                    Thread.sleep(
-                        1000); //Hackish fix to make sure all threads have sent closing RaceStatus
+                    Thread.sleep(1000); //Hackish fix to make sure all threads have sent closing RaceStatus
                     terminate();
                 } catch (InterruptedException ie) {
                     logger.trace("Thread interrupted while waiting to terminate clients", 1);
@@ -141,10 +160,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             }
         }
         try {
-            synchronized (this) {
-                for (ServerToClientThread serverToClientThread : serverToClientThreads) {
-                    serverToClientThread.terminate();
-                }
+            for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+                serverToClientThread.terminate();
             }
             serverSocket.close();
         } catch (IOException e) {
@@ -159,7 +176,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     }
 
     private void sendSetupMessages() {
-        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
         broadcastMessage(MessageFactory.getRaceXML());
         broadcastMessage(MessageFactory.getRegattaXML());
         broadcastMessage(MessageFactory.getBoatXML());
@@ -171,6 +187,63 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         }
     }
 
+    private static void updateWind(){
+        Integer direction = GameState.getWindDirection().intValue();
+        Integer windSpeed = GameState.getWindSpeedMMS().intValue();
+
+        Random random = new Random();
+
+        if (Math.floorMod(random.nextInt(), 2) == 0){
+            direction += random.nextInt(4);
+            windSpeed += random.nextInt(20) + 459;
+        }
+        else{
+            direction -= random.nextInt(4);
+            windSpeed -= random.nextInt(20) + 459;
+        }
+
+        direction = Math.floorMod(direction, 360);
+
+        if (windSpeed > MAX_WIND_SPEED){
+            windSpeed -= random.nextInt(500);
+        }
+
+        if (windSpeed <= MIN_WIND_SPEED){
+            windSpeed += random.nextInt(500);
+        }
+
+        GameState.setWindSpeed(Double.valueOf(windSpeed));
+        GameState.setWindDirection(direction.doubleValue());
+    }
+
+
+
+
+    // TODO: 29/08/17 wmu16 - This sort of update should be in game state
+    private static void startUpdatingWind(){
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                updateWind();
+            }
+        }, 0, 500);
+    }
+
+    /**
+     * Start spawning coins every 60s after the first minute
+     */
+    private void startSpawningTokens() {
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                GameState.spawnNewToken();
+                broadcastMessage(MessageFactory.getRaceXML());
+            }
+        }, 10000, 60000);
+    }
+
     /**
      * A client has tried to connect to the server
      *
@@ -181,42 +254,16 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         logger.debug("Player Connected From " + serverToClientThread.getThread().getName(), 0);
         if (serverToClientThreads.size() == 0) { //Sets first client as host.
             serverToClientThread.setAsHost();
-            serverToClientThread.raceXMLProperty().addListener((obs, oldVal, race) -> {
-                if (race != null) {
-                    raceXMLData = race;
-                }
-                if (regattaXMLData != null) {
-                    startServer();
-                }
-            });
-            serverToClientThread.regattaXMLProperty().addListener((obs, oldVal, regatta) -> {
-                if (regatta != null) {
-                    regattaXMLData = regatta;
-                }
-                if (raceXMLData != null) {
-                    startServer();
-                }
-            });
         }
-
         serverToClientThreads.add(serverToClientThread);
+        serverToClientThread.addConnectionListener(this::sendSetupMessages);
+        serverToClientThread.addDisconnectListener(this::clientDisconnected);
 
         try {
             ServerAdvertiser.getInstance().setNumberOfPlayers(GameState.getNumberOfPlayers());
         } catch (IOException e) {
             logger.warn("Couldn't update advertisement");
         }
-
-        while (regattaXMLData == null && raceXMLData == null) {
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-        }
-        serverToClientThread.addConnectionListener(this::sendSetupMessages);
-        serverToClientThread.addDisconnectListener(this::clientDisconnected);
     }
 
     /**
@@ -233,11 +280,10 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         for (ServerToClientThread serverToClientThread : serverToClientThreads) {
             if (serverToClientThread.getSocket() == player.getSocket()) {
                 closedConnection = serverToClientThread;
-            } else if (GameState.getCurrentStage() != GameStages.RACING) {
+            } else if (GameState.getCurrentStage() != GameStages.RACING){
                 serverToClientThread.sendSetupMessages();
             }
         }
-
         serverToClientThreads.remove(closedConnection);
 
         try {
@@ -246,9 +292,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             logger.warn("Couldn't update advertisement");
         }
 
-        if (closedConnection != null) {
-            closedConnection.terminate();
-        }
+        closedConnection.terminate();
     }
 
     public void startGame() {
@@ -266,12 +310,16 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             public void run() {
                 broadcastMessage(MessageFactory.getRaceStatusMessage());
                 if (GameState.getCurrentStage() == GameStages.PRE_RACE
-                    || GameState.getCurrentStage() == GameStages.LOBBYING) {
+                        || GameState.getCurrentStage() == GameStages.LOBBYING) {
                     broadcastMessage(MessageFactory.getRaceStartStatusMessage());
                 }
             }
         }, 0, 500);
 
+
+        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
+            sendSetupMessages();
+        }
     }
 
     public void terminate() {
@@ -282,72 +330,39 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
      * Initialise boats to specific spaced out geopoints behind starting line.
      */
     private void initialiseBoatPositions() {
+        CompoundMark cm = GameState.getMarkOrder().getMarkOrder().get(0);
+        GeoPoint startMark1 = cm.getSubMark(1);
+        GeoPoint startMark2 = cm.getSubMark(2);
 
-        final double DISTANCE_TO_START = 75d;
-        final double YACHT_SEPARATION = 35d;
+        // Calculating midpoint
+        Double perpendicularAngle = GeoUtility.getBearing(startMark1, startMark2);
+        Double length = GeoUtility.getDistance(startMark1, startMark2);
+        GeoPoint midpoint = GeoUtility.getGeoCoordinate(startMark1, perpendicularAngle, length / 2);
 
-        //Length of start line
-        double startLineLength = GeoUtility.getDistance(
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
-        ) - YACHT_SEPARATION;
+        // Setting each boats position side by side
+        double DISTANCE_FACTOR = 50.0;  // distance apart in meters
+        int boatIndex = 0;
+        for (ServerYacht yacht : GameState.getYachts().values()) {
+            int distanceApart = boatIndex / 2;
 
-        //How many yachts can fit along the start line
-        int spacesAlongLine = (int) Math.round(startLineLength / YACHT_SEPARATION);
-
-        //Angle of start line
-        double startMarkToMarkAngle = GeoUtility.getBearing(
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
-        );
-
-        //angle from first mark to the start
-        double angleToStart = GeoUtility.getBearing(
-            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint(),
-            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint()
-        );
-
-        double angleFromStart = GeoUtility.getBearing(
-            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
-            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint()
-        );
-
-        GeoPoint midPoint = GeoUtility.getGeoCoordinate(
-            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
-            angleToStart, DISTANCE_TO_START
-        );
-
-        List<ServerYacht> randomisedYachts = new ArrayList<>(GameState.getYachts().values());
-        Collections.shuffle(randomisedYachts);
-        while (randomisedYachts.size() > 0) {
-
-            int numYachts = spacesAlongLine > randomisedYachts.size() ? randomisedYachts.size() : spacesAlongLine;
-            double yachtSpace = (numYachts - 1) * YACHT_SEPARATION / 2;
-
-            GeoPoint firstYachtPoint = GeoUtility.getGeoCoordinate(
-                midPoint, startMarkToMarkAngle + 180, yachtSpace
-            );
-
-            for (int i = 0; i < numYachts; i++) {
-                randomisedYachts.get(0).setHeading(angleFromStart);
-                randomisedYachts.get(0).setLocation(firstYachtPoint);
-                firstYachtPoint = GeoUtility.getGeoCoordinate(
-                    firstYachtPoint, startMarkToMarkAngle, YACHT_SEPARATION
-                );
-                randomisedYachts.remove(0);
+            if (boatIndex % 2 == 1 && boatIndex != 0) {
+                distanceApart++;
+                distanceApart *= -1;
             }
 
-            midPoint = GeoUtility.getGeoCoordinate(
-                midPoint, angleToStart, YACHT_SEPARATION * 1.5
-            );
+            GeoPoint spawnMark = GeoUtility
+                .getGeoCoordinate(midpoint, perpendicularAngle, distanceApart * DISTANCE_FACTOR);
+
+            if (yacht.getHeading() < perpendicularAngle) {
+                spawnMark = GeoUtility
+                    .getGeoCoordinate(spawnMark, perpendicularAngle + 90, DISTANCE_FACTOR);
+            } else {
+                spawnMark = GeoUtility
+                    .getGeoCoordinate(spawnMark, perpendicularAngle + 270, DISTANCE_FACTOR);
+            }
+
+            yacht.setLocation(spawnMark);
+            boatIndex++;
         }
     }
-
-    public boolean hasStarted() {
-        return hasStarted;
-    }
-
-    public int getPortNumber() {
-        return selectedPort;
-    }
 }

src/main/java/seng302/gameServer/MessageFactory.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import seng302.gameServer.messages.BoatLocationMessage;
 import seng302.gameServer.messages.BoatSubMessage;
-import seng302.gameServer.messages.ChatterMessage;
 import seng302.gameServer.messages.RaceStartNotificationType;
 import seng302.gameServer.messages.RaceStartStatusMessage;
 import seng302.gameServer.messages.RaceStatus;
@@ -18,8 +17,6 @@ import seng302.model.Player;
 import seng302.model.ServerYacht;
 import seng302.model.stream.xml.generator.RaceXMLTemplate;
 import seng302.model.stream.xml.generator.RegattaXMLTemplate;
-import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.model.token.Token;
 import seng302.model.token.TokenType;
 import seng302.utilities.XMLGenerator;
@@ -41,48 +38,6 @@ Ideally this class would be created with an instance of the GameState (I tried i
 public class MessageFactory {
 
     private static XMLGenerator xmlGenerator = new XMLGenerator();
-    private static XMLMessage race;
-    private static XMLMessage regatta;
-    private static XMLMessage boats;
-
-    public static void updateXMLGenerator(RaceXMLData race, RegattaXMLData regatta) {
-        xmlGenerator.setRegattaTemplate(
-            new RegattaXMLTemplate(
-                regatta.getRegattaName(),
-                regatta.getCourseName(),
-                regatta.getCentralLat(),
-                regatta.getCentralLng()
-            )
-        );
-        xmlGenerator.setRaceTemplate(
-            new RaceXMLTemplate(
-                new ArrayList<>(),
-                new ArrayList<>(),
-                race.getMarkSequence(),
-                race.getCourseLimit(),
-                new ArrayList<>(race.getCompoundMarks().values()),
-                GameState.getCapacity(), true
-            )
-        );
-        String xmlStr = xmlGenerator.getRaceAsXml();
-        MessageFactory.race = new XMLMessage(xmlStr, XMLMessageSubType.RACE, xmlStr.length());
-        xmlStr = xmlGenerator.getRegattaAsXml();
-        MessageFactory.regatta = new XMLMessage(xmlStr, XMLMessageSubType.REGATTA, xmlStr.length());
-        xmlStr = xmlGenerator.getBoatsAsXml();
-        MessageFactory.boats = new XMLMessage(xmlStr, XMLMessageSubType.BOAT, xmlStr.length());
-    }
-
-    public static void updateBoats(List<ServerYacht> yachts) {
-        xmlGenerator.getRace().setBoats(yachts);
-        String xmlStr = xmlGenerator.getBoatsAsXml();
-        MessageFactory.boats = new XMLMessage(xmlStr, XMLMessageSubType.BOAT, xmlStr.length());
-    }
-
-    public static void updateTokens(List<Token> tokens) {
-        xmlGenerator.getRace().setTokens(tokens);
-        String xmlStr = xmlGenerator.getRaceAsXml();
-        MessageFactory.race = new XMLMessage(xmlStr, XMLMessageSubType.RACE, xmlStr.length());
-    }
 
 
     public static RaceStartStatusMessage getRaceStartStatusMessage() {
@@ -143,29 +98,44 @@ public class MessageFactory {
     }
 
     public static XMLMessage getRaceXML() {
-        return race;
+        List<ServerYacht> yachts = new ArrayList<>(GameState.getYachts().values());
+        List<Token> tokens = GameState.getTokensInPlay();
+        RaceXMLTemplate raceXMLTemplate = new RaceXMLTemplate(yachts, tokens);
+        xmlGenerator.setRaceTemplate(raceXMLTemplate);
+
+        XMLMessage raceXMLMessage = new XMLMessage(
+            xmlGenerator.getRaceAsXml(),
+            XMLMessageSubType.RACE,
+            xmlGenerator.getRaceAsXml().length());
+
+        return raceXMLMessage;
     }
 
     public static XMLMessage getRegattaXML() {
-       return regatta;
+        //@TODO calculate lat/lng values
+
+        return new XMLMessage(
+            xmlGenerator.getRegattaAsXml(),
+            XMLMessageSubType.REGATTA,
+            xmlGenerator.getRegattaAsXml().length());
     }
 
     public static XMLMessage getBoatXML() {
-        return boats;
+        List<ServerYacht> yachts = new ArrayList<>(GameState.getYachts().values());
+        List<Token> tokens = GameState.getTokensInPlay();
+        RaceXMLTemplate raceXMLTemplate = new RaceXMLTemplate(yachts, tokens);
+        xmlGenerator.setRaceTemplate(raceXMLTemplate);
+
+        return new XMLMessage(
+            xmlGenerator.getBoatsAsXml(),
+            XMLMessageSubType.BOAT,
+            xmlGenerator.getBoatsAsXml().length());
     }
 
     public static YachtEventCodeMessage makeCollisionMessage(ServerYacht serverYacht) {
         return new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION);
     }
 
-
-    /**
-     * Constructs a message to be sent out whenever a yacht picks up a boost
-     *
-     * @param serverYacht The yacht that has picked up a power up
-     * @param token The token which they picked up
-     * @return The corresponding YachtEventCodeMessage
-     */
     public static YachtEventCodeMessage makePickupMessage(ServerYacht serverYacht, Token token) {
         YachtEventType yachtEventType = null;
         switch (token.getTokenType()) {
@@ -187,39 +157,4 @@ public class MessageFactory {
         }
         return new YachtEventCodeMessage(serverYacht.getSourceId(), yachtEventType);
     }
-
-    /**
-     * Constructs a message representing a certain buff / debuff for a given yacht. For now this is
-     * just for the bumper debuff so the affected boat is aware that it has been crashed. This could
-     * however be extended to render affects for all boats given a certain debuff.
-     *
-     * @param yacht The yacht affected by some status
-     * @param token The token indicating what status they have
-     * @return A YachtEventCodeMessage
-     */
-    public static YachtEventCodeMessage makeStatusEffectMessage(ServerYacht yacht,
-        TokenType token) {
-        YachtEventType yachtEventType = null;
-        switch (token) {
-            case BUMPER:
-                yachtEventType = YachtEventType.BUMPER_CRASH;
-                break;
-        }
-        return new YachtEventCodeMessage(yacht.getSourceId(), yachtEventType);
-    }
-
-
-    /**
-     * Constructs a message to be sent out when a given yacht powers down (From a boost of any type)
-     *
-     * @param yacht The yacht that is powering down
-     * @return A YachtEventCodeMessage representing this action
-     */
-    public static YachtEventCodeMessage makePowerDownMessage(ServerYacht yacht) {
-        return new YachtEventCodeMessage(yacht.getSourceId(), YachtEventType.POWER_DOWN);
-    }
-
-    public static ChatterMessage makeChatterMessage(Integer messageType, String message) {
-        return new ChatterMessage(messageType, "SERVER: " + message);
-    }
 }

src/main/java/seng302/gameServer/ServerAdvertiser.java

@@ -1,9 +1,7 @@
 package seng302.gameServer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.DiscoveryServerClient;
 
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceInfo;
@@ -40,7 +38,6 @@ public class ServerAdvertiser {
     private DiscoveryServerClient repositoryClient;
 
     private Hashtable<String ,String> props;
-    private Logger logger = LoggerFactory.getLogger(ServerAdvertiser.class);
 
     private ServerAdvertiser() throws IOException{
         jmdnsInstance = JmDNS.create(InetAddress.getByName(getLocalHostIp()));
@@ -131,12 +128,12 @@ public class ServerAdvertiser {
                     try {
                         jmdnsInstance.registerService(serviceInfo);
                     } catch (IOException e) {
-                        logger.warn("Failed to register service info");
+                        System.out.println("Failed");
                     }
                 }
             }, 0);
 
-        ServerListing serverListing = new ServerListing(serverName, props.get("map"), new DiscoveryServerClient().getInetIp(), portNo, Integer.parseInt(props.get("capacity")));
+        ServerListing serverListing = new ServerListing(serverName, props.get("map"), getLocalHostIp(), portNo, Integer.parseInt(props.get("capacity")));
         repositoryClient.register(serverListing);
     }
 
@@ -146,8 +143,6 @@ public class ServerAdvertiser {
     public void unregister(){
         if (serviceInfo != null)
             jmdnsInstance.unregisterService(serviceInfo);
-
-        repositoryClient.unregister();
     }
 
     /**

src/main/java/seng302/gameServer/ServerDescription.java

@@ -92,10 +92,13 @@ public class ServerDescription {
 
     public Boolean serverShouldBeRemoved() {
         if (lastRefreshed == null) return false;
+
+        System.out.println("SBR" + (System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL));
         return System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL;
     }
 
     public void hasBeenRefreshed(){
+        System.out.println("Was refreshed");
         lastRefreshed = System.currentTimeMillis();
     }
 }

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -1,11 +1,23 @@
 package seng302.gameServer;
 
 
-import javafx.beans.property.SimpleObjectProperty;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.*;
-import org.w3c.dom.Document;
 import seng302.gameServer.messages.BoatAction;
 import seng302.gameServer.messages.ChatterMessage;
 import seng302.gameServer.messages.ClientType;
@@ -13,28 +25,14 @@ import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.gameServer.messages.Message;
 import seng302.gameServer.messages.RegistrationResponseMessage;
 import seng302.gameServer.messages.RegistrationResponseStatus;
+import seng302.gameServer.messages.XMLMessage;
+import seng302.gameServer.messages.XMLMessageSubType;
 import seng302.model.Player;
 import seng302.model.ServerYacht;
 import seng302.model.stream.packets.PacketType;
 import seng302.model.stream.packets.StreamPacket;
-import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.stream.xml.parser.RegattaXMLData;
-import seng302.utilities.StreamParser;
+import seng302.model.stream.xml.generator.RaceXMLTemplate;
 import seng302.utilities.XMLGenerator;
-import seng302.utilities.XMLParser;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.zip.CRC32;
-import java.util.zip.Checksum;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on
@@ -79,11 +77,9 @@ public class ServerToClientThread implements Runnable {
     private List<ConnectionListener> connectionListeners = new ArrayList<>();
     private DisconnectListener disconnectListener;
 
+    private ServerYacht yacht;
     private Player player;
 
-    private SimpleObjectProperty<RaceXMLData> raceXMLProperty = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<RegattaXMLData> regattaXMLProperty = new SimpleObjectProperty<>();
-
     public ServerToClientThread(Socket socket) {
         this.socket = socket;
         seqNo = 0;
@@ -104,11 +100,33 @@ public class ServerToClientThread implements Runnable {
     }
 
     private void setUpPlayer(){
-        String shortName = "P" + sourceId;
-        String longName = "Player " + sourceId;
+        BufferedReader fn;
+        String fName = "";
+        BufferedReader ln;
+        String lName = "";
+
+        fn = new BufferedReader(
+                new InputStreamReader(
+                        ServerToClientThread.class.getResourceAsStream(
+                                "/server_config/CSV_Database_of_First_Names.csv"
+                        )
+                )
+        );
+        List<String> all = fn.lines().collect(Collectors.toList());
+        fName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
+        ln = new BufferedReader(
+                new InputStreamReader(
+                        ServerToClientThread.class.getResourceAsStream(
+                                "/server_config/CSV_Database_of_Last_Names.csv"
+                        )
+                )
+        );
+        all = ln.lines().collect(Collectors.toList());
+        lName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
 
         ServerYacht yacht = new ServerYacht(
-            BoatMeshType.DINGHY, sourceId, sourceId.toString(), shortName, longName, "NZ");
+                "Yacht", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
+        );
 
         player = new Player(socket, yacht);
         GameState.addYacht(sourceId, yacht);
@@ -167,52 +185,37 @@ public class ServerToClientThread implements Runnable {
                     long computedCrc = checksum.getValue();
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
-                        StreamPacket packet = new StreamPacket(type, payloadLength, timeStamp, payload);
                         switch (PacketType.assignPacketType(type, payload)) {
                             case BOAT_ACTION:
-                                BoatAction actionType = ServerPacketParser.extractBoatAction(packet);
+                                BoatAction actionType = ServerPacketParser
+                                        .extractBoatAction(
+                                                new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.updateBoat(sourceId, actionType);
                                 break;
 
                             case RACE_REGISTRATION_REQUEST:
-                                ClientType requestedType = ServerPacketParser
-                                    .extractClientType(packet);
+                                ClientType requestedType = ServerPacketParser.extractClientType(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
+
                                 completeRegistration(requestedType);
                                 break;
                             case CHATTER_TEXT:
                                 ChatterMessage chatterMessage = ServerPacketParser
-                                    .extractChatterText(packet);
+                                    .extractChatterText(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.processChatter(chatterMessage, isHost);
                                 break;
                             case RACE_CUSTOMIZATION_REQUEST:
-                                Long sourceID = Message.bytesToLong(
-                                    Arrays.copyOfRange(payload, 0, 3)
-                                );
+                                Long sourceID = Message
+                                    .bytesToLong(Arrays.copyOfRange(payload, 0, 3));
                                 CustomizeRequestType requestType = ServerPacketParser
-                                    .extractCustomizationType(packet);
-
+                                    .extractCustomizationType(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.customizePlayer(sourceID, requestType,
-                                    Arrays.copyOfRange(payload, 6, payload.length)
-                                );
+                                    Arrays.copyOfRange(payload, 6, payload.length));
                                 GameState.setCustomizationFlag();
                                 // TODO: 17/08/2017 ajm412: Send a response packet here, not really necessary until we do shapes.
                                 break;
-                            case RACE_XML:
-                                Document document = StreamParser.extractXmlMessage(packet);
-                                raceXMLProperty.set(
-                                    XMLParser.parseRace(document)
-                                );
-                                GameState.setMaxPlayers(XMLParser.getMaxPlayers(document));
-                                GameState.setTokensEnabled(XMLParser.tokensEnabled(document));
-                                break;
-                            case REGATTA_XML:
-                                regattaXMLProperty.set(
-                                    XMLParser.parseRegatta(
-                                        StreamParser.extractXmlMessage(packet)
-                                    )
-                                );
-                                break;
-
                         }
                     } else {
                         logger.warn("Packet has been dropped", 1);
@@ -229,9 +232,23 @@ public class ServerToClientThread implements Runnable {
     }
 
     public void sendSetupMessages() {
-        sendMessage(MessageFactory.getRegattaXML());
-        sendMessage(MessageFactory.getBoatXML());
-        sendMessage(MessageFactory.getRaceXML());
+        xmlGenerator = new XMLGenerator();
+        RaceXMLTemplate race = new RaceXMLTemplate(new ArrayList<>(GameState.getYachts().values()), new ArrayList<>());
+
+        xmlGenerator.setRaceTemplate(race);
+
+        XMLMessage xmlMessage;
+        xmlMessage = new XMLMessage(xmlGenerator.getRegattaAsXml(), XMLMessageSubType.REGATTA,
+                xmlGenerator.getRegattaAsXml().length());
+        sendMessage(xmlMessage);
+
+        xmlMessage = new XMLMessage(xmlGenerator.getBoatsAsXml(), XMLMessageSubType.BOAT,
+                xmlGenerator.getBoatsAsXml().length());
+        sendMessage(xmlMessage);
+
+        xmlMessage = new XMLMessage(xmlGenerator.getRaceAsXml(), XMLMessageSubType.RACE,
+                xmlGenerator.getRaceAsXml().length());
+        sendMessage(xmlMessage);
     }
 
     private void closeSocket() {
@@ -300,6 +317,10 @@ public class ServerToClientThread implements Runnable {
         return socket;
     }
 
+    public ServerYacht getYacht() {
+        return yacht;
+    }
+
     public void addConnectionListener(ConnectionListener listener) {
         connectionListeners.add(listener);
     }
@@ -323,12 +344,4 @@ public class ServerToClientThread implements Runnable {
     public void setAsHost() {
         isHost = true;
     }
-
-    public SimpleObjectProperty<RaceXMLData> raceXMLProperty() {
-        return raceXMLProperty;
-    }
-
-    public SimpleObjectProperty<RegattaXMLData> regattaXMLProperty() {
-        return regattaXMLProperty;
-    }
 }

src/main/java/seng302/gameServer/messages/BoatAction.java

@@ -14,9 +14,7 @@ public enum BoatAction {
     TACK_GYBE(4),
     UPWIND(5),
     DOWNWIND(6),
-    MAINTAIN_HEADING(7),
-    CONTINUOUSLY_TURNING(8),
-    DEFAULT_TURNING(9);
+    MAINTAIN_HEADING(7);
 
     private final int type;
     private static final Map<Integer, BoatAction> intToTypeMap = new HashMap<>();

src/main/java/seng302/gameServer/messages/BoatActionMessage.java

@@ -5,19 +5,19 @@ package seng302.gameServer.messages;
  */
 public class BoatActionMessage extends Message{
     private final MessageType MESSAGE_TYPE = MessageType.BOAT_ACTION;
-    private final int MESSAGE_SIZE = 5;
+    private final int MESSAGE_SIZE = 1;
     private BoatAction actionType;
 
-    public BoatActionMessage(BoatAction actionType, int sourceId) {
+    public BoatActionMessage(BoatAction actionType) {
         this.actionType = actionType;
-        setHeader(new Header(MessageType.BOAT_ACTION, sourceId, (short) MESSAGE_SIZE)); // the second variable is the source id
+        setHeader(new Header(MessageType.BOAT_ACTION, 0, (short) 1)); // the second variable is the source id
         allocateBuffer();
         writeHeaderToBuffer();
         // Write message fields
         putInt(actionType.getValue(), 1);
-        putInt(sourceId, 4);
         writeCRC();
         rewind();
+
     }
 
     @Override

src/main/java/seng302/gameServer/messages/ChatterMessage.java

@@ -40,7 +40,7 @@ public class ChatterMessage extends Message {
         return message;
     }
 
-    public int getMessageType() {
+    public int getMessage_type() {
         return message_type;
     }
 }

src/main/java/seng302/gameServer/messages/Message.java

@@ -158,13 +158,7 @@ public abstract class Message {
      * @return The current buffer as a byte array
      */
     public byte[] getBuffer(){
-        byte[] bytes = buffer.array();
-
-//        buffer.reset();
-//        buffer.clear();
-//        buffer = null;
-
-        return bytes;
+        return buffer.array();
     }
 
     /**

src/main/java/seng302/gameServer/messages/RegistrationRequestMessage.java

@@ -4,8 +4,8 @@ package seng302.gameServer.messages;
 public class RegistrationRequestMessage extends Message {
     private static int MESSAGE_LENGTH = 2;
 
-    public RegistrationRequestMessage(ClientType type, int clientID){
-        setHeader(new Header(MessageType.REGISTRATION_REQUEST, clientID, (short) getSize()));
+    public RegistrationRequestMessage(ClientType type){
+        setHeader(new Header(MessageType.REGISTRATION_REQUEST, 1, (short) getSize()));
 
         allocateBuffer();
         writeHeaderToBuffer();

src/main/java/seng302/gameServer/messages/ServerRegistrationMessage.java

@@ -17,10 +17,6 @@ public class ServerRegistrationMessage extends Message {
         createMessage(serverName, mapName, address, port, players, capacity, roomCode);
     }
 
-    public static ServerRegistrationMessage getEmptyRegistration() {
-        return new ServerRegistrationMessage("","","",0,0,0,"");
-    }
-
     @Override
     public int getSize() {
         return size;

src/main/java/seng302/gameServer/messages/YachtEventType.java

@@ -1,7 +1,7 @@
 package seng302.gameServer.messages;
 
 /**
- * Enum for different event types for the yacht
+ * Created by wmu16 on 11/09/17.
  */
 public enum YachtEventType {
     COLLISION(33),
@@ -9,10 +9,7 @@ public enum YachtEventType {
     TOKEN_BUMPER(35),
     TOKEN_HANDLING(36),
     TOKEN_WIND_WALKER(37),
-    TOKEN_RANDOM(38),
-    POWER_DOWN(39),
-    BUMPER_CRASH(40);
-
+    TOKEN_RANDOM(38);
 
     private int code;
 

src/main/java/seng302/model/ClientYacht.java

@@ -6,18 +6,19 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
-import java.util.Timer;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.ReadOnlyLongProperty;
 import javafx.beans.property.ReadOnlyLongWrapper;
+import javafx.beans.value.ObservableObjectValue;
+import javafx.collections.FXCollections;
 import javafx.scene.paint.Color;
+import jdk.nashorn.internal.objects.annotations.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.model.token.TokenType;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
 import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 /**
@@ -38,30 +39,15 @@ public class ClientYacht extends Observable {
         void notifyRounding(ClientYacht yacht, int legNumber);
     }
 
-    @FunctionalInterface
-    public interface ColorChangeListener {
-
-        void notifyColorChange(ClientYacht yacht);
-    }
-
-    //This notifies RaceViewController so it can display icon - wmu16
     @FunctionalInterface
     public interface PowerUpListener {
         void notifyPowerUp(ClientYacht yacht, TokenType tokenType);
     }
 
-    //This notifies RaceViewController so it can remove token icon - wmu16
-    @FunctionalInterface
-    public interface PowerDownListener {
-        void notifyPowerDown(ClientYacht yacht);
-    }
-
-
-
     private Logger logger = LoggerFactory.getLogger(ClientYacht.class);
 
 
-    private BoatMeshType boatType;
+    private String boatType;
     private Integer sourceId;
     private String hullID; //matches HullNum in the XML spec.
     private String shortName;
@@ -71,7 +57,7 @@ public class ClientYacht extends Observable {
     private TokenType powerUp;
 
     private Long estimateTimeAtFinish;
-    private Boolean sailIn = true;
+    private Boolean sailIn = false;
     private Integer currentMarkSeqID = 0;
     private Long markRoundTime;
     private Long timeTillNext;
@@ -81,24 +67,18 @@ public class ClientYacht extends Observable {
     private Integer boatStatus;
     private Double currentVelocity;
 
-    Timer t;
-
     private BoatObject boatObject;
 
     private List<YachtLocationListener> locationListeners = new ArrayList<>();
     private List<MarkRoundingListener> markRoundingListeners = new ArrayList<>();
     private List<PowerUpListener> powerUpListeners = new ArrayList<>();
-    private List<PowerDownListener> powerDownListeners = new ArrayList<>();
-    private List<ColorChangeListener> colorChangeListeners = new ArrayList<>();
-
     private ReadOnlyDoubleWrapper velocityProperty = new ReadOnlyDoubleWrapper();
     private ReadOnlyLongWrapper timeTillNextProperty = new ReadOnlyLongWrapper();
     private ReadOnlyLongWrapper timeSinceLastMarkProperty = new ReadOnlyLongWrapper();
     private ReadOnlyIntegerWrapper placingProperty = new ReadOnlyIntegerWrapper();
-    private ReadOnlyDoubleWrapper headingProperty = new ReadOnlyDoubleWrapper();
     private Color colour;
 
-    public ClientYacht(BoatMeshType boatType, Integer sourceId, String hullID, String shortName,
+    public ClientYacht(String boatType, Integer sourceId, String hullID, String shortName,
         String boatName, String country) {
         this.boatType = boatType;
         this.sourceId = sourceId;
@@ -108,7 +88,6 @@ public class ClientYacht extends Observable {
         this.country = country;
         this.location = new GeoPoint(57.670341, 11.826856);
         this.heading = 120.0;   //In degrees
-        this.headingProperty.set(this.heading);
         this.currentVelocity = 0d;
         this.boatStatus = 1;
         this.colour = Color.rgb(0, 0, 0, 1.0);
@@ -123,7 +102,7 @@ public class ClientYacht extends Observable {
         super.addObserver(o);
     }
 
-    public BoatMeshType getBoatType() {
+    public String getBoatType() {
         return boatType;
     }
 
@@ -234,21 +213,6 @@ public class ClientYacht extends Observable {
         this.position = position;
     }
 
-    /**
-     * Powers down the boat and notifies the raceViewController to display
-     */
-    public void powerDown() {
-        this.powerUp = null;
-        for (PowerDownListener listener : powerDownListeners) {
-            listener.notifyPowerDown(this);
-        }
-    }
-
-    /**
-     * powers up the boat and notifies the raceViewController to display
-     *
-     * @param tokenType The type of token that this boat is being powered up with
-     */
     public void setPowerUp(TokenType tokenType) {
         this.powerUp = tokenType;
         for (PowerUpListener listener : powerUpListeners) {
@@ -282,8 +246,6 @@ public class ClientYacht extends Observable {
 
     public void setHeading(Double heading) {
         this.heading = heading;
-        System.out.println(heading);
-        setHeadingProperty();
     }
 
     @Override
@@ -310,15 +272,12 @@ public class ClientYacht extends Observable {
 
     public void setColour(Color colour) {
         this.colour = colour;
-        for (ColorChangeListener listener : colorChangeListeners) {
-            listener.notifyColorChange(this);
-        }
     }
 
+
     public void updateLocation(double lat, double lng, double heading, double velocity) {
         setLocation(lat, lng);
         this.heading = heading;
-        setHeadingProperty();
         this.currentVelocity = velocity;
         updateVelocityProperty(velocity);
         for (YachtLocationListener yll : locationListeners) {
@@ -326,10 +285,6 @@ public class ClientYacht extends Observable {
         }
     }
 
-    private void setHeadingProperty() {
-        headingProperty.set(heading);
-    }
-
     public void addLocationListener(YachtLocationListener listener) {
         locationListeners.add(listener);
     }
@@ -342,14 +297,6 @@ public class ClientYacht extends Observable {
         powerUpListeners.add(listener);
     }
 
-    public void addPowerDownListener(PowerDownListener listener) {
-        powerDownListeners.add(listener);
-    }
-
-    public void addColorChangeListener(ColorChangeListener listener) {
-        colorChangeListeners.add(listener);
-    }
-
     public void removeMarkRoundingListener(MarkRoundingListener listener) {
         markRoundingListeners.remove(listener);
     }
@@ -378,9 +325,4 @@ public class ClientYacht extends Observable {
     public BoatObject getBoatObject() {
         return this.boatObject;
     }
-
-    public ReadOnlyDoubleWrapper getHeadingProperty() {
-        return headingProperty;
-    }
-
 }

src/main/java/seng302/model/GameKeyBind.java

@@ -1,87 +0,0 @@
-package seng302.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import javafx.scene.input.KeyCode;
-
-public class GameKeyBind {
-
-    private static GameKeyBind instance;
-    private Map<KeyCode, KeyAction> keyToActionMap;
-    private Map<KeyAction, KeyCode> actionToKeyMap;
-    private Boolean continuouslyTurning;
-
-
-    private GameKeyBind() {
-        setToDefault();
-    }
-
-    public void setToDefault() {
-        actionToKeyMap = new HashMap<>();
-        keyToActionMap = new HashMap<>();
-        continuouslyTurning = false;
-        // default key bindings
-        ArrayList<KeyCode> keys = new ArrayList<>();
-        keys.add(KeyCode.Z);
-        keys.add(KeyCode.X);
-        keys.add(KeyCode.SPACE);
-        keys.add(KeyCode.SHIFT);
-        keys.add(KeyCode.ENTER);
-        keys.add(KeyCode.PAGE_UP);
-        keys.add(KeyCode.PAGE_DOWN);
-        keys.add(KeyCode.F1);
-        keys.add(KeyCode.D);
-        keys.add(KeyCode.A);
-        keys.add(KeyCode.W);
-        keys.add(KeyCode.S);
-        for (int i = 0; i < 12; i++) {
-            actionToKeyMap.put(KeyAction.getType(i + 1), keys.get(i));
-            keyToActionMap.put(keys.get(i), KeyAction.getType(i + 1));
-        }
-    }
-
-    public static GameKeyBind getInstance() {
-        if (instance == null) {
-            instance = new GameKeyBind();
-        }
-        return instance;
-    }
-
-    public KeyCode getKeyCode(KeyAction keyAction) {
-        return instance.actionToKeyMap.get(keyAction);
-    }
-
-    public KeyAction getKeyAction(KeyCode keyCode) {
-        return instance.keyToActionMap.get(keyCode);
-    }
-
-    /**
-     * Binds a key to a key action
-     *
-     * @return true if successfully bind
-     */
-    public boolean bindKeyToAction(KeyCode keyCode, KeyAction keyAction) {
-        if (instance.keyToActionMap.containsKey(keyCode)) {
-            // if the key has been bound to other action, return false
-            return false;
-        } else {
-            instance.keyToActionMap.put(keyCode, keyAction); // add key -> action
-            KeyCode oldKeyCode = instance.actionToKeyMap
-                .get(keyAction); // get old key for the action
-            instance.keyToActionMap.remove(oldKeyCode); // remove the old key -> action
-            instance.actionToKeyMap
-                .replace(keyAction, keyCode); // replace the old key by the newer one
-            return true;
-        }
-    }
-
-    public void toggleTurningMode() {
-        continuouslyTurning = !continuouslyTurning;
-    }
-
-    public Boolean isContinuouslyTurning() {
-        return continuouslyTurning;
-    }
-
-}

src/main/java/seng302/model/KeyAction.java

@@ -1,40 +0,0 @@
-package seng302.model;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum KeyAction {
-    ZOOM_IN(1),
-    ZOOM_OUT(2),
-    VMG(3),
-    SAILS_STATE(4),
-    TACK_GYBE(5),
-    UPWIND(6),
-    DOWNWIND(7),
-    VIEW(8),
-    RIGHT(9),
-    LEFT(10),
-    FORWARD(11),
-    BACKWARD(12);
-
-    private final int type;
-    private static final Map<Integer, KeyAction> intToTypeMap = new HashMap<>();
-
-    static {
-        for (KeyAction type : KeyAction.values()) {
-            intToTypeMap.put(type.getValue(), type);
-        }
-    }
-
-    KeyAction(int type) {
-        this.type = type;
-    }
-
-    public static KeyAction getType(int value) {
-        return intToTypeMap.get(value);
-    }
-
-    public int getValue() {
-        return this.type;
-    }
-}

src/main/java/seng302/model/Limit.java

@@ -15,9 +15,4 @@ public class Limit extends GeoPoint {
     public Integer getSeqID() {
         return seqID;
     }
-
-    @Override
-    public String toString(){
-        return "Limit = {seqID=" + seqID + ", lat=" + getLat() + ", lng=" + getLng() + "}";
-    }
 }

src/main/java/seng302/model/PolarTable.java

@@ -4,9 +4,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * A static class for parsing and storing the polars. Will parse the whole polar table and also store the optimised
@@ -19,7 +17,6 @@ public final class PolarTable {
     private static HashMap<Double, HashMap<Double, Double>> polarTable;
     private static HashMap<Double, HashMap<Double, Double>> upwindOptimal;
     private static HashMap<Double, HashMap<Double, Double>> downwindOptimal;
-    private static Double optimalAngle;
 
     private static int upTwaIndex;
     private static int dnTwaIndex;
@@ -36,13 +33,11 @@ public final class PolarTable {
         upwindOptimal = new HashMap<>();
         downwindOptimal = new HashMap<>();
 
-        String line = null;
-        String check;
+        String line;
         Boolean isHeaderLine = true;
 
         try (BufferedReader br = new BufferedReader(new InputStreamReader(polarFile))) {
-            while ((check = br.readLine()) != null) {
-                line = check;
+            while ((line = br.readLine()) != null) {
                 String[] thisLine = line.split(",");
 
                 //Initial line in file
@@ -71,10 +66,7 @@ public final class PolarTable {
                     upwindOptimal.put(thisWindSpeed, thisUpWindPolar);
                     downwindOptimal.put(thisWindSpeed, thisDnWindPolar);
                 }
-
-
             }
-            getMaxSpeedAngle(line);
 
         } catch (IOException e) {
             System.out.println("[PolarTable] IO exception");
@@ -82,27 +74,6 @@ public final class PolarTable {
     }
 
 
-    /**
-     * Passes the final line of the polar table and iterates over the speeds for each
-     * angle, velocity pair to find the angle that produces the highest velocity
-     *
-     * @param line The last line of the polar file
-     */
-    private static void getMaxSpeedAngle(String line) {
-        String[] theLastLine = line.split(",");
-        Double maxWindVal = Double.parseDouble(theLastLine[0]);
-        Double optimalAngle = Double.parseDouble(theLastLine[1]);
-        Double maxSpeed = Double.parseDouble(theLastLine[2]);
-        for (Map.Entry<Double, Double> entry : polarTable.get(maxWindVal).entrySet()) {
-            if (entry.getValue() > maxSpeed) {
-                maxSpeed = entry.getValue();
-                optimalAngle = entry.getKey();
-            }
-        }
-        PolarTable.optimalAngle = optimalAngle;
-    }
-
-
 
     /**
      * Parses the header line of a polar file
@@ -114,18 +85,14 @@ public final class PolarTable {
             String thisItem = thisLine[i];
             if (thisItem.toLowerCase().startsWith("uptwa")) {
                 upTwaIndex = i;
-            } else if (thisItem.toLowerCase().startsWith("dntwa")) {
+            }
+            else if (thisItem.toLowerCase().startsWith("dntwa")) {
                 dnTwaIndex = i;
             }
         }
     }
 
 
-    public static Double getOptimalAngle() {
-        return optimalAngle;
-    }
-
-
     /**
      * @return The entire polar table
      */

src/main/java/seng302/model/RaceState.java

@@ -134,8 +134,4 @@ public class RaceState {
     public Boolean getRaceFinished() {
         return raceFinished;
     }
-
-    public ReadOnlyDoubleWrapper getWindDirection() {
-        return windDirection;
-    }
 }

src/main/java/seng302/model/ScaledPoint.java

@@ -1,122 +0,0 @@
-package seng302.model;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import javafx.geometry.Point2D;
-import seng302.utilities.GeoUtility;
-
-/**
- * Contains information on a scaled lat lon point for use with mapping geographical elements to a 2d plane.
- */
-public class ScaledPoint extends GeoPoint {
-
-    public enum ScaleDirection {
-        HORIZONTAL,
-        VERTICAL
-    }
-
-    private double x, y, scaleFactor;
-    private ScaleDirection scaleDirection;
-
-    private ScaledPoint(double lat, double lng, double x, double y, double scaleFactor, ScaleDirection direction) {
-        super(lat, lng);
-        this.x = x;
-        this.y = y;
-        this.scaleFactor = scaleFactor;
-        this.scaleDirection = direction;
-    }
-
-    public double getX() {
-        return x;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    public double getScaleFactor() {
-        return scaleFactor;
-    }
-
-    public ScaleDirection getScaleDirection() {
-        return scaleDirection;
-    }
-
-    public Point2D findScaledXY(GeoPoint unscaled) {
-        return findScaledXY(unscaled.getLat(), unscaled.getLng());
-    }
-
-    public Point2D findScaledXY(double unscaledLat, double unscaledLon) {
-        double distanceFromReference;
-        double angleFromReference;
-        double xReference = this.getX();
-        double yReference = this.getY();
-
-        angleFromReference = GeoUtility.getBearingRad(
-            this, new GeoPoint(unscaledLat, unscaledLon)
-        );
-        distanceFromReference = GeoUtility.getDistance(
-            this, new GeoPoint(unscaledLat, unscaledLon)
-        );
-        if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
-            xReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-            yReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-        } else if (angleFromReference >= 0) {
-            angleFromReference = angleFromReference - Math.PI / 2;
-            xReference += scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-            yReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-        } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
-            angleFromReference = Math.abs(angleFromReference);
-            xReference -= scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-            yReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-        } else {
-            angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
-            xReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-            yReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-        }
-        return new Point2D(xReference, yReference);
-    }
-
-    public static ScaledPoint makeScaledPoint(double width, double height,
-        List<? extends GeoPoint> points, boolean centered) {
-
-        double referencePointX, referencePointY, scaleFactor, lat, lng;
-        ScaleDirection scaleDirection;
-        points = new ArrayList<>(points);
-        points.sort(Comparator.comparingDouble(GeoPoint::getLat));
-        GeoPoint minLatPoint = points.get(0);
-        GeoPoint maxLatPoint = points.get(points.size() - 1);
-
-        points.sort(Comparator.comparingDouble(GeoPoint::getLng));
-        GeoPoint minLonPoint = points.get(0);
-        GeoPoint maxLonPoint = points.get(points.size() - 1);
-
-        referencePointX = centered ? 0 : width / 2;
-        referencePointY = centered ? 0 : height / 2;
-
-        lat = (maxLatPoint.getLat() - minLatPoint.getLat()) / 2 + minLatPoint.getLat();
-        lng = (maxLonPoint.getLng() - minLonPoint.getLng()) / 2 + minLonPoint.getLng();
-
-        GeoPoint ref = new GeoPoint(lat, lng);
-
-        double vertDistance = GeoUtility.getDistance(
-            ref, new GeoPoint(ref.getLat(), maxLonPoint.getLng())
-        ) * 2.1;
-
-        double horiDistance = GeoUtility.getDistance(
-            ref, new GeoPoint(maxLatPoint.getLat(), ref.getLng())
-        ) * 2.1;
-
-        double vertScale = height / vertDistance;
-
-        if (horiDistance * vertScale > width) {
-            scaleFactor = width / horiDistance;
-            scaleDirection = ScaleDirection.HORIZONTAL;
-        } else {
-            scaleFactor = vertScale;
-            scaleDirection = ScaleDirection.VERTICAL;
-        }
-        return new ScaledPoint(lat, lng, referencePointX, referencePointY, scaleFactor, scaleDirection);
-    }
-}

src/main/java/seng302/model/ServerYacht.java

@@ -1,6 +1,5 @@
 package seng302.model;
 
-import java.util.HashMap;
 import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +8,10 @@ import seng302.gameServer.messages.BoatStatus;
 import seng302.model.mark.Mark;
 import seng302.model.token.TokenType;
 import seng302.utilities.GeoUtility;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+
+import java.util.HashMap;
+import java.util.Observable;
+import java.util.Observer;
 
 /**
  * Yacht class for the racing boat. <p> Class created to store more variables (eg. boat statuses)
@@ -18,14 +20,12 @@ import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
  */
 public class ServerYacht {
 
-    private Logger logger = LoggerFactory.getLogger(ServerYacht.class);
+    private Logger logger = LoggerFactory.getLogger(ClientYacht.class);
+
+    public static final Double TURN_STEP = 5.0;
 
     //Boat info
-    private BoatMeshType boatType;
-    private Double turnStep = 5.0;
-    private Double boatTypeSpeedMultiplier = 1.0;
-    private Double boatTypeTurnStepMultiplier = 1.0;
-    private Double boatTypeAccelerationMultiplier = 1.0;
+    private String boatType;
     private Integer sourceId;
     private String hullID; //matches HullNum in the XML spec.
     private String shortName;
@@ -55,15 +55,11 @@ public class ServerYacht {
     //PowerUp
     private TokenType powerUp;
     private Long powerUpStartTime;
-    private Double powerUpSpeedMultiplier;
-    private Integer powerUpHandlingMultiplier;
 
-    //turning mode
-    private Boolean continuouslyTurning;
 
-    public ServerYacht(BoatMeshType boatType, Integer sourceId, String hullID, String shortName,
+    public ServerYacht(String boatType, Integer sourceId, String hullID, String shortName,
         String boatName, String country) {
-        setBoatType(boatType);
+        this.boatType = boatType;
         this.boatStatus = BoatStatus.PRESTART;
         this.sourceId = sourceId;
         this.hullID = hullID;
@@ -80,12 +76,10 @@ public class ServerYacht {
         this.legNumber = 0;
         this.boatColor = Colors.getColor(sourceId - 1);
         this.powerUp = null;
-        this.powerUpSpeedMultiplier = 1d;
-        this.powerUpHandlingMultiplier = 1;
+
         this.hasEnteredRoundingZone = false;
         this.hasPassedLine = false;
         this.hasPassedThroughGate = false;
-        this.continuouslyTurning = false;
     }
 
 
@@ -112,33 +106,13 @@ public class ServerYacht {
         location = geoPoint;
     }
 
-    /**
-     * Powers up a yacht with a given yacht, only after powering it down first to avoid double power
-     * ups
-     *
-     * @param powerUp The given power up
-     */
     public void powerUp(TokenType powerUp) {
-        powerDown();
-        switch (powerUp) {
-            case BOOST:
-                powerUpSpeedMultiplier = GameState.VELOCITY_BOOST_MULTIPLIER;
-                break;
-            case HANDLING:
-                powerUpHandlingMultiplier = GameState.HANDLING_BOOST_MULTIPLIER;
-                break;
-        }
         this.powerUp = powerUp;
         powerUpStartTime = System.currentTimeMillis();
     }
 
-    /**
-     * Powers down a yacht, returning its power multipliers back to 1
-     */
     public void powerDown() {
         this.powerUp = null;
-        this.powerUpSpeedMultiplier = 1d;
-        this.powerUpHandlingMultiplier = 1;
     }
 
     public Long getPowerUpStartTime() {
@@ -155,7 +129,7 @@ public class ServerYacht {
      * @param amount the amount by which to adjust the boat heading.
      */
     public void adjustHeading(Double amount) {
-        Double newVal = heading + amount * powerUpHandlingMultiplier * boatTypeTurnStepMultiplier;
+        Double newVal = heading + amount;
         lastHeading = heading;
         heading = (double) Math.floorMod(newVal.longValue(), 360L);
     }
@@ -178,11 +152,11 @@ public class ServerYacht {
     /**
      * Enables the boats auto pilot feature, which will move the boat towards a given heading.
      *
-     * @param newHeading The heading to move the boat towards.
+     * @param thisHeading The heading to move the boat towards.
      */
-    private void setAutoPilot(Double newHeading) {
+    private void setAutoPilot(Double thisHeading) {
         isAuto = true;
-        autoHeading = newHeading;
+        autoHeading = thisHeading;
     }
 
     /**
@@ -200,9 +174,8 @@ public class ServerYacht {
         if (isAuto) {
             turnTowardsHeading(autoHeading);
             if (Math.abs(heading - autoHeading)
-                <= turnStep*1.5) {
+                <= TURN_STEP) { //Cancel when within 1 turn step of target.
                 isAuto = false;
-                setHeading(autoHeading);
             }
         }
     }
@@ -214,52 +187,44 @@ public class ServerYacht {
     public void turnUpwind() {
         disableAutoPilot();
         Double normalizedHeading = normalizeHeading();
-        if (continuouslyTurning) {
-            adjustHeading(turnStep);
-        } else {
-            if (normalizedHeading == 0) {
-                if (lastHeading < 180) {
-                    adjustHeading(-turnStep);
-                } else {
-                    adjustHeading(turnStep);
-                }
-            } else if (normalizedHeading == 180) {
-                if (lastHeading < 180) {
-                    adjustHeading(turnStep);
-                } else {
-                    adjustHeading(-turnStep);
-                }
-            } else if (normalizedHeading < 180) {
-                adjustHeading(-turnStep);
+        if (normalizedHeading == 0) {
+            if (lastHeading < 180) {
+                adjustHeading(-TURN_STEP);
             } else {
-                adjustHeading(turnStep);
+                adjustHeading(TURN_STEP);
             }
+        } else if (normalizedHeading == 180) {
+            if (lastHeading < 180) {
+                adjustHeading(TURN_STEP);
+            } else {
+                adjustHeading(-TURN_STEP);
+            }
+        } else if (normalizedHeading < 180) {
+            adjustHeading(-TURN_STEP);
+        } else {
+            adjustHeading(TURN_STEP);
         }
     }
 
     public void turnDownwind() {
         disableAutoPilot();
         Double normalizedHeading = normalizeHeading();
-        if (continuouslyTurning) {
-            adjustHeading(-turnStep);
-        } else {
-            if (normalizedHeading == 0) {
-                if (lastHeading < 180) {
-                    adjustHeading(turnStep);
-                } else {
-                    adjustHeading(-turnStep);
-                }
-            } else if (normalizedHeading == 180) {
-                if (lastHeading < 180) {
-                    adjustHeading(-turnStep);
-                } else {
-                    adjustHeading(turnStep);
-                }
-            } else if (normalizedHeading < 180) {
-                adjustHeading(turnStep);
+        if (normalizedHeading == 0) {
+            if (lastHeading < 180) {
+                adjustHeading(TURN_STEP);
             } else {
-                adjustHeading(-turnStep);
+                adjustHeading(-TURN_STEP);
             }
+        } else if (normalizedHeading == 180) {
+            if (lastHeading < 180) {
+                adjustHeading(-TURN_STEP);
+            } else {
+                adjustHeading(TURN_STEP);
+            }
+        } else if (normalizedHeading < 180) {
+            adjustHeading(TURN_STEP);
+        } else {
+            adjustHeading(-TURN_STEP);
         }
     }
 
@@ -288,7 +253,7 @@ public class ServerYacht {
 
             // Take optimal heading and turn into a boat heading rather than a wind heading.
             optimalHeading =
-                (optimalHeading + GameState.getWindDirection()) % 360;
+                optimalHeading + GameState.getWindDirection();
 
             setAutoPilot(optimalHeading);
         }
@@ -303,9 +268,9 @@ public class ServerYacht {
     private void turnTowardsHeading(Double newHeading) {
         Double newVal = heading - newHeading;
         if (Math.floorMod(newVal.longValue(), 360L) > 180) {
-            adjustHeading(turnStep  / 5);
+            adjustHeading(TURN_STEP / 5);
         } else {
-            adjustHeading(-turnStep / 5);
+            adjustHeading(-TURN_STEP / 5);
         }
     }
 
@@ -456,43 +421,4 @@ public class ServerYacht {
         return boatColor;
     }
 
-    public void setBoatType(BoatMeshType boatType) {
-        this.boatTypeAccelerationMultiplier = boatType.accelerationMultiplier;
-        this.boatTypeSpeedMultiplier = boatType.maxSpeedMultiplier;
-        this.boatTypeTurnStepMultiplier = boatType.turnStep;
-        this.boatType = boatType;
-    }
-
-    public Double getBoatTypeSpeedMultiplier() {
-        return boatTypeSpeedMultiplier;
-    }
-
-    public Double getBoatTypeAccelerationMultiplier() {
-        return boatTypeAccelerationMultiplier;
-    }
-
-
-    public BoatMeshType getBoatType() {
-        return boatType;
-    }
-
-    public void setContinuouslyTurning(Boolean continuouslyTurning) {
-        this.continuouslyTurning = continuouslyTurning;
-    }
-
-    public Double getPowerUpSpeedMultiplier() {
-        return powerUpSpeedMultiplier;
-    }
-
-    public void setPowerUpSpeedMultiplier(Double powerUpSpeedMultiplier) {
-        this.powerUpSpeedMultiplier = powerUpSpeedMultiplier;
-    }
-
-    public Integer getPowerUpHandlingMultiplier() {
-        return powerUpHandlingMultiplier;
-    }
-
-    public void setPowerUpHandlingMultiplier(Integer powerUpHandlingMultiplier) {
-        this.powerUpHandlingMultiplier = powerUpHandlingMultiplier;
-    }
 }

src/main/java/seng302/model/mark/CompoundMark.java

@@ -1,6 +1,6 @@
 package seng302.model.mark;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 import seng302.gameServer.messages.RoundingSide;
 import seng302.model.GeoPoint;
@@ -10,13 +10,13 @@ public class CompoundMark {
 
 	private int compoundMarkId;
 	private String name;
-	private List<Mark> marks;
+	private List<Mark> marks = new ArrayList<>();
     private GeoPoint midPoint;
 
     public CompoundMark(int markID, String name, List<Mark> marks) {
         this.compoundMarkId = markID;
         this.name = name;
-        this.marks = Collections.unmodifiableList(marks);
+        this.marks.addAll(marks);
         if (marks.size() > 1) {
             this.midPoint = GeoUtility.getDirtyMidPoint(marks.get(0), marks.get(1));
         } else {
@@ -72,6 +72,7 @@ public class CompoundMark {
                 getSubMark(1).setRoundingSide(RoundingSide.STARBOARD);
                 break;
 
+
         }
     }
 

src/main/java/seng302/model/mark/Corner.java

@@ -32,10 +32,4 @@ public class Corner {
     public Integer getZoneSize() {
         return zoneSize;
     }
-
-    @Override
-    public String toString() {
-        return "Corner = {seqID=" + seqID + ", compoundMarkID=" + compoundMarkID + ", rounding="
-            + rounding +", zoneSize=" + zoneSize + "}";
-    }
 }

src/main/java/seng302/model/mark/MarkOrder.java

@@ -1,33 +1,34 @@
 package seng302.model.mark;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.io.IOException;
+import java.io.StringReader;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import seng302.gameServer.messages.RoundingSide;
+import seng302.model.ServerYacht;
+import seng302.model.stream.xml.generator.RaceXMLTemplate;
 import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.token.Token;
+import seng302.utilities.XMLGenerator;
+import seng302.utilities.XMLParser;
+import java.util.*;
 
 /**
  * Class to hold the order of the marks in the race.
  */
 public class MarkOrder {
     private List<CompoundMark> raceMarkOrder;
-    private List<CompoundMark> orderedUniqueCompoundMarks;
     private Logger logger = LoggerFactory.getLogger(MarkOrder.class);
-    private List<Mark> allMarks;
+    private Set<Mark> allMarks;
 
-
-    public MarkOrder(RaceXMLData raceXMLData){
-        raceMarkOrder = new ArrayList<>();
-        for (Corner corner : raceXMLData.getMarkSequence()){
-            CompoundMark compoundMark = raceXMLData.getCompoundMarks().get(corner.getCompoundMarkID());
-            compoundMark.setRoundingSide(
-                RoundingSide.getRoundingSide(corner.getRounding())
-            );
-            raceMarkOrder.add(compoundMark);
-        }
-        orderedUniqueCompoundMarks = new ArrayList<>(raceXMLData.getCompoundMarks().values());
+    public MarkOrder(){
+        loadRaceProperties();
     }
 
     /**
@@ -39,11 +40,8 @@ public class MarkOrder {
             logger.warn("Race order accessed but not instantiated");
             return null;
         }
-        return Collections.unmodifiableList(raceMarkOrder);
-    }
 
-    public List<CompoundMark> getOrderedUniqueCompoundMarks() {
-        return orderedUniqueCompoundMarks;
+        return Collections.unmodifiableList(raceMarkOrder);
     }
 
     /**
@@ -76,4 +74,70 @@ public class MarkOrder {
     public CompoundMark getNextMark(Integer currentSeqID) throws IndexOutOfBoundsException {
         return raceMarkOrder.get(currentSeqID + 1);
     }
+
+    public Set<Mark> getAllMarks(){
+        return Collections.unmodifiableSet(allMarks);
+    }
+
+    /**
+     * Loads the race order from an XML string
+     * @param xml An AC35 RaceXML
+     * @return An ordered list of marks in the race
+     */
+    private List<CompoundMark> loadRaceOrderFromXML(String xml) {
+
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db;
+        Document doc;
+        allMarks = new HashSet<>();
+
+        try {
+            db = dbf.newDocumentBuilder();
+            doc = db.parse(new InputSource(new StringReader(xml)));
+        } catch (ParserConfigurationException | IOException | SAXException e) {
+            logger.error("Failed to read generated race XML");
+            return null;
+        }
+        
+        RaceXMLData data = XMLParser.parseRace(doc);
+
+        if (data != null){
+            logger.debug("Loaded RaceXML for mark order");
+            List<Corner> corners = data.getMarkSequence();
+            Map<Integer, CompoundMark> marks = data.getCompoundMarks();
+            List<CompoundMark> course = new ArrayList<>();
+            for (Corner corner : corners){
+                CompoundMark compoundMark = marks.get(corner.getCompoundMarkID());
+                compoundMark.setRoundingSide(
+                    RoundingSide.getRoundingSide(corner.getRounding())
+                );
+                course.add(compoundMark);
+                allMarks.addAll(compoundMark.getMarks());
+            }
+
+            return course;
+        }
+
+        return null;
+    }
+
+    /**
+     * Load the raceXML and mark order
+     */
+    private void loadRaceProperties(){
+        XMLGenerator generator = new XMLGenerator();
+
+        // TODO: 29/08/17 wmu16 - This is terrible, having to make a template just to receive constant data
+        generator.setRaceTemplate(new RaceXMLTemplate(
+            new ArrayList<>(),
+            new ArrayList<>()));
+
+        String raceXML = generator.getRaceAsXml();
+
+        if (raceXML == null){
+            logger.error("Failed to generate raceXML (for race properties)");
+            return;
+        }
+        raceMarkOrder = loadRaceOrderFromXML(raceXML);
+    }
 }

src/main/java/seng302/model/stream/xml/generator/RaceXMLTemplate.java

@@ -1,12 +1,10 @@
 package seng302.model.stream.xml.generator;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import seng302.model.Limit;
 import seng302.model.ServerYacht;
-import seng302.model.mark.CompoundMark;
-import seng302.model.mark.Corner;
 import seng302.model.token.Token;
 
 /**
@@ -17,22 +15,11 @@ public class RaceXMLTemplate {
     private List<ServerYacht> yachts;
     private LocalDateTime startTime;
     private List<Token> tokens;
-    private List<Corner> roundings;
-    private List<Limit> courseLimit;
-    private List<CompoundMark> course;
-    private Integer maxPlayers;
-    private Boolean tokensEnabled;
 
-    public RaceXMLTemplate(List<ServerYacht> yachts, List<Token> tokens, List<Corner> roundings,
-        List<Limit> limit, List<CompoundMark> course, Integer maxPlayers, Boolean tokensEnabled) {
+    public RaceXMLTemplate(List<ServerYacht> yachts, List<Token> tokens) {
         this.yachts = yachts;
         this.tokens = tokens;
-        this.roundings = roundings;
-        this.courseLimit = limit;
-        this.course = course;
         startTime = LocalDateTime.now();
-        this.maxPlayers = maxPlayers;
-        this.tokensEnabled = tokensEnabled;
     }
 
     /**
@@ -52,18 +39,6 @@ public class RaceXMLTemplate {
         return Collections.unmodifiableList(tokens);
     }
 
-    public List<CompoundMark> getCompoundMarks() {
-        return Collections.unmodifiableList(course);
-    }
-
-    public List<Limit> getCourseLimit() {
-        return Collections.unmodifiableList(courseLimit);
-    }
-
-    public List<Corner> getRoundings() {
-        return Collections.unmodifiableList(roundings);
-    }
-
     /**
      * Set the time until the race starts
      * @param seconds The time in seconds until the race starts
@@ -79,20 +54,4 @@ public class RaceXMLTemplate {
     public String getRaceStartTime(){
         return startTime.toString();
     }
-
-    public void setBoats(List<ServerYacht> boats) {
-        yachts = boats;
-    }
-
-    public void setTokens(List<Token> tokens) {
-        this.tokens = tokens;
-    }
-
-    public String getTokensEnabled() {
-        return tokensEnabled.toString();
-    }
-
-    public String getMaxPlayers() {
-        return maxPlayers.toString();
-    }
 }

src/main/java/seng302/model/token/Token.java

@@ -15,24 +15,11 @@ public class Token extends GeoPoint {
     private TokenType tokenType;
     private Random random = new Random();
 
-    //Constructor for creating a specific type client side
     public Token(TokenType tokenType, double lat, double lng) {
         super(lat, lng);
         this.tokenType = tokenType;
     }
 
-    //Making random type server side
-    public Token(double lat, double lng) {
-        super(lat, lng);
-        assignRandomType();
-    }
-
-    //Making random type server side
-    public Token(GeoPoint geoPoint) {
-        super(geoPoint.getLat(), geoPoint.getLng());
-        assignRandomType();
-    }
-
     public TokenType getTokenType() {
         return tokenType;
     }
@@ -53,10 +40,5 @@ public class Token extends GeoPoint {
         tokenType = tokenTypeList.get(random.nextInt(tokenTypeList.size()));
     }
 
-    /**
-     * Exists for testing purposes only
-     */
-    public void assignType(TokenType tokenType) {
-        this.tokenType = tokenType;
-    }
+
 }

src/main/java/seng302/utilities/RandomSpawn.java

@@ -1,64 +0,0 @@
-package seng302.utilities;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-import seng302.model.GeoPoint;
-import seng302.model.mark.CompoundMark;
-import seng302.model.token.Token;
-
-/**
- * A class for generating and spawning tokens in random locations
- * Created by wmu16 on 27/09/17.
- */
-public class RandomSpawn {
-
-    private static final Integer DEGREES_IN_CIRCLE = 360;
-
-    private HashMap<GeoPoint, Double> spawnRadii;
-    private Object[] spawnCentres;
-    private Random random;
-
-    /**
-     * @param markOrder this must be the ORDERED list of marks. Better yet UNIQUE to avoid over
-     * computation
-     */
-    public RandomSpawn(List<CompoundMark> markOrder) {
-        this.spawnRadii = new HashMap<>();
-        random = new Random();
-
-        spawnRadii = generateSpawnRadii(markOrder);
-        spawnCentres = spawnRadii.keySet().toArray();
-    }
-
-    private HashMap<GeoPoint, Double> generateSpawnRadii(List<CompoundMark> markOrder) {
-        HashMap<GeoPoint, Double> spawnRadii = new HashMap<>();
-        for (int i = 0; i < markOrder.size() - 1; i++) {
-            GeoPoint spawnCentre = GeoUtility.getDirtyMidPoint(
-                markOrder.get(i).getMidPoint(),
-                markOrder.get(i + 1).getMidPoint());
-
-            Double distance = GeoUtility.getDistance(spawnCentre, markOrder.get(i).getMidPoint());
-            spawnRadii.put(spawnCentre, distance);
-        }
-
-        return spawnRadii;
-    }
-
-
-    /**
-     * @return A random token type at a random location in a random radii of the set of possible
-     * radii
-     */
-    public Token getRandomToken() {
-        GeoPoint randomSpawnCentre = (GeoPoint) spawnCentres[random.nextInt(spawnCentres.length)];
-        Double spawnRadius = spawnRadii.get(randomSpawnCentre);
-        Double randomDistance = spawnRadius * random.nextDouble();
-        Double randomAngle = random.nextDouble() * DEGREES_IN_CIRCLE;
-        GeoPoint randomLocation = GeoUtility
-            .getGeoCoordinate(randomSpawnCentre, randomAngle, randomDistance);
-        return new Token(randomLocation);
-
-    }
-
-}

src/main/java/seng302/utilities/Sounds.java

@@ -14,10 +14,8 @@ public class Sounds {
     private static MediaPlayer soundEffect;
     private static MediaPlayer soundPlayer;
     private static MediaPlayer hoverSoundPlayer;
-    private static MediaPlayer crashSoundPlayer;
 
     private static boolean hoverInitialized = false;
-    private static boolean crashInitialized = false;
     private static boolean musicMuted = false;
     private static boolean soundEffectsMuted = false;
 
@@ -101,10 +99,6 @@ public class Sounds {
         musicPlayer.setCycleCount(MediaPlayer.INDEFINITE);
         musicPlayer.setVolume(0.3);
         musicPlayer.play();
-        musicPlayer.setMute(musicMuted);
-        if (soundEffect != null) {
-            soundEffect.stop();
-        }
     }
 
 
@@ -161,17 +155,11 @@ public class Sounds {
 
     public static void playCrashSound() {
         if (!soundEffectsMuted) {
-            if (!crashInitialized) {
-                Media pickupSound = new Media(
-                    Sounds.class.getClassLoader().getResource("sounds/Large-metal-door-slam.mp3")
-                        .toString());
-                crashSoundPlayer = new MediaPlayer(pickupSound);
-                crashInitialized = true;
-            }
-            if (crashSoundPlayer != null) {
-                crashSoundPlayer.stop();
-            }
-            crashSoundPlayer.play();
+            Media crashSound = new Media(
+                Sounds.class.getClassLoader().getResource("sounds/Large-metal-door-slam.mp3")
+                    .toString());
+            soundPlayer = new MediaPlayer(crashSound);
+            soundPlayer.play();
         }
     }
 
@@ -188,10 +176,10 @@ public class Sounds {
     public static void playHoverSound() {
         if (!soundEffectsMuted) {
             if (!hoverInitialized) {
-                Media hoverSound = new Media(
+                Media crashSound = new Media(
                     Sounds.class.getClassLoader().getResource("sounds/Error-sound-effect.mp3")
                         .toString());
-                hoverSoundPlayer = new MediaPlayer(hoverSound);
+                hoverSoundPlayer = new MediaPlayer(crashSound);
                 hoverInitialized = true;
             }
             hoverSoundPlayer.setVolume(0.5);

src/main/java/seng302/utilities/StreamParser.java

@@ -136,6 +136,7 @@ public class StreamParser {
         long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
         String xmlMessage = new String(
             (Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
+
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder db;

src/main/java/seng302/utilities/XMLGenerator.java

@@ -179,8 +179,4 @@ public class XMLGenerator {
     public RegattaXMLTemplate getRegatta() {
         return regatta;
     }
-
-    public RaceXMLTemplate getRace() {
-        return race;
-    }
 }

src/main/java/seng302/utilities/XMLParser.java

@@ -1,44 +1,29 @@
 package seng302.utilities;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import javafx.scene.paint.Color;
-import javafx.util.Pair;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 import seng302.model.ClientYacht;
-import seng302.model.Colors;
 import seng302.model.Limit;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
-import seng302.model.stream.xml.generator.RaceXMLTemplate;
-import seng302.model.stream.xml.generator.RegattaXMLTemplate;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.model.token.Token;
 import seng302.model.token.TokenType;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
 
 /**
  * Utilities for parsing XML documents
  */
 public class XMLParser {
 
-    private static final int MAX_PLAYERS = 8;
-
     /**
      * Returns the text content of a given child element tag, assuming it exists, as an Integer.
      *
@@ -49,7 +34,7 @@ public class XMLParser {
     private static Integer getElementInt(Element ele, String tag) {
         NodeList tagList = ele.getElementsByTagName(tag);
         if (tagList.getLength() > 0) {
-            return Integer.parseInt(tagList.item(0).getTextContent().replaceAll("\\s+",""));
+            return Integer.parseInt(tagList.item(0).getTextContent());
         } else {
             return null;
         }
@@ -81,7 +66,7 @@ public class XMLParser {
     private static Double getElementDouble(Element ele, String tag) {
         NodeList tagList = ele.getElementsByTagName(tag);
         if (tagList.getLength() > 0) {
-            return Double.parseDouble(tagList.item(0).getTextContent().replaceAll("\\s+",""));
+            return Double.parseDouble(tagList.item(0).getTextContent());
         } else {
             return null;
         }
@@ -153,27 +138,17 @@ public class XMLParser {
             Node currentBoat = boatsList.item(i);
             if (currentBoat.getNodeName().equals("Boat")) {
 //                    Boat boat = new Boat(currentBoat);
-                BoatMeshType boatMeshType;
-                try {
-                    boatMeshType = BoatMeshType.valueOf(XMLParser.getNodeAttributeString(currentBoat, "Type"));
-                } catch (IllegalArgumentException e){
-                    boatMeshType = BoatMeshType.DINGHY;
-                }
-                Color color;
-                try {
-                    color = Color.web(getNodeAttributeString(currentBoat, "Color"));
-                } catch (NullPointerException npe) {
-                    color = Colors.getColor(new Random().nextInt(8));
-                }
                 ClientYacht yacht = new ClientYacht(
-                    boatMeshType,
+                    XMLParser.getNodeAttributeString(currentBoat, "Type"),
                     XMLParser.getNodeAttributeInt(currentBoat, "SourceID"),
                     XMLParser.getNodeAttributeString(currentBoat, "HullNum"),
                     XMLParser.getNodeAttributeString(currentBoat, "ShortName"),
                     XMLParser.getNodeAttributeString(currentBoat, "BoatName"),
                     XMLParser.getNodeAttributeString(currentBoat, "Country"));
-                yacht.setColour(color);
-                competingBoats.put(yacht.getSourceId(), yacht);
+                yacht.setColour(Color.web(getNodeAttributeString(currentBoat, "Color")));
+                if (yacht.getBoatType().equals("Yacht")) {
+                    competingBoats.put(yacht.getSourceId(), yacht);
+                }
             }
         }
         return competingBoats;
@@ -199,36 +174,6 @@ public class XMLParser {
         );
     }
 
-    public static Boolean tokensEnabled(Document doc) {
-        Element docEle = doc.getDocumentElement();
-        try {
-            NamedNodeMap namedNodeMap = docEle.getElementsByTagName("Tokens").item(0).getAttributes();
-            Node node = namedNodeMap.getNamedItem("Enabled");
-            if (node != null) {
-                return Boolean.parseBoolean(node.getNodeValue());
-            }
-        } catch (NullPointerException npe) {
-            npe.printStackTrace();
-            return false;
-        }
-        return false;
-    }
-
-    public static Integer getMaxPlayers(Document doc) {
-        Element docEle = doc.getDocumentElement();
-        try {
-            NamedNodeMap namedNodeMap = docEle.getElementsByTagName("Participants").item(0).getAttributes();
-            Node node = namedNodeMap.getNamedItem("MaxPlayers");
-            if (node != null) {
-                return Integer.parseInt(node.getNodeValue());
-            }
-        } catch (NullPointerException npe) {
-            npe.printStackTrace();
-            return MAX_PLAYERS;
-        }
-        return MAX_PLAYERS;
-    }
-
     /**
      * Returns an object containing the data extracted from the given xml formatted document
      *
@@ -238,7 +183,7 @@ public class XMLParser {
     public static RaceXMLData parseRace(Document doc) {
         Element docEle = doc.getDocumentElement();
         return new RaceXMLData(
-            extractParticipantIDs(docEle),
+            extractParticpantIDs(docEle),
             extractTokens(docEle),
             extractCompoundMarks(docEle),
             extractMarkOrder(docEle),
@@ -251,20 +196,17 @@ public class XMLParser {
      */
     private static List<Token> extractTokens(Element docEle) {
         List<Token> tokens = new ArrayList<>();
-        try {
-            NodeList tokenList = docEle.getElementsByTagName("Tokens").item(0).getChildNodes();
-            for (int i = 0; i < tokenList.getLength(); i++) {
-                Node tokenNode = tokenList.item(i);
-                if (tokenNode.getNodeName().equals("Token")) {
-                    String tokenType = getNodeAttributeString(tokenNode, "TokenType");
-                    Double lat = getNodeAttributeDouble(tokenNode, "TargetLat");
-                    Double lng = getNodeAttributeDouble(tokenNode, "TargetLng");
-                    tokens.add(new Token(TokenType.valueOf(tokenType), lat, lng));
-                }
+        NodeList tokenList = docEle.getElementsByTagName("Tokens").item(0).getChildNodes();
+        for (int i = 0; i < tokenList.getLength(); i++) {
+            Node tokenNode = tokenList.item(i);
+            if (tokenNode.getNodeName().equals("Token")) {
+                String tokenType = getNodeAttributeString(tokenNode, "TokenType");
+                Double lat = getNodeAttributeDouble(tokenNode, "TargetLat");
+                Double lng = getNodeAttributeDouble(tokenNode, "TargetLng");
+                tokens.add(new Token(TokenType.valueOf(tokenType), lat, lng));
             }
-        } catch (NullPointerException npe) {
-            return new ArrayList<>();
         }
+
         return tokens;
     }
 
@@ -277,11 +219,13 @@ public class XMLParser {
         for (int i = 0; i < limitList.getLength(); i++) {
             Node limitNode = limitList.item(i);
             if (limitNode.getNodeName().equals("Limit")) {
-                courseLimit.add(new Limit(
-                    XMLParser.getNodeAttributeInt(limitNode, "SeqID"),
-                    XMLParser.getNodeAttributeDouble(limitNode, "Lat"),
-                    XMLParser.getNodeAttributeDouble(limitNode, "Lon")
-                ));
+                courseLimit.add(
+                    new Limit(
+                        XMLParser.getNodeAttributeInt(limitNode, "SeqID"),
+                        XMLParser.getNodeAttributeDouble(limitNode, "Lat"),
+                        XMLParser.getNodeAttributeDouble(limitNode, "Lon")
+                    )
+                );
             }
         }
         return courseLimit;
@@ -313,7 +257,7 @@ public class XMLParser {
     /**
      * Extracts course participants data
      */
-    private static List<Integer> extractParticipantIDs(Element docEle) {
+    private static List<Integer> extractParticpantIDs (Element docEle) {
         List<Integer> boatIDs = new ArrayList<>();
         NodeList pList = docEle.getElementsByTagName("Participants").item(0).getChildNodes();
         for (int i = 0; i < pList.getLength(); i++) {
@@ -335,11 +279,10 @@ public class XMLParser {
         for (int i = 0; i < cMarkList.getLength(); i++) {
             Node cMarkNode = cMarkList.item(i);
             if (cMarkNode.getNodeName().equals("CompoundMark")) {
-                String name = XMLParser.getNodeAttributeString(cMarkNode, "Name");
-                name = (name == null || name.equals("")) ? "Mark " + i+1: name;
                 cMark = new CompoundMark(
                     XMLParser.getNodeAttributeInt(cMarkNode, "CompoundMarkID"),
-                    name, createMarks(cMarkNode)
+                    XMLParser.getNodeAttributeString(cMarkNode, "Name"),
+                    createMarks(cMarkNode)
                 );
                 allMarks.add(cMark);
             }
@@ -360,169 +303,14 @@ public class XMLParser {
             Node markNode = childMarks.item(i);
             if (markNode.getNodeName().equals("Mark")) {
                 Integer seqID = XMLParser.getNodeAttributeInt(markNode, "SeqID");
-                seqID = (seqID == null) ? i+1 : seqID;
-
                 Integer sourceID = XMLParser.getNodeAttributeInt(markNode, "SourceID");
-                sourceID = (sourceID == null) ? i+1 : sourceID;
-
                 String markName = XMLParser.getNodeAttributeString(markNode, "Name");
-                markName = (markName == null || markName.equals("")) ? cMarkName + " " + i+1: markName;
-
                 Double targetLat = XMLParser.getNodeAttributeDouble(markNode, "TargetLat");
                 Double targetLng = XMLParser.getNodeAttributeDouble(markNode, "TargetLng");
-
                 Mark mark = new Mark(markName, seqID, targetLat, targetLng, sourceID);
                 subMarks.add(mark);
             }
         }
         return subMarks;
     }
-
-    /**
-     * This ungodly combination of existing methods and code blocks parses a race definition file.
-     * Look upon it and despair.
-     * @param url The input file path
-     * @param serverName the name of the server
-     * @param repetitions the repetitions of a segment of the race def file.
-     * @param maxPlayers max number of players. uses the default race max if null or greater than the actual max.
-     * @param tokensEnabled if tokens are enabled
-     * @return a pair which contains regatta string, race string as key, value pair.
-     */
-    public static Pair<RegattaXMLTemplate, RaceXMLTemplate> parseRaceDef(
-            String url, String serverName, Integer repetitions, Integer maxPlayers, Boolean tokensEnabled
-    ) {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db;
-        Document doc = null;
-        try {
-            db = dbf.newDocumentBuilder();
-            doc = db.parse(XMLParser.class.getResourceAsStream(url));
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            e.printStackTrace();
-        }
-        Element docEle = doc.getDocumentElement();
-
-        RegattaXMLTemplate regattaXMLTemplate = new RegattaXMLTemplate(
-            serverName, XMLParser.getElementString(docEle, "CourseName"),
-            XMLParser.getElementDouble(docEle, "CentralLat"),
-            XMLParser.getElementDouble(docEle, "CentralLng")
-        );
-
-        XMLGenerator xmlGenerator = new XMLGenerator();
-        xmlGenerator.setRegattaTemplate(regattaXMLTemplate);
-
-        if (maxPlayers == null) {
-            maxPlayers = XMLParser.getElementInt(docEle, "MaxPlayers");
-        } else if (maxPlayers > XMLParser.getElementInt(docEle, "MaxPlayers")) {
-            maxPlayers = XMLParser.getElementInt(docEle, "MaxPlayers");
-        }
-
-        RaceXMLTemplate raceXMLTemplate = new RaceXMLTemplate(
-            new ArrayList<>(), new ArrayList<>(),
-            XMLParser.extractMarkOrderRaceDef(docEle, repetitions),
-            XMLParser.extractCourseLimitRaceDef(docEle),
-            XMLParser.extractCompoundMarksRaceDef(docEle),
-            maxPlayers, tokensEnabled
-        );
-        xmlGenerator.setRaceTemplate(raceXMLTemplate);
-        return new Pair<>(regattaXMLTemplate, raceXMLTemplate);
-    }
-
-    private static List<Corner> extractMarkOrderRaceDef(Element docEle, int repitions){
-        List<Corner> compoundMarkSequence = new ArrayList<>();
-        NodeList cornerList = docEle.getElementsByTagName("Course").item(0).getChildNodes();
-
-        int seqId = 1;
-        final int zoneSize = 3;
-
-        for (int i=0; i<cornerList.getLength(); i++) {
-            Node segment = cornerList.item(i);
-            if (segment.getNodeName().equals("OpeningSegment") ||
-                segment.getNodeName().equals("ClosingSegment")) {
-
-                seqId = parseCourseSegment(segment, seqId, compoundMarkSequence);
-
-            } else if (segment.getNodeName().equals("RepeatingSegment")) {
-                for (int k = 0; k < repitions; k++) {
-                    seqId = parseCourseSegment(segment, seqId, compoundMarkSequence);
-                }
-            }
-        }
-        return compoundMarkSequence;
-    }
-
-    /**
-     * Parses a segment of the course adding new Corners to the given list.
-     * @param segment Segment to parse
-     * @param seqID initial sequence ID
-     * @param course course to add corners to
-     * @return the last sequence id.
-     */
-    private static int parseCourseSegment(Node segment, int seqID, List<Corner> course) {
-        NodeList segmentList = segment.getChildNodes();
-        for (int j = 0; j < segmentList.getLength(); j++) {
-            Node corner = segmentList.item(j);
-            if (corner.getNodeName().equals("Corner")) {
-                String rounding = XMLParser.getNodeAttributeString(corner, "Rounding");
-                rounding = //Converting "P" to "Port" and "S" to "Stbd"
-                    rounding.equals("P") ? "Port" :
-                    rounding.equals("S") ? "Stbd" : rounding;
-                course.add(new Corner(
-                    seqID++, XMLParser.getNodeAttributeInt(corner, "CompoundMarkID"),
-                    rounding, 3
-                ));
-            }
-        }
-        return seqID;
-    }
-
-    private static List<Limit> extractCourseLimitRaceDef(Element docEle) {
-        List<Limit> courseLimit = new ArrayList<>();
-        NodeList limitList = docEle.getElementsByTagName("CourseLimit").item(0).getChildNodes();
-        int seqId = 1;
-        for (int i = 0; i < limitList.getLength(); i++) {
-            Node limitNode = limitList.item(i);
-            if (limitNode.getNodeName().equals("Limit")) {
-                courseLimit.add(new Limit(
-                    seqId++, XMLParser.getNodeAttributeDouble(limitNode, "Lat"),
-                    XMLParser.getNodeAttributeDouble(limitNode, "Lng")
-                ));
-            }
-        }
-        return courseLimit;
-    }
-
-    private static List<CompoundMark> extractCompoundMarksRaceDef(Element docEle){
-        List<CompoundMark> allMarks = new ArrayList<>();
-        NodeList cMarkList = docEle.getElementsByTagName("Marks").item(0).getChildNodes();
-        CompoundMark cMark;
-        int markCount = 200;
-        for (int i = 0; i < cMarkList.getLength(); i++) {
-            Node cMarkNode = cMarkList.item(i);
-            if (cMarkNode.getNodeName().equals("CompoundMark")) {
-                Integer id = XMLParser.getNodeAttributeInt(cMarkNode, "CompoundMarkID");
-                List<Mark> subMarks = createMarksRaceDef(cMarkNode, markCount,"Mark " + id);
-                markCount += subMarks.size();
-                allMarks.add(new CompoundMark(id, "Mark " + id, subMarks));
-            }
-        }
-        return allMarks;
-    }
-
-    private static List<Mark> createMarksRaceDef(Node compoundMark, int markCount, String markName) {
-        List<Mark> subMarks = new ArrayList<>();
-        NodeList childMarks = compoundMark.getChildNodes();
-        int seqID = 1;
-        for (int i = 0; i < childMarks.getLength(); i++) {
-            Node markNode = childMarks.item(i);
-            if (markNode.getNodeName().equals("Mark")) {
-                Double targetLat = XMLParser.getNodeAttributeDouble(markNode, "Lat");
-                Double targetLng = XMLParser.getNodeAttributeDouble(markNode, "Lng");
-                Mark mark = new Mark(markName + " subMark " + seqID, seqID, targetLat, targetLng, markCount++);
-                subMarks.add(mark);
-                seqID += 1;
-            }
-        }
-        return subMarks;
-    }
 }

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -14,7 +14,6 @@ import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
-import javafx.util.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.messages.BoatAction;
@@ -26,15 +25,8 @@ import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.gameServer.messages.Message;
 import seng302.gameServer.messages.RegistrationRequestMessage;
 import seng302.gameServer.messages.RegistrationResponseStatus;
-import seng302.gameServer.messages.XMLMessage;
-import seng302.gameServer.messages.XMLMessageSubType;
 import seng302.model.stream.packets.PacketType;
 import seng302.model.stream.packets.StreamPacket;
-import seng302.model.stream.xml.generator.RaceXMLTemplate;
-import seng302.model.stream.xml.generator.RegattaXMLTemplate;
-import seng302.utilities.XMLGenerator;
-import seng302.utilities.XMLParser;
-
 
 /**
  * A class describing a single connection to a Server for the purposes of sending and receiving on
@@ -42,8 +34,6 @@ import seng302.utilities.XMLParser;
  */
 public class ClientToServerThread implements Runnable {
 
-    private boolean isStarted = false;
-
     /**
      * Functional interface for receiving packets from client socket.
      */
@@ -54,12 +44,7 @@ public class ClientToServerThread implements Runnable {
 
     @FunctionalInterface
     public interface DisconnectedFromHostListener {
-        void notifyDisconnection(String message);
-    }
-
-    @FunctionalInterface
-    public interface ConnectionErrorListener {
-        void notifyConnectionError(String message);
+        void notifYDisconnection (String message);
     }
 
     private class ByteReadException extends Exception {
@@ -71,7 +56,6 @@ public class ClientToServerThread implements Runnable {
     private Queue<StreamPacket> streamPackets = new ConcurrentLinkedQueue<>();
     private List<ClientSocketListener> listeners = new ArrayList<>();
     private List<DisconnectedFromHostListener> disconnectionListeners = new ArrayList<>();
-    private ConnectionErrorListener connectionErrorListener = null;
     private Thread thread;
 
     private Socket socket;
@@ -84,7 +68,7 @@ public class ClientToServerThread implements Runnable {
     private Timer upWindPacketTimer = new Timer();
     private Timer downWindPacketTimer = new Timer();
     private boolean upwindTimerFlag = false, downwindTimerFlag = false;
-    public static final int PACKET_SENDING_INTERVAL_MS = 100;
+    static public final int PACKET_SENDING_INTERVAL_MS = 100;
 
     private int clientId = -1;
 
@@ -119,8 +103,6 @@ public class ClientToServerThread implements Runnable {
      * variable is false.
      */
     public void run() {
-        isStarted = true;
-
         int sync1;
         int sync2;
         // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
@@ -151,10 +133,8 @@ public class ClientToServerThread implements Runnable {
                             else {
                                 if (clientId == -1) continue; // Do not continue if not registered
                                 streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
-                                synchronized (this) {
-                                    for (ClientSocketListener csl : listeners)
-                                        csl.newPacket();
-                                }
+                                for (ClientSocketListener csl : listeners)
+                                    csl.newPacket();
                             }
                         }
                     } else {
@@ -170,13 +150,6 @@ public class ClientToServerThread implements Runnable {
         logger.warn("Closed connection to server", 1);
         notifyDisconnectListeners("Connection to server was terminated");
         closeSocket();
-
-        //thread.interrupt();
-
-//        Platform.runLater(() -> {
-//            ViewManager.getInstance().showErrorSnackBar("Server rejected connection.");
-//            ViewManager.getInstance().goToStartView();
-//        });
     }
 
     public void sendCustomizationRequest(CustomizeRequestType reqType, byte[] payload) {
@@ -193,22 +166,16 @@ public class ClientToServerThread implements Runnable {
     private void notifyDisconnectListeners (String message) {
         if (socketOpen) {
             for (DisconnectedFromHostListener listener : disconnectionListeners) {
-                listener.notifyDisconnection(message);
+                listener.notifYDisconnection(message);
             }
         }
     }
 
-    private void handleConnectionError(String message){
-        if (connectionErrorListener != null){
-            connectionErrorListener.notifyConnectionError(message);
-        }
-    }
-
     /**
      * Sends a request to the server asking for a source ID
      */
     private void sendRegistrationRequest() {
-        RegistrationRequestMessage requestMessage = new RegistrationRequestMessage(ClientType.PLAYER, clientId);
+        RegistrationRequestMessage requestMessage = new RegistrationRequestMessage(ClientType.PLAYER);
 
         try {
             os.write(requestMessage.getBuffer());
@@ -224,8 +191,9 @@ public class ClientToServerThread implements Runnable {
      * @param packet The registration requests packet
      */
     private void processRegistrationResponse(StreamPacket packet){
-        int sourceId = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 0, 4));
+        int sourceId = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 0, 3));
         int statusCode = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 4,5));
+
         RegistrationResponseStatus status = RegistrationResponseStatus.getResponseStatus(statusCode);
 
         if (status.equals(RegistrationResponseStatus.SUCCESS_PLAYING)){
@@ -243,10 +211,8 @@ public class ClientToServerThread implements Runnable {
         else{
             alertErrorText = "Could not connect to server";
         }
-        handleConnectionError("Server no longer available.");
         notifyDisconnectListeners(alertErrorText);
-
-        System.out.println();
+        closeSocket();
     }
 
     /**
@@ -277,7 +243,7 @@ public class ClientToServerThread implements Runnable {
                         new TimerTask() {
                             @Override
                             public void run() {
-                                sendBoatActionMessage(new BoatActionMessage(BoatAction.DOWNWIND, clientId));
+                                sendBoatActionMessage(new BoatActionMessage(BoatAction.DOWNWIND));
                             }
                         }, 0, PACKET_SENDING_INTERVAL_MS
                     );
@@ -290,14 +256,14 @@ public class ClientToServerThread implements Runnable {
                         new TimerTask() {
                             @Override
                             public void run() {
-                                sendBoatActionMessage(new BoatActionMessage(BoatAction.UPWIND, clientId));
+                                sendBoatActionMessage(new BoatActionMessage(BoatAction.UPWIND));
                             }
                         }, 0, PACKET_SENDING_INTERVAL_MS
                     );
                 }
                 break;
             default:
-                sendBoatActionMessage(new BoatActionMessage(actionType, clientId));
+                sendBoatActionMessage(new BoatActionMessage(actionType));
                 break;
         }
     }
@@ -353,9 +319,7 @@ public class ClientToServerThread implements Runnable {
     }
 
     public void addStreamObserver (ClientSocketListener streamListener) {
-        synchronized (this){
-            listeners.add(streamListener);
-        }
+        listeners.add(streamListener);
     }
 
     public void removeStreamObserver (ClientSocketListener streamListener) {
@@ -363,21 +327,11 @@ public class ClientToServerThread implements Runnable {
     }
 
     public void addDisconnectionListener (DisconnectedFromHostListener listener) {
-        synchronized (this){
-            disconnectionListeners.add(listener);
-        }
+        disconnectionListeners.add(listener);
     }
 
     public void removeDisconnectionListener (DisconnectedFromHostListener listener) {
-        synchronized (this){
-            disconnectionListeners.remove(listener);
-        }
-    }
-
-    public void setConnectionErrorListener(ConnectionErrorListener listener){
-        synchronized (this){
-            connectionErrorListener = listener;
-        }
+        disconnectionListeners.remove(listener);
     }
 
     private int readByte() throws ByteReadException {
@@ -392,9 +346,8 @@ public class ClientToServerThread implements Runnable {
         }
         if (currentByte == -1) {
             notifyDisconnectListeners("Cannot read from server.");
-            logger.warn("InputStream reach end of stream", 1);
-            handleConnectionError("Could not connect to server. Server is no longer available.");
             closeSocket();
+            logger.warn("InputStream reach end of stream", 1);
         }
         return currentByte;
     }
@@ -416,29 +369,4 @@ public class ClientToServerThread implements Runnable {
     public int getClientId () {
         return clientId;
     }
-
-    public void sendXML(String path, String serverName, Integer legRepeats, Integer maxPlayers, Boolean tokensEnabled) {
-        Pair<RegattaXMLTemplate, RaceXMLTemplate> regattaRace = XMLParser.parseRaceDef(
-            path, serverName, legRepeats, maxPlayers, tokensEnabled
-        );
-        XMLGenerator xmlGenerator = new XMLGenerator();
-        xmlGenerator.setRegattaTemplate(regattaRace.getKey());
-        xmlGenerator.setRaceTemplate(regattaRace.getValue());
-        String regatta = xmlGenerator.getRegattaAsXml();
-        String race = xmlGenerator.getRaceAsXml();
-        sendByteBuffer(
-            new XMLMessage(
-                regatta, XMLMessageSubType.REGATTA, regatta.length()
-            ).getBuffer()
-        );
-        sendByteBuffer(
-            new XMLMessage(
-                race, XMLMessageSubType.RACE, race.length()
-            ).getBuffer()
-        );
-    }
-
-    public boolean hasStarted() {
-        return isStarted;
-    }
 }

src/main/java/seng302/visualiser/GameClient.java

@@ -5,17 +5,20 @@ import java.text.SimpleDateFormat;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import java.util.Timer;
-import java.util.TimerTask;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.paint.Color;
+import javafx.scene.layout.Pane;
 import javafx.util.Pair;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
@@ -25,8 +28,6 @@ import seng302.gameServer.messages.BoatAction;
 import seng302.gameServer.messages.BoatStatus;
 import seng302.gameServer.messages.YachtEventType;
 import seng302.model.ClientYacht;
-import seng302.model.GameKeyBind;
-import seng302.model.KeyAction;
 import seng302.model.RaceState;
 import seng302.model.stream.packets.StreamPacket;
 import seng302.model.stream.parser.MarkRoundingData;
@@ -44,7 +45,6 @@ import seng302.utilities.XMLParser;
 import seng302.visualiser.controllers.LobbyController;
 import seng302.visualiser.controllers.RaceViewController;
 import seng302.visualiser.controllers.ViewManager;
-import seng302.visualiser.controllers.dialogs.PopupDialogController;
 
 /**
  * This class is a client side instance of a yacht racing game in JavaFX. The game is instantiated
@@ -52,6 +52,7 @@ import seng302.visualiser.controllers.dialogs.PopupDialogController;
  */
 public class GameClient {
 
+    private Pane holderPane;
     private ClientToServerThread socketThread;
     private MainServerThread server;
 
@@ -66,16 +67,15 @@ public class GameClient {
 
     private ArrayList<ClientYacht> finishedBoats = new ArrayList<>();
 
-    private GameKeyBind gameKeyBind; // all the key binding setting.
-
     private ObservableList<String> clientLobbyList = FXCollections.observableArrayList();
 
     /**
      * Create an instance of the game client. Does not do anything until run with runAsClient()
      * runAsHost().
+     * @param holder The JavaFX Pane that the visual elements for the race will be inserted into.
      */
-    public GameClient() {
-        this.gameKeyBind = GameKeyBind.getInstance();
+    public GameClient(Pane holder) {
+        this.holderPane = holder;
     }
 
     /**
@@ -83,105 +83,65 @@ public class GameClient {
      * @param ipAddress IP to connect to.
      * @param portNumber Port to connect to.
      */
-    public boolean runAsClient(String ipAddress, Integer portNumber) {
+    public void runAsClient(String ipAddress, Integer portNumber) {
         try {
             startClientToServerThread(ipAddress, portNumber);
             socketThread.addDisconnectionListener((cause) -> {
                 showConnectionError(cause);
                 tearDownConnection();
+                Platform.runLater(this::loadStartScreen);
             });
             socketThread.addStreamObserver(this::parsePackets);
 
             ViewManager.getInstance().setPlayerList(clientLobbyList);
 
-            int triesLeft = 10;
-
-            while (regattaData == null && triesLeft >= 0){
+            while (regattaData == null){
                 try {
                     Thread.sleep(100);
-                } catch (InterruptedException ignored) {
-                    ;
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
                 }
-                triesLeft--;
-            }
-
-            if (triesLeft < 1){
-                return false;
             }
 
             ViewManager.getInstance().setProperty("serverName", regattaData.getRegattaName());
             ViewManager.getInstance().setProperty("mapName", regattaData.getCourseName());
 
-            getServerThread().setConnectionErrorListener((eMessage) -> ViewManager.getInstance().showErrorSnackBar(eMessage));
-
             this.lobbyController = ViewManager.getInstance().goToLobby(true);
 
         } catch (IOException ioe) {
-            ViewManager.getInstance().showErrorSnackBar("There are no servers currently available.");
+            showConnectionError("Unable to find server");
         }
-
-        return true;
     }
 
     /**
      * Connect to a game as the host at the given address and starts the visualiser.
+     * @param ipAddress IP to connect to.
+     * @param portNumber Port to connect to.
      */
-    public ServerDescription runAsHost(
-        String serverName, Integer maxPlayers, String race,
-        Integer numLegs, Boolean tokensEnabled
-    ) {
+    public ServerDescription runAsHost(String ipAddress, Integer portNumber, String serverName, Integer maxPlayers) {
         XMLGenerator.setDefaultRaceName(serverName);
+        GameState.setMaxPlayers(maxPlayers);
 
         server = new MainServerThread();
 
-        while (!server.hasStarted()){
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
         try {
-            startClientToServerThread("localhost", server.getPortNumber());
+            startClientToServerThread(ipAddress, 4942);
         } catch (IOException e) {
             showConnectionError("Cannot connect to server as host");
         }
 
-        // Wait for C2S thread
-        while (!socketThread.hasStarted()){
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-        socketThread.sendXML(race, serverName, numLegs, maxPlayers, tokensEnabled);
-
-        int triesLeft = 15;
-
-        while (regattaData == null && triesLeft > 0){
+        while (regattaData == null){
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            triesLeft--;
-        }
-
-        if (triesLeft <= 0){
-            showConnectionError("Could not launch server");
-            return null;
         }
 
         this.lobbyController = ViewManager.getInstance().goToLobby(false);
 
-        lobbyController.setPortNumber(""+server.getPortNumber());
-
         ViewManager.getInstance().setPlayerList(clientLobbyList);
-        return new ServerDescription(serverName, regattaData.getCourseName(), GameState.getNumberOfPlayers(), GameState.getCapacity(),
-            "localhost", server.getPortNumber());
+        return new ServerDescription(serverName, regattaData.getCourseName(), GameState.getNumberOfPlayers(), GameState.getCapacity(), ipAddress, 4942);
     }
 
     private void tearDownConnection() {
@@ -192,15 +152,23 @@ public class GameClient {
         }
     }
 
+    private void loadStartScreen() {
+        FXMLLoader fxmlLoader = new FXMLLoader(
+            getClass().getResource("/views/StartScreenView.fxml"));
+        try {
+            holderPane.getChildren().clear();
+            holderPane.getChildren().add(fxmlLoader.load());
+        } catch (IOException e) {
+            showConnectionError("JavaFX crashed. Please restart the app");
+        }
+    }
 
     private void showConnectionError (String message) {
         Platform.runLater(() -> {
-            PopupDialogController controller = ViewManager.getInstance().showPopupDialog();
-            controller.setHeader("Oops");
-            controller.setContent(message);
-            controller.setOptionButtonText("GO HOME");
-            controller
-                .setOptionButtonEventHandler(event -> ViewManager.getInstance().goToStartView());
+            Alert alert = new Alert(AlertType.ERROR);
+            alert.setHeaderText("Connection Error");
+            alert.setContentText(message);
+            alert.showAndWait();
         });
     }
 
@@ -284,12 +252,10 @@ public class GameClient {
                 case CHATTER_TEXT:
                     Pair<Integer, String> playerIdMessagePair = StreamParser
                         .extractChatterText(packet);
-                    if (playerIdMessagePair != null) {
-                        raceView.updateChatHistory(
-                            allBoatsMap.get(playerIdMessagePair.getKey()).getColour(),
-                            playerIdMessagePair.getValue()
-                        );
-                    }
+                    raceView.updateChatHistory(
+                        allBoatsMap.get(playerIdMessagePair.getKey()).getColour(),
+                        playerIdMessagePair.getValue()
+                    );
             }
         }
     }
@@ -300,14 +266,12 @@ public class GameClient {
 
             ClientYacht player = allBoatsMap.get(socketThread.getClientId());
             raceView.loadRace(allBoatsMap, courseData, raceState, player);
-            raceView.showView();
+
             raceView.getSendPressedProperty().addListener((obs, old, isPressed) -> {
                 if (isPressed) {
                     formatAndSendChatMessage(raceView.readChatInput());
                 }
             });
-            gameKeyBind.toggleTurningMode();
-            sendToggleTurningModePacket(); // notify the server about player's steering mode
         }
     }
 
@@ -326,6 +290,8 @@ public class GameClient {
                     positionData.getLon(), positionData.getHeading(),
                     positionData.getGroundSpeed());
             }
+        } else if (positionData.getType() == DeviceType.MARK_TYPE) {
+            //CompoundMark mark = courseData.getCompoundMarks().get(positionData.getDeviceId());
         }
     }
 
@@ -363,17 +329,21 @@ public class GameClient {
                 ClientYacht clientYacht = allBoatsMap.get((int) boatData[0]);
                 clientYacht.setEstimateTimeTillNextMark(raceState.getRaceTime() - boatData[1]);
                 clientYacht.setEstimateTimeAtFinish(boatData[2]);
+//                int legNumber = (int) boatData[3];
                 clientYacht.setBoatStatus((int) boatData[4]);
+//                if (legNumber != clientYacht.getLegNumber()) {
+//                    clientYacht.setLegNumber(legNumber);
+//                }
             }
 
-            if (raceFinished && !raceState.getRaceFinished()) {
-                raceState.setRaceFinished();
-                Sounds.playFinishSound();
+            if (raceFinished) {
                 raceViewController.showFinishDialog(finishedBoats);
-//                close();
-//                ViewManager.getInstance().getGameClient().stopGame();
+                Sounds.playFinishSound();
+                close();
+                ViewManager.getInstance().getGameClient().stopGame();
                 //loadFinishScreenView();
             }
+            raceState.setRaceFinished();
         }
     }
 
@@ -384,6 +354,10 @@ public class GameClient {
         }
     }
 
+    private void close() {
+        socketThread.setSocketToClose();
+    }
+
     /**
      * Handle the key-pressed event from the text field.
      * @param e The key event triggering this call
@@ -395,16 +369,16 @@ public class GameClient {
             }
             return;
         }
-
-        if (gameKeyBind.getKeyCode(KeyAction.VMG) == e.getCode()) { // align with vmg
-            socketThread.sendBoatAction(BoatAction.VMG);
-        } else if (gameKeyBind.getKeyCode(KeyAction.UPWIND) == e.getCode()) { // upwind
-            socketThread.sendBoatAction(BoatAction.UPWIND);
-        } else if (gameKeyBind.getKeyCode(KeyAction.DOWNWIND) == e.getCode()) { // downwind
-            socketThread.sendBoatAction(BoatAction.DOWNWIND);
-        } else if (gameKeyBind.getKeyCode(KeyAction.TACK_GYBE) == e.getCode()) { // tack/gybe
-            // if chat box is active take whatever is in there and send it to server
-            socketThread.sendBoatAction(BoatAction.TACK_GYBE);
+        switch (e.getCode()) {
+            case SPACE: // align with vmg
+                socketThread.sendBoatAction(BoatAction.VMG); break;
+            case PAGE_UP: // upwind
+                socketThread.sendBoatAction(BoatAction.UPWIND); break;
+            case PAGE_DOWN: // downwind
+                socketThread.sendBoatAction(BoatAction.DOWNWIND); break;
+            case ENTER: // tack/gybe
+                // if chat box is active take whatever is in there and send it to server
+                socketThread.sendBoatAction(BoatAction.TACK_GYBE); break;
         }
     }
 
@@ -413,17 +387,15 @@ public class GameClient {
         if (raceView.isChatInputFocused()) {
             return;
         }
-
-        if (gameKeyBind.getKeyCode(KeyAction.SAILS_STATE) == e.getCode()) {  // sails in/sails out
-            if (allBoatsMap.get(socketThread.getClientId()).getSailIn()) {
-                socketThread.sendBoatAction(BoatAction.SAILS_OUT);
-            } else {
+        switch (e.getCode()) {
+            //TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet)
+            case SHIFT:  // sails in/sails out
                 socketThread.sendBoatAction(BoatAction.SAILS_IN);
-            }
-            allBoatsMap.get(socketThread.getClientId()).toggleSail();
-        } else if (gameKeyBind.getKeyCode(KeyAction.UPWIND) == e.getCode()
-            || gameKeyBind.getKeyCode(KeyAction.DOWNWIND) == e.getCode()) {
-            socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING);
+                allBoatsMap.get(socketThread.getClientId()).toggleSail();
+                break;
+            case PAGE_UP:
+            case PAGE_DOWN:
+                socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break;
         }
     }
 
@@ -438,16 +410,9 @@ public class GameClient {
      * @param yachtEventData The YachtEvent data packet
      */
     private void processYachtEvent(YachtEventData yachtEventData) {
-        ClientYacht thisYacht = allBoatsMap.get(yachtEventData.getSubjectId().intValue());
-
         if (yachtEventData.getEventId() == YachtEventType.COLLISION.getCode()) {
-            showCollisionAlert(thisYacht);
-        } else if (yachtEventData.getEventId() == YachtEventType.POWER_DOWN.getCode()) {
-            thisYacht.powerDown();
-            Sounds.playTokenPickupSound();  // TODO: 23/09/17 This should be power down sound
-        } else if (yachtEventData.getEventId() == YachtEventType.BUMPER_CRASH.getCode()) {
-            showDisableAlert(thisYacht);
-        } else {        //Else all token pickup types
+            showCollisionAlert(yachtEventData);
+        } else {
             TokenType tokenType = null;
             if (yachtEventData.getEventId() == YachtEventType.TOKEN_VELOCITY.getCode()) {
                 tokenType = TokenType.BOOST;
@@ -461,36 +426,36 @@ public class GameClient {
                 tokenType = TokenType.WIND_WALKER;
             }
 
-            Sounds.playTokenPickupSound();
-            thisYacht.setPowerUp(tokenType);
+            showTokenPickUp(tokenType);
+            allBoatsMap.get(yachtEventData.getSubjectId().intValue()).setPowerUp(tokenType);
         }
     }
 
-
-    /**
-     * Turns a disabled boat black until the bumper affect wears off
-     *
-     * @param yacht The yacht to show as disabled
-     */
-    private void showDisableAlert(ClientYacht yacht) {
-        Color originalColor = yacht.getColour();
-        yacht.setColour(Color.BLACK);
-
-        Timer disableTimer = new Timer("Disable Timer");
-        disableTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                yacht.setColour(originalColor);
-            }
-        }, GameState.BUMPER_DISABLE_TIME);
-    }
-
     /**
      * Tells race view to show a collision animation.
      */
-    private void showCollisionAlert(ClientYacht yacht) {
+    private void showCollisionAlert(YachtEventData yachtEventData) {
         Sounds.playCrashSound();
-        raceState.storeCollision(yacht);
+        raceState.storeCollision(
+            allBoatsMap.get(
+                yachtEventData.getSubjectId().intValue()
+            )
+        );
+    }
+
+    // TODO: 11/09/17 wmu16 - Add in functionality to viually indicate a pickup to a user
+    private void showTokenPickUp(TokenType tokenType) {
+        Sounds.playTokenPickupSound();
+        switch (tokenType) {
+            case BOOST:
+                break;
+            case HANDLING:
+                break;
+            case WIND_WALKER:
+                break;
+            case BUMPER:
+                break;
+        }
     }
 
     private void formatAndSendChatMessage(String rawChat) {
@@ -510,6 +475,10 @@ public class GameClient {
         return socketThread;
     }
 
+    public List<String> getPlayerNames(){
+        return Collections.unmodifiableList(clientLobbyList.sorted());
+    }
+
     public void stopGame() {
         GameState.setCurrentStage(GameStages.CANCELLED);
         if (server != null) server.terminate();
@@ -521,14 +490,4 @@ public class GameClient {
     public Map<Integer, ClientYacht> getAllBoatsMap() {
         return allBoatsMap;
     }
-
-    public void sendToggleTurningModePacket() {
-        if (socketThread != null) {
-            if (gameKeyBind.isContinuouslyTurning()) {
-                socketThread.sendBoatAction(BoatAction.CONTINUOUSLY_TURNING);
-            } else {
-                socketThread.sendBoatAction(BoatAction.DEFAULT_TURNING);
-            }
-        }
-    }
 }

src/main/java/seng302/visualiser/GameView.java

@@ -1,64 +1,443 @@
 package seng302.visualiser;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import seng302.model.ClientYacht;
+import javafx.application.Platform;
+import javafx.collections.ObservableList;
+import javafx.geometry.Point2D;
+import javafx.scene.*;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Polygon;
+import seng302.gameServer.messages.RoundingSide;
+import seng302.model.GeoPoint;
 import seng302.model.Limit;
-import seng302.model.ScaledPoint;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
-import seng302.utilities.Sounds;
-import seng302.visualiser.fxObjects.Marker;
+import seng302.utilities.GeoUtility;
+import seng302.visualiser.fxObjects.MarkArrowFactory;
+import seng302.visualiser.fxObjects.assets_2D.*;
+
+import java.util.*;
 
 /**
- * Abstract class for keeping functionality common between race visualisation.
+ * Created by cir27 on 20/07/17.
  */
-public abstract class GameView {
+public class GameView extends Pane {
 
-    double canvasWidth, canvasHeight;
-    ScaledPoint scaledPoint;
+    private double bufferSize = 50;
+    private double horizontalBuffer = 0;
 
-    List<Limit> borderPoints;
-    Group gameObjects = new Group();
-    Group markers = new Group();
-    Group tokens = new Group();
-    List<CompoundMark> course = new ArrayList<>();
-    List<CompoundMark> compoundMarks = new ArrayList<>();
-    List<Corner> courseOrder = new ArrayList<>();
-    HashMap<Mark, Marker> markerObjects = new HashMap<>();
+    private double canvasWidth = 1100;
+    private double canvasHeight = 920;
+    private boolean horizontalInversion = false;
 
-    public abstract Node getAssets();
-    public abstract void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence);
-    public abstract void updateBorder(List<Limit> border);
+    private double distanceScaleFactor;
+    private ScaleDirection scaleDirection;
+    private GeoPoint minLatPoint, minLonPoint, maxLatPoint, maxLonPoint;
+    private double referencePointX, referencePointY;
 
-    void updateMarkArrows (ClientYacht yacht, int legNumber) {
-        CompoundMark compoundMark;
-        if (legNumber - 1 >= 0 && legNumber-1 < course.size()) {
-            Sounds.playMarkRoundingSound();
-            compoundMark = course.get(legNumber-1);
-            for (Mark mark : compoundMark.getMarks()) {
-                markerObjects.get(mark).showNextExitArrow();
-            }
-        }
-        CompoundMark nextMark = null;
-        if (legNumber < course.size()) {
-            Sounds.playMarkRoundingSound();
-            nextMark = course.get(legNumber);
-            for (Mark mark : nextMark.getMarks()) {
-                markerObjects.get(mark).showNextEnterArrow();
-            }
-        }
-        if (legNumber - 2 >= 0) {
-            CompoundMark lastMark = course.get(Math.max(0, legNumber - 2));
-            if (lastMark != nextMark) {
-                for (Mark mark : lastMark.getMarks()) {
-                    markerObjects.get(mark).hideAllArrows();
+    private Polygon raceBorder = new CourseBoundary();
+
+    /* Note that if either of these is null then values for it have not been added and the other
+       should be used as the limits of the map. */
+    private List<Limit> borderPoints;
+    private Map<Mark, Marker2D> markerObjects;
+
+    private ObservableList<Node> gameObjects;
+    private Group markers = new Group();
+    private Group tokens = new Group();
+    private List<CompoundMark> course = new ArrayList<>();
+
+    private ImageView mapImage = new ImageView();
+
+    private enum ScaleDirection {
+        HORIZONTAL,
+        VERTICAL
+    }
+
+    public GameView () {
+        gameObjects = this.getChildren();
+        gameObjects.addAll(mapImage, raceBorder, markers, tokens);
+    }
+
+    /**
+     * Adds a course to the GameView. The view is scaled accordingly unless a border is set in which
+     * case the course is added relative ot the border.
+     *
+     * @param newCourse the mark objects that make up the course.
+     * @param sequence The sequence the marks travel through
+     */
+    public void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence) {
+        markerObjects = new HashMap<>();
+
+        for (Corner corner : sequence) { //Makes course out of all compound marks.
+            for (CompoundMark compoundMark : newCourse) {
+                if (corner.getCompoundMarkID() == compoundMark.getId()) {
+                    course.add(compoundMark);
                 }
             }
         }
+
+        // TODO: 16/08/17 Updating mark roundings here. It should not happen here. Nor should it be done this way.
+        for (Corner corner : sequence){
+            CompoundMark compoundMark = course.get(corner.getSeqID() - 1);
+            compoundMark.setRoundingSide(
+                RoundingSide.getRoundingSide(corner.getRounding())
+            );
+        }
+
+        final List<Gate> gates = new ArrayList<>();
+        Paint colour = Color.BLACK;
+        //Creates new markers
+        for (CompoundMark cMark : newCourse) {
+            //Set start and end colour
+            if (cMark.getId() == sequence.get(0).getCompoundMarkID()) {
+                colour = Color.GREEN;
+            } else if (cMark.getId() == sequence.get(sequence.size() - 1).getCompoundMarkID()) {
+                colour = Color.RED;
+            }
+            //Create mark dots
+            for (Mark mark : cMark.getMarks()) {
+                makeAndBindMarker(mark, colour);
+            }
+            //Create gate line
+            if (cMark.isGate()) {
+                for (int i = 1; i < cMark.getMarks().size(); i++) {
+                    gates.add(
+                        makeAndBindGate(
+                            markerObjects.get(cMark.getSubMark(i)),
+                            markerObjects.get(cMark.getSubMark(i + 1)),
+                            colour
+                        )
+                    );
+                }
+            }
+            colour = Color.BLACK;
+        }
+
+        createMarkArrows(sequence);
+
+        //Scale race to markers if there is no border.
+        if (borderPoints == null) {
+            rescaleRace(new ArrayList<>(markerObjects.keySet()));
+        }
+        //Move the Markers to initial position.
+        markerObjects.forEach(((mark, marker2D) -> {
+            Point2D p2d = findScaledXY(mark.getLat(), mark.getLng());
+            marker2D.setLayoutX(p2d.getX());
+            marker2D.setLayoutY(p2d.getY());
+        }));
+        Platform.runLater(() -> {
+            markers.getChildren().clear();
+            markers.getChildren().addAll(gates);
+            markers.getChildren().addAll(markerObjects.values());
+        });
+    }
+
+    /**
+     * Calculates all the data needed for to create mark arrows. Requires that a course has been
+     * added to the gameview.
+     * @param sequence The order in which marks are traversed.
+     */
+    private void createMarkArrows (List<Corner> sequence) {
+        for (int i=1; i < sequence.size()-1; i++) { //General case.
+            double averageLat = 0;
+            double averageLng = 0;
+            int numMarks = course.get(i-1).getMarks().size();
+            for (Mark mark : course.get(i-1).getMarks()) {
+                averageLat += mark.getLat();
+                averageLng += mark.getLng();
+            }
+            GeoPoint lastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+            numMarks = course.get(i+1).getMarks().size();
+            averageLat = 0;
+            averageLng = 0;
+            for (Mark mark : course.get(i+1).getMarks()) {
+                averageLat += mark.getLat();
+                averageLng += mark.getLng();
+            }
+            GeoPoint nextMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+            // TODO: 16/08/17 This comparison doesn't need to exist but the alternative is to user server enum client side.
+            for (Mark mark : course.get(i).getMarks()) {
+                markerObjects.get(mark).addArrows(
+                    mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
+                    GeoUtility.getBearing(lastMarkAv, mark),
+                    GeoUtility.getBearing(mark, nextMarkAv)
+                );
+            }
+        }
+        createStartLineArrows();
+        createFinishLineArrows();
+    }
+
+    private void createStartLineArrows () {
+        double averageLat = 0;
+        double averageLng = 0;
+        int numMarks = 0;
+        for (Mark mark : course.get(1).getMarks()) {
+            numMarks += 1;
+            averageLat += mark.getLat();
+            averageLng += mark.getLng();
+        }
+        GeoPoint firstMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+        for (Mark mark : course.get(0).getMarks()) {
+            markerObjects.get(mark).addArrows(
+                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
+                0d, //90
+                GeoUtility.getBearing(mark, firstMarkAv)
+            );
+        }
+    }
+
+    private void createFinishLineArrows () {
+        double numMarks = 0;
+        double averageLat = 0;
+        double averageLng = 0;
+        for (Mark mark : course.get(course.size()-2).getMarks()) {
+            numMarks += 1;
+            averageLat += mark.getLat();
+            averageLng += mark.getLng();
+        }
+        GeoPoint secondToLastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+        for (Mark mark : course.get(course.size()-1).getMarks()) {
+            markerObjects.get(mark).addArrows(
+                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
+                GeoUtility.getBearing(secondToLastMarkAv, mark),
+                GeoUtility.getBearing(mark, mark)
+            );
+        }
+    }
+
+    /**
+     * Creates a new Marker and binds it's position to the given Mark.
+     *
+     * @param observableMark The mark to bind the marker to.
+     * @param colour The desired colour of the mark
+     */
+    private void makeAndBindMarker(Mark observableMark, Paint colour) {
+        Marker2D marker2D = new Marker2D(colour);
+//        marker.addArrows(MarkArrowFactory.RoundingSide.PORT, ThreadLocalRandom.current().nextDouble(91, 180), ThreadLocalRandom.current().nextDouble(1, 90));
+        markerObjects.put(observableMark, marker2D);
+        observableMark.addPositionListener((mark, lat, lon) -> {
+            Point2D p2d = findScaledXY(lat, lon);
+            markerObjects.get(mark).setLayoutX(p2d.getX());
+            markerObjects.get(mark).setLayoutY(p2d.getY());
+        });
+    }
+
+    /**
+     * Creates a new gate connecting the given marks.
+     *
+     * @param m1 The first Mark of the gate.
+     * @param m2 The second Mark of the gate.
+     * @param colour The desired colour of the gate.
+     * @return the new gate.
+     */
+    private Gate makeAndBindGate(Marker2D m1, Marker2D m2, Paint colour) {
+        Gate gate = new Gate(colour);
+        gate.startXProperty().bind(
+            m1.layoutXProperty()
+        );
+        gate.startYProperty().bind(
+            m1.layoutYProperty()
+        );
+        gate.endXProperty().bind(
+            m2.layoutXProperty()
+        );
+        gate.endYProperty().bind(
+            m2.layoutYProperty()
+        );
+        return gate;
+    }
+
+    /**
+     * Adds a border to the GameView and rescales to the size of the border, does not rescale if a
+     * border already exists. Assumes the border is larger than the course.
+     *
+     * @param border the race border to be drawn.
+     */
+    public void updateBorder(List<Limit> border) {
+        if (borderPoints == null) {
+            borderPoints = border;
+            rescaleRace(new ArrayList<>(borderPoints));
+        }
+
+        rescaleRace(new ArrayList<>(border));
+
+        List<Double> boundaryPoints = new ArrayList<>();
+        for (Limit limit : border) {
+            Point2D location = findScaledXY(limit.getLat(), limit.getLng());
+            boundaryPoints.add(location.getX());
+            boundaryPoints.add(location.getY());
+        }
+        raceBorder.getPoints().setAll(boundaryPoints);
+    }
+
+    /**
+     * Rescales the race to the size of the window.
+     *
+     * @param limitingCoordinates the set of geo points that contains the extremities of the race.
+     */
+    public void rescaleRace(List<GeoPoint> limitingCoordinates) {
+        //Check is called once to avoid unnecessarily change the course limits once the race is running
+        findMinMaxPoint(limitingCoordinates);
+        double minLonToMaxLon = scaleRaceExtremities();
+        calculateReferencePointLocation(minLonToMaxLon);
+    }
+
+    /**
+     * Sets the class variables minLatPoint, maxLatPoint, minLonPoint, maxLonPoint to the point with
+     * the leftmost point, rightmost point, southern most point and northern most point
+     * respectively.
+     */
+    private void findMinMaxPoint(List<GeoPoint> points) {
+        List<GeoPoint> sortedPoints = new ArrayList<>(points);
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLat));
+        minLatPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLat = sortedPoints.get(sortedPoints.size() - 1);
+        maxLatPoint = new GeoPoint(maxLat.getLat(), maxLat.getLng());
+
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLng));
+        minLonPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLon = sortedPoints.get(sortedPoints.size() - 1);
+        maxLonPoint = new GeoPoint(maxLon.getLat(), maxLon.getLng());
+        if (maxLonPoint.getLng() - minLonPoint.getLng() > 180) {
+            horizontalInversion = true;
+        }
+    }
+
+    /**
+     * Calculates the location of a reference point, this is always the point with minimum latitude,
+     * in relation to the canvas.
+     *
+     * @param minLonToMaxLon The horizontal distance between the point of minimum longitude to
+     * maximum longitude.
+     */
+    private void calculateReferencePointLocation(double minLonToMaxLon) {
+        GeoPoint referencePoint = minLatPoint;
+        double referenceAngle;
+
+        if (scaleDirection == ScaleDirection.HORIZONTAL) {
+            referenceAngle = Math.abs(
+                GeoUtility.getBearingRad(referencePoint, minLonPoint)
+            );
+            referencePointX =
+                bufferSize + distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                    .getDistance(referencePoint, minLonPoint);
+            referenceAngle = Math.abs(GeoUtility.getDistance(referencePoint, maxLatPoint));
+            referencePointY = canvasHeight - (bufferSize + bufferSize);
+            referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
+            referencePointY = referencePointY / 2;
+            referencePointY += bufferSize;
+            referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
+        } else {
+            referencePointY = canvasHeight - bufferSize;
+            referenceAngle = Math.abs(
+                Math.toRadians(
+                    GeoUtility.getDistance(referencePoint, minLonPoint)
+                )
+            );
+            referencePointX = bufferSize;
+            referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, minLonPoint);
+            referencePointX +=
+                ((canvasWidth - (bufferSize + bufferSize)) - (minLonToMaxLon * distanceScaleFactor))
+                    / 2;
+            referencePointX += horizontalBuffer;
+        }
+        if (horizontalInversion) {
+            referencePointX = canvasWidth - bufferSize - (referencePointX - bufferSize);
+        }
+    }
+
+
+    /**
+     * Finds the scale factor necessary to fit all race markers within the onscreen map and assigns
+     * it to distanceScaleFactor Returns the max horizontal distance of the map.
+     */
+    private double scaleRaceExtremities() {
+
+        double vertAngle = Math.abs(
+            GeoUtility.getBearingRad(minLatPoint, maxLatPoint)
+        );
+        double vertDistance =
+            Math.cos(vertAngle) * GeoUtility.getDistance(minLatPoint, maxLatPoint);
+        double horiAngle = Math.abs(
+            GeoUtility.getBearingRad(minLonPoint, maxLonPoint)
+        );
+        if (horiAngle <= (Math.PI / 2)) {
+            horiAngle = (Math.PI / 2) - horiAngle;
+        } else {
+            horiAngle = horiAngle - (Math.PI / 2);
+        }
+        double horiDistance =
+            Math.cos(horiAngle) * GeoUtility.getDistance(minLonPoint, maxLonPoint);
+
+        double vertScale = (canvasHeight - (bufferSize + bufferSize)) / vertDistance;
+
+        if ((horiDistance * vertScale) > (canvasWidth - (bufferSize + bufferSize))) {
+            distanceScaleFactor = (canvasWidth - (bufferSize + bufferSize)) / horiDistance;
+            scaleDirection = ScaleDirection.HORIZONTAL;
+        } else {
+            distanceScaleFactor = vertScale;
+            scaleDirection = ScaleDirection.VERTICAL;
+        }
+        return horiDistance;
+    }
+
+    private Point2D findScaledXY(double unscaledLat, double unscaledLon) {
+        double distanceFromReference;
+        double angleFromReference;
+        double xAxisLocation = referencePointX;
+        double yAxisLocation = referencePointY;
+
+        angleFromReference = GeoUtility.getBearingRad(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        distanceFromReference = GeoUtility.getDistance(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
+            xAxisLocation += Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+            yAxisLocation -= Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+        } else if (angleFromReference >= 0) {
+            angleFromReference = angleFromReference - Math.PI / 2;
+            xAxisLocation += Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+            yAxisLocation += Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+        } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
+            angleFromReference = Math.abs(angleFromReference);
+            xAxisLocation -= Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+            yAxisLocation -= Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+        } else {
+            angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
+            xAxisLocation -= Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+            yAxisLocation += Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+        }
+        if (horizontalInversion) {
+            xAxisLocation = canvasWidth - bufferSize - (xAxisLocation - bufferSize);
+        }
+        return new Point2D(xAxisLocation, yAxisLocation);
+    }
+
+
+    public void setSize(Double width, Double height){
+        this.canvasWidth = width;
+        this.canvasHeight = height;
+    }
+
+    public void setHorizontalBuffer(Double buff){
+        this.horizontalBuffer = buff;
     }
 }

src/main/java/seng302/visualiser/GameView3D.java

@@ -1,39 +1,35 @@
 package seng302.visualiser;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
-import javafx.beans.value.ObservableValue;
 import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
-import javafx.scene.Camera;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.PerspectiveCamera;
 import javafx.scene.SceneAntialiasing;
 import javafx.scene.SubScene;
-import javafx.scene.image.Image;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.paint.Color;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
-import org.fxyz3d.scene.Skybox;
 import seng302.gameServer.messages.RoundingSide;
 import seng302.model.ClientYacht;
-import seng302.model.GameKeyBind;
-import seng302.model.KeyAction;
+import seng302.model.GeoPoint;
 import seng302.model.Limit;
-import seng302.model.ScaledPoint;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
 import seng302.model.token.Token;
+import seng302.model.token.TokenType;
 import seng302.utilities.GeoUtility;
+import seng302.utilities.Sounds;
 import seng302.visualiser.cameras.ChaseCamera;
 import seng302.visualiser.cameras.IsometricCamera;
 import seng302.visualiser.cameras.RaceCamera;
@@ -42,7 +38,6 @@ import seng302.visualiser.controllers.ViewManager;
 import seng302.visualiser.fxObjects.MarkArrowFactory;
 import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 import seng302.visualiser.fxObjects.assets_3D.Marker3D;
-import seng302.visualiser.fxObjects.assets_3D.Model;
 import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
 import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
@@ -50,63 +45,83 @@ import seng302.visualiser.fxObjects.assets_3D.ModelType;
  * Collection of animated3D assets that displays a race.
  */
 
-public class GameView3D extends GameView {
+public class GameView3D {
+
 
     private final double FOV = 60;
+    private final double DEFAULT_CAMERA_DEPTH = -125;
     private final double DEFAULT_CAMERA_X = 0;
-    private final double DEFAULT_CAMERA_Y = 160;
+    private final double DEFAULT_CAMERA_Y = 155;
 
     private Group root3D;
     private SubScene view;
+    //    ParallelCamera camera;
+    private PerspectiveCamera camera;
+    private PerspectiveCamera camera2;
+    private PerspectiveCamera camera3;
     private Group gameObjects;
 
+    private double bufferSize = 0;
+    private double canvasWidth = 200;
+    private double canvasHeight = 200;
+    private boolean horizontalInversion = false;
+
+    private double distanceScaleFactor;
+    private ScaleDirection scaleDirection;
+    private GeoPoint minLatPoint, minLonPoint, maxLatPoint, maxLonPoint;
+    private double referencePointX, referencePointY;
     private Group raceBorder = new Group();
-    // Cameras
-    private PerspectiveCamera isometricCam;
-    private PerspectiveCamera topDownCam;
-    private PerspectiveCamera chaseCam;
-    private BoatObject playerBoat;
+
+    /* Note that if either of these is null then values for it have not been added and the other
+       should be used as the limits of the map. */
+    private List<Limit> borderPoints;
+    private Map<Mark, Marker3D> markerObjects;
+
     private Map<ClientYacht, BoatObject> boatObjects = new HashMap<>();
+    private BoatObject selectedBoat = null;
     private Group wakesGroup = new Group();
     private Group boatObjectGroup = new Group();
+    private Group markers = new Group();
+    private Group tokens = new Group();
+    private List<CompoundMark> course = new ArrayList<>();
     private List<Node> mapTokens;
     private AnimationTimer playerBoatAnimationTimer;
     private Group trail = new Group();
     private Double windDir;
-    private Skybox skybox;
 
+    private enum ScaleDirection {
+        HORIZONTAL,
+        VERTICAL
+    }
 
     public GameView3D () {
-        isometricCam = new IsometricCamera(DEFAULT_CAMERA_X, DEFAULT_CAMERA_Y);
-        topDownCam = new TopDownCamera();
-        chaseCam = new ChaseCamera();
+        camera = new IsometricCamera(DEFAULT_CAMERA_X, DEFAULT_CAMERA_Y, DEFAULT_CAMERA_DEPTH);
+        camera.setFarClip(600);
+        camera.setNearClip(0.1);
+        camera.setFieldOfView(FOV);
 
-        canvasWidth = canvasHeight = 300;
+        camera2 = new TopDownCamera();
+        camera2.setFarClip(600);
+        camera2.setNearClip(0.1);
+        camera2.setFieldOfView(FOV);
 
-        for (PerspectiveCamera pc : Arrays.asList(isometricCam, topDownCam, chaseCam)) {
-            pc.setFarClip(100000);
-            pc.setNearClip(0.1);
-            pc.setFieldOfView(FOV);
-        }
+        camera3 = new ChaseCamera();
+        camera3.setFarClip(600);
+        camera3.setNearClip(0.1);
+        camera3.setFieldOfView(FOV);
 
         gameObjects = new Group();
-        root3D = new Group(chaseCam, gameObjects);
+        root3D = new Group(camera, gameObjects);
         view = new SubScene(
-            root3D, 5000, 3000, true, SceneAntialiasing.BALANCED
+            root3D, 1000, 1000, true, SceneAntialiasing.BALANCED
         );
-        view.setCamera(chaseCam);
-
-        skybox = new Skybox(new Image(getClass().getResourceAsStream("/images/skybox.jpg")), 100000, isometricCam);
-        skybox.getTransforms().addAll(new Rotate(90, Rotate.X_AXIS));
-
-        Model land = ModelFactory.importModel(ModelType.LAND_SMOOTH);
-        land.getAssets().getTransforms().add(new Rotate(90, Rotate.X_AXIS));
+        view.setCamera(camera);
+        camera.getTransforms().add(new Rotate(30, new Point3D(1,0,0)));
 
         gameObjects.getChildren().addAll(
-            raceBorder, trail, markers, tokens, skybox, land.getAssets()
+            ModelFactory.importModel(ModelType.OCEAN).getAssets(),
+            raceBorder, trail, markers, tokens
         );
-
-
         view.sceneProperty().addListener((obs, old, scene) -> {
             if (scene != null) {
                 scene.addEventHandler(KeyEvent.KEY_PRESSED, this::cameraMovement);
@@ -114,10 +129,8 @@ public class GameView3D extends GameView {
         });
     }
 
-    @Override
     public void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence) {
         markerObjects = new HashMap<>();
-        compoundMarks = newCourse;
 
         for (Corner corner : sequence) { //Makes course out of all compound marks.
             for (CompoundMark compoundMark : newCourse) {
@@ -168,13 +181,11 @@ public class GameView3D extends GameView {
 
         //Scale race to markers if there is no border.
         if (borderPoints == null) {
-            scaledPoint = ScaledPoint.makeScaledPoint(
-                canvasWidth, canvasHeight, new ArrayList<>(markerObjects.keySet()), true
-            );
+            rescaleRace(new ArrayList<>(markerObjects.keySet()));
         }
         //Move the Markers to initial position.
         markerObjects.forEach(((mark, marker) -> {
-            Point2D p2d = scaledPoint.findScaledXY(mark.getLat(), mark.getLng());
+            Point2D p2d = findScaledXY(mark.getLat(), mark.getLng());
             marker.setLayoutX(p2d.getX());
             marker.setLayoutY(p2d.getY());
         }));
@@ -194,7 +205,7 @@ public class GameView3D extends GameView {
     private void makeAndBindMarker(Mark observableMark, ModelType markerType) {
         markerObjects.put(observableMark, new Marker3D(markerType));
         observableMark.addPositionListener((mark, lat, lon) -> {
-            Point2D p2d = scaledPoint.findScaledXY(lat, lon);
+            Point2D p2d = findScaledXY(lat, lon);
             markerObjects.get(mark).setLayoutX(p2d.getX());
             markerObjects.get(mark).setLayoutY(p2d.getY());
         });
@@ -209,8 +220,8 @@ public class GameView3D extends GameView {
      * @return the new gate.
      */
     private Group makeGate(Mark m1, Mark m2, ModelType gateType) {
-        Point2D m1Location = scaledPoint.findScaledXY(m1);
-        Point2D m2Location = scaledPoint.findScaledXY(m2);
+        Point2D m1Location = findScaledXY(m1);
+        Point2D m2Location = findScaledXY(m2);
 
         Group barrier = ModelFactory.importModel(gateType).getAssets();
         barrier.getTransforms().addAll(
@@ -268,46 +279,202 @@ public class GameView3D extends GameView {
         }
     }
 
-    public void cameraMovement(KeyEvent event) {
-        GameKeyBind keyBinds = GameKeyBind.getInstance();
-        KeyAction keyPressed = keyBinds.getKeyAction(event.getCode());
-        if (keyPressed != null) {
-            switch (keyPressed) {
-                case ZOOM_IN:
-                    ((RaceCamera) view.getCamera()).zoomIn();
-                    break;
-                case ZOOM_OUT:
-                    ((RaceCamera) view.getCamera()).zoomOut();
-                    break;
-                case FORWARD:
-                    ((RaceCamera) view.getCamera()).panUp();
-                    break;
-                case BACKWARD:
-                    ((RaceCamera) view.getCamera()).panDown();
-                    break;
-                case LEFT:
-                    ((RaceCamera) view.getCamera()).panLeft();
-                    break;
-                case RIGHT:
-                    ((RaceCamera) view.getCamera()).panRight();
-                    break;
-                case VIEW:
-                    toggleCamera();
-                    break;
-            }
+    /**
+     * Sets the class variables minLatPoint, maxLatPoint, minLonPoint, maxLonPoint to the point with
+     * the leftmost point, rightmost point, southern most point and northern most point
+     * respectively.
+     */
+    private void findMinMaxPoint(List<GeoPoint> points) {
+        List<GeoPoint> sortedPoints = new ArrayList<>(points);
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLat));
+        minLatPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLat = sortedPoints.get(sortedPoints.size() - 1);
+        maxLatPoint = new GeoPoint(maxLat.getLat(), maxLat.getLng());
+
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLng));
+        minLonPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLon = sortedPoints.get(sortedPoints.size() - 1);
+        maxLonPoint = new GeoPoint(maxLon.getLat(), maxLon.getLng());
+        if (maxLonPoint.getLng() - minLonPoint.getLng() > 180) {
+            horizontalInversion = true;
         }
     }
 
-    private void toggleCamera() {
-        Camera currCamera = view.getCamera();
+    /**
+     * Calculates the location of a reference point, this is always the point with minimum latitude,
+     * in relation to the canvas.
+     *
+     * @param minLonToMaxLon The horizontal distance between the point of minimum longitude to
+     * maximum longitude.
+     */
+    private void calculateReferencePointLocation(double minLonToMaxLon) {
+        GeoPoint referencePoint = minLatPoint;
+        double referenceAngle;
 
-        if (currCamera.equals(isometricCam)) {
-            view.setCamera(topDownCam);
-        } else if (currCamera.equals(topDownCam)) {
-            view.setCamera(chaseCam);
+        if (scaleDirection == ScaleDirection.HORIZONTAL) {
+            referenceAngle = Math.abs(
+                GeoUtility.getBearingRad(referencePoint, minLonPoint)
+            );
+            referencePointX =
+                -100 + distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                    .getDistance(referencePoint, minLonPoint);
+            referenceAngle = Math.abs(GeoUtility.getDistance(referencePoint, maxLatPoint));
+            referencePointY = -100 + canvasHeight - (bufferSize + bufferSize);
+            referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
+            referencePointY = referencePointY / 2;
+            referencePointY += bufferSize;
+            referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
         } else {
-            view.setCamera(isometricCam);
+            referencePointY = -100 + canvasHeight - bufferSize;
+            referenceAngle = Math.abs(
+                Math.toRadians(
+                    GeoUtility.getDistance(referencePoint, minLonPoint)
+                )
+            );
+            referencePointX = -100 + bufferSize;
+            referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, minLonPoint);
+            referencePointX +=
+                ((canvasWidth - (bufferSize + bufferSize)) - (minLonToMaxLon * distanceScaleFactor))
+                    / 2;
         }
+        if (horizontalInversion) {
+            referencePointX = -100 + canvasWidth - bufferSize - (referencePointX - bufferSize);
+        }
+    }
+
+
+    /**
+     * Finds the scale factor necessary to fit all race markers within the onscreen map and assigns
+     * it to distanceScaleFactor Returns the max horizontal distance of the map.
+     */
+    private double scaleRaceExtremities() {
+
+        double vertAngle = Math.abs(
+            GeoUtility.getBearingRad(minLatPoint, maxLatPoint)
+        );
+        double vertDistance =
+            Math.cos(vertAngle) * GeoUtility.getDistance(minLatPoint, maxLatPoint);
+        double horiAngle = Math.abs(
+            GeoUtility.getBearingRad(minLonPoint, maxLonPoint)
+        );
+        if (horiAngle <= (Math.PI / 2)) {
+            horiAngle = (Math.PI / 2) - horiAngle;
+        } else {
+            horiAngle = horiAngle - (Math.PI / 2);
+        }
+        double horiDistance =
+            Math.cos(horiAngle) * GeoUtility.getDistance(minLonPoint, maxLonPoint);
+
+        double vertScale = (canvasHeight - (bufferSize + bufferSize)) / vertDistance;
+
+        if ((horiDistance * vertScale) > (canvasWidth - (bufferSize + bufferSize))) {
+            distanceScaleFactor = (canvasWidth - (bufferSize + bufferSize)) / horiDistance;
+            scaleDirection = ScaleDirection.HORIZONTAL;
+        } else {
+            distanceScaleFactor = vertScale;
+            scaleDirection = ScaleDirection.VERTICAL;
+        }
+        return horiDistance;
+    }
+
+    private Point2D findScaledXY(GeoPoint unscaled) {
+        return findScaledXY(unscaled.getLat(), unscaled.getLng());
+    }
+
+    private Point2D findScaledXY(double unscaledLat, double unscaledLon) {
+        double distanceFromReference;
+        double angleFromReference;
+        double xAxisLocation = referencePointX;
+        double yAxisLocation = referencePointY;
+
+        angleFromReference = GeoUtility.getBearingRad(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        distanceFromReference = GeoUtility.getDistance(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
+            xAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+            yAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+        } else if (angleFromReference >= 0) {
+            angleFromReference = angleFromReference - Math.PI / 2;
+            xAxisLocation += distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+            yAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+        } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
+            angleFromReference = Math.abs(angleFromReference);
+            xAxisLocation -= distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+            yAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+        } else {
+            angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
+            xAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+            yAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+        }
+        if (horizontalInversion) {
+            xAxisLocation = canvasWidth - bufferSize - (xAxisLocation - bufferSize);
+        }
+        return new Point2D(xAxisLocation, yAxisLocation);
+    }
+
+    public void cameraMovement(KeyEvent event) {
+        switch (event.getCode()) {
+            case NUMPAD8:
+                view.getCamera().getTransforms().addAll(new Rotate(0.5, new Point3D(1, 0, 0)));
+                break;
+            case NUMPAD2:
+                view.getCamera().getTransforms().addAll(new Rotate(-0.5, new Point3D(1, 0, 0)));
+                break;
+            case NUMPAD4:
+                view.getCamera().getTransforms().addAll(new Rotate(-0.5, new Point3D(0, 1, 0)));
+                break;
+            case NUMPAD6:
+                view.getCamera().getTransforms().addAll(new Rotate(0.5, new Point3D(0, 1, 0)));
+                break;
+            case Z:
+                ((RaceCamera) view.getCamera()).zoomIn();
+                break;
+            case X:
+                ((RaceCamera) view.getCamera()).zoomOut();
+                break;
+            case W:
+                view.getCamera().getTransforms().addAll(new Translate(0, -1, 0));
+                break;
+            case S:
+                view.getCamera().getTransforms().addAll(new Translate(0, 1, 0));
+                break;
+            case A:
+                view.getCamera().getTransforms().addAll(new Translate(-1, 0, 0));
+                break;
+            case D:
+                view.getCamera().getTransforms().addAll(new Translate(1, 0, 0));
+                break;
+            case F1:
+                if (view.getCamera().equals(camera)) {
+                    view.setCamera(camera2);
+                    if (view.getCamera() instanceof TopDownCamera) {
+                        ((RaceCamera) view.getCamera()).zoomIn();
+                    }
+                } else if (view.getCamera().equals(camera2)) {
+                    view.setCamera(camera3);
+                } else {
+                    view.setCamera(camera);
+                }
+        }
+    }
+
+    /**
+     * Rescales the race to the size of the window.
+     *
+     * @param limitingCoordinates the set of geo points that contains the extremities of the race.
+     */
+    private void rescaleRace(List<GeoPoint> limitingCoordinates) {
+        //Check is called once to avoid unnecessarily change the course limits once the race is running
+        findMinMaxPoint(limitingCoordinates);
+        double minLonToMaxLon = scaleRaceExtremities();
+        calculateReferencePointLocation(minLonToMaxLon);
+//        drawGoogleMap();
     }
 
     /**
@@ -319,49 +486,24 @@ public class GameView3D extends GameView {
         final List<Group> wakes = new ArrayList<>();
         for (ClientYacht clientYacht : yachts) {
             Color colour = clientYacht.getColour();
-            newBoat = new BoatObject(clientYacht.getBoatType());
+            newBoat = new BoatObject();
             newBoat.setFill(colour);
             boatObjects.put(clientYacht, newBoat);
             wakesGroup.getChildren().add(newBoat.getWake());
             wakes.add(newBoat.getWake());
             boatObjectGroup.getChildren().add(newBoat);
-            clientYacht.addLocationListener(this::updateBoatLocation);
-            clientYacht.addColorChangeListener(this::updateBoatColor);
+            clientYacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> {
+                BoatObject bo = boatObjects.get(boat);
+                Point2D p2d = findScaledXY(lat, lon);
+                bo.moveTo(p2d.getX(), p2d.getY(), heading, velocity, sailIn, windDir);
+            });
 
             if (clientYacht.getSourceId().equals(
                 ViewManager.getInstance().getGameClient().getServerThread().getClientId())) {
-                ((ChaseCamera) chaseCam).setPlayerBoat(newBoat);
-                ((TopDownCamera) topDownCam).setPlayerBoat(newBoat);
-
-                newBoat.setMarkIndicator(ModelFactory.importSTL("mark_pointer.stl"));
-                playerBoat = newBoat;
-
+                ((ChaseCamera) camera3).setPlayerBoat(newBoat);
             }
         }
         Platform.runLater(() -> {
-            ClientYacht playerYacht = ViewManager.getInstance().getGameClient().getAllBoatsMap()
-                .get(ViewManager.getInstance().getGameClient().getServerThread().getClientId());
-
-            for (ObservableValue o : Arrays
-                .asList(playerBoat.layoutXProperty(), playerBoat.layoutXProperty())) {
-                o.addListener((obs, oldVal, newVal) -> {
-                    if (playerYacht.getLegNumber() < course.size()) {
-                        List<Mark> marks = course.get(playerYacht.getLegNumber()).getMarks();
-                        Point2D midPoint = new Point2D(0, 0);
-                        if (marks.size() == 1) {
-                            midPoint = scaledPoint.findScaledXY(marks.get(0));
-                        } else if (marks.size() == 2) {
-                            midPoint = (scaledPoint.findScaledXY(marks.get(0)))
-                                .midpoint(scaledPoint.findScaledXY(marks.get(1)));
-                        }
-
-                        if (midPoint != null) {
-                            playerBoat.updateMarkIndicator(midPoint);
-                        }
-                    }
-
-                });
-            }
             gameObjects.getChildren().addAll(wakes);
             gameObjects.getChildren().addAll(boatObjectGroup);
         });
@@ -371,27 +513,6 @@ public class GameView3D extends GameView {
         return view;
     }
 
-    public SubScene getView() {
-        return view;
-    }
-
-    /**
-     * Updates the boatObjects color with that of the clientYachts object. Used in notification from
-     * a listener on this attribute in clientYacht to re paint the boat mesh
-     *
-     * @param clientYacht The yacht to update the colour for
-     */
-    private void updateBoatColor(ClientYacht clientYacht) {
-        boatObjects.get(clientYacht).setFill(clientYacht.getColour());
-    }
-
-    private void updateBoatLocation(ClientYacht boat, Double lat, Double lon, Double heading,
-        Boolean sailIn, Double velocity) {
-        BoatObject bo = boatObjects.get(boat);
-        Point2D p2d = scaledPoint.findScaledXY(lat, lon);
-        bo.moveTo(p2d.getX(), p2d.getY(), heading, velocity, sailIn, windDir);
-    }
-
     /**
      * Adds a border to the GameView and rescales to the size of the border, does not rescale if a
      * border already exists. Assumes the border is larger than the course.
@@ -401,20 +522,18 @@ public class GameView3D extends GameView {
     public void updateBorder(List<Limit> border) {
         if (borderPoints == null) {
             borderPoints = border;
-            scaledPoint = ScaledPoint.makeScaledPoint(
-                canvasWidth, canvasHeight, new ArrayList<>(borderPoints), true
-            );
+            rescaleRace(new ArrayList<>(borderPoints));
         }
         List<Node> boundaryAssets = new ArrayList<>();
 
-        Point2D lastLocation = scaledPoint.findScaledXY(border.get(0).getLat(), border.get(0).getLng());
+        Point2D lastLocation = findScaledXY(border.get(0).getLat(), border.get(0).getLng());
         Group pylon = ModelFactory.importModel(ModelType.BORDER_PYLON).getAssets();
         pylon.setLayoutX(lastLocation.getX());
         pylon.setLayoutY(lastLocation.getY());
         boundaryAssets.add(pylon);
 
         for (int i=1; i<border.size(); i++) {
-            Point2D location = scaledPoint.findScaledXY(border.get(i).getLat(), border.get(i).getLng());
+            Point2D location = findScaledXY(border.get(i).getLat(), border.get(i).getLng());
             pylon = ModelFactory.importModel(ModelType.BORDER_PYLON).getAssets();
             pylon.setLayoutX(location.getX());
             pylon.setLayoutY(location.getY());
@@ -440,7 +559,7 @@ public class GameView3D extends GameView {
             boundaryAssets.add(pylon);
         }
 
-        Point2D firstLocation = scaledPoint.findScaledXY(border.get(0).getLat(), border.get(0).getLng());
+        Point2D firstLocation = findScaledXY(border.get(0).getLat(), border.get(0).getLng());
         Group barrier = ModelFactory.importModel(ModelType.BORDER_BARRIER).getAssets();
         barrier.getTransforms().addAll(
             new Rotate(
@@ -468,7 +587,7 @@ public class GameView3D extends GameView {
     public void updateTokens(List<Token> newTokens) {
         mapTokens = new ArrayList<>();
         for (Token token : newTokens) {
-            Point2D location = scaledPoint.findScaledXY(token.getLat(), token.getLng());
+            Point2D location = findScaledXY(token.getLat(), token.getLng());
 
             ModelType modelType = null;
             switch (token.getTokenType()) {
@@ -501,21 +620,21 @@ public class GameView3D extends GameView {
     }
 
     public void setBoatAsPlayer (ClientYacht playerYacht) {
-        playerBoat.updateMarkIndicator(scaledPoint.findScaledXY(course.get(0).getMidPoint()));
-        playerYacht.toggleSail();
         playerBoatAnimationTimer = new AnimationTimer() {
 
-            Point2D lastLocation = scaledPoint.findScaledXY(playerYacht.getLocation());
+            double count = 60;
+            Point2D lastLocation = findScaledXY(playerYacht.getLocation());
 
             @Override
             public void handle(long now) {
-                Point2D location = scaledPoint.findScaledXY(playerYacht.getLocation());
-                if (Math.abs(lastLocation.distance(location)) > 2) {
+                if (--count == 0) {
+                    count = 60;
                     Node segment = ModelFactory.importModel(ModelType.TRAIL_SEGMENT).getAssets();
-                    location = scaledPoint.findScaledXY(playerYacht.getLocation());
+                    Point2D location = findScaledXY(playerYacht.getLocation());
                     segment.getTransforms().addAll(
                         new Translate(location.getX(), location.getY(), 0),
-                        new Rotate(playerYacht.getHeading(), new Point3D(0,0,1))
+                        new Rotate(playerYacht.getHeading(), new Point3D(0,0,1)),
+                        new Scale(1, lastLocation.distance(location) / 5, 1)
                     );
                     trail.getChildren().add(segment);
                     if (trail.getChildren().size() > 50) {
@@ -535,4 +654,31 @@ public class GameView3D extends GameView {
     public void setWindDir(double windDir) {
         this.windDir = windDir;
     }
-}
+
+    private void updateMarkArrows (ClientYacht yacht, int legNumber) {
+        CompoundMark compoundMark;
+        if (legNumber - 1 >= 0) {
+            Sounds.playMarkRoundingSound();
+            compoundMark = course.get(legNumber-1);
+            for (Mark mark : compoundMark.getMarks()) {
+                markerObjects.get(mark).showNextExitArrow();
+            }
+        }
+        CompoundMark nextMark = null;
+        if (legNumber < course.size() - 1) {
+            Sounds.playMarkRoundingSound();
+            nextMark = course.get(legNumber);
+            for (Mark mark : nextMark.getMarks()) {
+                markerObjects.get(mark).showNextEnterArrow();
+            }
+        }
+        if (legNumber - 2 >= 0) {
+            CompoundMark lastMark = course.get(Math.max(0, legNumber - 2));
+            if (lastMark != nextMark) {
+                for (Mark mark : lastMark.getMarks()) {
+                    markerObjects.get(mark).hideAllArrows();
+                }
+            }
+        }
+    }
+}

src/main/java/seng302/visualiser/MapMaker.java

@@ -1,122 +0,0 @@
-package seng302.visualiser;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javafx.scene.Node;
-import javafx.util.Pair;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import seng302.model.stream.xml.generator.RaceXMLTemplate;
-import seng302.model.stream.xml.generator.RegattaXMLTemplate;
-import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.stream.xml.parser.RegattaXMLData;
-import seng302.utilities.XMLGenerator;
-import seng302.utilities.XMLParser;
-
-/**
- * Makes maps from map definition xml files.
- */
-public class MapMaker {
-
-    private List<MapPreview> mapPreviews = new ArrayList<>();
-    private List<RaceXMLData> races = new ArrayList<>();
-    private List<RegattaXMLData> regattas = new ArrayList<>();
-    private List<String> filePaths = new ArrayList<>();
-    private List<Integer> maxPlayers = new ArrayList<>();
-    private static MapMaker instance;
-    private int index = 0;
-    private XMLGenerator xmlGenerator = new XMLGenerator();
-
-    private List<String> maps = new ArrayList<>(
-        Arrays.asList("default.xml", "horseshoe.xml", "loop.xml", "madagascar.xml", "waiheke.xml"));
-
-    public static MapMaker getInstance() {
-        if (instance == null) {
-            instance = new MapMaker();
-        }
-        return instance;
-    }
-
-    private MapMaker() {
-        for (String mapPath : maps){
-            String path = ("/maps/" + mapPath);
-
-            Pair<RegattaXMLTemplate, RaceXMLTemplate> regattaRace = XMLParser.parseRaceDef(
-                    path, "", 1, null, false
-            );
-
-            RegattaXMLTemplate regattaTemplate = regattaRace.getKey();
-
-            filePaths.add(path);
-
-            regattas.add(new RegattaXMLData(
-                    regattaTemplate.getRegattaId(),
-                    regattaTemplate.getName(),
-                    regattaTemplate.getCourseName(),
-                    regattaTemplate.getLatitude(),
-                    regattaTemplate.getLongitude(),
-                    regattaTemplate.getUtcOffset()
-            ));
-
-            RaceXMLTemplate raceTemplate = regattaRace.getValue();
-            xmlGenerator.setRaceTemplate(raceTemplate);
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db;
-            Document doc = null;
-            try {
-                db = dbf.newDocumentBuilder();
-                doc = db.parse(new InputSource(new StringReader(xmlGenerator.getRaceAsXml())));
-            } catch (ParserConfigurationException | IOException | SAXException e) {
-                e.printStackTrace();
-            }
-
-            RaceXMLData race = XMLParser.parseRace(doc);
-            maxPlayers.add(XMLParser.getMaxPlayers(doc));
-
-            mapPreviews.add(new MapPreview(
-                    new ArrayList<>(race.getCompoundMarks().values()),
-                    race.getMarkSequence(), race.getCourseLimit()
-            ));
-
-            races.add(race);
-        }
-
-    }
-
-    public void next() {
-        index += 1;
-        if (index >= mapPreviews.size()) {
-            index = 0;
-        }
-    }
-
-    public void previous() {
-        index -= 1;
-        if (index < 0) {
-            index = mapPreviews.size() - 1;
-        }
-    }
-
-    public Node getCurrentGameView() {
-        return mapPreviews.get(index).getAssets();
-    }
-
-    public RegattaXMLData getCurrentRegatta() {
-        return regattas.get(index);
-    }
-
-    public String getCurrentRacePath() {
-        return filePaths.get(index);
-    }
-
-    public Integer getMaxPlayers() {
-        return maxPlayers.get(index);
-    }
-}

src/main/java/seng302/visualiser/MapPreview.java

@@ -1,282 +0,0 @@
-package seng302.visualiser;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import javafx.application.Platform;
-import javafx.geometry.Point2D;
-import javafx.scene.Node;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Polygon;
-import seng302.gameServer.messages.RoundingSide;
-import seng302.model.GeoPoint;
-import seng302.model.Limit;
-import seng302.model.ScaledPoint;
-import seng302.model.mark.CompoundMark;
-import seng302.model.mark.Corner;
-import seng302.model.mark.Mark;
-import seng302.utilities.GeoUtility;
-import seng302.visualiser.fxObjects.MarkArrowFactory;
-import seng302.visualiser.fxObjects.Marker;
-import seng302.visualiser.fxObjects.assets_2D.CourseBoundary;
-import seng302.visualiser.fxObjects.assets_2D.Gate;
-import seng302.visualiser.fxObjects.assets_2D.Marker2D;
-
-/**
- * Created by cir27 on 20/07/17.
- */
-public class MapPreview extends GameView {
-
-    private Polygon raceBorder = new CourseBoundary();
-
-    public MapPreview(List<CompoundMark> marks, List<Corner> course, List<Limit> border) {
-        this.compoundMarks = marks;
-        this.courseOrder = course;
-        this.borderPoints = border;
-        gameObjects.getChildren().addAll(raceBorder, markers, tokens);
-        gameObjects.parentProperty().addListener((obs, old, parent) -> {
-            if (parent != null) {
-                canvasWidth = parent.prefWidth(1);
-                canvasHeight = parent.prefHeight(1);
-                updateBorder(borderPoints);
-                updateCourse(compoundMarks, courseOrder);
-            }
-        });
-    }
-
-    @Override
-    public Node getAssets() {
-        return gameObjects;
-    }
-
-    public void setSize(double width, double height) {
-        canvasHeight = height;
-        canvasWidth = width;
-        updateBorder(borderPoints);
-        updateCourse(compoundMarks, courseOrder);
-    }
-
-    /**
-     * Adds a course to the GameView. The view is scaled accordingly unless a border is set in which
-     * case the course is added relative ot the border.
-     *
-     * @param newCourse the mark objects that make up the course.
-     * @param sequence The sequence the marks travel through
-     */
-    @Override
-    public void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence) {
-
-        if (newCourse.size() == 0) {
-            return;
-        }
-        compoundMarks = newCourse;
-        markerObjects = new HashMap<>();
-        courseOrder = sequence;
-
-        for (Corner corner : courseOrder) { //Makes course out of all compound marks.
-            for (CompoundMark compoundMark : newCourse) {
-                if (corner.getCompoundMarkID() == compoundMark.getId()) {
-                    course.add(compoundMark);
-                }
-            }
-        }
-
-        // TODO: 16/08/17 Updating mark roundings here. It should not happen here. Nor should it be done this way.
-        for (Corner corner : sequence){
-            CompoundMark compoundMark = course.get(corner.getSeqID() - 1);
-            compoundMark.setRoundingSide(
-                RoundingSide.getRoundingSide(corner.getRounding())
-            );
-        }
-
-        final List<Gate> gates = new ArrayList<>();
-        Paint colour = Color.BLACK;
-        //Creates new markers
-        for (CompoundMark cMark : newCourse) {
-            //Set start and end colour
-            if (cMark.getId() == sequence.get(0).getCompoundMarkID()) {
-                colour = Color.GREEN;
-            } else if (cMark.getId() == sequence.get(sequence.size() - 1).getCompoundMarkID()) {
-                colour = Color.RED;
-            }
-            //Create mark dots
-            for (Mark mark : cMark.getMarks()) {
-                makeAndBindMarker(mark, colour);
-            }
-            //Create gate line
-            if (cMark.isGate()) {
-                for (int i = 1; i < cMark.getMarks().size(); i++) {
-                    gates.add(
-                        makeAndBindGate(
-                            markerObjects.get(cMark.getSubMark(i)),
-                            markerObjects.get(cMark.getSubMark(i + 1)),
-                            colour
-                        )
-                    );
-                }
-            }
-            colour = Color.BLACK;
-        }
-
-        createMarkArrows(sequence);
-
-        //Scale race to markers if there is no border.
-        if (borderPoints == null) {
-            scaledPoint = ScaledPoint.makeScaledPoint(
-                canvasWidth, canvasHeight, new ArrayList<>(markerObjects.keySet()), false
-            );
-        }
-        //Move the Markers to initial position.
-        markerObjects.forEach(((mark, marker2D) -> {
-            Point2D p2d = scaledPoint.findScaledXY(mark.getLat(), mark.getLng());
-            marker2D.setLayoutX(p2d.getX());
-            marker2D.setLayoutY(p2d.getY());
-        }));
-        Platform.runLater(() -> {
-            markers.getChildren().clear();
-            markers.getChildren().addAll(gates);
-            markers.getChildren().addAll(markerObjects.values());
-        });
-    }
-
-    /**
-     * Calculates all the data needed for to create mark arrows. Requires that a course has been
-     * added to the gameview.
-     * @param sequence The order in which marks are traversed.
-     */
-    private void createMarkArrows (List<Corner> sequence) {
-        for (int i=1; i < sequence.size()-1; i++) { //General case.
-            double averageLat = 0;
-            double averageLng = 0;
-            int numMarks = course.get(i-1).getMarks().size();
-            for (Mark mark : course.get(i-1).getMarks()) {
-                averageLat += mark.getLat();
-                averageLng += mark.getLng();
-            }
-            GeoPoint lastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-            numMarks = course.get(i+1).getMarks().size();
-            averageLat = 0;
-            averageLng = 0;
-            for (Mark mark : course.get(i+1).getMarks()) {
-                averageLat += mark.getLat();
-                averageLng += mark.getLng();
-            }
-            GeoPoint nextMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-            // TODO: 16/08/17 This comparison doesn't need to exist but the alternative is to user server enum client side.
-            for (Mark mark : course.get(i).getMarks()) {
-                markerObjects.get(mark).addArrows(
-                    mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                    GeoUtility.getBearing(lastMarkAv, mark),
-                    GeoUtility.getBearing(mark, nextMarkAv)
-                );
-            }
-        }
-        createStartLineArrows();
-        createFinishLineArrows();
-    }
-
-    private void createStartLineArrows () {
-        double averageLat = 0;
-        double averageLng = 0;
-        int numMarks = 0;
-        for (Mark mark : course.get(1).getMarks()) {
-            numMarks += 1;
-            averageLat += mark.getLat();
-            averageLng += mark.getLng();
-        }
-        GeoPoint firstMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-        for (Mark mark : course.get(0).getMarks()) {
-            markerObjects.get(mark).addArrows(
-                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                0d, //90
-                GeoUtility.getBearing(mark, firstMarkAv)
-            );
-        }
-    }
-
-    private void createFinishLineArrows () {
-        double numMarks = 0;
-        double averageLat = 0;
-        double averageLng = 0;
-        for (Mark mark : course.get(course.size()-2).getMarks()) {
-            numMarks += 1;
-            averageLat += mark.getLat();
-            averageLng += mark.getLng();
-        }
-        GeoPoint secondToLastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-        for (Mark mark : course.get(course.size()-1).getMarks()) {
-            markerObjects.get(mark).addFinishArrow(
-                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                GeoUtility.getBearing(secondToLastMarkAv, mark),
-                GeoUtility.getBearing(mark, mark)
-            );
-        }
-    }
-
-    /**
-     * Creates a new Marker and binds it's position to the given Mark.
-     *
-     * @param observableMark The mark to bind the marker to.
-     * @param colour The desired colour of the mark
-     */
-    private void makeAndBindMarker(Mark observableMark, Paint colour) {
-        Marker2D marker2D = new Marker2D(colour);
-//        marker.addArrows(MarkArrowFactory.RoundingSide.PORT, ThreadLocalRandom.current().nextDouble(91, 180), ThreadLocalRandom.current().nextDouble(1, 90));
-        markerObjects.put(observableMark, marker2D);
-        observableMark.addPositionListener((mark, lat, lon) -> {
-            Point2D p2d = scaledPoint.findScaledXY(lat, lon);
-            markerObjects.get(mark).setLayoutX(p2d.getX());
-            markerObjects.get(mark).setLayoutY(p2d.getY());
-        });
-    }
-
-    /**
-     * Creates a new gate connecting the given marks.
-     *
-     * @param m1 The first Mark of the gate.
-     * @param m2 The second Mark of the gate.
-     * @param colour The desired colour of the gate.
-     * @return the new gate.
-     */
-    private Gate makeAndBindGate(Marker m1, Marker m2, Paint colour) {
-        Gate gate = new Gate(colour);
-        gate.startXProperty().bind(
-            m1.layoutXProperty()
-        );
-        gate.startYProperty().bind(
-            m1.layoutYProperty()
-        );
-        gate.endXProperty().bind(
-            m2.layoutXProperty()
-        );
-        gate.endYProperty().bind(
-            m2.layoutYProperty()
-        );
-        return gate;
-    }
-
-    /**
-     * Adds a border to the GameView and rescales to the size of the border, does not rescale if a
-     * border already exists. Assumes the border is larger than the course.
-     *
-     * @param border the race border to be drawn.
-     */
-    @Override
-    public void updateBorder(List<Limit> border) {
-        if (border.size() == 0) {
-            return;
-        }
-
-        borderPoints = border;
-        scaledPoint = ScaledPoint.makeScaledPoint(canvasWidth, canvasHeight, border, false);
-
-        List<Double> boundaryPoints = new ArrayList<>();
-        for (Limit limit : border) {
-            Point2D location = scaledPoint.findScaledXY(limit.getLat(), limit.getLng());
-            boundaryPoints.add(location.getX());
-            boundaryPoints.add(location.getY());
-        }
-        raceBorder.getPoints().setAll(boundaryPoints);
-    }
-}

src/main/java/seng302/visualiser/MiniMap.java

@@ -1,51 +0,0 @@
-package seng302.visualiser;
-
-import java.util.HashMap;
-import java.util.List;
-import javafx.application.Platform;
-import javafx.geometry.Point2D;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Polygon;
-import javafx.scene.transform.Rotate;
-import seng302.model.ClientYacht;
-import seng302.model.Limit;
-import seng302.model.mark.CompoundMark;
-import seng302.model.mark.Corner;
-
-/**
- * Class converts a map preview to a minimap by adding boats.
- */
-public class MiniMap extends MapPreview {
-
-    private HashMap<ClientYacht, Polygon> boatIcons = new HashMap<>();
-
-    public MiniMap (List<CompoundMark> marks, List<Corner> course, List<Limit> border, List<ClientYacht> boats, ClientYacht player) {
-        super(marks, course, border);
-        setBoats(boats);
-        player.addMarkRoundingListener(this::updateMarkArrows);
-    }
-
-    public void setBoats(List<ClientYacht> yachts) {
-        for (ClientYacht yacht : yachts) {
-            Polygon boatIcon = new Polygon(0, -3.5, 3.5, 3.5, -3.5, 3.5);
-            boatIcon.setStroke(Color.BLACK);
-            boatIcon.setFill(Color.GRAY);
-            boatIcon.setFill(yacht.getColour());
-            boatIcon.setFill(yacht.getColour());
-            boatIcons.put(yacht, boatIcon);
-            boatIcon.getTransforms().add(new Rotate(0));
-            yacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> {
-                Platform.runLater(() -> {
-                    Polygon bi = boatIcons.get(boat);
-                    Point2D p2d = scaledPoint.findScaledXY(lat, lon);
-                    bi.setLayoutX(p2d.getX());
-                    bi.setLayoutY(p2d.getY());
-                    ((Rotate) bi.getTransforms().get(0)).setAngle(heading);
-                });
-            });
-        }
-        Platform.runLater(() -> {
-            gameObjects.getChildren().addAll(boatIcons.values());
-        });
-    }
-}

src/main/java/seng302/visualiser/ServerListener.java

@@ -1,17 +1,17 @@
 package seng302.visualiser;
 
-import static seng302.gameServer.ServerAdvertiser.getLocalHostIp;
+import seng302.gameServer.ServerAdvertiser;
+import seng302.gameServer.ServerDescription;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceEvent;
 import javax.jmdns.ServiceListener;
-import seng302.gameServer.ServerAdvertiser;
-import seng302.gameServer.ServerDescription;
+import javax.jmdns.impl.JmDNSImpl;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.*;
+
+import static seng302.gameServer.ServerAdvertiser.getLocalHostIp;
 
 /**
  * Listens for servers on the local network
@@ -58,7 +58,7 @@ public class ServerListener{
                 servers.remove(toRemove);
             }
 
-            delegate.serverRemoved(new ArrayList<>(servers));
+            delegate.serverRemoved(new ArrayList<ServerDescription>(servers));
 
             // Get all other servers with the same name to respond if they are up
             jmdns.requestServiceInfo(ServerAdvertiser.SERVICE_TYPE, serverName);
@@ -94,6 +94,13 @@ public class ServerListener{
 
         listener = new GameServeMonitor();
         jmdns.addServiceListener(ServerAdvertiser.SERVICE_TYPE, listener);
+
+        /*new Timer().schedule(new TimerTask() {
+            @Override
+            public void run() {
+                refresh();
+            }
+        }, 50, SERVICE_REFRESH_INTERVAL);*/
     }
 
     public static ServerListener getInstance() throws IOException {
@@ -127,7 +134,7 @@ public class ServerListener{
         for (ServerDescription server : servers){
             if (server.serverShouldBeRemoved()){
                 listener.servers.remove(server);
-                delegate.serverRemoved(new ArrayList<>(listener.servers));
+                delegate.serverRemoved(new ArrayList<ServerDescription>(listener.servers));
             }
         }
 

src/main/java/seng302/visualiser/cameras/ChaseCamera.java

@@ -1,7 +1,7 @@
 package seng302.visualiser.cameras;
 
-import java.util.Arrays;
-import javafx.beans.property.DoubleProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.geometry.Point3D;
 import javafx.scene.PerspectiveCamera;
@@ -13,118 +13,77 @@ import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 public class ChaseCamera extends PerspectiveCamera implements RaceCamera {
 
-    private final Double VERTICAL_PAN_LIMIT = 20.0;
-    private final Double NEAR_ZOOM_LIMIT = -15.0;
-    private final Double FAR_ZOOM_LIMIT = -125.0;
-
-    private final Double ZOOM_STEP = 2.5;
-    private final Double PAN_STEP = 2.5;
-
     private ObservableList<Transform> transforms;
     private BoatObject playerBoat;
 
-    private Double zoomFactor;
-    private Double horizontalPan;
-    private Double verticalPan;
-
-
     public ChaseCamera() {
         super(true);
         transforms = this.getTransforms();
-
-        zoomFactor = (FAR_ZOOM_LIMIT + NEAR_ZOOM_LIMIT) / 2.0;
-        this.horizontalPan = 0.0;
-        this.verticalPan = 0.0;
     }
 
-    /**
-     * Sets a player boat object to observe and update the camera with.
-     *
-     * @param playerBoat The player boat to be observed.
-     */
     public void setPlayerBoat(BoatObject playerBoat) {
         this.playerBoat = playerBoat;
 
-        for (DoubleProperty o : Arrays
-            .asList(playerBoat.getRotationProperty(), playerBoat.layoutYProperty(),
-                playerBoat.layoutXProperty())) {
-            o.addListener((obs, oldVal, newVal) -> repositionCamera());
+        this.playerBoat.layoutXProperty().addListener(new ChangeListener<Number>() {
+            @Override
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue,
+                Number newValue) {
+                updateCameraX((Double) oldValue, (Double) newValue);
+            }
+        });
+        this.playerBoat.layoutYProperty().addListener(new ChangeListener<Number>() {
+            @Override
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue,
+                Number newValue) {
+                updateCameraY((Double) oldValue, (Double) newValue);
+            }
+        });
+    }
+
+
+    private void updateCameraX(Double oldXValue, Double newXValue) {
+        if (transforms.size() == 0) { // boat is placed and then moved at start,
+            transforms.addAll(
+                new Translate(playerBoat.getLayoutX() - 30, playerBoat.getLayoutY() - 30, -125),
+                new Rotate(80, new Point3D(0, 0, 1))
+            );
+        } else {
+            transforms.addAll(new Translate(newXValue - oldXValue, 0, 0));
         }
     }
 
-    /**
-     * Moves the camera to a new position after some change (Zooming or Panning)
-     */
-    private void repositionCamera() {
-        transforms.clear();
-        transforms.addAll(
-            new Translate(playerBoat.getLayoutX(), playerBoat.getLayoutY(), 0),
-            new Rotate(playerBoat.getRotationProperty().getValue() + horizontalPan,
-                new Point3D(0, 0, 1)),
-            new Rotate(60 + verticalPan, new Point3D(1, 0, 0)),
-            new Translate(0, 0, zoomFactor)
-        );
-    }
-
-    /**
-     * Adjusts the zoom amount (camera depth) by some adjustment value
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustZoomFactor(Double adjustment) {
-        if (zoomFactor + adjustment < NEAR_ZOOM_LIMIT && zoomFactor + adjustment > FAR_ZOOM_LIMIT) {
-            zoomFactor = zoomFactor + adjustment;
-            repositionCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Vertical Panning of the Camera
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustVerticalPan(Double adjustment) {
-        if (verticalPan + adjustment >= -VERTICAL_PAN_LIMIT
-            && verticalPan + adjustment <= VERTICAL_PAN_LIMIT) {
-            verticalPan += adjustment;
-            repositionCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Horizontal Panning of the Camera.
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustHorizontalPan(Double adjustment) {
-        this.horizontalPan += adjustment;
-        repositionCamera();
+    private void updateCameraY(Double oldYValue, Double newYValue) {
+        transforms.addAll(new Translate(0, (newYValue - oldYValue), 0));
     }
 
     @Override
     public void zoomIn() {
-        adjustZoomFactor(ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, 1.5));
     }
 
     @Override
     public void zoomOut() {
-        adjustZoomFactor(-ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, -1.5));
     }
 
+
+    /*
+    These have been left intentionally empty for now. it would be cool to be able to pan around the boat and have the camera move around the boat though.
+    */
+
     @Override
     public void panLeft() {
-        adjustHorizontalPan(-PAN_STEP);
     }
 
     @Override
     public void panRight() {
-        adjustHorizontalPan(PAN_STEP);
     }
 
     @Override
     public void panUp() {
-        adjustVerticalPan(-PAN_STEP);
     }
 
     @Override
     public void panDown() {
-        adjustVerticalPan(PAN_STEP);
     }
 }

src/main/java/seng302/visualiser/cameras/IsometricCamera.java

@@ -1,113 +1,47 @@
 package seng302.visualiser.cameras;
 
 import javafx.collections.ObservableList;
-import javafx.geometry.Point3D;
 import javafx.scene.PerspectiveCamera;
-import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Transform;
 import javafx.scene.transform.Translate;
 
 public class IsometricCamera extends PerspectiveCamera implements RaceCamera {
 
-    private final Double MIN_X = -120.0;
-    private final Double MAX_X = 125.0;
+    ObservableList<Transform> transforms;
 
-    private final Double MIN_Y = 40.0;
-    private final Double MAX_Y = 170.0;
-
-    private final Double PAN_LIMIT = 160.0;
-    private final Double NEAR_ZOOM_LIMIT = -30.0;
-    private final Double FAR_ZOOM_LIMIT = -180.0;
-
-    private Double horizontalPan;
-    private Double verticalPan;
-    private Double zoomFactor;
-
-    private ObservableList<Transform> transforms;
-
-    public IsometricCamera(Double cameraStartX, Double cameraStartY) {
+    public IsometricCamera(Double cameraStartX, Double cameraStartY, Double cameraDepth) {
         super(true);
         transforms = this.getTransforms();
-
-        zoomFactor = FAR_ZOOM_LIMIT;
-        horizontalPan = cameraStartX;
-        verticalPan = cameraStartY;
-
-        updateCamera();
-    }
-
-    /**
-     * Moves the camera to a new position after some change (Zooming or Panning)
-     */
-    private void updateCamera() {
-        transforms.clear();
-        transforms.addAll(
-            new Translate(horizontalPan, verticalPan, zoomFactor),
-            new Rotate(30, new Point3D(1, 0, 0))
-        );
-    }
-
-    /**
-     * Adjusts the zoom amount (camera depth) by some adjustment value
-     *
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustZoomFactor(Double adjustment) {
-        if (zoomFactor + adjustment < NEAR_ZOOM_LIMIT && zoomFactor + adjustment > FAR_ZOOM_LIMIT) {
-            zoomFactor = zoomFactor + adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Vertical Panning of the Camera
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustVerticalPan(Double adjustment) {
-        if (verticalPan + adjustment >= MIN_Y && verticalPan + adjustment <= MAX_Y) {
-            verticalPan += adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Horizontal Panning of the Camera.
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustHorizontalPan(Double adjustment) {
-        if (horizontalPan + adjustment >= MIN_X && horizontalPan + adjustment <= MIN_Y) {
-            this.horizontalPan += adjustment;
-            updateCamera();
-        }
+        transforms.addAll(new Translate(cameraStartX, cameraStartY, cameraDepth));
     }
 
     @Override
     public void zoomIn() {
-        adjustZoomFactor(-2.5);
+        transforms.addAll(new Translate(0, 0, 1.5));
     }
 
     @Override
     public void zoomOut() {
-        adjustZoomFactor(2.5);
+        transforms.addAll(new Translate(0, 0, -1.5));
     }
 
     @Override
     public void panLeft() {
-        adjustHorizontalPan(-2.5);
+        transforms.addAll(new Translate(-1, 0, 0));
     }
 
     @Override
     public void panRight() {
-        adjustHorizontalPan(2.5);
+        transforms.addAll(new Translate(1, 0, 0));
     }
 
     @Override
     public void panUp() {
-        adjustVerticalPan(-2.5);
+        transforms.addAll(new Translate(0, -1, 0));
     }
 
     @Override
     public void panDown() {
-        adjustVerticalPan(2.5);
+        transforms.addAll(new Translate(0, 1, 0));
     }
 }

src/main/java/seng302/visualiser/cameras/TopDownCamera.java

@@ -1,123 +1,48 @@
 package seng302.visualiser.cameras;
 
 
-import java.util.Arrays;
-import javafx.beans.property.DoubleProperty;
 import javafx.collections.ObservableList;
 import javafx.scene.PerspectiveCamera;
 import javafx.scene.transform.Transform;
 import javafx.scene.transform.Translate;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 public class TopDownCamera extends PerspectiveCamera implements RaceCamera {
 
-    private final Double PAN_LIMIT = 40d;
-    private final Double NEAR_ZOOM_LIMIT = -20.0;
-    private final Double FAR_ZOOM_LIMIT = -200d;
-    private final Double ZOOM_STEP = 2.5;
-
-    private ObservableList<Transform> transforms;
-    private BoatObject playerBoat;
-
-    private Double zoomFactor;
-    private Double horizontalPan;
-    private Double verticalPan;
+    ObservableList<Transform> transforms;
 
     public TopDownCamera() {
         super(true);
         transforms = this.getTransforms();
-
-        zoomFactor = FAR_ZOOM_LIMIT;
-        horizontalPan = 0.0;
-        verticalPan = 0.0;
-    }
-
-    /**
-     * Sets a player boat object to observe and update the camera with.
-     *
-     * @param playerBoat The player boat to be observed.
-     */
-    public void setPlayerBoat(BoatObject playerBoat) {
-        this.playerBoat = playerBoat;
-
-        for (DoubleProperty o : Arrays
-            .asList(playerBoat.layoutXProperty(), playerBoat.layoutYProperty())) {
-            o.addListener((obs, oldVal, newVal) -> updateCamera());
-        }
-    }
-
-    /**
-     * Moves the camera to a new position after some change (Zooming or Panning)
-     */
-    private void updateCamera() {
-        transforms.clear();
-        transforms.addAll(
-            new Translate(playerBoat.getLayoutX() + horizontalPan,
-                playerBoat.getLayoutY() + verticalPan, zoomFactor)
-        );
-    }
-
-    /**
-     * Adjusts the zoom amount (camera depth) by some adjustment value
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustZoomFactor(Double adjustment) {
-        if (zoomFactor + adjustment < NEAR_ZOOM_LIMIT && zoomFactor + adjustment > FAR_ZOOM_LIMIT) {
-            zoomFactor = zoomFactor + adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Vertical Panning of the Camera
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustVerticalPan(Double adjustment) {
-        if (verticalPan + adjustment >= -PAN_LIMIT && verticalPan + adjustment <= PAN_LIMIT) {
-            verticalPan += adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Horizontal Panning of the Camera.
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustHorizontalPan(Double adjustment) {
-        if (horizontalPan + adjustment >= -PAN_LIMIT && horizontalPan + adjustment <= PAN_LIMIT) {
-            horizontalPan += adjustment;
-            updateCamera();
-        }
+        transforms.add(new Translate(0, 0, -125));
     }
 
     @Override
     public void zoomIn() {
-        adjustZoomFactor(ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, 1.5));
     }
 
     @Override
     public void zoomOut() {
-        adjustZoomFactor(-ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, -1.5));
     }
 
     @Override
     public void panLeft() {
-        adjustHorizontalPan(-1.0);
+        transforms.addAll(new Translate(-1, 0, 0));
     }
 
     @Override
     public void panRight() {
-        adjustHorizontalPan(1.0);
+        transforms.addAll(new Translate(1, 0, 0));
     }
 
     @Override
     public void panUp() {
-        adjustVerticalPan(-1.0);
+        transforms.addAll(new Translate(0, -1, 0));
     }
 
     @Override
     public void panDown() {
-        adjustVerticalPan(1.0);
+        transforms.addAll(new Translate(0, 1, 0));
     }
-
 }

src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java

@@ -0,0 +1,98 @@
+package seng302.visualiser.controllers;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.ResourceBundle;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.fxml.Initializable;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+import seng302.model.ClientYacht;
+import seng302.utilities.Sounds;
+
+public class FinishScreenViewController implements Initializable {
+
+    @FXML
+    private GridPane finishScreenGridPane;
+    @FXML
+    private TableView<ClientYacht> finishOrderTable;
+    @FXML
+    private TableColumn<ClientYacht, String> posCol;
+    @FXML
+    private TableColumn<ClientYacht, String> boatNameCol;
+    @FXML
+    private TableColumn<ClientYacht, String> shortNameCol;
+    @FXML
+    private TableColumn<ClientYacht, String> countryCol;
+
+    ObservableList<ClientYacht> data = FXCollections.observableArrayList();
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        finishScreenGridPane.getStylesheets()
+            .add(getClass().getResource("/css/Master.css").toString());
+        finishOrderTable.getStylesheets().add(getClass().getResource("/css/Master.css").toString());
+
+        // set up data for table
+        finishOrderTable.setItems(data);
+
+        // setting table col data
+        posCol.setCellValueFactory(
+            new PropertyValueFactory<>("position")
+        );
+        boatNameCol.setCellValueFactory(
+            new PropertyValueFactory<>("boatName")
+        );
+        shortNameCol.setCellValueFactory(
+            new PropertyValueFactory<>("shortName")
+        );
+        countryCol.setCellValueFactory(
+            new PropertyValueFactory<>("country")
+        );
+        finishOrderTable.refresh();
+    }
+
+    public void setFinishers(Collection<ClientYacht> participants) {
+        List<ClientYacht> sorted = new ArrayList<>(participants);
+        sorted.sort(Comparator.comparingInt(ClientYacht::getPlacing));
+        finishOrderTable.getItems().setAll(sorted);
+    }
+
+    private void setContentPane(String jfxUrl) {
+        try {
+            // get the main controller anchor pane (FinishView -> MainView)
+            AnchorPane contentPane = (AnchorPane) finishScreenGridPane.getParent();
+            contentPane.getChildren().removeAll();
+            contentPane.getChildren().clear();
+            contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+            contentPane.getChildren()
+                .addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
+        } catch (javafx.fxml.LoadException e) {
+            System.out.println("[Controller] FXML load exception");
+        } catch (IOException e) {
+            System.out.println("[Controller] IO exception");
+        }
+    }
+
+    public void switchToStartScreenView() {
+        Sounds.playButtonClick();
+        //TODO merge fix
+        setContentPane("/views/StartScreenView.fxml");
+    }
+
+    public void playButtonHoverSound(MouseEvent mouseEvent) {
+        Sounds.playHoverSound();
+    }
+}

src/main/java/seng302/visualiser/controllers/LobbyController.java

@@ -2,31 +2,17 @@ package seng302.visualiser.controllers;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Scale;
-import javafx.scene.transform.Translate;
-import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
 import seng302.model.ClientYacht;
@@ -36,19 +22,18 @@ import seng302.model.RaceState;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.utilities.Sounds;
-import seng302.visualiser.MapPreview;
+import seng302.visualiser.GameView;
 import seng302.visualiser.controllers.cells.PlayerCell;
 import seng302.visualiser.controllers.dialogs.BoatCustomizeController;
-import seng302.visualiser.controllers.dialogs.TokenInfoDialogController;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.*;
 
 public class LobbyController implements Initializable {
 
-    private final double INITIAL_MAP_HEIGHT = 770d;
-    private final double INITIAL_MAP_WIDTH = 574d;
-
     //--------FXML BEGIN--------//
     @FXML
     private VBox playerListVBox;
@@ -63,27 +48,18 @@ public class LobbyController implements Initializable {
     @FXML
     private Label mapName;
     @FXML
-    private AnchorPane serverMap;
-    @FXML
-    private Label roomLabel;
-    @FXML
-    private Label portNumber;
-    @FXML
-    private Pane speedTokenPane, handlingTokenPane, windWalkerTokenPane, bumperTokenPane, randomTokenPane;
+    private Pane serverMap;
     //---------FXML END---------//
 
     private RaceState raceState;
     private JFXDialog customizationDialog;
-    private JFXDialog tokenInfoDialog;
     public Color playersColor;
     private Map<Integer, ClientYacht> playerBoats;
-    private Double mapWidth = INITIAL_MAP_WIDTH, mapHeight = INITIAL_MAP_HEIGHT;
-    private MapPreview mapPreview;
+    private Double mapWidth, mapHeight;
+    private GameView gameView;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        roomLabel.setText("");
-        portNumber.setText("");
 
         this.playerBoats = ViewManager.getInstance().getGameClient().getAllBoatsMap();
 
@@ -107,17 +83,6 @@ public class LobbyController implements Initializable {
             serverName.setText(ViewManager.getInstance().getProperty("serverName"));
             mapName.setText(ViewManager.getInstance().getProperty("mapName"));
 
-            int tries = 0;
-
-            while (DiscoveryServerClient.getRoomCode() == null && tries <= 10){
-                try {
-                    Thread.sleep(10);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                tries ++;
-            }
-
             if (DiscoveryServerClient.getRoomCode() != null){
                 setRoomCode(DiscoveryServerClient.getRoomCode());
             }
@@ -127,16 +92,16 @@ public class LobbyController implements Initializable {
             ViewManager.getInstance().getPlayerList().setAll(ViewManager.getInstance().getPlayerList().sorted());
         });
 
-        customizeButton.setOnMouseReleased(event -> {
-            customizationDialog = createCustomizeDialog();
-            Sounds.playButtonClick();
-            customizationDialog.show();
-        });
-
         Platform.runLater(() -> {
             Integer playerId = ViewManager.getInstance().getGameClient().getServerThread().getClientId();
 
             playersColor = Colors.getColor(playerId - 1);
+            customizationDialog = createCustomizeDialog();
+
+            customizeButton.setOnMouseReleased(event -> {
+                Sounds.playButtonClick();
+                customizationDialog.show();
+            });
         });
 
         leaveLobbyButton.setOnMouseEntered(e -> Sounds.playHoverSound());
@@ -144,118 +109,17 @@ public class LobbyController implements Initializable {
         beginRaceButton.setOnMouseEntered(e -> Sounds.playHoverSound());
 
         initMapPreview();
-        initTokenPreviews();
-    }
-
-
-    /**
-     * Initialises the tokens in the side panel
-     */
-    private void initTokenPreviews() {
-        Group speedToken = ModelFactory.importModel(ModelType.VELOCITY_PICKUP).getAssets();
-        Group handlingToken = ModelFactory.importModel(ModelType.HANDLING_PICKUP).getAssets();
-        Group windWalkerToken = ModelFactory.importModel(ModelType.WIND_WALKER_PICKUP).getAssets();
-        Group bumperToken = ModelFactory.importModel(ModelType.BUMPER_PICKUP).getAssets();
-        Group randomToken = ModelFactory.importModel(ModelType.RANDOM_PICKUP).getAssets();
-
-        HashMap<Pane, Group> tokenPanes = new HashMap<>();
-        tokenPanes.put(speedTokenPane, speedToken);
-        tokenPanes.put(handlingTokenPane, handlingToken);
-        tokenPanes.put(windWalkerTokenPane, windWalkerToken);
-        tokenPanes.put(bumperTokenPane, bumperToken);
-        tokenPanes.put(randomTokenPane, randomToken);
-
-        Scale hoverScale = new Scale(1.2, 1.2, 1.2);
-
-        tokenPanes.entrySet().forEach((entry) -> {
-            Pane thisPane = entry.getKey();
-            Group thisToken = entry.getValue();
-
-            thisToken.getTransforms().addAll(
-                new Translate(40, 50, 0),
-                new Scale(13, 13, 13));
-
-            thisPane.setOnMouseEntered(event -> {
-                thisToken.getTransforms().add(hoverScale);
-            });
-            thisPane.setOnMouseExited(event -> {
-                thisToken.getTransforms().remove(hoverScale);
-            });
-            thisPane.setOnMouseReleased(event -> {
-                tokenInfoDialog = makeTokenDialog(thisPane);
-                tokenInfoDialog.show();
-            });
-
-            thisPane.getChildren().add(thisToken);
-        });
-
-        //Hacky rotations for wind and random to level it in the plane
-        windWalkerToken.getTransforms().addAll(
-            new Rotate(-70, new Point3D(1, 0, 0)),
-            new Translate(0, 2,0)
-        );
-        randomToken.getTransforms().addAll(
-            new Rotate(-90, new Point3D(1, 0, 0)),
-            new Translate(0, 0,1)
-        );
-    }
-
-    private JFXDialog makeTokenDialog(Pane inducingPane) {
-        String header = "...";
-        String body = "Nothing to see here";
-        ModelType modelType = ModelType.RANDOM_PICKUP;
-
-        if (inducingPane == speedTokenPane) {
-            header = "Speed Boost";
-            body = "Increases your max velocity";
-            modelType = ModelType.VELOCITY_PICKUP;
-        } else if (inducingPane == handlingTokenPane) {
-            header = "Handling Boost";
-            body = "Increases your turing rate";
-            modelType = ModelType.HANDLING_PICKUP;
-        } else if (inducingPane == windWalkerTokenPane) {
-            header = "Wind Walker";
-            body = "The wind now rotates with you, giving you your optimal speed in all directions";
-            modelType = ModelType.WIND_WALKER_PICKUP;
-        } else if (inducingPane == bumperTokenPane) {
-            header = "Bumper";
-            body = "While this is active, upon hitting another boat, you will power it down for a short time";
-            modelType = ModelType.BUMPER_PICKUP;
-        } else if (inducingPane == randomTokenPane) {
-            header = "Random";
-            body = "A 50% chance of becoming any other token and a 50% chance of slowing your boat for a time";
-            modelType = ModelType.RANDOM_PICKUP;
-        }
-
-        FXMLLoader dialog = new FXMLLoader(
-            getClass().getResource("/views/dialogs/TokenInfoDialog.fxml"));
-
-        JFXDialog tokenInfoDialog = null;
-
-        try {
-            tokenInfoDialog = new JFXDialog(serverListMainStackPane, dialog.load(),
-                JFXDialog.DialogTransition.CENTER);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        TokenInfoDialogController controller = dialog.getController();
-        controller.setParentController(this);
-        controller.setHeader(header);
-        controller.setContent(body);
-        controller.setToken(modelType);
-        return tokenInfoDialog;
     }
 
     private JFXDialog createCustomizeDialog() {
         FXMLLoader dialog = new FXMLLoader(
-                getClass().getResource("/views/dialogs/BoatCustomizeDialog.fxml"));
+            getClass().getResource("/views/dialogs/BoatCustomizeDialog.fxml"));
 
         JFXDialog customizationDialog = null;
 
         try {
             customizationDialog = new JFXDialog(serverListMainStackPane, dialog.load(),
-                    JFXDialog.DialogTransition.CENTER);
+                JFXDialog.DialogTransition.CENTER);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -267,36 +131,48 @@ public class LobbyController implements Initializable {
         controller.setPlayerName(this.playerBoats
             .get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
             .getBoatName());
-        controller.setCurrentBoat(this.playerBoats.get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
-            .getBoatType().toString());
 
         return customizationDialog;
     }
 
+    /**
+     *
+     */
+    private void refreshMapView(){
+        RaceXMLData raceData = ViewManager.getInstance().getGameClient().getCourseData();
+        List<Limit> border = raceData.getCourseLimit();
+        List<CompoundMark> marks = new ArrayList<CompoundMark>(raceData.getCompoundMarks().values());
+        List<Corner> corners = raceData.getMarkSequence();
+
+        gameView.setSize(mapWidth, mapHeight);
+
+        // Update game view
+        gameView.updateBorder(border);
+        gameView.updateCourse(marks, corners);
+    }
 
     /**
      * Initializes a top down preview of the race course map.
      */
     private void initMapPreview() {
-        RaceXMLData raceData = ViewManager.getInstance().getGameClient().getCourseData();
-        List<Limit> border = raceData.getCourseLimit();
-        List<CompoundMark> marks = new ArrayList<>(raceData.getCompoundMarks().values());
-        List<Corner> corners = raceData.getMarkSequence();
+        gameView = new GameView();
+        gameView.setHorizontalBuffer(330d);
 
-        mapPreview = new MapPreview(marks, corners, border);
+        mapWidth = 770d;
+        mapHeight = 574d;
+
+        // Add game view
         serverMap.getChildren().clear();
-        serverMap.getChildren().add(mapPreview.getAssets());
-
-        mapPreview.setSize(mapWidth, mapHeight);
+        serverMap.getChildren().add(gameView);
 
         serverMap.widthProperty().addListener((observable, oldValue, newValue) -> {
             mapWidth = newValue.doubleValue();
-            mapPreview.setSize(mapWidth, mapHeight);
+            refreshMapView();
         });
-//
+
         serverMap.heightProperty().addListener((observable, oldValue, newValue) -> {
             mapHeight = newValue.doubleValue();
-            mapPreview.setSize(mapWidth, mapHeight);
+            refreshMapView();
         });
     }
 
@@ -328,7 +204,7 @@ public class LobbyController implements Initializable {
             FXMLLoader loader = new FXMLLoader(
                 getClass().getResource("/views/cells/PlayerCell.fxml"));
 
-            loader.setController(new PlayerCell(playerId, yacht));
+            loader.setController(new PlayerCell(playerId, yacht.getBoatName(), yacht.getColour()));
 
             try {
                 pane = loader.load();
@@ -353,8 +229,8 @@ public class LobbyController implements Initializable {
     }
 
     /**
-     * Updates the state of the race and changes the value
-     * @param raceState the new race state
+     *
+     * @param raceState
      */
     public void updateRaceState(RaceState raceState){
         this.raceState = raceState;
@@ -369,15 +245,7 @@ public class LobbyController implements Initializable {
         customizationDialog.close();
     }
 
-    public void closeTokenInfoDialog() {
-        tokenInfoDialog.close();
-    }
-
     public void setRoomCode(String roomCode) {
-        roomLabel.setText("Room: " + roomCode);
-    }
-
-    public void setPortNumber(String p){
-        portNumber.setText("Port: " + p);
+        roomLabel.setText("Room#" + roomCode);
     }
 }

src/main/java/seng302/visualiser/controllers/RaceViewController.java

@@ -4,68 +4,100 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.TimeUnit;
+import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Point2D;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.SubScene;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
+import javafx.scene.chart.XYChart.Data;
+import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.Slider;
 import javafx.scene.control.TextField;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.Polyline;
 import javafx.scene.text.Text;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import seng302.model.ClientYacht;
+import seng302.model.ClientYacht.PowerUpListener;
 import seng302.model.RaceState;
 import seng302.model.mark.CompoundMark;
+import seng302.model.mark.Mark;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.token.TokenType;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameView3D;
-import seng302.visualiser.MiniMap;
-import seng302.visualiser.controllers.cells.WindCell;
+import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
+import seng302.visualiser.controllers.annotations.ImportantAnnotationDelegate;
+import seng302.visualiser.controllers.annotations.ImportantAnnotationsState;
 import seng302.visualiser.controllers.dialogs.FinishDialogController;
 import seng302.visualiser.fxObjects.ChatHistory;
+import seng302.visualiser.fxObjects.assets_2D.WindArrow;
+import seng302.visualiser.fxObjects.assets_3D.BoatObject;
+import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
+import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
 /**
  * Controller class that manages the display of a race
  */
-public class RaceViewController extends Thread {
+public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
     private final int CHAT_LIMIT = 128;
     private static final Double ICON_BLINK_TIMEOUT_RATIO = 0.6;
     private static final Integer ICON_BLINK_PERIOD = 500;
 
     @FXML
-    private AnchorPane loadingScreenPane;
-    @FXML
-    private ImageView loadingScreen;
+    private Pane basePane;
     @FXML
     private JFXButton chatSend;
     @FXML
     private Pane chatHistoryHolder;
     @FXML
-    private JFXButton chatToggleButton;
-    @FXML
     private TextField chatInput;
     @FXML
+    private LineChart<String, Double> raceSparkLine;
+    @FXML
+    private NumberAxis sparklineYAxis;
+    @FXML
+    private VBox positionVbox;
+    @FXML
+    private CheckBox toggleFps;
+    @FXML
     private Label timerLabel;
     @FXML
-    private StackPane contentStackPane;
-    @FXML
-    private Pane miniMapPane;
-    @FXML
-    private ImageView windImageView;
+    private StackPane contentAnchorPane;
+
+    private GridPane contentGridPane;
     @FXML
     private AnchorPane rvAnchorPane;
     @FXML
@@ -78,8 +110,8 @@ public class RaceViewController extends Thread {
     private ComboBox<ClientYacht> yachtSelectionComboBox;
     @FXML
     private Text fpsDisplay;
-//    @FXML
-//    private ImageView windImageView;
+    @FXML
+    private ImageView windImageView;
     @FXML
     private Label windDirectionLabel;
     @FXML
@@ -87,56 +119,59 @@ public class RaceViewController extends Thread {
     @FXML
     private Label positionLabel, boatSpeedLabel, boatHeadingLabel;
     @FXML
-    private ImageView velocityIcon, handlingIcon, windWalkerIcon, bumperIcon, badRandomIcon;
-    @FXML
-    private VBox windArrowVBox;
-    @FXML
-    private JFXButton miniMapButton;
+    private ImageView velocityIcon, handlingIcon, windWalkerIcon, bumperIcon;
 
-
-    private WindCell windCell;
     //Race Data
     private Map<Integer, ClientYacht> participants;
     private Map<Integer, CompoundMark> markers;
     private RaceXMLData courseData;
     private GameView3D gameView;
     private RaceState raceState;
+
     private ChatHistory chatHistory;
+
+    private Timeline timerTimeline;
     private Timer timer = new Timer();
+    private List<Series<String, Double>> sparkLineData = new ArrayList<>();
+    private ImportantAnnotationsState importantAnnotations;
+    private Polyline windArrow = new WindArrow(Color.LIGHTGRAY);
+    private ObservableList<ClientYacht> selectionComboBoxList = FXCollections.observableArrayList();
     private ClientYacht player;
     private JFXDialog finishScreenDialog;
     private FinishDialogController finishDialogController;
-    private Timer blinkingTimer = new Timer();
-    private ImageView iconToDisplay;
-    private Double lastWindDirection;
-    private MiniMap miniMap;
 
     public void initialize() {
-        miniMapPane.setVisible(false);
-        miniMapButton.setVisible(false);
-        chatHistoryHolder.setVisible(false);
-        chatToggleButton.setVisible(false);
-        contentStackPane.setVisible(false);
-        Image loadingImage = new Image("PP.png");
-        loadingScreen.setImage(loadingImage);
-        //Centers the Image within the image view
-        double w = 0;
-        double h = 0;
-        double ratioX = loadingScreen.getFitWidth() / loadingImage.getWidth();
-        double ratioY = loadingScreen.getFitHeight() / loadingImage.getHeight();
-        double reduceRatio = 0;
-        if(ratioX >= ratioY) {
-            reduceRatio = ratioY;
-        } else {
-            reduceRatio = ratioX;
-        }
-        w = loadingImage.getWidth() * reduceRatio;
-        h = loadingImage.getHeight() * reduceRatio;
-        loadingScreen.setX((loadingScreen.getFitWidth() - w) / 2);
-        loadingScreen.setY((loadingScreen.getFitHeight() - h) / 2);
         Sounds.stopMusic();
         Sounds.playRaceMusic();
 
+        finishScreenDialog = createFinishDialog();
+
+        // Load a default important annotation state
+        //importantAnnotations = new ImportantAnnotationsState();
+
+        //Formatting the y axis of the sparkline
+//        raceSparkLine.getYAxis().setRotate(180);
+//        raceSparkLine.getYAxis().setTickLabelRotation(180);
+//        raceSparkLine.getYAxis().setTranslateX(-5);
+        //raceSparkLine.visibleProperty().setValue(false);
+        //raceSparkLine.getYAxis().setAutoRanging(false);
+        //sparklineYAxis.setTickMarkVisible(false);
+
+        //positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+//        raceSparkLine.visibleProperty().setValue(false);
+//        raceSparkLine.getYAxis().setAutoRanging(false);
+//        sparklineYAxis.setTickMarkVisible(false);
+//        positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+
+        //selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
+//        rvAnchorPane.prefWidthProperty().bind(ViewManager.getInstance().getDecorator().widthProperty());
+//        rvAnchorPane.prefHeightProperty().bind(ViewManager.getInstance().getDecorator().heightProperty());
+//        selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
+//        windArrowHolder.getChildren().addAll(windArrow);
+//        windArrow.setLayoutX(windArrowHolder.getWidth() / 2);
+//        windArrow.setLayoutY(windArrowHolder.getHeight() / 2);
+
+//        selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
         chatInput.lengthProperty().addListener((obs, oldLen, newLen) -> {
             if (newLen.intValue() > CHAT_LIMIT) {
                 chatInput.setText(chatInput.getText().substring(0, CHAT_LIMIT));
@@ -150,84 +185,51 @@ public class RaceViewController extends Thread {
         chatHistory.prefHeightProperty().bind(
             chatHistoryHolder.heightProperty()
         );
+//        chatHistory.setFitToWidth(true);
+//        chatHistory.setFitToHeight(true);
+//        chatHistory.textProperty().addListener((obs, oldValue, newValue) -> {
+//            chatHistory.setScrollTop(Double.MAX_VALUE);
+//        });
+        rvAnchorPane.setOnMouseClicked((event) ->
+                rvAnchorPane.requestFocus()
+        );
 
-        contentStackPane.getChildren().remove(chatToggleButton);
-        contentStackPane.getChildren().add(chatToggleButton);
-
-        contentStackPane.setOnMouseClicked(event -> {
-            contentStackPane.requestFocus();
-        });
-        Platform.runLater(contentStackPane::requestFocus);
         //Makes the chat history non transparent when clicked on
-        chatInput.focusedProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                chatHistory.increaseOpacity();
-            } else {
-                chatHistory.decreaseOpacity();
+        chatInput.focusedProperty().addListener(new ChangeListener<Boolean>() {
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue,
+                Boolean newValue) {
+                if (newValue) {
+                    chatHistory.increaseOpacity();
+                } else {
+                    chatHistory.decreaseOpacity();
+                }
             }
         });
-
-        lastWindDirection = 0d;
-
-    }
-
-    /**
-     * Initialise wind arrow cell.
-     */
-    private void initialiseWindArrow() {
-        FXMLLoader loader = new FXMLLoader(
-            getClass().getResource("/views/cells/WindCell.fxml"));
-        windCell = new WindCell();
-        loader.setController(windCell);
-
-        try {
-            loader.load();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        windCell.init(player, raceState.getWindDirection());
-        windCell.setCamera(gameView.getView().getCamera());
-        gameView.getView().cameraProperty()
-            .addListener((obs, oldVal, newVal) -> windCell.setCamera(newVal));
-
-        windArrowVBox.getChildren().add(windCell.getAssets());
     }
 
     public void showFinishDialog(ArrayList<ClientYacht> finishedBoats) {
         raceState.setRaceStarted(false);
-        createFinishDialog(finishedBoats);
+        finishDialogController.setFinishedBoats(finishedBoats);
+        finishScreenDialog.show();
     }
 
-    public void showView(){
-        loadingScreenPane.setVisible(false);
-        contentStackPane.setVisible(true);
-        miniMapPane.setVisible(true);
-        miniMapButton.setVisible(true);
-        chatHistoryHolder.setVisible(true);
-        chatToggleButton.setVisible(true);
-
-        Platform.runLater(() -> contentStackPane.requestFocus());
-    }
-
-    /**
-     * Create finishScreenDialog and set up finishDialogController.
-     */
-    private void createFinishDialog(ArrayList<ClientYacht> finishedBoats) {
+    private JFXDialog createFinishDialog() {
         FXMLLoader dialog = new FXMLLoader(
             getClass().getResource("/views/dialogs/RaceFinishDialog.fxml"));
 
-        Platform.runLater(() -> {
-            try {
-                finishScreenDialog = new JFXDialog(contentStackPane, dialog.load(),
-                    JFXDialog.DialogTransition.CENTER);
-                finishDialogController = dialog.getController();
-                finishDialogController.setFinishedBoats(finishedBoats);
-                finishScreenDialog.show();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
+        JFXDialog finishScreenDialog = null;
+
+        try {
+            finishScreenDialog = new JFXDialog(contentAnchorPane, dialog.load(),
+                JFXDialog.DialogTransition.CENTER);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        finishDialogController = dialog.getController();
+
+        return finishScreenDialog;
     }
 
 
@@ -235,46 +237,32 @@ public class RaceViewController extends Thread {
         Map<Integer, ClientYacht> participants, RaceXMLData raceData, RaceState raceState,
         ClientYacht player) {
 
+        this.participants = participants;
+        this.courseData = raceData;
+        this.markers = raceData.getCompoundMarks();
         this.raceState = raceState;
         this.player = player;
 
+        raceState.getPlayerPositions().addListener((ListChangeListener<ClientYacht>) c -> {
+            while (c.next()) {
+                if (c.wasPermutated()) {
+                    updateOrder(raceState.getPlayerPositions());
+                    updateSparkLine();
+                }
+            }
+        });
+
         player.addPowerUpListener(this::displayPowerUpIcon);
-        player.addPowerDownListener(this::removeIcon);
 
+        updateOrder(raceState.getPlayerPositions());
         gameView = new GameView3D();
-        miniMap = new MiniMap(
-            new ArrayList<>(raceData.getCompoundMarks().values()),
-            raceData.getMarkSequence(), raceData.getCourseLimit(),
-            new ArrayList<>(participants.values()), player
-        );
-
-        miniMapButton.setOnMouseClicked((event) -> {
-            if (miniMapPane.visibleProperty().get()) {
-                miniMapPane.setVisible(false);
-                miniMapButton.setText("+");
-            } else {
-                miniMapPane.setVisible(true);
-                miniMapButton.setText("—");
-            }
-        });
-
-        chatToggleButton.setOnMouseClicked((event) -> {
-            if (chatHistoryHolder.visibleProperty().get()) {
-                chatHistoryHolder.setVisible(false);
-                chatToggleButton.setText("+");
-            } else {
-                chatHistoryHolder.setVisible(true);
-                chatToggleButton.setText("—");
-            }
-        });
-
+//        gameView.setFrameRateFXText(fpsDisplay);
         Platform.runLater(() -> {
-            contentStackPane.getChildren().add(0, gameView.getAssets());
+            contentAnchorPane.getChildren().add(0, gameView.getAssets());
             ((SubScene) gameView.getAssets()).widthProperty()
                 .bind(ViewManager.getInstance().getStage().widthProperty());
             ((SubScene) gameView.getAssets()).heightProperty()
                 .bind(ViewManager.getInstance().getStage().heightProperty());
-            miniMapPane.getChildren().add(miniMap.getAssets());
         });
         gameView.setBoats(new ArrayList<>(participants.values()));
         gameView.updateBorder(raceData.getCourseLimit());
@@ -282,10 +270,11 @@ public class RaceViewController extends Thread {
         gameView.updateCourse(
             new ArrayList<>(raceData.getCompoundMarks().values()), raceData.getMarkSequence()
         );
+//        gameView.enableZoom();
         gameView.setBoatAsPlayer(player);
+//        gameView.startRace();
 
 //        raceState.addCollisionListener(gameView::drawCollision);
-
         raceState.windDirectionProperty().addListener((obs, oldDirection, newDirection) -> {
             gameView.setWindDir(newDirection.doubleValue());
             Platform.runLater(() -> updateWindDirection(newDirection.doubleValue()));
@@ -298,12 +287,8 @@ public class RaceViewController extends Thread {
             updateWindSpeed(raceState.getWindSpeed());
         });
         gameView.setWindDir(raceState.windDirectionProperty().doubleValue());
-        Platform.runLater(this::initializeUpdateTimer);
-
         Platform.runLater(() -> {
-            //windCell.setCamera(gameView.getView().getCamera());
-
-            initialiseWindArrow();
+            initializeUpdateTimer();
         });
     }
 
@@ -316,9 +301,7 @@ public class RaceViewController extends Thread {
      */
     private void displayPowerUpIcon(ClientYacht yacht, TokenType tokenType) {
         if (yacht == player) {
-            if (iconToDisplay != null) {
-                iconToDisplay.setVisible(false);
-            }
+            final ImageView iconToDisplay;
 
             switch (tokenType) {
                 case BOOST:
@@ -333,9 +316,6 @@ public class RaceViewController extends Thread {
                 case BUMPER:
                     iconToDisplay = bumperIcon;
                     break;
-                case RANDOM:
-                    iconToDisplay = badRandomIcon;
-                    break;
                 default:
                     iconToDisplay = velocityIcon;
             }
@@ -344,10 +324,7 @@ public class RaceViewController extends Thread {
             iconToDisplay.setVisible(true);
 
             //Start blinking icon towards end
-            if (blinkingTimer != null) {
-                blinkingTimer.cancel();
-            }
-            blinkingTimer = new Timer("Blinking Timer");
+            Timer blinkingTimer = new Timer();
             blinkingTimer.schedule(new TimerTask() {
                 Boolean isVisible = true;
 
@@ -357,16 +334,189 @@ public class RaceViewController extends Thread {
                     iconToDisplay.setVisible(isVisible);
                 }
             }, (int) (tokenType.getTimeout() * ICON_BLINK_TIMEOUT_RATIO), ICON_BLINK_PERIOD);
+
+            //Turn icon off after the time out
+            Timer switchOffTimer = new Timer();
+            switchOffTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    blinkingTimer.cancel();
+                    iconToDisplay.setVisible(false);
+                }
+            }, tokenType.getTimeout());
         }
     }
 
-    private void removeIcon(ClientYacht yacht) {
-        if (yacht == player) {
-            blinkingTimer.cancel();
-            iconToDisplay.setVisible(false);
+
+    /**
+     * The important annotations have been changed, update this view
+     *
+     * @param importantAnnotationsState The current state of the selected annotations
+     */
+    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState) {
+        this.importantAnnotations = importantAnnotationsState;
+        setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
+    }
+
+
+    /**
+     * Loads the "select annotations" view in a new window
+     */
+    private void loadSelectAnnotationView() {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader();
+            Stage stage = new Stage();
+            // Set controller
+            ImportantAnnotationController controller = new ImportantAnnotationController(
+                this, stage
+            );
+            fxmlLoader.setController(controller);
+            // Load FXML and set CSS
+            fxmlLoader.setLocation(
+                getClass().getResource("/views/importantAnnotationSelectView.fxml")
+            );
+            Scene scene = new Scene(fxmlLoader.load(), 469, 298);
+            scene.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+            stage.initStyle(StageStyle.UNDECORATED);
+            stage.setScene(scene);
+            stage.show();
+            controller.loadState(importantAnnotations);
+        } catch (IOException e) {
+            e.printStackTrace();
         }
     }
 
+    private void initialiseFPSCheckBox() {
+//        toggleFps.selectedProperty().addListener((obs, oldVal, newVal) ->
+//            gameView.setFPSVisibility(toggleFps.isSelected())
+//        );
+    }
+
+    private void initialiseAnnotationSlider() {
+//        annotationSlider.setLabelFormatter(new StringConverter<Double>() {
+//            @Override
+//            public String toString(Double n) {
+//                if (n == 0) {
+//                    return "None";
+//                }
+//                if (n == 1) {
+//                    return "Important";
+//                }
+//                if (n == 2) {
+//                    return "All";
+//                }
+//                return "All";
+//            }
+//
+//            @Override
+//            public Double fromString(String s) {
+//                switch (s) {
+//                    case "None":
+//                        return 0d;
+//                    case "Important":
+//                        return 1d;
+//                    case "All":
+//                        return 2d;
+//
+//                    default:
+//                        return 2d;
+//                }
+//            }
+//        });
+//        annotationSlider.setValue(2);
+//        annotationSlider.valueProperty().addListener((obs, oldVal, newVal) ->
+//            setAnnotations((int) annotationSlider.getValue())
+//        );
+    }
+
+
+    /**
+     * Used to add any new yachts into the race that may have started late or not have had data received yet
+     */
+    private void updateSparkLine(){
+//        // TODO: 2/08/17 there is about 0 chance of this working. Once we are keeping track of boat positions it can be fixed.
+//        // Collect the racing yachts that aren't already in the chart
+//        sparkLineData.clear();
+//        List<ClientYacht> sparkLineCandidates = new ArrayList<>(participants.values());
+//        // Create a new data series for new yachts
+//        sparkLineCandidates
+//            .stream()
+//            .filter(yacht -> yacht.getPosition() != null)
+//            .forEach(yacht -> {
+//                Series<String, Double> yachtData = new Series<>();
+//                yachtData.setName(yacht.getSourceId().toString());
+//                yachtData.getData().add(
+//                    new Data<>(
+//                        Integer.toString(yacht.getLegNumber()),
+//                        1.0 + participants.size() - yacht.getPosition()
+//                    )
+//                );
+//            sparkLineData.add(yachtData);
+//            });
+//
+//        // Lambda function to sort the series in order of leg (later legs shown more to the right)
+//        sparkLineData.sort((o1, o2) -> {
+//            Integer leg1 =  Integer.parseInt(o1.getData().get(o1.getData().size()-1).getXValue());
+//            Integer leg2 =  Integer.parseInt(o2.getData().get(o2.getData().size()-1).getXValue());
+//            if (leg2 < leg1){
+//                return 1;
+//            } else {
+//                return -1;
+//            }
+//        });
+//
+//        // Adds the new data series to the sparkline (and set the colour of the series)
+//        Platform.runLater(() -> {
+//            sparkLineData
+//                .stream()
+//                .filter(spark -> !raceSparkLine.getData().contains(spark))
+//                .forEach(spark -> {
+//                    raceSparkLine.getData().add(spark);
+//                    spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()));
+//                });
+//        });
+    }
+
+    private void initialiseSparkLine() {
+//        sparklineYAxis.setUpperBound(participants.size() + 1);
+//        raceSparkLine.setCreateSymbols(false);
+    }
+
+    /**
+     * Updates the yachts sparkline of the desired yacht and using the new leg number
+     * @param yacht The yacht to be updated on the sparkline
+     * @param legNumber the leg number that the position will be assigned to
+     */
+    void updateYachtPositionSparkline(ClientYacht yacht, Integer legNumber){
+        for (XYChart.Series<String, Double> positionData : sparkLineData) {
+            positionData.getData().add(
+                new Data<>(
+                    Integer.toString(legNumber),
+                    1.0 + participants.size() - yacht.getPlacing()
+                )
+            );
+        }
+    }
+
+
+    /**
+     * gets the rgb string of the yachts colour to use for the chart via css
+     * @param yachtId id of yacht passed in to get the yachts colour
+     * @return the colour as an rgb string
+     */
+    private String getBoatColorAsRGB(String yachtId){
+        Color color = participants.get(Integer.valueOf(yachtId)).getColour();
+        if (color == null){
+            return String.format("#%02X%02X%02X",255,255,255);
+        }
+        return String.format( "#%02X%02X%02X",
+            (int)( color.getRed() * 255 ),
+            (int)( color.getGreen() * 255 ),
+            (int)( color.getBlue() * 255 )
+        );
+    }
+
+
     /**
      * Initialises a timer which updates elements of the RaceView such as wind direction, yacht
      * orderings etc.. which are dependent on the info from the stream parser constantly.
@@ -384,19 +534,42 @@ public class RaceViewController extends Thread {
         }, 0, 1000);
     }
 
+    /**
+     * Iterates over all corners until ones SeqID matches with the yachts current leg number.
+     * Then it gets the compoundMarkID of that corner and uses it to fetch the appropriate mark
+     * Returns null if no next mark found.
+     * @param bg The BoatGroup to find the next mark of
+     * @return The next Mark or null if none found
+     */
+    private Mark getNextMark(BoatObject bg) {
+        // TODO: 1/08/17 Move to GameView
+//
+//        Integer legNumber = bg.getClientYacht().getLegNumber();
+//        List<Corner> markSequence = courseData.getMarkSequence();
+//
+//        if (legNumber == 0) {
+//            return null;
+//        } else if (legNumber == markSequence.size() - 1) {
+//            return null;
+//        }
+//
+//        for (Corner corner : markSequence) {
+//            if (legNumber + 2 == corner.getSeqID()) {
+//                return courseData.getCompoundMarks().get(corner.getCompoundMarkID());
+//            }
+//        }
+//        return null;
+        return null;
+    }
+
+
     /**
      * Updates the wind direction arrow and text as from info from the StreamParser
      * @param direction the from north angle of the wind.
      */
     private void updateWindDirection(double direction) {
         windDirectionLabel.setText(String.format("%.1f°", direction));
-//        RotateTransition rt = new RotateTransition(Duration.millis(300), windImageView);
-//        rt.setByAngle(direction - lastWindDirection);
-//        rt.setCycleCount(3);
-//        rt.setAutoReverse(true);
-//        rt.play();
-//        lastWindDirection = direction;
-//        windImageView.setRotate(direction);
+        windImageView.setRotate(direction);
     }
 
     /**
@@ -465,6 +638,226 @@ public class RaceViewController extends Thread {
         boatHeadingLabel.setText(String.format("Boat Heading:\n%.1f°", player.getHeading()));
     }
 
+    /**
+     * Updates the order of the yachts as from the StreamParser and sets them in the yacht order
+     * section
+     */
+    private void updateOrder(ObservableList<ClientYacht> yachts) {
+//        List<Text> vboxEntries = new ArrayList<>();
+//
+//        for (int i = 0; i < yachts.size(); i++) {
+////            System.out.println("yacht == null  " + String.valueOf(yacht == null));
+//            if (yachts.get(i).getBoatStatus() == BoatStatus.FINISHED
+//                .getCode()) {  // 3 is finish status
+//                Text textToAdd = new Text(i + 1 + ". " +
+//                    yachts.get(i).getShortName() + " (Finished)");
+//                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+//                vboxEntries.add(textToAdd);
+//
+//            } else {
+//                Text textToAdd = new Text(i + 1 + ". " +
+//                    yachts.get(i).getShortName() + " ");
+//                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
+//                textToAdd.setStyle("");
+//                vboxEntries.add(textToAdd);
+//            }
+//        }
+//        Platform.runLater(() ->
+//            positionVbox.getChildren().setAll(vboxEntries)
+//        );
+    }
+
+
+    private void updateLaylines(BoatObject bg) {
+        // TODO: 1/08/17 move to GameView
+//
+//        Mark nextMark = getNextMark(bg);
+//        Boolean isUpwind = null;
+//        // Can only calc leg direction if there is a next mark and it is a gate mark
+//        if (nextMark != null) {
+//            if (nextMark instanceof GateMark) {
+//                if (bg.isUpwindLeg(gameViewController, nextMark)) {
+//                    isUpwind = true;
+//                } else {
+//                    isUpwind = false;
+//                }
+//
+//                for(MarkObject mg : gameViewController.getMarkGroups()) {
+//
+//                    mg.removeLaylines();
+//
+//                    if (mg.getMainMark().getId() == nextMark.getId()) {
+//
+//                        SingleMark singleMark1 = ((GateMark) nextMark).getSingleMark1();
+//                        SingleMark singleMark2 = ((GateMark) nextMark).getSingleMark2();
+//                        Point2D markPoint1 = gameViewController
+//                            .findScaledXY(singleMark1.getLatitude(), singleMark1.getLongitude());
+//                        Point2D markPoint2 = gameViewController
+//                            .findScaledXY(singleMark2.getLatitude(), singleMark2.getLongitude());
+//                        HashMap<Double, Double> angleAndSpeed;
+//                        if (isUpwind) {
+//                            angleAndSpeed = PolarTable.getOptimalUpwindVMG(StreamParser.getWindSpeed());
+//                        } else {
+//                            angleAndSpeed = PolarTable.getOptimalDownwindVMG(StreamParser.getWindSpeed());
+//                        }
+//
+//                        Double resultingAngle = angleAndSpeed.keySet().iterator().next();
+//
+//
+//                        Point2D yachtCurrentPos = new Point2D(bg.getBoatLayoutX(), bg.getBoatLayoutY());
+//                        Point2D gateMidPoint = markPoint1.midpoint(markPoint2);
+//                        Integer lineFuncResult = GeoUtility.lineFunction(yachtCurrentPos, gateMidPoint, markPoint2);
+//                        Line rightLayline = new Line();
+//                        Line leftLayline = new Line();
+//                        if (lineFuncResult == 1) {
+//                            rightLayline = makeRightLayline(markPoint2, 180 - resultingAngle, StreamParser.getWindDirection());
+//                            leftLayline = makeLeftLayline(markPoint1, 180 - resultingAngle, StreamParser.getWindDirection());
+//                        } else if (lineFuncResult == -1) {
+//                            rightLayline = makeRightLayline(markPoint1, 180 - resultingAngle, StreamParser.getWindDirection());
+//                            leftLayline = makeLeftLayline(markPoint2, 180 - resultingAngle, StreamParser.getWindDirection());
+//                        }
+//
+//                        leftLayline.setStrokeWidth(0.5);
+//                        leftLayline.setStroke(bg.getBoat().getColour());
+//
+//                        rightLayline.setStrokeWidth(0.5);
+//                        rightLayline.setStroke(bg.getBoat().getColour());
+//
+//                        bg.setLaylines(leftLayline, rightLayline);
+//                        mg.addLaylines(leftLayline, rightLayline);
+//
+//                    }
+//                }
+//            }
+//        }
+    }
+
+
+    private Point2D getPointRotation(Point2D ref, Double distance, Double angle) {
+        Double newX = ref.getX() + (ref.getX() + distance - ref.getX()) * Math.cos(angle)
+            - (ref.getY() + distance - ref.getY()) * Math.sin(angle);
+        Double newY = ref.getY() + (ref.getX() + distance - ref.getX()) * Math.sin(angle)
+            + (ref.getY() + distance - ref.getY()) * Math.cos(angle);
+
+        return new Point2D(newX, newY);
+    }
+
+
+    public Line  makeLeftLayline(Point2D startPoint, Double layLineAngle, Double baseAngle) {
+        Point2D ep = getPointRotation(startPoint, 50.0, baseAngle + layLineAngle);
+        Line line = new Line(startPoint.getX(), startPoint.getY(), ep.getX(), ep.getY());
+        return line;
+
+    }
+
+
+    public Line makeRightLayline(Point2D startPoint, Double layLineAngle, Double baseAngle) {
+
+        Point2D ep = getPointRotation(startPoint, 50.0, baseAngle - layLineAngle);
+        Line line = new Line(startPoint.getX(), startPoint.getY(), ep.getX(), ep.getY());
+        return line;
+
+    }
+
+
+    /**
+     * Initialised the combo box with any yachts currently in the race and adds the required listener
+     * for the combobox to take action upon selection
+     */
+    private void initialiseBoatSelectionComboBox() {
+//        yachtSelectionComboBox.setItems(
+//            FXCollections.observableArrayList(participants.values())
+//        );
+//        //Null check is if the listener is fired but nothing selected
+//        yachtSelectionComboBox.valueProperty().addListener((obs, lastSelection, selectedBoat) -> {
+//            if (selectedBoat != null) {
+//                gameView.selectBoat(selectedBoat);
+//            }
+//        });
+
+        //TODO uncomment out
+//        selectionComboBoxList.setAll(participants.values());
+//        yachtSelectionComboBox.setItems(selectionComboBoxList);
+//        yachtSelectionComboBox.valueProperty().addListener((obs, lastSelection, selectedBoat) -> {
+//            if (selectedBoat != null) {
+//                gameView.selectBoat(selectedBoat);
+//            }
+//        });
+    }
+
+    /**
+     * Display the list of yachts in the order they finished the race
+     */
+    private void loadRaceResultView() {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/views/FinishView.fxml"));
+
+        try {
+            contentGridPane.getChildren().removeAll();
+            contentGridPane.getChildren().clear();
+            contentGridPane.getChildren().addAll((Pane) loader.load());
+
+        } catch (javafx.fxml.LoadException e) {
+            System.err.println(e.getCause().toString());
+        } catch (IOException e) {
+            System.err.println(e.toString());
+        }
+    }
+
+    private String getMillisToFormattedTime(long milliseconds) {
+        return String.format("%02d:%02d:%02d",
+            TimeUnit.MILLISECONDS.toHours(milliseconds),
+            TimeUnit.MILLISECONDS.toMinutes(milliseconds) % 60, //Modulus 60 minutes per hour
+            TimeUnit.MILLISECONDS.toSeconds(milliseconds) % 60  //Modulus 60 seconds per minute
+        );
+    }
+
+    private void setAnnotations(Integer annotationLevel) {
+//        switch (annotationLevel) {
+//            // No Annotations
+//            case 0:
+//                gameView.setAnnotationVisibilities(
+//                    false, false, false, false, false, false
+//                );
+//                break;
+//            // Important Annotations
+//            case 1:
+//                gameView.setAnnotationVisibilities(
+//                    importantAnnotations.getAnnotationState(Annotation.NAME),
+//                    importantAnnotations.getAnnotationState(Annotation.SPEED),
+//                    importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK),
+//                    importantAnnotations.getAnnotationState(Annotation.LEGTIME),
+//                    importantAnnotations.getAnnotationState(Annotation.TRACK),
+//                    importantAnnotations.getAnnotationState(Annotation.WAKE)
+//                );
+//                break;
+//            // All Annotations
+//            case 2:
+//                gameView.setAnnotationVisibilities(
+//                    true, true, true, true, true, true
+//                );
+//                break;
+//        }
+    }
+
+
+    /**
+     * Sets all the annotations of the selected yacht to be visible and all others to be hidden
+     *
+     * @param yacht The yacht for which we want to view all annotations
+     */
+    private void setSelectedBoat(ClientYacht yacht) {
+//        for (BoatObject bg : gameViewController.getBoatGroups()) {
+//            //We need to iterate over all race groups to get the matching yacht group belonging to this yacht if we
+//            //are to toggle its annotations, there is no other backwards knowledge of a yacht to its yachtgroup.
+//            if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
+////                updateLaylines(bg);
+//                bg.setIsSelected(true);
+////                selectedBoat = yacht;
+//            } else {
+//                bg.setIsSelected(false);
+//            }
+//        }
+    }
 
     public void updateTokens(RaceXMLData raceData) {
         gameView.updateTokens(raceData.getTokens());
@@ -481,7 +874,7 @@ public class RaceViewController extends Thread {
     public String readChatInput() {
         String chat = chatInput.getText();
         chatInput.clear();
-        contentStackPane.requestFocus();
+        rvAnchorPane.requestFocus();
         return chat;
     }
 

src/main/java/seng302/visualiser/controllers/ServerListController.java

@@ -7,7 +7,6 @@ import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ResourceBundle;
@@ -16,6 +15,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.geometry.Pos;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.KeyCode;
@@ -23,22 +23,14 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.discoveryServer.DiscoveryServerClient;
-import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.DiscoveryServer;
 import seng302.gameServer.ServerDescription;
-import seng302.gameServer.messages.ServerRegistrationMessage;
+import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.utilities.Sounds;
 import seng302.visualiser.ServerListener;
 import seng302.visualiser.ServerListenerDelegate;
 import seng302.visualiser.controllers.cells.ServerCell;
-import seng302.visualiser.controllers.dialogs.DirectConnectController;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ResourceBundle;
-import seng302.visualiser.controllers.dialogs.ServerCreationController;
 import seng302.visualiser.validators.HostNameFieldValidator;
 import seng302.visualiser.validators.NumberRangeValidator;
 import seng302.visualiser.validators.ValidationTools;
@@ -58,29 +50,19 @@ public class ServerListController implements Initializable, ServerListenerDelega
     private JFXButton serverListHostButton;
     //Direct Connect
     @FXML
-    private JFXButton directConnectButton;
+    private JFXButton connectButton;
+    @FXML
+    private JFXTextField serverHostName;
     @FXML
     private JFXTextField serverPortNumber;
     @FXML
     private JFXButton roomConnectButton;
     @FXML
     private JFXTextField roomNumber;
-    @FXML
-    private JFXButton autoSelectGame;
     //---------FXML END---------//
 
     private Label noServersFound;
     private Logger logger = LoggerFactory.getLogger(ServerListController.class);
-    private JFXDialog directConnectDialog;
-
-    private JFXDialog serverCreationDialog;
-    private List<ServerCreationDialogListener> serverCreationDialogListeners = new ArrayList<>();
-
-    @FunctionalInterface
-    public interface ServerCreationDialogListener {
-
-        void notifyClosure();
-    }
 
     // TODO: 12/09/17 ajm412: break this method down, its way too long.
     @Override
@@ -88,25 +70,24 @@ public class ServerListController implements Initializable, ServerListenerDelega
         serverListVBox.minWidthProperty().bind(serverListScrollPane.widthProperty());
 
         // Set Event Bindings
-        directConnectButton.setOnMouseEntered(event -> Sounds.playHoverSound());
+        connectButton.setOnMouseEntered(event -> Sounds.playHoverSound());
         serverListHostButton.setOnMouseEntered(event -> Sounds.playHoverSound());
 
-
-
+        roomConnectButton.setOnMouseReleased(event -> {
+            connectToRoomCode(roomNumber.getText());
+            Sounds.playButtonClick();
+        });
         roomNumber.setOnKeyPressed(event -> {
             if (event.getCode().equals(KeyCode.ENTER)) {
                 connectToRoomCode(roomNumber.getText());
             }
         });
 
-        directConnectButton.setOnMouseReleased(event -> {
-            directConnectDialog.show();
+        connectButton.setOnMouseReleased(event -> {
+            attemptToDirectConnect();
             Sounds.playButtonClick();
         });
-
-        directConnectDialog = createDirectConnectDialog();
-
-        for (JFXTextField textField : Arrays.asList(roomNumber)) {
+        for (JFXTextField textField : Arrays.asList(serverHostName, serverPortNumber)) {
             // Event for pressing enter to submit direct connection
             textField.setOnKeyPressed(event -> {
                 if (event.getCode().equals(KeyCode.ENTER)) {
@@ -120,43 +101,15 @@ public class ServerListController implements Initializable, ServerListenerDelega
             textField.getValidators().add(validator);
         }
 
-        autoSelectGame.setOnMouseReleased(e -> {
-            ServerListing listing;
-            DiscoveryServerClient client = new DiscoveryServerClient();
-
-            try {
-                listing = client.getRandomServer();
-            } catch (Exception e1) {
-                ViewManager.getInstance().showErrorSnackBar("Unable to connect to matchmaking server. Are you connected to the internet?");
-                return;
-            }
-
-            if (client.didFail()){
-                return;
-            }
-
-            if (listing == null || listing.equals(ServerRegistrationMessage.getEmptyRegistration())) {
-                ViewManager.getInstance().showErrorSnackBar("There are currently no servers available for you to connect to.");
-                return;
-            }
-
-            if (!ViewManager.getInstance().getGameClient().runAsClient(listing.getAddress(), listing.getPortNumber())){
-                ViewManager.getInstance().showErrorSnackBar("Could not connect to server");
-            }
-        });
-
-        /*
         // Validating the hostname
         HostNameFieldValidator hostNameValidator = new HostNameFieldValidator();
         hostNameValidator.setMessage("Host name incorrect");
-        roomCodeInput.getValidators().add(hostNameValidator);
+        serverHostName.getValidators().add(hostNameValidator);
 
         // Validating the port number
         NumberRangeValidator portNumberValidator = new NumberRangeValidator(1025, 65536);
         portNumberValidator.setMessage("Port number incorrect");
         serverPortNumber.getValidators().add(portNumberValidator);
-        TODO later
-        */
 
         // Start listening for servers on network
         try {
@@ -177,69 +130,30 @@ public class ServerListController implements Initializable, ServerListenerDelega
         );
         serverListVBox.getChildren().add(noServersFound);
 
-        roomConnectButton.setOnMouseReleased(e -> {
-            String roomCode = roomNumber.getText();
-            connectToRoomCode(roomCode);
-        });
-
         // Set up dialog for server creation
-        serverListHostButton.setOnAction(action -> {
-            showServerCreationDialog();
-        });
-
-        addServerCreationDialogListener(this::closeServerCreationDialog);
-    }
-
-    /**
-     * Shows Server Creation Dialog when "Host" button is clicked.
-     */
-    private void showServerCreationDialog() {
         Platform.runLater(() -> {
             FXMLLoader dialogContent = new FXMLLoader(getClass().getResource(
                 "/views/dialogs/ServerCreationDialog.fxml"));
             try {
-                serverCreationDialog = new JFXDialog(serverListMainStackPane, dialogContent.load(),
+                JFXDialog dialog = new JFXDialog(serverListMainStackPane, dialogContent.load(),
                     DialogTransition.CENTER);
-                ServerCreationController serverCreationController = dialogContent.getController();
-                serverCreationController.setListener(serverCreationDialogListeners);
-                serverCreationDialog.show();
-                Sounds.playButtonClick();
+                serverListHostButton.setOnAction(action -> {
+                    dialog.show();
+                    Sounds.playButtonClick();
+                });
             } catch (IOException e) {
-                e.printStackTrace();
                 logger.warn("Could not create Server Creation Dialog.");
             }
         });
     }
 
-    private JFXDialog createDirectConnectDialog() {
-        FXMLLoader dialog = new FXMLLoader(
-                getClass().getResource("/views/dialogs/DirectConnect.fxml"));
-
-        JFXDialog dcDialog = null;
-
-        try {
-            dcDialog = new JFXDialog(serverListMainStackPane, dialog.load(),
-                    JFXDialog.DialogTransition.CENTER);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        DirectConnectController controller = dialog.getController();
-
-        return dcDialog;
-    }
-
-    private void closeServerCreationDialog() {
-        serverCreationDialog.close();
-    }
-
     /**
      * Validates the connection and attempts to connect to a given hostname and port number.
      */
     private void attemptToDirectConnect() {
-        /*if (validateDirectConnection(serverHostName.getText(), serverPortNumber.getText())) {
+        if (validateDirectConnection(serverHostName.getText(), serverPortNumber.getText())) {
             DirectConnect();
-        }*/
+        }
     }
 
     /**
@@ -249,39 +163,27 @@ public class ServerListController implements Initializable, ServerListenerDelega
      * @return boolean value if host and port number are valid values
      */
     private Boolean validateDirectConnection(String hostName, String portNumber) {
-        /*Boolean hostNameValid = ValidationTools.validateTextField(serverHostName);
-        *
+        Boolean hostNameValid = ValidationTools.validateTextField(serverHostName);
         Boolean portNumberValid = ValidationTools.validateTextField(serverPortNumber);
 
-        return hostNameValid && portNumberValid;*/
-        return true;
+        return hostNameValid && portNumberValid;
     }
 
     private void connectToRoomCode(String roomCode){
-        DiscoveryServerClient client = new DiscoveryServerClient();
-        ServerListing serverListing;
-
-        if (client.didFail()){
-            return;
-        }
-
-        try {
-            serverListing = client.getServerForRoomCode(roomCode);
-        } catch (Exception e) {
-            ViewManager.getInstance().showErrorSnackBar("Error connecting to matchmaking server. Please try again later.");
-            return;
-        }
-
-        if (serverListing == null || serverListing.equals(new ServerListing("","","", 0, 0))){
-            ViewManager.getInstance().showErrorSnackBar("No servers could be found with that room code.");
-            return;
-        }
-
         try {
+            ServerListing serverListing = new DiscoveryServerClient().getServerForRoomCode(roomCode);
             ViewManager.getInstance().getGameClient().runAsClient(serverListing.getAddress(), serverListing.getPortNumber());
         }
+        catch (java.net.ConnectException e){
+            //TODO Add proper dialog
+            logger.warn("Couldn't connect to discovery server");
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setHeaderText("Couldn't connect to discovery server");
+            alert.setContentText("Couldn't connect to " + DiscoveryServer.DISCOVERY_SERVER);
+            alert.showAndWait();
+        }
         catch (Exception e) {
-            ViewManager.getInstance().showErrorSnackBar("Error connecting to matchmaking service.");
+            logger.warn("Error discovering room code");
         }
     }
 
@@ -290,7 +192,7 @@ public class ServerListController implements Initializable, ServerListenerDelega
      */
     private void DirectConnect() {
         Sounds.playButtonClick();
-       // ViewManager.getInstance().getGameClient().runAsClient(serverHostName.getText(), Integer.parseInt(serverPortNumber.getText()));
+        ViewManager.getInstance().getGameClient().runAsClient(serverHostName.getText(), Integer.parseInt(serverPortNumber.getText()));
     }
 
     /**
@@ -331,14 +233,4 @@ public class ServerListController implements Initializable, ServerListenerDelega
     public void serverDetected(ServerDescription serverDescription, List<ServerDescription> servers) {
         Platform.runLater(() -> refreshServers(servers));
     }
-
-    private void addServerCreationDialogListener(
-        ServerCreationDialogListener serverCreationDialogListener) {
-        serverCreationDialogListeners.add(serverCreationDialogListener);
-    }
-
-    private void removeServerCreationDialogListener(
-        ServerCreationDialogListener serverCreationDialogListener) {
-        serverCreationDialogListeners.remove(serverCreationDialogListener);
-    }
 }

src/main/java/seng302/visualiser/controllers/SplashScreenController.java

@@ -1,44 +0,0 @@
-package seng302.visualiser.controllers;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
-/**
- * The pre loading screen before launch the start view
- * Created by Kusal on 26-Sep-17.
- */
-public class SplashScreenController implements Initializable{
-
-    @FXML
-    private StackPane rootPane;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        new SplashScreen().start();
-    }
-
-
-    class SplashScreen extends Thread {
-        public void run(){
-            try {
-                Thread.sleep(3000);
-                Platform.runLater(() -> {
-                    try {
-                        Stage stage = new Stage();
-                        ViewManager.getInstance().initialStartView(stage);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    rootPane.getScene().getWindow().hide();
-                });
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

src/main/java/seng302/visualiser/controllers/StartScreenController.java

@@ -59,7 +59,7 @@ public class StartScreenController implements Initializable{
     /**
      * Changes the view to the Server Browser.
      */
-    public void goToServerBrowser() {
+    private void goToServerBrowser() {
         try {
             ViewManager.getInstance().setScene(serverList);
         } catch (Exception e) {

src/main/java/seng302/visualiser/controllers/ViewManager.java

@@ -2,9 +2,6 @@ package seng302.visualiser.controllers;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDecorator;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDialog.DialogTransition;
-import com.jfoenix.controls.JFXSnackbar;
 import com.jfoenix.svg.SVGGlyph;
 import java.io.IOException;
 import java.util.HashMap;
@@ -18,17 +15,14 @@ import javafx.scene.Scene;
 import javafx.scene.SceneAntialiasing;
 import javafx.scene.image.Image;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import javafx.stage.StageStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.ServerAdvertiser;
+import seng302.utilities.BonjourInstallChecker;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameClient;
-import seng302.visualiser.controllers.dialogs.KeyBindingDialogController;
-import seng302.visualiser.controllers.dialogs.PopupDialogController;
 
 public class ViewManager {
 
@@ -38,9 +32,12 @@ public class ViewManager {
     private HashMap<String, String> properties; //TODO is this the best way to do this??
     private ObservableList<String> playerList;
     private Logger logger = LoggerFactory.getLogger(ViewManager.class);
+
+    public Stage getStage() {
+        return stage;
+    }
+
     private Stage stage;
-    private JFXSnackbar jfxSnackbar;
-    private JFXDialog keyBindingDialog;
 
     private ViewManager() {
         properties = new HashMap<>();
@@ -56,18 +53,8 @@ public class ViewManager {
         if (instance == null) {
             instance = new ViewManager();
         }
-        return instance;
-    }
 
-    public void initialiseSplashScreen(Stage stage) throws IOException {
-        this.stage = stage;
-        Parent root = FXMLLoader.load(getClass().getResource("/views/SplashScreen.fxml"));
-        Scene scene = new Scene(root);
-        stage.setTitle("Party Parrots At Sea");
-        stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png")));
-        stage.setScene(scene);
-        stage.initStyle(StageStyle.UNDECORATED);
-        stage.show();
+        return instance;
     }
 
     /**
@@ -77,12 +64,13 @@ public class ViewManager {
         this.stage = stage;
         Parent root = FXMLLoader.load(getClass().getResource("/views/StartScreenView.fxml"));
         stage.setTitle("Party Parrots At Sea");
+
         JFXDecorator decorator = new JFXDecorator(stage, root, false, true, true);
         decorator.setCustomMaximize(true);
         decorator.applyCss();
         decorator.getStylesheets()
             .add(getClass().getResource("/css/Master.css").toExternalForm());
-        gameClient = new GameClient();
+        gameClient = new GameClient(decorator);
         setDecorator(decorator);
 
         stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png")));
@@ -131,31 +119,12 @@ public class ViewManager {
         //Get the button box
         HBox btns = (HBox) decorator.getChildren().get(0);
 
-        //Create settings button -- [WIP]
-        JFXButton btnKeyBinding = new JFXButton();
-        btnKeyBinding.setText(" Key Bindings");
-        btnKeyBinding.setStyle("-fx-text-fill:#fff");
-        btnKeyBinding.getStyleClass().add("jfx-decorator-button");
-        btnKeyBinding.setCursor(Cursor.HAND);
-        btnKeyBinding.setFocusTraversable(false);
-
-        btnKeyBinding.setOnMouseClicked(event -> Platform.runLater(() -> {
-            try {
-                if (!checkDialogOpened(decorator.getChildren())) {
-                    showKeyBindingDialog();
-                }
-            } catch (IOException e) {
-                logger.warn("Something went wrong when opening key bind dialog");
-            }
-        }));
-
         //Create new button
         JFXButton btnMute = new JFXButton();
         btnMute.setText(" Toggle Sound");
         btnMute.setStyle("-fx-text-fill:#fff");
         btnMute.getStyleClass().add("jfx-decorator-button");
         btnMute.setCursor(Cursor.HAND);
-        btnMute.setFocusTraversable(false);
 
         //Create Graphics
         SVGGlyph spacer = new SVGGlyph(0, "SPACER", "", Color.WHITE);
@@ -165,13 +134,9 @@ public class ViewManager {
         SVGGlyph volumeOff = new SVGGlyph(0, "VOLUME_ON",
             "M13.5,9 C13.5,7.2 12.5,5.7 11,5 L11,7.2 L13.5,9.7 L13.5,9 L13.5,9 Z M16,9 C16,9.9 15.8,10.8 15.5,11.6 L17,13.1 C17.7,11.9 18,10.4 18,8.9 C18,4.6 15,1 11,0.1 L11,2.2 C13.9,3.2 16,5.8 16,9 L16,9 Z M1.3,0 L0,1.3 L4.7,6 L0,6 L0,12 L4,12 L9,17 L9,10.3 L13.3,14.6 C12.6,15.1 11.9,15.5 11,15.8 L11,17.9 C12.4,17.6 13.6,17 14.7,16.1 L16.7,18.1 L18,16.8 L9,7.8 L1.3,0 L1.3,0 Z M9,1 L6.9,3.1 L9,5.2 L9,1 L9,1 Z",
             Color.WHITE);
-        SVGGlyph keyBindingGlyph = new SVGGlyph(0, "KEY_BINDING",
-            "M20 5H4c-1.1 0-1.99.9-1.99 2L2 17c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm-9 3h2v2h-2V8zm0 3h2v2h-2v-2zM8 8h2v2H8V8zm0 3h2v2H8v-2zm-1 2H5v-2h2v2zm0-3H5V8h2v2zm9 7H8v-2h8v2zm0-4h-2v-2h2v2zm0-3h-2V8h2v2zm3 3h-2v-2h2v2zm0-3h-2V8h2v2z",
-            Color.WHITE);
         volumeOn.setSize(16, 16);
         volumeOff.setSize(16, 16);
         spacer.setSize(40, 16);
-        keyBindingGlyph.setSize(24, 16);
 
         // Determine which graphic should go on the button
         if (Sounds.isMusicMuted() && Sounds.isSoundEffectsMuted()) {
@@ -180,12 +145,9 @@ public class ViewManager {
             btnMute.setGraphic(volumeOn);
         }
 
-        btnKeyBinding.setGraphic(keyBindingGlyph);
-
         // Add Buttons
         btns.getChildren().add(0, spacer);
         btns.getChildren().add(0, btnMute);
-        btns.getChildren().add(0, btnKeyBinding);
         btnMute.setOnAction((action) -> {
             Sounds.toggleAllSounds();
             if (btnMute.getGraphic().equals(volumeOff)) {
@@ -195,90 +157,18 @@ public class ViewManager {
             }
         });
 
-        jfxSnackbar = new JFXSnackbar(decorator);
     }
 
     /**
-     * Recursively find JFXDialog given a starting node. Will traverse children of StackPane.
-     *
-     * @param nodes children nodes to be check.
-     * @return true if node contains JFXDialog.
+     * Determines if a PC has compatibility with the bonjour protocol for server detection.
      */
-    private Boolean checkDialogOpened(ObservableList<Node> nodes) {
-        boolean foundJFXDialog = false;
-        for (Node node : nodes) {
-            if (node instanceof JFXDialog) {
-                return true;
-            } else if (node instanceof StackPane) {
-                foundJFXDialog = checkDialogOpened(((StackPane) node).getChildren());
-            }
+    private void checkCompatibility() {
+        if (BonjourInstallChecker.isBonjourSupported()) {
+            BonjourInstallChecker.openInstallUrl();
         }
-        return foundJFXDialog;
-    }
-
-    private void showKeyBindingDialog() throws IOException {
-        FXMLLoader dialogContent = new FXMLLoader(getClass().getResource(
-            "/views/dialogs/KeyBindingDialog.fxml"));
-        for (Node node : decorator.getChildren()) {
-            if (node instanceof StackPane) {
-                keyBindingDialog = new JFXDialog((StackPane) node,
-                    dialogContent.load(),
-                    DialogTransition.CENTER);
-
-                KeyBindingDialogController keyBindingDialogController = dialogContent
-                    .getController();
-                keyBindingDialogController.setGameClient(this.gameClient);
-                keyBindingDialog.show();
-                decorator.requestFocus();
-                Sounds.playButtonClick();
-            }
-        }
-    }
-
-    public void closeKeyBindingDialog() {
-        keyBindingDialog.close();
-    }
-
-    public PopupDialogController showPopupDialog() {
-        FXMLLoader dialogContent = new FXMLLoader(
-            getClass().getResource("/views/dialogs/PopupDialog.fxml"));
-        for (Node node : decorator.getChildren()) {
-            if (node instanceof StackPane) {
-                try {
-                    JFXDialog dialog = new JFXDialog((StackPane) node, dialogContent.load(),
-                        DialogTransition.CENTER);
-                    PopupDialogController popupDialogController = dialogContent.getController();
-                    popupDialogController.setPopupDialog(dialog);
-                    dialog.show();
-                    return popupDialogController;
-                } catch (IOException e) {
-                    logger.error("Cannot load Popup dialog");
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Show a snackbar at the bottom of the app for 1 second.
-     *
-     * @param snackbarText text to be displayed.
-     */
-    public void showSnackbar(String snackbarText, boolean isWarning) {
-        if (isWarning) {
-            decorator.getStylesheets()
-                .add(getClass().getResource("/css/dialogs/Snackbar.css").toExternalForm());
-        } else {
-            if (decorator.getStylesheets().size() > 1) {
-                decorator.getStylesheets().remove(1);
-            }
-        }
-        jfxSnackbar.show(snackbarText, 1500);
     }
 
     private void closeAll() {
-        if (stage!= null) stage.close();
-
         try {
             ServerAdvertiser.getInstance().unregister();
         } catch (IOException e1) {
@@ -305,7 +195,7 @@ public class ViewManager {
             Stage stage = new Stage();
             initialStartView(stage);
         } catch (Exception e) {
-            logger.warn("Could not go to start view");
+            e.printStackTrace();
         }
     }
 
@@ -331,7 +221,6 @@ public class ViewManager {
 
     /**
      * Change the view to the Lobby Screen
-     *
      * @param disableReadyButton Boolean value so that clients can't try start a game.
      * @return A LobbyController object for the Lobby Screen.
      */
@@ -355,7 +244,6 @@ public class ViewManager {
 
     /**
      * Sets up the view for the race. Creating a new decorator and destroying the old one.
-     *
      * @return A RaceViewController for the race view screen.
      */
     public RaceViewController loadRaceView() {
@@ -379,10 +267,17 @@ public class ViewManager {
                 scene.setOnKeyPressed(gameClient::keyPressed);
                 scene.setOnKeyReleased(gameClient::keyReleased);
 
-                stage.setMinHeight(800);
-                stage.setMinWidth(1200);
-                stage.setTitle("Party Parrots At Sea");
-                stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png")));
+                // uncomment to make it full screen
+//                Rectangle2D visualBounds = Screen.getPrimary().getVisualBounds();
+//                stage.setX(visualBounds.getMinX());
+//                stage.setY(visualBounds.getMinY());
+//                stage.setWidth(visualBounds.getWidth());
+//                stage.setHeight(visualBounds.getHeight());
+//                stage.setMaximized(true);
+//                stage.setFullScreen(true);
+
+                stage.setMinHeight(500);
+                stage.setMinWidth(800);
                 stage.setOnCloseRequest(e -> closeAll());
                 stage.setScene(scene);
                 stage.show();
@@ -391,7 +286,7 @@ public class ViewManager {
             }
         });
 
-        while (loader.getController() == null) {
+        while (loader.getController() == null){
             try {
                 Thread.sleep(50);
             } catch (InterruptedException e) {
@@ -401,19 +296,4 @@ public class ViewManager {
 
         return loader.getController();
     }
-
-    public void showErrorSnackBar(String msg){
-        decorator.getStylesheets()
-                .add(getClass().getResource("/css/dialogs/Snackbar.css").toExternalForm());
-
-        JFXSnackbar bar = new JFXSnackbar(decorator);
-        Platform.runLater(() -> {
-            bar.enqueue(new JFXSnackbar.SnackbarEvent(msg));
-        });
-    }
-
-    public Stage getStage() {
-        return stage;
-    }
-
 }

src/main/java/seng302/visualiser/controllers/cells/PlayerCell.java

@@ -6,7 +6,6 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
-import seng302.model.ClientYacht;
 import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
 import seng302.visualiser.fxObjects.assets_3D.BoatModel;
 import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
@@ -25,13 +24,11 @@ public class PlayerCell {
     private String name;
     private Color boatColor;
     private Integer playerId;
-    private BoatMeshType boatType;
 
-    public PlayerCell(Integer playerId, ClientYacht yacht) {
+    public PlayerCell(Integer playerId, String playerName, Color color) {
         this.playerId = playerId;
-        this.name = yacht.getBoatName();
-        this.boatColor = yacht.getColour();
-        this.boatType = yacht.getBoatType();
+        this.name = playerName;
+        this.boatColor = color;
     }
 
     public void initialize() {
@@ -40,7 +37,7 @@ public class PlayerCell {
         // Add Rotating Boat to Player Cell with players color on it.
         Group group = new Group();
         boatPane.getChildren().add(group);
-        BoatModel bo = ModelFactory.boatIconView(boatType, boatColor);
+        BoatModel bo = ModelFactory.boatIconView(BoatMeshType.DINGHY, this.boatColor);
         group.getChildren().add(bo.getAssets());
     }
 

src/main/java/seng302/visualiser/controllers/cells/WindCell.java

@@ -1,131 +0,0 @@
-package seng302.visualiser.controllers.cells;
-
-import java.util.Arrays;
-import javafx.application.Platform;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ReadOnlyDoubleWrapper;
-import javafx.fxml.FXML;
-import javafx.geometry.Point3D;
-import javafx.scene.Camera;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.SceneAntialiasing;
-import javafx.scene.SubScene;
-import javafx.scene.layout.Pane;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Transform;
-import javafx.scene.transform.Translate;
-import seng302.model.ClientYacht;
-import seng302.visualiser.cameras.ChaseCamera;
-import seng302.visualiser.fxObjects.assets_3D.Model;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-
-public class WindCell {
-
-    //--------FXML BEGIN--------//
-    @FXML
-    private Pane windPane;
-    //---------FXML END---------//
-
-    private final double FOV = 60;
-    private final double DEFAULT_CAMERA_X = 0;
-    private final double DEFAULT_CAMERA_Y = 50;
-
-    private Group root3D;
-    private SubScene view;
-    private Group gameObjects;
-
-    private ChaseCamera chaseCam;
-
-    private ClientYacht playerYacht;
-
-    // Cameras
-    private PerspectiveCamera camera = null;
-
-    private Model windArrowModel;
-    private Boolean isChaseCam;
-
-    /**
-     * Initialise WindCell fxml and load 3D wind arrow into a group.
-     */
-    public void init(ClientYacht playerYacht, ReadOnlyDoubleWrapper windDirection) {
-
-        this.playerYacht = playerYacht;
-        camera = new PerspectiveCamera();
-        camera.setFarClip(1000);
-        camera.setNearClip(0.1);
-        camera.setFieldOfView(60);
-        initialiseWindView();
-
-        for (DoubleProperty o : Arrays.asList(playerYacht.getHeadingProperty(), windDirection)) {
-            o.addListener((obs, oldValue, newValue) -> {
-                Platform.runLater(() -> {
-                    if (isChaseCam) {
-                        camera.getTransforms().clear();
-                        for (Transform t : chaseCam.getTransforms()) {
-                            if (t instanceof Rotate) {
-                                camera.getTransforms().add(t);
-                            }
-                        }
-                        this.camera.getTransforms().addAll(
-                            new Translate(-55, -60, 0)
-                        );
-                    }
-
-                    windArrowModel.getAssets().getTransforms().clear();
-                    windArrowModel.getAssets().getTransforms().addAll(
-                        new Rotate(windDirection.getValue(),
-                            new Point3D(0, 0, 1))
-                    );
-                });
-            });
-        }
-    }
-
-    private void initialiseWindView() {
-        gameObjects = new Group();
-        windPane.getChildren().add(gameObjects);
-
-        root3D = new Group(camera, gameObjects);
-        view = new SubScene(
-            root3D, 110, 120, true, SceneAntialiasing.BALANCED
-        );
-        view.setCamera(camera);
-
-        windArrowModel = ModelFactory.makeWindArrow();
-
-        gameObjects.getChildren().addAll(
-            windArrowModel.getAssets()
-        );
-    }
-
-    public Node getAssets() {
-        return view;
-    }
-
-
-    public void updateCameraTransforms(Camera camera) {
-        this.camera.getTransforms().clear();
-
-        for (Transform transform : camera.getTransforms()) {
-            if (!(transform instanceof Translate)) {
-                this.camera.getTransforms().add(transform);
-            }
-        }
-        this.camera.getTransforms().addAll(
-            new Translate(-55, -60, 0)
-        );
-        windArrowModel.getAssets().getTransforms().clear();
-    }
-
-    public void setCamera(Camera camera) {
-        isChaseCam = camera instanceof ChaseCamera;
-        if (isChaseCam) {
-            this.chaseCam = (ChaseCamera) camera;
-        } else {
-            this.chaseCam = null;
-        }
-        updateCameraTransforms(camera);
-    }
-}

src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java

@@ -6,25 +6,15 @@ import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.net.URL;
 import java.util.ResourceBundle;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.geometry.Insets;
-import javafx.scene.Group;
-import javafx.scene.PointLight;
-import javafx.scene.control.ProgressBar;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.CornerRadii;
-import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.utilities.Sounds;
 import seng302.visualiser.ClientToServerThread;
 import seng302.visualiser.controllers.LobbyController;
 import seng302.visualiser.controllers.ViewManager;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
-import seng302.visualiser.fxObjects.assets_3D.BoatModel;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
 import seng302.visualiser.validators.FieldLengthValidator;
 import seng302.visualiser.validators.ValidationTools;
 
@@ -34,35 +24,23 @@ public class BoatCustomizeController implements Initializable{
     @FXML
     private JFXColorPicker colorPicker;
     @FXML
-    private ProgressBar speedBar;
-    @FXML
-    private ProgressBar accelBar;
-    @FXML
-    private ProgressBar handleBar;
-    @FXML
     private JFXButton submitBtn;
     @FXML
     private JFXTextField boatName;
     @FXML
-    private Pane boatPane;
-    @FXML
-    void colorChanged() {
-        refreshBoat();
+    void colorChanged(ActionEvent event) {
+        Color color = colorPicker.getValue();
     }
     //---------FXML END---------//
 
     private ClientToServerThread socketThread;
     private LobbyController lobbyController;
-    private BoatMeshType currentBoat;
-    private Double maxSpeedMultiplier = 1.0;
-    private Double maxTurnRateMultiplier = 1.0;
-    private Double maxAccelerationMultiplier = 1.0;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
 
         socketThread = ViewManager.getInstance().getGameClient().getServerThread();
-        findMaxStats();
+
         RequiredFieldValidator playerNameReqValidator = new RequiredFieldValidator();
         playerNameReqValidator.setMessage("Player name required.");
 
@@ -70,8 +48,6 @@ public class BoatCustomizeController implements Initializable{
         playerNameLengthValidator.setMessage("Player name too long.");
 
         boatName.setValidators(playerNameLengthValidator, playerNameReqValidator);
-        boatPane.setBackground(
-            new Background(new BackgroundFill(Color.SKYBLUE, CornerRadii.EMPTY, Insets.EMPTY)));
 
         submitBtn.setOnMouseReleased(event -> {
             Sounds.playButtonClick();
@@ -102,10 +78,7 @@ public class BoatCustomizeController implements Initializable{
             colorArray[2] = (byte) blue;
 
             socketThread.sendCustomizationRequest(CustomizeRequestType.COLOR, colorArray);
-            socketThread.sendCustomizationRequest(CustomizeRequestType.SHAPE, currentBoat.toString().getBytes());
             lobbyController.closeCustomizationDialog();
-
-
         }
     }
 
@@ -120,61 +93,4 @@ public class BoatCustomizeController implements Initializable{
     public void setParentController(LobbyController lobbyController){
         this.lobbyController = lobbyController;
     }
-
-    public void setCurrentBoat(String boatType) {
-        currentBoat = BoatMeshType.valueOf(boatType);
-        displayCurrentBoat();
-        refreshStatBars(currentBoat);
-    }
-
-    public void nextBoat() {
-        currentBoat = BoatMeshType.getNextBoatType(currentBoat);
-        displayCurrentBoat();
-        refreshStatBars(currentBoat);
-    }
-
-    public void prevBoat() {
-        currentBoat = BoatMeshType.getPrevBoatType(currentBoat);
-        displayCurrentBoat();
-        refreshStatBars(currentBoat);
-
-    }
-
-    private void displayCurrentBoat() {
-        boatPane.getChildren().clear();
-        Group group = new Group();
-        boatPane.getChildren().add(group);
-        BoatModel bo = ModelFactory.boatCustomiseView(currentBoat, colorPicker.getValue());
-        group.getChildren().add(bo.getAssets());
-        group.getChildren().add(new PointLight());
-    }
-
-    private void refreshBoat() {
-        boatPane.getChildren().clear();
-        Group group = new Group();
-        boatPane.getChildren().add(group);
-        BoatModel bo = ModelFactory.boatCustomiseView(currentBoat, colorPicker.getValue());
-        group.getChildren().add(bo.getAssets());
-        refreshStatBars(currentBoat);
-    }
-
-    private void findMaxStats() {
-        for (BoatMeshType bmt: BoatMeshType.values()) {
-            if (bmt.turnStep > maxTurnRateMultiplier) {
-                maxTurnRateMultiplier = bmt.turnStep;
-            }
-            if (bmt.maxSpeedMultiplier > maxSpeedMultiplier) {
-                maxSpeedMultiplier = bmt.maxSpeedMultiplier;
-            }
-            if (bmt.accelerationMultiplier > maxAccelerationMultiplier) {
-                maxAccelerationMultiplier = bmt.accelerationMultiplier;
-            }
-        }
-    }
-
-    private void refreshStatBars(BoatMeshType bo) {
-        speedBar.setProgress((bo.maxSpeedMultiplier) / maxSpeedMultiplier);
-        accelBar.setProgress(bo.accelerationMultiplier / maxAccelerationMultiplier);
-        handleBar.setProgress(bo.turnStep / maxTurnRateMultiplier);
-    }
 }

src/main/java/seng302/visualiser/controllers/dialogs/DirectConnectController.java

@@ -1,70 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXSlider;
-import com.jfoenix.controls.JFXTextField;
-import com.jfoenix.validation.RequiredFieldValidator;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
-import javafx.scene.input.MouseEvent;
-import seng302.gameServer.ServerDescription;
-import seng302.utilities.Sounds;
-import seng302.visualiser.controllers.ViewManager;
-import seng302.visualiser.validators.FieldLengthValidator;
-import seng302.visualiser.validators.ValidationTools;
-
-public class DirectConnectController implements Initializable {
-
-    //--------FXML BEGIN--------//
-    @FXML
-    private JFXTextField serverAddress;
-    @FXML
-    private JFXTextField portNumber;
-    @FXML
-    private JFXButton submitBtn;
-    //---------FXML END---------//
-
-    public void initialize(URL location, ResourceBundle resources) {
-        FieldLengthValidator fieldLengthValidator = new FieldLengthValidator(40);
-        fieldLengthValidator.setMessage("Too long.");
-
-        RequiredFieldValidator fieldRequiredValidator = new RequiredFieldValidator();
-        fieldRequiredValidator.setMessage("Required.");
-
-        serverAddress.setValidators(fieldLengthValidator, fieldRequiredValidator);
-        portNumber.setValidators(fieldLengthValidator, fieldRequiredValidator);
-
-        submitBtn.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            connectToServer();
-        });
-
-    }
-
-    /**
-     * connects to the server
-     */
-    private void connectToServer() {
-        //TODO fix port number validation
-
-        try{
-            Integer.parseInt(portNumber.getText());
-        }
-        catch (NumberFormatException e){
-            ViewManager.getInstance().showErrorSnackBar("You need to enter a valid port number");
-            return;
-        }
-
-        ViewManager.getInstance().getGameClient()
-                .runAsClient(serverAddress.getText(), Integer.parseInt(portNumber.getText()));
-    }
-
-    public void playButtonHoverSound(MouseEvent mouseEvent) {
-        Sounds.playHoverSound();
-    }
-
-}

src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java

@@ -1,198 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXToggleButton;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.input.KeyEvent;
-import seng302.model.GameKeyBind;
-import seng302.model.KeyAction;
-import seng302.visualiser.GameClient;
-import seng302.visualiser.controllers.ViewManager;
-
-public class KeyBindingDialogController implements Initializable {
-
-    //--------FXML BEGIN--------//
-    @FXML
-    private Label keyBindingDialogHeader;
-    @FXML
-    private Label closeLabel;
-    @FXML
-    private JFXButton zoomInBtn;
-    @FXML
-    private JFXButton zoomOutBtn;
-    @FXML
-    private JFXButton vmgBtn;
-    @FXML
-    private JFXButton sailInOutBtn;
-    @FXML
-    private JFXButton tackGybeBtn;
-    @FXML
-    private JFXButton upwindBtn;
-    @FXML
-    private JFXButton downwindBtn;
-    @FXML
-    private JFXButton resetBtn;
-    @FXML
-    private JFXButton confirmBtn;
-    @FXML
-    private Label upwindLabel;
-    @FXML
-    private Label downwindLabel;
-    @FXML
-    private JFXToggleButton turningToggle;
-    @FXML
-    private JFXButton viewButton;
-    @FXML
-    private JFXButton rightButton;
-    @FXML
-    private JFXButton leftButton;
-    @FXML
-    private JFXButton forwardButton;
-    @FXML
-    private JFXButton backwardButton;
-    //---------FXML END---------//
-
-    private GameKeyBind gameKeyBind;
-    private List<JFXButton> buttons = new ArrayList<>();
-    private Map<Button, KeyAction> buttonActionMap;
-    private GameClient gameClient; // to send turning mode packet
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        gameKeyBind = GameKeyBind.getInstance();
-        buttons = new ArrayList<>();
-        Collections.addAll(buttons,
-            zoomInBtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
-            viewButton, rightButton, leftButton, forwardButton, backwardButton);
-        bindButtonWithAction();
-        loadKeyBind();
-
-        buttons.forEach(button -> {
-            button.setOnMouseEntered(event -> mouseEnter(button));
-            button.setOnMousePressed(event -> buttonPressed(button));
-            button.setOnMouseExited(event -> mouseExit(button));
-            button.setOnKeyPressed(event -> keyPressed(event, button));
-        });
-
-        turningToggle.setOnMouseClicked(event -> toggleTurningMode());
-
-        resetBtn.setOnMouseClicked(event -> {
-            gameKeyBind.setToDefault();
-            loadKeyBind();
-            showSnackBar("All keys reset!", false);
-        });
-
-        closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
-        confirmBtn.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
-    }
-
-    /**
-     * Set buttons' label according to GameKeyBind settings
-     */
-    private void loadKeyBind() {
-        buttons.forEach(
-            button -> button
-                .setText(gameKeyBind.getKeyCode(buttonActionMap.get(button)).getName()));
-        turningToggle.setSelected(gameKeyBind.isContinuouslyTurning());
-        if (gameKeyBind.isContinuouslyTurning()) {
-            upwindLabel.setText("ClOCKWISE TURNING");
-            downwindLabel.setText("ANTICLOCKWISE TURNING");
-        } else {
-            upwindLabel.setText("UPWIND");
-            downwindLabel.setText("DOWNWIND");
-        }
-    }
-
-    /**
-     * Bind buttons with specific action in a map.
-     */
-    private void bindButtonWithAction() {
-        buttonActionMap = new HashMap<>();
-        for (int i = 0; i < 12; i++) {
-            buttonActionMap.put(buttons.get(i), KeyAction.getType(i + 1));
-        }
-    }
-
-    /**
-     * Prompt success / failure message for reassigning key action
-     */
-    private void showSnackBar(String message, Boolean isWarning) {
-        ViewManager.getInstance().showSnackbar(message, isWarning);
-    }
-
-    /**
-     * When a mouse enters the button, the color and font size should change to highlight
-     * @param button
-     */
-    private void mouseEnter(Button button) {
-        button.setStyle(""
-            + "-fx-background-color: -fx-pp-theme-color;"
-            + "-fx-text-fill: -fx-pp-front-color;"
-            + "-fx-font-size: 15;");
-    }
-
-    /**
-     * Prompt "press key..." to inform users assign a new key bind by pressing a key
-     * @param button
-     */
-    private void buttonPressed(Button button) {
-        button.setText("PRESS KEY...");
-    }
-
-
-    /**
-     * When mouse leaves the button, return the button to the normal state in terms of text,
-     * color and font size
-     * @param button
-     */
-    private void mouseExit(Button button) {
-        button.setText(GameKeyBind.getInstance().getKeyCode(buttonActionMap.get(button)).getName());
-        button.setStyle(""
-            + "-fx-background-color: -fx-pp-front-color; "
-            + "-fx-text-fill: -fx-pp-theme-color; "
-            + "-fx-font-size: 13;");
-        keyBindingDialogHeader.requestFocus();
-    }
-
-    /**
-     * When a key is pressed, check if the new binding conflicts to any existed settings, if not
-     * assign the selected action with the new key binding to GameKeyBind.
-     * @param event
-     * @param button
-     */
-    private void keyPressed(KeyEvent event, Button button) {
-        event.consume();
-        KeyAction buttonAction = buttonActionMap.get(button);
-        if (gameKeyBind.bindKeyToAction(event.getCode(), buttonAction)) {
-            showSnackBar(button.getId() + " is set to " + event.getCode().getName(), false);
-            button.setText(gameKeyBind.getKeyCode(buttonAction).getName());
-        } else {
-            loadKeyBind();
-            showSnackBar(event.getCode().getName() + " is already in use", true);
-        }
-    }
-
-    /**
-     * When the turning mode is toggled, update gameKeyBind and send out packet to notify the server
-     */
-    private void toggleTurningMode() {
-        gameKeyBind.toggleTurningMode();
-        gameClient.sendToggleTurningModePacket();
-        loadKeyBind();
-    }
-
-    public void setGameClient(GameClient gameClient) {
-        this.gameClient = gameClient;
-    }
-
-}

src/main/java/seng302/visualiser/controllers/dialogs/PopupDialogController.java

@@ -1,56 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
-import javafx.scene.input.MouseEvent;
-
-public class PopupDialogController implements Initializable {
-
-    @FXML
-    private Label headerLabel;
-    @FXML
-    private Label contentLabel;
-    @FXML
-    private Label closeLabel;
-    @FXML
-    private JFXButton optionButton;
-
-    @FXML
-    private JFXDialog popupDialog;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-
-    }
-
-    public void setContent(String content) {
-        this.contentLabel.setText(content);
-    }
-
-    public void setHeader(String header) {
-        this.headerLabel.setText(header);
-    }
-
-    public void setOptionButton(JFXButton jfxButton) {
-        this.optionButton = jfxButton;
-    }
-
-    public void setOptionButtonText(String text) {
-        this.optionButton.setText(text);
-    }
-
-    public void setOptionButtonEventHandler(EventHandler<? super MouseEvent> eventHandler) {
-        this.optionButton.setOnMouseClicked(eventHandler);
-    }
-
-    public void setPopupDialog(JFXDialog popupDialog) {
-        this.popupDialog = popupDialog;
-        this.closeLabel.setOnMouseClicked(event -> this.popupDialog.close());
-    }
-}

src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

@@ -1,21 +1,18 @@
 package seng302.visualiser.controllers.dialogs;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXSlider;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.net.URL;
-import java.util.List;
 import java.util.ResourceBundle;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
-import javafx.scene.layout.AnchorPane;
+import javafx.scene.input.MouseEvent;
 import seng302.gameServer.ServerDescription;
 import seng302.utilities.Sounds;
-import seng302.visualiser.MapMaker;
-import seng302.visualiser.controllers.ServerListController.ServerCreationDialogListener;
 import seng302.visualiser.controllers.ViewManager;
 import seng302.visualiser.validators.FieldLengthValidator;
 import seng302.visualiser.validators.ValidationTools;
@@ -28,46 +25,16 @@ public class ServerCreationController implements Initializable {
     @FXML
     private JFXSlider maxPlayersSlider;
     @FXML
-    private JFXButton submitBtn;
-    @FXML
-    private Label closeLabel;
-    @FXML
     private Label maxPlayersLabel;
     @FXML
-    private JFXButton nextMapButton;
-    @FXML
-    private JFXButton lastMapButton;
-    @FXML
-    private Label mapNameLabel;
-    @FXML
-    private JFXSlider legsSlider;
-    @FXML
-    private Label legsSliderLabel;
-    @FXML
-    private JFXCheckBox pickupsCheckBox;
-    @FXML
-    private AnchorPane mapHolder;
+    private JFXButton submitBtn;
     //---------FXML END---------//
 
-    private MapMaker mapMaker = MapMaker.getInstance();
-
-    private List<ServerCreationDialogListener> serverCreationDialogListeners;
-
     public void initialize(URL location, ResourceBundle resources) {
-
-        maxPlayersSlider.valueProperty().addListener(
-            (observable, oldValue, newValue) -> updateMaxPlayerLabel()
-        );
-        maxPlayersSlider.setMax(mapMaker.getMaxPlayers());
-        maxPlayersSlider.setValue(mapMaker.getMaxPlayers());
-
-        legsSlider.valueProperty().addListener(
-            (obs, oldVal, newVal) -> updateLegSliderLabel()
-        );
-        legsSlider.setMax(10);
-
         updateMaxPlayerLabel();
-        updateLegSliderLabel();
+        maxPlayersSlider.valueProperty().addListener((observable, oldValue, newValue) -> {
+            updateMaxPlayerLabel();
+        });
 
         FieldLengthValidator fieldLengthValidator = new FieldLengthValidator(40);
         fieldLengthValidator.setMessage("Server name too long.");
@@ -82,20 +49,6 @@ public class ServerCreationController implements Initializable {
             validateServerSettings();
         });
 
-        nextMapButton.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            nextMap();
-        });
-
-        lastMapButton.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            lastMap();
-        });
-
-        mapHolder.getChildren().setAll(mapMaker.getCurrentGameView());
-        mapNameLabel.setText(mapMaker.getCurrentRegatta().getCourseName());
-        pickupsCheckBox.setSelected(true);
-        closeLabel.setOnMouseClicked(event -> notifyListeners());
     }
 
     /**
@@ -115,14 +68,8 @@ public class ServerCreationController implements Initializable {
      */
     private void createServer() {
         ServerDescription serverDescription = ViewManager.getInstance().getGameClient()
-            .runAsHost(serverName.getText(), (int) maxPlayersSlider
-                .getValue(), mapMaker.getCurrentRacePath(), (int) legsSlider.getValue(), pickupsCheckBox.isSelected());
-
-        if (serverDescription == null){
-            ViewManager.getInstance().getGameClient().getServerThread().closeSocket();
-            ViewManager.getInstance().getGameClient().stopGame();
-            return;
-        }
+            .runAsHost("localhost", 4941, serverName.getText(), (int) maxPlayersSlider
+                .getValue());
 
         ViewManager.getInstance().setProperty("serverName", serverDescription.getName());
         ViewManager.getInstance().setProperty("mapName", serverDescription.getMapName());
@@ -133,47 +80,11 @@ public class ServerCreationController implements Initializable {
      */
     private void updateMaxPlayerLabel() {
         maxPlayersSlider.setValue(Math.floor(maxPlayersSlider.getValue()));
-        maxPlayersLabel.setText(String
-            .format("Only %.0f players are allowed into the game", maxPlayersSlider.getValue()));
+        maxPlayersLabel.setText(String.format("YOU SELECTED: %.0f", maxPlayersSlider.getValue()));
     }
 
-    private void updateLegSliderLabel() {
-        legsSlider.setValue(Math.floor(legsSlider.getValue()));
-        legsSliderLabel.setText(
-            String.format("A section of the race will repeat %.0f times", legsSlider.getValue())
-        );
-
-    }
-
-    public void playButtonHoverSound() {
+    public void playButtonHoverSound(MouseEvent mouseEvent) {
         Sounds.playHoverSound();
     }
 
-    private void nextMap() {
-        mapMaker.next();
-        updateMap();
-    }
-
-    private void lastMap() {
-        mapMaker.previous();
-        updateMap();
-    }
-
-    private void updateMap() {
-        mapHolder.getChildren().setAll(mapMaker.getCurrentGameView());
-        mapNameLabel.setText(mapMaker.getCurrentRegatta().getCourseName());
-        maxPlayersSlider.setMax(mapMaker.getMaxPlayers());
-        maxPlayersSlider.setValue(mapMaker.getMaxPlayers());
-    }
-
-    public void setListener(List<ServerCreationDialogListener> serverCreationDialogListeners) {
-        this.serverCreationDialogListeners = serverCreationDialogListeners;
-    }
-
-    public void notifyListeners() {
-        for (ServerCreationDialogListener serverCreationDialogListener : serverCreationDialogListeners) {
-            serverCreationDialogListener.notifyClosure();
-        }
-    }
-
 }

src/main/java/seng302/visualiser/controllers/dialogs/TokenInfoDialogController.java

@@ -1,90 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXTextArea;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextArea;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Pane;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Scale;
-import javafx.scene.transform.Translate;
-import seng302.utilities.Sounds;
-import seng302.visualiser.controllers.LobbyController;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
-
-/**
- * Created by wmu16 on 28/09/17.
- */
-public class TokenInfoDialogController implements Initializable {
-
-    @FXML
-    private Label headerLabel;
-    @FXML
-    private TextArea contentText;
-    @FXML
-    private Pane tokenPane;
-    @FXML
-    private Button optionButton;
-
-    private LobbyController lobbyController;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        optionButton.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            lobbyController.closeTokenInfoDialog();
-        });
-
-        contentText.setEditable(false);
-
-    }
-
-
-    public void setContent(String content) {
-        contentText.setText(content);
-    }
-
-    public void setHeader(String header) {
-        this.headerLabel.setText(header);
-    }
-
-    public void setToken(ModelType token) {
-        tokenPane.getChildren().clear();
-
-        Group tokenObject = ModelFactory.importModel(token).getAssets();
-
-        tokenObject.getTransforms().addAll(
-            new Translate(138 / 2, 138 / 2, 0),
-            new Scale(20, 20, 20));
-
-        if (token == ModelType.WIND_WALKER_PICKUP) {
-            tokenObject.getTransforms().addAll(
-                new Rotate(-70, new Point3D(1, 0, 0)),
-                new Translate(0, 2, 0)
-            );
-        } else if (token == ModelType.RANDOM_PICKUP) {
-            tokenObject.getTransforms().addAll(
-                new Rotate(-90, new Point3D(1, 0, 0)),
-                new Translate(0, 0, 1)
-            );
-        }
-
-        tokenPane.getChildren().add(tokenObject);
-    }
-
-    public void setParentController(LobbyController lobbyController) {
-        this.lobbyController = lobbyController;
-    }
-
-
-}

src/main/java/seng302/visualiser/fxObjects/MarkArrowFactory.java

@@ -29,11 +29,11 @@ public class MarkArrowFactory {
         STARBOARD,
     }
 
-    public static final double MARK_ARROW_SEPARATION = 8;
-    public static final double ARROW_LENGTH = 20;
-    public static final double ARROW_HEAD_DEPTH = 5;
-    public static final double ARROW_HEAD_WIDTH = 3;
-    public static final double STROKE_WIDTH = 1;
+    public static final double MARK_ARROW_SEPARATION = 15;
+    public static final double ARROW_LENGTH = 75;
+    public static final double ARROW_HEAD_DEPTH = 10;
+    public static final double ARROW_HEAD_WIDTH = 6;
+    public static final double STROKE_WIDTH = 3;
 
     public static Model constructEntryArrow3D (
         RoundingSide roundingSide, double angle, ModelType type) {
@@ -86,6 +86,16 @@ public class MarkArrowFactory {
      */
     public static Group constructEntryArrow (RoundingSide roundingSide, double angleOfEntry,
         double angleOfExit, Paint colour) {
+        // Check to see if the the angle around mark would take you inside of it. (less than 180)
+        // If so make interior angle.
+        if (roundingSide == RoundingSide.PORT && angleOfEntry < angleOfExit &&
+            Math.abs(angleOfExit - angleOfEntry) < 180) {
+            return makeInteriorAngle(roundingSide, angleOfExit, angleOfEntry, colour);
+
+        } else if (roundingSide == RoundingSide.STARBOARD && angleOfEntry > angleOfExit &&
+            -Math.abs(angleOfEntry - angleOfExit) > -180) {
+            return makeInteriorAngle(roundingSide, angleOfExit, angleOfEntry, colour);
+        }
         //Create regular exit arrow.
         Group arrow = new Group();
         Group exitSection = constructExitArrow(roundingSide, angleOfExit, colour);
@@ -96,7 +106,7 @@ public class MarkArrowFactory {
         Arc roundSection = new Arc(
             0, 0, MARK_ARROW_SEPARATION, MARK_ARROW_SEPARATION,
             //Where to start drawing arc from
-            (roundingSide == RoundingSide.PORT ? 180 + angleOfEntry : angleOfEntry),
+            (roundingSide == RoundingSide.PORT ? 0 : angleOfEntry),
             //Which way to go around the mark. (clockwise vs anticlockwise)
             roundingSide == RoundingSide.PORT ? Math.abs(angleOfExit - angleOfEntry) : -Math.abs(angleOfEntry - angleOfExit)
         );
@@ -122,9 +132,7 @@ public class MarkArrowFactory {
      * @param colour colour of arrow
      * @return the arrow.
      */
-    public static Group constructInteriorArrow(RoundingSide roundingSide, double angleOfExit,
-        double angleOfEntry, Paint colour) {
-
+    private static Group makeInteriorAngle (RoundingSide roundingSide, double angleOfExit, double angleOfEntry, Paint colour) {
         Group arrow = new Group();
         Polygon lineSegment;
         //Reverse angle of exit/entry to find position between them

src/main/java/seng302/visualiser/fxObjects/Marker.java

@@ -1,41 +0,0 @@
-package seng302.visualiser.fxObjects;
-
-import java.util.ArrayList;
-import java.util.List;
-import javafx.scene.Group;
-import seng302.visualiser.fxObjects.MarkArrowFactory.RoundingSide;
-
-/**
- * Created by cir27 on 28/09/17.
- */
-public abstract class Marker extends Group{
-
-    protected List<Group> enterArrows = new ArrayList<>();
-    protected List<Group> exitArrows = new ArrayList<>();
-    protected int enterArrowIndex = 0;
-    protected int exitArrowIndex = 0;
-
-    public abstract void addArrows(RoundingSide roundingSide, double entryAngle, double exitAngle);
-
-    public abstract void addFinishArrow(RoundingSide roundingSide, double entryAngle, double exitAngle);
-
-    /**
-     * Shows the next EnterArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
-     */
-    public void showNextEnterArrow() {
-        showArrow(enterArrows, enterArrowIndex);
-        enterArrowIndex++;
-    }
-
-    /**
-     * Shows the next ExitArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
-     */
-    public void showNextExitArrow() {
-        showArrow(exitArrows, exitArrowIndex);
-        exitArrowIndex++;
-    }
-
-    protected abstract void showArrow(List<Group> arrowList, int arrowListIndex);
-
-    public abstract void hideAllArrows();
-}

src/main/java/seng302/visualiser/fxObjects/assets_2D/AnnotationBox.java

@@ -0,0 +1,230 @@
+package seng302.visualiser.fxObjects.assets_2D;
+
+import java.util.HashMap;
+import java.util.Map;
+import javafx.application.Platform;
+import javafx.beans.value.ObservableValue;
+import javafx.scene.CacheHint;
+import javafx.scene.Group;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Text;
+
+/**
+ * Grouping of string objects over a semi transparent background.
+ */
+public class AnnotationBox extends Group {
+
+    @FunctionalInterface
+    public interface AnnotationFormatter<T> {
+        String transformString (T input);
+    }
+
+    /**
+     * Class stores a text object and relationship for updating the text object if needed
+     *
+     * @param <T> The type of observable value passed to the annotation, if there is one.
+     */
+    public class Annotation<T> {
+        private Text text;
+        private ObservableValue<T> source;
+        private AnnotationFormatter<T> format;
+
+        /**
+         * Constructor for observing annotation
+         * @param textObject the javaFX text object the annotation is displayed in
+         * @param source observable value that the annotation is taken from
+         * @param formatter interface describing how to format the source data if needed
+         */
+        public Annotation (Text textObject, ObservableValue<T> source, AnnotationFormatter<T> formatter) {
+            this.text = textObject;
+            this.source = source;
+            this.format = formatter;
+            source.addListener((obs, oldVal, newVal) ->
+                Platform.runLater(() -> text.setText(format.transformString(newVal)))
+            );
+        }
+
+        /**
+         * Constructor for a static annotation
+         * @param textObject the javaFX text object the annotation is displayed in
+         * @param annotationText the static value of the test object
+         */
+        public Annotation (Text textObject, String annotationText) {
+            textObject.setText(annotationText);
+            text = textObject;
+        }
+
+        private Text getText () {
+            return text;
+        }
+    }
+
+    //Text offset constants
+    private static final double X_OFFSET_TEXT = 20d;
+    private static final double Y_OFFSET_TEXT_INIT = -35d;
+    private static final double Y_OFFSET_PER_TEXT = 12d;
+    //Background constants
+    private static final double TEXT_BUFFER = 3;
+    private static final double BACKGROUND_X = X_OFFSET_TEXT - TEXT_BUFFER;
+    private static final double BACKGROUND_Y = Y_OFFSET_TEXT_INIT - TEXT_BUFFER;
+    private static final double BACKGROUND_H_PER_TEXT = 9.5d;
+    private static final double BACKGROUND_ARC_SIZE = 10;
+
+    private int visibleAnnotations = 0;
+    private double backgroundWidth = 145d;
+
+    private Rectangle background = new Rectangle();
+    private Paint theme = Color.BLACK;
+
+    private Map<String, Annotation> annotationsByName = new HashMap<>();
+
+    /**
+     * Creates an empty annotation box. The box is offset from (0,0) by (17, -38).
+     */
+    public AnnotationBox() {
+        this.setCache(true);
+        background.setX(BACKGROUND_X);
+        background.setY(BACKGROUND_Y);
+        background.setWidth(backgroundWidth);
+        background.setHeight(Math.abs(BACKGROUND_X) + TEXT_BUFFER + BACKGROUND_H_PER_TEXT * 4);
+        background.setArcHeight(BACKGROUND_ARC_SIZE);
+        background.setArcWidth(BACKGROUND_ARC_SIZE);
+        background.setFill(new Color(1, 1, 1, 0.75));
+        background.setStroke(theme);
+        background.setStrokeWidth(2);
+        background.setCache(true);
+        background.setCacheHint(CacheHint.SCALE);
+        this.getChildren().add(background);
+    }
+
+    /**
+     * Adds an annotation to the box. Use the name to reference the annotation for removal or\
+     * changing visibility.
+     * @param annotationName the name of the annotation.
+     * @param annotation the annotation.
+     */
+    public void addAnnotation (String annotationName, Annotation annotation) {
+        annotationsByName.put(annotationName, annotation);
+        Platform.runLater(() -> {
+            this.getChildren().add(annotation.getText());
+            visibleAnnotations++;
+            update();
+        });
+    }
+
+    /**
+     * Adds an annotation with a constant text.
+     * @param annotationName The name of the annotation. Will be used to reference it later.
+     * @param annotationText The desired text.
+     */
+    public void addAnnotation (String annotationName, String annotationText) {
+        Text text = getTextObject();
+        addAnnotation(annotationName, new Annotation(text, annotationText));
+    }
+
+    /**
+     * Adds an annotation with the given name. The annotation will contain the value of the given
+     * ObservableValue. The formatter should return a String and takes an object of the same type as
+     * the ObservableValue as a parameter. The String is how you want the annotation to look.
+     * @param annotationName The annotation name.
+     * @param observable The observable value the annotation will display.
+     * @param formatter A formatting function for the observable value.
+     * @param <E> The type of ObservableValue.
+     */
+    public <E> void addAnnotation (String annotationName, ObservableValue<E> observable,
+        AnnotationFormatter<E> formatter) {
+        Text newText = getTextObject();
+        addAnnotation(annotationName, new Annotation<>(newText, observable, formatter));
+    }
+
+    /**
+     * Sets the visibility of the annotation with the given name if it exists.
+     * @param annotationName The name of the annotation
+     * @param visibility the desired visibility
+     */
+    public void setAnnotationVisibility (String annotationName, boolean visibility) {
+        if (annotationsByName.containsKey(annotationName)) {
+            Text textField = annotationsByName.get(annotationName).text;
+            boolean currentState = textField.visibleProperty().get();
+            if (visibility != currentState) {
+                if (visibility)
+                    visibleAnnotations++;
+                else
+                    visibleAnnotations--;
+            }
+            textField.setVisible(visibility);
+            update();
+        }
+    }
+
+    /**
+     * Removes the annotation with the given name if it exits.
+     * @param annotationName The name given when the annotation was created.
+     */
+    public void removeAnnotation (String annotationName) {
+        if (annotationName.contains(annotationName)) {
+            Platform.runLater(() -> {
+                this.getChildren().remove(annotationsByName.remove(annotationName).getText());
+                visibleAnnotations--;
+                update();
+            });
+            annotationsByName.remove(annotationName);
+        }
+    }
+
+    /**
+     * Moves the annotation.
+     * @param x x location
+     * @param y y location
+     */
+    public void setLocation (double x, double y) {
+        Platform.runLater(()-> this.relocate(x + BACKGROUND_X, y + BACKGROUND_Y));
+    }
+
+    /**
+     * Changes the width of the annotation box. Default is 145.
+     * @param width new width.
+     */
+    public void setWidth (double width) {
+        backgroundWidth = width;
+        Platform.runLater(() -> background.setWidth(backgroundWidth));
+    }
+
+    private void update () {
+        background.setVisible(visibleAnnotations != 0);
+        background.setHeight(Math.abs(BACKGROUND_X) + TEXT_BUFFER + BACKGROUND_H_PER_TEXT * visibleAnnotations);
+        for (int i = 1; i <= visibleAnnotations; i++) {
+            Text text = (Text) this.getChildren().get(i);
+            if (text.visibleProperty().get()) {
+                    text.setX(X_OFFSET_TEXT);
+                    text.setY(Y_OFFSET_TEXT_INIT + Y_OFFSET_PER_TEXT * i);
+//                });
+            }
+        }
+    }
+
+    /**
+     * Returns a text object for an annotation.
+     * @return The text object
+     */
+    private Text getTextObject() {
+        Text text = new Text();
+        text.setFill(theme);
+        text.setStrokeWidth(2);
+//        text.setCacheHint(CacheHint.QUALITY);
+        text.setCache(true);
+        return text;
+    }
+
+    /**
+     * Set the colour of the annotation box's border and text colour.
+     * @param value desired colour.
+     */
+    public void setFill (Paint value) {
+        theme = value;
+        background.setStroke(theme);
+        annotationsByName.forEach((name, annotation) -> annotation.getText().setFill(theme));
+    }
+}

src/main/java/seng302/visualiser/fxObjects/assets_2D/Marker2D.java

@@ -1,5 +1,6 @@
 package seng302.visualiser.fxObjects.assets_2D;
 
+import java.util.ArrayList;
 import java.util.List;
 import javafx.application.Platform;
 import javafx.scene.Group;
@@ -7,16 +8,18 @@ import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Circle;
 import seng302.visualiser.fxObjects.MarkArrowFactory;
-import seng302.visualiser.fxObjects.MarkArrowFactory.RoundingSide;
-import seng302.visualiser.fxObjects.Marker;
 
 /**
  * Visual object for a mark. Contains a coloured circle and any specified arrows.
  */
-public class Marker2D extends Marker {
+public class Marker2D extends Group {
 
     private Circle mark = new Circle();
     private Paint colour = Color.BLACK;
+    private List<Group> enterArrows = new ArrayList<>();
+    private List<Group> exitArrows = new ArrayList<>();
+    private int enterArrowIndex = 0;
+    private int exitArrowIndex = 0;
 
     /**
      * Creates a new Marker containing only a circle. The default colour is black.
@@ -25,7 +28,8 @@ public class Marker2D extends Marker {
         mark.setRadius(5);
         mark.setCenterX(0);
         mark.setCenterY(0);
-        Platform.runLater(() -> this.getChildren().add(mark));
+        Platform.runLater(() -> this.getChildren()
+            .addAll(mark, new Group())); //Empty group placeholder or arrows.
     }
 
     /**
@@ -58,14 +62,6 @@ public class Marker2D extends Marker {
         );
     }
 
-    @Override
-    public void addFinishArrow(RoundingSide roundingSide, double entryAngle, double exitAngle){
-        enterArrows.add(
-            MarkArrowFactory.constructInteriorArrow(roundingSide, entryAngle, exitAngle, Color.RED)
-        );
-        exitArrows.add(new Group());
-    }
-
     /**
      * Shows the next EnterArrow. Does nothing if there are no more enter arrows. Other arrows
      * become hidden.
@@ -84,12 +80,15 @@ public class Marker2D extends Marker {
         exitArrowIndex++;
     }
 
-    @Override
-    protected void showArrow(List<Group> arrowList, int arrowListIndex) {
+    private void showArrow(List<Group> arrowList, int arrowListIndex) {
         if (arrowListIndex < arrowList.size()) {
-            Platform.runLater(() ->
-                this.getChildren().setAll(mark, arrowList.get(arrowListIndex))
-            );
+            if (arrowListIndex == 1) {
+                ;
+            }
+            Platform.runLater(() -> {
+                this.getChildren().remove(1);
+                this.getChildren().add(arrowList.get(arrowListIndex));
+            });
         }
     }
 

src/main/java/seng302/visualiser/fxObjects/assets_2D/Wake.java

@@ -16,6 +16,10 @@ public class Wake extends Group {
 
     //The number of wakes
     private int numWakes = 8;
+    //The total possible difference between the first wake and the last. Increasing/Decreasing this will make wakes fan out more/less.
+    private final double MAX_DIFF = 75;
+    //Increasing/decreasing this will alter the speed that wakes converge when the heading stop changing. Anything over about 1500 may cause oscillation.
+    private final int UNIFICATION_SPEED = 45;
 
 
     private Arc[] arcs = new Arc[numWakes];
@@ -65,6 +69,34 @@ public class Wake extends Group {
                 rad += (14 / numWakes) + (velocity / 2.5);
             }
         });
+//        } else {
+//            rotations[0] = rotation;
+//            ((Rotate) arcs[0].getTransforms().get(0)).setAngle(rotation);
+//            for (int i = 1; i < numWakes; i++) {
+//                double wakeSeparationRad = Math.toRadians(rotations[i - 1] - rotations[i]);
+//                double shortestDistance = Math.atan2(
+//                        Math.sin(wakeSeparationRad),
+//                        Math.cos(wakeSeparationRad)
+//                );
+//                double distDeg = Math.toDegrees(shortestDistance);
+//                if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) {
+//                    rotationalVelocities[i] = distDeg / UNIFICATION_SPEED * 2 * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes);
+//
+//                } else {
+//                    if (distDeg < (MAX_DIFF / numWakes)) {
+//                        rotationalVelocities[i] = distDeg / UNIFICATION_SPEED * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes);
+//                    } else
+//                        rotationalVelocities[i] = rotationalVelocities[i - 1];
+//                }
+//            }
+//        }
+
+//        double rad = (14 / numWakes) + velocity;
+//        for (Arc arc : arcs) {
+//            arc.setRadiusX(rad);
+//            arc.setRadiusY(rad);
+//            rad += (14 / numWakes) + (velocity / 2.5);
+//        }
     }
 
     /**

src/main/java/seng302/visualiser/fxObjects/assets_2D/WindArrow.java

@@ -0,0 +1,25 @@
+package seng302.visualiser.fxObjects.assets_2D;
+
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Polyline;
+import javafx.scene.shape.StrokeLineCap;
+import javafx.scene.shape.StrokeLineJoin;
+
+/**
+ * Created by cir27 on 5/09/17.
+ */
+public class WindArrow extends Polyline {
+    public WindArrow(Paint fill) {
+        this.getPoints().addAll(
+            -10d, 15d,
+            0d, 25d,
+            0d, -25d,
+            0d, 25d,
+            10d, 15d
+        );
+        this.setStrokeLineCap(StrokeLineCap.ROUND);
+        this.setStroke(fill);
+        this.setStrokeWidth(5);
+        this.setStrokeLineJoin(StrokeLineJoin.ROUND);
+    }
+}

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java

@@ -2,62 +2,21 @@ package seng302.visualiser.fxObjects.assets_3D;
 
 /**
  * Enum for boat meshes. Enum values should be of the form :
- * ENUM_VALUE (hull file, mast file, Y offset of mast CoR from origin, sail file, Y offset of sail CoR from origin, jib file, fixed sail)
+ * ENUM_VALUE (hull file, mast file, Y offset of mast CoR from origin, sail file, Y offset of sail CoR from origin)
  * Files must be valid .stl files.
  */
 public enum BoatMeshType {
 
-    DINGHY("dinghy_hull.stl", "dinghy_mast.stl", 1.36653, "dinghy_sail.stl", 1.36653, null, false, 1.8, 1.0, 1.0),
-    CATAMARAN("catamaran_hull.stl", "catamaran_mast.stl", 0.997, "catamaran_sail.stl",
-        0.997, null, false, 1.0, 1.4, 2.0),
-    PIRATE_SHIP("pirateship_hull.stl", "pirateship_mast.stl", -0.5415, "pirateship_mainsail.stl",
-        -0.5415, "pirateship_frontsail.stl", true, 1.2, 1.6, 1.2),
-    DUCKY("ducky_hull.stl", "ducky_mast.stl", -2.18539, "ducky_sail.stl", -2.18539, "ducky_eyes.stl", false, 1.2, 1.1, 1.4),
-    PARROT("parrot_hull.stl", null, 0, "parrot_features.stl", 0, "parrot_sail.stl", true, 1, 1, 1),
-    WAKA("waka_hull.stl", "waka_mast.stl", 0, "waka_sail.stl", 0, null, true, 1.7, 0.5, 1.5);
+    DINGHY ("dinghy_hull.stl", "dinghy_mast.stl", -1.36653, "dinghy_sail.stl", -1.36653);
 
-    final String hullFile, mastFile, sailFile, jibFile;
+    final String hullFile, mastFile, sailFile;
     final double mastOffset, sailOffset;
-    public final double maxSpeedMultiplier;
-    public final double accelerationMultiplier;
-    public final double turnStep;
-    final boolean fixedSail;
-    final static BoatMeshType[] boatTypes = new BoatMeshType[]{DINGHY, CATAMARAN, PIRATE_SHIP, DUCKY, PARROT, WAKA};
 
-    BoatMeshType(String hullFile, String mastFile, double mastOffset, String sailFile,
-        double sailOffset, String jibFile, boolean fixedSail, double maxSpeedMultiplier, double accelerationMultiplier, double turnStep) {
+    BoatMeshType(String hullFile, String mastFile, double mastOffset, String sailFile, double sailOffset) {
         this.hullFile = hullFile;
         this.mastFile = mastFile;
         this.mastOffset = mastOffset;
         this.sailFile = sailFile;
         this.sailOffset = sailOffset;
-        this.jibFile = jibFile;
-        this.fixedSail = fixedSail;
-        this.maxSpeedMultiplier = maxSpeedMultiplier;
-        this.accelerationMultiplier = accelerationMultiplier;
-        this.turnStep = turnStep;
-    }
-
-
-    public static BoatMeshType getNextBoatType(BoatMeshType boatType) {
-        for (int i = 0; i < boatTypes.length; i++) {
-            if (i == boatTypes.length -1) {
-                return boatTypes[0];
-            } else if (boatType == boatTypes[i]) {
-                return boatTypes[i+1];
-            }
-        }
-        return boatType;
-    }
-
-    public static BoatMeshType getPrevBoatType(BoatMeshType boatType) {
-        for (int i = 0; i < boatTypes.length; i++) {
-            if (i == 0 && boatType == boatTypes[i]) {
-                return boatTypes[boatTypes.length -1];
-            } else if (boatType == boatTypes[i]) {
-                return boatTypes[i-1];
-            }
-        }
-        return boatType;
     }
 }

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatModel.java

@@ -34,16 +34,14 @@ public class BoatModel extends Model {
      * @param degrees The rotation of the sail in degrees
      */
     public void rotateSail(double degrees) {
-        if (!meshType.fixedSail) {
-            MeshView mast = getMeshViewChild(MAST_INDEX);
-            MeshView sail = getMeshViewChild(SAIL_INDEX);
-            mast.getTransforms().setAll(
-                new Rotate(degrees, 0, -meshType.mastOffset, 0, new Point3D(0, 0, 1))
-            );
-            sail.getTransforms().setAll(
-                new Rotate(degrees, 0, -meshType.sailOffset,0, new Point3D(0, 0, 1))
-            );
-        }
+        MeshView mast = getMeshViewChild(MAST_INDEX);
+        MeshView sail = getMeshViewChild(SAIL_INDEX);
+        mast.getTransforms().setAll(
+                new Rotate(degrees, -meshType.mastOffset, 0,0, new Point3D(0, 0, 1))
+        );
+        sail.getTransforms().setAll(
+                new Rotate(degrees, -meshType.sailOffset, 0,0, new Point3D(0, 0, 1))
+        );
     }
 
     public void hideSail() {
@@ -60,9 +58,7 @@ public class BoatModel extends Model {
      */
     public void changeColour(Color newColour) {
         changeColourChild(HULL_INDEX, newColour);
-        if (meshType != BoatMeshType.PARROT) {
-            changeColourChild(MAST_INDEX, newColour);
-        }
+        changeColourChild(MAST_INDEX, newColour);
     }
 
     private void changeColourChild(int index, Color newColour) {
@@ -73,8 +69,4 @@ public class BoatModel extends Model {
     private MeshView getMeshViewChild(int index) {
         return (MeshView) assets.getChildren().get(index);
     }
-
-    public BoatMeshType getMeshType() {
-        return meshType;
-    }
 }

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatObject.java

@@ -3,20 +3,15 @@ package seng302.visualiser.fxObjects.assets_3D;
 import java.util.ArrayList;
 import java.util.List;
 import javafx.application.Platform;
-import javafx.beans.property.ReadOnlyDoubleWrapper;
-import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
-import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.MeshView;
 import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Translate;
 
 /**
  * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2
  * dimensional boat. It contains a single polygon for the boat, a group of lines to show it's path,
- * a wake object and two text labels to annotate the boat teams name and the boatTypes velocity. The
+ * a wake object and two text labels to annotate the boat teams name and the boats velocity. The
  * boat will update it's position onscreen everytime UpdatePosition is called unless the window is
  * minimized in which case it attempts to store animations and apply them when the window is
  * maximised.
@@ -33,21 +28,15 @@ public class BoatObject extends Group {
     private Group wake;
     private Color colour = Color.BLACK;
     private Boolean isSelected = false;
-    private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
-
-    // This stuff only matters to the players boat object.
-    private MeshView markIndicator;
-    private MeshView playerIndicator;
-    private ReadOnlyDoubleWrapper rotationProperty;
+    private Rotate rotation = new Rotate(0,0,1);
 
     private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
 
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
      */
-    public BoatObject(BoatMeshType boatMeshType) {
-        rotationProperty = new ReadOnlyDoubleWrapper(0.0);
-        boatAssets = ModelFactory.boatGameView(boatMeshType, colour);
+    public BoatObject() {
+        boatAssets = ModelFactory.boatGameView(BoatMeshType.DINGHY, colour);
         boatAssets.hideSail();
         boatAssets.getAssets().getTransforms().addAll(
             rotation
@@ -77,6 +66,8 @@ public class BoatObject extends Group {
      * @param windDir .
      */
     public void moveTo(double x, double y, double rotation, double velocity, Boolean sailIn, double windDir) {
+        Double dx = Math.abs(boatAssets.getAssets().getLayoutX() - x);
+        Double dy = Math.abs(boatAssets.getAssets().getLayoutY() - y);
         Platform.runLater(() -> {
             rotateTo(rotation, sailIn, windDir);
             this.layoutXProperty().setValue(x);
@@ -86,19 +77,6 @@ public class BoatObject extends Group {
         });
     }
 
-    public void updateMarkIndicator(Point2D markPoint) {
-        Point2D boatLoc = new Point2D(this.getLayoutX(), this.getLayoutY());
-        Double angle = Math.toDegrees(
-            Math.atan2(boatLoc.getY() - markPoint.getY(), boatLoc.getX() - markPoint.getX())) - 90;
-
-        Double radius = 0.5;
-        markIndicator.getTransforms().clear();
-        markIndicator.getTransforms().addAll(
-            new Rotate(angle, new Point3D(0, 0, 1)),
-            new Translate(0, -radius, 0)
-        );
-    }
-
     private Double normalizeHeading(double heading, double windDirection) {
         Double normalizedHeading = heading - windDirection;
         normalizedHeading = (double) Math.floorMod(normalizedHeading.longValue(), 360L);
@@ -107,7 +85,6 @@ public class BoatObject extends Group {
 
 
     private void rotateTo(double heading, boolean sailsIn, double windDir) {
-        rotationProperty.set(heading);
         rotation.setAngle(heading);
         wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1)));
         if (sailsIn) {
@@ -138,26 +115,6 @@ public class BoatObject extends Group {
         }
     }
 
-    public void setMarkIndicator(MeshView indicator) {
-        this.markIndicator = indicator;
-        this.getChildren().add(markIndicator);
-        createPlayerIndicator();
-        setIndicatorColor();
-    }
-
-    private void createPlayerIndicator() {
-        MeshView torus = ModelFactory.importSTL("player_circle.stl");
-        playerIndicator = torus;
-        this.getChildren().add(torus);
-    }
-
-    public void setIndicatorColor() {
-        Platform.runLater(() -> {
-            markIndicator.setMaterial(new PhongMaterial(Color.DARKORANGE));
-            playerIndicator.setMaterial(new PhongMaterial(colour));
-        });
-    }
-
     public Group getWake () {
         return wake;
     }
@@ -175,8 +132,4 @@ public class BoatObject extends Group {
     public void addSelectedBoatListener(SelectedBoatListener sbl) {
         selectedBoatListenerListeners.add(sbl);
     }
-
-    public ReadOnlyDoubleWrapper getRotationProperty() {
-        return rotationProperty;
-    }
 }

src/main/java/seng302/visualiser/fxObjects/assets_3D/Marker3D.java

@@ -1,17 +1,22 @@
 package seng302.visualiser.fxObjects.assets_3D;
+
+import java.util.ArrayList;
 import java.util.List;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import seng302.visualiser.fxObjects.MarkArrowFactory;
 import seng302.visualiser.fxObjects.MarkArrowFactory.RoundingSide;
-import seng302.visualiser.fxObjects.Marker;
 
 /**
  * Visual object for a mark. Contains a coloured circle and any specified arrows.
  */
-public class Marker3D extends Marker {
+public class Marker3D extends Group {
 
     private Model mark;
+    private List<Group> enterArrows = new ArrayList<>();
+    private List<Group> exitArrows = new ArrayList<>();
+    private int enterArrowIndex = 0;
+    private int exitArrowIndex = 0;
     private ModelType markType;
     private ModelType arrowType;
 
@@ -55,18 +60,23 @@ public class Marker3D extends Marker {
         );
     }
 
-    public void addFinishArrow(RoundingSide roundingSide, double entryAngle,
-        double exitAngle) {
-        enterArrows.add(
-            MarkArrowFactory.constructEntryArrow3D(roundingSide, entryAngle, ModelType.FINISH_ARROW).getAssets()
-        );
-        exitArrows.add(
-            MarkArrowFactory.constructExitArrow3D(roundingSide, exitAngle, ModelType.FINISH_ARROW).getAssets()
-        );
+    /**
+     * Shows the next EnterArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
+     */
+    public void showNextEnterArrow() {
+        showArrow(enterArrows, enterArrowIndex);
+        enterArrowIndex++;
     }
 
-    @Override
-    protected void showArrow(List<Group> arrowList, int arrowListIndex) {
+    /**
+     * Shows the next ExitArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
+     */
+    public void showNextExitArrow() {
+        showArrow(exitArrows, exitArrowIndex);
+        exitArrowIndex++;
+    }
+
+    private void showArrow(List<Group> arrowList, int arrowListIndex) {
         if (arrowListIndex < arrowList.size()) {
             Platform.runLater(() ->
                 this.getChildren().setAll(mark.getAssets(), arrowList.get(arrowListIndex))

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

@@ -16,8 +16,9 @@ import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
 
 
+
 /**
- * Factory class for creating 3D models of boatTypes.
+ * Factory class for creating 3D models of boats.
  */
 public class ModelFactory {
 
@@ -50,33 +51,28 @@ public class ModelFactory {
         return bo;
     }
 
-    public static BoatModel boatCustomiseView(BoatMeshType boatType, Color primaryColour) {
+    public static BoatModel boatRotatingView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
-        final Rotate animationRotate = new Rotate(0, new Point3D(0,0,1));
         boatAssets.getTransforms().addAll(
-            new Scale(8.0, 8.0, 8.0),
-            new Rotate(-70, new Point3D(1,0,0)),
-            new Translate(16,50, 1),
-            animationRotate
+            new Scale(40, 40, 40),
+            new Rotate(90, new Point3D(0,0,1)),
+            new Rotate(90, new Point3D(0, 1, 0))
         );
 
+        final Rotate animationRotate = new Rotate(0, new Point3D(1,1,1));
         boatAssets.getTransforms().add(animationRotate);
-        BoatModel bo = new BoatModel(boatAssets, null, boatType);
-        bo.rotateSail(45);
 
-        bo.setAnimation(new AnimationTimer() {
-            double boatAngle = 0;
-            Rotate rotate = animationRotate;
+        return new BoatModel(boatAssets, new AnimationTimer() {
+
+            private double rotation = 0;
+            private Rotate rotate = animationRotate;
+
             @Override
             public void handle(long now) {
-                boatAngle += 0.5;
-                rotate.setAngle(boatAngle);
+                rotation += 0.5;
+                rotate.setAngle(rotation);
             }
-        });
-        boatAssets.getChildren().addAll(
-            new AmbientLight()
-        );
-        return bo;
+        }, boatType);
     }
 
     public static BoatModel boatGameView(BoatMeshType boatType, Color primaryColour) {
@@ -88,42 +84,18 @@ public class ModelFactory {
     }
 
     private static Group getUnmodifiedBoatModel(BoatMeshType boatType, Color primaryColour) {
-
         Group boatAssets = new Group();
-        MeshView hull = importBoatSTL(boatType.hullFile);
+        MeshView hull = importFile(boatType.hullFile);
         hull.setMaterial(new PhongMaterial(primaryColour));
-        boatAssets.getChildren().add(hull);
-
-        if (boatType.mastFile != null) {
-            MeshView mast = importBoatSTL(boatType.mastFile);
-            mast.setMaterial(new PhongMaterial(primaryColour));
-            boatAssets.getChildren().add(mast);
-        } else {
-            boatAssets.getChildren().add(new MeshView());
-        }
-
-        MeshView sail = importBoatSTL(boatType.sailFile);
-        sail.setMaterial(
-            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
-        );
-        boatAssets.getChildren().add(sail);
-
-        if (boatType.jibFile != null) {
-            MeshView jib = importBoatSTL(boatType.jibFile);
-            jib.setMaterial(
-                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
-            );
-            boatAssets.getChildren().add(jib);
-        }
-
+        MeshView mast = importFile(boatType.mastFile);
+        mast.setMaterial(new PhongMaterial(primaryColour));
+        MeshView sail = importFile(boatType.sailFile);
+        sail.setMaterial(new PhongMaterial(Color.WHITE));
+        boatAssets.getChildren().addAll(hull, mast, sail);
         return boatAssets;
     }
 
-    private static MeshView importBoatSTL(String fileName) {
-        return importSTL("boatSTLs/" + fileName);
-    }
-
-    public static MeshView importSTL(String fileName) {
+    private static MeshView importFile(String fileName) {
         StlMeshImporter importer = new StlMeshImporter();
         importer.read(ModelFactory.class.getResource("/meshes/" + fileName));
         MeshView importedFile = new MeshView(importer.getImport());
@@ -144,10 +116,6 @@ public class ModelFactory {
             assets.setCacheHint(CacheHint.SCALE_AND_ROTATE);
         }
         switch (tokenType) {
-            case PLAYER_IDENTIFIER_TORUS:
-                return makeIdentifierTorus(assets);
-            case NEXT_MARK_INDICATOR:
-                return makeNextMarkIndicator(assets);
             case VELOCITY_PICKUP:
             case BUMPER_PICKUP:
             case RANDOM_PICKUP:
@@ -182,16 +150,6 @@ public class ModelFactory {
         }
     }
 
-    private static Model makeIdentifierTorus(Group assets) {
-//        assets.getChildren().add(new AmbientLight());
-        return new Model(new Group(assets), null);
-    }
-
-    private static Model makeNextMarkIndicator(Group assets) {
-//        assets.getChildren().add(new AmbientLight());
-        return new Model(new Group(assets), null);
-    }
-
     private static Model makeTokenPickup(Group assets) {
         Rotate animationRotate = new Rotate(0, new Point3D(0, 0, 1));
         assets.getTransforms().addAll(
@@ -275,31 +233,4 @@ public class ModelFactory {
         );
         return new Model(new Group(assets), null);
     }
-
-    /**
-     * Create a 3D wind arrow.
-     *
-     * @return 3D wind arrow object
-     */
-    public static Model makeWindArrow() {
-        ColModelImporter importer = new ColModelImporter();
-        importer.read(ModelFactory.class.getResource("/meshes/" + ModelType.WIND_ARROW.filename));
-        Group assets = new Group(importer.getImport());
-        assets.setCache(true);
-        assets.setCacheHint(CacheHint.SCALE_AND_ROTATE);
-
-        Rotate animationRotate = new Rotate(0, new Point3D(0, 1, 0));
-        assets.getTransforms().addAll(
-            new Translate(0, 0, 0),
-            new Scale(5, 5, 5),
-            new Rotate(270, new Point3D(1, 0, 0)),
-            animationRotate
-        );
-
-        assets.getChildren().addAll(
-            new AmbientLight()
-        );
-
-        return new Model(new Group(assets), null);
-    }
 }

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java

@@ -26,12 +26,7 @@ public enum ModelType {
     PLAYER_IDENTIFIER ("player_identifier.dae"),
     PLAIN_ARROW ("arrow.dae"),
     START_ARROW ("start_arrow.dae"),
-    FINISH_ARROW ("finish_arrow.dae"),
-    LAND("land.dae"),
-    LAND_SMOOTH("land_smooth.dae"),
-    NEXT_MARK_INDICATOR("indicator_arrow.dae"),
-    PLAYER_IDENTIFIER_TORUS("torus.dae"),
-    WIND_ARROW("windFiles/arrow56.dae"); // change filename
+    FINISH_ARROW ("finish_arrow.dae");
 
     final String filename;
 

src/main/java/seng302/visualiser/map/Boundary.java

@@ -0,0 +1,44 @@
+package seng302.visualiser.map;
+
+/**
+ * The Boundary class represents a rectangle territorial boundary on a map. It
+ * contains four extremity double values(N, E, S, W). N and S are represented as
+ * latitudes in radians. E and W are represented as longitudes in radians.
+ *
+ * Created by Haoming on 10/5/17
+ */
+public class Boundary {
+
+	private double northLat, eastLng, southLat, westLng;
+
+	public Boundary(double northLat, double eastLng, double southLat, double westLng) {
+		this.northLat = northLat;
+		this.eastLng = eastLng;
+		this.southLat = southLat;
+		this.westLng = westLng;
+	}
+
+	double getCentreLat() {
+		return (northLat + southLat) / 2;
+	}
+
+	double getCentreLng() {
+		return (eastLng + westLng) / 2;
+	}
+
+	double getNorthLat() {
+		return northLat;
+	}
+
+	double getEastLng() {
+		return eastLng;
+	}
+
+	double getSouthLat() {
+		return southLat;
+	}
+
+	double getWestLng() {
+		return westLng;
+	}
+}

src/main/java/seng302/visualiser/map/CanvasMap.java

@@ -0,0 +1,103 @@
+package seng302.visualiser.map;
+
+import java.net.URL;
+import javafx.geometry.Point2D;
+import javafx.scene.image.Image;
+import javax.net.ssl.HttpsURLConnection;
+import seng302.model.GeoPoint;
+
+/**
+ * CanvasMap retrieves a map image with given geo boundary from Google Map server.
+ * By passing a rectangle like geo boundary, it returns a map image with the
+ * highest resolution. However, due to free quote account usage limit, the maximum
+ * resolution is only 1280 * 1280.
+ *
+ * Created by Haoming on 15/5/2017
+ */
+public class CanvasMap {
+
+	private Boundary boundary;
+	private long width, height;  // desired image size
+	private int zoom;
+
+	private String KEY = "AIzaSyC-5oOShMCY5Oy_9L7guYMPUPFHDMr37wE";
+
+	public CanvasMap(Boundary boundary) {
+		this.boundary = boundary;
+		calculateOptimalMapSize();
+	}
+
+	public Image getMapImage() {
+		try {
+			URL url = new URL(getRequest());
+			HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
+
+			return new Image(connection.getInputStream());
+		} catch (Exception e) {
+			System.out.println("[CanvasMap] Exception");
+			return null;
+		}
+	}
+
+	private String getRequest() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("https://maps.googleapis.com/maps/api/staticmap?");
+		sb.append(String.format("center=%f,%f", boundary.getCentreLat(), boundary.getCentreLng()));
+		sb.append(String.format("&zoom=%d", zoom));
+		sb.append(String.format("&size=%dx%d&scale=2", width, height));
+		sb.append("&style=feature:all|element:labels|visibility:off"); // hide all labels on map
+//		sb.append(String.format("&markers=%f,%f", boundary.getSouthLat(), boundary.getWestLng()));
+//		sb.append(String.format("&key=%s", KEY));
+		return sb.toString();
+	}
+
+	private void calculateOptimalMapSize() {
+		for (int z = 20; z > 0; z--) {
+			MapSize mapSize = getMapSize(z, boundary);
+			zoom = z;
+			width = mapSize.width;
+			height = mapSize.height;
+			// if map size is valid, exit the loop as we have the highest resolution
+			if (mapSize.isValid()) break;
+		}
+	}
+
+	private MapSize getMapSize(int zoom, Boundary boundary) {
+		double scale = Math.pow(2, zoom);
+		GeoPoint geoSW = new GeoPoint(boundary.getSouthLat(), boundary.getWestLng());
+		GeoPoint geoNE = new GeoPoint(boundary.getNorthLat(), boundary.getEastLng());
+		Point2D pointSW = MercatorProjection.toMapPoint(geoSW);
+		Point2D pointNE = MercatorProjection.toMapPoint(geoNE);
+		return new MapSize(Math.abs(pointNE.getX() - pointSW.getX()) * scale,
+				Math.abs(pointNE.getY() - pointSW.getY()) * scale);
+	}
+
+	class MapSize {
+		long width, height;
+
+		MapSize(double width, double height) {
+			this.width = Math.round(width);
+			this.height = Math.round(height);
+		}
+
+		/**
+		 * Map size is valid when width and height are both less than 640 pixels
+		 * @return true if both dimensions are less than 640px
+		 */
+		boolean isValid() {
+			return Math.max(width, height) <= 640;
+		}
+	}
+
+	public long getWidth() {
+		return width;
+	}
+
+	public long getHeight() {
+		return height;
+	}
+
+	public int getZoom() {
+		return zoom;
+	}
+}

src/main/java/seng302/visualiser/map/MercatorProjection.java

@@ -0,0 +1,55 @@
+package seng302.visualiser.map;
+
+import javafx.geometry.Point2D;
+import seng302.model.GeoPoint;
+
+/**
+ * An utility class useful to convert between Geo locations and Mercator projection
+ * planar coordinates.
+ * Created by Haoming on 15/5/2017
+ */
+public class MercatorProjection {
+
+	private static final double MERCATOR_RANGE = 256;
+	private static final double pixelsPerLngDegree = MERCATOR_RANGE / 360.0;
+	private static final double pixelsPerLngRadian = MERCATOR_RANGE / (2 * Math.PI);
+
+	/**
+	 * A help function keeps the value in bound between -0.9999 and 0.9999.
+	 * @param value in bound value
+	 * @return the value in bound
+	 */
+	private static double bound(double value) {
+		return Math.min(Math.max(value, -0.9999), 0.9999);
+	}
+
+	/**
+	 * Projects a Geo Location (lat, lng) on a planar
+	 * @param geo GeoPoint (lat, lng) location to be projected
+	 * @return the projection Point2D (x, y) on planar
+	 */
+	public static Point2D toMapPoint(GeoPoint geo) {
+		double x, y;
+		Point2D origin = new Point2D(MERCATOR_RANGE / 2.0, MERCATOR_RANGE / 2.0);
+		x = (origin.getX() + geo.getLng() * pixelsPerLngDegree);
+
+//		NOTE(appleton): Truncating to 0.9999 effectively limits latitude to
+//      89.189.  This is about a third of a tile past the edge of the world tile.
+		double sinY = bound(Math.sin(Math.toRadians(geo.getLat())));
+		y = origin.getY() + 0.5 * Math.log((1 + sinY) / (1 - sinY)) * (-pixelsPerLngRadian);
+		return new Point2D(x, y);
+	}
+
+	/**
+	 * Converts the planar projection (x, y) back to Geo Location (lat, lng)
+	 * @param point Point2D (x, y) to be converted back
+	 * @return the original Geo location converted from the given projection point
+	 */
+	public static GeoPoint toMapGeo(Point2D point) {
+		Point2D origin = new Point2D(MERCATOR_RANGE / 2.0, MERCATOR_RANGE / 2.0);
+		double lng = (point.getX() - origin.getX()) / pixelsPerLngDegree;
+		double latRadians = (point.getY() - origin.getY()) / (-pixelsPerLngRadian);
+		double lat = Math.toDegrees(2 * Math.atan(Math.exp(latRadians)) - Math.PI / 2.0);
+		return new GeoPoint(lat, lng);
+	}
+}

src/main/java/seng302/visualiser/map/TestMapController.java

@@ -0,0 +1,22 @@
+package seng302.visualiser.map;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.canvas.Canvas;
+import javafx.scene.canvas.GraphicsContext;
+
+public class TestMapController implements Initializable{
+
+	@FXML
+	private Canvas mapCanvas;
+
+	@Override
+	public void initialize(URL location, ResourceBundle resources) {
+		GraphicsContext gc = mapCanvas.getGraphicsContext2D();
+		Boundary bound = new Boundary(57.662943, 11.848501, 57.673945, 11.824966);
+		CanvasMap canvasMap = new CanvasMap(bound);
+		gc.drawImage(canvasMap.getMapImage(), 0, 0, canvasMap.getWidth(), canvasMap.getHeight());
+	}
+}

src/main/java/seng302/visualiser/test3d.java

@@ -0,0 +1,108 @@
+package seng302.visualiser;
+
+import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import javafx.animation.AnimationTimer;
+import javafx.application.Application;
+import javafx.geometry.Point3D;
+import javafx.scene.Camera;
+import javafx.scene.Group;
+import javafx.scene.PerspectiveCamera;
+import javafx.scene.Scene;
+import javafx.scene.SceneAntialiasing;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.MeshView;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Scale;
+import javafx.scene.transform.Translate;
+import javafx.stage.Stage;
+
+/**
+ * Created by cir27 on 7/09/17.
+ */
+public class test3d extends Application {
+
+    Group root = new Group();
+    Scene scene;
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+//        camera = new PerspectiveCamera();
+//        gameObjects = new Group();
+//        root3D = new Group(camera, gameObjects);
+        scene = new Scene(
+            root, 1000, 1000, true, SceneAntialiasing.BALANCED
+        );
+        gameView3DTest();
+        primaryStage.setScene(scene);
+        primaryStage.show();
+//        scene.setCamera(camera);
+//        primaryStage.setScene(scene);
+//        primaryStage.show();
+//
+//        StlMeshImporter importer = new StlMeshImporter();
+//        importer.read(test3d.class.getResource("/meshes/dinghy_hull.stl").toString());
+//        MeshView boat = new MeshView(importer.getImport());
+//        boat.setMaterial(new PhongMaterial(Color.GREENYELLOW));
+//
+//        importer = new StlMeshImporter();
+//        importer.read(getClass().getResource("/meshes/dinghy_mast.stl").toString());
+//        MeshView mast = new MeshView(importer.getImport());
+//        mast.setMaterial(new PhongMaterial(Color.GREENYELLOW));
+//
+//        importer = new StlMeshImporter();
+//        importer.read(getClass().getResource("/meshes/dinghy_sail.stl").toString());
+//        MeshView sail = new MeshView(importer.getImport());
+//        sail.setMaterial(new PhongMaterial(Color.LIGHTGREY));
+//
+//        gameObjects.getChildren().addAll(boat, mast, sail);
+//
+//        gameObjects.getTransforms().add(new Scale(25, 25,25));
+//        gameObjects.getTransforms().add(new Translate(15, 20,0));
+//        gameObjects.getTransforms().addAll(
+//            new Rotate(90, new Point3D(0,0,1)),
+//            new Rotate(90, new Point3D(0, 1, 0))
+//        );
+//
+////        PointLight light = new PointLight();
+////        light.setLightOn(true);
+////        light.getTransforms().add(new Translate(15, 20, 0));
+////
+////        PointLight light2 = new PointLight();
+////        light2.setLightOn(true);
+////        light2.getTransforms().add(new Translate(30, 40, 0));
+//
+////        root3D.getChildren().addAll(light);
+//
+//        scene.setOnKeyPressed(event -> {
+//            switch (event.getCode()) {
+//                case UP:
+//                    gameObjects.getTransforms().add(new Rotate(5, new Point3D(0,0,1)));
+//                    break;
+//                case DOWN:
+//                    gameObjects.getTransforms().add(new Rotate(-5, new Point3D(0,0,1)));
+//                    break;
+//                case LEFT:
+//                    gameObjects.getTransforms().add(new Rotate(-5, new Point3D(0,1,0)));
+//                    break;
+//                case RIGHT:
+//                    gameObjects.getTransforms().add(new Rotate(5, new Point3D(0,1,0)));
+//                    break;
+//            }
+//        });
+//
+//        AnimationTimer animationTimer = new AnimationTimer() {
+//            @Override
+//            public void handle(long now) {
+//                sail.getTransforms().add(new Rotate(0.5, 0, -1.36653, 0, new Point3D(0, 0, 1)));
+//            }
+//        };
+//
+////        animationTimer.start();
+    }
+
+    private void gameView3DTest() {
+        GameView3D gameView3D = new GameView3D();
+        root.getChildren().add(gameView3D.getAssets());
+    }
+}

src/main/resources/config/config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+
+<configurations>
+    <race-name>AC35</race-name>
+    <race-size>6</race-size>
+    <time-scale>10.0</time-scale>
+    <windDir-direction>135</windDir-direction>
+</configurations>
+

src/main/resources/config/course.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" ?>
+
+<markers>
+    <marks>
+        <gate>
+            <name type="start-line">Start</name>
+            <mark>
+                <name>Start1</name>
+                <latitude>57.6703330</latitude>
+                <longitude>11.8278330</longitude>
+                <id>122</id>
+            </mark>
+            <mark>
+                <name>Start2</name>
+                <latitude>57.6703330</latitude>
+                <longitude>11.8271333</longitude>
+                <id>123</id>
+            </mark>
+        </gate>
+        <mark>
+            <name>Mid Mark</name>
+            <latitude>57.6675700</latitude>
+            <longitude>11.8359880</longitude>
+            <id>131</id>
+        </mark>
+        <gate>
+            <name>Leeward Gate</name>
+            <mark>
+                <name>Leeward Gate1</name>
+                <latitude>57.6708220</latitude>
+                <longitude>11.8433900</longitude>
+                <id>124</id>
+            </mark>
+            <mark>
+                <name>Leeward Gate2</name>
+                <latitude>57.6711220</latitude>
+                <longitude>11.8436900</longitude>
+                <id>125</id>
+            </mark>
+        </gate>
+        <gate>
+            <name>Windward Gate</name>
+            <mark>
+                <name>Windward Gate1</name>
+                <latitude>57.6650170</latitude>
+                <longitude>11.8279170</longitude>
+                <id>126</id>
+            </mark>
+            <mark>
+                <name>Windward Gate2</name>
+                <latitude>57.6653170</latitude>
+                <longitude>11.8282170</longitude>
+                <id>127</id>
+            </mark>
+        </gate>
+        <gate type="finish-line">
+            <name>Finish</name>
+            <mark>
+                <name>Finish1</name>
+                <latitude>57.6715240</latitude>
+                <longitude>11.8444950</longitude>
+                <id>128</id>
+            </mark>
+            <mark>
+                <name>Finish2</name>
+                <latitude>57.6718240</latitude>
+                <longitude>11.8447950</longitude>
+                <id>129</id>
+            </mark>
+        </gate>
+    </marks>
+    <order>
+        <one>Start</one>
+        <two>Mid Mark</two>
+        <three>Leeward Gate</three>
+        <four>Windward Gate</four>
+        <five>Leeward Gate</five>
+        <six>Finish</six>
+    </order>
+</markers>

src/main/resources/config/courseAlt.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" ?>
+
+<course>
+    <marks>
+        <gate>
+            <name type="start-line">Start</name>
+            <mark>
+                <name>Start1</name>
+                <latitude>32.296577</latitude>
+                <longitude>-64.854304</longitude>
+            </mark>
+            <mark>
+                <name>Start2</name>
+                <latitude>32.293771</latitude>
+                <longitude>-64.855242</longitude>
+            </mark>
+        </gate>
+        <mark>
+            <name>Mid Mark</name>
+            <latitude>32.293039</latitude>
+            <longitude>-64.843983</longitude>
+        </mark>
+        <gate>
+            <name>Leeward Gate</name>
+            <mark>
+                <name>Leeward Gate1</name>
+                <latitude>32.284680</latitude>
+                <longitude>-64.850045</longitude>
+            </mark>
+            <mark>
+                <name>Leeward Gate2</name>
+                <latitude>32.280164</latitude>
+                <longitude>-64.847591</longitude>
+            </mark>
+        </gate>
+        <gate>
+            <name>Windward Gate</name>
+            <mark>
+                <name>Windward Gate1</name>
+                <latitude>32.309693</latitude>
+                <longitude>-64.835249</longitude>
+            </mark>
+            <mark>
+                <name>Windward Gate2</name>
+                <latitude>32.308046</latitude>
+                <longitude>-64.831785</longitude>
+            </mark>
+        </gate>
+        <gate type="finish-line">
+            <name>Finish</name>
+            <mark>
+                <name>Finish1</name>
+                <latitude>32.317379</latitude>
+                <longitude>-64.839291</longitude>
+            </mark>
+            <mark>
+                <name>Finish2</name>
+                <latitude>32.317257</latitude>
+                <longitude>-64.836260</longitude>
+            </mark>
+        </gate>
+    </marks>
+    <order>
+        <one>Start</one>
+        <two>Mid Mark</two>
+        <three>Leeward Gate</three>
+        <four>Windward Gate</four>
+        <five>Leeward Gate</five>
+        <six>Finish</six>
+    </order>
+</course>
+

src/main/resources/config/teams.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+
+<teams>
+    <team>
+        <name>Oracle Team USA</name>
+        <alias>USA</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>102</id>
+    </team>
+    <team>
+        <name>Artemis Racing</name>
+        <alias>ART</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>101</id>
+    </team>
+    <team>
+        <name>Emirates Team New Zealand</name>
+        <alias>NZL</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>103</id>
+    </team>
+    <team>
+        <name>Land Rover BAR</name>
+        <alias>BAR</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>104</id>
+    </team>
+    <team>
+        <name>SoftBank Team Japan</name>
+        <alias>JAP</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>105</id>
+    </team>
+    <team>
+        <name>Groupama Team France</name>
+        <alias>FRC</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>106</id>
+    </team>
+</teams>

src/main/resources/css/LobbyView.css

@@ -65,12 +65,4 @@
     /*-fx-background-repeat: no-repeat;*/
     /*-fx-background-size: cover;*/
     -fx-background-color: dodgerblue;
-}
-
-.tokenView {
-    -fx-cursor: hand;
-}
-
-.tokenGridView StackPane {
-    -fx-background-color: white;
 }

src/main/resources/css/Master.css

@@ -44,18 +44,8 @@
     -fx-border-color: -fx-decorator-color;
     -fx-border-width: 0 4 4 4;
 }
-
-.jfx-decorator-button {
-    -fx-focus-traversable: false; /* so decorator button will not be focused */
-}
-
 /********* customised scroll bar for scroll pane ***********/
 
-.scroll-pane {
-    -fx-focus-traversable: false;
-    -fx-border-style: none;
-}
-
 /* The main scrollbar **track** CSS class  */
 .scroll-bar:horizontal .track,
 .scroll-bar:vertical .track {
@@ -109,16 +99,4 @@
 
 .slider .track {
     -fx-background-color: -fx-pp-dark-text-color;
-}
-
-.jfx-snackbar-content {
-    -fx-background-color: -fx-pp-front-color;
-    -fx-padding: 0 5 0 5;
-    -fx-spacing: 0 5 0 5;
-    -fx-font-size: 15;
-}
-
-.jfx-snackbar-toast {
-    -fx-text-fill: -fx-pp-theme-color;
-    -fx-font-size: 15;
 }

src/main/resources/css/RaceView.css

@@ -5,7 +5,6 @@
 #timerGrid{
     -fx-background-color: rgba(255, 255, 255, 0.6);
     -fx-effect: -fx-pp-dropshadow-light;
-    -fx-background-radius: 5;
 }
 
 GridPane .timer * {
@@ -28,24 +27,20 @@ GridPane .timer * {
 #chatHistoryHolder {
     -fx-background-color: rgba(255, 255, 255, 0.6);
     -fx-effect: -fx-pp-dropshadow-light;
-    -fx-background-radius: 5;
 }
 
 #chatInputHolder {
     -fx-background-color: rgba(255, 255, 255, 0.6);
     -fx-effect: -fx-pp-dropshadow-light;
-    -fx-background-radius: 5;
 }
 
 #windGridPane {
     -fx-background-color: rgba(255, 255, 255, 0.6);
     -fx-effect: -fx-pp-dropshadow-light;
-    -fx-background-radius: 5;
 }
 
 #windHolder {
     -fx-background-color: rgba(255, 255, 255, 0.5);
-    -fx-background-radius: 5;
 }
 
 #chatSend {
@@ -53,7 +48,6 @@ GridPane .timer * {
     -fx-text-fill: -fx-pp-theme-color;
     -fx-font-size: 13px;
     -fx-pref-height: 35px;
-    -fx-focus-traversable: false;
 }
 
 #chatSend:hover {
@@ -66,25 +60,6 @@ GridPane .timer * {
     -fx-background-color: transparent;
 }
 
-#chatToggleButton {
-    -fx-background-color: rgba(255, 255, 255, 0.6);
-    -fx-background-radius: 5;
-    -fx-min-width: 30;
-    -fx-min-height: 30;
-}
-
 #windImageView {
     -fx-image: url("/images/wind-180.png");
-}
-
-#miniMapPane {
-    -fx-background-color: rgba(255, 255, 255, 0.6);
-    -fx-background-radius: 5;
-}
-
-#miniMapButton {
-    -fx-background-color: rgba(255, 255, 255, 0.6);
-    -fx-background-radius: 5;
-    -fx-min-width: 30;
-    -fx-min-height: 30;
 }

src/main/resources/css/ServerListView.css

@@ -38,16 +38,15 @@
     -fx-font-size: 23px;
 }
 
-#connectButton, #roomConnectButton, #directConnectButton, #autoSelectGame {
+#connectButton, #roomConnectButton {
     -fx-background-color: -fx-pp-light-text-color; /* inverted */
     -fx-text-fill: -fx-pp-theme-color; /* inverted */
     -fx-font-size: 20px;
     -fx-pref-height: 45px;
-    -fx-effect: -fx-pp-dropshadow-dark;
 }
 
-#connectButton:hover, #roomConnectButton:hover, #directConnectButton:hover, #autoSelectGame:hover {
-    -fx-font-size: 21px;
+#connectButton:hover, #roomConnectButton:hover {
+    -fx-font-size: 23px;
 }
 
 #connectLabel, #connectLabel1, #serverPortNumber, #roomNumber, #serverHostName {

src/main/resources/css/SplashScreenView.css

@@ -1,50 +0,0 @@
-.root {
-    -fx-effect: -fx-pp-dropshadow-dark;
-    -fx-background-radius: 5;
-    -fx-padding: 10;
-}
-
-#rootPane {
-    -fx-background-image: url("/images/waves.png");
-
-}
-
-#headText {
-    -fx-font-size: 52px;
-    -fx-text-fill: rgb(30, 30, 30);
-    -fx-effect: -fx-pp-dropshadow-dark;
-}
-
-#subHeadLabel {
-    -fx-text-fill: rgb(30, 30, 30);
-    -fx-effect: -fx-pp-dropshadow-dark;
-    -fx-font-size: 12px;
-}
-
-.materialDesign-purple .arc {
-    -fx-stroke: #ab47bc;
-}
-
-.materialDesign-blue .arc {
-    -fx-stroke: #2962ff;
-}
-
-.materialDesign-cyan .arc {
-    -fx-stroke: #00b8d4;
-}
-
-.materialDesign-green .arc {
-    -fx-stroke: #00c853;
-}
-
-.materialDesign-yellow .arc {
-    -fx-stroke: #ffd600;
-}
-
-.materialDesign-orange .arc {
-    -fx-stroke: #ff6d00;
-}
-
-.materialDesign-red .arc {
-    -fx-stroke: #d50000;
-}

src/main/resources/css/StartScreenView.css

@@ -2,7 +2,6 @@
     -fx-font-size: 20px;
     -fx-text-fill: -fx-pp-light-text-color;
     -fx-background-color: -fx-pp-theme-color;
-    -fx-focus-traversable: false;
 }
 
 .jfx-rippler {

src/main/resources/css/TokenInfoDialog.css

@@ -1,22 +0,0 @@
-.text-area {
-    -fx-background-insets: 0;
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area .content {
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area:focused .content {
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area:focused {
-    -fx-highlight-fill: #7ecfff;
-}
-
-.text-area .content {
-    -fx-padding: 10px;
-    -fx-text-fill: gray;
-    -fx-highlight-fill: #7ecfff;
-}

src/main/resources/css/cells/WindCell.css

@@ -1,3 +0,0 @@
-#windPane {
-    -fx-background-color: rgba(255, 255, 255, 0);
-}

src/main/resources/css/dialogs/DirectConnect.css

@@ -1,47 +0,0 @@
-#maxPlayersGridPane VBox * {
-    -fx-font-family: monospace !important;
-}
-
-#submitBtn {
-    -fx-background-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-light-text-color;
-    -fx-font-size: 20px;
-    -fx-effect: -fx-pp-dropshadow-dark;
-}
-
-.jfx-rippler {
-    -jfx-rippler-fill: -fx-pp-light-theme-color; /* set rippler color for button */
-}
-
-#submitBtn:hover {
-    -fx-font-size: 23px;
-    -fx-background-color: -fx-pp-light-theme-color;
-}
-
-#hostDialogHeader {
-    -fx-font-size: 30px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-
-#serverName {
-    -jfx-focus-color: -fx-pp-dark-text-color;
-    -jfx-unfocus-color: -fx-pp-dark-text-color;
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-prompt-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 16px;
-}
-
-#maxPlayersLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 16px;
-}
-
-#maxPlayerPromptLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 16px;
-}
-
-.maxPlayers {
-    -fx-font-size: 13px;
-}

src/main/resources/css/dialogs/KeyBindingDialog.css

@@ -1,59 +0,0 @@
-#keyBindingDialogHeader {
-    -fx-font-size: 27px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel {
-    -fx-font-size: 30;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel:hover {
-    -fx-text-fill: red;
-    -fx-font-size: 33px;
-}
-
-.sectionLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 20px;
-}
-
-JFXButton {
-    -fx-background-color: -fx-pp-light-text-color;
-    -fx-text-fill: -fx-pp-theme-color;
-    -fx-font-size: 13px;
-}
-
-Label {
-    -fx-font-size: 15px;
-    -fx-text-fill: -fx-pp-theme-color;
-    -fx-effect: -fx-pp-dropshadow-light;
-}
-
-JFXToggleButton {
-    -jfx-toggle-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-theme-color;
-}
-
-#resetBtn, #confirmBtn {
-    -fx-background-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-front-color;
-    -fx-effect: -fx-pp-dropshadow-light;
-    -fx-font-size: 18;
-}
-
-#resetBtn:hover, #confirmBtn:hover {
-    -fx-font-size: 20;
-}
-
-.jfx-snackbar-content {
-    -fx-background-color: #323232;
-}
-
-.jfx-snackbar-toast {
-    -fx-text-fill: WHITE;
-}
-
-.jfx-snackbar-action {
-    -fx-text-fill: #ff4081;
-}

src/main/resources/css/dialogs/Popup.css

@@ -1,33 +0,0 @@
-#headerLabel {
-    -fx-font-size: 20px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel {
-    -fx-font-size: 22px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel:hover {
-    -fx-font-size: 24px;
-    -fx-text-fill: red;
-}
-
-#contentLabel {
-    -fx-font-size: 22px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#optionButton {
-    -fx-background-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-light-text-color;
-    -fx-font-size: 18px;
-    -fx-effect: -fx-pp-dropshadow-light;
-    -fx-max-height: 55;
-    -fx-focus-traversable: false;
-}
-
-#optionButton:hover {
-    -fx-font-size: 20px !important;
-    -fx-background-color: -fx-pp-light-theme-color;
-}

src/main/resources/css/dialogs/ServerCreation.css

@@ -2,14 +2,6 @@
     -fx-font-family: monospace !important;
 }
 
-.sliderLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-.error-label * {
-    -fx-text-fill: red;
-}
-
 #submitBtn {
     -fx-background-color: -fx-pp-theme-color;
     -fx-text-fill: -fx-pp-light-text-color;
@@ -40,7 +32,12 @@
     -fx-font-size: 16px;
 }
 
-.optionLabel {
+#maxPlayersLabel {
+    -fx-text-fill: -fx-pp-dark-text-color;
+    -fx-font-size: 16px;
+}
+
+#maxPlayerPromptLabel {
     -fx-text-fill: -fx-pp-dark-text-color;
     -fx-font-size: 16px;
 }
@@ -48,18 +45,3 @@
 .maxPlayers {
     -fx-font-size: 13px;
 }
-
-#closeLabel {
-    -fx-font-size: 30;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel:hover {
-    -fx-text-fill: red;
-    -fx-font-size: 33px;
-}
-
-JFXCheckBox {
-    -jfx-checked-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}

src/main/resources/css/dialogs/Snackbar.css

@@ -1,4 +0,0 @@
-/* a separate file to dynamically change snackbar's color */
-.jfx-snackbar-toast {
-    -fx-text-fill: black !important;
-}