From 03713d3699fd76cc7b64463093c4c7573d6cde9e Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Wed, 9 Aug 2017 16:37:29 +1200
Subject: [PATCH] Added checkPosition into MockRace which was removed. Boat now
 updates legs again.

#Story[1097]
---
 .../src/main/java/mock/model/MockRace.java    | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 3ac8418e..87c0fa7c 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -346,7 +346,7 @@ public class MockRace extends Race {
 
             this.updateEstimatedTime(boat);
         }
-
+        checkPosition(boat, totalElapsedMilliseconds);
     }
 
     private void newOptimalVMG(MockBoat boat) {
@@ -443,6 +443,44 @@ public class MockRace extends Race {
 
     }
 
+    /**
+     * Checks if a boat has finished any legs, or has pulled out of race (DNF).
+     * @param boat The boat to check.
+     * @param timeElapsed The total time, in milliseconds, that has elapsed since the race started.
+     */
+    protected void checkPosition(MockBoat boat, long timeElapsed) {
+
+        //The distance, in nautical miles, within which the boat needs to get in order to consider that it has reached the marker.
+        double epsilonNauticalMiles = 100.0 / Constants.NMToMetersConversion; //100 meters. TODO should be more like 5-10.
+
+        if (boat.calculateDistanceToNextMarker() < epsilonNauticalMiles) {
+            //Boat has reached its target marker, and has moved on to a new leg.
+
+            //Calculate how much the boat overshot the marker by.
+            double overshootMeters = boat.calculateDistanceToNextMarker();
+
+            //Move boat on to next leg.
+            Leg nextLeg = this.legs.get(boat.getCurrentLeg().getLegNumber() + 1);
+            boat.setCurrentLeg(nextLeg);
+
+            //Add overshoot distance into the distance travelled for the next leg.
+            boat.setDistanceTravelledInLeg(overshootMeters);
+
+            //Setting a high value for this allows the boat to immediately do a large turn, as it needs to in order to get to the next mark.
+            boat.setTimeSinceTackChange(999999);
+
+            //Check if the boat has finished
+            if (this.isLastLeg(boat.getCurrentLeg())) {
+                //Boat has finished.
+                boat.setTimeFinished(timeElapsed);
+                boat.setCurrentSpeed(0);
+                boat.setStatus(BoatStatusEnum.FINISHED);
+            }
+        }
+
+    }
+
+
     public List<CompoundMark> getCompoundMarks() {
         return compoundMarks;
     }