Skip to content

Commit

Permalink
Fix type namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@matzipan
matzipan committed Jan 2, 2024
1 parent d8c810f commit 211c46e
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
20 changes: 10 additions & 10 deletions crates/lox_core/src/odm/ocm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub struct OcmType {
#[serde(rename = "header")]
pub header: common::OdmHeader,
#[serde(rename = "body")]
pub body: common::OcmBody,
pub body: OcmBody,
#[serde(rename = "@id")]
pub id: String,
#[serde(rename = "@version")]
Expand All @@ -19,16 +19,16 @@ pub struct OcmType {
#[serde(default)]
pub struct OcmBody {
#[serde(rename = "segment")]
pub segment: common::OcmSegment,
pub segment: OcmSegment,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
#[serde(default)]
pub struct OcmSegment {
#[serde(rename = "metadata")]
pub metadata: common::OcmMetadata,
pub metadata: OcmMetadata,
#[serde(rename = "data")]
pub data: common::OcmData,
pub data: OcmData,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand Down Expand Up @@ -136,17 +136,17 @@ pub struct OcmMetadata {
#[serde(default)]
pub struct OcmData {
#[serde(rename = "traj")]
pub traj_list: Vec<common::OcmTrajStateType>,
pub traj_list: Vec<OcmTrajStateType>,
#[serde(rename = "phys")]
pub phys: Option<common::OcmPhysicalDescriptionType>,
pub phys: Option<OcmPhysicalDescriptionType>,
#[serde(rename = "cov")]
pub cov_list: Vec<common::OcmCovarianceMatrixType>,
pub cov_list: Vec<OcmCovarianceMatrixType>,
#[serde(rename = "man")]
pub man_list: Vec<common::OcmManeuverParametersType>,
pub man_list: Vec<OcmManeuverParametersType>,
#[serde(rename = "pert")]
pub pert: Option<common::OcmPerturbationsType>,
pub pert: Option<OcmPerturbationsType>,
#[serde(rename = "od")]
pub od: Option<common::OcmOdParametersType>,
pub od: Option<OcmOdParametersType>,
#[serde(rename = "user")]
pub user: Option<common::UserDefinedType>,
}
Expand Down
8 changes: 4 additions & 4 deletions crates/lox_core/src/odm/oem.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub struct OemType {
#[serde(rename = "header")]
pub header: common::OdmHeader,
#[serde(rename = "body")]
pub body: common::OemBody,
pub body: OemBody,
#[serde(rename = "@id")]
pub id: String,
#[serde(rename = "@version")]
Expand All @@ -19,16 +19,16 @@ pub struct OemType {
#[serde(default)]
pub struct OemBody {
#[serde(rename = "segment")]
pub segment_list: Vec<common::OemSegment>,
pub segment_list: Vec<OemSegment>,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
#[serde(default)]
pub struct OemSegment {
#[serde(rename = "metadata")]
pub metadata: common::OemMetadata,
pub metadata: OemMetadata,
#[serde(rename = "data")]
pub data: common::OemData,
pub data: OemData,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand Down
28 changes: 14 additions & 14 deletions crates/lox_core/src/odm/omm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub struct OmmType {
#[serde(rename = "header")]
pub header: common::OdmHeader,
#[serde(rename = "body")]
pub body: common::OmmBody,
pub body: OmmBody,
#[serde(rename = "@id")]
pub id: String,
#[serde(rename = "@version")]
Expand All @@ -51,16 +51,16 @@ pub struct OmmType {
#[serde(default)]
pub struct OmmBody {
#[serde(rename = "segment")]
pub segment: common::OmmSegment,
pub segment: OmmSegment,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
#[serde(default)]
pub struct OmmSegment {
#[serde(rename = "metadata")]
pub metadata: common::OmmMetadata,
pub metadata: OmmMetadata,
#[serde(rename = "data")]
pub data: common::OmmData,
pub data: OmmData,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand Down Expand Up @@ -90,11 +90,11 @@ pub struct OmmData {
#[serde(rename = "COMMENT")]
pub comment_list: Vec<String>,
#[serde(rename = "meanElements")]
pub mean_elements: common::MeanElementsType,
pub mean_elements: MeanElementsType,
#[serde(rename = "spacecraftParameters")]
pub spacecraft_parameters: Option<common::SpacecraftParametersType>,
#[serde(rename = "tleParameters")]
pub tle_parameters: Option<common::TleParametersType>,
pub tle_parameters: Option<TleParametersType>,
#[serde(rename = "covarianceMatrix")]
pub covariance_matrix: Option<common::OpmCovarianceMatrixType>,
#[serde(rename = "userDefinedParameters")]
Expand Down Expand Up @@ -134,11 +134,11 @@ pub struct TleParametersType {
#[serde(rename = "NORAD_CAT_ID")]
pub norad_cat_id: Option<i32>,
#[serde(rename = "ELEMENT_SET_NO")]
pub element_set_no: Option<common::ElementSetNoType>,
pub element_set_no: Option<ElementSetNoType>,
#[serde(rename = "REV_AT_EPOCH")]
pub rev_at_epoch: Option<u64>,
#[serde(rename = "MEAN_MOTION_DOT")]
pub mean_motion_dot: common::DRevType,
pub mean_motion_dot: DRevType,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand All @@ -147,7 +147,7 @@ pub struct BStarType {
#[serde(rename = "$text")]
pub base: f64,
#[serde(rename = "@units")]
pub units: Option<common::BStarUnits>,
pub units: Option<BStarUnits>,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand All @@ -156,7 +156,7 @@ pub struct BTermType {
#[serde(rename = "$text")]
pub base: f64,
#[serde(rename = "@units")]
pub units: Option<common::BTermUnits>,
pub units: Option<BTermUnits>,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand All @@ -165,7 +165,7 @@ pub struct AgomType {
#[serde(rename = "$text")]
pub base: f64,
#[serde(rename = "@units")]
pub units: Option<common::AgomUnits>,
pub units: Option<AgomUnits>,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand All @@ -174,7 +174,7 @@ pub struct RevType {
#[serde(rename = "$text")]
pub base: f64,
#[serde(rename = "@units")]
pub units: Option<common::RevUnits>,
pub units: Option<RevUnits>,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand All @@ -183,7 +183,7 @@ pub struct DRevType {
#[serde(rename = "$text")]
pub base: f64,
#[serde(rename = "@units")]
pub units: Option<common::DRevUnits>,
pub units: Option<DRevUnits>,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand All @@ -192,5 +192,5 @@ pub struct DdRevType {
#[serde(rename = "$text")]
pub base: f64,
#[serde(rename = "@units")]
pub units: Option<common::DdRevUnits>,
pub units: Option<DdRevUnits>,
}
12 changes: 6 additions & 6 deletions crates/lox_core/src/odm/opm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub struct OpmType {
#[serde(rename = "header")]
pub header: common::OdmHeader,
#[serde(rename = "body")]
pub body: common::OpmBody,
pub body: OpmBody,
#[serde(rename = "@id")]
pub id: String,
#[serde(rename = "@version")]
Expand All @@ -19,16 +19,16 @@ pub struct OpmType {
#[serde(default)]
pub struct OpmBody {
#[serde(rename = "segment")]
pub segment: common::OpmSegment,
pub segment: OpmSegment,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
#[serde(default)]
pub struct OpmSegment {
#[serde(rename = "metadata")]
pub metadata: common::OpmMetadata,
pub metadata: OpmMetadata,
#[serde(rename = "data")]
pub data: common::OpmData,
pub data: OpmData,
}

#[derive(Clone, Debug, Default, PartialEq, serde::Deserialize, serde::Serialize)]
Expand Down Expand Up @@ -58,13 +58,13 @@ pub struct OpmData {
#[serde(rename = "stateVector")]
pub state_vector: common::StateVectorType,
#[serde(rename = "keplerianElements")]
pub keplerian_elements: Option<common::KeplerianElementsType>,
pub keplerian_elements: Option<KeplerianElementsType>,
#[serde(rename = "spacecraftParameters")]
pub spacecraft_parameters: Option<common::SpacecraftParametersType>,
#[serde(rename = "covarianceMatrix")]
pub covariance_matrix: Option<common::OpmCovarianceMatrixType>,
#[serde(rename = "maneuverParameters")]
pub maneuver_parameters_list: Vec<common::ManeuverParametersType>,
pub maneuver_parameters_list: Vec<ManeuverParametersType>,
#[serde(rename = "userDefinedParameters")]
pub user_defined_parameters: Option<common::UserDefinedType>,
}
Expand Down

0 comments on commit 211c46e

Please sign in to comment.