gps_pvt 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ae7a4026e4f061c13eda89c325a64eba31907fc358433104a8f8bb2b185be4a
-  data.tar.gz: 2271e46713a750224bb700292552d670d7a3f483c3f6499b8fc719f686e3a88a
+  metadata.gz: 8059818f19a2c05d02838cdadc8e4c80f8587cc1d820cef940a1bd9c3c07e734
+  data.tar.gz: 65e9a8dddcf5a9f8ce3e434e19438401565f445f141c6ba1ba139b83631032fa
 SHA512:
-  metadata.gz: 69b901d4cd1b31c72423acfe0e6e2185a44c5df4b2eae7f6969e9525dec9cb807bab49fd1e1ae1e05c582b596cd0ebdbf0738d2cdbdc42fe87a4c2feb9510be5
-  data.tar.gz: 8bec3d3eac56beb25895dcdae4ffa084acf4967ae6c9b06b5234574bcca7197cdc01937ec27ef4547013e0bdd4b3e1e5e69a8f7494d1052d4bfc0b6cd47fba06
+  metadata.gz: f06f11c40ed2ab98a0c275df92e92a130aefefb2c6632fe2dcdb9f22021124f3082c176f84a9dcdf754896ae6fe1313bc42f3c5180a3ad44f689ebeab40349ae
+  data.tar.gz: 4f2011f3b622ca7ba2e3d0b0dcb809fceeac9f7afaa23e45fe48d452f686675c3281ba220251491b667577d8dea4a0fccdc75d2c02736c22538d0630c5178f2c

data/ext/ninja-scan-light/tool/navigation/RINEX.h

@@ -846,29 +846,37 @@ class RINEX_NAV_Reader : public RINEX_Reader<> {
       int year, month, day;
       FloatT tau_c_neg, tau_GPS; // TODO check tau_GPS polarity
       int leap_sec;
+      int flags;
+      enum {
+        TAU_C_NEG = 0x01,
+        TAU_GPS   = 0x02,
+        LEAP_SEC  = 0x04,
+      };
     };
     static const typename super_t::convert_item_t t_corr_glonass_v2[4];
 
     bool extract_t_corr_glonass_v2(t_corr_glonass_t &t_corr_glonass) const {
-      bool utc, leap;
+      t_corr_glonass.flags = 0;
       super_t::header_t::const_iterator it;
 
-      if(utc = ((it = _header.find("CORR TO SYSTEM TIME")) != _header.end())){
+      if((it = _header.find("CORR TO SYSTEM TIME")) != _header.end()){
         super_t::convert(t_corr_glonass_v2, it->second.front(), &t_corr_glonass);
+        t_corr_glonass.flags |= t_corr_glonass_t::TAU_C_NEG;
       }
 
-      if(leap = ((it = _header.find("LEAP SECONDS")) != _header.end())){
+      if((it = _header.find("LEAP SECONDS")) != _header.end()){
         iono_utc_t iono_utc;
         super_t::convert(utc_leap_v2, it->second.front(), &iono_utc);
         t_corr_glonass.leap_sec = iono_utc.delta_t_LS;
+        t_corr_glonass.flags |= t_corr_glonass_t::LEAP_SEC;
       }
 
-      return utc && leap;
+      return t_corr_glonass.flags > 0;
     }
 
     bool extract_t_corr_glonass_v3(t_corr_glonass_t &t_corr_glonass) const {
       iono_utc_t iono_utc;
-      bool utc(false), leap(false);
+      t_corr_glonass.flags = 0;
       typedef super_t::header_t::const_iterator it_t;
       typedef super_t::header_t::mapped_type::const_iterator it2_t;
 
@@ -880,11 +888,12 @@ class RINEX_NAV_Reader : public RINEX_Reader<> {
             super_t::convert(utc_v3, *it2, &iono_utc);
             t_corr_glonass.year = t_corr_glonass.month = t_corr_glonass.day = 0;
             t_corr_glonass.tau_c_neg = iono_utc.A0;
+            t_corr_glonass.flags |= t_corr_glonass_t::TAU_C_NEG;
           }else if(it2->find("GLGP") != it2->npos){
             super_t::convert(utc_v3, *it2, &iono_utc);
             t_corr_glonass.tau_GPS = iono_utc.A0;
+            t_corr_glonass.flags |= t_corr_glonass_t::TAU_GPS;
           }
-          utc = true;
         }
       }
 
@@ -895,10 +904,10 @@ class RINEX_NAV_Reader : public RINEX_Reader<> {
           super_t::convert(utc_leap_v2, it->second.front(), &iono_utc);
         }
         t_corr_glonass.leap_sec = iono_utc.delta_t_LS;
-        leap = true;
+        t_corr_glonass.flags |= t_corr_glonass_t::LEAP_SEC;
       }
 
-      return utc && leap;
+      return t_corr_glonass.flags > 0;
     }
 
     struct space_node_list_t {
@@ -955,8 +964,11 @@ class RINEX_NAV_Reader : public RINEX_Reader<> {
             typename message_glonass_t::eph_t eph0(reader.msg_glonass);
             eph0.tau_c = -t_corr_glonass.tau_c_neg;
             eph0.tau_GPS = t_corr_glonass.tau_GPS;
-            typename GLONASS_SpaceNode<FloatT>
-                ::SatelliteProperties::Ephemeris_with_GPS_Time eph(eph0, t_corr_glonass.leap_sec);
+            typename GLONASS_SpaceNode<FloatT>::SatelliteProperties::Ephemeris_with_GPS_Time eph(
+                eph0,
+                (t_corr_glonass.flags & t_corr_glonass_t::LEAP_SEC)
+                   ? t_corr_glonass.leap_sec
+                   : GPS_Time<FloatT>::guess_leap_seconds(reader.msg_glonass.date_tm));
             space_nodes.glonass->satellite(reader.msg_glonass.svid).register_ephemeris(eph);
             res++;
             break;

data/ext/ninja-scan-light/tool/navigation/SP3.h

@@ -770,6 +770,11 @@ class SP3_Reader {
         dst_t &dst;
         int &res;
         epoch_t epoch;
+        enum {
+          TS_UNKNOWN,
+          TS_GPS,
+          TS_UTC
+        } time_system;
         struct pv_t {
           position_clock_t pos;
           velocity_rate_t vel;
@@ -777,12 +782,15 @@ class SP3_Reader {
         };
         typedef std::map<int, pv_t> entries_t;
         entries_t entries;
-        buf_t(dst_t &dst_, int &res_) : dst(dst_), res(res_), entries(){
+        buf_t(dst_t &dst_, int &res_) : dst(dst_), res(res_), time_system(TS_UNKNOWN), entries(){
           epoch.symbols[0] = 0;
         }
         void flush(){
           if(!epoch.symbols[0]){return;}
           GPS_Time<FloatT> gpst(epoch);
+          if(time_system == TS_UTC){
+            gpst += GPS_Time<FloatT>::guess_leap_seconds(gpst);
+          }
           for(typename entries_t::const_iterator it(entries.begin()), it_end(entries.end());
               it != it_end; ++it){
             if(it->second.pos.symbol[0]){
@@ -807,6 +815,14 @@ class SP3_Reader {
       while(src.has_next()){
         parsed_t parsed(src.parse_line());
         switch(parsed.type){
+          case parsed_t::L21_22: // check time system
+            if(buf.time_system != buf_t::TS_UNKNOWN){break;}
+            if(std::strncmp(parsed.item.l21_22.time_system, "GPS", 3) == 0){
+              buf.time_system = buf_t::TS_GPS;
+            }else if(std::strncmp(parsed.item.l21_22.time_system, "UTC", 3) == 0){
+              buf.time_system = buf_t::TS_UTC;
+            }
+            break;
           case parsed_t::EPOCH:
             buf.flush();
             buf.epoch = parsed.item.epoch;

data/lib/gps_pvt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GPS_PVT
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gps_pvt
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - fenrir(M.Naruoka)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake