Prepare for rinex upgrade

Signed-off-by: Guillaume W. Bres <[email protected]>

Author: gwbres

src/cfg.rs

@@ -1,9 +1,10 @@
 use maud::{html, Markup, Render};
-use rinex::prelude::*;
 use thiserror::Error;
 
 use serde::{Deserialize, Serialize};
 
+use rinex::prelude::nav::Orbit;
+
 /// Configuration Error
 #[derive(Debug, Clone, Error)]
 pub enum Error {
@@ -53,7 +54,7 @@ pub struct QcConfig {
     #[serde(default)]
     pub report: QcReportType,
     #[serde(default)]
-    pub manual_reference: Option<GroundPosition>,
+    pub manual_rx_orbit: Option<Orbit>,
     #[serde(default)]
     /// When both SP3 and BRDC NAV are present,
     /// SP3 is prefered for skyplot project: set true here to
@@ -65,8 +66,8 @@ impl QcConfig {
     pub fn set_report_type(&mut self, report_type: QcReportType) {
         self.report = report_type;
     }
-    pub fn set_reference_position(&mut self, pos: GroundPosition) {
-        self.manual_reference = Some(pos.clone());
+    pub fn set_reference_rx_orbit(&mut self, orbit: Orbit) {
+        self.manual_rx_orbit = Some(orbit);
     }
 }
 
@@ -81,10 +82,10 @@ impl Render for QcConfig {
                     (self.report.to_string())
                 }
             }
-            @if let Some(position) = self.manual_reference {
+            @if let Some(_) = self.manual_rx_orbit {
                 tr {
                     td {
-                        (position.render())
+                        "TODO"
                     }
                 }
             }

src/context.rs

@@ -10,12 +10,13 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use rinex::{
-    prelude::{Almanac, GroundPosition, Rinex, TimeScale},
-    types::Type as RinexType,
-    Error as RinexError,
+use rinex::prelude::{
+    nav::{Almanac, Orbit},
+    Rinex, RinexType, TimeScale,
 };
 
+use qc_traits::{Merge, MergeError};
+
 use anise::{
     almanac::{
         metaload::MetaAlmanacError,
@@ -30,7 +31,7 @@ use anise::{
 #[cfg(feature = "sp3")]
 use sp3::prelude::SP3;
 
-use qc_traits::{Filter, Merge, MergeError, Preprocessing, Repair, RepairTrait};
+use qc_traits::{Filter, Preprocessing, Repair, RepairTrait};
 
 /// Context Error
 #[derive(Debug, Error)]
@@ -41,14 +42,12 @@ pub enum Error {
     MetaAlmanac(#[from] MetaAlmanacError),
     #[error("planetary data error")]
     PlanetaryData(#[from] PlanetaryDataError),
-    #[error("failed to extend gnss context")]
-    ContextExtensionError(#[from] MergeError),
     #[error("non supported file format")]
     NonSupportedFileFormat,
     #[error("failed to determine filename")]
     FileNameDetermination,
-    #[error("invalid rinex: {0}")]
-    RinexError(#[from] RinexError),
+    #[error("failed to extend context")]
+    Merge(#[from] MergeError),
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -667,16 +666,18 @@ impl QcContext {
     pub fn nav_compatible(&self) -> bool {
         self.observation().is_some() && self.brdc_navigation().is_some()
     }
+
     /// True if Self is compatible with CPP positioning,
     /// see <https://docs.rs/gnss-rtk/latest/gnss_rtk/prelude/enum.Method.html#variant.CodePPP>
     pub fn cpp_compatible(&self) -> bool {
         // TODO: improve: only PR
         if let Some(obs) = self.observation() {
-            obs.carrier().count() > 1
+            obs.carrier_iter().count() > 1
         } else {
             false
         }
     }
+
     /// [Self] cannot be True if self is compatible with PPP positioning,
     /// see <https://docs.rs/gnss-rtk/latest/gnss_rtk/prelude/enum.Method.html#variant.PPP>
     pub fn ppp_compatible(&self) -> bool {
@@ -705,21 +706,15 @@ impl QcContext {
     pub fn tropo_bias_model_optimization(&self) -> bool {
         self.has_meteo()
     }
+
     /// Returns possible Reference position defined in this context.
     /// Usually the Receiver location in the laboratory.
-    pub fn reference_position(&self) -> Option<GroundPosition> {
-        if let Some(data) = self.observation() {
-            if let Some(pos) = data.header.ground_position {
-                return Some(pos);
-            }
-        }
-        if let Some(data) = self.brdc_navigation() {
-            if let Some(pos) = data.header.ground_position {
-                return Some(pos);
-            }
-        }
-        None
+    pub fn reference_rx_orbit(&self) -> Option<Orbit> {
+        let obs_rinex = self.observation()?;
+        let first_epoch = obs_rinex.first_epoch()?;
+        obs_rinex.header.rx_orbit(first_epoch, self.earth_cef)
     }
+
     /// Apply preprocessing filter algorithm to mutable [Self].
     /// Filter will apply to all data contained in the context.
     pub fn filter_mut(&mut self, filter: &Filter) {

src/lib.rs

@@ -1,4 +1,4 @@
-#![doc(html_logo_url = "https://raw.githubusercontent.com/rtk-rs/.github/master/logos/logo2.jpg")]
+#![doc(html_logo_url = "https://raw.githubusercontent.com/georust/meta/master/logo/logo.png")]
 #![doc = include_str!("../README.md")]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
@@ -25,7 +25,8 @@ pub mod prelude {
     pub use crate::plot::{Marker, MarkerSymbol, Mode, Plot};
     pub use maud::{html, Markup, Render};
     pub use qc_traits::{Filter, Preprocessing, Repair, RepairTrait};
-    pub use rinex::prelude::{Almanac, Error as RinexError, Rinex};
+    pub use rinex::prelude::nav::Almanac;
+    pub use rinex::prelude::{Error as RinexError, Rinex};
     #[cfg(feature = "sp3")]
     pub use sp3::prelude::{Error as SP3Error, SP3};
     pub use std::path::Path;

src/report/mod.rs

@@ -161,10 +161,10 @@ pub struct QcReport {
 impl QcReport {
     /// Builds a new GNSS report, ready to be rendered
     pub fn new(context: &QcContext, cfg: QcConfig) -> Self {
-        let ref_position = if let Some(position) = cfg.manual_reference {
+        let ref_position = if let Some(position) = cfg.manual_rx_orbit {
             Some(position)
         } else {
-            context.reference_position()
+            context.reference_rx_orbit()
         };
         let summary = QcSummary::new(&context, &cfg);
         let summary_only = cfg.report == QcReportType::Summary;

src/report/orbit.rs

@@ -1,6 +1,6 @@
 use rinex::{
     navigation::Ephemeris,
-    prelude::{Constellation, Epoch, GroundPosition, Orbit, Rinex, SV},
+    prelude::{nav::Orbit, Constellation, Epoch, Rinex, SV},
 };
 use std::collections::{BTreeMap, HashMap};
 
@@ -158,13 +158,19 @@ pub struct OrbitReport {
 }
 
 impl OrbitReport {
-    pub fn new(ctx: &QcContext, reference: Option<GroundPosition>, force_brdc_sky: bool) -> Self {
-        let (x0, y0, z0) = reference.unwrap_or_default().to_ecef_wgs84();
-        let (x0_km, y0_km, z0_km) = (x0 / 1000.0, y0 / 1000.0, z0 / 1000.0);
+    pub fn new(ctx: &QcContext, reference: Option<Orbit>, force_brdc_sky: bool) -> Self {
+        let (x0_km, y0_km, z0_km) = match reference {
+            Some(orbit) => {
+                let pos_vel = orbit.to_cartesian_pos_vel();
+                (pos_vel[0], pos_vel[1], pos_vel[2])
+            }
+            None => (0.0, 0.0, 0.0),
+        };
 
         // TODO: brdc needs a timeserie..
         #[cfg(feature = "sp3")]
         let brdc_skyplot = ctx.has_brdc_navigation() && ctx.has_sp3() && force_brdc_sky;
+
         #[cfg(not(feature = "sp3"))]
         let brdc_skyplot = ctx.has_brdc_navigation();
 
@@ -212,8 +218,9 @@ impl OrbitReport {
                     }
                     if brdc_skyplot {
                         let brdc = ctx.brdc_navigation().unwrap();
+
                         if let Some(el_az_range) =
-                            brdc.sv_azimuth_elevation_range(sv_sp3, t, rx_orbit, &ctx.almanac)
+                            brdc.nav_azimuth_elevation_range(sv_sp3, t, rx_orbit, &ctx.almanac)
                         {
                             let (el_deg, az_deg) =
                                 (el_az_range.elevation_deg, el_az_range.azimuth_deg);
@@ -375,7 +382,7 @@ impl OrbitReport {
                     if let Some(nav) = ctx.brdc_navigation() {
                         for constellation in sp3.constellation() {
                             if let Some(constellation) = nav
-                                .constellation()
+                                .constellations_iter()
                                 .filter(|c| *c == constellation)
                                 .reduce(|k, _| k)
                             {

src/report/rinex/clock.rs

@@ -1,7 +1,8 @@
 use itertools::Itertools;
 use maud::{html, Markup, Render};
 use qc_traits::{Filter, FilterItem, MaskOperand, Preprocessing};
-use rinex::prelude::{ClockProfileType, Constellation, Rinex, TimeScale, DOMES, SV};
+
+use rinex::prelude::{clock::ClockProfileType, Constellation, Rinex, TimeScale, DOMES, SV};
 use std::collections::HashMap;
 
 use crate::report::shared::SamplingReport;
@@ -19,7 +20,7 @@ struct ConstellPage {
 
 impl ConstellPage {
     fn new(rinex: &Rinex) -> Self {
-        let satellites = rinex.sv().collect::<Vec<_>>();
+        let satellites = rinex.sv_iter().collect::<Vec<_>>();
 
         Self {
             offset_plot: {
@@ -195,7 +196,7 @@ impl ClkReport {
             sampling: SamplingReport::from_rinex(rnx),
             constellations: {
                 let mut pages = HashMap::<Constellation, ConstellPage>::new();
-                for constellation in rnx.constellation() {
+                for constellation in rnx.constellations_iter() {
                     let filter = Filter::mask(
                         MaskOperand::Equals,
                         FilterItem::ConstellationItem(vec![constellation]),

src/report/rinex/ionex.rs

@@ -15,7 +15,7 @@ pub struct IonexReport {
     map_dimension: u8,
     epoch_first_map: Epoch,
     epoch_last_map: Epoch,
-    sampling_interval: Duration,
+    sampling_interval: Option<Duration>,
     reference: Reference,
     description: Option<String>,
     mapping: Option<MappingFunction>,
@@ -24,7 +24,7 @@ pub struct IonexReport {
 
 impl IonexReport {
     pub fn new(rnx: &Rinex) -> Result<Self, Error> {
-        let nb_of_maps = rnx.epoch().count();
+        let nb_of_maps = rnx.epoch_iter().count();
         let header = rnx.header.ionex.as_ref().ok_or(Error::MissingIonexHeader)?;
         Ok(Self {
             nb_of_maps,
@@ -34,7 +34,7 @@ impl IonexReport {
             mapping: header.mapping.clone(),
             reference: header.reference.clone(),
             description: header.description.clone(),
-            sampling_interval: rnx.dominant_sample_rate().ok_or(Error::SamplingAnalysis)?,
+            sampling_interval: rnx.sampling_interval(),
             world_map: {
                 let mut plot = Plot::world_map(
                     "ionex_tec",
@@ -44,14 +44,17 @@ impl IonexReport {
                     0,
                     true,
                 );
+
+                // Build one trace (1 map) per Epoch
                 let mut buttons = Vec::<Button>::new();
-                // one trace(=map) per Epoch
-                for (epoch_index, epoch) in rnx.epoch().enumerate() {
+
+                for (epoch_index, epoch) in rnx.epoch_iter().enumerate() {
                     let label = epoch.to_string();
+
                     let lat = rnx
-                        .tec()
+                        .ionex_tecu_latlong_ddeg_alt_km_iter()
                         .filter_map(
-                            |(t, lat, _, _, _)| {
+                            |(t, _, lat, _, _)| {
                                 if t == epoch {
                                     Some(lat)
                                 } else {
@@ -60,8 +63,9 @@ impl IonexReport {
                             },
                         )
                         .collect::<Vec<_>>();
+
                     let long = rnx
-                        .tec()
+                        .ionex_tecu_latlong_ddeg_alt_km_iter()
                         .filter_map(
                             |(t, _, long, _, _)| {
                                 if t == epoch {
@@ -72,12 +76,13 @@ impl IonexReport {
                             },
                         )
                         .collect::<Vec<_>>();
-                    let tec = rnx
-                        .tec()
+
+                    let tecu = rnx
+                        .ionex_tecu_latlong_ddeg_alt_km_iter()
                         .filter_map(
-                            |(t, _, _, _, tec)| {
+                            |(t, tecu, _, _, _)| {
                                 if t == epoch {
-                                    Some(tec)
+                                    Some(tecu)
                                 } else {
                                     None
                                 }
@@ -88,12 +93,13 @@ impl IonexReport {
                     let trace = Plot::density_mapbox(
                         lat.clone(),
                         long.clone(),
-                        tec,
+                        tecu,
                         &label,
                         0.6,
                         3,
                         epoch_index == 0,
                     );
+
                     plot.add_trace(trace);
 
                     buttons.push(
@@ -114,6 +120,7 @@ impl IonexReport {
                             .build(),
                     );
                 }
+
                 plot.add_custom_controls(buttons);
                 plot
             },
@@ -160,10 +167,16 @@ impl Render for IonexReport {
                 }
                 tr {
                     th class="is-info" {
-                        "Time Interval"
+                        "Sampling Period"
                     }
-                    td {
-                        (self.sampling_interval.to_string())
+                    @ if let Some(sampling_interval) = &self.sampling_interval {
+                        td {
+                            (sampling_interval.to_string())
+                        }
+                    } @ else {
+                        td class="is-warning" {
+                            "Unknown"
+                        }
                     }
                 }
                 tr {