Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules

mock/src/main/java/seng302/Data/RaceData.java

@@ -11,6 +11,7 @@ import seng302.Model.Marker;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
@@ -20,7 +21,6 @@ import java.io.StringWriter;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
-
 /**
  * Created by esa46 on 21/04/17.
  */
@@ -59,6 +59,8 @@ public class RaceData {
             // write the content into xml file
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
             Transformer transformer = transformerFactory.newTransformer();
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
             DOMSource source = new DOMSource(doc);
 
             //Serialize document.

mock/src/main/java/seng302/Data/RegattaData.java

@@ -8,6 +8,7 @@ import seng302.Exceptions.InvalidRegattaDataException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
@@ -51,6 +52,8 @@ public class RegattaData {
             // write the content into xml file
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
             Transformer transformer = transformerFactory.newTransformer();
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
             DOMSource source = new DOMSource(doc);
 
             //Serialize document.

visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java

@@ -84,17 +84,19 @@ public class ResizableRaceCanvas extends Canvas {
     }
 
     public void displayBoat(Boat boat, double angle, Color colour) {
-        GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition());
+        if (boat.getCurrentPosition() != null) {
-        Paint paint = colour;
+            GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition());
-
+            Paint paint = colour;
-        double[] x = {pos.getX() - 6, pos.getX(), pos.getX() + 6};
+
-        double[] y = {pos.getY() + 12, pos.getY() - 12, pos.getY() + 12};
+            double[] x = {pos.getX() - 6, pos.getX(), pos.getX() + 6};
-        gc.setFill(paint);
+            double[] y = {pos.getY() + 12, pos.getY() - 12, pos.getY() + 12};
-
+            gc.setFill(paint);
-        gc.save();
+
-        rotate(angle, pos.getX(), pos.getY());
+            gc.save();
-        gc.fillPolygon(x, y, 3);
+            rotate(angle, pos.getX(), pos.getY());
-        gc.restore();
+            gc.fillPolygon(x, y, 3);
+            gc.restore();
+        }
     }
 
     /**

visualiser/src/main/resources/scenes/start.fxml

@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="startWrapper" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.StartController">
+<AnchorPane fx:id="startWrapper" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.StartController">
     <children>
         <GridPane fx:id="start" prefHeight="600.0" prefWidth="780.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <columnConstraints>
@@ -44,7 +44,7 @@
                 </TableView>
                 <Label fx:id="timeZoneTime" contentDisplay="CENTER" text="Local time..." GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
                 <Label fx:id="timer" text=" " GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
-            <Label fx:id="raceStartLabel" text="Starting time..." visible="false" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+            <Label fx:id="raceStartLabel" text="Starting time..." GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
             <Label fx:id="raceTitleLabel" text="Welcome to RaceVision" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.halignment="CENTER">
                <font>
                   <Font size="36.0" />