Update boat position according to boat location messages in StreamedRace

- Added StreamedRace constructor accepting VisualiserInput
- Modified VisualiserInput constructor to accept Socket
- Refactored controller setup of Race

#story[782]

visualiser/src/main/java/seng302/Controllers/MainController.java

@@ -3,6 +3,7 @@ package seng302.Controllers;
 import javafx.fxml.FXML;
 import javafx.scene.layout.AnchorPane;
 import seng302.RaceDataSource;
+import seng302.VisualiserInput;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -16,8 +17,8 @@ public class MainController extends Controller {
     @FXML
     RaceController raceController;
 
-    public void beginRace(int scaleFactor, RaceDataSource raceData) {
+    public void beginRace(VisualiserInput visualiserInput) {
-        raceController.startRace(scaleFactor, raceData);
+        raceController.startRace(visualiserInput);
     }
 
 

visualiser/src/main/java/seng302/Controllers/RaceController.java

@@ -13,6 +13,7 @@ import seng302.Mock.StreamedRace;
 import seng302.Model.*;
 import seng302.RaceDataSource;
 import seng302.RaceXMLReader;
+import seng302.VisualiserInput;
 
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
@@ -114,13 +115,13 @@ public class RaceController extends Controller {
      * Initializes and runs the race, based on the user's chosen scale factor
      * Currently uses an example racecourse
      *
-     * @param scaleFactor scale value of race
+     * @param visualiserInput
      */
-    public void startRace(int scaleFactor, RaceDataSource raceData) {
+    public void startRace(VisualiserInput visualiserInput) {
-        StreamedRace newRace = new StreamedRace(raceData, this, scaleFactor);
+        StreamedRace newRace = new StreamedRace(visualiserInput, this);
         //newRace.initialiseBoats();
 
-        raceMap = new ResizableRaceCanvas(raceData);
+        raceMap = new ResizableRaceCanvas(visualiserInput.getCourse());
         raceMap.setMouseTransparent(true);
         raceMap.widthProperty().bind(canvasBase.widthProperty());
         raceMap.heightProperty().bind(canvasBase.heightProperty());
@@ -133,8 +134,8 @@ public class RaceController extends Controller {
 
         //Initialize save annotation array, fps listener, and annotation listeners
         //timezone
-        RaceClock raceClock = new RaceClock(raceData.getZonedDateTime());
+//        RaceClock raceClock = new RaceClock(visualiserInput.getCourse().getZonedDateTime());
-        timeZone.setText(raceClock.getTimeZone());
+//        timeZone.setText(raceClock.getTimeZone());
         initializeFPS();
         initializeAnnotations();
 

visualiser/src/main/java/seng302/Controllers/StartController.java

@@ -21,6 +21,8 @@ import seng302.RaceDataSource;
 
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.List;
@@ -53,6 +55,8 @@ public class StartController extends Controller implements Observer {
     private StreamedCourse raceData;
     private long timeLeft = 1;
 
+    private VisualiserInput visualiserInput;
+
     /**
      * Begins the race with a scale factor of 15
      */
@@ -88,7 +92,7 @@ public class StartController extends Controller implements Observer {
         try {
             raceData = new StreamedCourse();
             raceData.addObserver(this);
-            VisualiserInput visualiserInput = new VisualiserInput(raceData);
+            visualiserInput = new VisualiserInput(new Socket("livedata.americascup.com", 4941), raceData);
             new Thread(visualiserInput).start();
 //            StreamedCourse streamedCourse = new StreamedCourse(new BoatXMLReader("mockXML/boatXML/boatTest.xml"));
 //            streamedCourse.setStreamedCourseXMLReader(new StreamedCourseXMLReader("mockXML/raceXML/raceTest.xml"));
@@ -150,7 +154,7 @@ public class StartController extends Controller implements Observer {
                 if (timeLeft <= 0) {
                     updateTime("Race is starting...");
                     stop();
-                    parent.beginRace(scaleFactor, raceData);
+                    parent.beginRace(visualiserInput);
                     startWrapper.setVisible(false);
 
                 } else {

visualiser/src/main/java/seng302/Mock/StreamedRace.java

@@ -6,7 +6,10 @@ import seng302.Constants;
 import seng302.Controllers.RaceController;
 import seng302.GPSCoordinate;
 import seng302.Model.*;
+import seng302.Networking.MessageDecoders.BoatLocationDecoder;
+import seng302.Networking.Utils.BoatLocationMessage;
 import seng302.RaceDataSource;
+import seng302.VisualiserInput;
 
 import java.awt.geom.Point2D;
 import java.util.*;
@@ -15,12 +18,12 @@ import java.util.*;
  * Created by jjg64 on 21/04/17.
  */
 public class StreamedRace extends Race {
-    private RaceDataSource raceData;
+    private VisualiserInput visualiserInput;
+    private double MMPS_TO_KN = 0.001944;
 
-    public StreamedRace(RaceDataSource raceData, RaceController controller, int scaleFactor) {
+    public StreamedRace(VisualiserInput visualiserInput, RaceController controller) {
-        super(raceData.getBoats(), raceData.getLegs(), controller, scaleFactor);
+        super(visualiserInput.getCourse(), controller, 1);
-        this.raceData = raceData;
+        this.visualiserInput = visualiserInput;
-        this.scaleFactor = 1;   // There will be no scaling in a live streamed race
     }
 
     public void initialiseBoats() {
@@ -72,8 +75,16 @@ public class StreamedRace extends Race {
      * @param millisecondsElapsed time since last update
      */
     protected void updatePosition(Boat boat, int millisecondsElapsed) {
-        //TODO Grab info from network
+        int sourceID = boat.getSourceID();
-        // setPosition(boat, coordinate);
+        BoatLocationMessage boatLocationMessage = visualiserInput.getBoatLocationMessage(sourceID);
+        if(boatLocationMessage != null) {
+            System.out.println(sourceID);
+            double lat = boatLocationMessage.getLatitudeDouble();
+            double lon = boatLocationMessage.getLongitudeDouble();
+            boat.setCurrentPosition(new GPSCoordinate(lat, lon));
+            boat.setHeading(boatLocationMessage.getHeadingDegrees());
+            boat.setVelocity(boatLocationMessage.getBoatSpeed() * MMPS_TO_KN);
+        }
     }
 
     protected void setPosition(Boat boat, GPSCoordinate coordinate) {

visualiser/src/main/java/seng302/Model/Race.java

@@ -9,6 +9,7 @@ import org.geotools.referencing.GeodeticCalculator;
 import seng302.Controllers.RaceController;
 import seng302.GPSCoordinate;
 import seng302.RaceDataSource;
+import seng302.VisualiserInput;
 
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
@@ -31,7 +32,7 @@ public abstract class Race implements Runnable {
 
     protected int scaleFactor;
 
-    protected int PRERACE_TIME = 120000; //time in milliseconds to pause during pre-race
+    protected int PRERACE_TIME = 0; //time in milliseconds to pause during pre-race
     private boolean timerEnabled = true; //boolean to determine if timer is ran
 
     /**
@@ -69,6 +70,10 @@ public abstract class Race implements Runnable {
         this(Arrays.asList(startingBoats), legs, controller, scaleFactor);
     }
 
+    public void setController(RaceController controller) {
+        this.controller = controller;
+    }
+
     public abstract void initialiseBoats();
 
     /**

visualiser/src/main/java/seng302/VisualiserInput.java

@@ -37,9 +37,9 @@ public class VisualiserInput implements Runnable
 
     private Map<Integer, BoatLocationMessage> boatLocation;
 
-    public VisualiserInput(StreamedCourse course) throws IOException{
+    public VisualiserInput(Socket socket, StreamedCourse course) throws IOException{
 
-        connectionSocket = new Socket(InetAddress.getLocalHost(), 4942);
+        this.connectionSocket = socket;
 //        this.connectionSocket = new Socket("livedata.americascup.com",4941);
 
         this.course = course;
@@ -125,17 +125,17 @@ public class VisualiserInput implements Runnable
                          lastHeartbeatTime = System.currentTimeMillis();
                          //note: if the program runs for over 340 years, this will crash.
                          heartbeatSeqNum = ByteConverter.bytesToLong(testDecoder.getMessage());
-                         System.out.println("HeartBeat Message! " + heartbeatSeqNum);
+//                         System.out.println("HeartBeat Message! " + heartbeatSeqNum);
                          break;
                      case RACESTATUS:
-                         System.out.println("Race Status Message");
+//                         System.out.println("Race Status Message");
                          break;
                      case DISPLAYTEXTMESSAGE:
 //                         System.out.println("Display Text Message");
                          //no decoder for this.
                          break;
                      case XMLMESSAGE:
-                         System.out.println("XML Message!");
+//                         System.out.println("XML Message!");
                          XMLMessage xml = (XMLMessage) data;
                          try {
                              if (xml.getXmlMsgSubType() == xml.XMLTypeRegatta){
@@ -159,7 +159,7 @@ public class VisualiserInput implements Runnable
                          }
                          break;
                      case RACESTARTSTATUS:
-                         //System.out.println("Race Start Status Message");
+                         System.out.println("Race Start Status Message");
                          break;
                      case YACHTEVENTCODE:
 //                         System.out.println("Yacht Action Code!");
@@ -174,6 +174,7 @@ public class VisualiserInput implements Runnable
                          //no decoder
                          break;
                      case BOATLOCATION:
+                         System.out.println("Boat Location!");
                          BoatLocationMessage msg = (BoatLocationMessage) data;
                          if (boatLocation.containsKey(msg.getSourceID())){
                              if (msg.getTime() > boatLocation.get(msg.getSourceID()).getTime()){
@@ -212,7 +213,8 @@ public class VisualiserInput implements Runnable
 
     public static void main(String argv[]) throws Exception
     {
-        VisualiserInput receiver = new VisualiserInput(new StreamedCourse());
+        Socket socket = new Socket(InetAddress.getLocalHost(), 4942);
+        VisualiserInput receiver = new VisualiserInput(socket, new StreamedCourse());
         receiver.run();
     }