From ad58149d17dd118b28a1201aef0b8deeea8a9cd9 Mon Sep 17 00:00:00 2001
From: Axel <axellopez92@outlook.com>
Date: Tue, 1 Dec 2020 15:26:00 +0100
Subject: [PATCH] Fixed distance > 0.0 bug for landmark search.

---
 LibCarla/source/carla/road/Map.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/LibCarla/source/carla/road/Map.cpp b/LibCarla/source/carla/road/Map.cpp
index 9c0d1b431..c89ea29da 100644
--- a/LibCarla/source/carla/road/Map.cpp
+++ b/LibCarla/source/carla/road/Map.cpp
@@ -368,9 +368,15 @@ namespace road {
       } else {
         distance_to_signal = waypoint.s - signal->GetDistance();
       }
-      Waypoint signal_waypoint = GetNext(waypoint, distance_to_signal).front();
-      SignalSearchData signal_data{signal, signal_waypoint, distance_to_signal};
-      result.emplace_back(signal_data);
+      if (distance_to_signal == 0) {
+        result.emplace_back(SignalSearchData
+            {signal, waypoint,
+            distance_to_signal});
+      } else {
+        result.emplace_back(SignalSearchData
+            {signal, GetNext(waypoint, distance_to_signal).front(),
+            distance_to_signal});
+      }
     }
     // If we run out of remaining_lane_length we have to go to the successors.
     for (auto &successor : GetSuccessors(waypoint)) {