Modified RDA message clang-tidy cleanup

This commit is contained in:
Dan Paulat 2025-05-12 23:24:49 -05:00
parent 2025698d88
commit fd6c224fc2
10 changed files with 1365 additions and 1310 deletions

View file

@ -2,11 +2,7 @@
#include <scwx/wsr88d/rda/generic_radar_data.hpp>
namespace scwx
{
namespace wsr88d
{
namespace rda
namespace scwx::wsr88d::rda
{
class DigitalRadarDataGeneric : public GenericRadarData
@ -27,30 +23,31 @@ public:
DigitalRadarDataGeneric(DigitalRadarDataGeneric&&) noexcept;
DigitalRadarDataGeneric& operator=(DigitalRadarDataGeneric&&) noexcept;
std::string radar_identifier() const;
std::uint32_t collection_time() const;
std::uint16_t modified_julian_date() const;
std::uint16_t azimuth_number() const;
units::degrees<float> azimuth_angle() const;
std::uint8_t compression_indicator() const;
std::uint16_t radial_length() const;
std::uint8_t azimuth_resolution_spacing() const;
std::uint8_t radial_status() const;
std::uint16_t elevation_number() const;
std::uint8_t cut_sector_number() const;
units::degrees<float> elevation_angle() const;
std::uint8_t radial_spot_blanking_status() const;
std::uint8_t azimuth_indexing_mode() const;
std::uint16_t data_block_count() const;
std::uint16_t volume_coverage_pattern_number() const;
[[nodiscard]] std::string radar_identifier() const;
[[nodiscard]] std::uint32_t collection_time() const override;
[[nodiscard]] std::uint16_t modified_julian_date() const override;
[[nodiscard]] std::uint16_t azimuth_number() const override;
[[nodiscard]] units::degrees<float> azimuth_angle() const override;
[[nodiscard]] std::uint8_t compression_indicator() const;
[[nodiscard]] std::uint16_t radial_length() const;
[[nodiscard]] std::uint8_t azimuth_resolution_spacing() const;
[[nodiscard]] std::uint8_t radial_status() const;
[[nodiscard]] std::uint16_t elevation_number() const override;
[[nodiscard]] std::uint8_t cut_sector_number() const;
[[nodiscard]] units::degrees<float> elevation_angle() const;
[[nodiscard]] std::uint8_t radial_spot_blanking_status() const;
[[nodiscard]] std::uint8_t azimuth_indexing_mode() const;
[[nodiscard]] std::uint16_t data_block_count() const;
[[nodiscard]] std::uint16_t volume_coverage_pattern_number() const override;
std::shared_ptr<ElevationDataBlock> elevation_data_block() const;
std::shared_ptr<RadialDataBlock> radial_data_block() const;
std::shared_ptr<VolumeDataBlock> volume_data_block() const;
std::shared_ptr<GenericRadarData::MomentDataBlock>
moment_data_block(DataBlockType type) const;
[[nodiscard]] std::shared_ptr<ElevationDataBlock>
elevation_data_block() const;
[[nodiscard]] std::shared_ptr<RadialDataBlock> radial_data_block() const;
[[nodiscard]] std::shared_ptr<VolumeDataBlock> volume_data_block() const;
[[nodiscard]] std::shared_ptr<GenericRadarData::MomentDataBlock>
moment_data_block(DataBlockType type) const override;
bool Parse(std::istream& is);
bool Parse(std::istream& is) override;
static std::shared_ptr<DigitalRadarDataGeneric>
Create(Level2MessageHeader&& header, std::istream& is);
@ -65,11 +62,14 @@ class DigitalRadarDataGeneric::DataBlock
protected:
explicit DataBlock(const std::string& dataBlockType,
const std::string& dataName);
public:
virtual ~DataBlock();
DataBlock(const DataBlock&) = delete;
DataBlock& operator=(const DataBlock&) = delete;
protected:
DataBlock(DataBlock&&) noexcept;
DataBlock& operator=(DataBlock&&) noexcept;
@ -118,17 +118,17 @@ public:
MomentDataBlock(MomentDataBlock&&) noexcept;
MomentDataBlock& operator=(MomentDataBlock&&) noexcept;
std::uint16_t number_of_data_moment_gates() const;
units::kilometers<float> data_moment_range() const;
std::int16_t data_moment_range_raw() const;
units::kilometers<float> data_moment_range_sample_interval() const;
std::uint16_t data_moment_range_sample_interval_raw() const;
float snr_threshold() const;
std::int16_t snr_threshold_raw() const;
std::uint8_t data_word_size() const;
float scale() const;
float offset() const;
const void* data_moments() const;
[[nodiscard]] std::uint16_t number_of_data_moment_gates() const override;
[[nodiscard]] units::kilometers<float> data_moment_range() const override;
[[nodiscard]] std::int16_t data_moment_range_raw() const override;
[[nodiscard]] units::kilometers<float> data_moment_range_sample_interval() const override;
[[nodiscard]] std::uint16_t data_moment_range_sample_interval_raw() const override;
[[nodiscard]] float snr_threshold() const;
[[nodiscard]] std::int16_t snr_threshold_raw() const override;
[[nodiscard]] std::uint8_t data_word_size() const override;
[[nodiscard]] float scale() const override;
[[nodiscard]] float offset() const override;
[[nodiscard]] const void* data_moments() const override;
static std::shared_ptr<MomentDataBlock>
Create(const std::string& dataBlockType,
@ -155,7 +155,7 @@ public:
RadialDataBlock(RadialDataBlock&&) noexcept;
RadialDataBlock& operator=(RadialDataBlock&&) noexcept;
float unambiguous_range() const;
[[nodiscard]] float unambiguous_range() const;
static std::shared_ptr<RadialDataBlock>
Create(const std::string& dataBlockType,
@ -182,9 +182,9 @@ public:
VolumeDataBlock(VolumeDataBlock&&) noexcept;
VolumeDataBlock& operator=(VolumeDataBlock&&) noexcept;
float latitude() const;
float longitude() const;
std::uint16_t volume_coverage_pattern_number() const;
[[nodiscard]] float latitude() const;
[[nodiscard]] float longitude() const;
[[nodiscard]] std::uint16_t volume_coverage_pattern_number() const;
static std::shared_ptr<VolumeDataBlock>
Create(const std::string& dataBlockType,
@ -198,6 +198,4 @@ private:
bool Parse(std::istream& is);
};
} // namespace rda
} // namespace wsr88d
} // namespace scwx
} // namespace scwx::wsr88d::rda