adds missing NavigationStatus enum attrs and adds missing ShipType (2…

…9) (#124)

* adds missing NavigationStatus enum attrs and adds missing ShipType (29)

* prepare version 2.5.8

CHANGELOG.txt

@@ -1,6 +1,13 @@
 ====================
  pyais CHANGELOG
 ====================
+-------------------------------------------------------------------------------
+ Version 2.5.8 01 Oct 2023
+-------------------------------------------------------------------------------
+* bug fix: Navigational statuses 9, 10, 13 and Ship type 29
+  * closes https://github.com/M0r13n/pyais/issues/123
+  * adds Navigational statuses 9, 10, 13 to NavigationStatus
+  * adds Ship type 29 to ShipType
 -------------------------------------------------------------------------------
  Version 2.5.7 29 Jul 2023
 -------------------------------------------------------------------------------

Makefile

@@ -12,7 +12,7 @@ check-build:
 	twine check dist/*
 
 type-check:
-	mypy ./pyais
+	mypy ./pyais --strict
 
 clean:
 	rm -rf .mypy_cache

pyais/__init__.py

@@ -5,7 +5,7 @@
 from pyais.tracker import AISTracker, AISTrack
 
 __license__ = 'MIT'
-__version__ = '2.5.7'
+__version__ = '2.5.8'
 __author__ = 'Leon Morten Richter'
 
 __all__ = (

pyais/constants.py

@@ -53,6 +53,11 @@ class NavigationStatus(IntEnum):
     Aground = 6
     EngagedInFishing = 7
     UnderWaySailing = 8
+    ReservedFutureAmendmentHSC = 9
+    ReservedFutureAmendmentWIG = 10
+    PowerDrivenVesselTowingAstern = 11
+    PowerDrivenVesselPushingAhead = 12
+    ReservedFutureUse = 13
     AISSARTActive = 14
     Undefined = 15
 
@@ -110,6 +115,7 @@ class ShipType(IntEnum):
     WIG_HazardousCategory_C = 23
     WIG_HazardousCategory_D = 24
     WIG_Reserved = 25
+    WIG_NoAdditionalInformation = 29
     # 30's
     Fishing = 30
     Towing = 31

tests/test_constants.py

@@ -1,10 +1,24 @@
 import unittest
+
+from pyais import decode, encode_msg
 from pyais.constants import NavigationStatus, ManeuverIndicator, ShipType, NavAid, TransmitMode, StationIntervals, \
     StationType
 
 
 class TestConstants(unittest.TestCase):
+    def test_that_nav_data_values_are_kept_for_all_values(self):
+        # See: https://github.com/M0r13n/pyais/issues/123
+        orignal = decode(b"!AIVDM,1,1,,B,15M67FC000G?ufbE`FepT@3n00Sa,0*5C")
+
+        for i in range(15):
+            orignal.status = i
+            encoded = encode_msg(orignal)
+            decoded = decode(encoded[0])
+
+            self.assertEqual(decoded.status.value, i)
+
     def test_nav_status(self):
+
         self.assertEqual(NavigationStatus(3), NavigationStatus.RestrictedManoeuverability)
         self.assertEqual(NavigationStatus(17), NavigationStatus.Undefined)