Merge pull request #10 from rtk-rs/rinex-upgrade

Rinex lib upgrade

Author: gwbres

Cargo.toml

@@ -11,7 +11,7 @@ categories = ["science", "science::geo"]
 edition = "2021"
 
 [features]
-default = [] # no features by default
+default = ["sp3"] # no features by default
 
 # Unlock support of high precision SP3 files.
 # When targetting highest precision analysis and solutions, like in PPP,
@@ -37,26 +37,17 @@ strum_macros = "0.26"
 itertools = "0.14.0"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 
-map_3d = "0.1.5"
-
 hifitime = "4.0"
 anise = { version = "0.5.3", features = ["embed_ephem"] }
-gnss-rs = { version = "2.3.1", features = ["serde"] }
-
-gnss-qc-traits = { version = "0.0.2", features = ["processing"] }
-# gnss-qc-traits = { path = "../traits", version = "=0.0.1", features = ["processing"] }
+gnss-rs = { version = "2.3.3", features = ["serde"] }
+gnss-qc-traits = { version = "0.1.0", features = ["processing"] }
 
 maud = "0.26"
-
 plotly = "0.12"
-# plotly = { path = "../../plotly-rs/plotly" }
-# plotly = { git = "https://github.com/gwbres/plotly", branch = "scattergeo"} 
 
-# RINEX lib
-rinex = { version = "=0.17.0-alpha-3", features = ["full"] }
+rinex = { git = "https://github.com/georust/rinex", branch = "main",  features = ["qc", "processing", "obs", "clock", "nav", "ionex", "serde"]  }
 
-# SP3 lib
-sp3 = { version = "=1.1.0-alpha-2", features = ["qc", "processing", "serde"], optional = true }
+sp3 = { git = "https://github.com/georust/rinex", branch = "main", features = ["qc", "processing", "anise", "serde"], optional = true }
 
 [dev-dependencies]
 serde_json = "1"

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)]
@@ -379,7 +378,7 @@ impl QcContext {
     pub fn timescale(&self) -> Option<TimeScale> {
         #[cfg(feature = "sp3")]
         if let Some(sp3) = self.sp3() {
-            return Some(sp3.time_scale);
+            return Some(sp3.header.timescale);
         }
 
         if let Some(obs) = self.observation() {
@@ -601,7 +600,7 @@ impl QcContext {
     /// Returns true if High Precision Orbits also contains temporal information.
     pub fn sp3_has_clock(&self) -> bool {
         if let Some(sp3) = self.sp3() {
-            sp3.sv_clock().count() > 0
+            sp3.has_satellite_clock_offset()
         } else {
             false
         }
@@ -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

@@ -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;
@@ -226,11 +226,7 @@ impl QcReport {
             #[cfg(feature = "sp3")]
             orbit: {
                 if (context.has_sp3() || context.has_brdc_navigation()) && !summary_only {
-                    Some(OrbitReport::new(
-                        context,
-                        ref_position,
-                        cfg.force_brdc_skyplot,
-                    ))
+                    Some(OrbitReport::new(context, ref_position))
                 } else {
                     None
                 }