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

Merge pull request #387 from AdenKoperczak/fix_negative_radar_elevation

Browse source 
Fix negative radar elevations being reported as large possitive elevations
This commit is contained in:
Dan Paulat 2025-03-01 23:29:31 -06:00 • committed by GitHub
commit db6ff3e0a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
wxdata/source/scwx/wsr88d/ar2v_file.cpp
View file

@ -66,7 +66,7 @@ public:
std::map<std::uint16_t, std::shared_ptr<rda::ElevationScan>> radarData_ {}; std::map<std::uint16_t, std::shared_ptr<rda::ElevationScan>> radarData_ {};
std::map<rda::DataBlockType, std::map<rda::DataBlockType,
std::map<std::uint16_t, std::map<float,
std::map<std::chrono::system_clock::time_point, std::map<std::chrono::system_clock::time_point,
std::shared_ptr<rda::ElevationScan>>>> std::shared_ptr<rda::ElevationScan>>>>
index_ {}; index_ {};
@ -139,52 +139,41 @@ Ar2vFile::GetElevationScan(rda::DataBlockType dataBlockType,
{ {
logger_->debug("GetElevationScan: {} degrees", elevation); logger_->debug("GetElevationScan: {} degrees", elevation);
constexpr float scaleFactor = 8.0f / 0.043945f;
std::shared_ptr<rda::ElevationScan> elevationScan = nullptr; std::shared_ptr<rda::ElevationScan> elevationScan = nullptr;
float elevationCut = 0.0f; float elevationCut = 0.0f;
std::vector<float> elevationCuts; std::vector<float> elevationCuts;
std::uint16_t codedElevation =
static_cast<std::uint16_t>(std::lroundf(elevation * scaleFactor));
if (p->index_.contains(dataBlockType)) if (p->index_.contains(dataBlockType))
{ {
auto& scans = p->index_.at(dataBlockType); auto& scans = p->index_.at(dataBlockType);
std::uint16_t lowerBound = scans.cbegin()->first; float lowerBound = scans.cbegin()->first;
std::uint16_t upperBound = scans.crbegin()->first; float upperBound = scans.crbegin()->first;
// Find closest elevation match // Find closest elevation match
for (auto& scan : scans) for (auto& scan : scans)
{ {
if (scan.first > lowerBound && scan.first <= codedElevation) if (scan.first > lowerBound && scan.first <= elevation)
{ {
lowerBound = scan.first; lowerBound = scan.first;
} }
if (scan.first < upperBound && scan.first >= codedElevation) if (scan.first < upperBound && scan.first >= elevation)
{ {
upperBound = scan.first; upperBound = scan.first;
} }
elevationCuts.push_back(scan.first / scaleFactor); elevationCuts.push_back(scan.first);
} }
std::int32_t lowerDelta = const float lowerDelta = std::abs(elevation - lowerBound);
std::abs(static_cast<std::int32_t>(codedElevation) - const float upperDelta = std::abs(elevation - upperBound);
static_cast<std::int32_t>(lowerBound));
std::int32_t upperDelta =
std::abs(static_cast<std::int32_t>(codedElevation) -
static_cast<std::int32_t>(upperBound));
// Select closest elevation match // Select closest elevation match
std::uint16_t elevationIndex = elevationCut = (lowerDelta < upperDelta) ? lowerBound : upperBound;
(lowerDelta < upperDelta) ? lowerBound : upperBound;
elevationCut = elevationIndex / scaleFactor;
// Select closest time match, not newer than the selected time // Select closest time match, not newer than the selected time
std::chrono::system_clock::time_point foundTime {}; std::chrono::system_clock::time_point foundTime {};
auto& elevationScans = scans.at(elevationIndex); auto& elevationScans = scans.at(elevationCut);
for (auto& scan : elevationScans) for (auto& scan : elevationScans)
{ {
@ -457,6 +446,8 @@ void Ar2vFileImpl::IndexFile()
{ {
logger_->debug("Indexing file"); logger_->debug("Indexing file");
constexpr float scaleFactor = 8.0f / 0.043945f;
for (auto& elevationCut : radarData_) for (auto& elevationCut : radarData_)
{ {
std::uint16_t elevationAngle {}; std::uint16_t elevationAngle {};
@ -510,7 +501,19 @@ void Ar2vFileImpl::IndexFile()
auto time = util::TimePoint(radial0->modified_julian_date(), auto time = util::TimePoint(radial0->modified_julian_date(),
radial0->collection_time()); radial0->collection_time());
index_[dataBlockType][elevationAngle][time] = elevationCut.second; // NOLINTNEXTLINE This conversion is accurate
float elevationAngleConverted = elevationAngle / scaleFactor;
// Any elevation above 90 degrees should be interpreted as a
// negative angle
// NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers)
if (elevationAngleConverted > 90)
{
elevationAngleConverted -= 360;
}
// NOLINTEND(cppcoreguidelines-avoid-magic-numbers)
index_[dataBlockType][elevationAngleConverted][time] =
elevationCut.second;
} }
} }
} }