From 6eb9caf819aa2b90ad3d81ad3186af9beb2d84a0 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Wed, 21 Feb 2024 23:02:24 -0600
Subject: [PATCH] Fix stale storm tracking information logic to use selected
 time

---
 .../scwx/qt/view/overlay_product_view.cpp     | 123 +++++++++---------
 1 file changed, 62 insertions(+), 61 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/view/overlay_product_view.cpp b/scwx-qt/source/scwx/qt/view/overlay_product_view.cpp
index 1bfb0f44..c57e7010 100644
--- a/scwx-qt/source/scwx/qt/view/overlay_product_view.cpp
+++ b/scwx-qt/source/scwx/qt/view/overlay_product_view.cpp
@@ -137,77 +137,78 @@ void OverlayProductView::Impl::LoadProduct(
 
    if (autoUpdate)
    {
-      connect(request.get(),
-              &request::NexradFileRequest::RequestComplete,
-              self_,
-              [=, this](std::shared_ptr<request::NexradFileRequest> request)
-              {
-                 using namespace std::chrono_literals;
+      connect(
+         request.get(),
+         &request::NexradFileRequest::RequestComplete,
+         self_,
+         [=, this](std::shared_ptr<request::NexradFileRequest> request)
+         {
+            using namespace std::chrono_literals;
 
-                 // Select loaded record
-                 const auto& record = request->radar_product_record();
+            // Select loaded record
+            const auto& record = request->radar_product_record();
 
-                 // Validate record
-                 if (record != nullptr)
-                 {
-                    auto productTime = record->time();
-                    auto level3File  = record->level3_file();
-                    if (level3File != nullptr)
-                    {
-                       const auto& header = level3File->message()->header();
-                       productTime =
-                          util::TimePoint(header.date_of_message(),
-                                          header.time_of_message() * 1000);
-                    }
+            // Validate record
+            if (record != nullptr)
+            {
+               auto productTime = record->time();
+               auto level3File  = record->level3_file();
+               if (level3File != nullptr)
+               {
+                  const auto& header = level3File->message()->header();
+                  productTime        = util::TimePoint(
+                     header.date_of_message(), header.time_of_message() * 1000);
+               }
 
-                    // If the record is from the last 30 minutes
-                    if (productTime + 30min >= time ||
-                        productTime + 30min >= std::chrono::system_clock::now())
-                    {
-                       // Store loaded record
-                       std::unique_lock lock {recordMutex_};
+               // If the record is from the last 30 minutes
+               if (productTime + 30min >= std::chrono::system_clock::now() ||
+                   (selectedTime_ != std::chrono::system_clock::time_point {} &&
+                    productTime + 30min >= selectedTime_))
+               {
+                  // Store loaded record
+                  std::unique_lock lock {recordMutex_};
 
-                       auto it = recordMap_.find(product);
-                       if (it == recordMap_.cend() || it->second != record)
-                       {
-                          recordMap_.insert_or_assign(product, record);
+                  auto it = recordMap_.find(product);
+                  if (it == recordMap_.cend() || it->second != record)
+                  {
+                     recordMap_.insert_or_assign(product, record);
 
-                          lock.unlock();
+                     lock.unlock();
 
-                          Q_EMIT self_->ProductUpdated(product);
-                       }
-                    }
-                    else
-                    {
-                       // If product is more than 30 minutes old, discard
-                       std::unique_lock lock {recordMutex_};
-                       std::size_t elementsRemoved = recordMap_.erase(product);
-                       lock.unlock();
+                     Q_EMIT self_->ProductUpdated(product);
+                  }
+               }
+               else
+               {
+                  // If product is more than 30 minutes old, discard
+                  std::unique_lock lock {recordMutex_};
+                  std::size_t      elementsRemoved = recordMap_.erase(product);
+                  lock.unlock();
 
-                       if (elementsRemoved > 0)
-                       {
-                          Q_EMIT self_->ProductUpdated(product);
-                       }
+                  if (elementsRemoved > 0)
+                  {
+                     Q_EMIT self_->ProductUpdated(product);
+                  }
 
-                       logger_->trace("Discarding stale data: {}",
-                                      util::TimeString(productTime));
-                    }
-                 }
-                 else
-                 {
-                    // If the product doesn't exist, erase the stale product
-                    std::unique_lock lock {recordMutex_};
-                    std::size_t elementsRemoved = recordMap_.erase(product);
-                    lock.unlock();
+                  logger_->trace("Discarding stale data: {}",
+                                 util::TimeString(productTime));
+               }
+            }
+            else
+            {
+               // If the product doesn't exist, erase the stale product
+               std::unique_lock lock {recordMutex_};
+               std::size_t      elementsRemoved = recordMap_.erase(product);
+               lock.unlock();
 
-                    if (elementsRemoved > 0)
-                    {
-                       Q_EMIT self_->ProductUpdated(product);
-                    }
+               if (elementsRemoved > 0)
+               {
+                  Q_EMIT self_->ProductUpdated(product);
+               }
 
-                    logger_->trace("Removing stale product");
-                 }
-              });
+               logger_->trace("Removing stale product");
+            }
+         });
    }
 
    // Load file