gps_pvt 0.10.1 → 0.10.3

data/lib/gps_pvt/upl/RRLP-V17_0_0-Release17.asn

@@ -1191,7 +1191,12 @@ GANSSRefTimeInfo ::= SEQUENCE {
 GANSSTOD ::= INTEGER (0 .. 86399) 
 
 -- GANSS TOD uncertainty 
-GANSSTODUncertainty ::= INTEGER (0 .. 127) -- Coding according to Annex 
+GANSSTODUncertainty ::= INTEGER (0 .. 127) -- Coding according to Annex
+
+-- GANSS Reference Time Rel-10 Extension:
+GANSSReferenceTime-R10-Ext ::= SEQUENCE {
+  ganssDayCycleNumber INTEGER(0..7) -- coding according to annex
+}
 
 -- GANSS TOD-GSM Time association 
 GANSSTOD-GSMTimeAssociation ::= SEQUENCE { 

data/lib/gps_pvt/upl/upl.rb

@@ -26,6 +26,54 @@ ASN1::dig(upl, :ULP, :"ULP-PDU", :message, :msSUPLPOS, :posPayLoad, :rrlpPayload
   },
 })
 
+ASN1::dig(upl, :"MAP-LCS-DataTypes", :"Ext-GeographicalInformation")[:type][1].merge!({
+  :hook_decode => proc{
+    gen_ut = proc{|c, x| proc{|k| ((x + 1) ** k - 1) * c} }
+    tbl_task = {
+      :lat => [3, proc{|v| Rational((v & 0x7FFFFF) * 90, 1 << 23).to_f * (((v >> 23) == 1) ? -1 : 1)}],
+      :lng => [3, proc{|v| Rational((v >= (1 << 23) ? v - (1 << 24) : v) * 180, 1 << 23).to_f}],
+      :ucode => 1,
+      :usmaj => [1, gen_ut.call(10, 0.1)],
+      :usmin => [1, gen_ut.call(10, 0.1)],
+      :omaj => 1,
+      :cnf => 1,
+      :alt => [2, proc{|v| (v & 0x7FFF) * (((v >> 15) == 1) ? -1 : 1)}],
+      :ualt => [1, gen_ut.call(45, 0.025)],
+      :irad => [2, proc{|v| v * 5}],
+      :urad => [1, gen_ut.call(10, 0.1)],
+      :oang => [1, proc{|v| v * 2}],
+      :iang => [1, proc{|v| (v + 1) * 2}],
+    }
+    tbl_item = { # 7.2 Table 2a in 3GPP TS 23.032
+      # (a) 7.3.2 Ellipsoid point with uncertainty Circle
+      1 => [8, :lat, :lng, :ucode],
+      # (b) 7.3.3 Ellipsoid point with uncertainty Ellipse
+      3 => [11, :lat, :lng, :usmaj, :usmin, :omaj, :cnf],
+      # (c) 7.3.6 Ellipsoid point with altitude and uncertainty Ellipsoid
+      9 => [14, :lat, :lng, :alt, :usmaj, :usmin, :omaj, :ualt, :cnf],
+      # (d) 7.3.7 Ellipsoid Arc 
+      10 => [13, :lat, :lng, :irad, :urad, :oang, :iang, :cnf],
+      # (e) 7.3.1 Ellipsoid Point
+      0 => [7, :lat, :lng],
+    }
+    proc{|data|
+      data.define_singleton_method(:decode){
+        len, *items = tbl_item[self[0] >> 4]
+        next nil unless self.length == len
+        offset = 1
+        Hash[*(items.collect{|k|
+          len2, task = tbl_task[k]
+          v = self.slice(offset, len2).inject(0){|res, v2| (res << 8) + v2}
+          v = task.call(v) if task
+          offset += len2
+          [k, v]
+        }.flatten(1))]
+      }
+      data
+    }
+  }.call,
+})
+
 # LPP payload conversion
 ASN1::dig(upl, :ULP, :"ULP-PDU", :message, :msSUPLPOS, :posPayLoad, :"ver2-PosPayLoad-extension", :lPPPayload)[:type][1].merge!({
   :hook_encode => proc{|data|

data/lib/gps_pvt/util.rb

@@ -88,9 +88,15 @@ module Util
           end
           nil
         }.call
-        is_file = src.kind_of?(File) || src.kind_of?(Tempfile)
 
-        return src.path if ((!compressed) and is_file)
+        case src
+        when File
+          next src.path
+        when Tempfile
+          # Preserve tempfile after leaving open-uri block
+          src.define_singleton_method(:close!){close(false)}
+          next src # Kernel.open(obj) redirects to obj.open if obj responds to :open
+        end unless compressed
 
         Tempfile::open(File::basename($0, '.*')){|dst|
           dst.binmode

data/lib/gps_pvt/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GPS_PVT
-  VERSION = "0.10.1"
+  VERSION = "0.10.3"
   
   def GPS_PVT.version_compare(a, b)
     Gem::Version::new(a) <=> Gem::Version::new(b)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gps_pvt
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - fenrir(M.Naruoka)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyserial
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -168,12 +182,14 @@ files:
 - lib/gps_pvt/ntrip.rb
 - lib/gps_pvt/receiver.rb
 - lib/gps_pvt/receiver/agps.rb
+- lib/gps_pvt/receiver/almanac.rb
 - lib/gps_pvt/receiver/extension.rb
 - lib/gps_pvt/receiver/rtcm3.rb
 - lib/gps_pvt/rtcm3.rb
 - lib/gps_pvt/supl.rb
 - lib/gps_pvt/ubx.rb
 - lib/gps_pvt/upl/LPP-V17_5_0-Release17.asn
+- lib/gps_pvt/upl/MAP-LCS-DataTypes-V17_4_0-Release17.asn
 - lib/gps_pvt/upl/RRLP-V17_0_0-Release17.asn
 - lib/gps_pvt/upl/ULP-V2_0_6-20200720-D.asn
 - lib/gps_pvt/upl/upl.json.gz