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

Fall back to archive if chunks get too old

Browse source
This commit is contained in:
AdenKoperczak 2025-04-25 13:11:57 -04:00
parent 3288ba30ec
commit 2821eff71f
No known key found for this signature in database
GPG key ID: 9843017036F62EE7
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
View file

@ -1548,6 +1548,12 @@ RadarProductManager::GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
std::vector<float> elevationCuts {}; std::vector<float> elevationCuts {};
std::chrono::system_clock::time_point foundTime {}; std::chrono::system_clock::time_point foundTime {};
const bool isEpox = time == std::chrono::system_clock::time_point{};
bool needArchive = true;
static const auto maxChunkDelay = std::chrono::minutes(10);
const std::chrono::system_clock::time_point firstValidChunkTime =
(isEpox ? std::chrono::system_clock::now() : time) - maxChunkDelay;
// See if we have this one in the chunk provider. // See if we have this one in the chunk provider.
auto chunkFile = std::dynamic_pointer_cast<wsr88d::Ar2vFile>( auto chunkFile = std::dynamic_pointer_cast<wsr88d::Ar2vFile>(
p->level2ChunksProviderManager_->provider_->LoadObjectByTime(time)); p->level2ChunksProviderManager_->provider_->LoadObjectByTime(time));
@ -1572,9 +1578,16 @@ RadarProductManager::GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
p->incomingLevel2Elevation_ = incomingElevation; p->incomingLevel2Elevation_ = incomingElevation;
Q_EMIT IncomingLevel2ElevationChanged(incomingElevation); Q_EMIT IncomingLevel2ElevationChanged(incomingElevation);
} }
if (foundTime >= firstValidChunkTime)
{
needArchive = false;
} }
} }
else // It is not in the chunk provider, so get it from the archive }
// It is not in the chunk provider, so get it from the archive
if (needArchive)
{ {
auto records = p->GetLevel2ProductRecords(time); auto records = p->GetLevel2ProductRecords(time);
for (auto& recordPair : records) for (auto& recordPair : records)
@ -1601,7 +1614,8 @@ RadarProductManager::GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
// Find the newest radar data, not newer than the selected time // Find the newest radar data, not newer than the selected time
if (radarData == nullptr || if (radarData == nullptr ||
(collectionTime <= time && foundTime < collectionTime)) (collectionTime <= time && foundTime < collectionTime) ||
(isEpox && foundTime < collectionTime))
{ {
radarData = recordRadarData; radarData = recordRadarData;
elevationCut = recordElevationCut; elevationCut = recordElevationCut;