diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index 6d9c19d2..63126939 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -148,11 +148,11 @@ public class CanvasController { gc.clearRect(0, 0, 19200, 10800); drawCourse(); drawBoats(); - gc.clearRect(0, 0, canvas.getWidth(),canvas.getHeight()); - gc.setFill(Color.SKYBLUE); - gc.fillRect(0,0,canvas.getWidth(),canvas.getHeight()); - drawCourse(); - drawBoats(); + gc.clearRect(0, 0, canvas.getWidth(),canvas.getHeight()); + gc.setFill(Color.SKYBLUE); + gc.fillRect(0,0,canvas.getWidth(),canvas.getHeight()); + drawCourse(); + drawBoats(); // If race has started, draw the boats and play the timeline if (race.getRaceTime() > 1){ diff --git a/src/test/java/seng302/models/parsers/CourseParserTest.java b/src/test/java/seng302/models/parsers/CourseParserTest.java index 96add4a8..a70375a0 100644 --- a/src/test/java/seng302/models/parsers/CourseParserTest.java +++ b/src/test/java/seng302/models/parsers/CourseParserTest.java @@ -29,15 +29,15 @@ public class CourseParserTest { assertTrue(MarkType.GATE_MARK == course.get(0).getMarkType()); GateMark gateMark1 = (GateMark) course.get(0); - assertEquals(32.293834, gateMark1.getSingleMark2().getLatitude(), 0.00000001); - assertEquals(-64.855195, gateMark1.getSingleMark2().getLongitude(), 0.00000001); + assertEquals(32.293771, gateMark1.getSingleMark2().getLatitude(), 0.00000001); + assertEquals(-64.855242, gateMark1.getSingleMark2().getLongitude(), 0.00000001); GateMark gateMark2 = (GateMark) course.get(5); assertEquals("Finish1", gateMark2.getSingleMark1().getName()); assertEquals("Finish2", gateMark2.getSingleMark2().getName()); - assertEquals(32.318303, gateMark2.getSingleMark2().getLatitude(), 0.00000001); - assertEquals(-64.834974, gateMark2.getSingleMark2().getLongitude(), 0.00000001); + assertEquals(32.317257, gateMark2.getSingleMark2().getLatitude(), 0.00000001); + assertEquals(-64.83626, gateMark2.getSingleMark2().getLongitude(), 0.00000001); } @Test diff --git a/src/test/java/seng302/models/parsers/TeamsParserTest.java b/src/test/java/seng302/models/parsers/TeamsParserTest.java index c0fd2814..aad9fdc2 100644 --- a/src/test/java/seng302/models/parsers/TeamsParserTest.java +++ b/src/test/java/seng302/models/parsers/TeamsParserTest.java @@ -26,10 +26,10 @@ public class TeamsParserTest { assertEquals(6, boats.size(), 1e-10); assertEquals("Oracle Team USA", boats.get(0).getTeamName()); - assertEquals(23.4, boats.get(0).getVelocity(), 1e-10); + assertEquals(10, boats.get(0).getVelocity(), 1e-10); assertEquals("Groupama Team France", boats.get(5).getTeamName()); - assertEquals(28.8, boats.get(5).getVelocity(), 1e-10); + assertEquals(10, boats.get(5).getVelocity(), 1e-10); } } \ No newline at end of file