gps_pvt 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39089e2daa55491ccf086809797c2fef68d1e0268e75e6217ed793f091e748de
-  data.tar.gz: cca39a3dbcca26921606019be603526f62766c841a92191ee0a99174f00b54c7
+  metadata.gz: 65f27faf8bc6c61e51bd06217b50fad55277e59278c687971a4b3bd83e218603
+  data.tar.gz: 3d56b37228725e36d0edc6e5b1a2a2d2a2f1b42305124aa1abec8280253a0c48
 SHA512:
-  metadata.gz: becc6540b82ff9d3a97b4b6c5e58f2a7b0872f63584abdee2c425860e1c47b07700f778550ab95bccb3fc7b6462f9fb2f6249ca7846d1a9a9319471e96577c55
-  data.tar.gz: 67b2b12b88df52a19e84ef68a7773f2ec989dec3858b5d64e0e60961f8f9f4154eda3e36ef1548b61004c8af4cc6b6850ba73c145f15da41832944857c904889
+  metadata.gz: 51de2010ed26249277bccac04f2297877b14772c66d406d7b02d81f425ebd4258c56bb8f7f6919ef04db678bae78e803058361509b0dde3c267fe3e454d47e77
+  data.tar.gz: 90f2ffc8892553c8cf381fbeec93dabb1458dbb841b1485df47cf4482a286e1c8f1e971bded03a71c0ddc37d82717ab2b63f34d3ea049a691de9188b02263950

data/README.md

@@ -150,11 +150,11 @@ receiver.solver.correction = { # provide by using a Hash
 
 ## Additional utilities
 
-### [to_ubx](exe/to_ubx)
+### [gps2ubx](exe/gps2ubx) <sub>(formerly [to_ubx](../../tree/v0.8.4/exe/to_ubx))</sub>
 
 Utility to convert observation into u-blox ubx format and dump standard input. After installation of gps_pvt, to type
 
-    $ to_ubx file_or_URI(s) (options) > out.ubx
+    $ 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.
 
@@ -163,6 +163,18 @@ saves resultant into out.ubx by using redirection. The shared options with gps_p
 | ubx_rawx |  | Change output packet types to UBX-RAWX from its default UBX-RAW. | v0.8.1 |
 | broadcast_data |  | In addition to observation, ephemeris is inserted by using UBX-SFRB packets. If ubx_rawx option is specified, UBX-SFRBX is used instead of UBX-SFRB. | v0.8.1 |
 
+### [gps_get](exe/gps_get)
+
+Utility to get and dump GPS files. After installation of gps_pvt, to type
+
+    $ gps_get file_or_URI(s) (options) > output_file
+
+saves data into output_file by using redirection. http(s), ftp, and ntrip can be used as scheme of URI. Serial port is also supported. Note that compressed data is automatically decompressed before output. The following options are available.
+
+| key | value | comment | since |
+----|----|----|----
+| out | file | Change output target from the standard output. In addition to file, serial port is supported. | v0.8.5 |
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake` to build library and run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/exe/gps_get

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+require 'gps_pvt/util'
+require 'uri'
+
+$stderr.puts <<__STRING__
+Usage: #{__FILE__} file_or_URI(s) ...
+This utility outputs GNSS data specified with file_or_URI(s).
+A file_or_URI having additional ".gz" or ".Z" extension is recognized as a compressed file, and the decompression is performed before output.
+In addition to a local file, major URIs such as http(s)://..., ftp://..., and ntrip:// are supported.
+Serial port (COMn for Windows, /dev/tty* for *NIX) is also acceptable as an input file name.
+__STRING__
+
+options = []
+
+files = ARGV.collect{|arg|
+  next arg unless arg =~ /^--([^=]+)=?/
+  k, v = [$1.downcase.to_sym, $']
+  options << [$1.to_sym, $']
+  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
+
+STDIN.binmode
+STDOUT.binmode
+dst, io_dst = proc{|spec| [spec, spec2io.call(spec, false)]}.call('-')
+
+options.reject!{|k, v|
+  case k
+  when :out
+    dst, io_dst = [v, spec2io.call(v, false)]
+    next true
+  end
+  false
+}
+raise "Unknown option: #{options.first}" unless options.empty?
+
+$stderr.puts "out: #{{'-' => '(stdout)'}[dst] || dst}"
+threads = files.collect{|src|
+  $stderr.puts "in: #{{'-' => '(stdin)'}[src] || src}"
+  io_src = spec2io.call(src)
+  Thread.start{
+    io_dst.write(io_src.read(128)) until io_src.eof?
+  }
+}
+threads.each{|t| t.join}

data/exe/gps_pvt

@@ -14,7 +14,8 @@ If you want to specify its format manually, command options like --rinex_nav=fil
 Other than --rinex_nav, --rinex_obs, -rinex_clk, --ubx, --sp3 or --antex are supported. 
 Supported RINEX versions are 2 and 3.
 A file having additional ".gz" or ".Z" extension is recognized as a compressed file.
-Major URL such as http(s)://... or ftp://..., and serial port (COMn for Windows, /dev/tty* for *NIX) is acceptable as an input file name.
+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.
 __STRING__
 
 options = []

data/lib/gps_pvt/ntrip.rb

@@ -44,6 +44,20 @@ class Ntrip < Net::HTTP
         :type, :identifier, :operator, :authentication, :fee,
         :web_net, :web_str, :web_reg],
   }
+  module MountPoints
+    [:select, :reject, :merge, :clone, :dup].each{|f|
+      define_method(f){|*args, &b| super(*args, &b).extend(MountPoints)}
+    }
+    D2R = Math::PI / 180
+    def near_from(lat_deg, lng_deg)
+      require 'gps_pvt/Coordinate'
+      llh0 = Coordinate::LLH::new(D2R * lat_deg, D2R * lng_deg, 0)
+      collect{|pt, prop|
+        llh = Coordinate::LLH::new(*([:latitude, :longitude].collect{|k| D2R * prop[k].to_f} + [0]))
+        [llh0.xyz.dist(llh.xyz), prop]
+      }.sort{|a, b| a[0] <=> b[0]} # return [distance, property]
+    end
+  end
   def Ntrip.parse_source_table(str)
     res = {}
     str.lines.each{|line|
@@ -55,11 +69,11 @@ class Ntrip < Net::HTTP
       entry[:misc] = values[(keys.size)..-1] if values.size > keys.size
       (res[type] ||= []) << entry
     }
-    res.define_singleton_method(:mount_points){
+    res.define_singleton_method(:mount_points, lambda{
       Hash[*((self[:STR] || []).collect{|entry|
         [entry[:mountpoint], entry]
-      }.flatten(1))]
-    }
+      }.flatten(1))].extend(MountPoints)
+    })
     res
   end
   def generate_request(path, header)

data/lib/gps_pvt/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GPS_PVT
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
   
   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.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - fenrir(M.Naruoka)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyserial
@@ -71,8 +71,9 @@ description: This module calculate PVT by using raw observation obtained from a
 email:
 - fenrir.naru@gmail.com
 executables:
+- gps2ubx
+- gps_get
 - gps_pvt
-- to_ubx
 extensions:
 - ext/gps_pvt/extconf.rb
 extra_rdoc_files: []
@@ -86,8 +87,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/gps2ubx
+- exe/gps_get
 - exe/gps_pvt
-- exe/to_ubx
 - ext/gps_pvt/Coordinate/Coordinate_wrap.cxx
 - ext/gps_pvt/GPS/GPS_wrap.cxx
 - ext/gps_pvt/SylphideMath/SylphideMath_wrap.cxx