Added an attribute to each yacht: 'DistanceToNextMark'

This attribute is calculated at each update of the boat as prompted by the game state regularly
Removed the lat and lng attribute from the Yacht class and replaced its usage with the GeoPoint object instead

Removed redundant test files and merged GeoUtility and testGeoUtil test classes into one

tags: #story[1124] #pair[hyi25, wmu16]

src/test/java/seng302/utilities/GeoUtilityTest.java

@@ -0,0 +1,128 @@
+package seng302.utilities;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import javafx.geometry.Point2D;
+import org.junit.Before;
+import org.junit.Test;
+import seng302.model.GeoPoint;
+import seng302.utilities.GeoUtility;
+
+/**
+ * To test methods in GeoUtility.
+ * Use this site to calculate distances
+ * https://rechneronline.de/geo-coordinates/#distance
+ * Created by Haoming on 28/04/17.
+ */
+public class GeoUtilityTest {
+
+
+    //Line in x = y
+    private Point2D linePoint1 = new Point2D(0, 0);
+    private Point2D linePoint2 = new Point2D(1, 1);
+
+    private Point2D arbitraryPoint1 = new Point2D(1, 0);     //Point below x = y
+    private Point2D arbitraryPoint2 = new Point2D(0, 1);     //Point above x = y
+    private Point2D arbitraryPoint3 = new Point2D(2, 2);     //Point on x = y
+
+    private GeoPoint p1 = new GeoPoint(57.670333, 11.827833);
+    private GeoPoint p2 = new GeoPoint(57.671524, 11.844495);
+    private GeoPoint p3 = new GeoPoint(57.670822, 11.843392);
+    private GeoPoint p4 = new GeoPoint(25.694829, 98.392049);
+
+    private double toleranceRate = 0.01;
+
+
+    @Test
+    public void getBearing() throws Exception {
+        double expected, actual;
+
+        actual = GeoUtility.getBearing(p1, p2);
+        expected = 82;
+        assertEquals(expected, actual, expected * toleranceRate);
+
+        actual = GeoUtility.getBearing(p1, p3);
+        expected = 86;
+        assertEquals(expected, actual, expected * toleranceRate);
+
+        actual = GeoUtility.getBearing(p2, p4);
+        expected = 78;
+        assertEquals(expected, actual, expected * toleranceRate);
+    }
+
+    @Test
+    public void getGeoCoordinate() throws Exception {
+        GeoPoint expected, actual;
+
+        actual = GeoUtility.getGeoCoordinate(p1, 82.0, 1000.0);
+        expected = p2;
+        assertEquals(expected.getLat(), actual.getLat(), expected.getLat() * toleranceRate);
+        assertEquals(expected.getLng(), actual.getLng(), expected.getLng() * toleranceRate);
+
+        actual = GeoUtility.getGeoCoordinate(p1, 86.0, 927.0);
+        expected = p3;
+        assertEquals(expected.getLat(), actual.getLat(), expected.getLat() * toleranceRate);
+        assertEquals(expected.getLng(), actual.getLng(), expected.getLng() * toleranceRate);
+
+        actual = GeoUtility.getGeoCoordinate(p2, 78.0, 7430180.0);
+        expected = p4;
+        assertEquals(expected.getLat(), actual.getLat(), expected.getLat() * toleranceRate);
+        assertEquals(expected.getLng(), actual.getLng(), expected.getLng() * toleranceRate);
+    }
+
+
+    @Test
+    public void testGetDistance() throws Exception {
+        double expected, actual;
+
+        actual = GeoUtility.getDistance(p1, p2);
+        expected = 1000;
+        assertEquals(expected, actual, expected * toleranceRate);
+
+        actual = GeoUtility.getDistance(p1, p3);
+        expected = 927;
+        assertEquals(expected, actual, expected * toleranceRate);
+
+        actual = GeoUtility.getDistance(p2, p4);
+        expected = 7430180;
+        assertEquals(expected, actual, expected * toleranceRate);
+
+    }
+
+    @Test
+    public void testLineFunction() {
+
+        Integer lineFunctionResult1 = GeoUtility
+            .lineFunction(linePoint1, linePoint2, arbitraryPoint1);
+        Integer lineFunctionResult2 = GeoUtility
+            .lineFunction(linePoint1, linePoint2, arbitraryPoint2);
+        Integer lineFunctionResult3 = GeoUtility
+            .lineFunction(linePoint1, linePoint2, arbitraryPoint3);
+
+        //Point1 and Point2 are on opposite sides
+        assertEquals(Math.abs(lineFunctionResult1), Math.abs(lineFunctionResult2));
+        assertNotEquals(lineFunctionResult1, lineFunctionResult2);
+
+        //Point3 is on the line
+        assertEquals((long) lineFunctionResult3, 0L);
+    }
+
+    @Test
+    public void testMakeArbitraryVectorPoint() {
+
+        //Make a point (1,0) from point (0,0)
+        Point2D newPoint = GeoUtility.makeArbitraryVectorPoint(linePoint1, 0d, 1d);
+        Point2D expected = new Point2D(1, 0);
+
+        assertEquals(expected.getX(), newPoint.getX(), 1E-6);
+        assertEquals(expected.getY(), newPoint.getY(), 1E-6);
+
+        newPoint = GeoUtility.makeArbitraryVectorPoint(linePoint1, 90d, 1d);
+        expected = new Point2D(0, 1);
+
+        assertEquals(expected.getX(), newPoint.getX(), 1E-6);
+        assertEquals(expected.getY(), newPoint.getY(), 1E-6);
+    }
+
+}