From e782b810259fb0f8fb0aca01f0b3afb446a0a695 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Mon, 5 Oct 2015 15:09:17 +0300 Subject: [PATCH] Cleaning up the code in the PR. --- routing/routing_tests/turns_sound_test.cpp | 1 - routing/turns_sound.cpp | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/routing/routing_tests/turns_sound_test.cpp b/routing/routing_tests/turns_sound_test.cpp index 5fbdc26cc2..3ad98fb75c 100644 --- a/routing/routing_tests/turns_sound_test.cpp +++ b/routing/routing_tests/turns_sound_test.cpp @@ -194,7 +194,6 @@ UNIT_TEST(TurnsSoundMetersTwoTurnsTest) turnSound.Reset(); turnSound.SetSpeedMetersPerSecond(35.); - //TurnItem turnItem1(5 /* idx */, TurnDirection::TurnSharpRight); vector turns = {{{5 /* idx */, TurnDirection::TurnSharpRight}, 800.}}; vector turnNotifications; diff --git a/routing/turns_sound.cpp b/routing/turns_sound.cpp index 88edea9ca5..96354456ac 100644 --- a/routing/turns_sound.cpp +++ b/routing/turns_sound.cpp @@ -1,4 +1,4 @@ - #include "routing/turns_sound.hpp" +#include "routing/turns_sound.hpp" #include "platform/location.hpp" @@ -67,7 +67,7 @@ void TurnsSound::GenerateTurnSound(vector const & turns, vector kMaxTurnDistM) return; - string const secondNotification = GenerateTurnText(0 /*distanceUnits is not used because of then is used*/, + string const secondNotification = GenerateTurnText(0 /* distanceUnits is not used because of "Then" is used */, secondTurn.m_turnItem.m_exitNum, true, secondTurn.m_turnItem.m_turn, m_settings.GetLengthUnits()); @@ -102,9 +102,6 @@ string TurnsSound::GenerateFirstTurnSound(TurnItem const & turn, double distance // First turn sound notification. uint32_t const distToPronounce = m_settings.RoundByPresetSoundedDistancesUnits(turnNotificationDistUnits); - - // @TODO(vbykoianko) Check if there's a turn immediately after the current turn. - // If so add an extra item to turnNotifications with "then parameter". m_nextTurnNotificationProgress = PronouncedNotification::First; return GenerateTurnText(distToPronounce, turn.m_exitNum, false, turn.m_turn, m_settings.GetLengthUnits()); @@ -122,8 +119,6 @@ string TurnsSound::GenerateFirstTurnSound(TurnItem const & turn, double distance if (m_nextTurnNotificationProgress == PronouncedNotification::First && distanceToTurnMeters < distanceToPronounceNotificationMeters) { - // @TODO(vbykoianko) Check if there's a turn immediately after the current turn. - // If so add an extra item to info.turnNotifications with "then parameter". m_nextTurnNotificationProgress = PronouncedNotification::Second; return GenerateTurnText(0, turn.m_exitNum, false, turn.m_turn, m_settings.GetLengthUnits()); }