From 37fe7389fff5974e45f02f1faa515be7dd60cedd Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Thu, 17 Aug 2017 13:55:33 +1200
Subject: [PATCH] Rounding marks works.

---
 racevisionGame/src/main/java/mock/model/MockRace.java  |  7 ++++---
 racevisionGame/src/main/java/mock/model/RaceLogic.java | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 72196be7..56317c78 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -299,7 +299,6 @@ public class MockRace extends Race {
 
     }
 
-
     /**
      * Calculates the distance a boat has travelled and updates its current position according to this value.
      *
@@ -314,6 +313,8 @@ public class MockRace extends Race {
 
         if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds & boat.isSailsOut()) {
 
+            checkPosition(boat, totalElapsedMilliseconds);
+
             setBoatSpeed(boat);
 
             //Calculates the distance travelled, in meters, in the current timeslice.
@@ -515,7 +516,7 @@ public class MockRace extends Race {
                 if (boat.isStarboardSide(roundingMark) &&
                         GPSCoordinate.passesLine(roundingMark.getPosition(),
                                 roundingChecks.get(0), boat.getPosition(), legBearing) &&
-                                gateCheck &&
+                        gateCheck &&
                         boat.isBetweenGate(roundingMark, Mark.tempMark(roundingChecks.get(0)))) {
                     boat.increaseRoundingStatus();
                     if (boat.getCurrentLeg().getLegNumber() + 2 >= legs.size()){
@@ -699,4 +700,4 @@ public class MockRace extends Race {
 
 
 
-}
+}
\ No newline at end of file
diff --git a/racevisionGame/src/main/java/mock/model/RaceLogic.java b/racevisionGame/src/main/java/mock/model/RaceLogic.java
index a3560bbd..5f0c4191 100644
--- a/racevisionGame/src/main/java/mock/model/RaceLogic.java
+++ b/racevisionGame/src/main/java/mock/model/RaceLogic.java
@@ -180,9 +180,9 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer {
     public void update(Observable o, Object arg) {
         Collision e = (Collision)arg;
 
-        if(e.getBearing().degrees() == 0) System.out.println("Ahead");
-        else if(e.getBearing().degrees() < 90) System.out.println("Starboard");
-        else if(e.getBearing().degrees() > 270) System.out.println("Port");
-        else System.out.println("Behind");
+//        if(e.getBearing().degrees() == 0) System.out.println("Ahead");
+//        else if(e.getBearing().degrees() < 90) System.out.println("Starboard");
+//        else if(e.getBearing().degrees() > 270) System.out.println("Port");
+//        else System.out.println("Behind");
     }
-}
+}
\ No newline at end of file