blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 07:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not display an elevation number when there is non

Browse source
This commit is contained in:
AdenKoperczak 2025-04-13 10:59:41 -04:00
parent 484c08c455
commit 24f5f0a3e3
No known key found for this signature in database
GPG key ID: 9843017036F62EE7
12 changed files with 166 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

98
wxdata/include/scwx/wsr88d/rpg/product_description_block.hpp
View file

@ -9,11 +9,7 @@
#include <units/angle.h>
namespace scwx
{
namespace wsr88d
{
namespace rpg
namespace scwx::wsr88d::rpg
{
class ProductDescriptionBlockImpl;
@ -22,7 +18,7 @@ class ProductDescriptionBlock : public awips::Message
{
public:
explicit ProductDescriptionBlock();
~ProductDescriptionBlock();
~ProductDescriptionBlock() override;
ProductDescriptionBlock(const ProductDescriptionBlock&) = delete;
ProductDescriptionBlock& operator=(const ProductDescriptionBlock&) = delete;
@ -30,57 +26,59 @@ public:
ProductDescriptionBlock(ProductDescriptionBlock&&) noexcept;
ProductDescriptionBlock& operator=(ProductDescriptionBlock&&) noexcept;
int16_t block_divider() const;
float latitude_of_radar() const;
float longitude_of_radar() const;
int16_t height_of_radar() const;
int16_t product_code() const;
uint16_t operational_mode() const;
uint16_t volume_coverage_pattern() const;
int16_t sequence_number() const;
uint16_t volume_scan_number() const;
uint16_t volume_scan_date() const;
uint32_t volume_scan_start_time() const;
uint16_t generation_date_of_product() const;
uint32_t generation_time_of_product() const;
uint16_t elevation_number() const;
uint16_t data_level_threshold(size_t i) const;
uint8_t version() const;
uint8_t spot_blank() const;
uint32_t offset_to_symbology() const;
uint32_t offset_to_graphic() const;
uint32_t offset_to_tabular() const;
[[nodiscard]] int16_t block_divider() const;
[[nodiscard]] float latitude_of_radar() const;
[[nodiscard]] float longitude_of_radar() const;
[[nodiscard]] int16_t height_of_radar() const;
[[nodiscard]] int16_t product_code() const;
[[nodiscard]] uint16_t operational_mode() const;
[[nodiscard]] uint16_t volume_coverage_pattern() const;
[[nodiscard]] int16_t sequence_number() const;
[[nodiscard]] uint16_t volume_scan_number() const;
[[nodiscard]] uint16_t volume_scan_date() const;
[[nodiscard]] uint32_t volume_scan_start_time() const;
[[nodiscard]] uint16_t generation_date_of_product() const;
[[nodiscard]] uint32_t generation_time_of_product() const;
[[nodiscard]] uint16_t elevation_number() const;
[[nodiscard]] uint16_t data_level_threshold(size_t i) const;
[[nodiscard]] uint8_t version() const;
[[nodiscard]] uint8_t spot_blank() const;
[[nodiscard]] uint32_t offset_to_symbology() const;
[[nodiscard]] uint32_t offset_to_graphic() const;
[[nodiscard]] uint32_t offset_to_tabular() const;
float range() const;
uint16_t range_raw() const;
float x_resolution() const;
uint16_t x_resolution_raw() const;
float y_resolution() const;
uint16_t y_resolution_raw() const;
[[nodiscard]] float range() const;
[[nodiscard]] uint16_t range_raw() const;
[[nodiscard]] float x_resolution() const;
[[nodiscard]] uint16_t x_resolution_raw() const;
[[nodiscard]] float y_resolution() const;
[[nodiscard]] uint16_t y_resolution_raw() const;
uint16_t threshold() const;
float offset() const;
float scale() const;
uint16_t number_of_levels() const;
[[nodiscard]] uint16_t threshold() const;
[[nodiscard]] float offset() const;
[[nodiscard]] float scale() const;
[[nodiscard]] uint16_t number_of_levels() const;
std::optional<DataLevelCode> data_level_code(std::uint8_t level) const;
std::optional<float> data_value(std::uint8_t level) const;
[[nodiscard]] std::optional<DataLevelCode>
data_level_code(std::uint8_t level) const;
[[nodiscard]] std::optional<float> data_value(std::uint8_t level) const;
std::uint16_t log_start() const;
float log_offset() const;
float log_scale() const;
[[nodiscard]] std::uint16_t log_start() const;
[[nodiscard]] float log_offset() const;
[[nodiscard]] float log_scale() const;
float gr_scale() const;
[[nodiscard]] float gr_scale() const;
std::uint8_t data_mask() const;
std::uint8_t topped_mask() const;
[[nodiscard]] std::uint8_t data_mask() const;
[[nodiscard]] std::uint8_t topped_mask() const;
units::angle::degrees<double> elevation() const;
[[nodiscard]] units::angle::degrees<double> elevation() const;
[[nodiscard]] bool has_elevation() const;
bool IsCompressionEnabled() const;
bool IsDataLevelCoded() const;
[[nodiscard]] bool IsCompressionEnabled() const;
[[nodiscard]] bool IsDataLevelCoded() const;
size_t data_size() const override;
[[nodiscard]] size_t data_size() const override;
bool Parse(std::istream& is) override;
@ -90,6 +88,4 @@ private:
std::unique_ptr<ProductDescriptionBlockImpl> p;
};
} // namespace rpg
} // namespace wsr88d
} // namespace scwx
} // namespace scwx::wsr88d::rpg

7
wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
View file

@ -724,7 +724,7 @@ units::angle::degrees<double> ProductDescriptionBlock::elevation() const
{
double elevation = 0.0;
if (p->elevationNumber_ > 0)
if (has_elevation())
{
// Elevation is given in tenths of a degree
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
@ -734,6 +734,11 @@ units::angle::degrees<double> ProductDescriptionBlock::elevation() const
return units::angle::degrees<double> {elevation};
}
bool ProductDescriptionBlock::has_elevation() const
{
return p->elevationNumber_ > 0;
}
bool ProductDescriptionBlock::IsCompressionEnabled() const
{
bool isCompressed = false;