gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[routing] Drop speed cameras notifications flags, fix crash in ASSERT

Browse source
This commit is contained in:
gmoryes 2020-01-16 14:51:26 +03:00 • committed by Vladimir Byko-Ianko
parent 5bf52fd0c6
commit 0392cb0f5e
2 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
routing/routing_integration_tests/speed_camera_notifications_tests.cpp
View file

@ -338,7 +338,55 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_7)
TEST(!CheckVoiceNotification(routingSession), ());
TEST(CheckBeepSignal(routingSession), ());
}
}
}
// Mode: Always/Auto
// ____Notification___|___beep____|_____Impact camera zone_____|
// ----------------^ | - We are here. Exceed speed limit.
// | In case Always/Auto mode we should hear voice notification.
// -----------------^ | - Then we are here. Exceed speed limit.
// | But it's soon to make beep signal.
// ---------------------^ - Than we are here. Exceed speed limit.
// We should here beep signal.
UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_8)
{
vector<SpeedCameraManagerMode> modes = {SpeedCameraManagerMode::Auto, SpeedCameraManagerMode::Always};
for (auto const mode : modes)
{
RoutingSession routingSession;
InitRoutingSession({55.678536, 37.531112} /* from */,
{55.671112, 37.520202} /* to */,
routingSession,
mode);
{
double const speedKmPH = 180.0;
ChangePosition({55.67840, 37.53090}, speedKmPH, routingSession);
TEST(!CheckVoiceNotification(routingSession), ());
TEST(!CheckBeepSignal(routingSession), ());
}
{
double const speedKmPH = 180.0;
ChangePosition({55.67810, 37.53050}, speedKmPH, routingSession);
TEST_EQUAL(CheckZone(routingSession, speedKmPH), SpeedCameraManager::Interval::VoiceNotificationZone, ());
TEST(CheckVoiceNotification(routingSession), ());
TEST(!CheckBeepSignal(routingSession), ());
}
{
double const speedKmPH = 180.0;
ChangePosition({55.67810, 37.53050}, speedKmPH, routingSession);
TEST_EQUAL(CheckZone(routingSession, speedKmPH), SpeedCameraManager::Interval::VoiceNotificationZone, ());
TEST(!CheckVoiceNotification(routingSession), ());
TEST(!CheckBeepSignal(routingSession), ());
}
{
double const speedKmPH = 180.0;
ChangePosition({55.67790, 37.53020}, speedKmPH, routingSession);
TEST_EQUAL(CheckZone(routingSession, speedKmPH), SpeedCameraManager::Interval::BeepSignalZone, ());
TEST(!CheckVoiceNotification(routingSession), ());
TEST(CheckBeepSignal(routingSession), ());
}
}
}

6
routing/speed_camera_manager.cpp
View file

@ -97,9 +97,10 @@ void SpeedCameraManager::GenerateNotifications(std::vector<std::string> & notifi
if (VoiceSignalAvailable())
{
notifications.emplace_back(m_notificationManager.GenerateSpeedCameraText());
m_makeVoiceSignal = false;
++m_voiceSignalCounter;
}
m_makeVoiceSignal = false;
}
bool SpeedCameraManager::ShouldPlayBeepSignal()
@ -116,6 +117,7 @@ bool SpeedCameraManager::ShouldPlayBeepSignal()
return true;
}
m_makeBeepSignal = false;
return false;
}
@ -360,7 +362,7 @@ void SpeedCameraManager::SendNotificationStat(double passedDistanceMeters, doubl
auto const distToCameraMeters = camera.m_distFromBeginMeters - passedDistanceMeters;
ASSERT(m_makeBeepSignal != m_makeVoiceSignal, ("In each moment of time only one flag should be up."));
CHECK(m_makeBeepSignal != m_makeVoiceSignal, ("In each moment of time only one flag should be up."));
alohalytics::TStringMap params = {{"type", m_makeBeepSignal ? "beep" : "voice"},
{"distance", strings::to_string(distToCameraMeters)},
{"speed", strings::to_string(measurement_utils::MpsToKmph(speedMpS))}};