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

Update segment end time logic for alert layer

Browse source 
- Only earlier segments should have their end time updated
- The current message should end when the next message begins
This commit is contained in:
Dan Paulat 2025-04-26 22:31:23 -05:00
parent ae24991432
commit 104fe790fb
1 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

64
scwx-qt/source/scwx/qt/map/alert_layer.cpp
View file

@ -336,27 +336,28 @@ void AlertLayerHandler::HandleAlert(const types::TextEventKey& key,
alertsUpdated {};
const auto& messageList = textEventManager_->message_list(key);
auto message = messageList.at(messageIndex);
if (message->uuid() != uuid)
// Find message by UUID instead of index, as the message index could have
// changed between the signal being emitted and the handler being called
auto messageIt = std::find_if(messageList.cbegin(),
messageList.cend(),
[&uuid](const auto& message)
{ return uuid == message->uuid(); });
if (messageIt == messageList.cend())
{
// Find message by UUID instead of index, as the message index could have
// changed between the signal being emitted and the handler being called
auto it = std::find_if(messageList.cbegin(),
messageList.cend(),
[&uuid](const auto& message)
{ return uuid == message->uuid(); });
if (it == messageList.cend())
{
logger_->warn(
"Could not find alert uuid: {} ({})", key.ToString(), messageIndex);
return;
}
message = *it;
logger_->warn(
"Could not find alert uuid: {} ({})", key.ToString(), messageIndex);
return;
}
auto& message = *messageIt;
auto nextMessageIt = std::next(messageIt);
// Store the current message index
messageIndex =
static_cast<std::size_t>(std::distance(messageList.cbegin(), messageIt));
// Determine start time for first segment
std::chrono::system_clock::time_point segmentBegin {};
if (message->segment_count() > 0)
@ -364,14 +365,31 @@ void AlertLayerHandler::HandleAlert(const types::TextEventKey& key,
segmentBegin = message->segment(0)->event_begin();
}
// Determine the start time for the first segment of the next message
std::optional<std::chrono::system_clock::time_point> nextMessageBegin {};
if (nextMessageIt != messageList.cend())
{
nextMessageBegin =
(*nextMessageIt)
->wmo_header()
->GetDateTime((*nextMessageIt)->segment(0)->event_begin());
}
// Take a unique mutex before modifying segments
std::unique_lock lock {alertMutex_};
// Update any existing segments with new end time
// Update any existing earlier segments with new end time
auto& segmentsForKey = segmentsByKey_[key];
for (auto& segmentRecord : segmentsForKey)
{
if (segmentRecord->segmentEnd_ > segmentBegin)
// Determine if the segment is earlier than the current message
auto it = std::find(
messageList.cbegin(), messageList.cend(), segmentRecord->message_);
auto segmentIndex =
static_cast<std::size_t>(std::distance(messageList.cbegin(), it));
if (segmentIndex < messageIndex &&
segmentRecord->segmentEnd_ > segmentBegin)
{
segmentRecord->segmentEnd_ = segmentBegin;
@ -398,6 +416,14 @@ void AlertLayerHandler::HandleAlert(const types::TextEventKey& key,
std::shared_ptr<SegmentRecord> segmentRecord =
std::make_shared<SegmentRecord>(segment, key, message);
// Update segment end time to be no later than the begin time of the next
// message (if present)
if (nextMessageBegin.has_value() &&
segmentRecord->segmentEnd_ > nextMessageBegin)
{
segmentRecord->segmentEnd_ = nextMessageBegin.value();
}
segmentsForKey.push_back(segmentRecord);
segmentsForType.push_back(segmentRecord);