Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.

#refactor

src/main/java/seng302/utilities/GeoPoint.java

@@ -1,31 +0,0 @@
-package seng302.utilities;
-
-/**
- * A class represent Geo location (latitude, longitude).
- * Created by Haoming on 15/5/2017
- */
-public class GeoPoint {
-
-	double lat, lng;
-
-	public GeoPoint(double lat, double lng) {
-		this.lat = lat;
-		this.lng = lng;
-	}
-
-	public double getLat() {
-		return lat;
-	}
-
-	public void setLat(double lat) {
-		this.lat = lat;
-	}
-
-	public double getLng() {
-		return lng;
-	}
-
-	public void setLng(double lng) {
-		this.lng = lng;
-	}
-}

src/main/java/seng302/utilities/GeoUtility.java

@@ -1,6 +1,7 @@
 package seng302.utilities;
 
 import javafx.geometry.Point2D;
+import seng302.model.GeoPoint;
 
 public class GeoUtility {
 
@@ -43,16 +44,31 @@ public class GeoUtility {
 	 * and end up on a heading of 120°
 	 */
 	public static Double getBearing(GeoPoint p1, GeoPoint p2) {
+		return (getBearingRad(p1, p2) + 360.0) % 360.0;
+	}
 
+	/**
+	 * Calculates the angle between to angular co-ordinates on a sphere in radians.
+	 *
+	 * @param p1 the first geographical position, start point
+	 * @param p2 the second geographical position, end point
+	 * @return the initial bearing in degree from p1 to p2, value range (0 ~ 360 deg.).
+	 * vertical up is 0 deg. horizontal right is 90 deg.
+	 *
+	 * NOTE:
+	 * The final bearing will differ from the initial bearing by varying degrees
+	 * according to distance and latitude (if you were to go from say 35°N,45°E
+	 * (≈ Baghdad) to 35°N,135°E (≈ Osaka), you would start on a heading of 60°
+	 * and end up on a heading of 120°
+	 */
+	public static Double getBearingRad(GeoPoint p1, GeoPoint p2) {
 		double dLon = Math.toRadians(p2.getLng() - p1.getLng());
 
 		double y = Math.sin(dLon) * Math.cos(Math.toRadians(p2.getLat()));
 		double x = Math.cos(Math.toRadians(p1.getLat())) * Math.sin(Math.toRadians(p2.getLat()))
-				- Math.sin(Math.toRadians(p1.getLat())) * Math.cos(Math.toRadians(p2.getLat())) * Math.cos(dLon);
+			- Math.sin(Math.toRadians(p1.getLat())) * Math.cos(Math.toRadians(p2.getLat())) * Math.cos(dLon);
 
-		double bearing = Math.toDegrees(Math.atan2(y, x));
-
-		return (bearing + 360.0) % 360.0;
+		return Math.toDegrees(Math.atan2(y, x));
 	}
 
 	/**

src/main/java/seng302/utilities/XMLParser.java

@@ -8,13 +8,11 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import seng302.model.Corner;
 import seng302.model.Limit;
 import seng302.model.Yacht;
-import seng302.model.mark.GateMark;
+import seng302.model.mark.CompoundMark;
+import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
-import seng302.model.mark.MarkType;
-import seng302.model.mark.SingleMark;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 
@@ -249,13 +247,19 @@ public class XMLParser {
     /**
      * Extracts course mark data
      */
-    private static List<Mark> extractCompoundMarks(Element docEle) {
-        List<Mark> allMarks = new ArrayList<>();
+    private static List<CompoundMark> extractCompoundMarks(Element docEle) {
+        List<CompoundMark> allMarks = new ArrayList<>();
         NodeList cMarkList = docEle.getElementsByTagName("Course").item(0).getChildNodes();
+        CompoundMark cMark;
         for (int i = 0; i < cMarkList.getLength(); i++) {
             Node cMarkNode = cMarkList.item(i);
             if (cMarkNode.getNodeName().equals("CompoundMark")) {
-                allMarks.add(createMark(cMarkNode));
+                cMark = new CompoundMark(
+                    XMLParser.getNodeAttributeInt(cMarkNode, "CompoundMarkID"),
+                    XMLParser.getNodeAttributeString(cMarkNode, "Name")
+                );
+                cMark.addSubMarks(createMarks(cMarkNode));
+                allMarks.add(cMark);
             }
         }
         return allMarks;
@@ -264,8 +268,8 @@ public class XMLParser {
     /**
      * Creates marks objects from the given node
      */
-    private static Mark createMark(Node compoundMark) {
-        List<SingleMark> subMarks = new ArrayList<>();
+    private static List<Mark> createMarks(Node compoundMark) {
+        List<Mark> subMarks = new ArrayList<>();
         Integer compoundMarkID = XMLParser.getNodeAttributeInt(compoundMark, "CompoundMarkID");
         String cMarkName = XMLParser.getNodeAttributeString(compoundMark, "Name");
 
@@ -277,17 +281,10 @@ public class XMLParser {
                 String markName = XMLParser.getNodeAttributeString(markNode, "Name");
                 Double targetLat = XMLParser.getNodeAttributeDouble(markNode, "TargetLat");
                 Double targetLng = XMLParser.getNodeAttributeDouble(markNode, "TargetLng");
-                SingleMark mark = new SingleMark(markName, targetLat, targetLng, sourceID,
-                    compoundMarkID);
+                Mark mark = new Mark(markName, targetLat, targetLng, sourceID);
                 subMarks.add(mark);
             }
         }
-        if (subMarks.size() == 1) {
-            return subMarks.get(0);
-        } else {
-            return new GateMark( cMarkName, MarkType.OPEN_GATE, subMarks.get(0), subMarks.get(1),
-                subMarks.get(0).getLatitude(), subMarks.get(0).getLongitude(), compoundMarkID
-            );
-        }
+        return subMarks;
     }
 }