From 5a2a78a7d5b951e4e7cf8d4aa762d4708414f062 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <ryan_zhiyou@hotmail.com>
Date: Thu, 17 Aug 2017 13:43:31 +1200
Subject: [PATCH] Bug fixes for final commit

---
 src/main/java/seng302/gameServer/GameState.java            | 2 +-
 .../seng302/visualiser/controllers/RaceViewController.java | 4 ----
 src/main/resources/server_config/xml_templates/race.ftlh   | 7 ++++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 6a0c7067..604694e1 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -360,7 +360,7 @@ public class GameState implements Runnable {
         Double velocity = yacht.getCurrentVelocity();
         Double trueWindAngle = Math.abs(windDirection - yacht.getHeading());
         Double boatSpeedInKnots = PolarTable.getBoatSpeed(getWindSpeedKnots(), trueWindAngle);
-        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots) * 5;
+        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots);
         // TODO: 15/08/17 remove magic numbers from these equations.
         if (yacht.getSailIn()) {
             if (velocity < maxBoatSpeed - 500) {
diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index 341a46ab..a7cd9718 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -252,9 +252,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             .stream()
             .filter(yacht -> yacht.getPosition() != null)
             .forEach(yacht -> {
-                System.out.println(
-                    yacht.getBoatName() + " pos: " + yacht.getPosition() + " legno: " + yacht
-                        .getLegNumber());
                 Series<String, Double> yachtData = new Series<>();
                 yachtData.setName(yacht.getSourceId().toString());
                 yachtData.getData().add(
@@ -283,7 +280,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 .stream()
                 .filter(spark -> !raceSparkLine.getData().contains(spark))
                 .forEach(spark -> {
-                    System.out.println(spark.getName());
                     raceSparkLine.getData().add(spark);
                     spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()));
                 });
diff --git a/src/main/resources/server_config/xml_templates/race.ftlh b/src/main/resources/server_config/xml_templates/race.ftlh
index b1674dfd..8fa95216 100644
--- a/src/main/resources/server_config/xml_templates/race.ftlh
+++ b/src/main/resources/server_config/xml_templates/race.ftlh
@@ -38,7 +38,12 @@
         <Corner SeqID="3" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
         <Corner SeqID="4" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
         <Corner SeqID="5" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="6" CompoundMarkID="5" Rounding="PS" ZoneSize="3" />
+        <Corner SeqID="6" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
+        <Corner SeqID="7" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
+        <Corner SeqID="8" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
+        <Corner SeqID="9" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
+        <Corner SeqID="10" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
+        <Corner SeqID="11" CompoundMarkID="5" Rounding="PS" ZoneSize="3" />
     </CompoundMarkSequence>
     <CourseLimit>
         <Limit SeqID="1" Lat="57.6739450" Lon="11.8417100" />