kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed camera test and code style

Browse source
This commit is contained in:
Olga Khlopkova 2019-09-20 16:28:19 +03:00 • committed by Vladimir Byko-Ianko
parent e8ea9a73c2
commit 8aeb01280f
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing/base/followed_polyline.cpp
View file

@ -149,7 +149,7 @@ FollowedPolyline::UpdatedProjectionInfo FollowedPolyline::UpdateMatchedProjectio
ASSERT(m_current.IsValid(), ());
ASSERT_LESS(m_current.m_ind, m_poly.GetSize() - 1, ());
auto res = GetBestMatchedProjection(posRect);
auto const res = GetBestMatchedProjection(posRect);
if (res.m_iter.IsValid())
m_current = res.m_iter;

14
routing/routing_integration_tests/speed_camera_notifications_tests.cpp
View file

@ -320,15 +320,25 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_7)
TEST(!CheckBeepSignal(routingSession), ());
}
// No exceed speed limit in beep zone, we did no VoiceNotification,
// Intermediate Move for correct calculating of passedDistance.
{
double const speedKmPH = 20.0;
ChangePosition({ 55.76559, 37.59016}, speedKmPH, routingSession);
TEST_EQUAL(CheckZone(routingSession, speedKmPH), SpeedCameraManager::Interval::VoiceNotificationZone, ());
TEST(!CheckVoiceNotification(routingSession), ());
TEST(!CheckBeepSignal(routingSession), ());
}
// No exceed speed limit in beep zone, but we did VoiceNotification earlier,
// so now we make BeedSignal.
{
double const speedKmPH = 40.0;
ChangePosition({55.76559, 37.59016}, speedKmPH, routingSession);
ChangePosition({ 55.765732, 37.590305}, speedKmPH, routingSession);
TEST_EQUAL(CheckZone(routingSession, speedKmPH), SpeedCameraManager::Interval::BeepSignalZone, ());
TEST(!CheckVoiceNotification(routingSession), ());
TEST(CheckBeepSignal(routingSession), ());
}
}
}