From bf6b3e3601ca036eb27e61c5c3ab28849d17196f Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Fri, 23 Sep 2022 22:46:44 -0500
Subject: [PATCH] Select the latest product level 3 product available when
 switching products

---
 .../source/scwx/qt/manager/radar_product_manager.cpp  | 11 ++++++++++-
 scwx-qt/source/scwx/qt/map/map_widget.cpp             |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
index 117d681d..02411f3e 100644
--- a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
@@ -747,7 +747,16 @@ RadarProductManagerImpl::GetLevel3ProductRecord(
 
    if (it != level3ProductRecordsMap_.cend())
    {
-      record = util::GetBoundedElementValue(it->second, time);
+      if (time == std::chrono::system_clock::time_point {})
+      {
+         // If a default-initialized time point is given, return the latest
+         // record
+         record = it->second.rbegin()->second;
+      }
+      else
+      {
+         record = util::GetBoundedElementValue(it->second, time);
+      }
    }
 
    return record;
diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp
index 3a0748ea..1b60c240 100644
--- a/scwx-qt/source/scwx/qt/map/map_widget.cpp
+++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp
@@ -326,7 +326,8 @@ void MapWidget::SelectRadarProduct(common::RadarProductGroup group,
 
    if (radarProductView != nullptr)
    {
-      radarProductView->SelectTime(p->selectedTime_);
+      // Always select the latest product available
+      radarProductView->SelectTime({});
 
       if (radarProductViewCreated)
       {