gps_pvt 0.6.3 → 0.7.1

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

@@ -0,0 +1,458 @@
+/*
+ * Copyright (c) 2022, M.Naruoka (fenrir)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * - Neither the name of the naruoka.org nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/** @file
+ * @brief Loader of RINEX Clock extension, support versions are 3 including 3.04
+ */
+
+#ifndef __RINEX_CLOCK__
+#define __RINEX_CLOCK__
+
+#include <cstring>
+#include <cctype>
+#include <string>
+
+#include "RINEX.h"
+#include "GPS.h"
+#include "algorithm/interpolate.h"
+#include "GPS_Solver_Base.h"
+
+template <class FloatT>
+struct RINEX_CLK {
+  struct record_t {
+    char type[2], name[9];
+    std::tm epoch;
+    int epoch_year4, epoch_mon12;
+    FloatT epoch_sec;
+    int items_followed;
+    bool valid[6];
+    union {
+      FloatT array[6];
+      struct {
+        FloatT bias, bias_sigma, rate, rate_sigma, acc, acc_sigma;
+      } v;
+    } values;
+
+    GPS_Time<FloatT> get_epoch() const {
+      return GPS_Time<FloatT>(epoch) + (epoch_sec - epoch.tm_sec);
+    }
+    record_t &set_epoch(const GPS_Time<FloatT> &t){
+      epoch = t.c_tm();
+      epoch_year4 = epoch.tm_year + 1900;
+      epoch_mon12 = epoch.tm_mon + 1;
+      epoch_sec = std::fmod(t.seconds, 60);
+      return *this;
+    }
+
+    std::string get_name() const {
+      std::string res;
+      for(std::size_t i(0); i < sizeof(name); ++i){
+        if(!std::isgraph(name[i])){break;}
+        res.push_back(name[i]);
+      }
+      return res;
+    }
+    record_t &set_name(const std::string &str){
+      std::memset(name, ' ', sizeof(name));
+      str.copy(name, str.size() > sizeof(name) ? sizeof(name) : str.size());
+      return *this;
+    }
+  };
+
+  struct per_node_t {
+    std::map<GPS_Time<FloatT>, FloatT> bias;
+    typedef InterpolatableSet<GPS_Time<FloatT>, FloatT, FloatT> interpolator_t;
+    static const typename interpolator_t::condition_t interpolator_cnd_default;
+    mutable struct {
+      interpolator_t bias;
+    } subset;
+    bool precheck(const GPS_Time<FloatT> &t) const {
+      subset.bias.update(t, bias, interpolator_cnd_default);
+      return subset.bias.ready;
+    }
+    FloatT clock_error(const GPS_Time<FloatT> &t) const {
+      return subset.bias.update(t, bias, interpolator_cnd_default).interpolate(t);
+    }
+    FloatT clock_error_dot(const GPS_Time<FloatT> &t) const {
+      FloatT res;
+      subset.bias.update(t, bias, interpolator_cnd_default).interpolate(t, &res);
+      return res;
+    }
+  };
+  struct satellites_t {
+    typedef std::map<int, per_node_t> buf_t; // prn => per_node_t
+    buf_t buf;
+
+    enum system_t {
+      SYSTEM_GPS,
+      SYSTEM_SBAS,
+      SYSTEM_QZSS,
+      SYSTEM_GLONASS,
+      SYSTEM_GALILEO,
+      SYSTEM_BEIDOU,
+      SYSTEM_IRNSS,
+      NUM_OF_SYSTEMS,
+    };
+
+    static const int offset_list[NUM_OF_SYSTEMS];
+
+    protected:
+
+    typedef typename GPS_Solver_Base<FloatT>::satellite_t sat_t;
+
+    mutable struct per_system_t {
+      struct {
+        const satellites_t *sats;
+      } clk_rate;
+      struct {
+        const void *impl;
+        sat_t (*impl_select)(const void *, const int &, const GPS_Time<FloatT> &);
+      } pos_vel;
+      system_t sys;
+    } per_system[NUM_OF_SYSTEMS];
+
+    static sat_t select(
+        const void *ptr, const int &prn, const GPS_Time<FloatT> &receiver_time){
+      const per_system_t *ptr_sys(reinterpret_cast<const per_system_t *>(ptr));
+
+      // retrieve position/velocity supplier
+      sat_t res(
+          ptr_sys->pos_vel.impl_select(ptr_sys->pos_vel.impl, prn, receiver_time));
+
+      int sat_id((prn & 0xFF) + offset_list[ptr_sys->sys]);
+
+      // check clock_error/clock_error_dot availability
+      typename buf_t::const_iterator it(ptr_sys->clk_rate.sats->buf.find(sat_id));
+      if((it == ptr_sys->clk_rate.sats->buf.end()) || !it->second.precheck(receiver_time)){
+        // unavailable case
+        static const sat_t &unavailable(sat_t::unavailable());
+        res.impl_t = unavailable.impl_t;
+        res.impl_clock_error = unavailable.impl_clock_error;
+        res.impl_clock_error_dot = unavailable.impl_clock_error_dot;
+        return res;
+      }
+
+      struct impl_t {
+        static inline const per_node_t &sat(const void *ptr) {
+          return *reinterpret_cast<const per_node_t *>(ptr);
+        }
+        static typename GPS_Solver_Base<FloatT>::float_t clock_error(
+            const void *ptr, const GPS_Time<FloatT> &t_tx) {
+          return sat(ptr).clock_error(t_tx);
+        }
+        static typename GPS_Solver_Base<FloatT>::float_t clock_error_dot(
+            const void *ptr, const GPS_Time<FloatT> &t_tx) {
+          return sat(ptr).clock_error_dot(t_tx);
+        }
+      };
+      res.impl_t = &(it->second);
+      res.impl_clock_error = impl_t::clock_error;
+      res.impl_clock_error_dot = impl_t::clock_error_dot;
+      return res;
+    }
+
+    public:
+
+    template <class SelectorT>
+    bool push(SelectorT &slct, const system_t &sys = SYSTEM_GPS) const {
+      if(sys >= NUM_OF_SYSTEMS){return false;}
+      per_system[sys].clk_rate.sats = this;
+      per_system[sys].sys = sys;
+      if(slct.impl_select != select){
+        per_system[sys].pos_vel.impl = slct.impl;
+        per_system[sys].pos_vel.impl_select = slct.impl_select;
+      }
+      slct.impl_select = select;
+      slct.impl = &per_system[sys];
+      return true;
+    }
+
+    struct count_t {
+      int gps, sbas, qzss, glonass, galileo, beidou, irnss, unknown;
+    };
+    count_t count() const {
+      count_t res = {0};
+      for(typename buf_t::const_iterator it(buf.begin()), it_end(buf.end());
+          it != it_end; ++it){
+        switch((char)(it->first >> 8)){
+          case '\0': {
+            int id(it->first & 0xFF);
+            if(id < 100){++res.gps;}
+            else if(id < 192){++res.sbas;}
+            else{++res.qzss;}
+            break;
+          }
+          case 'R': ++res.glonass;  break;
+          case 'E': ++res.galileo;  break;
+          case 'C': ++res.beidou;   break;
+          case 'I': ++res.irnss;    break;
+          default: ++res.unknown; break;
+        }
+      }
+      return res;
+    }
+  };
+  typedef std::map<std::string, per_node_t> collection_t; // satellites + receivers, name => per_node_t
+};
+
+template <class FloatT>
+const typename RINEX_CLK<FloatT>::per_node_t::interpolator_t::condition_t
+    RINEX_CLK<FloatT>::per_node_t::interpolator_cnd_default = {
+      5, // max_x_size
+      60 * 60 * 2, // subset.cnd.max_dx_range
+    };
+
+template <class FloatT>
+const int RINEX_CLK<FloatT>::satellites_t::offset_list[NUM_OF_SYSTEMS] = {
+  0, 0, 0, // GPS, SBAS, QZSS
+  (int)'R' << 8, // GLONASS
+  (int)'E' << 8, // GALILEO
+  (int)'C' << 8, // BEIDOU
+  (int)'I' << 8, // IRNSS,
+};
+
+template <class FloatT = double>
+class RINEX_CLK_Reader : public RINEX_Reader<> {
+  protected:
+    typedef RINEX_Reader<> super_t;
+  public:
+    typedef typename RINEX_CLK<FloatT>::record_t record_t;
+    static const typename super_t::convert_item_t head_v3[7];
+    static const typename super_t::convert_item_t head_v304[7];
+
+  protected:
+    record_t record;
+
+    void read_header(){
+      if(super_t::src.fail()){return;}
+
+      char buf[256];
+      int label_offset(60);
+
+      // Read header
+      for(int line(0); !super_t::src.eof(); ++line){
+        super_t::src.getline(buf, sizeof(buf));
+
+        std::string content(buf);
+
+        if(line == 0){ // Check version and type extraction
+          switch(content.find("RINEX VERSION / TYPE")){
+            case 60:
+              super_t::version_type.parse(content);
+              break;
+            case 65: {
+              double temp(0);
+              super_t::conv_t<double>::f(content, 0, 4, &temp, 2);
+              super_t::version_type.version = (int)(temp * 100);
+              if(super_t::version_type.version != 304){return;}
+              if(content[21] != 'C'){return;}
+              super_t::version_type.file_type
+                  = super_t::version_type_t::FTYPE_CLOCK;
+              super_t::version_type.sat_system
+                  = super_t::version_type_t::char2sys_v3(content[42]);
+              label_offset = 65;
+              break;
+            }
+            default: // includes std::string::npos:
+              return;
+          }
+        }
+
+        std::string label(content, label_offset, 20);
+        {
+          int real_length(label.find_last_not_of(' ') + 1);
+          if(real_length < (int)label.length()){
+            label = label.substr(0, real_length);
+          }
+        }
+
+        if(label.find("END OF HEADER") == 0){break;}
+
+        _header[label].push_back(content.substr(0, label_offset));
+      }
+    }
+
+  public:
+    void seek_next() {
+      super_t::_has_next = false;
+
+      char buf[1024];
+      std::string str;
+      bool v304(super_t::version_type.version == 304);
+      while(true){
+        if(super_t::src.getline(buf, sizeof(buf)).fail()){return;}
+        str.assign(buf);
+        if(str.size() < (v304 ? 45 : 37)){continue;}
+        str.copy(record.type, 2);
+        if((std::memcmp(record.type, "AR", 2) == 0)
+            || (std::memcmp(record.type, "AS", 2) == 0)
+            || (std::memcmp(record.type, "CR", 2) == 0)
+            || (std::memcmp(record.type, "DR", 2) == 0)
+            || (std::memcmp(record.type, "MS", 2) == 0)){
+          break;
+        }
+      }
+      std::memset(record.name, ' ', sizeof(record.name));
+      str.copy(record.name, v304 ? 9 : 4, 3);
+      v304 ? super_t::convert(head_v304, str, &record) : super_t::convert(head_v3, str, &record);
+      record.epoch.tm_year = record.epoch_year4 - 1900; // greater than 1980
+      record.epoch.tm_mon = record.epoch_mon12 - 1; // month [0, 11]
+      record.epoch.tm_sec = (int)record.epoch_sec;
+
+      for(int i(0), j(2), k(v304 ? 45 : 40); i < 6; ++i, ++j, k += (v304 ? 21 : 20)){
+        record.valid[i] = false;
+        if(i >= record.items_followed){continue;}
+        if(j % 4 == 0){
+          j = 0; k = 3;
+          if(super_t::src.getline(buf, sizeof(buf)).fail()){break;}
+          str.assign(buf);
+        }
+        if(!super_t::template conv_t<FloatT>::e_dot_head(
+            str, k, 19, &record.values.array[i], 12)){break;}
+        record.valid[i] = true;
+      }
+
+      super_t::_has_next = true;
+    }
+
+    RINEX_CLK_Reader(std::istream &in)
+        : super_t(in, static_cast<void(super_t::*)()>(
+            &RINEX_CLK_Reader::read_header)) {
+      seek_next();
+    }
+    ~RINEX_CLK_Reader(){}
+
+    void next() {
+      seek_next();
+    }
+
+  protected:
+    static int read_all(
+        std::istream &in,
+        void *buf, bool (*callback)(void *, const record_t &)){
+      RINEX_CLK_Reader reader(in);
+      if(reader.version_type.file_type != version_type_t::FTYPE_CLOCK){
+        return -1;
+      }
+      int res(0);
+      for(; reader.has_next(); reader.next()){
+        if(!reader.record.valid[0]){continue;}
+        if(!callback(buf, reader.record)){continue;}
+        ++res;
+      }
+      return res;
+    }
+
+  public:
+    static int read_all(
+        std::istream &in,
+        typename RINEX_CLK<FloatT>::satellites_t &dst){
+      struct func_t {
+        static bool add(void *ptr, const record_t &record){
+          typename RINEX_CLK<FloatT>::satellites_t &dst(
+              *reinterpret_cast<typename RINEX_CLK<FloatT>::satellites_t *>(ptr));
+          if((record.type[0] != 'A') || (record.type[1] != 'S')){return false;}
+          int offset(0);
+          char sys(record.name[0]);
+          switch(sys){
+            case 'G': break; // GPS
+            case 'R': offset = (int)'R' << 8; break; // GLONASS
+            case 'E': offset = (int)'E' << 8; break; // Galileo
+            case 'C': offset = (int)'C' << 8; break; // BeiDou
+            case 'J': offset = 192; break; // QZSS
+            case 'S': offset = 100; break; // SBAS
+            case 'I': offset = (int)'I' << 8; break; // IRNSS
+            default: return false;
+          }
+          if(record.name[1] < '0' || record.name[1] > '9'
+              || record.name[2] < '0' || record.name[2] > '9'){return false;}
+          int idx((record.name[1] - '0') * 10 + (record.name[2] - '0') + offset);
+          dst.buf[idx].bias[record.get_epoch()] = record.values.v.bias;
+          return true;
+        }
+      };
+      return read_all(in, &dst, func_t::add);
+    }
+
+    static int read_all(
+        std::istream &in,
+        typename RINEX_CLK<FloatT>::collection_t &dst){
+      struct func_t {
+        static bool add(void *ptr, const record_t &record){
+          typename RINEX_CLK<FloatT>::collection_t &dst(
+              *reinterpret_cast<typename RINEX_CLK<FloatT>::collection_t *>(ptr));
+          dst[record.get_name()].bias[record.get_epoch()] = record.values.v.bias;
+          return true;
+        }
+      };
+      return read_all(in, &dst, func_t::add);
+    }
+};
+
+#define GEN_D(offset, length, container_type, container_member, value_type) \
+    {super_t::template conv_t<value_type>::d, offset, length, \
+      offsetof(container_type, container_member)}
+#define GEN_I(offset, length, container_type, container_member, value_type) \
+    {super_t::template conv_t<value_type>::d, offset, length, \
+      offsetof(container_type, container_member), 1}
+#define GEN_F2(offset, length, precision, container_type, container_member, value_type) \
+    {super_t::template conv_t<value_type>::f_dot_head, offset, length, \
+      offsetof(container_type, container_member), precision}
+#define GEN_F(offset, length, precision, container_type, container_member) \
+    GEN_F2(offset, length, precision, container_type, container_member, FloatT)
+
+template <class FloatT>
+const typename RINEX_CLK_Reader<FloatT>::convert_item_t RINEX_CLK_Reader<FloatT>::head_v3[] = {
+  GEN_I( 8,  4,     record_t, epoch_year4,    int),
+  GEN_I(13,  2,     record_t, epoch_mon12,    int),
+  GEN_I(16,  2,     record_t, epoch.tm_mday,  int),
+  GEN_I(19,  2,     record_t, epoch.tm_hour,  int),
+  GEN_I(22,  2,     record_t, epoch.tm_min,   int),
+  GEN_F(24, 10,  6, record_t, epoch_sec),
+  GEN_D(34,  3,     record_t, items_followed, int),
+};
+
+template <class FloatT>
+const typename RINEX_CLK_Reader<FloatT>::convert_item_t RINEX_CLK_Reader<FloatT>::head_v304[] = {
+  GEN_I(13,  4,     record_t, epoch_year4,    int),
+  GEN_I(18,  2,     record_t, epoch_mon12,    int),
+  GEN_I(21,  2,     record_t, epoch.tm_mday,  int),
+  GEN_I(24,  2,     record_t, epoch.tm_hour,  int),
+  GEN_I(27,  2,     record_t, epoch.tm_min,   int),
+  GEN_F(29,  9,  6, record_t, epoch_sec),
+  GEN_D(40,  2,     record_t, items_followed, int),
+};
+
+#undef GEN_D
+#undef GEN_I
+#undef GEN_F
+
+#endif /* __RINEX_CLOCK__ */

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

@@ -1387,16 +1387,16 @@ sf[SF_ ## TARGET] * msg_t::TARGET(buf)
 
           // the first line
           out << "     ";
-          for(int j(0); j < sizeof(igp.properties[0]) / sizeof(igp.properties[0][0]); ++j){
+          for(std::size_t j(0); j < sizeof(igp.properties[0]) / sizeof(igp.properties[0][0]); ++j){
             int lng(position_index_t::idx2lng(j));
             out << (lng == 0 ? '0' : (lng % 90 == 0 ? '|' : (lng % 30 == 0 ? '+' : ' ')));
           }
           out << std::endl;
 
-          for(int i(0); i < sizeof(igp.properties) / sizeof(igp.properties[0]); ++i){
+          for(std::size_t i(0); i < sizeof(igp.properties) / sizeof(igp.properties[0]); ++i){
             out.width(4);
             out << position_index_t::idx2lat(i) << ' ';
-            for(int j(0); j < sizeof(igp.properties[0]) / sizeof(igp.properties[0][0]); ++j){
+            for(std::size_t j(0); j < sizeof(igp.properties[0]) / sizeof(igp.properties[0][0]); ++j){
               if(!igp.properties[i][j].is_available()){
                 out << ' ';
               }else{

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

@@ -128,7 +128,7 @@ class SBAS_SinglePositioning : public SolverBaseT {
           }
         };
         satellite_t res = {
-            &(it_sat->second),
+            &(it_sat->second), &(it_sat->second),
             impl_t::position, impl_t::velocity,
             impl_t::clock_error, impl_t::clock_error_dot};
         return res;

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

@@ -185,7 +185,7 @@ struct SP3_Product {
         }
       };
       typename GPS_Solver_Base<FloatT>::satellite_t res = {
-        this,
+        this, this,
         impl_t::position, impl_t::velocity,
         impl_t::clock_error, impl_t::clock_error_dot
       };
@@ -248,29 +248,33 @@ struct SP3_Product {
   }
 
   enum system_t {
-    SYSTEM_GPS      = (int)'\0' << 8,
-    SYSTEM_SBAS     = SYSTEM_GPS,
-    SYSTEM_QZSS     = SYSTEM_GPS,
-    SYSTEM_GLONASS  = (int)'R' << 8,
-    SYSTEM_LEO      = (int)'L' << 8,
-    SYSTEM_GALILEO  = (int)'E' << 8,
-    SYSTEM_BEIDOU   = (int)'C' << 8,
-    SYSTEM_IRNSS    = (int)'I' << 8,
+    SYSTEM_GPS,
+    SYSTEM_SBAS,
+    SYSTEM_QZSS,
+    SYSTEM_GLONASS,
+    SYSTEM_LEO,
+    SYSTEM_GALILEO,
+    SYSTEM_BEIDOU,
+    SYSTEM_IRNSS,
+    NUM_OF_SYSTEMS,
   };
 
-#define gen_func(sys) \
-static typename GPS_Solver_Base<FloatT>::satellite_t select_ ## sys( \
-    const void *ptr, const int &prn, const GPS_Time<FloatT> &receiver_time){ \
-  return reinterpret_cast<const SP3_Product<FloatT> *>(ptr) \
-      ->select(prn + SYSTEM_ ## sys, receiver_time); \
-}
-  gen_func(GPS);
-  gen_func(GLONASS);
-  gen_func(LEO);
-  gen_func(GALILEO);
-  gen_func(BEIDOU);
-  gen_func(IRNSS);
-#undef gen_fun
+  static const int offset_list[NUM_OF_SYSTEMS];
+
+  protected:
+
+  mutable struct per_system_t {
+    const SP3_Product<FloatT> *product;
+    system_t sys;
+  } per_system[NUM_OF_SYSTEMS];
+
+  static typename GPS_Solver_Base<FloatT>::satellite_t select(
+      const void *ptr, const int &prn, const GPS_Time<FloatT> &receiver_time){
+    const per_system_t *ptr_impl(reinterpret_cast<const per_system_t *>(ptr));
+    return ptr_impl->product->select((prn & 0xFF) + offset_list[ptr_impl->sys], receiver_time);
+  }
+
+  public:
 
   /**
    * push SP3 product to satellite selector
@@ -281,19 +285,11 @@ static typename GPS_Solver_Base<FloatT>::satellite_t select_ ## sys( \
    */
   template <class SelectorT>
   bool push(SelectorT &slct, const system_t &sys = SYSTEM_GPS) const {
-    switch(sys){
-      case SYSTEM_GPS: // SBAS and QZSS are identically treated as GPS.
-      //case SYSTEM_SBAS:
-      //case SYSTEM_QZSS:
-        slct.impl_select = select_GPS; break;
-      case SYSTEM_GLONASS:  slct.impl_select = select_GLONASS;  break;
-      case SYSTEM_LEO:      slct.impl_select = select_LEO;      break;
-      case SYSTEM_GALILEO:  slct.impl_select = select_GALILEO;  break;
-      case SYSTEM_BEIDOU:   slct.impl_select = select_BEIDOU;   break;
-      case SYSTEM_IRNSS:    slct.impl_select = select_IRNSS;    break;
-      default: return false;
-    }
-    slct.impl = this;
+    if(sys >= NUM_OF_SYSTEMS){return false;}
+    per_system[sys].product = this;
+    per_system[sys].sys = sys;
+    slct.impl_select = select;
+    slct.impl = &per_system[sys];
     return true;
   }
 
@@ -305,19 +301,19 @@ static typename GPS_Solver_Base<FloatT>::satellite_t select_ ## sys( \
     for(typename satellites_t::const_iterator
           it(satellites.begin()), it_end(satellites.end());
         it != it_end; ++it){
-      switch(it->first & 0xFF00){
-        case SYSTEM_GPS: {
+      switch((char)(it->first >> 8)){
+        case '\0': {
           int id(it->first & 0xFF);
           if(id < 100){++res.gps;}
           else if(id < 192){++res.sbas;}
           else{++res.qzss;}
           break;
         }
-        case SYSTEM_GLONASS:  ++res.glonass;  break;
-        case SYSTEM_LEO:      ++res.leo;      break;
-        case SYSTEM_GALILEO:  ++res.galileo;  break;
-        case SYSTEM_BEIDOU:   ++res.beidou;   break;
-        case SYSTEM_IRNSS:    ++res.irnss;    break;
+        case 'R': ++res.glonass;  break;
+        case 'L': ++res.leo;      break;
+        case 'E': ++res.galileo;  break;
+        case 'C': ++res.beidou;   break;
+        case 'I': ++res.irnss;    break;
         default: ++res.unknown; break;
       }
     }
@@ -335,6 +331,17 @@ const typename SP3_Product<FloatT>::per_satellite_t::interpolate_cnd_t
   60 * 60 * 2,
 };
 
+template <class FloatT>
+const int SP3_Product<FloatT>::offset_list[NUM_OF_SYSTEMS] = {
+  0, 0, 0, // GPS, SBAS, QZSS
+  ((int)'R' << 8), // GLONASS
+  ((int)'L' << 8), // LEO
+  ((int)'E' << 8), // GALILEO
+  ((int)'C' << 8), // BEIDOU
+  ((int)'I' << 8), // IRNSS
+};
+
+
 template <class FloatT>
 class SP3_Reader {
   protected:

data/ext/ninja-scan-light/tool/param/bit_array.h

@@ -125,9 +125,9 @@ struct BitArray {
       return (unsigned int)res;
     }
   }
-  std::vector<int> indices_one() const {
+  std::vector<int> indices_one(const int &offset = 0) const {
     std::vector<int> res;
-    int idx(0);
+    int idx(offset);
     static const const_div_t<bits_per_addr> qr(MAX_SIZE);
     int rem(qr.rem), i(0);
     for(; i < qr.quot; ++i, idx += bits_per_addr){

data/ext/ninja-scan-light/tool/param/quaternion.h

@@ -130,7 +130,7 @@ class QuaternionData : public QuaternionDataProperty<FloatT> {
      * @param q �R�s�[��
      */
     QuaternionData(const self_t &q){
-      if(storage = q.storage){(storage->ref)++;}
+      if((storage = q.storage)){(storage->ref)++;}
     }
     
     /**
@@ -143,7 +143,7 @@ class QuaternionData : public QuaternionDataProperty<FloatT> {
     self_t &operator=(const self_t &q){
       if(this == &q){return *this;}
       if(storage && ((--(storage->ref)) <= 0)){delete storage;}
-      if(storage = q.storage){(storage->ref)++;}
+      if((storage = q.storage)){(storage->ref)++;}
       return *this;
     }
     

data/ext/ninja-scan-light/tool/param/vector3.h

@@ -133,7 +133,7 @@ class Vector3Data : public Vector3DataProperty<FloatT> {
      * @param v �R�s�[��
      */
     Vector3Data(const self_t &v){
-      if(storage = v.storage){(storage->ref)++;}
+      if((storage = v.storage)){(storage->ref)++;}
     }
     
     /**
@@ -146,7 +146,7 @@ class Vector3Data : public Vector3DataProperty<FloatT> {
     self_t &operator=(const self_t &v){
       if(this == &v){return *this;}
       if(storage && ((--(storage->ref)) <= 0)){delete storage;}
-      if(storage = v.storage){(storage->ref)++;}
+      if((storage = v.storage)){(storage->ref)++;}
       return *this;
     }