From 43151389e77ae6c4de8f61270e9a07e2d1c57f84 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Thu, 10 Jun 2021 12:31:47 +0200
Subject: [PATCH] nav: expand banner at correct distance from maneuver

---
 selfdrive/ui/qt/maps/map.cc | 21 ++++++++++++---------
 selfdrive/ui/qt/maps/map.h  |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/selfdrive/ui/qt/maps/map.cc b/selfdrive/ui/qt/maps/map.cc
index 2f5fb713d9..a104297f86 100644
--- a/selfdrive/ui/qt/maps/map.cc
+++ b/selfdrive/ui/qt/maps/map.cc
@@ -172,17 +172,20 @@ void MapWindow::timerUpdate() {
       auto cur_maneuver = segment.maneuver();
       auto attrs = cur_maneuver.extendedAttributes();
       if (cur_maneuver.isValid() && attrs.contains("mapbox.banner_instructions")){
+        float along_geometry = distance_along_geometry(segment.path(), to_QGeoCoordinate(last_position));
+        float distance = std::max(0.0f, float(segment.distance()) - along_geometry);
+        emit distanceChanged(distance);
+
+        m_map->setPitch(MAX_PITCH); // TODO: smooth pitching based on maneuver distance
 
         auto banner = attrs["mapbox.banner_instructions"].toList();
         if (banner.size()){
-          // TOOD: Only show when traveled distanceAlongGeometry since the start
           map_instructions->setVisible(true);
-          emit instructionsChanged(banner[0].toMap());
-        }
 
-        float distance = segment.distance() - distance_along_geometry(segment.path(), to_QGeoCoordinate(last_position));
-        emit distanceChanged(distance);
-        m_map->setPitch(MAX_PITCH); // TODO: smooth pitching based on maneuver distance
+          auto banner_0 = banner[0].toMap();
+          float show_at = banner_0["distance_along_geometry"].toDouble();
+          emit instructionsChanged(banner_0, distance < show_at);
+        }
       }
 
       auto next_segment = segment.nextRouteSegment();
@@ -514,7 +517,7 @@ void MapInstructions::updateDistance(float d){
   distance->setText(distance_str);
 }
 
-void MapInstructions::updateInstructions(QMap<QString, QVariant> banner){
+void MapInstructions::updateInstructions(QMap<QString, QVariant> banner, bool full){
   // Need multiple calls to adjustSize for it to properly resize
   // seems like it takes a little bit of time for the images to change and
   // the size can only be changed afterwards
@@ -550,7 +553,7 @@ void MapInstructions::updateInstructions(QMap<QString, QVariant> banner){
     }
   }
 
-  if (banner.contains("secondary")){
+  if (banner.contains("secondary") && full){
     auto s = banner["secondary"].toMap();
     secondary_str += s["text"].toString();
   }
@@ -558,7 +561,7 @@ void MapInstructions::updateInstructions(QMap<QString, QVariant> banner){
   clearLayout(lane_layout);
   bool has_lanes = false;
 
-  if (banner.contains("sub")){
+  if (banner.contains("sub") && full){
     auto s = banner["sub"].toMap();
     auto components = s["components"].toList();
     for (auto &c : components) {
diff --git a/selfdrive/ui/qt/maps/map.h b/selfdrive/ui/qt/maps/map.h
index 88db3333c9..2d28633a8b 100644
--- a/selfdrive/ui/qt/maps/map.h
+++ b/selfdrive/ui/qt/maps/map.h
@@ -42,7 +42,7 @@ public:
 
 public slots:
   void updateDistance(float d);
-  void updateInstructions(QMap<QString, QVariant> banner);
+  void updateInstructions(QMap<QString, QVariant> banner, bool full);
 };
 
 class MapETA : public QWidget {
@@ -132,7 +132,7 @@ public slots:
 
 signals:
   void distanceChanged(float distance);
-  void instructionsChanged(QMap<QString, QVariant> banner);
+  void instructionsChanged(QMap<QString, QVariant> banner, bool full);
   void ETAChanged(float seconds, float seconds_typical, float distance);
 };