Changed package heirachy. Merged Controller and StartScreenController.

#refactor

src/main/java/seng302/model/mark/GateMark.java

@@ -0,0 +1,49 @@
+package seng302.model.mark;
+
+/**
+ * To represent a gate mark which contains two single marks.
+ * Created by ptg19 on 16/03/17.
+ * Modified by Haoming Yin (hyi25) on 17/3/2017.
+ */
+public class GateMark extends Mark {
+
+    private SingleMark singleMark1;
+    private SingleMark singleMark2;
+
+    /**
+     * Create an instance of Gate Mark which contains two single mark
+     * @param name the name of the gate mark
+     * @param singleMark1 one single mark inside of the gate mark
+     * @param singleMark2 the second mark inside of the gate mark
+     */
+    public GateMark(String name, MarkType type, SingleMark singleMark1, SingleMark singleMark2, double latitude, double longitude, int compoundMarkID) {
+        super(name, type, latitude, longitude, compoundMarkID);
+        this.singleMark1 = singleMark1;
+        this.singleMark2 = singleMark2;
+    }
+
+    public SingleMark getSingleMark1() {
+        return singleMark1;
+    }
+
+    public void setSingleMark1(SingleMark singleMark1) {
+        this.singleMark1 = singleMark1;
+    }
+
+    public SingleMark getSingleMark2() {
+        return singleMark2;
+    }
+
+    public void setSingleMark2(SingleMark singleMark2) {
+        this.singleMark2 = singleMark2;
+    }
+
+    public double getLatitude(){
+        return (this.getSingleMark1().getLatitude());
+    }
+
+    public double getLongitude(){
+        return (this.getSingleMark1().getLongitude());
+    }
+
+}

src/main/java/seng302/model/mark/Mark.java

@@ -0,0 +1,148 @@
+package seng302.model.mark;
+
+/**
+ * An abstract class to represent general marks
+ * Created by Haoming Yin (hyi25) on 17/3/17.
+ */
+public abstract class Mark {
+
+    private String name;
+    private MarkType markType;
+    private double latitude;
+    private double longitude;
+    private long id;
+    private int compoundMarkID;
+
+    /**
+     * Create a mark instance by passing its name and type
+     * @param name the name of the mark
+     * @param markType the type of mark. either GATE_MARK or SINGLE_MARK.
+     */
+    public Mark (String name, MarkType markType, int sourceID, int compoundMarkID) {
+        this.name = name;
+        this.markType = markType;
+        this.id = sourceID;
+        this.compoundMarkID = compoundMarkID;
+    }
+
+    public Mark(String name, MarkType markType, double latitude, double longitude, int compoundMarkID) {
+        this.name = name;
+        this.markType = markType;
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.id = 0;
+        this.compoundMarkID = compoundMarkID;
+    }
+
+    /**
+     * Calculated the heading in radians from first Mark to the second Mark.
+     *
+     * @param pointOne First Mark
+     * @param pointTwo Second Mark
+     * @return Heading in radians
+     */
+    public static Double calculateHeadingRad(Mark pointOne, Mark pointTwo) {
+        Double longitude1 = pointOne.getLongitude();
+        Double longitude2 = pointTwo.getLongitude();
+        Double latitude1 = pointOne.getLatitude();
+        Double latitude2 = pointTwo.getLatitude();
+        return calculateHeadingRad(latitude1, longitude1, latitude2, longitude2);
+    }
+
+    /**
+     * Calculate the heading in radians from geographical location with latitude1, longitude 1 to
+     * geographical latitude2, longitude 2
+     *
+     * @param longitude1 Longitude of first point in degrees
+     * @param longitude2 Longitude of second point in degrees
+     * @param latitude1 Latitude of first point in degrees
+     * @param latitude2 Latitude of first  point in degrees
+     * @return Heading in radians
+     */
+    public static double calculateHeadingRad(Double latitude1, Double longitude1, Double latitude2,
+        Double longitude2) {
+        latitude1 = Math.toRadians(latitude1);
+        latitude2 = Math.toRadians(latitude2);
+        Double longDiff = Math.toRadians(longitude2 - longitude1);
+        Double y = Math.sin(longDiff) * Math.cos(latitude2);
+        Double x =
+            Math.cos(latitude1) * Math.sin(latitude2) - Math.sin(latitude1) * Math.cos(latitude2)
+                * Math.cos(longDiff);
+        return Math.atan2(y, x);
+    }
+
+    /**
+     * Calculates the distance in meters from the first Mark to a second Mark
+     *
+     * @param pointOne First Mark
+     * @param pointTwo Second Mark
+     * @return Distance in meters
+     */
+    public static Double calculateDistance(Mark pointOne, Mark pointTwo) {
+        Double longitude1 = pointOne.getLongitude();
+        Double longitude2 = pointTwo.getLongitude();
+        Double latitude1 = pointOne.getLatitude();
+        Double latitude2 = pointTwo.getLatitude();
+        return calculateDistance(latitude1, longitude1, latitude2, longitude2);
+    }
+
+    /**
+     * Calculate the distance in meters from geographical location with latitude1, longitude 1 to
+     * geographical latitude2, longitude 2
+     *
+     * @param longitude1 Longitude of first point in degrees
+     * @param longitude2 Longitude of second point in degrees
+     * @param latitude1 Latitude of first point in degrees
+     * @param latitude2 Latitude of first  point in degrees
+     * @return Distance in meters
+     */
+    public static Double calculateDistance(Double latitude1, Double longitude1, Double latitude2,
+        Double longitude2) {
+        Double theta = longitude1 - longitude2;
+        Double dist = Math.sin(Math.toRadians(latitude1)) * Math.sin(Math.toRadians(latitude2)) +
+            Math.cos(Math.toRadians(latitude1)) * Math.cos(Math.toRadians(latitude2)) *
+                Math.cos(Math.toRadians(theta));
+        dist = Math.acos(dist);
+        dist = Math.toDegrees(dist);
+        dist = dist * 60
+            * 1.1508; //nautical mile (distance between two degrees) * (degrees in a minute)
+        dist = dist * 1609.344;    //ratio of miles to metres
+        return dist;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public MarkType getMarkType() {
+        return markType;
+    }
+
+    public void setMarkType(MarkType markType) {
+        this.markType = markType;
+    }
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getCompoundMarkID() {
+        return compoundMarkID;
+    }
+}

src/main/java/seng302/model/mark/MarkType.java

@@ -0,0 +1,9 @@
+package seng302.model.mark;
+
+/**
+ * To represent two types of mark
+ * Created by Haoming Yin (hyi25) on 17/3/17.
+ */
+public enum MarkType {
+    SINGLE_MARK, OPEN_GATE
+}

src/main/java/seng302/model/mark/SingleMark.java

@@ -0,0 +1,34 @@
+package seng302.model.mark;
+
+/**
+ * Represents the marker as a single mark
+ *
+ * Created by Haoming Yin (hyi25) on 17/3/2017
+ */
+public class SingleMark extends Mark {
+    private double lat;
+    private double lon;
+    private String name;
+
+    /**
+     * Represents a marker
+     *
+     * @param name, the name of the marker*
+     * @param lat,  the latitude of the marker
+     * @param lon,  the longitude of the marker
+     */
+    public SingleMark(String name, double lat, double lon, int sourceID, int compoundMarkID) {
+        super(name, MarkType.SINGLE_MARK, sourceID, compoundMarkID);
+        this.lat = lat;
+        this.lon = lon;
+    }
+
+
+    public double getLatitude() {
+        return this.lat;
+    }
+
+    public double getLongitude() {
+        return this.lon;
+    }
+}