Additional AIS messages

Fixed AISMessage19 encoding and decoding as messages in the wild is only 1 sentence.

Author: amsga

AIS/AIS.csproj

@@ -7,7 +7,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageId>TensionDev.Maritime.AIS</PackageId>
-    <Version>0.4.0</Version>
+    <Version>0.4.1</Version>
     <Authors>TensionDev amsga</Authors>
     <Company>TensionDev</Company>
     <Product>TensionDev.Maritime.AIS</Product>
@@ -21,7 +21,7 @@
     <PackageReleaseNotes>Initial project release</PackageReleaseNotes>
     <NeutralLanguage>en-SG</NeutralLanguage>
     <AssemblyVersion>0.4.0.0</AssemblyVersion>
-    <FileVersion>0.4.0.0</FileVersion>
+    <FileVersion>0.4.1.0</FileVersion>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>

AIS/AISMessage19.cs

@@ -397,34 +397,25 @@ public override IList<String> EncodeSentences()
             IList<String> sentences = new List<String>();
 
             StringBuilder stringBuilder = new StringBuilder();
-            StringBuilder stringBuilder2 = new StringBuilder();
             IList<String> payload = EncodePayloads();
 
-            stringBuilder.AppendFormat("!AI{0},2,1,{1},B,{2},0", SentenceFormatter.ToString(), s_groupId, payload[0]);
-            stringBuilder2.AppendFormat("!AI{0},2,2,{1},B,{2},0", SentenceFormatter.ToString(), s_groupId, payload[1]);
+            stringBuilder.AppendFormat("!AI{0},1,1,,B,{1},0", SentenceFormatter.ToString(), payload[0]);
 
             Byte checksum = CalculateChecksum(stringBuilder.ToString());
-            Byte checksum2 = CalculateChecksum(stringBuilder2.ToString());
 
             stringBuilder.AppendFormat("*{0}\r\n", checksum.ToString("X2"));
-            stringBuilder2.AppendFormat("*{0}\r\n", checksum2.ToString("X2"));
 
             sentences.Add(stringBuilder.ToString());
-            sentences.Add(stringBuilder2.ToString());
-
-            ++s_groupId;
-            if (s_groupId > 9)
-                s_groupId = 0;
 
             return sentences;
         }
 
         protected override void DecodePayloads(IList<String> payloads)
         {
-            if (payloads.Count != 2)
+            if (payloads.Count != 1)
                 throw new ArgumentOutOfRangeException(nameof(payloads));
 
-            String payload = payloads[0] + payloads[1];
+            String payload = payloads[0];
 
             _bitVector0_59 = DecodePayload(payload, 0, 10);
             _bitVector60_119 = DecodePayload(payload, 10, 10);
@@ -447,7 +438,6 @@ protected override IList<String> EncodePayloads()
             IList<String> payloads = new List<String>();
 
             StringBuilder payload = new StringBuilder();
-            StringBuilder payload2 = new StringBuilder();
 
             GetBitVector0_59();
             GetBitVector60_119();
@@ -461,11 +451,9 @@ protected override IList<String> EncodePayloads()
             payload.Append(EncodePayload(_bitVector120_179, 60));
             payload.Append(EncodePayload(_bitVector180_239, 60));
             payload.Append(EncodePayload(_bitVector240_299, 60));
-
-            payload2.Append(EncodePayload(_bitVector300_311, 12));
+            payload.Append(EncodePayload(_bitVector300_311, 12));
 
             payloads.Add(payload.ToString());
-            payloads.Add(payload2.ToString());
 
             return payloads;
         }

CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v0.4.1] - 2022-05-26
+[v0.4.1](https://github.com/TensionDev/AutomaticIdentificationSystem/releases/tag/v0.4.1)
+
+### Fixed
+- Fixed Message 19 encoding and decoding.
+
 
 ## [v0.4.0] - 2022-05-22
 [v0.4.0](https://github.com/TensionDev/AutomaticIdentificationSystem/releases/tag/v0.4.0)

XUnitTestProjectAIS/UnitTestAISMessage19.cs

@@ -14,8 +14,7 @@ public void AIS19Decoding01()
         {
             IList<String> sentences = new List<String>()
             {
-                "!AIVDM,2,1,0,B,C5N3SRgPEnJGEBT>NhWAwwo862PaLELTBJ:V00000000S0D:R2,0*3A",
-                "!AIVDM,2,2,0,B,20,0*17"
+                "!AIVDM,1,1,,B,C5N3SRgPEnJGEBT>NhWAwwo862PaLELTBJ:V00000000S0D:R220,0*0B"
             };
 
             AISMessage aisMessage = AISMessage.DecodeSentences(sentences);