From 5bf6368947ae87a5dd153719151e33d994986cc5 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Wed, 27 Sep 2023 11:17:16 -0400
Subject: [PATCH] ui: Clear road name cache when going onroad (#305)

* ui: Clear road name cache at UI initiation

* clear on offroad
---
 selfdrive/ui/qt/onroad.cc | 10 ++++++----
 selfdrive/ui/qt/onroad.h  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
index ceb8057bbd..7287ca62b7 100644
--- a/selfdrive/ui/qt/onroad.cc
+++ b/selfdrive/ui/qt/onroad.cc
@@ -479,8 +479,10 @@ AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* par
 
 #ifdef ENABLE_DASHCAM
 void AnnotatedCameraWidget::offroadTransition(bool offroad) {
-  if (offroad && recorder) {
-    recorder->stop();
+  if (offroad) {
+    if (recorder) recorder->stop();
+
+    roadName = "";
   }
 }
 #endif
@@ -641,11 +643,11 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
     showDebugUI = s.scene.show_debug_ui;
 
     const auto lmd = sm["liveMapData"].getLiveMapData();
-    QString road_name = QString::fromStdString(lmd.getCurrentRoadName());
 
     const auto data_type = int(lmd.getDataType());
     const QString data_type_draw(data_type == 2 ? "🌐  " : "");
-    roadName = !road_name.isEmpty() ? data_type_draw + road_name : "";
+    roadName = QString::fromStdString(lmd.getCurrentRoadName());
+    roadName = !roadName.isEmpty() ? data_type_draw + roadName : "";
 
     float speed_limit_slc = lp.getSpeedLimit() * (s.scene.is_metric ? MS_TO_KPH : MS_TO_MPH);
     const float speed_limit_offset = lp.getSpeedLimitOffset() * (s.scene.is_metric ? MS_TO_KPH : MS_TO_MPH);
diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h
index 7c729c5189..8630aa2f3c 100644
--- a/selfdrive/ui/qt/onroad.h
+++ b/selfdrive/ui/qt/onroad.h
@@ -170,7 +170,7 @@ private:
 
   bool showDebugUI = false;
 
-  QString roadName;
+  QString roadName = "";
 
   bool showSpeedLimit = false;
   float speedLimitSLC;