gps_pvt 0.8.5 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f27faf8bc6c61e51bd06217b50fad55277e59278c687971a4b3bd83e218603
-  data.tar.gz: 3d56b37228725e36d0edc6e5b1a2a2d2a2f1b42305124aa1abec8280253a0c48
+  metadata.gz: a75bed6b9453e7fe5b435eb2c10bd82e7c736654b6d34461368b79274ee223e3
+  data.tar.gz: 55577769f09988ce63809f52b14a82bfa7fd958f68547f36263647b147559831
 SHA512:
-  metadata.gz: 51de2010ed26249277bccac04f2297877b14772c66d406d7b02d81f425ebd4258c56bb8f7f6919ef04db678bae78e803058361509b0dde3c267fe3e454d47e77
-  data.tar.gz: 90f2ffc8892553c8cf381fbeec93dabb1458dbb841b1485df47cf4482a286e1c8f1e971bded03a71c0ddc37d82717ab2b63f34d3ea049a691de9188b02263950
+  metadata.gz: 01c350f1e321119d0b4693a9b96bc99003b92e37783cdc53f0779e02111ec880d2b26e30e1f1ccec81faaaca16d730b8e17a5d24eb9bacd2934fe0ffaf083284
+  data.tar.gz: 6cab5c290099b0dd7604940822c9399dc93d7656651fe4c38003202745c8b5f561c68cb452ece7c2d9b35740d7621b47e809341cec2228d3551e3238e2648c23

data/README.md

@@ -32,7 +32,7 @@ An attached executable is useful. After installation, type
 
     $ gps_pvt file_or_URI(s)
 
-The format of file is automatically determined with its extension, such as .ubx will be treated as UBX format. A compressed file of .gz or .Z can be specified directly (decompression is internally performed). URI such as http(s)://... and ftp://, and serial port (COMn for Windows and /dev/tty* for *NIX, version >= 0.8.0) are also acceptable. Moreover, Ntrip URI of ntrip://(username):(password)@(caster_host):(port)/(mount_point), for exmaple, ```ntrip://test%40example.com:none@rtk2go.com:2101/NAIST-UBX``` (%40 is recognized as '@') is supported (version >= 0.8.4). If you want to specify the file format, instead of file_or_URI(s), use the following arguments:
+The format of file is automatically determined with its extension, such as .ubx will be treated as UBX format. A compressed file of .gz or .Z can be specified directly (decompression is internally performed). URI such as http(s)://... and ftp://, and serial port (COMn for Windows and /dev/tty* for *NIX, version >= 0.8.0) are also acceptable. Moreover, Ntrip URI of ntrip://(username):(password)@(caster_host):(port)/(mount_point), for exmaple, ```ntrip://test%40example.com:none@rtk2go.com:2101/NAIST-UBX``` (%40 is recognized as '@') is supported (version >= 0.8.4), and its content format can be automatically determined (version >= 0.9.0). If you want to specify the file format, instead of file_or_URI(s), use the following arguments:
 
 | specification | recoginized as |
 ----|----
@@ -42,6 +42,7 @@ The format of file is automatically determined with its extension, such as .ubx
 | --sp3=file_or_URI | [Standard Product 3 Orbit Format](https://files.igs.org/pub/data/format/sp3c.txt) (supported gps_pvt version >= 0.6.0) |
 | --antex=file_or_URI | [Antenna Exchange Format](https://igs.org/wg/antenna#files) (supported gps_pvt version >= 0.6.0) |
 | --rinex_clk=file_or_URI | [RINEX clock](https://files.igs.org/pub/data/format/rinex_clock304.txt) file (supported gps_pvt version >= 0.7.0) |
+| <a name=opt_rtcm3>--rtcm3=file_or_URI</a> | [RTCM 10403.x](https://rtcm.myshopify.com/collections/differential-global-navigation-satellite-dgnss-standards), ephemeris and MSM7 are used. (supported gps_pvt version >= 0.9.0) |
 
 Since version 0.2.0, SBAS and QZSS are supported in addition to GPS. Since version 0.4.0, GLONASS is also available. QZSS ranging is activated in default, however, SBAS is just utilized for ionospheric correction. GLONASS is also turned off by default. If you want to activate SBAS or GLONASS ranging, "--with=(system or PRN)" options are used with gps_pvt executable like
 
@@ -156,7 +157,7 @@ Utility to convert observation into u-blox ubx format and dump standard input. A
 
     $ gps2ubx file_or_URI(s) (options) > out.ubx
 
-saves resultant into out.ubx by using redirection. The shared options with gps_pvt executable are [rinex_obs](#opt_rinex_obs), [rinex_nav](#opt_rinex_nav), [ubx](#opt_ubx), and [online_ephemeris](#opt_online_ephemeris). In addition, the following options are available.
+saves resultant into out.ubx by using redirection. The shared options with gps_pvt executable are [rinex_obs](#opt_rinex_obs), [rinex_nav](#opt_rinex_nav), [ubx](#opt_ubx), [rtcm3](#opt_rtcm3) and [online_ephemeris](#opt_online_ephemeris). In addition, the following options are available.
 
 | key | value | comment | since |
 ----|----|----|----

data/exe/gps2ubx

@@ -9,14 +9,15 @@ require 'gps_pvt/ubx'
 
 $stderr.puts <<__STRING__
 Usage: #{__FILE__} GPS_file ... > as_you_like.ubx
-As GPS_file, only rinex_obs(*.YYo) is currently supported.
+As GPS_file, rinex_obs(*.YYo) and rtcm3 stream are supported.
 (YY = last two digit of year)
 File format is automatically determined based on its extention described in above parentheses.
 If you want to specify its format manually, command options like --rinex_obs=file_name are available.
 Supported RINEX versions are 2 and 3.
 RXM-RAWX and RXM-SFRBX are included in output UBX if corresponding file(s) is given. 
 A file having additional ".gz" or ".Z" extension is recognized as a compressed file.
-Major URL such as http(s)://... or ftp://... is acceptable as an input file name. 
+Major URL such as http(s)://... or ftp://... is acceptable as an input file name.
+Ntrip specified in URI as ntrip://(username):(password)@(caster_host):(port)/(mount_point) is also supported, and its format is automatically detected. 
 __STRING__
 
 options = []
@@ -30,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
@@ -41,16 +42,12 @@ files.collect!{|fname, ftype|
   when /\.\d{2}[nhqg](?:\.gz)?$/; :rinex_nav
   when /\.\d{2}o(?:\.gz)?$/; :rinex_obs
   when /\.ubx$/; :ubx
-  else
-    raise "Format cannot be guessed, use --(format, ex. rinex_obs)=#{fname}"
   end
-  fname = proc{
-    next fname if File::exist?(fname)
-    if uri = URI::parse(fname) and !uri.instance_of?(URI::Generic) then
-      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]
 }
 
@@ -69,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]
 }
@@ -97,14 +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){}
+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{
@@ -366,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

@@ -11,11 +11,11 @@ As GPS_file, rinex_nav(*.YYn, *.YYh, *.YYq, *.YYg), rinex_obs(*.YYo), ubx(*.ubx)
 (YY = last two digit of year)
 File format is automatically determined based on its extention described in above parentheses.
 If you want to specify its format manually, command options like --rinex_nav=file_name are available.
-Other than --rinex_nav, --rinex_obs, -rinex_clk, --ubx, --sp3 or --antex are supported. 
+Other than --rinex_nav, --rinex_obs, --rinex_clk, --ubx, --sp3, --antex or --rtcm3 are supported. 
 Supported RINEX versions are 2 and 3.
 A file having additional ".gz" or ".Z" extension is recognized as a compressed file.
 Major URI such as http(s)://... or ftp://..., and serial port (COMn for Windows, /dev/tty* for *NIX) is acceptable as an input file name.
-Ntrip specified in URI as ntrip://(username):(password)@(caster_host):(port)/(mount_point) is also supported.
+Ntrip specified in URI as ntrip://(username):(password)@(caster_host):(port)/(mount_point) is also supported, and its format is automatically detected.
 __STRING__
 
 options = []
@@ -25,7 +25,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, :ubx, :sp3, :antex, :rinex_clk].include?(k) # file type
+  next [v, k] if [:rinex_nav, :rinex_obs, :ubx, :sp3, :antex, :rinex_clk, :rtcm3].include?(k) # file type
   options << [$1.to_sym, $']
   nil
 }.compact
@@ -76,17 +76,12 @@ files.collect!{|fname, ftype|
   when /\.sp3(?:\.Z)?$/; :sp3
   when /\.atx(?:\.Z)?$/; :antex
   when /\.clk$/; :rinex_clk
-  else
-    raise "Format cannot be guessed, use --(format, ex. rinex_nav)=#{fname}"
   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
-      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,9 +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 :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}