Various bug fixes

- Made canvas fill entire screen
- Made window scale to screens that aren't 1920x1080
- Changed boat speeds in mock so they aren't too fast
- Added command line options to switch server

Tags: #story[829]

src/main/java/seng302/server/ServerThread.java

@@ -20,9 +20,10 @@ public class ServerThread implements Runnable, Observer {
     Map<Integer,Boolean> boatsFinished = new HashMap<>();
     private List<Boat> boats;
     private Simulator raceSimulator;
+    private boolean sendingRaceFinishedLocationMessages = true;
 
     private final int HEARTBEAT_PERIOD = 5000;
-    private final int RACE_STATUS_PERIOD = 1000;
+    private final int RACE_STATUS_PERIOD = 1000/2;
     private final int RACE_START_STATUS_PERIOD = 1000;
     private final int BOAT_LOCATION_PERIOD = 1000/5;
     private final int PORT_NUMBER = 8085;
@@ -31,6 +32,8 @@ public class ServerThread implements Runnable, Observer {
 
     public ServerThread(String threadName){
         runner = new Thread(this, threadName);
+        runner.setDaemon(true);
+
         serverLog("Spawning Server", 0);
 
         raceSimulator = new Simulator(BOAT_LOCATION_PERIOD);
@@ -128,7 +131,7 @@ public class ServerThread implements Runnable, Observer {
             raceStatus = RaceStatus.TERMINATED;
         }
 
-        return new RaceStatusMessage(1, raceStatus, startTime, WindDirection.EAST,
+        return new RaceStatusMessage(1, raceStatus, startTime, WindDirection.SOUTH,
                 100, boats.size(), RaceType.MATCH_RACE, 1, boatSubMessages);
     }
 
@@ -256,6 +259,30 @@ public class ServerThread implements Runnable, Observer {
         startSendingRaceStatusMessages();
     }
 
+    /**
+     * Start sending static boat position updates when race has finished
+     */
+    private void startSendingRaceFinishedBoatPostions(){
+        Timer t = new Timer();
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    for (Boat b : raceSimulator.getBoats()){
+                        Message m = new BoatLocationMessage(b.getSourceID(), server.getSequenceNumber(), b.getLat(),
+                                b.getLng(), b.getLastPassedCorner().getBearingToNextCorner(),
+                                ((long) 0));
+
+                        server.send(m);
+                    }
+
+                } catch (IOException e) {
+                    System.out.print("");
+                }
+            }
+        }, 0, BOAT_LOCATION_PERIOD);
+    }
+
     /**
      * Send a boat location message when they are updated by the simulator
      * @param o .
@@ -271,7 +298,7 @@ public class ServerThread implements Runnable, Observer {
 
         for (Boat b : (List<Boat>) arg){
             try {
-                Message m = new BoatLocationMessage(b.getSourceID(), 1, b.getLat(),
+                Message m = new BoatLocationMessage(b.getSourceID(), server.getSequenceNumber(), b.getLat(),
                         b.getLng(), b.getLastPassedCorner().getBearingToNextCorner(),
                         ((long) b.getSpeed()));
                 server.send(m);

src/main/java/seng302/server/messages/BoatLocationMessage.java

@@ -42,6 +42,7 @@ public class BoatLocationMessage extends Message {
      * @param boatSpeed The boats speed
      */
     public BoatLocationMessage(int sourceId, int sequenceNum, double latitude, double longitude, double heading, long boatSpeed){
+        boatSpeed /= 10;
         messageVersionNumber = 1;
         time = System.currentTimeMillis() / 1000L;
         this.sourceId = sourceId;
@@ -54,8 +55,8 @@ public class BoatLocationMessage extends Message {
         this.pitch = 0;
         this.roll = 0;
         this.boatSpeed = boatSpeed;
-        this.COG = 0;
-        this.SOG = 0;
+        this.COG = 2;
+        this.SOG = boatSpeed ;
         this.apparentWindSpeed = 0;
         this.apparentWindAngle = 0;
         this.trueWindSpeed = 0;
@@ -146,7 +147,7 @@ public class BoatLocationMessage extends Message {
         putInt(headingToSend, 2);
         putInt((int) pitch, 2);
         putInt((int) roll, 2);
-        putUnsignedInt((int) boatSpeed, 2);
+        putInt((int) boatSpeed, 2);
         putUnsignedInt((int) COG, 2);
         putUnsignedInt((int) SOG, 2);
         putUnsignedInt((int) apparentWindSpeed, 2);

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

@@ -185,7 +185,6 @@ public abstract class Message {
      * @return
      */
     public static byte[] intToByteArray(long val, int len){
-        long vor = val;
         int index = 0;
         byte[] data = new byte[len];
 
@@ -210,4 +209,8 @@ public abstract class Message {
         }
     }
 
+    public int wat(){
+        return bufferPosition;
+    }
+
 }

src/main/java/seng302/server/simulator/Simulator.java

@@ -37,7 +37,7 @@ public class Simulator extends Observable implements Runnable {
 			boat.setLng(startLng);
 			boat.setLastPassedCorner(course.get(0));
 			boat.setHeadingCorner(course.get(1));
-			boat.setSpeed(ThreadLocalRandom.current().nextInt(400000, 600000 + 1));
+			boat.setSpeed(ThreadLocalRandom.current().nextInt(40000, 60000 + 1));
 		}
 	}