From 7b8719f7dc40ff545c68c5ebaffb10ccacf0a008 Mon Sep 17 00:00:00 2001 From: Anton Sidorov Date: Mon, 10 Feb 2025 22:00:03 +0000 Subject: [PATCH 1/3] rename: --- src/decoder/adsb.rs | 2 +- src/decoder/adsb/icao.rs | 10 +++++----- src/decoder/downlink/extended/update.rs | 2 +- src/decoder/downlink/mode_s.rs | 2 +- src/decoder/downlink/short.rs | 2 +- src/lib.rs | 4 ++-- src/reader.rs | 16 ++++++++++------ 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/decoder/adsb.rs b/src/decoder/adsb.rs index 665d1f2..b151d60 100644 --- a/src/decoder/adsb.rs +++ b/src/decoder/adsb.rs @@ -9,7 +9,7 @@ mod surveillance_status; mod version; mod vertical_rate; -pub use icao::icao; +pub use icao::get_icao; pub(crate) use acas::threat_encounter; pub(crate) use ais::ais; diff --git a/src/decoder/adsb/icao.rs b/src/decoder/adsb/icao.rs index 1fe8f3d..e62fade 100644 --- a/src/decoder/adsb/icao.rs +++ b/src/decoder/adsb/icao.rs @@ -14,15 +14,15 @@ use crate::decoder::get_crc; /// # Examples /// /// ``` -/// use squitterator::{get_message, get_downlink_format, icao}; +/// use squitterator::{get_message, get_downlink_format, get_icao}; /// if let Some(message) = get_message("A0001838300000000000007ADA59") { /// if let Some(df) = get_downlink_format(&message) { -/// if let Some(icao_address) = icao(&message, df) { +/// if let Some(icao_address) = get_icao(&message, df) { /// assert_eq!(icao_address, 7453696); /// } /// } /// } -pub fn icao(message: &[u32], df: u32) -> Option { +pub fn get_icao(message: &[u32], df: u32) -> Option { match df { 0 | 4 | 5 | 16 | 20 | 21 => { let len = (message.len() * 4) as u32; @@ -59,7 +59,7 @@ pub(crate) fn icao_wtc(vc: &(u32, u32)) -> Option { #[cfg(test)] mod tests { - use crate::decoder::{get_downlink_format, get_message, icao}; + use crate::decoder::{get_downlink_format, get_icao, get_message}; #[test] fn test_icao() { @@ -81,7 +81,7 @@ mod tests { for (squitter, value) in squitters.iter() { if let Some(message) = get_message(squitter) { if let Some(df) = get_downlink_format(&message) { - if let Some(result) = icao(&message, df) { + if let Some(result) = get_icao(&message, df) { assert_eq!(result, *value, "Squitter: {} ICAO:{:X}", squitter, result); } } diff --git a/src/decoder/downlink/extended/update.rs b/src/decoder/downlink/extended/update.rs index 52aa207..a7b7024 100644 --- a/src/decoder/downlink/extended/update.rs +++ b/src/decoder/downlink/extended/update.rs @@ -64,7 +64,7 @@ impl decoder::Downlink for Ext { fn update(&mut self, message: &[u32]) { if let Some(df) = decoder::get_downlink_format(message) { self.df = Some(df); - self.icao = decoder::icao(message, df); + self.icao = decoder::get_icao(message, df); self.capability = decoder::get_capability(message); self.message_type = decoder::get_message_type(message); match self.message_type.0 { diff --git a/src/decoder/downlink/mode_s.rs b/src/decoder/downlink/mode_s.rs index 4649f15..1bcb32c 100644 --- a/src/decoder/downlink/mode_s.rs +++ b/src/decoder/downlink/mode_s.rs @@ -102,7 +102,7 @@ impl decoder::Downlink for Mds { fn update(&mut self, message: &[u32]) { if let Some(df) = decoder::get_downlink_format(message) { self.df = Some(df); - self.icao = decoder::icao(message, df); + self.icao = decoder::get_icao(message, df); self.altitude = decoder::altitude(message, df); } diff --git a/src/decoder/downlink/short.rs b/src/decoder/downlink/short.rs index 157f1e5..ade601d 100644 --- a/src/decoder/downlink/short.rs +++ b/src/decoder/downlink/short.rs @@ -68,7 +68,7 @@ impl decoder::Downlink for Srt { fn update(&mut self, message: &[u32]) { if let Some(df) = decoder::get_downlink_format(message) { self.df = Some(df); - self.icao = decoder::icao(message, df); + self.icao = decoder::get_icao(message, df); match df { 4 => { self.altitude = decoder::altitude(message, df); diff --git a/src/lib.rs b/src/lib.rs index 3859a94..927f2db 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,8 +7,8 @@ mod reader; pub use arguments::Args; pub use decoder::{ - get_downlink_format, get_message, icao, set_observer_coords_from_str, DisplayFlags, Downlink, - Legend, LegendHeaders, Plane, Planes, UpdateFromDownlink, DF, + get_downlink_format, get_icao, get_message, set_observer_coords_from_str, DisplayFlags, + Downlink, Legend, LegendHeaders, Plane, Planes, UpdateFromDownlink, DF, }; pub use errors::AppResult; pub use logger::initialize_logger; diff --git a/src/reader.rs b/src/reader.rs index a9958ee..ea88ac9 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -1,5 +1,5 @@ use crate::{ - get_downlink_format, get_message, icao, AppCounters, Args, DisplayFlags, Downlink, Legend, + get_downlink_format, get_icao, get_message, AppCounters, Args, DisplayFlags, Downlink, Legend, LegendHeaders, Planes, DF, }; use log::{debug, error, info}; @@ -21,10 +21,7 @@ fn read_lines(reader: R, args: &Args, planes: &mut Planes) -> Result let display_flags = DisplayFlags::from_arg_str(&args.display.concat()); if !display_flags.quiet() { - clear_screen(); - - let legend = Legend::from_display_flags(&display_flags); - legend.print_legend(); + display_legend(&display_flags); } let headers = LegendHeaders::from_display_flags(&display_flags); @@ -42,7 +39,7 @@ fn read_lines(reader: R, args: &Args, planes: &mut Planes) -> Result debug!("DF:{}, L:{}", df, &line); - let Some(icao) = icao(&message, df) else { + let Some(icao) = get_icao(&message, df) else { continue; }; @@ -78,6 +75,13 @@ fn read_lines(reader: R, args: &Args, planes: &mut Planes) -> Result Ok(()) } +fn display_legend(display_flags: &DisplayFlags) { + clear_screen(); + + let legend = Legend::from_display_flags(display_flags); + legend.print_legend(); +} + fn display_planes( args: &Args, planes: &mut Planes, From bc5f5e285a18adb69438d05fbdfaa51bbd5f83a1 Mon Sep 17 00:00:00 2001 From: Anton Sidorov Date: Mon, 10 Feb 2025 22:04:33 +0000 Subject: [PATCH 2/3] rename: --- src/decoder/adsb.rs | 2 +- src/decoder/adsb/icao.rs | 15 ++++++++++----- src/decoder/plane/simple_display.rs | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/decoder/adsb.rs b/src/decoder/adsb.rs index b151d60..b0e0450 100644 --- a/src/decoder/adsb.rs +++ b/src/decoder/adsb.rs @@ -15,7 +15,7 @@ pub(crate) use acas::threat_encounter; pub(crate) use ais::ais; pub(crate) use altitude::{altitude, altitude_delta, altitude_gnss}; pub(crate) use ground_movement::ground_movement; -pub(crate) use icao::icao_wtc; +pub(crate) use icao::get_wake_turbulence_category; pub(crate) use position::{cpr, cpr_location}; pub(crate) use squawk::squawk; pub(crate) use surveillance_status::surveillance_status; diff --git a/src/decoder/adsb/icao.rs b/src/decoder/adsb/icao.rs index e62fade..79df988 100644 --- a/src/decoder/adsb/icao.rs +++ b/src/decoder/adsb/icao.rs @@ -45,7 +45,7 @@ pub fn get_icao(message: &[u32], df: u32) -> Option { /// /// The calculated Wake Turbulence Category (WTC) as a character. /// -pub(crate) fn icao_wtc(vc: &(u32, u32)) -> Option { +pub(crate) fn get_wake_turbulence_category(vc: &(u32, u32)) -> Option { match vc { (4, 1) => Some('L'), (4, 2) => Some('S'), @@ -90,7 +90,7 @@ mod tests { } #[test] - fn test_icao_wtc() { + fn test_get_wake_turbulence_category() { let vcs = [ ((4, 1), 'L'), ((4, 2), 'S'), @@ -101,18 +101,23 @@ mod tests { ]; for (vc, value) in vcs.iter() { - if let Some(result) = crate::decoder::icao_wtc(vc) { + if let Some(result) = crate::decoder::get_wake_turbulence_category(vc) { assert_eq!(result, *value, "VC: {:?}", vc); } } } #[test] - fn test_icao_wtc_none() { + fn test_get_wake_turbulence_category_none() { let vcs = [(4, 0), (4, 6)]; for vc in vcs.iter() { - assert_eq!(crate::decoder::icao_wtc(vc), None, "VC: {:?}", vc); + assert_eq!( + crate::decoder::get_wake_turbulence_category(vc), + None, + "VC: {:?}", + vc + ); } } } diff --git a/src/decoder/plane/simple_display.rs b/src/decoder/plane/simple_display.rs index cea9373..484b176 100644 --- a/src/decoder/plane/simple_display.rs +++ b/src/decoder/plane/simple_display.rs @@ -21,7 +21,7 @@ impl SimpleDisplay for Plane { } else { write!(f, " ")?; } - if let Some(w) = decoder::icao_wtc(&self.category) { + if let Some(w) = decoder::get_wake_turbulence_category(&self.category) { write!(f, "{} ", w)?; } else { write!(f, " ")?; From d62c3cd675afb25497141f4bce670cc26bef4ab4 Mon Sep 17 00:00:00 2001 From: Anton Sidorov Date: Mon, 10 Feb 2025 22:06:44 +0000 Subject: [PATCH 3/3] rename: --- src/decoder/downlink/dfs.rs | 10 +++++----- src/decoder/downlink/extended/update.rs | 2 +- src/decoder/downlink/mode_s.rs | 2 +- src/decoder/downlink/short.rs | 2 +- src/decoder/plane.rs | 2 +- src/reader.rs | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/decoder/downlink/dfs.rs b/src/decoder/downlink/dfs.rs index 75e9aa1..33367c0 100644 --- a/src/decoder/downlink/dfs.rs +++ b/src/decoder/downlink/dfs.rs @@ -49,13 +49,13 @@ impl DF { } impl Downlink for DF { - fn from_get_message(message: &[u32]) -> Result { + fn from_message(message: &[u32]) -> Result { match get_downlink_format(message) { Some(value) => { let dl = match value { - 0..=16 => DF::SRT(Srt::from_get_message(message)?), - 17 => DF::EXT(Ext::from_get_message(message)?), - 20 | 21 => DF::MDS(Mds::from_get_message(message)?), + 0..=16 => DF::SRT(Srt::from_message(message)?), + 17 => DF::EXT(Ext::from_message(message)?), + 20 | 21 => DF::MDS(Mds::from_message(message)?), _ => DF::SRT(Srt::new()), }; Ok(dl) @@ -82,7 +82,7 @@ impl Downlink for DF { } pub trait Downlink: Sized { - fn from_get_message(message: &[u32]) -> Result; + fn from_message(message: &[u32]) -> Result; fn update(&mut self, message: &[u32]); fn icao(&self) -> Option; } diff --git a/src/decoder/downlink/extended/update.rs b/src/decoder/downlink/extended/update.rs index a7b7024..d4a8eb6 100644 --- a/src/decoder/downlink/extended/update.rs +++ b/src/decoder/downlink/extended/update.rs @@ -55,7 +55,7 @@ impl Ext { } impl decoder::Downlink for Ext { - fn from_get_message(message: &[u32]) -> Result { + fn from_message(message: &[u32]) -> Result { let mut dl = Ext::new(); dl.update(message); Ok(dl) diff --git a/src/decoder/downlink/mode_s.rs b/src/decoder/downlink/mode_s.rs index 1bcb32c..70f413f 100644 --- a/src/decoder/downlink/mode_s.rs +++ b/src/decoder/downlink/mode_s.rs @@ -93,7 +93,7 @@ impl Display for Mds { } impl decoder::Downlink for Mds { - fn from_get_message(message: &[u32]) -> Result { + fn from_message(message: &[u32]) -> Result { let mut dl = Mds::new(); dl.update(message); Ok(dl) diff --git a/src/decoder/downlink/short.rs b/src/decoder/downlink/short.rs index ade601d..edce488 100644 --- a/src/decoder/downlink/short.rs +++ b/src/decoder/downlink/short.rs @@ -59,7 +59,7 @@ impl Display for Srt { } impl decoder::Downlink for Srt { - fn from_get_message(message: &[u32]) -> Result { + fn from_message(message: &[u32]) -> Result { let mut dl = Srt::new(); dl.update(message); Ok(dl) diff --git a/src/decoder/plane.rs b/src/decoder/plane.rs index 4dcbe91..cd35698 100644 --- a/src/decoder/plane.rs +++ b/src/decoder/plane.rs @@ -118,7 +118,7 @@ impl Plane { } } - pub fn from_get_message(message: &[u32], df: u32, icao: u32, relaxed: bool) -> Self { + pub fn from_message(message: &[u32], df: u32, icao: u32, relaxed: bool) -> Self { let mut plane = Plane::new(); plane.icao = icao; (_, plane.reg) = super::icao_to_country(icao); diff --git a/src/reader.rs b/src/reader.rs index ea88ac9..06ca0f1 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -60,7 +60,7 @@ fn read_lines(reader: R, args: &Args, planes: &mut Planes) -> Result } let now = chrono::Utc::now(); - if let Ok(downlink) = DF::from_get_message(&message) { + if let Ok(downlink) = DF::from_message(&message) { if let Some(ref downlink_error_log_file) = downlink_error_log_file { downlink.log(downlink_error_log_file)?; }