From 6d4428b8e0e7a608c548939836d64f6528a786e5 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 8 Jan 2022 22:36:46 -0600 Subject: [PATCH] Wind barb data packet --- .../scwx/wsr88d/rpg/wind_barb_data_packet.hpp | 44 +++++ .../source/scwx/wsr88d/rpg/packet_factory.cpp | 2 + .../scwx/wsr88d/rpg/wind_barb_data_packet.cpp | 151 ++++++++++++++++++ wxdata/wxdata.cmake | 2 + 4 files changed, 199 insertions(+) create mode 100644 wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp create mode 100644 wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp diff --git a/wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp new file mode 100644 index 00000000..1eab0230 --- /dev/null +++ b/wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp @@ -0,0 +1,44 @@ +#pragma once + +#include + +#include +#include + +namespace scwx +{ +namespace wsr88d +{ +namespace rpg +{ + +class WindBarbDataPacketImpl; + +class WindBarbDataPacket : public Packet +{ +public: + explicit WindBarbDataPacket(); + ~WindBarbDataPacket(); + + WindBarbDataPacket(const WindBarbDataPacket&) = delete; + WindBarbDataPacket& operator=(const WindBarbDataPacket&) = delete; + + WindBarbDataPacket(WindBarbDataPacket&&) noexcept; + WindBarbDataPacket& operator=(WindBarbDataPacket&&) noexcept; + + uint16_t packet_code() const; + uint16_t length_of_block() const; + + size_t data_size() const override; + + bool Parse(std::istream& is) override; + + static std::shared_ptr Create(std::istream& is); + +private: + std::unique_ptr p; +}; + +} // namespace rpg +} // namespace wsr88d +} // namespace scwx diff --git a/wxdata/source/scwx/wsr88d/rpg/packet_factory.cpp b/wxdata/source/scwx/wsr88d/rpg/packet_factory.cpp index ca006570..da90f8b1 100644 --- a/wxdata/source/scwx/wsr88d/rpg/packet_factory.cpp +++ b/wxdata/source/scwx/wsr88d/rpg/packet_factory.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -32,6 +33,7 @@ typedef std::function(std::istream&)> static const std::unordered_map create_ { {1, TextAndSpecialSymbolPacket::Create}, {2, TextAndSpecialSymbolPacket::Create}, + {4, WindBarbDataPacket::Create}, {5, VectorArrowDataPacket::Create}, {6, LinkedVectorPacket::Create}, {7, UnlinkedVectorPacket::Create}, diff --git a/wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp new file mode 100644 index 00000000..e593ae39 --- /dev/null +++ b/wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp @@ -0,0 +1,151 @@ +#include + +#include +#include + +#include + +namespace scwx +{ +namespace wsr88d +{ +namespace rpg +{ + +static const std::string logPrefix_ = + "[scwx::wsr88d::rpg::wind_barb_data_packet] "; + +struct WindBarb +{ + uint16_t value_; + int16_t xCoordinate_; + int16_t yCoordinate_; + uint16_t directionOfWind_; + uint16_t windSpeed_; + + WindBarb() : + value_ {0}, + xCoordinate_ {0}, + yCoordinate_ {0}, + directionOfWind_ {0}, + windSpeed_ {0} + { + } +}; + +class WindBarbDataPacketImpl +{ +public: + explicit WindBarbDataPacketImpl() : + packetCode_ {0}, lengthOfBlock_ {0}, windBarb_ {} + { + } + ~WindBarbDataPacketImpl() = default; + + uint16_t packetCode_; + uint16_t lengthOfBlock_; + + std::vector windBarb_; +}; + +WindBarbDataPacket::WindBarbDataPacket() : + p(std::make_unique()) +{ +} +WindBarbDataPacket::~WindBarbDataPacket() = default; + +WindBarbDataPacket::WindBarbDataPacket(WindBarbDataPacket&&) noexcept = default; +WindBarbDataPacket& +WindBarbDataPacket::operator=(WindBarbDataPacket&&) noexcept = default; + +uint16_t WindBarbDataPacket::packet_code() const +{ + return p->packetCode_; +} + +uint16_t WindBarbDataPacket::length_of_block() const +{ + return p->lengthOfBlock_; +} + +size_t WindBarbDataPacket::data_size() const +{ + return p->lengthOfBlock_ + 4u; +} + +bool WindBarbDataPacket::Parse(std::istream& is) +{ + bool blockValid = true; + + std::streampos isBegin = is.tellg(); + + is.read(reinterpret_cast(&p->packetCode_), 2); + is.read(reinterpret_cast(&p->lengthOfBlock_), 2); + + p->packetCode_ = ntohs(p->packetCode_); + p->lengthOfBlock_ = ntohs(p->lengthOfBlock_); + + if (is.eof()) + { + BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "Reached end of file"; + blockValid = false; + } + else + { + if (p->packetCode_ != 4) + { + BOOST_LOG_TRIVIAL(warning) + << logPrefix_ << "Invalid packet code: " << p->packetCode_; + blockValid = false; + } + } + + // The number of vectors is equal to the size divided by the number of bytes + // in a vector + size_t vectorCount = p->lengthOfBlock_ / 10; + + p->windBarb_.resize(vectorCount); + + for (int v = 0; v < vectorCount && !is.eof(); v++) + { + WindBarb& windBarb = p->windBarb_[v]; + + is.read(reinterpret_cast(&windBarb.value_), 2); + is.read(reinterpret_cast(&windBarb.xCoordinate_), 2); + is.read(reinterpret_cast(&windBarb.yCoordinate_), 2); + is.read(reinterpret_cast(&windBarb.directionOfWind_), 2); + is.read(reinterpret_cast(&windBarb.windSpeed_), 2); + + windBarb.value_ = ntohs(windBarb.value_); + windBarb.xCoordinate_ = ntohs(windBarb.xCoordinate_); + windBarb.yCoordinate_ = ntohs(windBarb.yCoordinate_); + windBarb.directionOfWind_ = ntohs(windBarb.directionOfWind_); + windBarb.windSpeed_ = ntohs(windBarb.windSpeed_); + } + + std::streampos isEnd = is.tellg(); + + if (!ValidateMessage(is, isEnd - isBegin)) + { + blockValid = false; + } + + return blockValid; +} + +std::shared_ptr WindBarbDataPacket::Create(std::istream& is) +{ + std::shared_ptr packet = + std::make_shared(); + + if (!packet->Parse(is)) + { + packet.reset(); + } + + return packet; +} + +} // namespace rpg +} // namespace wsr88d +} // namespace scwx diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index 4495b55e..f588c2b3 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -63,6 +63,7 @@ set(HDR_WSR88D_RPG include/scwx/wsr88d/rpg/digital_precipitation_data_array_pack include/scwx/wsr88d/rpg/unlinked_contour_vector_packet.hpp include/scwx/wsr88d/rpg/unlinked_vector_packet.hpp include/scwx/wsr88d/rpg/vector_arrow_data_packet.hpp + include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp include/scwx/wsr88d/rpg/wmo_header.hpp) set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.cpp source/scwx/wsr88d/rpg/digital_radial_data_array_packet.cpp @@ -81,6 +82,7 @@ set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/digital_precipitation_data_array_packe source/scwx/wsr88d/rpg/unlinked_contour_vector_packet.cpp source/scwx/wsr88d/rpg/unlinked_vector_packet.cpp source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp + source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp source/scwx/wsr88d/rpg/wmo_header.cpp) add_library(wxdata OBJECT ${HDR_COMMON}