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

[routing] Since former weight factors and weight speed are used, they should be multiplied to each other if maxspeed is not set.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-10-15 12:44:44 +03:00 • committed by mesozoic-drones
parent 9a2a870d1d
commit dfb7ed7f7b
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routing_common/vehicle_model.cpp
View file

@ -199,7 +199,11 @@ SpeedKMpH VehicleModel::GetSpeedOnFeatureWithoutMaxspeed(HighwayType const & typ
SpeedKMpH const speed = speedIt->second.GetSpeed(isCityRoad);
ASSERT(speed.IsValid(), (speed));
return Pick<min>(factorIt->second.GetFactor(isCityRoad) * speed, maxModelSpeed);
// Note. Weight speeds put to |m_highwayBasedInfo| are taken from the former code and should not
// be multiplied to the factor. On the contrary eta speed should be multiplied.
return SpeedKMpH(
min(speed.m_weight, maxModelSpeed.m_weight),
min(factorIt->second.GetFactor(isCityRoad).m_eta * speed.m_eta, maxModelSpeed.m_eta));
}
SpeedKMpH VehicleModel::GetTypeSpeed(feature::TypesHolder const & types,