nmea_plus 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab50fa5e587f895b72ed894cf0c4e3f280956146
-  data.tar.gz: 923806c46670760a1f3832b23ae93f37001f4c80
+  metadata.gz: a0eca727afdb573f7ffede6594fc3d7acda16a48
+  data.tar.gz: 6ad4878023b3743d36954b020c8f08d97ea2ec62
 SHA512:
-  metadata.gz: b59b0f3ea335e74df47fd85587e88907d41e61052a5a2da22f7d3fc9882fbf30a6294cad1d95cbc65774eafb6a35cb30e73293cbf547b12de916423c0c6444df
-  data.tar.gz: 2e572c97ed129692c193ebefa13bd20598e1e49b29fe23c99000cd669e30bab93599dac69757cb27a0a5a27d1406e3a182fd0f43ba9adfce581b5d7396c8a67c
+  metadata.gz: 9ab5c817f001fb525e698b1e3588690bfbcf7952fd85faebe27df6e1c214cceecb5502ec0aedc39e74f33a0e1255524fe172059f1d9b870f1fec9eb245b526b1
+  data.tar.gz: 9338e0e75eae30e96717ffa45053ae7fbd03383f49b22793a0b4b87ddfcfb17d508ae6197490093a6aab7e859a67426d329731907949b992a334ecee765a71b7

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/nmea_plus.svg)](https://rubygems.org/gems/nmea_plus)
 [![Build Status](https://travis-ci.org/ifreecarve/nmea_plus.svg)](https://travis-ci.org/ifreecarve/nmea_plus)
-[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/nmea_plus/1.0.6)
+[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/nmea_plus/1.0.7)
 
 [NMEA Plus](https://github.com/ifreecarve/nmea_plus) is a Ruby gem for parsing and decoding "GPS" messages: NMEA, AIS, and any other similar formats of short messaging typically used by marine equipment.  It provides convenient access (by name) to the fields of each message type, and a stream reader designed for use with Ruby Blocks.
 
@@ -97,7 +97,7 @@ Because the message types are standard, if no override is found for a particular
 Additionally, AIS message type definitions were implemented from the unofficial spec found here:
 http://catb.org/gpsd/AIVDM.html
 
-> Currently AIVDM messages types 1, 2, 3, 4, 5, 8, 9, 12, 14, 18, 19, and 21 are implemented.
+> Currently AIVDM messages types 1, 2, 3, 4, 5, 8, 9, 12, 14, 18, 19, 20, 21, and 24 are implemented.
 
 Support for proprietary messages is also possible.  PASHR is included as proof-of-concept.
 
@@ -114,4 +114,4 @@ This gem was written by Ian Katz (ifreecarve@gmail.com) in 2015.  It's released
 
 ## See Also
 
-* [Contributing](CONTRIBUTING.md)
+* [Contributing](CONTRIBUTING.md)

data/lib/nmea_plus/message/ais/vdm.rb

@@ -25,7 +25,9 @@ require_relative "vdm_payload/vdm_msg9"
 require_relative "vdm_payload/vdm_msg12"
 require_relative "vdm_payload/vdm_msg14"
 require_relative "vdm_payload/vdm_msg18" # also includes 19
+require_relative "vdm_payload/vdm_msg20"
 require_relative "vdm_payload/vdm_msg21"
+require_relative "vdm_payload/vdm_msg24"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/ais/vdm_payload/vdm_msg.rb

@@ -1,5 +1,3 @@
-class Class
-end
 
 module NMEAPlus
   module Message
@@ -8,6 +6,9 @@ module NMEAPlus
       module VDMPayload
         # The base class for the AIS payload (of {NMEAPlus::Message::AIS::VDM}), which uses its own encoding for its own subtypes
         class VDMMsg
+
+          def initialize; end
+
           # @return [String] The raw "armored payload" in the original message
           attr_accessor :payload_bitstring
 
@@ -225,6 +226,11 @@ module NMEAPlus
             end
           end
 
+          # An MMSI is associated with an auxiliary craft when it is of the form 98XXXYYYY
+          def auxiliary_craft?
+            980_000_000 < source_mmsi && source_mmsi < 990_000_000
+          end
+
         end
 
         # We haven't defined all the AIS payload types, so this is a catch-all

data/lib/nmea_plus/message/ais/vdm_payload/vdm_msg20.rb

@@ -0,0 +1,29 @@
+require_relative 'vdm_msg'
+
+module NMEAPlus
+  module Message
+    module AIS
+      module VDMPayload
+        # Type 20 Data Link Management Message
+        class VDMMsg20 < NMEAPlus::Message::AIS::VDMPayload::VDMMsg
+          payload_reader :offset1, 40, 12, :_u
+          payload_reader :reserved_slots1, 52, 4, :_u
+          payload_reader :timeout1, 56, 3, :_u
+          payload_reader :increment1, 59, 11, :_u
+          payload_reader :offset2, 70, 12, :_u
+          payload_reader :reserved_slots2, 82, 4, :_u
+          payload_reader :timeout2, 86, 3, :_u
+          payload_reader :increment2, 89, 11, :_u
+          payload_reader :offset3, 100, 12, :_u
+          payload_reader :reserved_slots3, 112, 4, :_u
+          payload_reader :timeout3, 116, 3, :_u
+          payload_reader :increment3, 119, 11, :_u
+          payload_reader :offset4, 130, 12, :_u
+          payload_reader :reserved_slots4, 142, 4, :_u
+          payload_reader :timeout4, 146, 3, :_u
+          payload_reader :increment4, 149, 11, :_u
+        end
+      end
+    end
+  end
+end

data/lib/nmea_plus/message/ais/vdm_payload/vdm_msg21.rb

@@ -7,6 +7,7 @@ module NMEAPlus
         # Type 21: Aid-to-Navigation Report
         class VDMMsg21 < NMEAPlus::Message::AIS::VDMPayload::VDMMsg
 
+          # TODO: Navaid type descriptions (there are 32 of them)
           payload_reader :aid_type, 38, 5, :_e
           payload_reader :name, 43, 120, :_t
 
@@ -38,6 +39,7 @@ module NMEAPlus
 
           payload_reader :name_extension, 272, 88, :_t
 
+          # TODO: full name property?
         end
       end
     end

data/lib/nmea_plus/message/ais/vdm_payload/vdm_msg24.rb

@@ -0,0 +1,50 @@
+require_relative 'vdm_msg'
+
+module NMEAPlus
+  module Message
+    module AIS
+      module VDMPayload
+        # Type 24: Static Data Report
+        class VDMMsg24 < NMEAPlus::Message::AIS::VDMPayload::VDMMsg
+
+          payload_reader :part_number, 38, 2, :_u
+
+          # Override default bitstring setting to dynamically calculate what fields belong in this message
+          # which can be either part A or part B dpeending on the {#part_number} field
+          def payload_bitstring=(val)
+            super
+
+            case part_number
+            when 0
+              self.class.payload_reader :name, 40, 120, :_t
+            when 1
+              self.class.payload_reader :ship_cargo_type, 40, 8, :_e
+              self.class.payload_reader :vendor_id, 48, 18, :_t
+              self.class.payload_reader :model_code, 66, 4, :_u
+              self.class.payload_reader :serial_number, 70, 20, :_u
+              self.class.payload_reader :callsign, 90, 42, :_t
+
+              # If the MMSI is that of an auxiliary craft, these 30 bits are read as the MMSI of the mother ship.
+              # otherwise they are the vessel dimensions
+              if auxiliary_craft?
+                self.class.payload_reader :mothership_mmsi, 132, 30, :_u
+              else
+                self.class.payload_reader :ship_dimension_to_bow, 132, 9, :_u
+                self.class.payload_reader :ship_dimension_to_stern, 141, 9, :_u
+                self.class.payload_reader :ship_dimension_to_port, 150, 6, :_u
+                self.class.payload_reader :ship_dimension_to_starboard, 156, 6, :_u
+              end
+            end
+          end
+
+          # @!parse attr_reader :ship_cargo_type_description
+          # @return [String] Cargo type description
+          def ship_cargo_type_description
+            get_ship_cargo_type_description(ship_cargo_type)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/nmea_plus/version.rb

@@ -1,3 +1,3 @@
 module NMEAPlus
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nmea_plus
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -201,7 +201,9 @@ files:
 - lib/nmea_plus/message/ais/vdm_payload/vdm_msg12.rb
 - lib/nmea_plus/message/ais/vdm_payload/vdm_msg14.rb
 - lib/nmea_plus/message/ais/vdm_payload/vdm_msg18.rb
+- lib/nmea_plus/message/ais/vdm_payload/vdm_msg20.rb
 - lib/nmea_plus/message/ais/vdm_payload/vdm_msg21.rb
+- lib/nmea_plus/message/ais/vdm_payload/vdm_msg24.rb
 - lib/nmea_plus/message/ais/vdm_payload/vdm_msg4.rb
 - lib/nmea_plus/message/ais/vdm_payload/vdm_msg5.rb
 - lib/nmea_plus/message/ais/vdm_payload/vdm_msg8.rb