Merge remote-tracking branch 'origin/story68' into story68

2017-08-13 19:10:31 +12:00
parent 0d786f381b 8b1561cdc7
commit 67bb7b81dc
1 changed files with 9 additions and 1 deletions
@@ -75,7 +75,15 @@ public class MockBoat extends Boat {

        //Get the start and end points.
        GPSCoordinate currentPosition = this.getCurrentPosition();
-        GPSCoordinate nextMarkerPosition = this.getCurrentLeg().getEndCompoundMark().getAverageGPSCoordinate();
+        GPSCoordinate nextMarkerPosition;
+
+        // if boat is at the finish
+        if (this.getCurrentLeg().getEndCompoundMark() == null) {
+            nextMarkerPosition = currentPosition;
+        }
+        else {
+            nextMarkerPosition = this.getCurrentLeg().getEndCompoundMark().getAverageGPSCoordinate();
+        }

        //Calculate bearing.
        Bearing bearing = GPSCoordinate.calculateBearing(currentPosition, nextMarkerPosition);