Added AverageWindEncoder.

Refactored AverageWindDecoder - it now implements MessageDecoder.
Refactored AverageWind - it now uses milliseconds and knots, instead of packed MMperSec and tenths of a second. It also exposes its attributes now.
Added (un)packAverageWindPeriod to AC35UnitConverter.
Added AverageWindDecoderTest.
issue #35 #36
#story[1095]

racevisionGame/src/main/java/network/MessageDecoders/AverageWindDecoder.java

@@ -1,56 +1,103 @@
 package network.MessageDecoders;
 
 
+import network.Messages.AC35Data;
 import network.Messages.AverageWind;
 import network.Utils.ByteConverter;
 
+import static network.Utils.AC35UnitConverter.*;
+
 import java.util.Arrays;
 
 /**
- * Created by hba56 on 23/04/17.
+ * Decodes {@link AverageWind} messages.
  */
-public class AverageWindDecoder {
-    byte messageVersionNumber;
-    byte[] byteTime;
-    byte[] byteRawPeriod;
-    byte[] byteRawSpeed;
-    byte[] bytePeriod2;
-    byte[] byteSpeed2;
-    byte[] bytePeriod3;
-    byte[] byteSpeed3;
-    byte[] bytePeriod4;
-    byte[] byteSpeed4;
+public class AverageWindDecoder implements MessageDecoder {
 
-    AverageWind averageWind;
+    /**
+     * The encoded message.
+     */
+    private byte[] encodedMessage;
 
-    public AverageWindDecoder(byte[] encodedAverageWind) {
-        messageVersionNumber = encodedAverageWind[0];
-        byteTime = Arrays.copyOfRange(encodedAverageWind, 1, 7);
-        byteRawPeriod = Arrays.copyOfRange(encodedAverageWind, 7, 9);
-        byteRawSpeed = Arrays.copyOfRange(encodedAverageWind, 9, 11);
-        bytePeriod2 = Arrays.copyOfRange(encodedAverageWind, 11, 13);
-        byteSpeed2 = Arrays.copyOfRange(encodedAverageWind, 13, 15);
-        bytePeriod3 = Arrays.copyOfRange(encodedAverageWind, 15, 17);
-        byteSpeed3 = Arrays.copyOfRange(encodedAverageWind, 17, 19);
-        bytePeriod4 = Arrays.copyOfRange(encodedAverageWind, 19, 21);
-        byteSpeed4 = Arrays.copyOfRange(encodedAverageWind, 21, 23);
+    /**
+     * The decoded message.
+     */
+    private AverageWind message;
 
-        int msgNum = ByteConverter.bytesToInt(messageVersionNumber);
-        long lngTime = ByteConverter.bytesToLong(byteTime);
+
+
+    public AverageWindDecoder() {
+    }
+
+
+
+    @Override
+    public AC35Data decode(byte[] encodedMessage) {
+        this.encodedMessage = encodedMessage;
+
+
+        byte messageVersionNumber = encodedMessage[0];
+
+
+        byte[] byteTime = Arrays.copyOfRange(encodedMessage, 1, 7);
+        long time = ByteConverter.bytesToLong(byteTime);
+
+        byte[] byteRawPeriod = Arrays.copyOfRange(encodedMessage, 7, 9);
         int intRawPeriod = ByteConverter.bytesToInt(byteRawPeriod);
-        int intRawSpeed = ByteConverter.bytesToInt(byteRawSpeed);
-        int intPeriod2 = ByteConverter.bytesToInt(bytePeriod2);
-        int intSpeed2 = ByteConverter.bytesToInt(byteSpeed2);
-        int intPeriod3 = ByteConverter.bytesToInt(bytePeriod3);
-        int intSpeed3 = ByteConverter.bytesToInt(byteSpeed3);
-        int intPeriod4 = ByteConverter.bytesToInt(bytePeriod4);
-        int intSpeed4 = ByteConverter.bytesToInt(byteSpeed4);
+        long rawPeriod = unpackAverageWindPeriod(intRawPeriod);
 
-        this.averageWind = new AverageWind(msgNum, lngTime, intRawPeriod, intRawSpeed, intPeriod2, intSpeed2, intPeriod3, intSpeed3, intPeriod4, intSpeed4);
+        byte[] byteRawSpeed = Arrays.copyOfRange(encodedMessage, 9, 11);
+        int intRawSpeed = ByteConverter.bytesToInt(byteRawSpeed);
+        double rawSpeedKnots = unpackMMperSecToKnots(intRawSpeed);
+
+        byte[] bytePeriod2 = Arrays.copyOfRange(encodedMessage, 11, 13);
+        int intPeriod2 = ByteConverter.bytesToInt(bytePeriod2);
+        long period2 = unpackAverageWindPeriod(intPeriod2);
+
+        byte[] byteSpeed2 = Arrays.copyOfRange(encodedMessage, 13, 15);
+        int intSpeed2 = ByteConverter.bytesToInt(byteSpeed2);
+        double speed2Knots = unpackMMperSecToKnots(intSpeed2);
+
+        byte[] bytePeriod3 = Arrays.copyOfRange(encodedMessage, 15, 17);
+        int intPeriod3 = ByteConverter.bytesToInt(bytePeriod3);
+        long period3 = unpackAverageWindPeriod(intPeriod3);
+
+        byte[] byteSpeed3 = Arrays.copyOfRange(encodedMessage, 17, 19);
+        int intSpeed3 = ByteConverter.bytesToInt(byteSpeed3);
+        double speed3Knots = unpackMMperSecToKnots(intSpeed3);
+
+        byte[] bytePeriod4 = Arrays.copyOfRange(encodedMessage, 19, 21);
+        int intPeriod4 = ByteConverter.bytesToInt(bytePeriod4);
+        long period4 = unpackAverageWindPeriod(intPeriod4);
+
+        byte[] byteSpeed4 = Arrays.copyOfRange(encodedMessage, 21, 23);
+        int intSpeed4 = ByteConverter.bytesToInt(byteSpeed4);
+        double speed4Knots = unpackMMperSecToKnots(intSpeed4);
+
+
+
+
+        message = new AverageWind(
+                messageVersionNumber,
+                time,
+                rawPeriod,
+                rawSpeedKnots,
+                period2,
+                speed2Knots,
+                period3,
+                speed3Knots,
+                period4,
+                speed4Knots   );
+
+        return message;
 
     }
 
-    public AverageWind getAverageWind() {
-        return averageWind;
+    /**
+     * Returns the decoded message.
+     * @return The decoded message.
+     */
+    public AverageWind getMessage() {
+        return message;
     }
 }

racevisionGame/src/main/java/network/MessageDecoders/DecoderFactory.java

@@ -51,7 +51,7 @@ public class DecoderFactory {
 
             case COURSEWIND: return new CourseWindsDecoder();
 
-            //case AVGWIND: return new AverageWindDecoder()//TODO;
+            case AVGWIND: return new AverageWindDecoder();
 
             case REQUEST_TO_JOIN: return new RequestToJoinDecoder();