From 3157ac88b598e613cc603be31fbebc074520ecbd Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Fri, 8 Sep 2017 13:27:30 +1200
Subject: [PATCH] Course layout for a type M2 course has been made.
 #story[1193]

---
 .../src/main/java/mock/app/Event.java         |  6 ++-
 .../Controllers/HostController.java           |  3 +-
 .../resources/mock/mockXML/mMapLayout.xml     | 44 +++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index a1fc5072..d9bfd4e8 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -91,7 +91,9 @@ public class Event {
                 break;
             case 2: raceXMLFile = "mock/mockXML/iMapLayout.xml";
                 break;
-            default:raceXMLFile = "mock/mockXML/raceTest.xml";
+            case 3: raceXMLFile = "mock/mockXML/mMapLayout.xml";
+                break;
+            default: raceXMLFile = "mock/mockXML/raceTest.xml";
 
         }
         String boatsXMLFile = "mock/mockXML/boatTest.xml";
@@ -208,7 +210,7 @@ public class Event {
     public static String setRaceXMLAtCurrentTimeToNow(String raceXML) {
 
         //The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute.
-        long millisecondsToAdd = Constants.RacePreStartTime + (1 * 60 * 1000);
+        long millisecondsToAdd = Constants.RacePreStartTime + Constants.RacePreparatoryTime;
         long secondsToAdd = millisecondsToAdd / 1000;
         //Scale the time using our time scalar.
         secondsToAdd = secondsToAdd / Constants.RaceTimeScale;
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index 5255de71..2b43e34c 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -62,8 +62,9 @@ public class HostController extends Controller {
         Image ac35Map = new Image(getClass().getClassLoader().getResourceAsStream("images/AC35_Racecourse_MAP.png"));
         Image oMap = new Image(getClass().getClassLoader().getResourceAsStream("images/oMapLayout.png"));
         Image iMap = new Image(getClass().getClassLoader().getResourceAsStream("images/iMapLayout.png"));
+        Image mMap = new Image(getClass().getClassLoader().getResourceAsStream("images/iMapLayout.png"));
 
-        listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap, iMap));
+        listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap, iMap, mMap));
         mapImage.setImage(listOfMaps.get(currentMapIndex));
     }
 
diff --git a/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml b/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml
new file mode 100644
index 00000000..3f990b09
--- /dev/null
+++ b/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Race>
+    <RaceID>5326</RaceID>
+    <RaceType>FLEET</RaceType>
+    <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
+    <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
+    <Participants>
+        <Yacht SourceID="121"/>
+
+    </Participants>
+    <CompoundMarkSequence>
+        <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
+        <Corner SeqID="2" CompoundMarkID="2" Rounding="Starboard" ZoneSize="3" />
+        <Corner SeqID="3" CompoundMarkID="3" Rounding="Starboard" ZoneSize="3" />
+        <Corner SeqID="4" CompoundMarkID="2" Rounding="Starboard" ZoneSize="3" />
+        <Corner SeqID="5" CompoundMarkID="4" Rounding="SP" ZoneSize="3" />
+    </CompoundMarkSequence>
+    <Course>
+        <CompoundMark CompoundMarkID="1" Name="Start Line">
+            <Mark SeqId="1" Name="PRO" TargetLat="1.681354" TargetLng="1.132354" SourceID="101"/>
+            <Mark SeqId="2" Name="PIN" TargetLat="1.680354" TargetLng="1.135604" SourceID="102"/>
+        </CompoundMark>
+        <CompoundMark CompoundMarkID="2" Name="Marker 1">
+            <Mark Name="Marker1" TargetLat="1.780354" TargetLng="1.140600" SourceID="103"/>
+        </CompoundMark>
+        <CompoundMark CompoundMarkID="3" Name="Marker 2">
+            <Mark Name="Marker2" TargetLat="1.730354" TargetLng="1.137604" SourceID="104"/>
+        </CompoundMark>
+        <CompoundMark CompoundMarkID="4" Name="Finish Line">
+            <Mark SeqId="1" Name="FL" TargetLat="1.681354" TargetLng="1.132354" SourceID="105"/>
+            <Mark SeqId="2" Name="FR" TargetLat="1.680354" TargetLng="1.135604" SourceID="106"/>
+        </CompoundMark>
+    </Course>
+    <CourseLimit>
+        <Limit Lat="1.675354" Lon="1.122354" SeqID="1"/>
+
+        <Limit Lat="1.680354" Lon="1.141600" SeqID="2"/>
+
+        <Limit Lat="1.790354" Lon="1.146600" SeqID="3"/>
+
+        <Limit Lat="1.785354" Lon="1.127354" SeqID="4"/>
+
+    </CourseLimit>
+</Race>
\ No newline at end of file