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

Asserts and clamp for decreasing speed factors.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-06-08 17:12:36 +03:00 • committed by Tatiana Yan
parent 34f801cd20
commit d134608c38
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
routing_common/vehicle_model.cpp
View file

@ -5,6 +5,7 @@
#include "indexer/ftypes_matcher.hpp"
#include "base/macros.hpp"
#include "base/math.hpp"
#include <algorithm>
@ -42,7 +43,13 @@ VehicleModel::VehicleModel(Classificator const & c, LimitsInitList const & featu
size_t i = 0;
for (auto const & v : featureTypeSurface)
m_surfaceFactors[i++] = {c.GetTypeByPath(vector<string>(v.m_types, v.m_types + 2)), v.m_speedFactor};
{
ASSERT_LESS_OR_EQUAL(v.m_speedFactor, 1.0, ());
ASSERT_GREATER_OR_EQUAL(v.m_speedFactor, 0.0, ());
double const speedFactor = my::clamp(v.m_speedFactor, 0.0, 1.0);
m_surfaceFactors[i++] = {c.GetTypeByPath(vector<string>(v.m_types, v.m_types + 2)),
speedFactor};
}
}
void VehicleModel::SetAdditionalRoadTypes(Classificator const & c,
@ -89,7 +96,7 @@ double VehicleModel::GetMinTypeSpeed(feature::TypesHolder const & types) const
if (itFactor != m_surfaceFactors.cend())
speedFactor = min(speedFactor, itFactor->m_factor);
}
if (speed <= m_maxSpeedKMpH && speedFactor <= 1.0)
return speed * speedFactor;