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

Infrastructure updates for multiple elevations

Browse source
This commit is contained in:
Dan Paulat 2021-11-14 14:20:24 -06:00
parent 87581892a7
commit 19f1207384
8 changed files with 85 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
wxdata/include/scwx/wsr88d/ar2v_file.hpp
View file

@ -40,9 +40,9 @@ public:
std::map<uint16_t, std::shared_ptr<rda::ElevationScan>> radar_data() const;
std::shared_ptr<const rda::VolumeCoveragePatternData> vcp_data() const;
std::shared_ptr<rda::ElevationScan>
std::pair<float, std::shared_ptr<rda::ElevationScan>>
GetElevationScan(rda::DataBlockType dataBlockType,
uint16_t elevation,
float elevation,
std::chrono::system_clock::time_point time) const;
bool LoadFile(const std::string& filename);

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

@ -106,21 +106,56 @@ std::shared_ptr<const rda::VolumeCoveragePatternData> Ar2vFile::vcp_data() const
return p->vcpData_;
}
std::shared_ptr<rda::ElevationScan>
std::pair<float, std::shared_ptr<rda::ElevationScan>>
Ar2vFile::GetElevationScan(rda::DataBlockType dataBlockType,
uint16_t elevation,
float elevation,
std::chrono::system_clock::time_point time) const
{
std::shared_ptr<rda::ElevationScan> elevationScan = nullptr;
constexpr float scaleFactor = 8.0f / 0.043945f;
// TODO: 88 = 0.5 degrees - this should be parameterized and searched
if (p->index_.contains(dataBlockType) &&
p->index_.at(dataBlockType).contains(88))
float elevationFound = 0.0f;
std::shared_ptr<rda::ElevationScan> elevationScan = nullptr;
uint16_t codedElevation =
static_cast<uint16_t>(std::lroundf(elevation * scaleFactor));
if (p->index_.contains(dataBlockType))
{
return p->index_.at(dataBlockType).at(88);
auto scans = p->index_.at(dataBlockType);
uint16_t lowerBound = scans.cbegin()->first;
uint16_t upperBound = scans.crbegin()->first;
for (auto scan : scans)
{
if (scan.first > lowerBound && scan.first < codedElevation)
{
lowerBound = scan.first;
}
if (scan.first < upperBound && scan.first > codedElevation)
{
upperBound = scan.first;
}
}
uint16_t lowerDelta = std::abs(static_cast<int32_t>(codedElevation) -
static_cast<int32_t>(lowerBound));
uint16_t upperDelta = std::abs(static_cast<int32_t>(codedElevation) -
static_cast<int32_t>(upperBound));
if (lowerDelta < upperDelta)
{
elevationFound = lowerBound / scaleFactor;
elevationScan = scans.at(lowerBound);
}
else
{
elevationFound = upperBound / scaleFactor;
elevationScan = scans.at(upperBound);
}
}
return elevationScan;
return std::make_pair(elevationFound, elevationScan);
}
bool Ar2vFile::LoadFile(const std::string& filename)