Fix AIS type 15 decoding and add a new test from Kurt Schwehr.

2 files changed, 19 insertions, 1 deletions

diff --git a/test/sample.aivdm b/test/sample.aivdm
index b4e7747d..3ed2a452 100644
--- a/test/sample.aivdm
+++ b/test/sample.aivdm
@@ -381,7 +381,8 @@
 #       Text                     : TEST
 #
 # Type 15:
-# From Mike Greene.
+# From Mike Greene. This is the 88/90-bit variant with one MMSI, 
+# message type and offset. Decode is known good.
 !AIVDM,1,1,,A,?5OP=l00052HD00,2*5B
 #       Message Type:       15
 #       Repeat Indicator:   0
@@ -390,6 +391,22 @@
 #       First Message Type: 5
 #       First Slot Offset:  0
 #
+# Type 15:
+# From Kurt Schwehr. This is the 108/110-bit variant with one MMSI and two
+# message types. Includes USCG metadata. Decode is known good.
+!AIVDM,1,1,,B,?h3Ovn1GP<K0<P@59a0,2*04,d-077,S1832,t004248.00,T48.85520485,r07RPAL1,1272415370
+#	Message Type             : 15
+#	Repeat Indicator         : 3
+#	MMSI                     : 3669720
+#	First interrogated MMSI  : 367014320
+#	First message type       : 3
+#	First slot offset        : 516
+#	Second message type      : 5
+#	Second slot offset       : 617
+#	Second interrogated MMSI : 0
+#	Message type             : 0
+#	Slot offset              : 0
+#
 # Type 16:
 # From AISHub. These are only a regression test to check that the C and Python
 # decoders do the same thing, not yet checked against other
diff --git a/test/sample.aivdm.chk b/test/sample.aivdm.chk
index 733b6128..f92a5f8a 100644
--- a/test/sample.aivdm.chk
+++ b/test/sample.aivdm.chk
@@ -27,6 +27,7 @@
 14,0,237008900,EP228 IX48 FG3 DK7 PL56.

 14,0,311764000,TEST

 15,0,368578000,5158,5,0,0,0,0,0,0

+15,3,003669720,367014320,3,516,5,617,0,0,0

 16,0,002053501,224251000,200,0,0,0,0

 17,0,002734450,17478,35992,376:7c0556c07031febbf52924fe33fa2933ffa0fd2932fdb7062922fe3809292afde9122929fcf7002923ffd20c29aaaa

 18,0,338087471,0,1,0,-44443279,24410724,796,511,49,0x0,1,0,1,1,1,1,0xe0006