fixed serialization and deserialization

src/bin/aisparser.rs

@@ -1,8 +1,6 @@
 use ais::lib;
 use ais::sentence::{AisFragments, AisParser, AisSentence};
 use lib::std::io::{self, BufRead};
-use serde_json;
-
 
 fn parse_nmea_line_to_json(parser: &mut AisParser, line: &[u8]) -> Result<(), ais::errors::Error> {
     let sentence = parser.parse(line, true)?;

src/lib.rs

@@ -2,7 +2,7 @@
 //!
 //! This library parses NMEA AIS (Automatic Identification System) sentences and provides
 //! structured representations of the data, allowing further processing or analysis.
-//! 
+//!
 //! # Features
 //! - Parses AIS NMEA sentences into structured types.
 //! - Supports JSON serialization and deserialization for `AisSentence` objects.
@@ -14,7 +14,7 @@
 //!
 //! let line = b"!AIVDM,1,1,,B,E>kb9O9aS@7PUh10dh19@;0Tah2cWrfP:l?M`00003vP100,0*01";
 //! let mut parser = AisParser::new();
-//! 
+//!
 //! if let AisFragments::Complete(sentence) = parser.parse(line, true).unwrap() {
 //!     assert_eq!(sentence.num_fragments, 1);
 //!     assert_eq!(sentence.channel, Some('B'));
@@ -85,8 +85,8 @@ pub mod sentence;
 pub use errors::Result;
 pub use sentence::{AisFragments, AisParser};
 
-use serde_json::Error as SerdeError;
 use sentence::AisSentence;
+use serde_json::Error as SerdeError;
 
 /// Serializes an `AisSentence` to JSON
 pub fn serialize_to_json(sentence: &AisSentence) -> std::result::Result<String, SerdeError> {
@@ -112,7 +112,7 @@ mod test_helpers {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::sentence::{AisReportType, TalkerId, AisSentence};
+    use crate::sentence::{AisReportType, AisSentence, TalkerId};
 
     const TEST_MESSAGES: [&[u8]; 8] = [
         b"!AIVDM,1,1,,B,E>kb9O9aS@7PUh10dh19@;0Tah2cWrfP:l?M`00003vP100,0*01",
@@ -144,8 +144,8 @@ mod tests {
             println!("Serialized JSON: {}", json);
 
             // Deserialize back from JSON
-            let deserialized_sentence = deserialize_from_json(&json)
-                .expect("Failed to deserialize from JSON");
+            let deserialized_sentence =
+                deserialize_from_json(&json).expect("Failed to deserialize from JSON");
 
             assert_eq!(sentence, deserialized_sentence);
         }
@@ -162,7 +162,7 @@ mod tests {
             fragment_number: 1,
             message_id: Some(123),
             channel: Some('A'),
-            data: vec![69, 62, 107, 98, 57, 79],  // sample data; replace with real data if needed
+            data: vec![69, 62, 107, 98, 57, 79], // sample data; replace with real data if needed
             fill_bit_count: 0,
             message_type: 1,
         };
@@ -171,8 +171,8 @@ mod tests {
         let json_data = serialize_to_json(&original_sentence).expect("Serialization failed");
 
         // Deserialize back to an AisSentence
-        let deserialized_sentence: AisSentence = deserialize_from_json(&json_data)
-            .expect("Deserialization failed");
+        let deserialized_sentence: AisSentence =
+            deserialize_from_json(&json_data).expect("Deserialization failed");
 
         // Check if the deserialized struct matches the original
         assert_eq!(original_sentence, deserialized_sentence);

src/messages/addressed_safety_related.rs

@@ -5,7 +5,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize, Eq)]
 pub struct AddressedSafetyRelatedMessage {

src/messages/aid_to_navigation_report.rs

@@ -7,7 +7,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum NavaidType {

src/messages/assignment_mode_command.rs

@@ -5,7 +5,7 @@ use super::AisMessageType;
 use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AssignmentModeCommand {

src/messages/base_station_report.rs

@@ -8,7 +8,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct BaseStationReport {

src/messages/binary_acknowledge.rs

@@ -1,14 +1,14 @@
 //! Binary Acknowledge (type 7)
-#[cfg(all(not(feature = "std"), not(feature = "alloc")))] 
- use super::nom_noalloc::many_m_n; 
+#[cfg(all(not(feature = "std"), not(feature = "alloc")))]
+use super::nom_noalloc::many_m_n;
 use super::AisMessageType;
 use crate::errors::Result;
 use crate::lib;
 use nom::bits::{bits, complete::take as take_bits};
-#[cfg(any(feature = "std", feature = "alloc"))] 
+#[cfg(any(feature = "std", feature = "alloc"))]
 use nom::multi::many_m_n;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Acknowledgement {

src/messages/binary_addressed.rs

@@ -6,7 +6,7 @@ use crate::lib;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[cfg(all(not(feature = "std"), not(feature = "alloc")))]
 const MAX_DATA_SIZE_BYTES: usize = 119;

src/messages/binary_broadcast_message.rs

@@ -4,7 +4,7 @@ use crate::errors::Result;
 use crate::lib;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[cfg(all(not(feature = "std"), not(feature = "alloc")))]
 const MAX_DATA_SIZE_BYTES: usize = 119;

src/messages/data_link_management_message.rs

@@ -8,7 +8,7 @@ use nom::bits::{bits, complete::take as take_bits};
 #[cfg(any(feature = "std", feature = "alloc"))]
 use nom::multi::many_m_n;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct SlotReservation {

src/messages/dgnss_broadcast_binary_message.rs

@@ -6,7 +6,7 @@ use crate::lib;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[cfg(all(not(feature = "std"), not(feature = "alloc")))]
 const MAX_DATA_SIZE_BYTES: usize = 119;

src/messages/extended_class_b_position_report.rs

@@ -10,7 +10,7 @@ use crate::messages::types::ShipType;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct ExtendedClassBPositionReport {

src/messages/interrogation.rs

@@ -6,7 +6,7 @@ use crate::errors::Result;
 use crate::lib;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Message {

src/messages/long_range_ais_broadcast.rs

@@ -7,7 +7,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct LongRangeAisBroadcastMessage {

src/messages/mod.rs

@@ -4,11 +4,11 @@ use crate::lib;
 use crate::sentence::AisRawData;
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "std")]
-
 pub mod addressed_safety_related;
 pub mod aid_to_navigation_report;
 pub mod assignment_mode_command;
 pub mod base_station_report;
+pub mod binary_acknowledge;
 pub mod binary_addressed;
 pub mod binary_broadcast_message;
 pub mod data_link_management_message;
@@ -31,7 +31,6 @@ pub mod static_data_report;
 pub mod types;
 pub mod utc_date_inquiry;
 pub mod utc_date_response;
-pub mod binary_acknowledge;
 
 pub use parsers::message_type;
 

src/messages/navigation.rs

@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 pub fn parse_speed_over_ground(data: u16) -> Option<f32> {
     match data {

src/messages/position_report.rs

@@ -7,7 +7,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct PositionReport {

src/messages/radio_status.rs

@@ -3,7 +3,7 @@ use nom::bits::complete::take as take_bits;
 use nom::combinator::map;
 use nom::error::ErrorKind;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum RadioStatus {

src/messages/safety_related_acknowledgment.rs

@@ -8,7 +8,7 @@ use nom::bits::{bits, complete::take as take_bits};
 #[cfg(any(feature = "std", feature = "alloc"))]
 use nom::multi::many_m_n;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Acknowledgement {

src/messages/safety_related_broadcast.rs

@@ -5,7 +5,7 @@ use super::AisMessageType;
 use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize, Eq)]
 pub struct SafetyRelatedBroadcastMessage {

src/messages/standard_aircraft_position_report.rs

@@ -10,7 +10,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct SARPositionReport {

src/messages/standard_class_b_position_report.rs

@@ -8,7 +8,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct StandardClassBPositionReport {

src/messages/static_and_voyage_related_data.rs

@@ -7,9 +7,9 @@ use crate::lib;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, PartialEq,Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct StaticAndVoyageRelatedData {
     pub message_type: u8,
     pub repeat_indicator: u8,

src/messages/static_data_report.rs

@@ -7,7 +7,7 @@ use crate::lib;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct StaticDataReport {

src/messages/types.rs

@@ -1,6 +1,6 @@
 //! Common data types
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 /// Electronic Position Fixing Device type. This is the
 /// type of device used for determining the object's

src/messages/utc_date_inquiry.rs

@@ -3,7 +3,7 @@ use super::AisMessageType;
 use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct UtcDateInquiry {

src/messages/utc_date_response.rs

@@ -8,7 +8,7 @@ use crate::errors::Result;
 use nom::bits::{bits, complete::take as take_bits};
 use nom::combinator::map;
 use nom::IResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct UtcDateResponse {

src/sentence.rs

@@ -11,8 +11,7 @@ use nom::combinator::{map, map_res, opt, peek, verify};
 use nom::number::complete::hex_u32;
 use nom::sequence::{delimited, terminated};
 use nom::IResult;
-use serde::{Serialize, Deserialize};
-
+use serde::{Deserialize, Serialize};
 
 pub const MAX_SENTENCE_SIZE_BYTES: usize = 384;
 
@@ -110,7 +109,7 @@ impl From<AisFragments> for Result<AisSentence> {
     }
 }
 
-#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+#[derive(Serialize, Deserialize, PartialEq, Debug)]
 pub struct AisParser {
     message_id: Option<u8>,
     fragment_number: u8,
@@ -191,6 +190,12 @@ impl AisParser {
     }
 }
 
+impl Default for AisParser {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[derive(Serialize, Deserialize, PartialEq, Debug)]
 /// Represents an NMEA sentence parsed as AIS
 pub struct AisSentence {