Fixed typo in src/ephemeris doc. Removed si feature from default. Cha…

…nged SI Statevector parsing to make clippy pedantic happy
NiklasVousten · Oct 20, 2023 · ea3e971 · ea3e971
1 parent 4f6c96b
commit ea3e971
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,5 +22,4 @@ env_logger = "0.9.0"
 tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] }
 
 [features]
-si = ["dep:uom"]
-default= ["si"]
+si = ["dep:uom"]
diff --git a/src/ephemeris.rs b/src/ephemeris.rs
@@ -15,7 +15,7 @@ use crate::utilities::{take_expecting, take_or_empty};
 /// | RR              | Range-rate; radial velocity wrt coord. center   | km/sec                |
 #[derive(Debug, PartialEq)]
 pub struct EphemerisVectorItem {
-    /// Position int km of the moving body relative to the Sun
+    /// Position in km of the moving body relative to the Sun
     ///
     /// [x, y, z]
     pub position: [f32; 3],

diff --git a/src/si/ephemeris.rs b/src/si/ephemeris.rs
@@ -215,15 +215,11 @@ impl<'a, Input: Iterator<Item = &'a str>> Iterator for EphemerisVectorParser<'a,
                         let line = take_expecting(line, " Z =").unwrap();
                         let (z, _) = take_or_empty(line, 22);
 
-                        let x_km = x.trim().parse::<f32>().unwrap();
-                        let y_km = y.trim().parse::<f32>().unwrap();
-                        let z_km = z.trim().parse::<f32>().unwrap();
-
                         self.state = EphemerisVectorParserState::Position {
                             position: [
-                                Length::new::<length::kilometer>(x_km),
-                                Length::new::<length::kilometer>(y_km),
-                                Length::new::<length::kilometer>(z_km),
+                                Length::new::<length::kilometer>(x.trim().parse::<f32>().unwrap()),
+                                Length::new::<length::kilometer>(y.trim().parse::<f32>().unwrap()),
+                                Length::new::<length::kilometer>(z.trim().parse::<f32>().unwrap()),
                             ],
                         };
                     }
@@ -238,16 +234,12 @@ impl<'a, Input: Iterator<Item = &'a str>> Iterator for EphemerisVectorParser<'a,
                         let line = take_expecting(line, " VZ=").unwrap();
                         let (vz, _) = take_or_empty(line, 22);
 
-                        let vx_kms = vx.trim().parse::<f32>().unwrap();
-                        let vy_kms = vy.trim().parse::<f32>().unwrap();
-                        let vz_kms = vz.trim().parse::<f32>().unwrap();
-
                         self.state = EphemerisVectorParserState::Complete {
                             position,
                             velocity: [
-                                Velocity::new::<velocity::kilometer_per_second>(vx_kms),
-                                Velocity::new::<velocity::kilometer_per_second>(vy_kms),
-                                Velocity::new::<velocity::kilometer_per_second>(vz_kms),
+                                Velocity::new::<velocity::kilometer_per_second>(vx.trim().parse::<f32>().unwrap()),
+                                Velocity::new::<velocity::kilometer_per_second>(vy.trim().parse::<f32>().unwrap()),
+                                Velocity::new::<velocity::kilometer_per_second>(vz.trim().parse::<f32>().unwrap()),
                             ],
                         };
                     }