Merged onto develop.

#mergre #refactor

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

@@ -360,7 +360,7 @@ public class GameState implements Runnable {
         Double velocity = yacht.getCurrentVelocity();
         Double trueWindAngle = Math.abs(windDirection - yacht.getHeading());
         Double boatSpeedInKnots = PolarTable.getBoatSpeed(getWindSpeedKnots(), trueWindAngle);
-        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots) * 3;
+        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots);
         // TODO: 15/08/17 remove magic numbers from these equations.
         if (yacht.getSailIn()) {
             if (velocity < maxBoatSpeed - 500) {

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

@@ -3,8 +3,18 @@ package seng302.gameServer;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
-import seng302.gameServer.server.messages.*;
+import java.util.List;
+import java.util.Random;
+import java.util.Timer;
+import java.util.TimerTask;
+import seng302.gameServer.messages.BoatSubMessage;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.RaceStartNotificationType;
+import seng302.gameServer.messages.RaceStartStatusMessage;
+import seng302.gameServer.messages.RaceStatus;
+import seng302.gameServer.messages.RaceStatusMessage;
+import seng302.gameServer.messages.RaceType;
 import seng302.model.GeoPoint;
 import seng302.model.Player;
 import seng302.model.PolarTable;

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

@@ -14,8 +14,8 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
 import seng302.gameServer.GameState;
 import seng302.gameServer.MainServerThread;
-import seng302.gameServer.server.messages.BoatAction;
+import seng302.gameServer.messages.BoatAction;
-import seng302.gameServer.server.messages.BoatStatus;
+import seng302.gameServer.messages.BoatStatus;
 import seng302.model.ClientYacht;
 import seng302.model.RaceState;
 import seng302.model.stream.packets.StreamPacket;
@@ -176,7 +176,9 @@ public class GameClient {
     }
 
     private void loadFinishScreenView() {
-        loadFXMLToHolder("/views/FinishScreenView.fxml");
+        FXMLLoader fxmlLoader = loadFXMLToHolder("/views/FinishScreenView.fxml");
+        FinishScreenViewController controller = fxmlLoader.getController();
+        controller.setFinishers(raceState.getPlayerPositions());
     }
 
     private FXMLLoader loadFXMLToHolder(String fxmlLocation) {
@@ -192,8 +194,6 @@ public class GameClient {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        FinishScreenViewController controller = fxmlLoader.getController();
-        controller.setFinishers(raceState.getPlayerPositions());
         return fxmlLoader;
     }
 
@@ -297,13 +297,10 @@ public class GameClient {
     private void updateMarkRounding(MarkRoundingData roundingData) {
         if (allXMLReceived()) {
             ClientYacht clientYacht = allBoatsMap.get(roundingData.getBoatId());
-            clientYacht.setMarkRoundingTime(roundingData.getTimeStamp());
+            clientYacht.roundMark(
-            clientYacht.updateTimeSinceLastMarkProperty(
+                courseData.getCompoundMarks().get(roundingData.getMarkId()),
-                raceState.getRaceTime() - roundingData.getTimeStamp());
+                roundingData.getTimeStamp(),
-            clientYacht.setLastMarkRounded(
+                raceState.getRaceTime() - roundingData.getTimeStamp()
-                courseData.getCompoundMarks().get(
-                    roundingData.getMarkId()
-                )
             );
         }
     }

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

@@ -771,9 +771,6 @@ public class GameView extends Pane {
 
     private void updateMarkArrows (ClientYacht yacht, CompoundMark compoundMark, int legNumber) {
         //Only show arrows for this and next leg.
-        if (legNumber - 2 >= 0) {
-            CompoundMark lastMark = course.get(Math.max(0, legNumber - 2));
-        }
         if (compoundMark != null) {
             for (Mark mark : compoundMark.getMarks()) {
                 markerObjects.get(mark).showNextExitArrow();

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

@@ -2,7 +2,6 @@ package seng302.visualiser.controllers;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Timer;
@@ -36,8 +35,8 @@ import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.StringConverter;
-import seng302.model.RaceState;
 import seng302.model.ClientYacht;
+import seng302.model.RaceState;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Mark;
 import seng302.model.stream.xml.parser.RaceXMLData;
@@ -147,14 +146,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             gameView.setWindDir(newDirection.doubleValue());
             updateWindDirection(newDirection.doubleValue());
         });
-        updateWindDirection(raceState.windDirectionProperty().doubleValue());
+        raceState.windSpeedProperty().addListener((obs, oldSpeed, newSpeed) -> {
-        gameView.setWindDir(raceState.windDirectionProperty().doubleValue());
+            updateWindSpeed(newSpeed.doubleValue());
-        for (ClientYacht yacht : participants.values()) {
-            yacht.placingProperty().addListener((obs, oldPlacing, newPlacing) -> {
-                updateOrder();
-                updateSparkLine();
         });
-        }
+        updateWindDirection(raceState.windDirectionProperty().doubleValue());
+        updateWindSpeed(raceState.getWindSpeed());
+        gameView.setWindDir(raceState.windDirectionProperty().doubleValue());
     }
 
     /**
@@ -379,10 +376,17 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
      * Updates the wind direction arrow and text as from info from the StreamParser
      * @param direction the from north angle of the wind.
      */
-    private void updateWind() {
+    private void updateWindDirection(double direction) {
-        windDirectionText.setText(String.format("%.1f°", raceState.getWindDirection()));
+        windDirectionText.setText(String.format("%.1f°", direction));
-        windArrowText.setRotate(raceState.getWindDirection());
+        windArrowText.setRotate(direction);
-        windSpeedText.setText("Speed: " + String.format("%.1f", raceState.getWindSpeed()) + " Knots");
+    }
+
+    /**
+     * Updates the speed of the wind as displayed by the info pane.
+     * @param windSpeed Windspeed in knots.
+     */
+    private void updateWindSpeed(double windSpeed) {
+        windSpeedText.setText("Speed: " + String.format("%.1f", windSpeed) + " Knots");
     }