Epoch comparison issue

Signed-off-by: Guillaume W. Bres <[email protected]>
georust · Mar 6, 2024 · b2a47bd · b2a47bd
1 parent 4873a56
commit b2a47bd
Showing 1 changed file with 38 additions and 36 deletions.
diff --git a/rinex-cli/src/positioning/ppp/mod.rs b/rinex-cli/src/positioning/ppp/mod.rs
@@ -68,44 +68,46 @@ where
              *   3. Radio last option: always feasible
              */
             let clock_state = if let Some(clk) = clk_data {
-                //if ctx.needs_clock_interpolation {
-                if let Some((_, profile)) = clk.precise_sv_clock_interpolate(*t, *sv) {
-                    (
-                        profile.bias,
-                        profile.drift.unwrap_or(0.0),
-                        profile.drift_change.unwrap_or(0.0),
-                    )
+                if ctx.needs_clock_interpolation {
+                    if let Some((_, profile)) = clk.precise_sv_clock_interpolate(*t, *sv) {
+                        (
+                            profile.bias,
+                            profile.drift.unwrap_or(0.0),
+                            profile.drift_change.unwrap_or(0.0),
+                        )
+                    } else {
+                        /*
+                         * interpolation failure.
+                         * Do not interpolate other products: SV will not be presented.
+                         */
+                        continue;
+                    }
                 } else {
-                    /*
-                     * interpolation failure.
-                     * Do not interpolate other products: SV will not be presented.
-                     */
-                    continue;
+                    if let Some(profile) = clk
+                        .precise_sv_clock()
+                        .filter_map(|(clk_t, clk_sv, _, profile)| {
+                            if clk_t == *t && clk_sv == *sv {
+                                Some(profile)
+                            } else {
+                                None
+                            }
+                        })
+                        .reduce(|k, _| k)
+                    {
+                        (
+                            profile.bias,
+                            profile.drift.unwrap_or(0.0),
+                            profile.drift_change.unwrap_or(0.0),
+                        )
+                    } else {
+                        /*
+                         * When using high precision products it's better not to attempt
+                         * this in other products, which would mix high and low precision products
+                         * in the solution. We simply abort.
+                         */
+                        continue;
+                    }
                 }
-                //} else {
-                //    if let Some(profile) = clk.precise_sv_clock()
-                //        .filter_map(|(clk_t, clk_sv, _, profile)| {
-                //            if clk_t == *t && clk_sv == *sv {
-                //                Some(profile)
-                //            } else {
-                //                None
-                //            }
-                //        }).reduce(|k, _| k)
-                //    {
-                //        (
-                //            profile.bias,
-                //            profile.drift.unwrap_or(0.0),
-                //            profile.drift_change.unwrap_or(0.0),
-                //        )
-                //    } else {
-                //        /*
-                //         * When using high precision products it's better not to attempt
-                //         * this in other products, which would mix high and low precision products
-                //         * in the solution. We simply abort.
-                //         */
-                //        continue;
-                //    }
-                //}
             } else if sp3_has_clock {
                 panic!("sp3 (clock) not ready yet: prefer broadcast or clk product");
             } else {