From 1d2908b20596f1a524ced4a1455a45db4c3bdad4 Mon Sep 17 00:00:00 2001 From: AsbjornPettersen Date: Sun, 17 May 2015 23:41:34 +0200 Subject: [PATCH 1/5] New class for Month,Day,Hour.Minute. Should be implemented other places too. --- src/libais/ais.h | 20 ++++++++++++-------- src/libais/ais6.cpp | 4 +--- src/libais/ais_py.cpp | 16 ++++++++-------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/libais/ais.h b/src/libais/ais.h index 5bec7e4f..06232555 100644 --- a/src/libais/ais.h +++ b/src/libais/ais.h @@ -367,6 +367,16 @@ enum Dac { class AisBitset; +class AisMdate +{ +public: + int month; + int day; + int hour; + int min; + AisMdate() { month = day = hour = min = 0; }; +}; + class AisPoint { public: double lng_deg; @@ -625,15 +635,9 @@ class Ais6_1_5 : public Ais6 { class Ais6_1_12 : public Ais6 { public: string last_port; - int utc_month_dep; // actual time of departure - int utc_day_dep; - int utc_hour_dep; - int utc_min_dep; + AisMdate utc_dep; // actual time of departure string next_port; - int utc_month_next; // estimated arrival - int utc_day_next; - int utc_hour_next; - int utc_min_next; + AisMdate utc_next; // estimated arrival string main_danger; string imo_cat; int un; diff --git a/src/libais/ais6.cpp b/src/libais/ais6.cpp index 29eaeacd..0a6dfcf9 100644 --- a/src/libais/ais6.cpp +++ b/src/libais/ais6.cpp @@ -259,9 +259,7 @@ Ais6_1_5::Ais6_1_5(const char *nmea_payload, const size_t pad) // IMO Circ 289 - Dangerous cargo // See also Circ 236 Ais6_1_12::Ais6_1_12(const char *nmea_payload, const size_t pad) - : Ais6(nmea_payload, pad), utc_month_dep(0), utc_day_dep(0), - utc_hour_dep(0), utc_min_dep(0), utc_month_next(0), - utc_day_next(0), utc_hour_next(0), utc_min_next(0), + : Ais6(nmea_payload, pad), un(0), value(0), value_unit(0), spare2(0) { assert(dac == 1); assert(fi == 12); diff --git a/src/libais/ais_py.cpp b/src/libais/ais_py.cpp index 8741840d..e9ad276a 100644 --- a/src/libais/ais_py.cpp +++ b/src/libais/ais_py.cpp @@ -467,15 +467,15 @@ ais6_1_12_append_pydict(const char *nmea_payload, PyObject *dict, } DictSafeSetItem(dict, "last_port", msg.last_port); - DictSafeSetItem(dict, "utc_month_dep", msg.utc_month_dep); // actual - DictSafeSetItem(dict, "utc_day_dep", msg.utc_day_dep); - DictSafeSetItem(dict, "utc_hour_dep", msg.utc_hour_dep); - DictSafeSetItem(dict, "utc_min_dep", msg.utc_min_dep); + DictSafeSetItem(dict, "utc_month_dep", msg.utc_dep.month); // actual + DictSafeSetItem(dict, "utc_day_dep", msg.utc_dep.day); + DictSafeSetItem(dict, "utc_hour_dep", msg.utc_dep.hour); + DictSafeSetItem(dict, "utc_min_dep", msg.utc_dep.min); DictSafeSetItem(dict, "next_port", msg.next_port); - DictSafeSetItem(dict, "utc_month_next", msg.utc_month_next); // estimated - DictSafeSetItem(dict, "utc_day_next", msg.utc_day_next); - DictSafeSetItem(dict, "utc_hour_next", msg.utc_hour_next); - DictSafeSetItem(dict, "utc_min_next", msg.utc_min_next); + DictSafeSetItem(dict, "utc_month_next", msg.utc_next.month); // estimated + DictSafeSetItem(dict, "utc_day_next", msg.utc_next.day); + DictSafeSetItem(dict, "utc_hour_next", msg.utc_next.hour); + DictSafeSetItem(dict, "utc_min_next", msg.utc_next.min); DictSafeSetItem(dict, "main_danger", msg.main_danger); DictSafeSetItem(dict, "imo_cat", msg.imo_cat); DictSafeSetItem(dict, "un", msg.un); From 87977d420a363381efef1e6b3148c89f1d8f208c Mon Sep 17 00:00:00 2001 From: AsbjornPettersen Date: Thu, 5 May 2016 20:43:19 +0200 Subject: [PATCH 2/5] test test --- Changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Changelog.md b/Changelog.md index 6b0df194..812741fb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ + + + + Changelog and release history for libais ======================================== From 4a2e2b040b6d8e35925225f0cd32db71e32730ea Mon Sep 17 00:00:00 2001 From: AsbjornPettersen Date: Thu, 5 May 2016 20:45:15 +0200 Subject: [PATCH 3/5] Revert "test" This reverts commit 87977d420a363381efef1e6b3148c89f1d8f208c. --- Changelog.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index 812741fb..6b0df194 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,7 +1,3 @@ - - - - Changelog and release history for libais ======================================== From 305b64c8723cdfdef06d5ffeb5f7cdd1a186de63 Mon Sep 17 00:00:00 2001 From: AsbjornPettersen Date: Thu, 5 May 2016 21:36:50 +0200 Subject: [PATCH 4/5] Namespace Namespace for Ais5 --- src/libais/ais_decode_normed.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libais/ais_decode_normed.cpp b/src/libais/ais_decode_normed.cpp index 09bcec6f..5b8476b3 100644 --- a/src/libais/ais_decode_normed.cpp +++ b/src/libais/ais_decode_normed.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) { if (fields.size() < 7) continue; if (fields[5].size() < 5) continue; if (fields[5][0] != '5') continue; - Ais5 m5(fields[5].c_str(), 2); + libais::Ais5 m5(fields[5].c_str(), 2); if (m5.had_error()) continue; std::cout << m5.mmsi << "," << m5.name << "," << m5.callsign << "," << m5.type_and_cargo << std::endl; From d6678d8e066440d44f7f4a2836ac99e19e58ad90 Mon Sep 17 00:00:00 2001 From: AsbjornPettersen Date: Fri, 6 May 2016 13:20:30 +0200 Subject: [PATCH 5/5] Namespace Namespace libais for test program --- src/libais/ais_decode_normed.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libais/ais_decode_normed.cpp b/src/libais/ais_decode_normed.cpp index 09bcec6f..5b8476b3 100644 --- a/src/libais/ais_decode_normed.cpp +++ b/src/libais/ais_decode_normed.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) { if (fields.size() < 7) continue; if (fields[5].size() < 5) continue; if (fields[5][0] != '5') continue; - Ais5 m5(fields[5].c_str(), 2); + libais::Ais5 m5(fields[5].c_str(), 2); if (m5.had_error()) continue; std::cout << m5.mmsi << "," << m5.name << "," << m5.callsign << "," << m5.type_and_cargo << std::endl;