gps_pvt 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9977db11c202c0e16e0db9a06a91419011732835f8d406194f4663342e79eef
-  data.tar.gz: 485793ee595d5245e383f70de03efd77f98f1e4228ba74b782c80fb2d0e06946
+  metadata.gz: a75bed6b9453e7fe5b435eb2c10bd82e7c736654b6d34461368b79274ee223e3
+  data.tar.gz: 55577769f09988ce63809f52b14a82bfa7fd958f68547f36263647b147559831
 SHA512:
-  metadata.gz: ee59dd138de2243ea47a170c8d0724803fb3a5e19b28b5fe360649614c827b020000dc264dfd810b48346cfb3ddd0929925633d9769848a782ee6c65feeb0143
-  data.tar.gz: 63230d1fee5eadb80487df64d679300144a457efaaa6f9874a6574bb600c47307f4cedab607385d9bfd73a5c43e0e066f22ee09ccd0b81a6294d688c753d3e08
+  metadata.gz: 01c350f1e321119d0b4693a9b96bc99003b92e37783cdc53f0779e02111ec880d2b26e30e1f1ccec81faaaca16d730b8e17a5d24eb9bacd2934fe0ffaf083284
+  data.tar.gz: 6cab5c290099b0dd7604940822c9399dc93d7656651fe4c38003202745c8b5f561c68cb452ece7c2d9b35740d7621b47e809341cec2228d3551e3238e2648c23

data/exe/gps2ubx

@@ -31,7 +31,7 @@ misc_options = {
 files = ARGV.collect{|arg|
   next [arg, nil] unless arg =~ /^--([^=]+)=?/
   k, v = [$1.downcase.to_sym, $']
-  next [v, k] if [:rinex_nav, :rinex_obs].include?(k) # file type
+  next [v, k] if [:rinex_nav, :rinex_obs, :ubx, :rtcm3].include?(k) # file type
   options << [$1.to_sym, $']
   nil
 }.compact
@@ -43,14 +43,10 @@ files.collect!{|fname, ftype|
   when /\.\d{2}o(?:\.gz)?$/; :rinex_obs
   when /\.ubx$/; :ubx
   end
-  fname = proc{
-    next fname if File::exist?(fname)
-    if uri = URI::parse(fname) and !uri.instance_of?(URI::Generic) then
-      ftype ||= uri.read_format if uri.instance_of?(URI::Ntrip)
-      next uri
-    end
-    raise "File not found: #{fname}"
-  }.call
+  if (!(uri = URI::parse(fname)).instance_of?(URI::Generic) rescue false) then
+    ftype ||= uri.read_format if uri.instance_of?(URI::Ntrip)
+    fname = uri
+  end
   raise "Format cannot be guessed, use --(format, ex. rinex_obs)=#{fname}" unless ftype
   [fname, ftype]
 }
@@ -70,7 +66,7 @@ options.reject!{|opt|
 
 rcv = GPS_PVT::Receiver::new(options)
 
-obs = []
+obs = Queue::new
 rcv.define_singleton_method(:run){|meas, t_meas, *args|
   obs << [t_meas, meas]
 }
@@ -98,15 +94,23 @@ files.each{|fname, ftype|
 }
 
 # other files
-files.each{|fname, ftype|
-  case ftype
-  when :ubx; rcv.parse_ubx(fname){}
-  when :rinex_obs; rcv.parse_rinex_obs(fname){}
-  when :rtcm3; rcv.parse_rtcm3(fname){}
+threads = files.collect{|fname, ftype|
+  task = case ftype
+  when :ubx; proc{rcv.parse_ubx(fname){}}
+  when :rinex_obs; proc{rcv.parse_rinex_obs(fname){}}
+  when :rtcm3; proc{rcv.parse_rtcm3(fname){}}
   end
-}
+  case fname
+  when URI::Ntrip; Thread::new(&task)
+  else; task.call; nil
+  end
+}.compact
 
-obs.sort!{|a, b| a[0] <=> b[0]} # Sort by measurement time
+obs = proc{
+  tmp = []
+  tmp << obs.pop until obs.empty?
+  tmp
+}.call.sort!{|a, b| b[0] <=> a[0]} if threads.empty? # Sort by measurement time
 
 # Time packet for solution of leap seconds
 gen_gpstime = proc{
@@ -368,7 +372,18 @@ gen_list << gen_gpstime unless misc_options[:ubx_rawx]
 gen_list << (misc_options[:ubx_rawx] ? gen_sfrbx : gen_sfrb) if misc_options[:broadcast_data]
 gen_list << (misc_options[:ubx_rawx] ? gen_rawx : gen_raw)
 STDOUT.binmode
-obs.each{|t_meas, meas|
-  meas2 = meas.to_hash
-  gen_list.each{|gen| print gen.call(t_meas, meas2)}
+
+task_dump = proc{
+  until obs.empty? do
+    t_meas, meas = obs.pop
+    meas2 = meas.to_hash
+    gen_list.each{|gen| print gen.call(t_meas, meas2)}
+  end
 }
+if threads.empty? then
+  task_dump.call
+else
+  (threads << Thread::new{loop{
+    task_dump.call
+  }}).each{|th| th.join}
+end

data/exe/gps_get

@@ -20,30 +20,21 @@ files = ARGV.collect{|arg|
   nil
 }.compact
 
-spec2io = proc{
-  io_pool = {}
-  proc{|spec, mode_r|
-    mode_r = true if (mode_r == nil)
-    next (io_pool[spec] ||= open(spec)) if Serial::SPEC =~ spec # serial port
-    if (uri = (URI::parse(spec) rescue nil)) and !uri.instance_of?(URI::Generic) then # URI
-      if mode_r then
-        case uri
-        when URI::Ntrip; next URI::open(uri)
-        else; next GPS_PVT::Util::get_txt(uri)
-        end
-      end
-      raise "Unknown URI: #{spec}"
-    end
-    if mode_r then # file
-      next STDIN if spec == '-'
-      next open(GPS_PVT::Util::get_txt(spec), 'r') if File::exist?(spec)
-      raise "File not found: #{spec}"
-    else
-      next STDOUT if spec == '-'
-      open(spec, 'a+')
-    end
-  }
-}.call
+spec2io = proc{|spec, mode_r|
+  mode_r = ((nil == mode_r) || mode_r)
+  is_stream = false
+  if (!(uri = URI::parse(spec)).instance_of?(URI::Generic) rescue false) then
+    spec = uri
+    is_stream = true if uri.kind_of?(URI::Ntrip)
+  else
+    is_stream = GPS_PVT::Util::special_stream?(spec)
+  end
+  if is_stream || (!mode_r) then
+    GPS_PVT::Util::open(spec, mode_r ? 'r' : 'a+')
+  else
+    open(GPS_PVT::Util::get_txt(spec), 'r')
+  end
+}
 
 STDIN.binmode
 STDOUT.binmode

data/exe/gps_pvt

@@ -77,15 +77,10 @@ files.collect!{|fname, ftype|
   when /\.atx(?:\.Z)?$/; :antex
   when /\.clk$/; :rinex_clk
   end
-  fname = proc{
-    next fname if File::exist?(fname)
-    next fname if ((fname =~ Serial::SPEC) rescue false)
-    if uri = URI::parse(fname) and !uri.instance_of?(URI::Generic) then
-      ftype ||= uri.read_format if uri.instance_of?(URI::Ntrip)
-      next uri
-    end
-    raise "File not found: #{fname}"
-  }.call
+  if (!(uri = URI::parse(fname)).instance_of?(URI::Generic) rescue false) then
+    ftype ||= uri.read_format if uri.instance_of?(URI::Ntrip)
+    fname = uri
+  end
   raise "Format cannot be guessed, use --(format, ex. rinex_nav)=#{fname}" unless ftype
   [fname, ftype]
 }
@@ -137,10 +132,11 @@ files.each{|fname, ftype|
 }
 
 # other files
-files.each{|fname, ftype|
+files.collect{|fname, ftype|
   case ftype
-  when :ubx; rcv.parse_ubx(fname)
-  when :rinex_obs; rcv.parse_rinex_obs(fname)
-  when :rtcm3; rcv.parse_rtcm3(fname)
+  when :ubx; Thread::new{rcv.parse_ubx(fname)}
+  when :rinex_obs; Thread::new{rcv.parse_rinex_obs(fname)}
+  when :rtcm3; Thread::new{rcv.parse_rtcm3(fname)}
+  else; nil
   end
-}
+}.compact.each{|th| th.join}

data/lib/gps_pvt/receiver/rtcm3.rb

@@ -7,7 +7,7 @@ class Receiver
   def parse_rtcm3(src, opt = {}, &b)
     $stderr.print "Reading RTCM3 stream (%s) "%[src]
     require_relative '../rtcm3'
-    src_io = open(src)
+    src_io = Util::open(src)
     rtcm3 = GPS_PVT::RTCM3::new(src_io)
     ref_time = case (ref_time = opt[:ref_time])
     when GPS::Time; 

data/lib/gps_pvt/receiver.rb

@@ -460,7 +460,7 @@ class Receiver
     $stderr.print "Reading UBX file (%s) "%[ubx_fname]
     require_relative 'ubx'
   
-    ubx = UBX::new(open(ubx_fname))  
+    ubx = UBX::new(Util::open(ubx_fname))
     ubx_kind = Hash::new(0)
     
     after_run = b || proc{|pvt| puts pvt.to_s if pvt}

data/lib/gps_pvt/util.rb

@@ -23,14 +23,6 @@ proc{
     }
     def eof?; false; end
   }
-  module Kernel
-    open_orig = instance_method(:open)
-    define_method(:open){|*args, &b|
-      return open_orig.bind(self).call(*args, &b) unless Serial::SPEC =~ args[0]
-      Serial::new($1, $2 ? $2.to_i : 115200)
-    }
-    module_function(:open)
-  end
 }.call if require 'rubyserial'
 
 require 'open-uri'
@@ -41,7 +33,7 @@ class URI::Ntrip
     pnt_list = self.read_source_table(options).mount_points
     case pnt_list[self.mount_point][:format]
     when /u-?b(?:lo)?x/i; :ubx
-    when /RTCM 3/i; :rtcm3
+    when /RTCM ?3/i; :rtcm3
     else; nil
     end
   end
@@ -50,6 +42,24 @@ end
 module GPS_PVT
 module Util
   class << self
+    def special_stream?(spec)
+      ['-', (Serial::SPEC rescue nil)].compact.any?{|v| v === spec}
+    end
+    def open(*args, &b)
+      return args[0].open(*args[1..-1], &b) if args[0].respond_to?(:open)
+      case args[0].to_str
+      when (Serial::SPEC rescue nil)
+        return ((@serial_ports ||= {})[$1] ||= Serial::new($1, $2 ? $2.to_i : 115200))
+      when '-'
+        if (/^[wa]/ === args[1]) \
+            || (args[1].kind_of?(Integer) && ((File::Constants::WRONLY & args[1]) > 0)) then
+          return STDOUT
+        else
+          return STDIN
+        end
+      end rescue nil
+      super
+    end
     def inflate(src, type = :gz)
       case type
       when :gz
@@ -66,7 +76,7 @@ module Util
     end
     def get_txt(fname_or_uri)
       is_uri = fname_or_uri.kind_of?(URI)
-      (is_uri ? URI : Kernel).send(:open, fname_or_uri){|src|
+      open(fname_or_uri){|src|
         compressed = proc{
           case src.content_type
           when /gzip/; next :gz

data/lib/gps_pvt/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GPS_PVT
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
   
   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.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - fenrir(M.Naruoka)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyserial