Merge branch 'issue_26_wind' into RaceFactory

# Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/shared/model/Race.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
2017-08-02 15:04:55 +12:00
parent 81eeca3533 ed12ff659d
commit 51bbdf9a50
5 changed files with 376 additions and 16 deletions
@@ -311,11 +311,10 @@ public class VisualiserRace extends Race {
        //Race status enum.
        this.raceStatusEnum = RaceStatusEnum.fromByte(raceStatus.getRaceStatus());

-        // Wind direction
-        wind.setDegrees(raceStatus.getScaledWindDirection());
-
-        // Wind speed
-        wind.setWindSpeed(raceStatus.getWindSpeedKnots());
+        //Wind.
+        this.setWind(
+                Bearing.fromDegrees(raceStatus.getScaledWindDirection()),
+                raceStatus.getWindSpeedKnots()  );

        //Current race time.
        this.raceClock.setUTCTime(raceStatus.getCurrentTime());