Refactored countdown timer in race class

- Also fixed all boats having ame velocity

#story[881]

mock/src/main/java/seng302/Constants.java

@@ -8,4 +8,7 @@ public class Constants {
 
     public static final int NMToMetersConversion = 1852; // 1 nautical mile = 1852 meters
 
+    public static final int PRE_RACE_WAIT_TIME = 18000;
+
+    public static final int TEST_VELOCITIES[] = new int[] { 30, 15, 64, 52, 25, 24 };
 }

mock/src/main/java/seng302/DataInput/RegattaDataSource.java

@@ -1,11 +0,0 @@
-package seng302.DataInput;
-
-
-import seng302.Model.Regatta;
-
-/**
- * Created by zwu18 on 25/04/17.
- */
-public interface RegattaDataSource {
-    Regatta getRegatta();
-}

mock/src/main/java/seng302/DataInput/RegattaXMLReader.java

@@ -1,75 +0,0 @@
-package seng302.DataInput;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import seng302.Model.Regatta;
-
-
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-
-/**
- * Created by jjg64 on 19/04/17.
- */
-public class RegattaXMLReader extends XMLReader implements RegattaDataSource {
-    private Regatta regatta;
-
-    /**
-     * Constructor for Regatta XML
-     *
-     * @param filePath path of the file
-     * @throws IOException                  error
-     * @throws SAXException                 error
-     * @throws ParserConfigurationException error
-     */
-    public RegattaXMLReader(String filePath) throws IOException, SAXException, ParserConfigurationException {
-        this(filePath, true);
-    }
-
-    /**
-     * Constructor for Regatta XML
-     *
-     * @param filePath file path to read
-     * @param read     whether or not to read and store the files straight away.
-     * @throws IOException                  error
-     * @throws SAXException                 error
-     * @throws ParserConfigurationException error
-     */
-    public RegattaXMLReader(String filePath, boolean read) throws IOException, SAXException, ParserConfigurationException {
-        super(filePath);
-        if (read) {
-            read();
-        }
-    }
-
-    /**
-     * Read the XML
-     */
-    private void read() {
-        NodeList attributeConfig = doc.getElementsByTagName("RegattaConfig");
-        Element attributes = (Element) attributeConfig.item(0);
-        makeRegatta(attributes);
-    }
-
-    /**
-     * Create new regatta
-     * @param attributes
-     */
-    private void makeRegatta(Element attributes) {
-        int regattaID = Integer.parseInt(getTextValueOfNode(attributes, "RegattaID"));
-        String regattaName = getTextValueOfNode(attributes, "RegattaName");
-        String courseName = getTextValueOfNode(attributes, "CourseName");
-        double centralLatitude = Double.parseDouble(getTextValueOfNode(attributes, "CentralLatitude"));
-        double centralLongitude = Double.parseDouble(getTextValueOfNode(attributes, "CentralLongitude"));
-        double centralAltitude = Double.parseDouble(getTextValueOfNode(attributes, "CentralAltitude"));
-        float utcOffset = Float.parseFloat(getTextValueOfNode(attributes, "UtcOffset"));
-        float magneticVariation = Float.parseFloat(getTextValueOfNode(attributes, "MagneticVariation"));
-
-        regatta = new Regatta(regattaID, regattaName, courseName, centralLatitude, centralLongitude, centralAltitude, utcOffset, magneticVariation);
-    }
-
-    public Regatta getRegatta() {
-        return regatta;
-    }
-}

mock/src/main/java/seng302/DataInput/XMLReader.java

@@ -29,8 +29,6 @@ public abstract class XMLReader {
      */
     public XMLReader(String filePath) throws ParserConfigurationException, IOException, SAXException {
 
-
-
         InputSource fXmlFile;
         if (filePath.contains("<")) {
             fXmlFile = new InputSource();

mock/src/main/java/seng302/Exceptions/InvalidRegattaDataException.java

@@ -1,17 +0,0 @@
-package seng302.Exceptions;
-
-/**
- * Created by f123 on 25-Apr-17.
- */
-
-/**
- * An exception thrown when a Regatta.xml message cannot be generated and sent.
- */
-public class InvalidRegattaDataException extends RuntimeException {
-    public InvalidRegattaDataException() {
-    }
-
-    public InvalidRegattaDataException(String message) {
-        super(message);
-    }
-}

mock/src/main/java/seng302/Model/Boat.java

@@ -27,7 +27,6 @@ public class Boat {
      * @param country   nam abbreviation
      */
     public Boat(int sourceID, String name, String country) {
-        this.velocity = 30; // TODO - please dont commit
         this.country = this.country;
         this.name = name;
         this.sourceID = sourceID;

mock/src/main/java/seng302/Model/Race.java

@@ -1,12 +1,10 @@
 package seng302.Model;
 
-
 import javafx.animation.AnimationTimer;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.geotools.referencing.GeodeticCalculator;
 
-
 import seng302.Constants;
 import seng302.DataInput.RaceDataSource;
 import seng302.MockOutput;
@@ -19,7 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-
 /**
  * Parent class for races
  * Created by fwy13 on 3/03/17.
@@ -30,60 +27,19 @@ public class Race implements Runnable {
     protected List<Leg> legs;
     protected int boatsFinished = 0;
     protected long totalTimeElapsed;
-    protected int scaleFactor = 20;
+    protected int scaleFactor = 3;
-    protected int PRERACE_TIME = 18000; //time in milliseconds to pause during pre-race. At the moment, 3 minutes
     private long startTime;
-    protected boolean countdownFinish = false;
-    protected boolean runRace = true;
-    private int lastFPS = 20;
     private int raceId;
     private int dnfChance = 0; //percentage chance a boat fails at each checkpoint
     private MockOutput mockOutput;
-    private static int boatOffset = 0;
-    private int finished = 0;
-
-    /**
-     * Initailiser for Race
-     *
-     * @param boats       Takes in an array of boats that are participating in the race.
-     * @param legs        Number of marks in order that the boats pass in order to complete the race.
-     */
-    public Race(List<Boat> boats, List<Leg> legs, int raceID, MockOutput mockOutput) {
-
-        this.startingBoats = FXCollections.observableArrayList(boats);
-        this.legs = legs;
-        this.legs.add(new Leg("Finish", this.legs.size()));
-        this.raceId = raceID;
-        this.mockOutput = mockOutput;
-
-        this.startTime = System.currentTimeMillis() + (this.PRERACE_TIME / this.scaleFactor);
-    }
 
     public Race(RaceDataSource raceData, MockOutput mockOutput) {
-        this(raceData.getBoats(), raceData.getLegs(), raceData.getRaceId(), mockOutput);
+        this.startingBoats = FXCollections.observableArrayList(raceData.getBoats());
-    }
+        this.legs = raceData.getLegs();
-
+        this.legs.add(new Leg("Finish", this.legs.size()));
-    /**
+        this.raceId = raceData.getRaceId();
-     * Calculates the boats next GPS position based on its distance travelled and heading
+        this.mockOutput = mockOutput;
-     *
+        this.startTime = System.currentTimeMillis() + (Constants.PRE_RACE_WAIT_TIME / this.scaleFactor);
-     * @param oldCoordinates    GPS coordinates of the boat's starting position
-     * @param distanceTravelled distance in nautical miles
-     * @param azimuth           boat's current direction. Value between -180 and 180
-     * @return The boat's new coordinate
-     */
-    public static GPSCoordinate calculatePosition(GPSCoordinate oldCoordinates, double distanceTravelled, double azimuth) {
-
-        //Find new coordinate using current heading and distance
-        GeodeticCalculator geodeticCalculator = new GeodeticCalculator();
-        //Load start point into calculator
-        Point2D startPoint = new Point2D.Double(oldCoordinates.getLongitude(), oldCoordinates.getLatitude());
-        geodeticCalculator.setStartingGeographicPoint(startPoint);
-        //load direction and distance tranvelled into calculator
-        geodeticCalculator.setDirection(azimuth, distanceTravelled * Constants.NMToMetersConversion);
-        //get new point
-        Point2D endPoint = geodeticCalculator.getDestinationGeographicPoint();
-
-        return new GPSCoordinate(endPoint.getY(), endPoint.getX());
     }
 
     /**
@@ -91,69 +47,45 @@ public class Race implements Runnable {
      */
     public void run() {
         initialiseBoats();
-        countdownTimer();
+        countdownTimer.start();
     }
 
     /**
-     * Starts the heartbeat timer, which sends a heartbeat message every so often (i.e., 5 seconds).
+     * Countdown timer until race starts.
      */
-    /**
+
-     * Countdown timer until race starts. Use PRERACE_TIME to set countdown duration.
+    private AnimationTimer countdownTimer = new AnimationTimer() {
-     */
-    protected void countdownTimer() {
-        AnimationTimer timer = new AnimationTimer() {
         long currentTime = System.currentTimeMillis();
         long timeLeft;
-
         @Override
         public void handle(long arg0) {
             timeLeft = startTime - currentTime;
-                ArrayList<BoatStatus> boatStatuses = new ArrayList<>();
+            if (timeLeft <= 0) {
-                //For each boat, we update its position, and generate a BoatLocationMessage.
+                System.setProperty("javafx.animation.fullspeed", "true");
-                for (int i = 0; i < startingBoats.size(); i++) {
+                raceTimer.start();
-                    Boat boat = startingBoats.get((i + boatOffset) % startingBoats.size());
-                    mockOutput.parseBoatLocation(boat.getSourceID(), boat.getCurrentPosition().getLatitude(), boat.getCurrentPosition().getLongitude(), boat.getHeading(), 0);
-                    boatStatuses.add(new BoatStatus(boat.getSourceID(), BoatStatusEnum.PRESTART, boat.getCurrentLeg().getLegNumber()));
-                }
-                boatOffset = (boatOffset + 1) % (startingBoats.size());
-
-                if (timeLeft <= 60000/scaleFactor && timeLeft > 0) {
-                    RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, 2, startTime, 0, 2300, 1, boatStatuses);
-                    mockOutput.parseRaceStatus(raceStatus);
-                }
-                else if (timeLeft <= 0) {
-                    countdownFinish =  true;
-                    if (runRace) {
-                        simulateRace();
-                    }
                 stop();
             }
-                else {
+
-                    RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, 1, startTime, 0, 2300,1, boatStatuses);
+            ArrayList<BoatStatus> boatStatuses = new ArrayList<>();
-                    mockOutput.parseRaceStatus(raceStatus);
+            for (Boat boat : startingBoats) {
+                mockOutput.parseBoatLocation(boat.getSourceID(), boat.getCurrentPosition().getLatitude(),
+                        boat.getCurrentPosition().getLongitude(), boat.getHeading(), 0);
+                boatStatuses.add(new BoatStatus(boat.getSourceID(), BoatStatusEnum.PRESTART, 0));
             }
+
+            int raceStatusNumber = timeLeft <= 60000 / scaleFactor && timeLeft > 0? 2 : 1;
+            RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, raceStatusNumber, startTime, 0, 2300, 1, boatStatuses);
+            mockOutput.parseRaceStatus(raceStatus);
+
             currentTime = System.currentTimeMillis();
         }
     };
-        timer.start();
-    }
-
-    /**
-     * Starts the Race Simulation, playing the race start to finish with the timescale.
-     * This prints the boats participating, the order that the events occur in time order, and the respective information of the events.
-     */
-    private void simulateRace() {
-
-        System.setProperty("javafx.animation.fullspeed", "true");
-
-        for (Boat boat : startingBoats) {
-            boat.setStarted(true);
-        }
 
 
-        new AnimationTimer() {
+    private AnimationTimer raceTimer = new AnimationTimer() {
         //Start time of loop.
         long timeRaceStarted = System.currentTimeMillis();
+        int boatOffset = 0;
 
         @Override
         public void handle(long arg0) {
@@ -163,29 +95,23 @@ public class Race implements Runnable {
                 //Update the total elapsed time.
                 totalTimeElapsed = currentTime - timeRaceStarted;
                 ArrayList<BoatStatus> boatStatuses = new ArrayList<>();
-                    finished = 0;
+                //For each boat, we update its position, and generate a BoatLocationMessage.
-                    //For each boat, we update it's position, and generate a BoatLocationMessage.
                 for (int i = 0; i < startingBoats.size(); i++) {
                     Boat boat = startingBoats.get((i + boatOffset) % startingBoats.size());
                     if (boat != null) {
                         //Update position.
                         if (boat.getTimeFinished() < 0) {
-                                updatePosition(boat, Math.round(1000 / lastFPS) > 20 ? 15 : Math.round(1000 / lastFPS));
+                            updatePosition(boat, 15);
                             checkPosition(boat, totalTimeElapsed);
                         }
                         if (boat.getTimeFinished() > 0) {
                             mockOutput.parseBoatLocation(boat.getSourceID(), boat.getCurrentPosition().getLatitude(), boat.getCurrentPosition().getLongitude(), boat.getHeading(), boat.getVelocity());
                             boatStatuses.add(new BoatStatus(boat.getSourceID(), BoatStatusEnum.FINISHED, boat.getCurrentLeg().getLegNumber()));
-                                finished++;
                         } else {
                             mockOutput.parseBoatLocation(boat.getSourceID(), boat.getCurrentPosition().getLatitude(), boat.getCurrentPosition().getLongitude(), boat.getHeading(), boat.getVelocity());
                             boatStatuses.add(new BoatStatus(boat.getSourceID(),
                                     boat.getCurrentLeg().getLegNumber() >= 0 ? BoatStatusEnum.RACING : BoatStatusEnum.DNF, boat.getCurrentLeg().getLegNumber()));
                         }
-                            if (startingBoats.size()==finished){
-                                RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, 4, startTime, 0, 2300, 2, boatStatuses);
-                                mockOutput.parseRaceStatus(raceStatus);
-                            }
                     } else {
                         stop();
                     }
@@ -195,19 +121,20 @@ public class Race implements Runnable {
                 mockOutput.parseRaceStatus(raceStatus);
             }
         }
-        }.start();
+    };
-    }
+
     public void initialiseBoats() {
         Leg officialStart = legs.get(0);
         String name = officialStart.getName();
         Marker endMark = officialStart.getEndCompoundMark();
-
         ArrayList<GPSCoordinate> startingPositions = getSpreadStartingPositions();
+
         for (int i = 0; i < startingBoats.size(); i++) {
             Boat boat = startingBoats.get(i);
             if (boat != null) {
                 Leg newLeg = new Leg(name, new Marker(startingPositions.get(i)), endMark, 0);
                 boat.setCurrentLeg(newLeg);
+                boat.setVelocity(Constants.TEST_VELOCITIES[i]);
                 boat.setScaledVelocity(boat.getVelocity() * scaleFactor);
                 boat.setCurrentPosition(startingPositions.get(i));
                 boat.setHeading(boat.calculateHeading());
@@ -249,19 +176,26 @@ public class Race implements Runnable {
     }
 
     /**
-     * Sets the chance each boat has of failing at a gate or marker
+     * Calculates the boats next GPS position based on its distance travelled and heading
      *
-     * @param chance percentage chance a boat has of failing per checkpoint.
+     * @param oldCoordinates    GPS coordinates of the boat's starting position
+     * @param distanceTravelled distance in nautical miles
+     * @param azimuth           boat's current direction. Value between -180 and 180
+     * @return The boat's new coordinate
      */
-    protected void setDnfChance(int chance) {
+    public static GPSCoordinate calculatePosition(GPSCoordinate oldCoordinates, double distanceTravelled, double azimuth) {
-        if (chance >= 0 && chance <= 100) {
-            dnfChance = chance;
-        }
-    }
 
-    protected boolean doNotFinish() {
+        //Find new coordinate using current heading and distance
-        Random rand = new Random();
+        GeodeticCalculator geodeticCalculator = new GeodeticCalculator();
-        return rand.nextInt(100) < dnfChance;
+        //Load start point into calculator
+        Point2D startPoint = new Point2D.Double(oldCoordinates.getLongitude(), oldCoordinates.getLatitude());
+        geodeticCalculator.setStartingGeographicPoint(startPoint);
+        //load direction and distance travelled into calculator
+        geodeticCalculator.setDirection(azimuth, distanceTravelled * Constants.NMToMetersConversion);
+        //get new point
+        Point2D endPoint = geodeticCalculator.getDestinationGeographicPoint();
+
+        return new GPSCoordinate(endPoint.getY(), endPoint.getX());
     }
 
     /**
@@ -316,13 +250,19 @@ public class Race implements Runnable {
     }
 
     /**
-     * Returns the boats that have started the race.
+     * Sets the chance each boat has of failing at a gate or marker
      *
-     * @return ObservableList of Boat class that participated in the race.
+     * @param chance percentage chance a boat has of failing per checkpoint.
-     * @see ObservableList
-     * @see Boat
      */
-    public ObservableList<Boat> getStartingBoats() {
+    protected void setDnfChance(int chance) {
-        return startingBoats;
+        if (chance >= 0 && chance <= 100) {
+            dnfChance = chance;
         }
+    }
+
+    protected boolean doNotFinish() {
+        Random rand = new Random();
+        return rand.nextInt(100) < dnfChance;
+    }
+
 }

mock/src/main/java/seng302/Model/Regatta.java

@@ -1,99 +0,0 @@
-package seng302.Model;
-
-/**
- * Created by jjg64 on 19/04/17.
- */
-public class Regatta {
-    int regattaID;
-    String RegattaName;
-    int raceID = 0;
-    String courseName;
-    double centralLatitude;
-    double centralLongitude;
-    double centralAltitude;
-    float utcOffset;
-    float magneticVariation;
-
-    public Regatta(int regattaID, String regattaName, String courseName, double centralLatitude, double centralLongitude, double centralAltitude, float utcOffset, float magneticVariation) {
-        this.regattaID = regattaID;
-        this.RegattaName = regattaName;
-        this.courseName = courseName;
-        this.centralLatitude = centralLatitude;
-        this.centralLongitude = centralLongitude;
-        this.centralAltitude = centralAltitude;
-        this.utcOffset = utcOffset;
-        this.magneticVariation = magneticVariation;
-    }
-
-    public int getRegattaID() {
-        return regattaID;
-    }
-
-    public void setRegattaID(int ID) {
-        this.regattaID = ID;
-    }
-
-    public String getRegattaName() {
-        return RegattaName;
-    }
-
-    public void setRegattaName(String regattaName) {
-        RegattaName = regattaName;
-    }
-
-    public int getRaceID() {
-        return raceID;
-    }
-
-    public void setRaceID(int raceID) {
-        this.raceID = raceID;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public double getCentralLatitude() {
-        return centralLatitude;
-    }
-
-    public void setCentralLatitude(double centralLatitude) {
-        this.centralLatitude = centralLatitude;
-    }
-
-    public double getCentralLongitude() {
-        return centralLongitude;
-    }
-
-    public void setCentralLongitude(double centralLongitude) {
-        this.centralLongitude = centralLongitude;
-    }
-
-    public double getCentralAltitude() {
-        return centralAltitude;
-    }
-
-    public void setCentralAltitude(double centralAltitude) {
-        this.centralAltitude = centralAltitude;
-    }
-
-    public float getUtcOffset() {
-        return utcOffset;
-    }
-
-    public void setUtcOffset(float utcOffset) {
-        this.utcOffset = utcOffset;
-    }
-
-    public float getMagneticVariation() {
-        return magneticVariation;
-    }
-
-    public void setMagneticVariation(float magneticVariation) {
-        this.magneticVariation = magneticVariation;
-    }
-}

mock/src/main/resources/mockXML/raceTest.xml

@@ -15,9 +15,9 @@
     <CompoundMarkSequence>
         <Corner CompoundMarkID="1" SeqID="1"/>
         <Corner CompoundMarkID="2" SeqID="2"/>
-        <Corner CompoundMarkID="3" SeqID="3"/>
+        <Corner CompoundMarkID="4" SeqID="3"/>
-        <Corner CompoundMarkID="4" SeqID="4"/>
+        <Corner CompoundMarkID="3" SeqID="4"/>
-        <Corner CompoundMarkID="3" SeqID="5"/>
+        <Corner CompoundMarkID="4" SeqID="5"/>
         <Corner CompoundMarkID="5" SeqID="6"/>
     </CompoundMarkSequence>
     <Course>

mock/src/main/resources/raceXML/bermuda_AC35.xml

@@ -1,286 +0,0 @@
-<race>
-    <raceId>5326</raceId>
-    <boats>
-        <boat>
-            <name>Team ORACLE USA</name>
-            <speed>20</speed>
-            <abbr>USA</abbr>
-            <sourceID>121</sourceID>
-            <colour>BLUEVIOLET</colour>
-        </boat>
-        <boat>
-            <name>Land Rover BAR</name>
-            <speed>30</speed>
-            <abbr>GBR</abbr>
-            <sourceID>122</sourceID>
-            <colour>BLACK</colour>
-        </boat>
-        <boat>
-            <name>SoftBank Team Japan</name>
-            <speed>25</speed>
-            <abbr>JPN</abbr>
-            <sourceID>123</sourceID>
-            <colour>RED</colour>
-        </boat>
-        <boat>
-            <name>Groupama Team France</name>
-            <speed>20</speed>
-            <abbr>FRA</abbr>
-            <sourceID>124</sourceID>
-            <colour>ORANGE</colour>
-        </boat>
-        <boat>
-            <name>Artemis Racing</name>
-            <speed>29</speed>
-            <abbr>SWE</abbr>
-            <sourceID>125</sourceID>
-            <colour>DARKOLIVEGREEN</colour>
-        </boat>
-        <boat>
-            <name>Emirates Team New Zealand</name>
-            <speed>62</speed>
-            <abbr>NZL</abbr>
-            <sourceID>126</sourceID>
-            <colour>LIMEGREEN</colour>
-        </boat>
-    </boats>
-    <legs>
-        <leg>
-            <name>Start to Mark 1</name>
-            <start>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.296577</latitude>
-                        <longitude>-64.854304</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.293771</latitude>
-                        <longitude>-64.855242</longitude>
-                    </coordinate>
-                </compoundMark>
-            </start>
-            <finish>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.293039</latitude>
-                        <longitude>-64.843983</longitude>
-                    </coordinate>
-                </compoundMark>
-            </finish>
-        </leg>
-        <leg>
-            <name>Mark 1 to Leeward Gate</name>
-            <start>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.293039</latitude>
-                        <longitude>-64.843983</longitude>
-                    </coordinate>
-                </compoundMark>
-            </start>
-            <finish>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.309693</latitude>
-                        <longitude>-64.835249</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.308046</latitude>
-                        <longitude>-64.831785</longitude>
-                    </coordinate>
-                </compoundMark>
-            </finish>
-        </leg>
-        <leg>
-            <name>Leeward Gate to Windward Gate</name>
-            <start>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.309693</latitude>
-                        <longitude>-64.835249</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.308046</latitude>
-                        <longitude>-64.831785</longitude>
-                    </coordinate>
-                </compoundMark>
-            </start>
-            <finish>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.284680</latitude>
-                        <longitude>-64.850045</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.280164</latitude>
-                        <longitude>-64.847591</longitude>
-                    </coordinate>
-                </compoundMark>
-            </finish>
-        </leg>
-        <leg>
-            <name>Windward Gate to Leeward Gate</name>
-            <start>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.284680</latitude>
-                        <longitude>-64.850045</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.280164</latitude>
-                        <longitude>-64.847591</longitude>
-                    </coordinate>
-                </compoundMark>
-            </start>
-            <finish>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.309693</latitude>
-                        <longitude>-64.835249</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.308046</latitude>
-                        <longitude>-64.831785</longitude>
-                    </coordinate>
-                </compoundMark>
-            </finish>
-        </leg>
-        <leg>
-            <name>Leeward Gate to Finish</name>
-            <start>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.309693</latitude>
-                        <longitude>-64.835249</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.308046</latitude>
-                        <longitude>-64.831785</longitude>
-                    </coordinate>
-                </compoundMark>
-            </start>
-            <finish>
-                <compoundMark>
-                    <coordinate>
-                        <latitude>32.317379</latitude>
-                        <longitude>-64.839291</longitude>
-                    </coordinate>
-                    <coordinate>
-                        <latitude>32.317257</latitude>
-                        <longitude>-64.836260</longitude>
-                    </coordinate>
-                </compoundMark>
-            </finish>
-        </leg>
-    </legs>
-    <course>
-        <boundaries>
-            <coordinate>
-                <latitude>32.313922</latitude>
-                <longitude>-64.837168</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.317379</latitude>
-                <longitude>-64.839291</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.317911</latitude>
-                <longitude>-64.836996</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.317257</latitude>
-                <longitude>-64.836260</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.304273</latitude>
-                <longitude>-64.822834</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.279097</latitude>
-                <longitude>-64.841545</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.279604</latitude>
-                <longitude>-64.849871</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.289545</latitude>
-                <longitude>-64.854162</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.290198</latitude>
-                <longitude>-64.858711</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.297164</latitude>
-                <longitude>-64.856394</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.296148</latitude>
-                <longitude>-64.849184</longitude>
-            </coordinate>
-        </boundaries>
-        <compoundMark>
-            <name>Start Line</name>
-            <coordinate>
-                <latitude>32.296577</latitude>
-                <longitude>-64.854304</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.293771</latitude>
-                <longitude>-64.855242</longitude>
-            </coordinate>
-        </compoundMark>
-        <compoundMark>
-            <name>Mark</name>
-            <coordinate>
-                <latitude>32.293039</latitude>
-                <longitude>-64.843983</longitude>
-            </coordinate>
-        </compoundMark>
-        <compoundMark>
-            <name>Windward Gate</name>
-            <coordinate>
-                <latitude>32.284680</latitude>
-                <longitude>-64.850045</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.280164</latitude>
-                <longitude>-64.847591</longitude>
-            </coordinate>
-        </compoundMark>
-        <compoundMark>
-            <name>Leeward Gate</name>
-            <coordinate>
-                <latitude>32.309693</latitude>
-                <longitude>-64.835249</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.308046</latitude>
-                <longitude>-64.831785</longitude>
-            </coordinate>
-        </compoundMark>
-        <compoundMark>
-            <name>Windward Gate</name>
-            <coordinate>
-                <latitude>32.284680</latitude>
-                <longitude>-64.850045</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.280164</latitude>
-                <longitude>-64.847591</longitude>
-            </coordinate>
-        </compoundMark>
-        <compoundMark>
-            <name>Finish Line</name>
-            <coordinate>
-                <latitude>32.317379</latitude>
-                <longitude>-64.839291</longitude>
-            </coordinate>
-            <coordinate>
-                <latitude>32.317257</latitude>
-                <longitude>-64.836260</longitude>
-            </coordinate>
-        </compoundMark>
-    </course>
-</race>

mock/src/test/java/seng302/DataInput/RegattaXMLTest.java

@@ -1,51 +0,0 @@
-package seng302.DataInput;
-
-import org.junit.Before;
-import org.junit.Test;
-import seng302.Model.Regatta;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by jjg64 on 19/04/17.
- */
-public class RegattaXMLTest {
-    RegattaXMLReader regattaXMLReader;
-
-    @Before
-    public void findFile() {
-        try {
-            regattaXMLReader = new RegattaXMLReader("mockXML/regattaTest.xml", false);
-        } catch (Exception e) {
-            fail("Cannot find mockXML/regattaXML/regattaTest.xml in the resources folder");
-        }
-    }
-
-    @Test
-    public void makeRegattaTest() {
-        try {
-            regattaXMLReader = new RegattaXMLReader("mockXML/regattaTest.xml");
-            assertNotEquals(regattaXMLReader.getRegatta(), null);
-        } catch (Exception e) {
-            fail("Did not make a Regatta object");
-        }
-    }
-
-    @Test
-    public void correctValuesTest() {
-        try {
-            regattaXMLReader = new RegattaXMLReader("mockXML/regattaTest.xml");
-            Regatta regatta = regattaXMLReader.getRegatta();
-            assertEquals(regatta.getRegattaID(), 3);
-            assertEquals(regatta.getRegattaName(), "New Zealand Test");
-            assertEquals(regatta.getCourseName(), "North Head");
-            assertEquals(regatta.getCentralLatitude(), -36.82791529, 0.00000001);
-            assertEquals(regatta.getCentralLongitude(), 174.81218919, 0.00000001);
-            assertEquals(regatta.getCentralAltitude(), 0.00, 0.00000001);
-            assertEquals(regatta.getUtcOffset(), 12.0, 0.001);
-            assertEquals(regatta.getMagneticVariation(), 14.1, 0.001);
-        } catch (Exception e) {
-            fail("Did not have the correct values");
-        }
-    }
-}