Spun off Locatable interface to make collision code more reusable

#story[1100]
This commit is contained in:
cbt24
2017-08-16 16:05:25 +12:00
parent ce14e93404
commit f44929f376
17 changed files with 98 additions and 664 deletions
@@ -8,7 +8,6 @@ import shared.exceptions.MarkNotFoundException;
import shared.model.GPSCoordinate;
import shared.model.Mark;
import visualiser.model.VisualiserBoat;
import visualiser.model.VisualiserRaceEvent;
import visualiser.model.VisualiserRaceState;
import java.util.logging.Level;
@@ -68,7 +67,7 @@ public class BoatLocationCommand implements Command {
boatLocation.getLatitude(),
boatLocation.getLongitude());
boat.setCurrentPosition(gpsCoordinate);
boat.setPosition(gpsCoordinate);
//Bearing.
boat.setBearing(boatLocation.getHeading());
@@ -96,7 +95,7 @@ public class BoatLocationCommand implements Command {
*/
private void attemptAddTrackPoint(VisualiserBoat boat) {
if (boat.getStatus() == BoatStatusEnum.RACING) {
boat.addTrackPoint(boat.getCurrentPosition(), visualiserRace.getRaceClock().getCurrentTime());
boat.addTrackPoint(boat.getPosition(), visualiserRace.getRaceClock().getCurrentTime());
}
}