gps_pvt 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3484f0e37e7c00f141b306449a90c6ccf3496a886d8c3c08b0a0506fabe5d6f6
-  data.tar.gz: c36df1d120c8d4310e0aad76627ba68763a6b5892bf44ae081dbd7745f962907
+  metadata.gz: 940d644f51b5c4195a040d31bbc9ae7ab162ef90f1d55deafc651f024e17c8a7
+  data.tar.gz: f4e4669b798d7774595ae3fa6a18099b62b8290862f1e0e72584bec20e77d2fb
 SHA512:
-  metadata.gz: 49a7adb9bbe3f47513bc9f19e1a99ee50615c7b6b7d2377dad9ab1c8388335517b893a899da0ea33d781797256481f25328fd72e3da0e5398f9e155475232580
-  data.tar.gz: b4c64dacb8051345e3f370c7bb69f1d0decd6f4715826a319aadad3785f629ecf07facfc54248f290230fbc9d29a2d5889befeea06971f15a7a4fa7c91d832f7
+  metadata.gz: f64a9e456f5b9f88f471e26d1d47414e8bb5f9d7c64bf68b19b10cda6a53f8335379f13557bf214b8fd917807e2cd317cc86131bafd7ba32911f0dfa45460023
+  data.tar.gz: e3f9f700aa9a4f7aab686f0eb671c76d1ce795fca54cd662a624d24de2515b3e667b382219e90238e514c0527351f4422dcb0171b49d98a3f1d8fe934c936064

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), 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:
+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). A-GPS to get ephemeris quickly is supported via special URI like ```supl://supl.google.com/``` (version >= 0.10.0). If you want to specify the file format, instead of file_or_URI(s), use the following arguments:
 
 | specification | recoginized as |
 ----|----
@@ -43,6 +43,7 @@ The format of file is automatically determined with its extension, such as .ubx
 | --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). (supported gps_pvt version >= 0.9.0) The latest version uses message type Observation(GPS: 1001..1004; GLONASS: 1009..1012), Epehemris(GPS: 1019; GLOANSS: 1020; SBAS: 1043; QZSS: 1044), MSM(GPS: 1071..1077; GLONASS: 1081..1087; SBAS: 1101..1107; QZSS: 1111..1117) |
+| <a name=opt_supl>--supl=URI</a> | [SUPL, secure user plane location](https://www.openmobilealliance.org/release/SUPL/). (supported gps_pvt version >= 0.10.0) Both [LPP](https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=3710)(default) and [RRLP](https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=2688) are internally used, which can be manually selected by adding ```?protocol=lpp_or_rrlp``` URI query string. |
 
 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
 
@@ -157,7 +158,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), [rtcm3](#opt_rtcm3) 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), [supl](#opt_supl) and [online_ephemeris](#opt_online_ephemeris). In addition, the following options are available.
 
 | key | value | comment | since |
 ----|----|----|----
@@ -170,7 +171,7 @@ 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.
+saves data into output_file by using redirection. http(s), ftp, ntrip, and supl 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 |
 ----|----|----|----

data/Rakefile

@@ -107,6 +107,23 @@ task :swig do
   }
 end
 
+desc "Update upl.json.gz by using upl/*.asn"
+task "upl.json" do
+  parser_dir = File::join(File::dirname(__FILE__), 'lib', 'gps_pvt', 'asn1')
+  upl_dir = File::join(parser_dir, '..', 'upl')
+  upl_files = Dir::glob(File::join(upl_dir, '*.asn'))
+  chdir(parser_dir){
+    sh [:racc, 'asn1.y', '--debug'].join(' ')
+    require 'zlib'
+    Zlib::GzipWriter.wrap(open(File::join(upl_dir, 'upl.json.gz'), 'w')){|gz|
+      json_str = `#{['ruby', 'asn1.tab.rb', *upl_files].join(' ')}`
+      puts "generating JSON => #{json_str.gsub(/\s+/, ' ').slice(0, 100)} ... " 
+      gz.write json_str
+    }
+    remove_file('asn1.tab.rb')
+  }
+end
+
 file "ext/ninja-scan-light/tool" do |t|
   Rake::Task["git:submodules:init"].invoke
 end
@@ -116,6 +133,6 @@ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
         Dir::glob(File::join(File::dirname(__FILE__), '*.gemspec')).first).homepage
   config.user = $1
   config.project = $2
-end if require 'github_changelog_generator/task'
+end if (begin; require 'github_changelog_generator/task'; rescue Exception; false; end)
 
 task :default => ["ext/ninja-scan-light/tool", :compile, :spec]

data/exe/gps2ubx

@@ -17,7 +17,8 @@ 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.
-Ntrip specified in URI as ntrip://(username):(password)@(caster_host):(port)/(mount_point) is also supported, and its format is automatically detected. 
+Ntrip specified in URI as ntrip://(username):(password)@(caster_host):(port)/(mount_point) is also supported, and its format is automatically detected.
+Assisted GPS by using SUPL (Secure user plane location) is also supported by using supl://(host) URI. 
 __STRING__
 
 options = []
@@ -44,7 +45,10 @@ files.collect!{|fname, ftype|
   when /\.ubx$/; :ubx
   end
   if (!(uri = URI::parse(fname)).instance_of?(URI::Generic) rescue false) then
-    ftype ||= uri.read_format if uri.instance_of?(URI::Ntrip)
+    ftype ||= case uri
+    when URI::Ntrip; uri.read_format
+    when URI::Supl; :supl
+    end
     fname = uri
   end
   raise "Format cannot be guessed, use --(format, ex. rinex_obs)=#{fname}" unless ftype
@@ -69,6 +73,7 @@ rcv = GPS_PVT::Receiver::new(options)
 obs = Queue::new
 rcv.define_singleton_method(:run){|meas, t_meas, *args|
   obs << [t_meas, meas]
+  nil
 }
 
 proc{|src|
@@ -86,22 +91,24 @@ proc{
   }
 }.call
 
-# parse RINEX NAV
+# parse RINEX NAV first
 files.each{|fname, ftype|
   case ftype
   when :rinex_nav; rcv.parse_rinex_nav(fname)
   end
 }
 
-# other files
+# then, other files
 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){}}
+  when :supl; proc{rcv.parse_supl(fname)}
+  when :rinex_nav; proc{}
   end
   case fname
-  when URI::Ntrip; Thread::new(&task)
+  when URI::Ntrip, URI::Supl; Thread::new(&task)
   else; task.call; nil
   end
 }.compact

data/exe/gps_pvt

@@ -11,11 +11,12 @@ 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, --antex or --rtcm3 are supported. 
+In addition to --rinex_nav, --rinex_obs, --rinex_clk, --ubx, --sp3, --antex, --rtcm3, and --supl 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, and its format is automatically detected.
+Assisted GPS by using SUPL (Secure user plane location) is also supported by using supl://(host) URI.
 __STRING__
 
 options = []
@@ -78,7 +79,10 @@ files.collect!{|fname, ftype|
   when /\.clk$/; :rinex_clk
   end
   if (!(uri = URI::parse(fname)).instance_of?(URI::Generic) rescue false) then
-    ftype ||= uri.read_format if uri.instance_of?(URI::Ntrip)
+    ftype ||= case uri
+    when URI::Ntrip; uri.read_format
+    when URI::Supl; :supl
+    end
     fname = uri
   end
   raise "Format cannot be guessed, use --(format, ex. rinex_nav)=#{fname}" unless ftype
@@ -137,6 +141,7 @@ files.collect{|fname, ftype|
   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)}
+  when :supl; Thread::new{rcv.parse_supl(fname)}
   else; nil
   end
 }.compact.each{|th| th.join}

data/gps_pvt.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  #spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGELOG.md"
+  #spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/-/CHANGELOG.md"
     
   spec.extensions = ["ext/gps_pvt/extconf.rb"]
 
@@ -63,7 +63,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "matrix" if GPS_PVT::version_compare(RUBY_VERSION, "3.1") >= 0
-  spec.add_development_dependency "github_changelog_generator"
+  spec.add_development_dependency "racc"
+  spec.add_development_dependency "github_changelog_generator" unless ((Gem::Platform.local.os =~ /mingw/) && (GPS_PVT::version_compare(RUBY_VERSION, "3.1") >= 0))
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html