Merge branch 'develop' into Story40_Zooming

# Conflicts:
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/visualiser/GameClient.java

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

@@ -7,17 +7,28 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Queue;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import seng302.model.stream.packets.StreamPacket;
+import javafx.scene.control.ButtonType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.server.messages.BoatAction;
 import seng302.gameServer.server.messages.BoatActionMessage;
+import seng302.gameServer.server.messages.ClientType;
 import seng302.gameServer.server.messages.Message;
+import seng302.gameServer.server.messages.RegistrationRequestMessage;
+import seng302.gameServer.server.messages.RegistrationResponseStatus;
+import seng302.model.stream.packets.PacketType;
+import seng302.model.stream.packets.StreamPacket;
 
 /**
  * A class describing a single connection to a Server for the purposes of sending and receiving on
@@ -49,9 +60,17 @@ public class ClientToServerThread implements Runnable {
 
     private Socket socket;
     private InputStream is;
-    private OutputStream os;
 
-    private int clientId;
+    private Logger logger = LoggerFactory.getLogger(ClientToServerThread.class);
+
+    //Output stream
+    private OutputStream os;
+    private Timer upWindPacketTimer = new Timer();
+    private Timer downWindPacketTimer = new Timer();
+    private boolean upwindTimerFlag = false, downwindTimerFlag = false;
+    static public final int PACKET_SENDING_INTERVAL_MS = 100;
+
+    private int clientId = -1;
 
 //    private Boolean updateClient = true;
     private ByteArrayOutputStream crcBuffer;
@@ -73,15 +92,8 @@ public class ClientToServerThread implements Runnable {
         socket = new Socket(ipAddress, portNumber);
         is = socket.getInputStream();
         os = socket.getOutputStream();
-        Integer allocatedID = threeWayHandshake();
-        if (allocatedID != null) {
-            clientId = allocatedID;
-            clientLog("Successful handshake. Allocated ID: " + clientId, 1);
-        } else {
-            clientLog("Unsuccessful handshake", 1);
-            closeSocket();
-            return;
-        }
+
+        sendRegistrationRequest();
 
         thread = new Thread(this);
         thread.start();
@@ -130,15 +142,22 @@ public class ClientToServerThread implements Runnable {
                         if (streamPackets.size() > 0) {
                             streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
                         } else {
-                            streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
-                            for (ClientSocketListener csl : listeners)
-                                csl.newPacket();
+                            if (PacketType.RACE_REGISTRATION_RESPONSE == PacketType.assignPacketType(type, payload)){
+                                processRegistrationResponse(new StreamPacket(type, payloadLength, timeStamp, payload));
+                            }
+                            else {
+                                if (clientId == -1) continue; // Do not continue if not registered
+                                streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
+                                for (ClientSocketListener csl : listeners)
+                                    csl.newPacket();
+                            }
                         }
                     } else {
                         clientLog("Packet has been dropped", 1);
                     }
                 }
             } catch (ByteReadException e) {
+                e.printStackTrace();
                 closeSocket();
                 Platform.runLater(() -> {
                     Alert alert = new Alert(AlertType.ERROR);
@@ -149,7 +168,6 @@ public class ClientToServerThread implements Runnable {
                 clientLog(e.getMessage(), 1);
                 return;
             }
-//            System.out.println("streamPackets = " + streamPackets.size());
         }
         closeSocket();
         clientLog("Closed connection to Server", 0);
@@ -157,43 +175,127 @@ public class ClientToServerThread implements Runnable {
 
 
     /**
-     * Listens for an allocated sourceID and returns it to the server
-     *
-     * @return the sourceID allocated to us by the server
+     * Sends a request to the server asking for a source ID
      */
-    private Integer threeWayHandshake() {
-        Integer ourSourceID = null;
-        while (true) {
-            try {
-                ourSourceID = is.read();
-            } catch (IOException e) {
-                clientLog("Three way handshake failed", 1);
-            }
-            if (ourSourceID != null) {
-                try {
-                    os.write(ourSourceID);
-                    return ourSourceID;
-                } catch (IOException e) {
-                    clientLog("Three way handshake failed", 1);
-                    return null;
-                }
-            }
+    private void sendRegistrationRequest() {
+        RegistrationRequestMessage requestMessage = new RegistrationRequestMessage(ClientType.PLAYER);
+
+        try {
+            os.write(requestMessage.getBuffer());
+        } catch (IOException e) {
+            logger.error("Could not send registration request. Exiting");
+            System.exit(1);
         }
     }
 
-
     /**
-     * Send the post-start race course information
-     * @param boatActionMessage The message to send
+     * Accepts a response to the registration request message, and updates the client OR quits
+     * @param packet The registration requests packet
      */
-    public void sendBoatActionMessage(BoatActionMessage boatActionMessage) {
-        try {
-            os.write(boatActionMessage.getBuffer());
-        } catch (IOException e) {
-            clientLog("Could not write to server", 1);
+    private void processRegistrationResponse(StreamPacket packet){
+        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)){
+            clientId = sourceId;
+
+            return;
+        }
+
+        logger.error("Server Denied Connection, Exiting");
+
+        final String alertErrorText;
+
+        if (status.equals(RegistrationResponseStatus.FAILURE_FULL)){
+            alertErrorText = "Server is full";
+        }
+        else{
+            alertErrorText = "Could not connect to server";
+        }
+
+        Platform.runLater(() -> {
+            new Alert(AlertType.ERROR, alertErrorText, ButtonType.OK).showAndWait();
+            System.exit(1);
+        });
+    }
+
+    /**
+     * Sends packets for the given boat action. Special cases are: \n
+     * - DOWNWIND = Packets are sent every ClientToServerThread.PACKET_SENDING_INTERVAL_MS
+     * - UPWIND = Packets are sent every ClientToServerThread.PACKET_SENDING_INTERVAL_MS
+     * - MAINTAIN_HEADING = DOWNWIND and UPWIND packets stop being sent.
+     * @param actionType The boat action that will dictate packets sent.
+     */
+    public void sendBoatAction(BoatAction actionType) {
+        switch (actionType) {
+            case MAINTAIN_HEADING:
+                if (upwindTimerFlag) {
+                    cancelTimer(upWindPacketTimer);
+                    upwindTimerFlag = false;
+                    upWindPacketTimer = new Timer();
+                }
+                if (downwindTimerFlag) {
+                    cancelTimer(downWindPacketTimer);
+                    downwindTimerFlag = false;
+                    downWindPacketTimer = new Timer();
+                }
+                break;
+            case DOWNWIND:
+                if (!downwindTimerFlag) {
+                    downwindTimerFlag = true;
+                    downWindPacketTimer.scheduleAtFixedRate(
+                        new TimerTask() {
+                            @Override
+                            public void run() {
+                                sendBoatAction(new BoatActionMessage(BoatAction.DOWNWIND));
+                            }
+                        }, 0, PACKET_SENDING_INTERVAL_MS
+                    );
+                }
+                break;
+            case UPWIND:
+                if (!upwindTimerFlag) {
+                    upwindTimerFlag = true;
+                    upWindPacketTimer.scheduleAtFixedRate(
+                        new TimerTask() {
+                            @Override
+                            public void run() {
+                                sendBoatAction(new BoatActionMessage(BoatAction.UPWIND));
+                            }
+                        }, 0, PACKET_SENDING_INTERVAL_MS
+                    );
+                }
+                break;
+            default:
+                sendBoatAction(new BoatActionMessage(actionType));
+                break;
         }
     }
 
+    /**
+     * Cancels a packet sending timer.
+     * @param timer The timer to cancel.
+     */
+    private void cancelTimer (Timer timer) {
+        timer.cancel();
+        timer.purge();
+    }
+
+    /**
+     * Sends a boat action of the given message type.
+     * @param message The given message type.
+     */
+    private void sendBoatAction(BoatActionMessage message) {
+        if (clientId != -1) {
+            try {
+                os.write(message.getBuffer());
+            } catch (IOException e) {
+                clientLog("Could not write to server", 1);
+            }
+        }
+    }
 
     private void closeSocket() {
         try {
@@ -247,11 +349,8 @@ public class ClientToServerThread implements Runnable {
         }
     }
 
-    public Thread getThread() {
-        return thread;
-    }
-
     public int getClientId () {
         return clientId;
     }
+
 }

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

@@ -13,6 +13,7 @@ import javafx.scene.Node;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
 import seng302.gameServer.MainServerThread;
+import seng302.gameServer.server.messages.BoatAction;
 import seng302.model.RaceState;
 import seng302.model.Yacht;
 import seng302.model.stream.packets.StreamPacket;
@@ -22,8 +23,6 @@ import seng302.model.stream.parser.PositionUpdateData.DeviceType;
 import seng302.model.stream.parser.RaceStatusData;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
-import seng302.gameServer.server.messages.BoatActionMessage;
-import seng302.gameServer.server.messages.BoatActionType;
 import seng302.utilities.StreamParser;
 import seng302.utilities.XMLParser;
 import seng302.visualiser.controllers.LobbyController;
@@ -31,7 +30,8 @@ import seng302.visualiser.controllers.LobbyController.CloseStatus;
 import seng302.visualiser.controllers.RaceViewController;
 
 /**
- * Created by cir27 on 20/07/17.
+ * This class is a client side instance of a yacht racing game in JavaFX. The game is instantiated
+ * with a JavaFX Pane to insert itself into.
  */
 public class GameClient {
 
@@ -48,13 +48,20 @@ public class GameClient {
 
     private ObservableList<String> clientLobbyList = FXCollections.observableArrayList();
 
-    private long lastSendingTime;
-    private int KEY_STROKE_SENDING_FREQUENCY = 50;
-
+    /**
+     * 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(Pane holder) {
         this.holderPane = holder;
     }
 
+    /**
+     * Connect to a game at the given address and starts the visualiser.
+     * @param ipAddress IP to connect to.
+     * @param portNumber Port to connect to.
+     */
     public void runAsClient(String ipAddress, Integer portNumber) {
         try {
             socketThread = new ClientToServerThread(ipAddress, portNumber);
@@ -62,6 +69,7 @@ public class GameClient {
             ioe.printStackTrace();
             System.out.println("Unable to connect to host...");
         }
+
         socketThread.addStreamObserver(this::parsePackets);
         LobbyController lobbyController = loadLobby();
         lobbyController.setPlayerListSource(clientLobbyList);
@@ -70,6 +78,11 @@ public class GameClient {
         lobbyController.addCloseListener((exitCause) -> this.loadStartScreen());
     }
 
+    /**
+     * 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 void runAsHost(String ipAddress, Integer portNumber) {
         server = new MainServerThread();
         try {
@@ -93,10 +106,8 @@ public class GameClient {
 
     private void loadStartScreen() {
         socketThread.setSocketToClose();
-        socketThread = null;
         if (server != null) {
-            // TODO: 26/07/17 cir27 - handle disconnecting
-//            server.shutDown();
+            server.terminate();
             server = null;
         }
         FXMLLoader fxmlLoader = new FXMLLoader(
@@ -178,12 +189,9 @@ public class GameClient {
                         StreamParser.extractXmlMessage(packet)
                     );
                     clientLobbyList.clear();
-                    allBoatsMap.forEach((id, boat) -> {
-                        clientLobbyList.add(id + " " + boat.getBoatName());
-//                        System.out.println(id + " " + boat.getBoatName());
-
-                    });
-//                    startRaceIfAllDataReceived();
+                    allBoatsMap.forEach((id, boat) ->
+                        clientLobbyList.add(id + " " + boat.getBoatName())
+                    );
                     break;
 
                 case RACE_START_STATUS:
@@ -282,28 +290,15 @@ public class GameClient {
      * @param e The key event triggering this call
      */
     public void keyPressed(KeyEvent e) {
-        BoatActionMessage boatActionMessage;
-        long currentTime = System.currentTimeMillis();
-        if (currentTime - lastSendingTime > KEY_STROKE_SENDING_FREQUENCY) {
-            lastSendingTime = currentTime;
-            switch (e.getCode()) {
-                case SPACE: // align with vmg
-                    boatActionMessage = new BoatActionMessage(BoatActionType.VMG);
-                    socketThread.sendBoatActionMessage(boatActionMessage);
-                    break;
-                case PAGE_UP: // upwind
-                    boatActionMessage = new BoatActionMessage(BoatActionType.UPWIND);
-                    socketThread.sendBoatActionMessage(boatActionMessage);
-                    break;
-                case PAGE_DOWN: // downwind
-                    boatActionMessage = new BoatActionMessage(BoatActionType.DOWNWIND);
-                    socketThread.sendBoatActionMessage(boatActionMessage);
-                    break;
-                case ENTER: // tack/gybe
-                    boatActionMessage = new BoatActionMessage(BoatActionType.TACK_GYBE);
-                    socketThread.sendBoatActionMessage(boatActionMessage);
-                    break;
-                //TODO Allow a zoom in and zoom out methods
+        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
+                socketThread.sendBoatAction(BoatAction.TACK_GYBE); break;
                 case Z:  // zoom in
                     raceView.getGameView().zoomIn();
                     break;
@@ -314,15 +309,17 @@ public class GameClient {
         }
     }
 
-    public void keyReleased(KeyEvent e) {
+    private void keyReleased(KeyEvent e) {
         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
-                BoatActionMessage boatActionMessage = new BoatActionMessage(
-                    BoatActionType.SAILS_IN);
-                socketThread.sendBoatActionMessage(boatActionMessage);
+                socketThread.sendBoatAction(BoatAction.SAILS_IN);
                 raceView.getGameView().getPlayerYacht().toggleClientSail();
                 break;
+            case PAGE_UP:
+            case PAGE_DOWN:
+                socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break;
+
         }
     }
 }

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

@@ -168,7 +168,7 @@ public class GameView extends Pane {
                     }
                 }
 //                Platform.runLater(() ->
-//                    boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation())
+                    boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation());
 //                );
             }
         };
@@ -523,7 +523,6 @@ public class GameView extends Pane {
         distanceFromReference = GeoUtility.getDistance(
             minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
         );
-//        System.out.println("distanceFromReference = " + distanceFromReference);
         if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
             xAxisLocation += Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
             yAxisLocation -= Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
@@ -543,8 +542,6 @@ public class GameView extends Pane {
         if(horizontalInversion) {
             xAxisLocation = canvasWidth - bufferSize - (xAxisLocation - bufferSize);
         }
-//        System.out.println("yAxisLocation = " + yAxisLocation + " " + unscaledLat);
-//        System.out.println("xAxisLocation = " + xAxisLocation + " " + unscaledLon);
         return new Point2D(xAxisLocation, yAxisLocation);
     }
 

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

@@ -4,15 +4,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javafx.application.Platform;
-import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.ListView;
+import javafx.scene.control.TextArea;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.layout.GridPane;
 import javafx.scene.text.Text;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
@@ -33,28 +31,26 @@ public class LobbyController {
         void notify(CloseStatus exitCause);
     }
 
-    @FXML
-    private GridPane lobbyScreen;
     @FXML
     private Text lobbyIpText;
     @FXML
     private Button readyButton;
     @FXML
-    private ListView<String> firstListView;
+    private TextArea playerOneTxt;
     @FXML
-    private ListView secondListView;
+    private TextArea playerTwoTxt;
     @FXML
-    private ListView thirdListView;
+    private TextArea playerThreeTxt;
     @FXML
-    private ListView fourthListView;
+    private TextArea playerFourTxt;
     @FXML
-    private ListView fifthListView;
+    private TextArea playerFiveTxt;
     @FXML
-    private ListView sixthListView;
+    private TextArea playerSixTxt;
     @FXML
-    private ListView seventhListView;
+    private TextArea playerSevenTxt;
     @FXML
-    private ListView eighthListView;
+    private TextArea playerEightTxt;
     @FXML
     private ImageView firstImageView;
     @FXML
@@ -72,79 +68,67 @@ public class LobbyController {
     @FXML
     private ImageView eighthImageView;
 
-    private List<ObservableList<String>> competitors = new ArrayList<>();
-    private ObservableList<String> firstCompetitor = FXCollections.observableArrayList();
-    private ObservableList<String> secondCompetitor = FXCollections.observableArrayList();
-    private ObservableList<String> thirdCompetitor = FXCollections.observableArrayList();
-    private ObservableList<String> fourthCompetitor = FXCollections.observableArrayList();
-    private ObservableList<String> fifthCompetitor = FXCollections.observableArrayList();
-    private ObservableList<String> sixthCompetitor = FXCollections.observableArrayList();
-    private ObservableList<String> seventhCompetitor = FXCollections.observableArrayList();
-    private ObservableList<String> eighthCompetitor = FXCollections.observableArrayList();
-
     private List<ImageView> imageViews = new ArrayList<>();
-    private List<ListView> listViews;
+    private List<TextArea> listViews = new ArrayList<>();
 
     private int MAX_NUM_PLAYERS = 8;
 
     private List<LobbyCloseListener> lobbyListeners = new ArrayList<>();
-    private ObservableList<String> players = FXCollections.observableArrayList();
+    private ObservableList<String> players;
 
+    /**
+     * Add all FXObjects to lists and initialize images.
+     */
     public void initialize() {
-        imageViews = new ArrayList<>();
-        Collections
-            .addAll(imageViews, firstImageView, secondImageView, thirdImageView, fourthImageView,
-                fifthImageView, sixthImageView, seventhImageView, eighthImageView);
-        listViews = new ArrayList<>();
-        Collections.addAll(listViews, firstListView, secondListView, thirdListView, fourthListView, fifthListView,
-            sixthListView, seventhListView, eighthListView);
-        competitors = new ArrayList<>();
-        Collections.addAll(competitors, firstCompetitor, secondCompetitor, thirdCompetitor,
-            fourthCompetitor, fifthCompetitor, sixthCompetitor, seventhCompetitor, eighthCompetitor);
-
+        Collections.addAll(listViews,
+            playerOneTxt, playerTwoTxt, playerThreeTxt, playerFourTxt, playerFiveTxt, playerSixTxt,
+            playerSevenTxt, playerEightTxt
+        );
+        Collections.addAll(imageViews,
+            firstImageView, secondImageView, thirdImageView, fourthImageView,
+            fifthImageView, sixthImageView, seventhImageView, eighthImageView
+        );
         initialiseImageView();
     }
 
-    private void initialiseListView() {
-        listViews.forEach(listView -> listView.getItems().clear());
-        imageViews.forEach(gif -> gif.setVisible(false));
-        competitors.forEach(ol -> ol.removeAll());
+    /**
+     * Updates player names.
+     */
+    private void updatePlayers() {
+        //Update players if one added.
         for (int i = 0; i < players.size(); i++) {
-            competitors.get(i).add(players.get(i));
-            listViews.get(i).setItems(competitors.get(i));
+            listViews.get(i).setText(players.get(i));
             imageViews.get(i).setVisible(true);
         }
+        //Update empty text fields if player left.
+        for (int i = MAX_NUM_PLAYERS-1; i >= players.size(); i--) {
+            listViews.get(i).setText("");
+            imageViews.get(i).setVisible(false);
+        }
     }
 
+    /**
+     * Sets all images and hides them till players join.
+     */
     private void initialiseImageView() {
-        imageViews.add(firstImageView);
-        imageViews.add(secondImageView);
-        imageViews.add(thirdImageView);
-        imageViews.add(fourthImageView);
-        imageViews.add(fifthImageView);
-        imageViews.add(sixthImageView);
-        imageViews.add(seventhImageView);
-        imageViews.add(eighthImageView);
-        for (int i = 0; i < MAX_NUM_PLAYERS; i++) {
-            imageViews.get(i).setImage(
+        for (ImageView viewer : imageViews) {
+            viewer.setImage(
                 new Image(
                     RaceViewController.class.getResourceAsStream(
                         "/pics/sail.png")
                 )
             );
+            viewer.setVisible(false);
         }
     }
 
     @FXML
     public void leaveLobbyButtonPressed() {
         // TODO: 10/07/17 wmu16 - Finish function!
-//        setContentPane("/views/StartScreenView.fxml");
         GameState.setCurrentStage(GameStages.CANCELLED);
         // TODO: 20/07/17 wmu16 - Implement some way of terminating the game
-//        ClientState.setConnectedToHost(false);
         for (LobbyCloseListener readyListener : lobbyListeners)
             readyListener.notify(CloseStatus.LEAVE);
-
     }
 
     @FXML
@@ -154,32 +138,6 @@ public class LobbyController {
             readyListener.notify(CloseStatus.READY);
     }
 
-
-//    private static MediaPlayer mediaPlayer;
-//
-//    private void playTheme() {
-//        Random random = new Random(System.currentTimeMillis());
-//        Integer rand = random.nextInt();
-//        if(rand == 10) {
-//            URL file = getClass().getResource("/music/Disturbed - down with the sickness.mp3");
-//            Media hit = new Media(file.toString());
-//            mediaPlayer = new MediaPlayer(hit);
-//            mediaPlayer.play();
-//        } else if(rand == 9) {
-//            URL file = getClass().getResource("/music/Owl City - Fireflies.mp3");
-//            Media hit = new Media(file.toString());
-//            mediaPlayer = new MediaPlayer(hit);
-//            mediaPlayer.play();
-//        }
-//    }
-
-//    private void switchToRaceView() {
-//        if (!switchedPane) {
-//            switchedPane = true;
-//            setContentPane("/views/RaceView.fxml");
-//        }
-//    }
-// TODO: 26/07/17 cir27 - Could probably be done in a cleaner way.
     public void setTitle (String title) {
         lobbyIpText.setText(title);
     }
@@ -191,12 +149,13 @@ public class LobbyController {
     public void setPlayerListSource (ObservableList<String> players) {
         this.players = players;
         players.addListener((ListChangeListener<? super String>) (lcl) ->
-            Platform.runLater(this::initialiseListView)
+            Platform.runLater(this::updatePlayers)
         );
-        Platform.runLater(this::initialiseListView);
+        Platform.runLater(this::updatePlayers);
     }
 
     public void disableReadyButton () {
         readyButton.setDisable(true);
+        readyButton.setVisible(false);
     }
 }

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

@@ -245,15 +245,15 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             }
         });
         // Adds the new data series to the sparkline (and set the colour of the series)
-        Platform.runLater(() -> {
+        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() {
@@ -315,7 +315,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 updateRaceTime();
                 updateWindDirection();
                 updateOrder();
-                updateSparkLine();
+//                updateSparkLine();
             }
         }, 0, 1000);
     }

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

@@ -346,7 +346,7 @@ public class BoatObject extends Group {
      */
     public void setAsPlayer() {
         boatPoly.getPoints().setAll(
-          -BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75,
+            -BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75,
             0.0, -BOAT_HEIGHT / 1.75,
             BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75
         );

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

@@ -52,7 +52,7 @@ public class Wake extends Group {
             arc.setFill(new Color(0.0, 0.0, 0.0, 0.0));
             arcs[i] = arc;
             arc.getTransforms().setAll(
-                    new Rotate(1)
+                new Rotate(1)
             );
         }
         super.getChildren().addAll(arcs);
@@ -60,15 +60,15 @@ public class Wake extends Group {
 
     void setRotation (double rotation, double velocity) {
 //        if (Math.abs(rotations[0] - rotation) > 20) {
-          Platform.runLater(() -> {
-              rotate(rotation);
-              double rad = (14 / numWakes) + velocity;
-              for (Arc arc : arcs) {
-                  arc.setRadiusX(rad);
-                  arc.setRadiusY(rad);
-                  rad += (14 / numWakes) + (velocity / 2.5);
-              }
-          });
+        Platform.runLater(() -> {
+            rotate(rotation);
+            double rad = (14 / numWakes) + velocity;
+            for (Arc arc : arcs) {
+                arc.setRadiusX(rad);
+                arc.setRadiusY(rad);
+                rad += (14 / numWakes) + (velocity / 2.5);
+            }
+        });
 //        } else {
 //            rotations[0] = rotation;
 //            ((Rotate) arcs[0].getTransforms().get(0)).setAngle(rotation);

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

@@ -28,7 +28,7 @@ public class MercatorProjection {
 	 * @param geo GeoPoint (lat, lng) location to be projected
 	 * @return the projection Point2D (x, y) on planar
 	 */
-	static Point2D toMapPoint(GeoPoint geo) {
+	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);