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

Store elevation scans as a shared pointer to avoid needless copying

Browse source
This commit is contained in:
Dan Paulat 2021-11-13 00:59:57 -06:00
parent efeb87baaa
commit ab616b0c62
6 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,10 +47,8 @@ public:
size_t numRecords_;
std::shared_ptr<rda::VolumeCoveragePatternData> vcpData_;
std::map<uint16_t,
std::map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
radarData_;
std::shared_ptr<rda::VolumeCoveragePatternData> vcpData_;
std::map<uint16_t, std::shared_ptr<rda::ElevationScan>> radarData_;
std::list<std::stringstream> rawRecords_;
};
@ -82,7 +80,7 @@ std::chrono::system_clock::time_point Ar2vFile::end_time() const
if (p->radarData_.size() > 0)
{
std::shared_ptr<rda::DigitalRadarData> lastRadial =
p->radarData_.crbegin()->second.crbegin()->second;
p->radarData_.crbegin()->second->crbegin()->second;
endTime = util::TimePoint(lastRadial->modified_julian_date(),
lastRadial->collection_time());
@ -91,7 +89,7 @@ std::chrono::system_clock::time_point Ar2vFile::end_time() const
return endTime;
}
std::map<uint16_t, std::map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
std::map<uint16_t, std::shared_ptr<rda::ElevationScan>>
Ar2vFile::radar_data() const
{
return p->radarData_;
@ -289,7 +287,12 @@ void Ar2vFileImpl::ProcessRadarData(
uint16_t azimuthIndex = message->azimuth_number() - 1;
uint16_t elevationIndex = message->elevation_number() - 1;
radarData_[elevationIndex][azimuthIndex] = message;
if (radarData_[elevationIndex] == nullptr)
{
radarData_[elevationIndex] = std::make_shared<rda::ElevationScan>();
}
(*radarData_[elevationIndex])[azimuthIndex] = message;
}
} // namespace wsr88d