gps_pvt 0.1.7 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05eabd6a7d771c772d6146722153e6ae2e9292ed9f41892e8285a2aa7d2f4ee
-  data.tar.gz: e8566da7fc64f0f330771ee8420bef47dfd819ae703d5ef46fe0bcf310ddf11f
+  metadata.gz: b6820c87f08dcf6c64e70d304c634b32c1bea265d6f360fc79c8c9405822569a
+  data.tar.gz: 75b9db05a1c23827fc9e1163b476f4e3293a7d09efbf4a9a1cd9636dda7387bd
 SHA512:
-  metadata.gz: 56054b607dc23efa2826f02ab117fc07080e447a3775215ea642aa4e77f481929ec0f8d66a4634c873cb453c9a5e9fc36fe73c528c361e50aaa844ebf385506f
-  data.tar.gz: 4d47da0ba28881434c03ef1eb270c5d3e20dc17e5abbb222bb076ae2c2c8295a973b38764e7616e6f4adcd102904ed21389397a52ec3f91853c938e98464248e
+  metadata.gz: f22eb60b17dc0bbd6a8c249deedd39e0fa5ec179bf28abb5c36cdf4191d79219af0dd456af93e8432f93173d07e42debdef11cdcdf6c9327395c38535c7d8de5
+  data.tar.gz: a7643df74fd9947d07383353d4cdf860b45494b13e2c332ccb2176a771112acd3887a9a8dc95e62ad8f97841506cceaccb79d8ba990dc6148aeb66efc07f51a3

data/README.md

@@ -31,6 +31,16 @@ For user who just generate PVT solution, an attached executable is useful. After
 
     $ gps_pvt RINEX_or_UBX_file(s)
 
+The format of RINEX_or_UBX_file is automatically determined with its extention, such as .ubx will be treated as UBX format. If you want to specify the file format, instead of RINEX_or_UBX_file(s), use the following arguments:
+
+    --rinex_nav=filename
+    --rinex_obs=filename
+    --ubx=filename
+
+From version 0.2.0, SBAS and QZSS are supported in addition to GPS. QZSS ranging is activated in default, however, SBAS is just utilized for ionospheric correction. If you want to activate SBAS ranging, "--with=(SBAS PRN number, ex. 137)" option is used with gps_pvt executable like
+
+    $ gps_pvt --with=137 RINEX_or_UBX_file(s)
+
 For developer, this library will be used in the following:
 
 ```ruby
@@ -75,9 +85,10 @@ receiver.parse_rinex_obs(rinex_obs_file){|pvt, meas| # per epoch
 receiver.solver.gps_options.exclude(prn) # Exclude satellite; the default is to use every satellite if visible
 receiver.solver.gps_options.include(prn) # Discard previous setting of exclusion
 receiver.solver.gps_options.elevation_mask = Math::PI / 180 * 10 # example 10 [deg] elevation mask
-receiver.solver.hooks[:relative_property] = proc{|prn, rel_prop, rcv_e, t_arv, usr_pos, usr_vel|
+receiver.solver.hooks[:relative_property] = proc{|prn, rel_prop, meas, rcv_e, t_arv, usr_pos, usr_vel|
   # control weight per satellite per iteration
   weight, range_c, range_r, rate_rel_neg, *los_neg = rel_prop # relative property
+  # meas is measurement represented by pseudo range of the selected satellite.
   # rcv_e, t_arv, usr_pos, usr_vel are temporary solution of 
   # receiver clock error [m], time of arrival [s], user position and velocity in ECEF, respectively.
   
@@ -94,7 +105,7 @@ receiver.solver.hooks[:relative_property] = proc{|prn, rel_prop, rcv_e, t_arv, u
   alias_method(:run_orig, :run)
   define_method(:run){|meas, t_meas, &b|
     meas # observation, same as the 2nd argument of parse_XXX
-    receiver.solver.hooks[:relative_property] = proc{|prn, rel_prop, rcv_e, t_arv, usr_pos, usr_vel|
+    receiver.solver.hooks[:relative_property] = proc{|prn, rel_prop, meas, rcv_e, t_arv, usr_pos, usr_vel|
       # Do something based on meas, t_meas.
       rel_prop
     }

data/Rakefile

@@ -30,6 +30,8 @@ namespace :git do
           "sparse-checkout set" + (<<-__SPARSE_PATTERNS__).lines.collect{|str| str.chomp.gsub(/^ */, ' ')}.join,
             /tool/param/
             /tool/navigation/GPS*
+            /tool/navigation/SBAS*
+            /tool/navigation/QZSS*
             /tool/navigation/coordinate.h
             /tool/navigation/EGM.h
             /tool/navigation/MagneticField.h

data/exe/gps_pvt

@@ -6,41 +6,50 @@ require 'gps_pvt'
 
 $stderr.puts <<__STRING__
 Usage: #{__FILE__} GPS_file1 GPS_file2 ...
-As GPS_file, rinex_nav(*.YYn), rinex_obs(*.YYo), and ubx(*.ubx) format are currently supported.
+As GPS_file, rinex_nav(*.YYn, *.YYh, *.YYq), rinex_obs(*.YYo), and ubx(*.ubx) format are currently supported.
 File format is automatically determined based on its extention described in above parentheses.
+If you want to specify its format manually, --rinex_(nav|obs)=file_name or --ubx=file_name are available.
+Supported RINEX versions are 2 and 3.
 Note: YY = last two digit of year.
 __STRING__
 
-options = {}
-
-# check options
-ARGV.reject!{|arg|
-  next false unless arg =~ /^--([^=]+)=?/
-  options[$1.to_sym] = $'
-  true
-}
-
-# Check file existence
-ARGV.each{|arg|
-  raise "File not found: #{arg}" unless File::exist?(arg)
+options = []
+
+# check options and file format
+files = ARGV.collect{|arg|
+  next [arg, nil] unless arg =~ /^--([^=]+)=?/
+  k, v = [$1.downcase.to_sym, $']
+  next [v, k] if [:rinex_nav, :rinex_obs, :ubx].include?(k) # file type
+  options << [$1.to_sym, $']
+  nil
+}.compact
+
+# Check file existence and extension
+files.collect!{|fname, ftype|
+  raise "File not found: #{fname}" unless File::exist?(fname)
+  ftype ||= case fname
+  when /\.\d{2}[nhq]$/; :rinex_nav
+  when /\.\d{2}o$/; :rinex_obs
+  when /\.ubx$/; :ubx
+  else
+    raise "Format cannot be guessed, use --(format, ex. rinex_nav)=#{fname}"
+  end
+  [fname, ftype]
 }
 
 rcv = GPS_PVT::Receiver::new(options)
 
-puts GPS_PVT::Receiver::header
+puts rcv.header
 
 # parse RINEX NAV
-ARGV.reject!{|arg|
-  next false unless arg =~ /\.\d{2}n$/
-  rcv.parse_rinex_nav(arg)
+files.each{|fname, ftype|
+  rcv.parse_rinex_nav(fname) if ftype == :rinex_nav
 }
 
 # other files
-ARGV.each{|arg|
-  case arg
-  when /\.ubx$/
-    rcv.parse_ubx(arg)
-  when /\.\d{2}o$/
-    rcv.parse_rinex_obs(arg)
+files.each{|fname, ftype|
+  case ftype
+  when :ubx; rcv.parse_ubx(fname)
+  when :rinex_obs; rcv.parse_rinex_obs(fname)
   end
 }

data/ext/gps_pvt/Coordinate/Coordinate_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1612,6 +1612,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1872,7 +1874,7 @@ static VALUE mCoordinate;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2205,7 +2207,7 @@ SWIG_ruby_failed(VALUE SWIGUNUSEDPARM(arg1), VALUE SWIGUNUSEDPARM(arg2))
 } 
 
 
-/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;