gps_pvt 0.1.7 → 0.2.3

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

@@ -405,11 +405,12 @@ struct GPS_Time {
     }
 
     // process remaining 4 years
-    int doy_i(0), doy[] = {
+    int doy[] = {
       leap_year ? 366 : 365,
       365, 365, 365,
       is_leap_year(year + 4) ? 366 : 365,
     };
+    std::size_t doy_i(0);
     for(; doy_i < sizeof(doy) / sizeof(doy[0]); ++doy_i){
       if(days <= doy[doy_i]){break;}
       days -= doy[doy_i];
@@ -525,6 +526,9 @@ class GPS_SpaceNode {
       return res;
     }
     static const float_t gamma_L1_L2;
+    static const float_t gamma_per_L1(const float_t &freq){
+      return std::pow(L1_Frequency / freq, 2);
+    }
 
   protected:
     static float_t rad2sc(const float_t &rad) {return rad / M_PI;}
@@ -2051,6 +2055,7 @@ if(std::abs(TARGET - eph.TARGET) > raw_t::sf[raw_t::SF_ ## TARGET]){break;}
      * @param height_over_ellipsoid
      * @see spherically single layer approach, for example,
      * Eq.(3) of "Ionospheric Range Error Correction Models" by N. Jakowski
+     * @see DO-229D A4.4.10.4 Eq.(A-42) is equivalent
      */
     static float_t slant_factor(
         const enu_t &relative_pos,
@@ -2089,8 +2094,7 @@ if(std::abs(TARGET - eph.TARGET) > raw_t::sf[raw_t::SF_ ## TARGET]){break;}
       // Elevation and azimuth
       float_t el(relative_pos.elevation()),
              az(relative_pos.azimuth());
-      float_t sc_el(rad2sc(el)),
-             sc_az(rad2sc(az));
+      float_t sc_el(rad2sc(el));
              
       // Pierce point (PP stands for the earth projection of the Pierce point)
       // (the following equation is based on GPS ICD)
@@ -2150,37 +2154,17 @@ if(std::abs(TARGET - eph.TARGET) > raw_t::sf[raw_t::SF_ ## TARGET]){break;}
           usr.llh(), 
           t);
     }
-    
-    struct IonospericCorrection {
-      const GPS_SpaceNode<float_t> &space_node;
-      float_t operator()(
-          const enu_t &relative_pos,
-          const llh_t &usrllh,
-          const gps_time_t &t) const {
-        return space_node.iono_correction(relative_pos, usrllh, t);
-      }
-      float_t operator()(
-          const xyz_t &sat,
-          const xyz_t &usr,
-          const gps_time_t &t) const {
-        return space_node.iono_correction(sat, usr, t);
-      }
-    };
-    IonospericCorrection iono_correction() const {
-      IonospericCorrection res = {*this};
-      return res;
-    }
 
     /**
-     * Calculate correction value in accordance with tropospheric model
+     * Calculate correction value in accordance with tropospheric Hopfield model
      * 
      * @param relative_pos satellite position (relative position, NEU)
      * @param usrllh user position (absolute position, LLH)
      * @return correction in meters
      */
-    float_t tropo_correction(
+    static float_t tropo_correction(
         const enu_t &relative_pos,
-        const llh_t &usrllh) const {
+        const llh_t &usrllh){
       
       // Elevation (rad)
       float_t el(relative_pos.elevation());
@@ -2290,31 +2274,13 @@ if(std::abs(TARGET - eph.TARGET) > raw_t::sf[raw_t::SF_ ## TARGET]){break;}
      * @param usr user position (absolute position, XYZ)
      * @return correction in meters
      */
-    float_t tropo_correction(
+    static float_t tropo_correction(
         const xyz_t &sat,
-        const xyz_t &usr) const {
+        const xyz_t &usr) {
       return tropo_correction(
           enu_t::relative(sat, usr),
           usr.llh());
     }
-
-    struct TropospericCorrection {
-      const GPS_SpaceNode<float_t> &space_node;
-      float_t operator()(
-          const enu_t &relative_pos,
-          const llh_t &usrllh) const {
-        return space_node.tropo_correction(relative_pos, usrllh);
-      }
-      float_t operator()(
-          const xyz_t &sat,
-          const xyz_t &usr) const {
-        return space_node.tropo_correction(sat, usr);
-      }
-    };
-    TropospericCorrection tropo_correction() const {
-      TropospericCorrection res = {*this};
-      return res;
-    }
 };
 
 template <class FloatT>

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

@@ -43,6 +43,7 @@
 #include <exception>
 
 #include <cmath>
+#include <cstddef>
 
 #include "param/bit_array.h"
 
@@ -55,49 +56,10 @@ struct GPS_Solver_GeneralOptions {
   FloatT elevation_mask;
   FloatT residual_mask;
 
-  enum ionospheric_model_t {
-    IONOSPHERIC_KLOBUCHAR,
-    IONOSPHERIC_NTCM_GL,
-    IONOSPHERIC_NONE, // which allows no correction
-    IONOSPHERIC_MODELS,
-    IONOSPHERIC_SKIP = IONOSPHERIC_MODELS, // which means delegating the next slot
-  };
-  ionospheric_model_t ionospheric_models[IONOSPHERIC_MODELS]; // lower index means having higher priority
-
-  int count_ionospheric_models() const {
-    int res(0);
-    for(int i(0); i < sizeof(ionospheric_models) / sizeof(ionospheric_models[0]); ++i){
-      if(ionospheric_models[i] != IONOSPHERIC_SKIP){res++;}
-    }
-    return res;
-  }
-
-  FloatT f_10_7;
-
   GPS_Solver_GeneralOptions()
       : elevation_mask(0), // elevation mask default is 0 [deg]
-      residual_mask(30), // range residual mask is 30 [m]
-      f_10_7(-1) {
-    for(int i(0); i < sizeof(ionospheric_models) / sizeof(ionospheric_models[0]); ++i){
-      ionospheric_models[i] = IONOSPHERIC_SKIP;
-    }
-    // default: broadcasted Klobuchar parameters are at least required for solution.
-    ionospheric_models[0] = IONOSPHERIC_KLOBUCHAR;
-  }
+      residual_mask(30) { // range residual mask is 30 [m]
 
-  bool insert_ionospheric_model(const ionospheric_model_t &model, const int &index = 0) {
-    if((index < 0)
-        || (index >= sizeof(ionospheric_models) / sizeof(ionospheric_models[0]))){
-      return false;
-    }
-
-    // shift, then replace
-    for(int i(index), j(i + 1); j < sizeof(ionospheric_models) / sizeof(ionospheric_models[0]); ++i, ++j){
-      ionospheric_models[j] = ionospheric_models[i];
-    }
-    ionospheric_models[index] = model;
-
-    return true;
   }
 };
 
@@ -145,6 +107,8 @@ class GPS_SinglePositioning : public SolverBaseT {
     typedef typename base_t::measurement_t measurement_t;
     inheritate_type(measurement_items_t);
     typedef typename base_t::range_error_t range_error_t;
+    typedef typename base_t::range_corrector_t range_corrector_t;
+    typedef typename base_t::range_correction_t range_correction_t;
 
     inheritate_type(relative_property_t);
     inheritate_type(geometric_matrices_t);
@@ -161,37 +125,50 @@ class GPS_SinglePositioning : public SolverBaseT {
   public:
     const space_node_t &space_node() const {return _space_node;}
 
-    /**
-     * Check availability of ionospheric models
-     * If a model is completely unavailable, it will be replaced to IONOSPHERIC_SKIP.
-     * It implies that when a model has conditional applicability (such as SBAS), it will be retained.
-     *
-     * @return (int) number of (possibly) available models
-     */
-    int filter_ionospheric_models(GPS_SinglePositioning_Options<float_t> &opt) const {
-
-      int available_models(0);
-
-      for(int i(0); i < sizeof(opt.ionospheric_models) / sizeof(opt.ionospheric_models[0]); ++i){
-        switch(opt.ionospheric_models[i]){
-          case options_t::IONOSPHERIC_KLOBUCHAR:
-            // check whether Klobuchar parameters alpha and beta have been already received
-            if(_space_node.is_valid_iono()){break;}
-            opt.ionospheric_models[i] = options_t::IONOSPHERIC_SKIP;
-            continue;
-          case options_t::IONOSPHERIC_NTCM_GL:
-            if(opt.f_10_7 >= 0){break;}
-            // check F10.7 has been already configured
-            opt.ionospheric_models[i] = options_t::IONOSPHERIC_SKIP;
-            continue;
-          case options_t::IONOSPHERIC_SKIP:
-            continue;
-        }
-        available_models++;
+    struct klobuchar_t : public range_corrector_t {
+      const space_node_t &space_node;
+      klobuchar_t(const space_node_t &sn) : range_corrector_t(), space_node(sn) {}
+      bool is_available(const gps_time_t &t) const {
+        return space_node.is_valid_iono();
+      }
+      float_t *calculate(
+          const gps_time_t &t, const pos_t &usr_pos, const enu_t &sat_rel_pos,
+          float_t &buf) const {
+        return &(buf = space_node.iono_correction(sat_rel_pos, usr_pos.llh, t));
       }
+    } ionospheric_klobuchar;
 
-      return available_models;
-    }
+    struct ntcm_gl_t : public range_corrector_t {
+      float_t f_10_7;
+      ntcm_gl_t() : range_corrector_t(), f_10_7(-1) {}
+      bool is_available(const gps_time_t &t) const {
+        return f_10_7 >= 0;
+      }
+      float_t *calculate(
+          const gps_time_t &t, const pos_t &usr_pos, const enu_t &sat_rel_pos,
+          float_t &buf) const {
+        if(!is_available(t)){return NULL;}
+        typename space_node_t::pierce_point_res_t pp(
+            space_node_t::pierce_point(sat_rel_pos, usr_pos.llh));
+        return &(buf = -space_node_t::tec2delay(space_node_t::slant_factor(sat_rel_pos)
+            * NTCM_GL_Generic<float_t>::tec_vert(
+              pp.latitude, pp.longitude, t.year(), f_10_7)));
+      }
+    } ionospheric_ntcm_gl;
+
+    struct tropospheric_simplified_t : public range_corrector_t {
+      tropospheric_simplified_t() : range_corrector_t() {}
+      bool is_available(const gps_time_t &t) const {
+        return true;
+      }
+      float_t *calculate(
+          const gps_time_t &t, const pos_t &usr_pos, const enu_t &sat_rel_pos,
+          float_t &buf) const {
+        return &(buf = space_node_t::tropo_correction(sat_rel_pos, usr_pos.llh));
+      }
+    } tropospheric_simplified;
+
+    range_correction_t ionospheric_correction, tropospheric_correction;
 
     options_t available_options() const {
       return options_t(base_t::available_options(), _options);
@@ -199,18 +176,26 @@ class GPS_SinglePositioning : public SolverBaseT {
 
     options_t available_options(const options_t &opt_wish) const {
       GPS_SinglePositioning_Options<float_t> opt(opt_wish);
-      filter_ionospheric_models(opt);
       return options_t(base_t::available_options(opt_wish), opt);
     }
 
     options_t update_options(const options_t &opt_wish){
-      filter_ionospheric_models(_options = opt_wish);
+      _options = opt_wish;
       return options_t(base_t::update_options(opt_wish), _options);
     }
 
     GPS_SinglePositioning(const space_node_t &sn)
-        : base_t(), _space_node(sn), _options() {
-      filter_ionospheric_models(_options);
+        : base_t(), _space_node(sn), _options(available_options(options_t())),
+        ionospheric_klobuchar(sn), ionospheric_ntcm_gl(),
+        tropospheric_simplified(),
+        ionospheric_correction(), tropospheric_correction() {
+
+      // default ionospheric correction:
+      // Broadcasted Klobuchar parameters are at least required for solution.
+      ionospheric_correction.push_front(&ionospheric_klobuchar);
+
+      // default troposheric correction: simplified
+      tropospheric_correction.push_front(&tropospheric_simplified);
     }
 
     ~GPS_SinglePositioning(){}
@@ -264,38 +249,14 @@ class GPS_SinglePositioning : public SolverBaseT {
       enu_t relative_pos(enu_t::relative(sat_pos, usr_pos.xyz));
 
       if(error.unknown_flag & range_error_t::MASK_IONOSPHERIC){
-        // Ionospheric model selection, the fall back is no correction
-        bool iono_model_hit(false);
-        for(int i(0); i < sizeof(_options.ionospheric_models) / sizeof(_options.ionospheric_models[0]); ++i){
-          switch(_options.ionospheric_models[i]){
-            case options_t::IONOSPHERIC_KLOBUCHAR:
-              residual.residual += _space_node.iono_correction(relative_pos, usr_pos.llh, time_arrival);
-              break;
-            case options_t::IONOSPHERIC_NTCM_GL: {
-              // TODO f_10_7 setup, optimization (mag_model etc.)
-              typename space_node_t::pierce_point_res_t pp(_space_node.pierce_point(relative_pos, usr_pos.llh));
-              residual.residual -= space_node_t::tec2delay(
-                  _space_node.slant_factor(relative_pos)
-                  * NTCM_GL_Generic<float_t>::tec_vert(
-                      pp.latitude, pp.longitude,
-                      time_arrival.year(), _options.f_10_7));
-              break;
-            }
-            case options_t::IONOSPHERIC_NONE:
-              break;
-            default:
-              continue;
-          }
-          iono_model_hit = true;
-          break;
-        }
+        residual.residual += ionospheric_correction(time_arrival, usr_pos, relative_pos);
       }else{
         residual.residual += error.value[range_error_t::IONOSPHERIC];
       }
 
       // Tropospheric
       residual.residual += (error.unknown_flag & range_error_t::MASK_TROPOSPHERIC)
-          ? _space_node.tropo_correction(relative_pos, usr_pos.llh)
+          ? tropospheric_correction(time_arrival, usr_pos, relative_pos)
           : error.value[range_error_t::TROPOSPHERIC];
 
       // Setup weight
@@ -441,7 +402,7 @@ class GPS_SinglePositioning : public SolverBaseT {
 
       res.receiver_time = receiver_time;
 
-      if(_options.count_ionospheric_models() == 0){
+      if(!ionospheric_correction.select(receiver_time)){
         res.error_code = user_pvt_t::ERROR_INVALID_IONO_MODEL;
         return;
       }

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

@@ -38,6 +38,8 @@
 #include <vector>
 #include <map>
 #include <utility>
+#include <deque>
+#include <algorithm>
 
 #include <cmath>
 #include <cstring>
@@ -101,6 +103,7 @@ struct GPS_Solver_Base {
       L1_RANGE_RATE_SIGMA,
       L1_SIGNAL_STRENGTH_dBHz,
       L1_LOCK_SEC,
+      L1_FREQUENCY,
       MEASUREMENT_ITEMS_PREDEFINED,
     };
   };
@@ -202,9 +205,9 @@ struct GPS_Solver_Base {
   virtual const float_t *rate(
       const typename measurement_t::mapped_type &values, float_t &buf) const {
     const float_t *res;
-    if(res = find_value(values, measurement_items_t::L1_RANGE_RATE, buf)){
+    if((res = find_value(values, measurement_items_t::L1_RANGE_RATE, buf))){
 
-    }else if(res = find_value(values, measurement_items_t::L1_DOPPLER, buf)){
+    }else if((res = find_value(values, measurement_items_t::L1_DOPPLER, buf))){
       // Fall back to doppler
       buf *= -space_node_t::L1_WaveLength();
     }
@@ -214,15 +217,62 @@ struct GPS_Solver_Base {
   virtual const float_t *rate_sigma(
       const typename measurement_t::mapped_type &values, float_t &buf) const {
     const float_t *res;
-    if(res = find_value(values, measurement_items_t::L1_RANGE_RATE_SIGMA, buf)){
+    if((res = find_value(values, measurement_items_t::L1_RANGE_RATE_SIGMA, buf))){
 
-    }else if(res = find_value(values, measurement_items_t::L1_DOPPLER_SIGMA, buf)){
+    }else if((res = find_value(values, measurement_items_t::L1_DOPPLER_SIGMA, buf))){
       // Fall back to doppler
       buf *= space_node_t::L1_WaveLength();
     }
     return res;
   }
 
+  struct range_corrector_t {
+    virtual ~range_corrector_t() {}
+    virtual bool is_available(const gps_time_t &t) const {
+      return false;
+    }
+    virtual float_t *calculate(
+        const gps_time_t &t, const pos_t &usr_pos, const enu_t &sat_rel_pos,
+        float_t &buf) const = 0;
+  };
+  static const struct no_correction_t : public range_corrector_t {
+    bool is_available(const gps_time_t &t) const {
+      return true;
+    }
+    float_t *calculate(
+        const gps_time_t &t, const pos_t &usr_pos, const enu_t &sat_rel_pos,
+        float_t &buf) const {
+      return &(buf = 0);
+    }
+  } no_correction;
+  struct range_correction_t : public std::deque<const range_corrector_t *> {
+    typedef std::deque<const range_corrector_t *> super_t;
+    range_correction_t() : super_t() {}
+    const range_corrector_t *select(const gps_time_t &t) const {
+      for(typename super_t::const_iterator it(super_t::begin()), it_end(super_t::end());
+          it != it_end; ++it){
+        if((*it)->is_available(t)){return *it;}
+      }
+      return NULL;
+    }
+    float_t operator()(
+        const gps_time_t &t, const pos_t &usr_pos, const enu_t &sat_rel_pos) const {
+      float_t res;
+      for(typename super_t::const_iterator it(super_t::begin()), it_end(super_t::end());
+          it != it_end; ++it){
+        if((*it)->calculate(t, usr_pos, sat_rel_pos, res)){return res;}
+      }
+      return 0;
+    }
+    void remove(const typename super_t::value_type &v){
+      std::remove(super_t::begin(), super_t::end(), v);
+    }
+    void add(const typename super_t::value_type &v){
+      remove(v);
+      super_t::push_front(v);
+    }
+  };
+
   /**
    * Select appropriate solver, this is provision for GNSS extension
    * @param prn satellite number
@@ -308,8 +358,9 @@ struct GPS_Solver_Base {
         case ERROR_VELOCITY_INSUFFICIENT_SATELLITES:
         case ERROR_VELOCITY_LS:
           return true;
+        default:
+          return false;
       }
-      return false;
     }
     bool velocity_solved() const {
       return error_code == ERROR_NO;
@@ -394,10 +445,11 @@ protected:
      * @return transformed design matrix G'
      */
     static matrix_t rotate_G(const MatrixT &G_, const matrix_t &rotation_matrix){
-      matrix_t res(G_.rows(), 4);
-      res.partial(G_.rows(), 3).replace(
-          G_.partial(G_.rows(), 3) * rotation_matrix.transpose());
-      res.partial(G_.rows(), 1, 0, 3).replace(G_.partial(G_.rows(), 1, 0, 3));
+      unsigned int r(G_.rows()), c(G_.columns()); // Normally c=4
+      matrix_t res(r, c);
+      res.partial(r, 3).replace(
+          G_.partial(r, 3) * rotation_matrix.transpose());
+      res.partial(r, c - 3, 0, 3).replace(G_.partial(r, c - 3, 0, 3));
       return res;
     }
 
@@ -424,14 +476,16 @@ protected:
      * @see rotate_G
      */
     static matrix_t rotate_C(const matrix_t &C, const matrix_t &rotation_matrix){
-      matrix_t res(4, 4);
+      unsigned int n(C.rows()); // Normally n=4
+      matrix_t res(n, n);
       res.partial(3, 3).replace( // upper left
           rotation_matrix * C.partial(3, 3) * rotation_matrix.transpose());
-      res.partial(3, 1, 0, 3).replace( // upper right
-          rotation_matrix * C.partial(3, 1, 0, 3));
-      res.partial(1, 3, 3, 0).replace( // lower left
-          C.partial(1, 3, 3, 0) * rotation_matrix.transpose());
-      res(3, 3) = C(3, 3); // lower right
+      res.partial(3, n - 3, 0, 3).replace( // upper right
+          rotation_matrix * C.partial(3, n - 3, 0, 3));
+      res.partial(n - 3, 3, 3, 0).replace( // lower left
+          C.partial(n - 3, 3, 3, 0) * rotation_matrix.transpose());
+      res.partial(n - 3, n - 3, 3, 3).replace( // lower right
+          C.partial(n - 3, n - 3, 3, 3));
       return res;
     }
     /**
@@ -469,11 +523,10 @@ protected:
      * @see rotate_G
      */
     static matrix_t rotate_S(const matrix_t &S, const matrix_t &rotation_matrix){
-      matrix_t res(4, S.columns());
-      res.partial(3, S.columns()).replace(rotation_matrix * S.partial(3, S.columns()));
-      for(unsigned int j(0), j_end(S.columns()); j < j_end; ++j){
-        res(3, j) = S(3, j);
-      }
+      unsigned int r(S.rows()), c(S.columns()); // Normally r=4
+      matrix_t res(r, c);
+      res.partial(3, c).replace(rotation_matrix * S.partial(3, c));
+      res.partial(r - 3, c, 3, 0).replace(S.partial(r - 3, c, 3, 0));
       return res;
     }
     /**
@@ -536,7 +589,7 @@ protected:
     partial_t partial(unsigned int size) const {
       if(size >= G.rows()){size = G.rows();}
       return partial_t(
-          G.partial(size, 4), W.partial(size, size), delta_r.partial(size, 1));
+          G.partial(size, G.columns()), W.partial(size, size), delta_r.partial(size, 1));
     }
     typedef linear_solver_t<typename MatrixT::circular_t> exclude_t;
     exclude_t exclude(const unsigned int &row) const {
@@ -544,14 +597,16 @@ protected:
       if(size >= 1){size--;}
       // generate matrices having circular view
       return exclude_t(
-          G.circular(offset, 0, size, 4),
+          G.circular(offset, 0, size, G.columns()),
           W.circular(offset, offset, size, size),
           delta_r.circular(offset, 0, size, 1));
     }
     template <class MatrixT2>
     void copy_G_W_row(const linear_solver_t<MatrixT2> &src,
         const unsigned int &i_src, const unsigned int &i_dst){
-      for(unsigned int j(0); j < 4; ++j){
+      unsigned int c_dst(G.columns()), c_src(src.G.columns()),
+          c(c_dst > c_src ? c_src : c_dst); // Normally c=4
+      for(unsigned int j(0); j < c; ++j){
         G(i_dst, j) = src.G(i_src, j);
       }
       W(i_dst, i_dst) = src.W(i_src, i_src);
@@ -560,9 +615,12 @@ protected:
 
   struct geometric_matrices_t : public linear_solver_t<matrix_t> {
     typedef linear_solver_t<matrix_t> super_t;
-    geometric_matrices_t(const unsigned int &capacity)
+    geometric_matrices_t(
+        const unsigned int &capacity,
+        const unsigned int &estimate_system_differences = 0)
         : super_t(
-          matrix_t(capacity, 4), matrix_t(capacity, capacity), matrix_t(capacity, 1)) {
+          matrix_t(capacity, 4 + estimate_system_differences),
+          matrix_t(capacity, capacity), matrix_t(capacity, 1)) {
       for(unsigned int i(0); i < capacity; ++i){
         super_t::G(i, 3) = 1;
       }
@@ -1035,6 +1093,10 @@ const typename GPS_Solver_Base<FloatT>::range_error_t
       {0},
     };
 
+template <class FloatT>
+const typename GPS_Solver_Base<FloatT>::no_correction_t
+    GPS_Solver_Base<FloatT>::no_correction;
+
 template <class FloatT, class PVT_BaseT = typename GPS_Solver_Base<FloatT>::user_pvt_t>
 struct GPS_PVT_Debug : public PVT_BaseT {
   typename GPS_Solver_Base<FloatT>::matrix_t G, W, delta_r;

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

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021, 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.
+ *
+ */
+
+#ifndef __QZSS_H__
+#define __QZSS_H__
+
+/** @file
+ * @brief QZSS ICD definitions
+ */
+
+#include "GPS.h"
+#include <limits>
+
+template <class FloatT>
+struct QZSS_LNAV_Ephemeris_Raw : public GPS_SpaceNode<FloatT>::Satellite::Ephemeris::raw_t {
+  typedef typename GPS_SpaceNode<FloatT>::Satellite::Ephemeris eph_t;
+  typedef typename eph_t::raw_t super_t;
+
+  operator eph_t() const {
+    eph_t res(super_t::operator eph_t());
+    res.fit_interval = super_t::fit_interval_flag
+        ? (std::numeric_limits<FloatT>::max)()
+        : (2 * 60 * 60); // Fit interval (ICD:4.1.2.4 Subframe 2); should be zero
+    return res;
+  };
+
+  QZSS_LNAV_Ephemeris_Raw &operator=(const eph_t &eph){
+    super_t::operator=(eph);
+    super_t::fit_interval_flag = (eph.fit_interval > 2 * 60 * 60);
+    return *this;
+  }
+};
+
+#endif /* __QZSS_H__ */