nmea_plus 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb6a15ea1c4b8d040614ae117703221df082cf53
-  data.tar.gz: 3d738a04a524c69e02c371befc3d1edd9f913a96
+  metadata.gz: 1f71c1e2ce5125ec0729070d9bc7955bf0e764ff
+  data.tar.gz: 8058c722fb35884334c9b87e750948791bd9c441
 SHA512:
-  metadata.gz: f026b1f759c56c97952ea97b3b7a6190c0930e4cb02486a715cf704eefe5fa8c4f012c19b6b8778dd32be709be95cc671c23f267096635ddcd55d3f2e1d1074c
-  data.tar.gz: 9002792450538ed8f492db5f54707f1631bc44f27acede7a44868b82900755177da03974922565249ebde61b175fd56023aa5cf23878d0141b606dbad891ceb8
+  metadata.gz: 1e49686ab20cf85f0d91743e026af130d2e372be651e3410ae60570a8efa2d33c8df63b14bfce7a499cb31e073fe34cf88da508db181fd6825d8081aa749b7a0
+  data.tar.gz: 33c30c99d96467c453c1c8046efa321af8c60c3ca971e877db1adad3d49193a2a326e26b94264a4bc7f80e01a41c8699950b0c9aa3aaed65ea7ee0c796dd52ae

data/gem/lib/nmea_plus.rb

@@ -23,11 +23,13 @@ module NMEAPlus
         if @throw_on_parse_fail
           yield @decoder.parse(line)
         else
+          got_error = false
           begin
             y = @decoder.parse(line)
-            yield y
           rescue
+            got_error = true
           end
+          yield y unless got_error
         end
       end
     end

data/gem/lib/nmea_plus/generated_parser/tokenizer.rb

@@ -1,7 +1,7 @@
 #--
 # DO NOT MODIFY!!!!
 # This file is automatically generated by rex 1.0.5
-# from lexical definition file "/Users/iakatz/Code Base/nmea_plus/parser/tokenizer.rex".
+# from lexical definition file "/Users/iakatz/Code Base/ship_spotter/nmea_plus/parser/tokenizer.rex".
 #++
 
 

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

@@ -26,6 +26,14 @@ module NMEAPlus
             '@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !"#$%&\'()*+,-./0123456789:;<=>?'[ord]
           end
 
+          # access part of the payload.  if there aren't bytes, there, return nil
+          # else execute a block
+          def _access(start, length)
+            part = @payload_bitstring[start, length]
+            return nil if part.nil? || part.empty?
+            yield part
+          end
+
           # convert an entire string from the payload
           def _6b_string(start, length)
             # pull out 6b chunks from the string, use their value as a lookup into the ascii array
@@ -37,7 +45,7 @@ module NMEAPlus
           end
 
           def _bit_slices(start, length, chunk_size)
-            @payload_bitstring[start, length].chars.each_slice(chunk_size)
+            _access(start, length) { |bits| bits.chars.each_slice(chunk_size) }
           end
 
           # convert a string but trim off the 0s ('@')
@@ -47,18 +55,19 @@ module NMEAPlus
 
           # directly convert a string to a binary number as you'd read it
           def _6b_unsigned_integer(start, length)
-            @payload_bitstring[start, length].to_i(2)
+            _access(start, length) { |bits| bits.to_i(2) }
           end
 
           # perform a twos complement operation on part of the payload
           def _6b_twoscomplement(start, length)
             # two's complement: flip bits, then add 1
-            @payload_bitstring[start, length].tr("01", "10").to_i(2) + 1
+            _access(start, length) { |bits| bits.tr("01", "10").to_i(2) + 1 }
           end
 
           def _6b_integer(start, length)
             # MSB is 1 for negative
-            _6b_twoscomplement(start, length) * (@payload_bitstring[start] == 0 ? 1 : -1)
+            twoc = _6b_twoscomplement(start, length)
+            twoc && twoc * (@payload_bitstring[start] == 0 ? 1 : -1)
           end
 
           # scale an integer by dividing it by 10^decimal_places
@@ -72,11 +81,11 @@ module NMEAPlus
           end
 
           def _6b_boolean(start, _)
-            @payload_bitstring[start].to_i == 1
+            _access(start, 1) { |bits| bits.to_i == 1 }
           end
 
           def _2b_data_string(start, length)
-            @payload_bitstring[start, length]
+            _access(start, length)
           end
 
           # use shorthand for data types as defined in http://catb.org/gpsd/AIVDM.html

data/gem/lib/nmea_plus/message/ais/vdm_payload/vdm_msg5.rb

@@ -31,6 +31,72 @@ module NMEAPlus
           payload_reader :destination, 302, 120, :_t
           payload_reader :dte?, 422, 1, :_b
 
+          def ship_cargo_type_description
+            case ship_cargo_type
+            when 0 then return nil
+            when 1...19 then return "(future use)"
+            when 20 then return "WIG (any)"
+            when 21 then return "WIG Hazardous category A"
+            when 22 then return "WIG Hazardous category B"
+            when 23 then return "WIG Hazardous category C"
+            when 24 then return "WIG Hazardous category D"
+            when 25...29 then return "WIG (future use)"
+            when 30 then return "Fishing"
+            when 31 then return "Towing"
+            when 32 then return "Towing (large)"
+            when 33 then return "Dredging/underwater ops"
+            when 34 then return "Diving ops"
+            when 35 then return "Military ops"
+            when 36 then return "Sailing"
+            when 37 then return "Pleasure craft"
+            when 38, 39 then return "Reserved"
+            when 40 then return "High Speed Craft"
+            when 41 then return "HSC Hazardous category A"
+            when 42 then return "HSC Hazardous category B"
+            when 43 then return "HSC Hazardous category C"
+            when 44 then return "HSC Hazardous category D"
+            when 45...48 then return "HSC (reserved)"
+            when 49 then return "HSC (no additional information)"
+            when 50 then return "Pilot Vessel"
+            when 51 then return "Search and Rescue Vessel"
+            when 52 then return "Tug"
+            when 53 then return "Port Tender"
+            when 54 then return "Anti-pollution equipment"
+            when 55 then return "Law Enforcement"
+            when 56, 57 then return "Spare - Local Vessel"
+            when 58 then return "Medical Transport"
+            when 59 then return "Noncombatant ship according to RR Resolution No. 18"
+            when 60 then return "Passenger"
+            when 61 then return "Passenger, Hazardous category A"
+            when 62 then return "Passenger, Hazardous category B"
+            when 63 then return "Passenger, Hazardous category C"
+            when 64 then return "Passenger, Hazardous category D"
+            when 65..68 then return "Passenger, Reserved for future use"
+            when 69 then return "Passenger, No additional information"
+            when 70 then return "Cargo"
+            when 71 then return "Cargo, Hazardous category A"
+            when 72 then return "Cargo, Hazardous category B"
+            when 73 then return "Cargo, Hazardous category C"
+            when 74 then return "Cargo, Hazardous category D"
+            when 75..78 then return "Cargo, Reserved for future use"
+            when 79 then return "Cargo, No additional information"
+            when 80 then return "Tanker"
+            when 81 then return "Tanker, Hazardous category A"
+            when 82 then return "Tanker, Hazardous category B"
+            when 83 then return "Tanker, Hazardous category C"
+            when 84 then return "Tanker, Hazardous category D"
+            when 85.88 then return "Tanker, Reserved for future use"
+            when 89 then return "Tanker, No additional information"
+            when 90 then return "Other Type"
+            when 91 then return "Other Type, Hazardous category A"
+            when 92 then return "Other Type, Hazardous category B"
+            when 93 then return "Other Type, Hazardous category C"
+            when 94 then return "Other Type, Hazardous category D"
+            when 95..98 then return "Other Type, Reserved for future use"
+            when 99 then return "Other Type, no additional information"
+            end
+          end
+
         end
       end
     end

data/gem/lib/nmea_plus/version.rb

@@ -1,3 +1,3 @@
 module NMEAPlus
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nmea_plus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc