From 4a75c062cee0f6bcb9c479c6338479e186bb6ffe Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 11 May 2017 15:49:49 +1200
Subject: [PATCH 01/14] Making the course limits change when a new xml packet
 is received.. #story[889]

---
 src/main/java/seng302/App.java                    |  4 +++-
 .../seng302/controllers/CanvasController.java     | 12 ++++++++++++
 .../java/seng302/models/parsers/StreamParser.java | 15 +++++++++++++++
 src/main/resources/views/RaceView.fxml            |  5 +++--
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..960511f8 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,7 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 8fc7ed54..bcdcc0c5 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -240,6 +240,17 @@ public class CanvasController {
                 }
             }
         }
+        checkForCourseChanges();
+    }
+
+    private void checkForCourseChanges() {
+        if (StreamParser.isNewXmlRecieved()){
+            System.out.println("New Canvas found");
+            gc.setFill(Color.SKYBLUE);
+            gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
+            gc.restore();
+            addRaceBorder();
+        }
     }
 
     private void move(long id, RaceObject raceObject){
@@ -345,6 +356,7 @@ public class CanvasController {
      * Calculates x and y location for every marker that fits it to the canvas the race will be drawn on.
      */
     private void fitMarksToCanvas() {
+        StreamParser.isNewXmlRecieved();
         findMinMaxPoint();
         double minLonToMaxLon = scaleRaceExtremities();
         calculateReferencePointLocation(minLonToMaxLon);
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..9260ae9e 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -31,6 +31,7 @@ public class StreamParser extends Thread{
      public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatPositions = new ConcurrentHashMap<>();
      private String threadName;
      private Thread t;
+     private static boolean newXmlRecieved = false;
      private static boolean raceStarted = false;
      private static XMLParser xmlObject;
      private static boolean raceFinished = false;
@@ -122,6 +123,8 @@ public class StreamParser extends Thread{
                      extractDisplayMessage(packet);
                      break;
                  case XML_MESSAGE:
+                     System.out.println("XML MESSAGE GOT");
+                     newXmlRecieved = true;
                      extractXmlMessage(packet);
                      break;
                  case RACE_START_STATUS:
@@ -313,6 +316,9 @@ public class StreamParser extends Thread{
         if (messageType == 7) {   //7 is the boat XML
             boats = xmlObject.getBoatXML().getCompetingBoats();
         }
+        if (messageType == 6) { //6 is race info xml
+            newXmlRecieved = true;
+        }
     }
 
     /**
@@ -579,5 +585,14 @@ public class StreamParser extends Thread{
         appRunning = false;
         System.out.println("[CLIENT] Shutting down stream parser");
     }
+
+    public static boolean isNewXmlRecieved(){
+        if (newXmlRecieved){
+            newXmlRecieved = false;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
 
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 3c148485..8a0c40a5 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -7,6 +7,7 @@
 <?import javafx.scene.text.*?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Slider?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
@@ -35,9 +36,9 @@
                 <Label layoutX="11.0" layoutY="14.0" text="Timer" />
                 <Label layoutX="11.0" layoutY="88.0" text="Wind direction" />
                 <Circle fx:id="windBackgroundCircle" blendMode="DARKEN" fill="#76baf8" layoutX="110.0" layoutY="166.0" radius="35.0" stroke="#686868" strokeType="INSIDE" strokeWidth="3.0" />
-                <Text fx:id="windArrowText" fill="#686868" layoutX="86.0" layoutY="186.0" strokeType="OUTSIDE" strokeWidth="0.0" text="↑">
+                <Text fx:id="windArrowText" fill="#686868" layoutX="96.0" layoutY="186.0" strokeType="OUTSIDE" strokeWidth="0.0" text="↑" wrappingWidth="27.5">
                     <font>
-                        <Font name="AdobeArabic-Regular" size="55.0" />
+                        <Font name="Arial Black" size="55.0" />
                     </font>
                 </Text>
                 <Text fx:id="windDirectionText" fill="#a8a7a7" layoutX="171.0" layoutY="214.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0.0°" textAlignment="RIGHT">

From 5472765b95413e0fac2364085f26a7d1776b10d6 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Fri, 12 May 2017 18:24:28 +1200
Subject: [PATCH 02/14] Removed unused methods in RaceViewController.java

 #story[923]
---
 .../controllers/RaceViewController.java       | 126 ------------------
 1 file changed, 126 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 433e47a2..d2e2ba11 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -51,8 +51,6 @@ public class RaceViewController extends Thread{
     private ArrayList<Yacht> startingBoats = new ArrayList<>();
     private boolean displayFps;
     private Timeline timerTimeline;
-    private Map<Yacht, TimelineInfo> timelineInfos = new HashMap<>();
-    private ArrayList<Yacht> boatOrder = new ArrayList<>();
     private Race race;
     private Stage stage;
     private Integer annotationLevel;
@@ -66,12 +64,6 @@ public class RaceViewController extends Thread{
         for (Yacht boat : race.getBoats()) {
             startingBoats.add(boat);
         }
-//        try{
-//            initializeTimelines();
-//        }
-//        catch (Exception e){
-//            e.printStackTrace();
-//        }
 
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
@@ -79,10 +71,6 @@ public class RaceViewController extends Thread{
         initializeSettings();
         initialiseWindDirection();
         initialisePositionVBox();
-        //set wind direction!!!!!!! can't find another place to put my code --haoming
-//        double windDirection = new ConfigParser("/config/config.xml").getWindDirection();
-//        windDirectionText.setText(String.format("%.1f°", windDirection));
-//        windArrowText.setRotate(windDirection);
         includedCanvasController.timer.start();
 
         selectAnnotationBtn.setOnAction(event -> {
@@ -225,97 +213,6 @@ public class RaceViewController extends Thread{
 
     }
 
-    /**
-     * Generates time line for each boat, and stores time time into timelineInfos hash map
-     */
-    private void initializeTimelines() {
-        HashMap<Yacht, List> boat_events = race.getEvents();
-        for (Yacht boat : boat_events.keySet()) {
-            startingBoats.add(boat);
-//            // x, y are the real time coordinates
-//            DoubleProperty x = new SimpleDoubleProperty();
-//            DoubleProperty y = new SimpleDoubleProperty();
-//
-//            List<KeyFrame> keyFrames = new ArrayList<>();
-//            List<Event> events = boat_events.get(boat);
-//
-//            // iterates all events and convert each event to keyFrame, then add them into a list
-//            for (Event event : events) {
-//                if (event.getIsFinishingEvent()) {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished -> {race.setBoatFinished(boat); handleEvent(event);},
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                } else {
-//                    keyFrames.add(
-//                            new KeyFrame(Duration.seconds(event.getTime()),
-//                                    onFinished ->{
-//                                        handleEvent(event);
-//                                        boat.setHeading(event.getBoatHeading());
-//                                    },
-//                                    new KeyValue(x, event.getThisMark().getLatitude()),
-//                                    new KeyValue(y, event.getThisMark().getLongitude())
-//                            )
-//                    );
-//                }
-//            }
-//            timelineInfos.put(boat, new TimelineInfo(new Timeline(keyFrames.toArray(new KeyFrame[keyFrames.size()])), x, y));
-        }
-        setRaceDuration();
-    }
-
-    private void setRaceDuration(){
-        Double maxDuration = 0.0;
-        Timeline maxTimeline = null;
-
-        for (TimelineInfo timelineInfo : timelineInfos.values()) {
-
-            Timeline timeline = timelineInfo.getTimeline();
-            if (timeline.getTotalDuration().toMillis() >= maxDuration) {
-                maxDuration = timeline.getTotalDuration().toMillis();
-                maxTimeline = timeline;
-            }
-
-            // Timelines are paused by default
-            timeline.play();
-            timeline.pause();
-        }
-
-        maxTimeline.setOnFinished(event -> {
-            race.setRaceFinished();
-            loadRaceResultView();
-        });
-    }
-
-    /**
-     * Play each boats timerTimeline
-     */
-    public void playTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.PAUSED){
-                timeline.play();
-            }
-        }
-    }
-
-    /**
-     * Pause each boats timerTimeline
-     */
-    public void pauseTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.RUNNING){
-                timeline.pause();
-            }
-        }
-    }
-
     /**
      * Display the list of boats in the order they finished the race
      */
@@ -335,29 +232,11 @@ public class RaceViewController extends Thread{
         }
     }
 
-    public void handleEvent(Event event) {
-        Yacht boat = event.getBoat();
-        boatOrder.remove(boat);
-        boat.setMarkLastPast(event.getMarkPosInRace());
-        boatOrder.add(boat);
-        boatOrder.sort(new Comparator<Yacht>() {
-            @Override
-            public int compare(Yacht b1, Yacht b2) {
-                return b2.getMarkLastPast() - b1.getMarkLastPast();
-            }
-        });
-        showOrder();
-    }
-
     private void showOrder() {
         positionVbox.getChildren().clear();
         positionVbox.getChildren().removeAll();
         positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
 
-//        for (Boat boat : boatOrder) {
-//            positionVbox.getChildren().add(new Text(boat.getShortName() + " " + boat.getSpeedInKnots() + " Knots"));
-//        }
-
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 Text textToAdd = new Text(boat.getPosition() + ". " +
@@ -424,15 +303,10 @@ public class RaceViewController extends Thread{
         return race;
     }
 
-    public Map<Yacht, TimelineInfo> getTimelineInfos() {
-        return timelineInfos;
-    }
-
     public ArrayList<Yacht> getStartingBoats(){
         return startingBoats;
     }
 
-
     private void setAnnotations(Integer annotationLevel) {
         switch (annotationLevel) {
             case 0:

From 47880d09bc85df9592670d606b42b65a130c1e30 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Fri, 12 May 2017 20:04:09 +1200
Subject: [PATCH 03/14] Implemented estimated time to next mark. Added checkbox
 for estimated time to next mark. To be fix: change from long to human
 readable time, update time every second

 #story[923]
---
 .../ImportantAnnotationController.java        | 12 ++++++++++
 .../controllers/RaceViewController.java       | 12 +++++++++-
 src/main/java/seng302/models/BoatGroup.java   | 22 ++++++++++++++++---
 .../views/importantAnnotationSelectView.fxml  |  3 ++-
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/controllers/ImportantAnnotationController.java b/src/main/java/seng302/controllers/ImportantAnnotationController.java
index e1a031cf..d5cd577e 100644
--- a/src/main/java/seng302/controllers/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/ImportantAnnotationController.java
@@ -28,6 +28,9 @@ public class ImportantAnnotationController implements Initializable {
     @FXML
     private CheckBox boatNameSelect;
 
+    @FXML
+    private CheckBox boatEstTimeToNextMarkSelect;
+
     @FXML
     private AnchorPane annotationSelectWindow;
 
@@ -87,6 +90,10 @@ public class ImportantAnnotationController implements Initializable {
                     boatNameSelect.setSelected(importantAnnotations.get(key));
                     break;
 
+                case "BoatEstTimeToNextMark":
+                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotations.get(key));
+                    break;
+
                 default:
                     break;
             }
@@ -120,6 +127,11 @@ public class ImportantAnnotationController implements Initializable {
             sendUpdate();
         });
 
+        boatEstTimeToNextMarkSelect.setOnAction(event -> {
+            setAnnotation("BoatEstTimeToNextMark", boatEstTimeToNextMarkSelect.isSelected());
+            sendUpdate();
+        });
+
         closeButton.setOnAction(event -> stage.close());
     }
 }
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index d2e2ba11..d6bcdc49 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -315,6 +315,7 @@ public class RaceViewController extends Thread{
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(false);
                         bg.setVelocityObjectVisible(false);
+                        bg.setEstTimeToNextMarkVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -326,6 +327,7 @@ public class RaceViewController extends Thread{
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(false);
+                        bg.setEstTimeToNextMarkVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -348,7 +350,14 @@ public class RaceViewController extends Thread{
                             bg.setVelocityObjectVisible(true);
                         }
                         else{
-                            bg.setTeamNameObjectVisible(false);
+                            bg.setVelocityObjectVisible(false);
+                        }
+
+                        if (importantAnnotations.containsKey("BoatEstTimeToNextMark") && importantAnnotations.get("BoatEstTimeToNextMark")) {
+                            bg.setEstTimeToNextMarkVisible(true);
+                        }
+                        else{
+                            bg.setEstTimeToNextMarkVisible(false);
                         }
 
                         if (importantAnnotations.containsKey("BoatTrack") && importantAnnotations.get("BoatTrack")){
@@ -373,6 +382,7 @@ public class RaceViewController extends Thread{
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(true);
+                        bg.setEstTimeToNextMarkVisible(true);
                         bg.setLineGroupVisible(true);
                         bg.setWakeVisible(true);
                     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 57dd48db..0a58d90e 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -23,9 +23,11 @@ public class BoatGroup extends RaceObject{
 
     //Constants for drawing
     private static final double TEAMNAME_X_OFFSET = 10d;
-    private static final double TEAMNAME_Y_OFFSET = -15d;
+    private static final double TEAMNAME_Y_OFFSET = -29d;
     private static final double VELOCITY_X_OFFSET = 10d;
-    private static final double VELOCITY_Y_OFFSET = -5d;
+    private static final double VELOCITY_Y_OFFSET = -17d;
+    private static final double ESTTIMETONEXTMARK_X_OFFSET = 10d;
+    private static final double ESTTIMETONEXTMARK_Y_OFFSET = -5d;
     private static final double BOAT_HEIGHT = 15d;
     private static final double BOAT_WIDTH = 10d;
     //Variables for boat logic.
@@ -38,6 +40,7 @@ public class BoatGroup extends RaceObject{
     private Polygon boatPoly;
     private Text teamNameObject;
     private Text velocityObject;
+    private Text estTimeToNextMarkObject;
     private Wake wake;
     //Handles boat moving when connecting to a stream
     private boolean setToInitialLocation = false;
@@ -83,6 +86,7 @@ public class BoatGroup extends RaceObject{
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
+        estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -93,8 +97,12 @@ public class BoatGroup extends RaceObject{
         velocityObject.relocate(velocityObject.getX(), velocityObject.getY());
         destinationSet = false;
 
+        estTimeToNextMarkObject.setX(ESTTIMETONEXTMARK_X_OFFSET);
+        estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
+        estTimeToNextMarkObject.relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
+
         wake = new Wake(0, -BOAT_HEIGHT);
-        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly);
+        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject);
     }
 
     /**
@@ -120,6 +128,8 @@ public class BoatGroup extends RaceObject{
         teamNameObject.setLayoutY(teamNameObject.getLayoutY() + dy);
         velocityObject.setLayoutX(velocityObject.getLayoutX() + dx);
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
+        estTimeToNextMarkObject.setLayoutX(estTimeToNextMarkObject.getLayoutX() + dx);
+        estTimeToNextMarkObject.setLayoutY(estTimeToNextMarkObject.getLayoutY() + dy);
         wake.setLayoutX(wake.getLayoutX() + dx);
         wake.setLayoutY(wake.getLayoutY() + dy);
         rotateTo(rotation + currentRotation);
@@ -148,6 +158,8 @@ public class BoatGroup extends RaceObject{
         teamNameObject.setLayoutY(y);
         velocityObject.setLayoutX(x);
         velocityObject.setLayoutY(y);
+        estTimeToNextMarkObject.setLayoutX(x);
+        estTimeToNextMarkObject.setLayoutY(y);
         wake.setLayoutX(x);
         wake.setLayoutY(y);
         wake.rotate(currentRotation);
@@ -287,6 +299,10 @@ public class BoatGroup extends RaceObject{
         velocityObject.setVisible(visible);
     }
 
+    public void setEstTimeToNextMarkVisible(Boolean visible) {
+        estTimeToNextMarkObject.setVisible(visible);
+    }
+
     public void setLineGroupVisible(Boolean visible) {
         lineGroup.setVisible(visible);
     }
diff --git a/src/main/resources/views/importantAnnotationSelectView.fxml b/src/main/resources/views/importantAnnotationSelectView.fxml
index fb88442d..da89b52a 100644
--- a/src/main/resources/views/importantAnnotationSelectView.fxml
+++ b/src/main/resources/views/importantAnnotationSelectView.fxml
@@ -15,7 +15,8 @@
       <CheckBox fx:id="boatWakeSelect" layoutX="26.0" layoutY="80.0" mnemonicParsing="false" style="-fx-border-width: 0; -fx-background-insets: 0;" text="Boat Wakes" textFill="#e7e7e7" />
       <CheckBox fx:id="boatSpeedSelect" layoutX="26.0" layoutY="111.0" mnemonicParsing="false" text="Boat Speed" textFill="#e7e7e7" />
       <CheckBox fx:id="boatTrackSelect" layoutX="26.0" layoutY="142.0" mnemonicParsing="false" text="Boat Tracks" textFill="#e7e7e7" />
-      <CheckBox fx:id="boatNameSelect" layoutX="26.0" layoutY="175.0" mnemonicParsing="false" text="Boat Name" textFill="#e7e7e7" />
+      <CheckBox fx:id="boatNameSelect" layoutX="26.0" layoutY="173.0" mnemonicParsing="false" text="Boat Name" textFill="#e7e7e7" />
+      <CheckBox fx:id="boatEstTimeToNextMarkSelect" layoutX="26.0" layoutY="204.0" mnemonicParsing="false" text="Boat Estimated Time To Next Mark" textFill="#e7e7e7" />
       <Button fx:id="closeButton" layoutX="424.0" layoutY="-1.0" mnemonicParsing="false" prefHeight="11.0" prefWidth="49.0" style=": 0;" text="X" textFill="#ffffff4e">
          <font>
             <Font size="24.0" />

From 1ab6351d48cffa85e398f5dc7eb942f71cc62db5 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 10:11:19 +1200
Subject: [PATCH 04/14] Fixed estimated time to next mark (annotation) to
 update correctly

#story[924]
---
 src/main/java/seng302/models/BoatGroup.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 0a58d90e..1d689c5f 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -236,6 +236,7 @@ public class BoatGroup extends RaceObject{
                     wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
+                estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;

From 39efafc75f8f2c5090416566f1467baa0958c35e Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 10:36:20 +1200
Subject: [PATCH 05/14] Fixed Annotation.java,
 ImportantAnnotationController.java, RaceViewController.java to include
 estimate time to next mark after merge

#story[924]
---
 .../java/seng302/controllers/RaceViewController.java   |  7 +++++++
 .../seng302/controllers/annotations/Annotation.java    |  3 ++-
 .../annotations/ImportantAnnotationController.java     | 10 +++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index b38aa4ca..cce59db3 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -340,6 +340,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         else{
             bg.setWakeVisible(false);
         }
+
+        if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
+            bg.setEstTimeToNextMarkVisible(true);
+        }
+        else {
+            bg.setEstTimeToNextMarkVisible(false);
+        }
     }
 
     private void setAnnotations(Integer annotationLevel) {
diff --git a/src/main/java/seng302/controllers/annotations/Annotation.java b/src/main/java/seng302/controllers/annotations/Annotation.java
index eed70162..0eea5ee2 100644
--- a/src/main/java/seng302/controllers/annotations/Annotation.java
+++ b/src/main/java/seng302/controllers/annotations/Annotation.java
@@ -7,5 +7,6 @@ public enum Annotation {
     SPEED,
     WAKE,
     TRACK,
-    NAME
+    NAME,
+    ESTTIMETONEXTMARK
 }
diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
index 5220b8fb..95fe84d3 100644
--- a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
@@ -94,8 +94,8 @@ public class ImportantAnnotationController implements Initializable {
                     boatNameSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
-                case "BoatEstTimeToNextMark":
-                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotations.get(key));
+                case ESTTIMETONEXTMARK:
+                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 default:
@@ -115,11 +115,7 @@ public class ImportantAnnotationController implements Initializable {
         boatSpeedSelect.setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
         boatTrackSelect.setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
         boatNameSelect.setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
-
-        boatEstTimeToNextMarkSelect.setOnAction(event -> {
-            setAnnotation("BoatEstTimeToNextMark", boatEstTimeToNextMarkSelect.isSelected());
-            sendUpdate();
-        });
+        boatEstTimeToNextMarkSelect.setOnAction(event -> setAnnotation(Annotation.ESTTIMETONEXTMARK, boatEstTimeToNextMarkSelect.isSelected()));
 
         closeButton.setOnAction(event -> stage.close());
     }

From 94d1982670d3fcb89bab5ea698d0d9b31a59227e Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 10:46:28 +1200
Subject: [PATCH 06/14] Shifted the canvas to the back of the window when
 updated.

This is to preserve the way the boats are still shown on the front when the course i reloaded.
As the main live stream has been down, this still needs to be tested.
---
 src/main/java/seng302/controllers/CanvasController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index ec449ab1..c4fa7b58 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -250,6 +250,7 @@ public class CanvasController {
             gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
             gc.restore();
             addRaceBorder();
+            canvas.toBack();
         }
     }
 

From e62a609b6b8055b3c975decaea5e736a779ad59c Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 13:47:30 +1200
Subject: [PATCH 07/14] Prepared StreamParser.java, BoatGroup.java, Yacht.java
 for leg timer annotation (story 36)

#story[927]
---
 .../controllers/RaceViewController.java       | 11 +++++-----
 src/main/java/seng302/models/BoatGroup.java   | 21 +++++++++++++++++--
 src/main/java/seng302/models/Yacht.java       | 12 ++++++-----
 .../seng302/models/parsers/StreamParser.java  | 13 ++++++++----
 4 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index cce59db3..f0ea2c51 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,6 +1,5 @@
 package seng302.controllers;
 
-import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.beans.value.ChangeListener;
@@ -342,10 +341,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
 
         if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
-            bg.setEstTimeToNextMarkVisible(true);
+            bg.setEstTimeToNextMarkObjectVisible(true);
         }
         else {
-            bg.setEstTimeToNextMarkVisible(false);
+            bg.setEstTimeToNextMarkObjectVisible(false);
         }
     }
 
@@ -358,7 +357,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(false);
                         bg.setVelocityObjectVisible(false);
-                        bg.setEstTimeToNextMarkVisible(false);
+                        bg.setEstTimeToNextMarkObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -371,7 +370,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(false);
-                        bg.setEstTimeToNextMarkVisible(false);
+                        bg.setEstTimeToNextMarkObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -393,7 +392,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(true);
-                        bg.setEstTimeToNextMarkVisible(true);
+                        bg.setEstTimeToNextMarkObjectVisible(true);
                         bg.setLineGroupVisible(true);
                         bg.setWakeVisible(true);
                     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 1d689c5f..30845ec5 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -28,6 +28,8 @@ public class BoatGroup extends RaceObject{
     private static final double VELOCITY_Y_OFFSET = -17d;
     private static final double ESTTIMETONEXTMARK_X_OFFSET = 10d;
     private static final double ESTTIMETONEXTMARK_Y_OFFSET = -5d;
+    private static final double LEGTIME_X_OFFSET = 10d;
+    private static final double LEGTIME_Y_OFFSET = 7d;
     private static final double BOAT_HEIGHT = 15d;
     private static final double BOAT_WIDTH = 10d;
     //Variables for boat logic.
@@ -41,6 +43,7 @@ public class BoatGroup extends RaceObject{
     private Text teamNameObject;
     private Text velocityObject;
     private Text estTimeToNextMarkObject;
+    private Text legTimeObject;
     private Wake wake;
     //Handles boat moving when connecting to a stream
     private boolean setToInitialLocation = false;
@@ -87,6 +90,7 @@ public class BoatGroup extends RaceObject{
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
         estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
+        legTimeObject = new Text(String.valueOf(boat.getMarkRoundingTime()));
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -101,8 +105,12 @@ public class BoatGroup extends RaceObject{
         estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
         estTimeToNextMarkObject.relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
 
+        legTimeObject.setX(LEGTIME_X_OFFSET);
+        legTimeObject.setY(LEGTIME_Y_OFFSET);
+        legTimeObject.relocate(legTimeObject.getX(), legTimeObject.getY());
+
         wake = new Wake(0, -BOAT_HEIGHT);
-        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject);
+        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject, legTimeObject);
     }
 
     /**
@@ -130,6 +138,8 @@ public class BoatGroup extends RaceObject{
         velocityObject.setLayoutY(velocityObject.getLayoutY() + dy);
         estTimeToNextMarkObject.setLayoutX(estTimeToNextMarkObject.getLayoutX() + dx);
         estTimeToNextMarkObject.setLayoutY(estTimeToNextMarkObject.getLayoutY() + dy);
+        legTimeObject.setLayoutX(legTimeObject.getLayoutX() + dx);
+        legTimeObject.setLayoutY(legTimeObject.getLayoutY() + dy);
         wake.setLayoutX(wake.getLayoutX() + dx);
         wake.setLayoutY(wake.getLayoutY() + dy);
         rotateTo(rotation + currentRotation);
@@ -160,6 +170,8 @@ public class BoatGroup extends RaceObject{
         velocityObject.setLayoutY(y);
         estTimeToNextMarkObject.setLayoutX(x);
         estTimeToNextMarkObject.setLayoutY(y);
+        legTimeObject.setLayoutX(x);
+        legTimeObject.setLayoutY(y);
         wake.setLayoutX(x);
         wake.setLayoutY(y);
         wake.rotate(currentRotation);
@@ -237,6 +249,7 @@ public class BoatGroup extends RaceObject{
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
                 estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
+                legTimeObject.setText(String.valueOf(boat.getMarkRoundingTime()));
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;
@@ -300,10 +313,14 @@ public class BoatGroup extends RaceObject{
         velocityObject.setVisible(visible);
     }
 
-    public void setEstTimeToNextMarkVisible(Boolean visible) {
+    public void setEstTimeToNextMarkObjectVisible(Boolean visible) {
         estTimeToNextMarkObject.setVisible(visible);
     }
 
+    public void setLegObjectTime(Boolean visible) {
+        legTimeObject.setVisible(visible);
+    }
+
     public void setLineGroupVisible(Boolean visible) {
         lineGroup.setVisible(visible);
     }
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 68970268..e21384f9 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -12,9 +12,9 @@ import java.text.SimpleDateFormat;
  *  also done outside Boat class because some old variables are not used anymore.
  */
 public class Yacht {
+    // Used in boat group
     private Color colour;
     private double velocity;
-    private Integer markLastPast;
 
     private String boatType;
     private Integer sourceID;
@@ -30,6 +30,8 @@ public class Yacht {
     private Long estimateTimeAtNextMark;
     private Long estimateTimeAtFinish;
     private String position;
+    // Mark rounding
+    private Long markRoundingTime;
 
     /**
      * Used in EventTest and RaceTest.
@@ -157,11 +159,11 @@ public class Yacht {
         this.velocity = velocity;
     }
 
-    public Integer getMarkLastPast() {
-        return markLastPast;
+    public Long getMarkRoundingTime() {
+        return markRoundingTime;
     }
 
-    public void setMarkLastPast(Integer markLastPast) {
-        this.markLastPast = markLastPast;
+    public void setMarkRoundingTime(Long markRoundingTime) {
+        this.markRoundingTime = markRoundingTime;
     }
 }
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..39e86df0 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -39,6 +39,7 @@ public class StreamParser extends Thread{
      private static Map<Integer, Yacht> boats = new HashMap<>();
      private static Map<Long, Yacht> boatsPos = new TreeMap<>();
      private static double windDirection = 0;
+     private static Long currentTimeLong;
      private static String currentTimeString;
      private static boolean appRunning;
 
@@ -196,9 +197,11 @@ public class StreamParser extends Thread{
         long currentTime = bytesToLong(Arrays.copyOfRange(payload,1,7));
         long raceId = bytesToLong(Arrays.copyOfRange(payload,7,11));
         int raceStatus = payload[11];
-//        System.out.println("raceStatus = " + raceStatus);
         long expectedStartTime = bytesToLong(Arrays.copyOfRange(payload,12,18));
+        long windDir = bytesToLong(Arrays.copyOfRange(payload,18,20));
+        long windSpeed = bytesToLong(Arrays.copyOfRange(payload,20,22));
 
+        currentTimeLong = currentTime;
         DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         if (xmlObject.getRegattaXML() != null) {
             format.setTimeZone(TimeZone.getTimeZone(getTimeZoneString()));
@@ -206,7 +209,6 @@ public class StreamParser extends Thread{
         }
         long timeTillStart = ((new Date (expectedStartTime)).getTime() - (new Date (currentTime)).getTime())/1000;
 
-
         if (timeTillStart > 0) {
             timeSinceStart = timeTillStart;
             //System.out.println("Time till start: " + timeTillStart + " Seconds");
@@ -223,10 +225,10 @@ public class StreamParser extends Thread{
             //System.out.println("Time since start: " + -1 * timeTillStart + " Seconds");
             timeSinceStart = timeTillStart;
         }
-        long windDir = bytesToLong(Arrays.copyOfRange(payload,18,20));
+
         double windDirFactor = 0x4000 / 90;   //0x4000 is 90 degrees, 0x8000 is 180 degrees, etc...
         windDirection = windDir / windDirFactor;
-        long windSpeed = bytesToLong(Arrays.copyOfRange(payload,20,22));
+
         int noBoats = payload[22];
         int raceType = payload[23];
 //        ArrayList<String> boatStatuses = new ArrayList<>();
@@ -429,6 +431,9 @@ public class StreamParser extends Thread{
         int roundingSide = payload[18];
         int markType = payload[19];
         int markId = payload[20];
+
+        // assign mark rounding time to boat
+        boats.get((int)subjectId).setMarkRoundingTime(timeStamp);
     }
 
     /**

From 081d7e3dcb2f426109963681d34216163e777f38 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 14:52:57 +1200
Subject: [PATCH 08/14] Fixed the parsing of bytes being off by one byte in the
 stream parser fr the race status packet.

#story[924] #pair[kre39,zyt10]
---
 src/main/java/seng302/App.java                         | 4 +++-
 src/main/java/seng302/models/Yacht.java                | 8 ++++----
 src/main/java/seng302/models/parsers/StreamParser.java | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..60f22080 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,7 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 68970268..31871684 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -114,10 +114,10 @@ public class Yacht {
         this.penaltiesServed = penaltiesServed;
     }
 
-    public Long getEstimateTimeAtNextMark() {
-//        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-//        return format.format(estimateTimeAtNextMark);
-        return estimateTimeAtNextMark;
+    public String getEstimateTimeAtNextMark() {
+        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        return format.format(estimateTimeAtNextMark);
+//        return estimateTimeAtNextMark;
     }
 
     public void setEstimateTimeAtNextMark(Long estimateTimeAtNextMark) {
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index deea3184..ab15722b 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -236,11 +236,11 @@ public class StreamParser extends Thread{
             Yacht boat = boats.get((int)(long) boatStatusSourceID);
             boat.setBoatStatus((int)payload[28 + (i * 20)]);
             boat.setLegNumber((int)payload[29 + (i * 20)]);
-            boat.setPenaltiesAwarded((int)payload[29 + (i * 20)]);
-            boat.setPenaltiesServed((int)payload[30 + (i * 20)]);
-            Long estTimeAtNextMark = bytesToLong(Arrays.copyOfRange(payload,31 + (i * 20),37+ (i * 20)));
+            boat.setPenaltiesAwarded((int)payload[30 + (i * 20)]);
+            boat.setPenaltiesServed((int)payload[31 + (i * 20)]);
+            Long estTimeAtNextMark = bytesToLong(Arrays.copyOfRange(payload,32 + (i * 20),38+ (i * 20)));
             boat.setEstimateTimeAtNextMark(estTimeAtNextMark);
-            Long estTimeAtFinish = bytesToLong(Arrays.copyOfRange(payload,37 + (i * 20),43+ (i * 20)));
+            Long estTimeAtFinish = bytesToLong(Arrays.copyOfRange(payload,38 + (i * 20),44+ (i * 20)));
             boat.setEstimateTimeAtFinish(estTimeAtFinish);
             boatsPos.put(estTimeAtFinish, boat);
 //            String boatStatus = "SourceID: " + boatStatusSourceID;

From 2e914a7704b0d2fcab297ccfec4f97115075e0c8 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 15:49:21 +1200
Subject: [PATCH 09/14] Fixed estimate time to next mark to match acceptance
 criteria which is countdown in minutes and seconds.

 #story[924]
---
 src/main/java/seng302/App.java                        |  4 ++--
 src/main/java/seng302/models/BoatGroup.java           | 11 +++++++++--
 src/main/java/seng302/models/Yacht.java               |  8 ++++----
 .../java/seng302/models/parsers/StreamParser.java     | 11 +++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 60f22080..80163138 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,9 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
 
-//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 1d689c5f..8204a41c 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -8,7 +8,10 @@ import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
+import seng302.models.parsers.StreamParser;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -86,7 +89,9 @@ public class BoatGroup extends RaceObject{
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
-        estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
+        DateFormat format = new SimpleDateFormat("mm:ss");
+        String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+        estTimeToNextMarkObject = new Text("Next mark: " + timeToNextMark);
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -236,7 +241,9 @@ public class BoatGroup extends RaceObject{
                     wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
-                estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
+                DateFormat format = new SimpleDateFormat("mm:ss");
+                String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+                estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark);
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 31871684..68970268 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -114,10 +114,10 @@ public class Yacht {
         this.penaltiesServed = penaltiesServed;
     }
 
-    public String getEstimateTimeAtNextMark() {
-        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-        return format.format(estimateTimeAtNextMark);
-//        return estimateTimeAtNextMark;
+    public Long getEstimateTimeAtNextMark() {
+//        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+//        return format.format(estimateTimeAtNextMark);
+        return estimateTimeAtNextMark;
     }
 
     public void setEstimateTimeAtNextMark(Long estimateTimeAtNextMark) {
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index ab15722b..1aca5826 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -39,6 +39,7 @@ public class StreamParser extends Thread{
      private static Map<Integer, Yacht> boats = new HashMap<>();
      private static Map<Long, Yacht> boatsPos = new TreeMap<>();
      private static double windDirection = 0;
+     private static Long currentTimeLong;
      private static String currentTimeString;
      private static boolean appRunning;
 
@@ -199,6 +200,7 @@ public class StreamParser extends Thread{
 //        System.out.println("raceStatus = " + raceStatus);
         long expectedStartTime = bytesToLong(Arrays.copyOfRange(payload,12,18));
 
+        currentTimeLong = currentTime;
         DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         if (xmlObject.getRegattaXML() != null) {
             format.setTimeZone(TimeZone.getTimeZone(getTimeZoneString()));
@@ -575,6 +577,15 @@ public class StreamParser extends Thread{
         return boatsPos;
     }
 
+    /**
+     * returns current time in stream in long
+     *
+     * @return a long value of current time
+     */
+    public static Long getCurrentTimeLong() {
+        return currentTimeLong;
+    }
+
     public static void appClose(){
         appRunning = false;
         System.out.println("[CLIENT] Shutting down stream parser");

From 5fa47ff65b290f16fcc86bfa9716027808d6ee49 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 16:31:04 +1200
Subject: [PATCH 10/14] Implemented elapsed time since last mark on annotation.

 #story[927]
---
 .../controllers/RaceViewController.java       | 130 +++++++------
 .../controllers/annotations/Annotation.java   |   3 +-
 .../ImportantAnnotationController.java        |  55 ++++--
 src/main/java/seng302/models/BoatGroup.java   | 173 +++++++++++-------
 .../views/importantAnnotationSelectView.fxml  |   3 +-
 5 files changed, 223 insertions(+), 141 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index f0ea2c51..aa09d9d1 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -33,7 +33,8 @@ import java.util.*;
 /**
  * Created by ptg19 on 29/03/17.
  */
-public class RaceViewController extends Thread implements ImportantAnnotationDelegate{
+public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
+
     @FXML
     private VBox positionVbox;
     @FXML
@@ -85,11 +86,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
     /**
      * The important annotations have been changed, update this view
+     *
      * @param importantAnnotationsState The current state of the selected annotations
      */
-    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState){
+    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState) {
         this.importantAnnotations = importantAnnotationsState;
-        setAnnotations((int)annotationSlider.getValue()); // Refresh the displayed annotations
+        setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
     /**
@@ -101,12 +103,14 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             Stage stage = new Stage();
 
             // Set controller
-            ImportantAnnotationController controller = new ImportantAnnotationController(this, stage);
+            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, 248);
+            fxmlLoader
+                .setLocation(getClass().getResource("/views/importantAnnotationSelectView.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 469, 270);
             scene.getStylesheets().add(getClass().getResource("/css/master.css").toString());
             stage.initStyle(StageStyle.UNDECORATED);
 
@@ -125,7 +129,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
         toggleFps.selectedProperty().addListener(new ChangeListener<Boolean>() {
             @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue,
+                Boolean newValue) {
                 displayFps = !displayFps;
             }
         });
@@ -134,10 +139,18 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
             public String toString(Double n) {
-                if (n == 0) return "None";
-                if (n == 1) return "Low";
-                if (n == 2) return "Important";
-                if (n == 3) return "All";
+                if (n == 0) {
+                    return "None";
+                }
+                if (n == 1) {
+                    return "Low";
+                }
+                if (n == 2) {
+                    return "Important";
+                }
+                if (n == 3) {
+                    return "All";
+                }
 
                 return "All";
             }
@@ -161,25 +174,25 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
 
         annotationSlider.valueProperty().addListener((obs, oldval, newVal) ->
-                    setAnnotations((int)annotationSlider.getValue()));
+            setAnnotations((int) annotationSlider.getValue()));
 
         annotationSlider.setValue(3);
     }
 
-    private void initializeTimer(){
+    private void initializeTimer() {
         timerTimeline = new Timeline();
         timerTimeline.setCycleCount(Timeline.INDEFINITE);
         // Run timer update every second
         timerTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            if (StreamParser.isRaceFinished()) {
-                                timerLabel.setFill(Color.RED);
-                                timerLabel.setText("Race Finished!");
-                            } else {
-                                timerLabel.setText(currentTimer());
-                            }
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    if (StreamParser.isRaceFinished()) {
+                        timerLabel.setFill(Color.RED);
+                        timerLabel.setText("Race Finished!");
+                    } else {
+                        timerLabel.setText(currentTimer());
+                    }
+                })
         );
 
         // Start the timer
@@ -190,11 +203,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Timeline windDirTimeline = new Timeline();
         windDirTimeline.setCycleCount(Timeline.INDEFINITE);
         windDirTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            windDirectionText.setText(String.format("%.1f°", StreamParser.getWindDirection()));
-                            windArrowText.setRotate(StreamParser.getWindDirection());
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    windDirectionText
+                        .setText(String.format("%.1f°", StreamParser.getWindDirection()));
+                    windArrowText.setRotate(StreamParser.getWindDirection());
+                })
         );
         windDirTimeline.playFromStart();
     }
@@ -204,10 +218,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Timeline posVBoxTimeline = new Timeline();
         posVBoxTimeline.setCycleCount(Timeline.INDEFINITE);
         posVBoxTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            showOrder();
-                        })
+            new KeyFrame(Duration.seconds(1),
+                event -> {
+                    showOrder();
+                })
         );
         posVBoxTimeline.playFromStart();
 
@@ -240,13 +254,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " (Finished)");
+                    boat.getShortName() + " (Finished)");
                 textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                 positionVbox.getChildren().add(textToAdd);
 
             } else {
                 Text textToAdd = new Text(boat.getPosition() + ". " +
-                        boat.getShortName() + " ");
+                    boat.getShortName() + " ");
                 textToAdd.setFill(Paint.valueOf("#d3d3d3"));
                 textToAdd.setStyle("");
                 positionVbox.getChildren().add(textToAdd);
@@ -291,6 +305,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     public void stopTimer() {
         timerTimeline.stop();
     }
+
     public void startTimer() {
         timerTimeline.play();
     }
@@ -303,49 +318,51 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return race;
     }
 
-    public ArrayList<Yacht> getStartingBoats(){
+    public ArrayList<Yacht> getStartingBoats() {
         return startingBoats;
     }
 
     /**
      * Display the important annotations for a specific BoatGroup
+     *
      * @param bg The boat group to set the annotations for
      */
-    private void setBoatGroupImportantAnnotations(BoatGroup bg){
-        if (importantAnnotations.getAnnotationState(Annotation.NAME)){
+    private void setBoatGroupImportantAnnotations(BoatGroup bg) {
+        if (importantAnnotations.getAnnotationState(Annotation.NAME)) {
             bg.setTeamNameObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setTeamNameObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.SPEED)){
+        if (importantAnnotations.getAnnotationState(Annotation.SPEED)) {
             bg.setVelocityObjectVisible(true);
-        }
-        else{
+        } else {
             bg.setVelocityObjectVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.TRACK)){
+        if (importantAnnotations.getAnnotationState(Annotation.TRACK)) {
             bg.setLineGroupVisible(true);
-        }
-        else{
+        } else {
             bg.setLineGroupVisible(false);
         }
 
-        if (importantAnnotations.getAnnotationState(Annotation.WAKE)){
+        if (importantAnnotations.getAnnotationState(Annotation.WAKE)) {
             bg.setWakeVisible(true);
-        }
-        else{
+        } else {
             bg.setWakeVisible(false);
         }
 
         if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
             bg.setEstTimeToNextMarkObjectVisible(true);
-        }
-        else {
+        } else {
             bg.setEstTimeToNextMarkObjectVisible(false);
         }
+
+        if (importantAnnotations.getAnnotationState(Annotation.LEGTIME)) {
+            bg.setLegTimeObjectVisible(true);
+        } else {
+            bg.setLegTimeObjectVisible(false);
+        }
     }
 
     private void setAnnotations(Integer annotationLevel) {
@@ -353,11 +370,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // No Annotations
             case 0:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(false);
                         bg.setVelocityObjectVisible(false);
                         bg.setEstTimeToNextMarkObjectVisible(false);
+                        bg.setLegTimeObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -366,11 +384,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // Low Annotations
             case 1:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(false);
                         bg.setEstTimeToNextMarkObjectVisible(false);
+                        bg.setLegTimeObjectVisible(false);
                         bg.setLineGroupVisible(false);
                         bg.setWakeVisible(false);
                     }
@@ -379,7 +398,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // Important Annotations
             case 2:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         setBoatGroupImportantAnnotations(bg);
                     }
@@ -388,11 +407,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             // All Annotations
             case 3:
                 for (RaceObject ro : includedCanvasController.getRaceObjects()) {
-                    if(ro instanceof BoatGroup) {
+                    if (ro instanceof BoatGroup) {
                         BoatGroup bg = (BoatGroup) ro;
                         bg.setTeamNameObjectVisible(true);
                         bg.setVelocityObjectVisible(true);
                         bg.setEstTimeToNextMarkObjectVisible(true);
+                        bg.setLegTimeObjectVisible(true);
                         bg.setLineGroupVisible(true);
                         bg.setWakeVisible(true);
                     }
@@ -401,11 +421,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
-    void setStage (Stage stage) {
+    void setStage(Stage stage) {
         this.stage = stage;
     }
 
-    Stage getStage () {
+    Stage getStage() {
         return stage;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/controllers/annotations/Annotation.java b/src/main/java/seng302/controllers/annotations/Annotation.java
index 0eea5ee2..20a2c265 100644
--- a/src/main/java/seng302/controllers/annotations/Annotation.java
+++ b/src/main/java/seng302/controllers/annotations/Annotation.java
@@ -8,5 +8,6 @@ public enum Annotation {
     WAKE,
     TRACK,
     NAME,
-    ESTTIMETONEXTMARK
+    ESTTIMETONEXTMARK,
+    LEGTIME
 }
diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
index 95fe84d3..8dfa8df7 100644
--- a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
@@ -15,6 +15,7 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 public class ImportantAnnotationController implements Initializable {
+
     /*
      * JavaFX Outlets
      */
@@ -33,6 +34,9 @@ public class ImportantAnnotationController implements Initializable {
     @FXML
     private CheckBox boatEstTimeToNextMarkSelect;
 
+    @FXML
+    private CheckBox boatElapsedTimeSelect;
+
     @FXML
     private AnchorPane annotationSelectWindow;
 
@@ -43,7 +47,7 @@ public class ImportantAnnotationController implements Initializable {
     private ImportantAnnotationsState importantAnnotationsState;
     private Stage stage;
 
-    public ImportantAnnotationController(ImportantAnnotationDelegate delegate, Stage stage){
+    public ImportantAnnotationController(ImportantAnnotationDelegate delegate, Stage stage) {
         this.delegate = delegate;
         importantAnnotationsState = new ImportantAnnotationsState();
         this.stage = stage;
@@ -52,10 +56,11 @@ public class ImportantAnnotationController implements Initializable {
     /**
      * Sets whether or not an annotation is considered important, then
      * sends an update to the delegate
+     *
      * @param annotation The annotation
      * @param isSet True if annotation is important
      */
-    private void setAnnotation(Annotation annotation, Boolean isSet){
+    private void setAnnotation(Annotation annotation, Boolean isSet) {
         importantAnnotationsState.setAnnotationState(annotation, isSet);
         sendUpdate();
     }
@@ -64,40 +69,50 @@ public class ImportantAnnotationController implements Initializable {
      * Sends an update to the delegate when the important
      * annotations have changed
      */
-    private void sendUpdate(){
+    private void sendUpdate() {
         this.delegate.importantAnnotationsChanged(importantAnnotationsState);
     }
 
     /**
      * Load the current state of the 'important annotations'
+     *
      * @param currentState hashmap containing the states of each annotation
      */
-    public void loadState(ImportantAnnotationsState currentState){
+    public void loadState(ImportantAnnotationsState currentState) {
         this.importantAnnotationsState = currentState;
 
         // Initialise checkboxes
-        for (Annotation annotation : importantAnnotationsState.getAnnotations()){
-            switch (annotation){
+        for (Annotation annotation : importantAnnotationsState.getAnnotations()) {
+            switch (annotation) {
                 case WAKE:
-                    boatWakeSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatWakeSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case SPEED:
-                    boatSpeedSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatSpeedSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case TRACK:
-                    boatTrackSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatTrackSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case NAME:
-                    boatNameSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatNameSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 case ESTTIMETONEXTMARK:
-                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
+                    boatEstTimeToNextMarkSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
+                case LEGTIME:
+                    boatElapsedTimeSelect
+                        .setSelected(importantAnnotationsState.getAnnotationState(annotation));
+
                 default:
                     break;
             }
@@ -106,16 +121,24 @@ public class ImportantAnnotationController implements Initializable {
 
     /**
      * View did load
+     *
      * @param location .
      * @param resources .
      */
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        boatWakeSelect.setOnAction(event -> setAnnotation(Annotation.WAKE, boatWakeSelect.isSelected()));
-        boatSpeedSelect.setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
-        boatTrackSelect.setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
-        boatNameSelect.setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
-        boatEstTimeToNextMarkSelect.setOnAction(event -> setAnnotation(Annotation.ESTTIMETONEXTMARK, boatEstTimeToNextMarkSelect.isSelected()));
+        boatWakeSelect
+            .setOnAction(event -> setAnnotation(Annotation.WAKE, boatWakeSelect.isSelected()));
+        boatSpeedSelect
+            .setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
+        boatTrackSelect
+            .setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
+        boatNameSelect
+            .setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
+        boatEstTimeToNextMarkSelect.setOnAction(event -> setAnnotation(Annotation.ESTTIMETONEXTMARK,
+            boatEstTimeToNextMarkSelect.isSelected()));
+        boatElapsedTimeSelect.setOnAction(
+            event -> setAnnotation(Annotation.LEGTIME, boatElapsedTimeSelect.isSelected()));
 
         closeButton.setOnAction(event -> stage.close());
     }
diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java
index 34faf696..e07c57ee 100644
--- a/src/main/java/seng302/models/BoatGroup.java
+++ b/src/main/java/seng302/models/BoatGroup.java
@@ -16,13 +16,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 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 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.
+ * 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 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.
  */
-public class BoatGroup extends RaceObject{
+public class BoatGroup extends RaceObject {
 
     //Constants for drawing
     private static final double TEAMNAME_X_OFFSET = 10d;
@@ -53,50 +54,61 @@ public class BoatGroup extends RaceObject{
     private boolean destinationSet;
     //Variables for handling minimization
     private Stage stage;
-    private boolean isMaximized= true;
+    private boolean isMaximized = true;
     private List<Line> lineStorage = new ArrayList<>();
     private int setCallCount = 5;
 
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used to tell which
-     *             BoatGroup to update.
+     *
+     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
+     * to tell which BoatGroup to update.
      * @param color The colour of the boat polygon and the trailing line.
      */
-    public BoatGroup (Yacht boat, Color color){
+    public BoatGroup(Yacht boat, Color color) {
         this.boat = boat;
         initChildren(color);
     }
 
     /**
-     * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be at point (0,0).
-     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used to tell which
-     *             BoatGroup to update.
+     * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be
+     * at point (0,0).
+     *
+     * @param boat The boat that the BoatGroup will represent. Must contain an ID which will be used
+     * to tell which BoatGroup to update.
      * @param color The colour of the boat polygon and the trailing line.
-     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat polygon.
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
      */
-    public BoatGroup (Yacht boat, Color color, double... points)
-    {
+    public BoatGroup(Yacht boat, Color color, double... points) {
         this.boat = boat;
         initChildren(color, points);
     }
 
     /**
      * Creates the javafx objects that will be the in the group by default.
+     *
      * @param color The colour of the boat polygon and the trailing line.
-     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat polygon.
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
      */
-    private void initChildren (Color color, double... points) {
+    private void initChildren(Color color, double... points) {
         boatPoly = new Polygon(points);
         boatPoly.setFill(color);
 
         teamNameObject = new Text(boat.getShortName());
         velocityObject = new Text(String.valueOf(boat.getVelocity()));
-        estTimeToNextMarkObject = new Text(String.valueOf(boat.getEstimateTimeAtNextMark()));
-        legTimeObject = new Text(String.valueOf(boat.getMarkRoundingTime()));
         DateFormat format = new SimpleDateFormat("mm:ss");
-        String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+        String timeToNextMark = format
+            .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
         estTimeToNextMarkObject = new Text("Next mark: " + timeToNextMark);
+        if (boat.getMarkRoundingTime() != null) {
+            String elapsedTime = format
+                .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
+            legTimeObject = new Text("Last mark: " + elapsedTime);
+        } else {
+            legTimeObject = new Text("Last mark: -");
+        }
 
         teamNameObject.setX(TEAMNAME_X_OFFSET);
         teamNameObject.setY(TEAMNAME_Y_OFFSET);
@@ -109,29 +121,35 @@ public class BoatGroup extends RaceObject{
 
         estTimeToNextMarkObject.setX(ESTTIMETONEXTMARK_X_OFFSET);
         estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET);
-        estTimeToNextMarkObject.relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
+        estTimeToNextMarkObject
+            .relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY());
 
         legTimeObject.setX(LEGTIME_X_OFFSET);
         legTimeObject.setY(LEGTIME_Y_OFFSET);
         legTimeObject.relocate(legTimeObject.getX(), legTimeObject.getY());
 
         wake = new Wake(0, -BOAT_HEIGHT);
-        super.getChildren().addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject, legTimeObject);
+        super.getChildren()
+            .addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject,
+                legTimeObject);
     }
 
     /**
      * Creates the javafx objects that will be the in the group by default.
+     *
      * @param color The colour of the boat polygon and the trailing line.
      */
-    private void initChildren (Color color) {
+    private void initChildren(Color color) {
         initChildren(color,
-                -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
-                0.0, -BOAT_HEIGHT / 2,
-                BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
+            -BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
+            0.0, -BOAT_HEIGHT / 2,
+            BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
     }
 
     /**
-     * Moves the boat and its children annotations from its current coordinates by specified amounts.
+     * Moves the boat and its children annotations from its current coordinates by specified
+     * amounts.
+     *
      * @param dx The amount to move the X coordinate by
      * @param dy The amount to move the Y coordinate by
      */
@@ -153,21 +171,23 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Moves the boat and its children annotations to coordinates specified
+     *
      * @param x The X coordinate to move the boat to
      * @param y The Y coordinate to move the boat to
      * @param rotation The heading in degrees from north the boat should rotate to.
      */
-    public void moveTo (double x, double y, double rotation) {
+    public void moveTo(double x, double y, double rotation) {
         rotateTo(rotation);
         moveTo(x, y);
     }
 
     /**
      * Moves the boat and its children annotations to coordinates specified
+     *
      * @param x The X coordinate to move the boat to
      * @param y The Y coordinate to move the boat to
      */
-    public void moveTo (double x, double y) {
+    public void moveTo(double x, double y) {
         boatPoly.setLayoutX(x);
         boatPoly.setLayoutY(y);
         teamNameObject.setLayoutX(x);
@@ -185,9 +205,11 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Updates the position of all graphics in the BoatGroup based off of the given time interval.
-     * @param timeInterval The interval, in milliseconds, the boat should update it's position based on.
+     *
+     * @param timeInterval The interval, in milliseconds, the boat should update it's position based
+     * on.
      */
-    public void updatePosition (long timeInterval) {
+    public void updatePosition(long timeInterval) {
         //Calculate the movement of the boat.
         if (isMaximized) {
             double dx = pixelVelocityX * timeInterval;
@@ -200,10 +222,10 @@ public class BoatGroup extends RaceObject{
                 distanceTravelled = 0;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            boatPoly.getLayoutX(),
-                            boatPoly.getLayoutY()
+                        lastPoint.getX(),
+                        lastPoint.getY(),
+                        boatPoly.getLayoutX(),
+                        boatPoly.getLayoutY()
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
@@ -219,18 +241,21 @@ public class BoatGroup extends RaceObject{
 
     /**
      * Sets the destination of the boat and the headng it should have once it reaches
+     *
      * @param newXValue The X co-ordinate the boat needs to move to.
      * @param newYValue The Y co-ordinate the boat needs to move to.
      * @param rotation Rotation to move graphics to.
      * @param raceIds RaceID of the object to move.
      */
-    public void setDestination (double newXValue, double newYValue, double rotation, double groundSpeed, int... raceIds) {
+    public void setDestination(double newXValue, double newYValue, double rotation,
+        double groundSpeed, int... raceIds) {
         if (hasRaceId(raceIds)) {
             if (setToInitialLocation) {
                 destinationSet = true;
                 boat.setVelocity(groundSpeed);
-                if (currentRotation < 0)
+                if (currentRotation < 0) {
                     currentRotation = 360 - currentRotation;
+                }
                 double dx = newXValue - boatPoly.getLayoutX();
                 double dy = newYValue - boatPoly.getLayoutY();
                 //Check movement is reasonable. Assumes a 1000 * 1000 canvas
@@ -251,14 +276,23 @@ public class BoatGroup extends RaceObject{
                     rotationalVelocity = 0;
                     wakeGenerationDelay--;
                 } else {
-                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal, boat.getVelocity());
+                    wake.setRotationalVelocity(rotationalVelocity, rotationalGoal,
+                        boat.getVelocity());
                 }
                 velocityObject.setText(String.format("%.2f m/s", boat.getVelocity()));
-                estTimeToNextMarkObject.setText(String.valueOf(boat.getEstimateTimeAtNextMark()));
-                legTimeObject.setText(String.valueOf(boat.getMarkRoundingTime()));
                 DateFormat format = new SimpleDateFormat("mm:ss");
-                String timeToNextMark = format.format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
+                // estimate time to next mark
+                String timeToNextMark = format
+                    .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong());
                 estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark);
+                // elapsed time
+                if (boat.getMarkRoundingTime() != null) {
+                    String elapsedTime = format
+                        .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime());
+                    legTimeObject.setText("Last mark: " + elapsedTime);
+                } else {
+                    legTimeObject.setText("Last mark: -");
+                }
             } else {
                 setToInitialLocation = true;
                 rotationalGoal = rotation;
@@ -269,14 +303,14 @@ public class BoatGroup extends RaceObject{
         if (!isMaximized) {
             setToInitialLocation = false;
             wakeGenerationDelay = 2;
-            if(setCallCount-- == 0) {
+            if (setCallCount-- == 0) {
                 setCallCount = 5;
                 if (lastPoint != null) {
                     Line l = new Line(
-                            lastPoint.getX(),
-                            lastPoint.getY(),
-                            newXValue,
-                            newYValue
+                        lastPoint.getX(),
+                        lastPoint.getY(),
+                        newXValue,
+                        newYValue
                     );
                     l.getStrokeDashArray().setAll(3d, 7d);
                     l.setStroke(boatPoly.getFill());
@@ -289,28 +323,29 @@ public class BoatGroup extends RaceObject{
         }
     }
 
-    public void setDestination (double newXValue, double newYValue, double groundSpeed, int... raceIDs) {
+    public void setDestination(double newXValue, double newYValue, double groundSpeed,
+        int... raceIDs) {
         destinationSet = true;
 
         if (hasRaceId(raceIDs)) {
             double rotation = Math.abs(
-                    Math.toDegrees(
-                            Math.atan(
-                                    (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
-                            )
+                Math.toDegrees(
+                    Math.atan(
+                        (newYValue - boatPoly.getLayoutY()) / (newXValue - boatPoly.getLayoutX())
                     )
+                )
             );
             setDestination(newXValue, newYValue, rotation, groundSpeed, raceIDs);
         }
     }
 
-    public void rotateTo (double rotation) {
+    public void rotateTo(double rotation) {
         currentRotation = rotation;
         boatPoly.getTransforms().setAll(new Rotate(rotation));
     }
 
-    public void forceRotation () {
-        rotateTo (rotationalGoal);
+    public void forceRotation() {
+        rotateTo(rotationalGoal);
         wake.rotate(rotationalGoal);
     }
 
@@ -326,7 +361,7 @@ public class BoatGroup extends RaceObject{
         estTimeToNextMarkObject.setVisible(visible);
     }
 
-    public void setLegObjectTime(Boolean visible) {
+    public void setLegTimeObjectVisible(Boolean visible) {
         legTimeObject.setVisible(visible);
     }
 
@@ -348,10 +383,11 @@ public class BoatGroup extends RaceObject{
      * @param raceIds The ID's to check the BoatGroup for.
      * @return True if the BoatGroup contains at east one of the given IDs, false otherwise.
      */
-    public boolean hasRaceId (int... raceIds) {
+    public boolean hasRaceId(int... raceIds) {
         for (int id : raceIds) {
-            if (id == boat.getSourceID())
+            if (id == boat.getSourceID()) {
                 return true;
+            }
         }
         return false;
     }
@@ -361,31 +397,32 @@ public class BoatGroup extends RaceObject{
      *
      * @return An array containing all ID's associated with this RaceObject.
      */
-    public int[] getRaceIds () {
-        return new int[] {boat.getSourceID()};
+    public int[] getRaceIds() {
+        return new int[]{boat.getSourceID()};
     }
 
     /**
-     * Due to javaFX limitations annotations associated with a boat that you want to appear below all boats in the
-     * Z-axis need to be pulled out of the BoatGroup and added to the parent group of the BoatGroups. This function
-     * returns these annotations as a group.
+     * Due to javaFX limitations annotations associated with a boat that you want to appear below
+     * all boats in the Z-axis need to be pulled out of the BoatGroup and added to the parent group
+     * of the BoatGroups. This function returns these annotations as a group.
      *
      * @return A group containing low priority annotations.
      */
-    public Group getLowPriorityAnnotations () {
+    public Group getLowPriorityAnnotations() {
         Group group = new Group();
         group.getChildren().addAll(wake, lineGroup);
         return group;
     }
 
     /**
-     * Use this function to let the BoatGroup know about the stage it is in. If it knows about it's stage then it will
-     * listen to the iconified property of that stage and change it's behaviour upon minimization. Without setting the
-     * Stage there is guarantee that the BoatGroup will draw properly when the stage is minimized.
+     * Use this function to let the BoatGroup know about the stage it is in. If it knows about it's
+     * stage then it will listen to the iconified property of that stage and change it's behaviour
+     * upon minimization. Without setting the Stage there is guarantee that the BoatGroup will draw
+     * properly when the stage is minimized.
      *
      * @param stage The stage that the BoatGroup is added to.
      */
-    public void setStage (Stage stage) {
+    public void setStage(Stage stage) {
         /* TODO: 4/05/17 cir27 - Find a way to get the stage to this point. Need to pass it through multiple controllers.
                                  App.start() -> Controller.setContentPane -> RaceViewController -> CanvasController
          */
diff --git a/src/main/resources/views/importantAnnotationSelectView.fxml b/src/main/resources/views/importantAnnotationSelectView.fxml
index da89b52a..8b21c2d9 100644
--- a/src/main/resources/views/importantAnnotationSelectView.fxml
+++ b/src/main/resources/views/importantAnnotationSelectView.fxml
@@ -5,7 +5,7 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane fx:id="annotationSelectWindow" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="248.0" prefWidth="469.0" styleClass="background-blue" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane fx:id="annotationSelectWindow" maxHeight="270.0" maxWidth="469.0" minHeight="270.0" minWidth="469.0" prefHeight="270.0" prefWidth="469.0" styleClass="background-blue" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Text fill="WHITE" layoutX="26.0" layoutY="52.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Select important annotations">
          <font>
@@ -26,5 +26,6 @@
             <String fx:value="clearExitButton" />
          </styleClass>
       </Button>
+      <CheckBox fx:id="boatElapsedTimeSelect" layoutX="26.0" layoutY="235.0" mnemonicParsing="false" text="Boat Elapsed Time Since Last Mark" textFill="#e7e7e7" />
    </children>
 </AnchorPane>

From 110143ae6e62491c5f1b5a2e9cb26e48c63395d5 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 17:09:12 +1200
Subject: [PATCH 11/14] Added a dynamically updating course limits file to the
 model.

This will make manual testing of the course limits easier. When the race starts, the limits encapsulate the start line but soon after the race starts the course limits close off around the start line (this is for the model). This means the model acts in a very similar way to the actual live stream.

#story[889]
---
 src/main/java/seng302/App.java                |   4 +-
 .../seng302/models/parsers/StreamParser.java  |   6 +-
 .../java/seng302/server/ServerThread.java     |  26 ++++-
 .../resources/server_config/courseLimits.xml  | 105 ++++++++++++++++++
 src/main/resources/server_config/race.xml     |   6 +-
 5 files changed, 138 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/server_config/courseLimits.xml

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 960511f8..efed20d6 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,9 +62,9 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
 //            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index 9260ae9e..af644692 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -297,9 +297,9 @@ public class StreamParser extends Thread{
         byte[] payload = packet.getPayload();
 
         int messageType = payload[9];
-        long messagelength = bytesToLong(Arrays.copyOfRange(payload,12,14));
-        String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messagelength)))).trim();
-        //System.out.println("xmlMessage2 = " + xmlMessage);
+        long messageLength = bytesToLong(Arrays.copyOfRange(payload,12,14));
+        String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messageLength)))).trim();
+        System.out.println("xmlMessage = " + xmlMessage);
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
diff --git a/src/main/java/seng302/server/ServerThread.java b/src/main/java/seng302/server/ServerThread.java
index c09eb8dc..e76ed822 100644
--- a/src/main/java/seng302/server/ServerThread.java
+++ b/src/main/java/seng302/server/ServerThread.java
@@ -235,6 +235,27 @@ public class ServerThread implements Runnable, Observer {
         }
     }
 
+    /**
+     * Send the post-start race course information
+     */
+    private void sendPostStartCourseXml(){
+        Timer t = new Timer();
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    Message raceData = getXmlMessage("/server_config/courseLimits.xml", XMLMessageSubType.RACE);
+                    if (raceData != null) {
+                        server.send(raceData);
+                        serverLog("Sending race data", 0);
+                    }
+                }catch (IOException e) {
+                    serverLog("Couldn't send an XML Message: " + e.getMessage(), 0);
+                }
+            }
+        },25000);
+    }
+
     public void run() {
         try{
             server = new StreamingServerSocket(PORT_NUMBER);
@@ -252,12 +273,13 @@ public class ServerThread implements Runnable, Observer {
         sendXml();
         startSendingRaceStartStatusMessages();
         startSendingRaceStatusMessages();
+        sendPostStartCourseXml();
     }
 
     /**
      * Start sending static boat position updates when race has finished
      */
-    private void startSendingRaceFinishedBoatPostions(){
+    private void startSendingRaceFinishedBoatPositions(){
         Timer t = new Timer();
         t.schedule(new TimerTask() {
             @Override
@@ -316,7 +338,7 @@ public class ServerThread implements Runnable, Observer {
         }
 
         if (numOfBoatsFinished == ((List<Boat>) arg).size()) {
-            startSendingRaceFinishedBoatPostions();
+            startSendingRaceFinishedBoatPositions();
         }
 
     }
diff --git a/src/main/resources/server_config/courseLimits.xml b/src/main/resources/server_config/courseLimits.xml
new file mode 100644
index 00000000..646f6ade
--- /dev/null
+++ b/src/main/resources/server_config/courseLimits.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Race>
+<CreationTimeDate>2015-08-29T13:12:40+02:00</CreationTimeDate>
+<RaceStartTime Start="2015-08-29T13:10:00+02:00" Postpone="False"/>
+<RaceID>15082901</RaceID>
+<RaceType>Fleet</RaceType>
+<Participants>
+  <Yacht SourceID="101"/>
+  <Yacht SourceID="102"/>
+  <Yacht SourceID="103"/>
+  <Yacht SourceID="104"/>
+  <Yacht SourceID="105"/>
+  <Yacht SourceID="106"/>
+</Participants>
+<Course>
+  <CompoundMark CompoundMarkID="1" Name="Mark0">
+    <Mark SeqID="1" Name="Start Line 1" TargetLat="57.6703330" TargetLng="11.8278330"
+      SourceID="122"/>
+    <Mark SeqID="2" Name="Start Line 2" TargetLat="57.6703330" TargetLng="11.8278330"
+      SourceID="123"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="2" Name="Mark1">
+    <Mark SeqID="1" Name="Mark1" TargetLat="57.6675700" TargetLng="11.8359880" SourceID="131"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="3" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="4" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="5" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="6" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="7" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="8" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="9" Name="Mark2">
+    <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="124"/>
+    <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900"
+      SourceID="125"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="10" Name="Mark3">
+    <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="126"/>
+    <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170"
+      SourceID="127"/>
+  </CompoundMark>
+  <CompoundMark CompoundMarkID="11" Name="Mark4">
+    <Mark SeqID="1" Name="Finish Line 1" TargetLat="57.6715240" TargetLng="11.8444950"
+      SourceID="128"/>
+    <Mark SeqID="2" Name="Finish Line 2" TargetLat="57.6715240" TargetLng="11.8444950"
+      SourceID="129"/>
+  </CompoundMark>
+</Course>
+<CompoundMarkSequence>
+  <Corner SeqID="1" CompoundMarkID="1" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="2" CompoundMarkID="2" Rounding="Port" ZoneSize="3"/>
+  <Corner SeqID="3" CompoundMarkID="3" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="4" CompoundMarkID="4" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="5" CompoundMarkID="5" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="6" CompoundMarkID="6" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="7" CompoundMarkID="7" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="8" CompoundMarkID="8" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="9" CompoundMarkID="9" Rounding="SP" ZoneSize="3"/>
+  <Corner SeqID="10" CompoundMarkID="10" Rounding="PS" ZoneSize="3"/>
+  <Corner SeqID="11" CompoundMarkID="11" Rounding="PS" ZoneSize="3"/>
+</CompoundMarkSequence>
+<CourseLimit>
+  <Limit SeqID="1" Lat="57.6739450" Lon="11.8417100"/>
+  <Limit SeqID="2" Lat="57.6709520" Lon="11.8485010"/>
+  <Limit SeqID="3" Lat="57.6690260" Lon="11.8472790"/>
+  <Limit SeqID="4" Lat="57.6693140" Lon="11.8457610"/>
+  <Limit SeqID="5" Lat="57.6665370" Lon="11.8432910"/>
+  <Limit SeqID="6" Lat="57.6641400" Lon="11.8385840"/>
+  <Limit SeqID="7" Lat="57.6629430" Lon="11.8332030"/>
+  <Limit SeqID="8" Lat="57.6629480" Lon="11.8249660"/>
+  <Limit SeqID="9" Lat="57.6686890" Lon="11.8250920"/>
+  <Limit SeqID="10" Lat="57.6708220" Lon="11.8321340"/>
+</CourseLimit>
+</Race>
\ No newline at end of file
diff --git a/src/main/resources/server_config/race.xml b/src/main/resources/server_config/race.xml
index 845f2044..06f4f626 100644
--- a/src/main/resources/server_config/race.xml
+++ b/src/main/resources/server_config/race.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Race>
-    <CreationTimeDate>2015-08-29T13:12:40+02:00</CreationTimeDate>
+    <CreationTimeDate>2015-08-29T11:27:15+02:00</CreationTimeDate>
     <RaceStartTime Start="2015-08-29T13:10:00+02:00" Postpone="False" />
     <RaceID>15082901</RaceID>
     <RaceType>Fleet</RaceType>
@@ -80,6 +80,8 @@
         <Limit SeqID="7" Lat="57.6629430" Lon="11.8332030" />
         <Limit SeqID="8" Lat="57.6629480" Lon="11.8249660" />
         <Limit SeqID="9" Lat="57.6686890" Lon="11.8250920" />
-        <Limit SeqID="10" Lat="57.6708220" Lon="11.8321340" />
+        <Limit SeqID="10" Lat="57.6692230" Lon="11.8231430" />
+        <Limit SeqID="11" Lat="57.6725370" Lon="11.8272480" />
+        <Limit SeqID="12" Lat="57.6708220" Lon="11.8321340" />
     </CourseLimit>
 </Race>
\ No newline at end of file

From fa501460cb4fb71c86d66b3984a3e42394417022 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 17:21:56 +1200
Subject: [PATCH 12/14] Cleaned up code for merge.

#story[889]
---
 src/main/java/seng302/App.java                |  2 -
 .../seng302/controllers/CanvasController.java |  5 +-
 .../seng302/models/parsers/PacketType.java    | 53 -------------------
 .../seng302/models/parsers/StreamPacket.java  | 44 ---------------
 .../seng302/models/parsers/StreamParser.java  | 19 ++++---
 .../java/seng302/server/ServerThread.java     |  1 +
 .../models/parsers/StreamReceiverTest.java    |  1 +
 7 files changed, 17 insertions(+), 108 deletions(-)
 delete mode 100644 src/main/java/seng302/models/parsers/PacketType.java
 delete mode 100644 src/main/java/seng302/models/parsers/StreamPacket.java

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index efed20d6..1a400afd 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -63,8 +63,6 @@ public class App extends Application
         //Change the StreamReceiver in this else block to change the default data source.
         else{
             sr = new StreamReceiver("localhost", 4949, "RaceStream");
-//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index c4fa7b58..0a7f699f 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -244,7 +244,7 @@ public class CanvasController {
     }
 
     private void checkForCourseChanges() {
-        if (StreamParser.isNewXmlRecieved()){
+        if (StreamParser.isNewRaceXmlReceived()){
             System.out.println("New Canvas found");
             gc.setFill(Color.SKYBLUE);
             gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
@@ -357,7 +357,8 @@ public class CanvasController {
      * Calculates x and y location for every marker that fits it to the canvas the race will be drawn on.
      */
     private void fitMarksToCanvas() {
-        StreamParser.isNewXmlRecieved();
+        //Check is called once to avoid unnecessarily change the course limits once the race is running
+        StreamParser.isNewRaceXmlReceived();
         findMinMaxPoint();
         double minLonToMaxLon = scaleRaceExtremities();
         calculateReferencePointLocation(minLonToMaxLon);
diff --git a/src/main/java/seng302/models/parsers/PacketType.java b/src/main/java/seng302/models/parsers/PacketType.java
deleted file mode 100644
index 66b86207..00000000
--- a/src/main/java/seng302/models/parsers/PacketType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package seng302.models.parsers;
-
-/**
- * Created by Kusal on 4/24/2017.
- */
-public enum PacketType {
-    HEARTBEAT,
-    RACE_STATUS,
-    DISPLAY_TEXT_MESSAGE,
-    XML_MESSAGE,
-    RACE_START_STATUS,
-    YACHT_EVENT_CODE,
-    YACHT_ACTION_CODE,
-    CHATTER_TEXT,
-    BOAT_LOCATION,
-    MARK_ROUNDING,
-    COURSE_WIND,
-    AVG_WIND,
-    OTHER;
-
-    static PacketType assignPacketType(int packetType){
-        switch(packetType){
-            case 1:
-                return HEARTBEAT;
-            case 12:
-                return RACE_STATUS;
-            case 20:
-                return DISPLAY_TEXT_MESSAGE;
-            case 26:
-                return XML_MESSAGE;
-            case 27:
-                return RACE_START_STATUS;
-            case 29:
-                return YACHT_EVENT_CODE;
-            case 31:
-                return YACHT_ACTION_CODE;
-            case 36:
-                return CHATTER_TEXT;
-            case 37:
-                return BOAT_LOCATION;
-            case 38:
-                return MARK_ROUNDING;
-            case 44:
-                return COURSE_WIND;
-            case 47:
-                return AVG_WIND;
-            default:
-        }
-        return OTHER;
-    }
-
-
-}
diff --git a/src/main/java/seng302/models/parsers/StreamPacket.java b/src/main/java/seng302/models/parsers/StreamPacket.java
deleted file mode 100644
index 5c2c0706..00000000
--- a/src/main/java/seng302/models/parsers/StreamPacket.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package seng302.models.parsers;
-
-/**
- * Created by kre39 on 23/04/17.
- */
-public class StreamPacket {
-
-    //Change int to an ENUM for the type
-    private PacketType type;
-
-    private long messageLength;
-    private long timeStamp;
-    private byte[] payload;
-
-    StreamPacket(int type, long messageLength, long timeStamp, byte[] payload) {
-        this.type = PacketType.assignPacketType(type);
-        this.messageLength = messageLength;
-        this.timeStamp = timeStamp;
-        this.payload = payload;
-//        System.out.println("type = " + this.type.toString());
-        //switch the packet type to deal with what ever specific packet you want to deal with
-//        if (this.type == PacketType.XML_MESSAGE){
-//            //System.out.println("--------");
-//            System.out.println(new String(payload));
-//            //StreamParser.parsePacket(this);
-//        }
-    }
-
-    PacketType getType() {
-        return type;
-    }
-
-    public long getMessageLength() {
-        return messageLength;
-    }
-
-    byte[] getPayload() {
-        return payload;
-    }
-
-    long getTimeStamp() {
-        return timeStamp;
-    }
-}
diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index af644692..e13883ee 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -31,7 +31,7 @@ public class StreamParser extends Thread{
      public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatPositions = new ConcurrentHashMap<>();
      private String threadName;
      private Thread t;
-     private static boolean newXmlRecieved = false;
+     private static boolean newRaceXmlReceived = false;
      private static boolean raceStarted = false;
      private static XMLParser xmlObject;
      private static boolean raceFinished = false;
@@ -124,7 +124,7 @@ public class StreamParser extends Thread{
                      break;
                  case XML_MESSAGE:
                      System.out.println("XML MESSAGE GOT");
-                     newXmlRecieved = true;
+                     newRaceXmlReceived = true;
                      extractXmlMessage(packet);
                      break;
                  case RACE_START_STATUS:
@@ -299,7 +299,6 @@ public class StreamParser extends Thread{
         int messageType = payload[9];
         long messageLength = bytesToLong(Arrays.copyOfRange(payload,12,14));
         String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messageLength)))).trim();
-        System.out.println("xmlMessage = " + xmlMessage);
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -317,7 +316,7 @@ public class StreamParser extends Thread{
             boats = xmlObject.getBoatXML().getCompetingBoats();
         }
         if (messageType == 6) { //6 is race info xml
-            newXmlRecieved = true;
+            newRaceXmlReceived = true;
         }
     }
 
@@ -586,9 +585,15 @@ public class StreamParser extends Thread{
         System.out.println("[CLIENT] Shutting down stream parser");
     }
 
-    public static boolean isNewXmlRecieved(){
-        if (newXmlRecieved){
-            newXmlRecieved = false;
+    /**
+     * Used to check if a new un-processed xml has been found, if so will return true before
+     * toggling off so that the next check will return false.
+     *
+     * @return the status of if new xml has been received
+     */
+    public static boolean isNewRaceXmlReceived(){
+        if (newRaceXmlReceived){
+            newRaceXmlReceived = false;
             return true;
         } else {
             return false;
diff --git a/src/main/java/seng302/server/ServerThread.java b/src/main/java/seng302/server/ServerThread.java
index e76ed822..094845ab 100644
--- a/src/main/java/seng302/server/ServerThread.java
+++ b/src/main/java/seng302/server/ServerThread.java
@@ -254,6 +254,7 @@ public class ServerThread implements Runnable, Observer {
                 }
             }
         },25000);
+        //Delays the new course xml data for 25 seconds so the boats are able to pass the starting line
     }
 
     public void run() {
diff --git a/src/test/java/seng302/models/parsers/StreamReceiverTest.java b/src/test/java/seng302/models/parsers/StreamReceiverTest.java
index c7951e3b..698ee3c0 100644
--- a/src/test/java/seng302/models/parsers/StreamReceiverTest.java
+++ b/src/test/java/seng302/models/parsers/StreamReceiverTest.java
@@ -8,6 +8,7 @@ import java.lang.reflect.Method;
 import java.net.Socket;
 import java.util.Comparator;
 import java.util.concurrent.PriorityBlockingQueue;
+import seng302.models.parsers.packets.StreamPacket;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

From 9c7144c918bfd93eca7e3a45ea5028c12313584e Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 15 May 2017 17:55:06 +1200
Subject: [PATCH 13/14] Removed dud print statement

#story[889]
---
 src/main/java/seng302/App.java                      | 13 ++++++-------
 .../java/seng302/controllers/CanvasController.java  |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 1a400afd..b86b465d 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -9,8 +9,8 @@ import seng302.models.parsers.StreamParser;
 import seng302.models.parsers.StreamReceiver;
 import seng302.server.ServerThread;
 
-public class App extends Application
-{
+public class App extends Application {
+
     @Override
     public void start(Stage primaryStage) throws Exception {
         Parent root = FXMLLoader.load(getClass().getResource("/views/MainView.fxml"));
@@ -39,15 +39,15 @@ public class App extends Application
             e.printStackTrace();
         }
 
-        if (args.length == 1 && args[0].equals("-standalone")){
+        if (args.length == 1 && args[0].equals("-standalone")) {
             return;
         }
 
-        if (args.length == 3 && args[0].equals("-server")){
+        if (args.length == 3 && args[0].equals("-server")) {
 
             sr = new StreamReceiver(args[1], Integer.valueOf(args[2]), "RaceStream");
 
-        } else if(args.length == 2 && args[0].equals("-server")){
+        } else if (args.length == 2 && args[0].equals("-server")) {
             switch (args[1]) {
                 case "internal":
                     sr = new StreamReceiver("localhost", 4949, "RaceStream");
@@ -61,7 +61,7 @@ public class App extends Application
             }
         }
         //Change the StreamReceiver in this else block to change the default data source.
-        else{
+        else {
             sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
@@ -72,7 +72,6 @@ public class App extends Application
         launch(args);
 
 
-
     }
 }
 
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 0a7f699f..9a2a9797 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -245,7 +245,6 @@ public class CanvasController {
 
     private void checkForCourseChanges() {
         if (StreamParser.isNewRaceXmlReceived()){
-            System.out.println("New Canvas found");
             gc.setFill(Color.SKYBLUE);
             gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
             gc.restore();

From a9de005e1ae8af1acbefb582cbea2161daaa37f0 Mon Sep 17 00:00:00 2001
From: Michael Rausch <michael@michaelrausch.net>
Date: Mon, 15 May 2017 18:41:44 +1200
Subject: [PATCH 14/14] Removed a extraneous print stmt

---
 src/main/java/seng302/models/parsers/StreamParser.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java
index 73994d87..63019c3d 100644
--- a/src/main/java/seng302/models/parsers/StreamParser.java
+++ b/src/main/java/seng302/models/parsers/StreamParser.java
@@ -124,7 +124,6 @@ public class StreamParser extends Thread{
                      extractDisplayMessage(packet);
                      break;
                  case XML_MESSAGE:
-                     System.out.println("XML MESSAGE GOT");
                      newRaceXmlReceived = true;
                      extractXmlMessage(packet);
                      break;