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

@@ -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();

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));
+        long messageLength = bytesToLong(Arrays.copyOfRange(payload,12,14));
-        String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messagelength)))).trim();
+        String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messageLength)))).trim();
-        //System.out.println("xmlMessage2 = " + xmlMessage);
+        System.out.println("xmlMessage = " + xmlMessage);
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

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();
         }
 
     }

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>

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>