Merge with master complete

- merged with master
#story[877]

mock/src/test/java/seng302/Model/LegTest.java

@@ -14,7 +14,7 @@ import static junit.framework.TestCase.assertEquals;
  */
 public class LegTest {
 
-    private CompoundMark ORIGIN_Compound_MARKER = new CompoundMark(new Mark(1, "test mark1", new GPSCoordinate(0, 0)));
+    private CompoundMark ORIGIN_COMPOUND_MARKER = new CompoundMark(new Mark(1, "test mark1", new GPSCoordinate(0, 0)));
 
     @Test
     public void calculateDistanceHandles5nmNorth() {
@@ -23,7 +23,7 @@ public class LegTest {
         calc.setDirection(0, 5 * Constants.NMToMetersConversion);
 
         CompoundMark endMarker = getEndMarker(calc.getDestinationGeographicPoint());
-        Leg test = new Leg("Test", ORIGIN_Compound_MARKER, endMarker, 0);
+        Leg test = new Leg("Test", ORIGIN_COMPOUND_MARKER, endMarker, 0);
         assertEquals(test.getDistanceNauticalMiles(), 5, 1e-8);
     }
 
@@ -34,7 +34,7 @@ public class LegTest {
         calc.setDirection(90, 12 * Constants.NMToMetersConversion);
 
         CompoundMark endMarker = getEndMarker(calc.getDestinationGeographicPoint());
-        Leg test = new Leg("Test", ORIGIN_Compound_MARKER, endMarker, 0);
+        Leg test = new Leg("Test", ORIGIN_COMPOUND_MARKER, endMarker, 0);
         assertEquals(test.getDistanceNauticalMiles(), 12, 1e-8);
     }
 
@@ -45,7 +45,7 @@ public class LegTest {
         calc.setDirection(180, 0.5 * Constants.NMToMetersConversion);
 
         CompoundMark endMarker = getEndMarker(calc.getDestinationGeographicPoint());
-        Leg test = new Leg("Test", ORIGIN_Compound_MARKER, endMarker, 0);
+        Leg test = new Leg("Test", ORIGIN_COMPOUND_MARKER, endMarker, 0);
         assertEquals(test.getDistanceNauticalMiles(), 0.5, 1e-8);
     }
 
@@ -56,14 +56,14 @@ public class LegTest {
         calc.setDirection(-90, 0.1 * Constants.NMToMetersConversion);
 
         CompoundMark endMarker = getEndMarker(calc.getDestinationGeographicPoint());
-        Leg test = new Leg("Test", ORIGIN_Compound_MARKER, endMarker, 0);
+        Leg test = new Leg("Test", ORIGIN_COMPOUND_MARKER, endMarker, 0);
         assertEquals(test.getDistanceNauticalMiles(), 0.1, 1e-8);
     }
 
     @Test
     public void calculateDistanceHandlesZeroDifference() {
 
-        Leg test = new Leg("Test", ORIGIN_Compound_MARKER, ORIGIN_Compound_MARKER, 0);
+        Leg test = new Leg("Test", ORIGIN_COMPOUND_MARKER, ORIGIN_COMPOUND_MARKER, 0);
         assertEquals(test.getDistanceNauticalMiles(), 0, 1e-8);
     }