drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-01 18:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[routing] Improved TTS for roundabouts

Browse Source 
Signed-off-by: Henry Sternberg <dev@bluelightmaps.com>
This commit is contained in:
Henry Sternberg
2025-07-08 08:49:26 +01:00
committed by Konstantin Pastbin
parent 54b6471400
commit 090ed5044a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
routing/turns_notification_manager.cpp
View File

@@ -77,9 +77,12 @@ std::string NotificationManager::GenerateTurnText(uint32_t distanceUnits, uint8_
{
auto const lengthUnits = m_settings.GetLengthUnits();
if (turn.m_turn != CarDirection::None)
if (turn.m_turn != CarDirection::None && turn.m_turn != CarDirection::EnterRoundAbout)
return m_getTtsText.GetTurnNotification(
{distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_turn, lengthUnits, nextStreetInfo});
else if (turn.m_turn == CarDirection::EnterRoundAbout) // Don't include roundabout street name in TTS
return m_getTtsText.GetTurnNotification(
{distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_turn, lengthUnits});
return m_getTtsText.GetTurnNotification({distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_pedestrianTurn, lengthUnits, nextStreetInfo});
}
@@ -133,9 +136,9 @@ void NotificationManager::GenerateTurnNotifications(std::vector<TurnItemDist> co
return;
}
if (distBetweenTurnsMeters < kDistanceNotifyThresholdM)
if ((distBetweenTurnsMeters < kDistanceNotifyThresholdM) || IsClassicEntranceToRoundabout(firstTurn, secondTurn))
{
// distanceUnits is not used because of "Then" is used
// distanceUnits is not used because "Then" is used
distBetweenTurnsMeters = 0;
}