drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 05:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format all C++ and Java code via clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
libs/routing/turns_notification_manager.cpp
View File

@@ -47,20 +47,18 @@ NotificationManager::NotificationManager()
, m_nextTurnIndex(0)
, m_secondTurnNotification(CarDirection::None)
, m_secondTurnNotificationIndex(0)
{
}
{}
// static
NotificationManager NotificationManager::CreateNotificationManagerForTesting(
uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters,
uint32_t minDistToSayNotificationMeters, measurement_utils::Units lengthUnits,
std::string const & engShortJson, uint32_t notificationTimeSecond, double speedMeterPerSecond)
uint32_t minDistToSayNotificationMeters, measurement_utils::Units lengthUnits, std::string const & engShortJson,
uint32_t notificationTimeSecond, double speedMeterPerSecond)
{
NotificationManager notificationManager;
notificationManager.m_settings = Settings(startBeforeSeconds, minStartBeforeMeters,
maxStartBeforeMeters, minDistToSayNotificationMeters,
startBeforeSeconds, minStartBeforeMeters,
maxStartBeforeMeters);
notificationManager.m_settings =
Settings(startBeforeSeconds, minStartBeforeMeters, maxStartBeforeMeters, minDistToSayNotificationMeters,
startBeforeSeconds, minStartBeforeMeters, maxStartBeforeMeters);
notificationManager.Enable(true);
notificationManager.SetLengthUnits(lengthUnits);
notificationManager.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en");
@@ -80,11 +78,12 @@ std::string NotificationManager::GenerateTurnText(uint32_t distanceUnits, uint8_
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
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});
return m_getTtsText.GetTurnNotification(
{distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_pedestrianTurn, lengthUnits, nextStreetInfo});
}
std::string NotificationManager::GenerateRecalculatingText() const
@@ -130,11 +129,8 @@ void NotificationManager::GenerateTurnNotifications(std::vector<TurnItemDist> co
double distBetweenTurnsMeters = secondTurn.m_distMeters - firstTurn.m_distMeters;
ASSERT_GREATER_OR_EQUAL(distBetweenTurnsMeters, 0, ());
if (distBetweenTurnsMeters > kSecondTurnThresholdDistM &&
!IsClassicEntranceToRoundabout(firstTurn, secondTurn))
{
if (distBetweenTurnsMeters > kSecondTurnThresholdDistM && !IsClassicEntranceToRoundabout(firstTurn, secondTurn))
return;
}
if ((distBetweenTurnsMeters < kDistanceNotifyThresholdM) || IsClassicEntranceToRoundabout(firstTurn, secondTurn))
{
@@ -174,8 +170,7 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, d
if (!m_settings.TooCloseForFisrtNotification(distanceToTurnMeters))
{
uint32_t const startPronounceDistMeters =
m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) +
distanceToPronounceNotificationM;
m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) + distanceToPronounceNotificationM;
if (distanceToTurnMeters < startPronounceDistMeters)
{
if (m_turnNotificationWithThen)
@@ -192,13 +187,14 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, d
}
// Pronouncing first turn sound notification.
double const distToPronounceUnits =
m_settings.ConvertMetersToUnits(distToPronounceMeters);
double const distToPronounceUnits = m_settings.ConvertMetersToUnits(distToPronounceMeters);
uint32_t const roundedDistToPronounceUnits =
m_settings.RoundByPresetSoundedDistancesUnits(distToPronounceUnits);
m_nextTurnNotificationProgress = PronouncedNotification::First;
LOG(LINFO, ("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters, "meters to start pronounce", startPronounceDistMeters, "speed m/s", m_speedMetersPerSecond));
LOG(LINFO,
("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters,
"meters to start pronounce", startPronounceDistMeters, "speed m/s", m_speedMetersPerSecond));
return GenerateTurnText(roundedDistToPronounceUnits, turn.m_exitNum, false /* useThenInsteadOfDistance */,
turn, nextStreetInfo);
}
@@ -220,7 +216,8 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, d
m_nextTurnNotificationProgress = PronouncedNotification::Second;
FastForwardFirstTurnNotification();
LOG(LINFO,("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters, "speed m/s", m_speedMetersPerSecond));
LOG(LINFO, ("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters,
"speed m/s", m_speedMetersPerSecond));
return GenerateTurnText(0 /* distMeters */, turn.m_exitNum, false /* useThenInsteadOfDistance */, turn,
nextStreetInfo);
}
@@ -241,14 +238,12 @@ void NotificationManager::SetLengthUnits(measurement_utils::Units units)
{
case measurement_utils::Units::Metric:
m_settings.SetState(30 /* notificationTimeSeconds */, 200 /* minNotificationDistanceUnits */,
2000 /* maxNotificationDistanceUnits */,
GetSoundedDistMeters() /* soundedDistancesUnits */,
2000 /* maxNotificationDistanceUnits */, GetSoundedDistMeters() /* soundedDistancesUnits */,
measurement_utils::Units::Metric /* lengthUnits */);
return;
case measurement_utils::Units::Imperial:
m_settings.SetState(30 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */,
5000 /* maxNotificationDistanceUnits */,
GetSoundedDistFeet() /* soundedDistancesUnits */,
5000 /* maxNotificationDistanceUnits */, GetSoundedDistFeet() /* soundedDistancesUnits */,
measurement_utils::Units::Imperial /* lengthUnits */);
return;
}
@@ -300,9 +295,8 @@ CarDirection NotificationManager::GenerateSecondTurnNotification(std::vector<Tur
if (distBetweenTurnsMeters > kSecondTurnThresholdDistM)
return CarDirection::None;
uint32_t const startPronounceDistMeters =
m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) +
m_settings.ComputeDistToPronounceDistM(m_speedMetersPerSecond);
uint32_t const startPronounceDistMeters = m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) +
m_settings.ComputeDistToPronounceDistM(m_speedMetersPerSecond);
if (firstTurn.m_distMeters <= startPronounceDistMeters)
{
@@ -322,12 +316,9 @@ std::string DebugPrint(PronouncedNotification notificationProgress)
{
switch (notificationProgress)
{
case PronouncedNotification::Nothing:
return "Nothing";
case PronouncedNotification::First:
return "First";
case PronouncedNotification::Second:
return "Second";
case PronouncedNotification::Nothing: return "Nothing";
case PronouncedNotification::First: return "First";
case PronouncedNotification::Second: return "Second";
}
ASSERT(false, ());