organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[routing] Select max speed in VehicleModel::GetAdditionalRoadSpeed. #2920

Merged
vng merged 1 commit from vng-fix into master 2022-07-06 03:15:00 +00:00
Conversation 0 Commits 1 Files changed 1 +5 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routing_common/vehicle_model.cpp
View file

@ -12,7 +12,8 @@
#include <algorithm>
#include <sstream>
using namespace routing;
namespace routing
{
using namespace std;
namespace
@ -44,9 +45,6 @@ HighwayType GetHighwayTypeKey(HighwayType type)
}
} // namespace
namespace routing
{
VehicleModel::VehicleModel(Classificator const & classif, LimitsInitList const & featureTypeLimits,
SurfaceInitList const & featureTypeSurface, HighwayBasedInfo const & info)
: m_highwayBasedInfo(info)
@ -162,7 +160,9 @@ void VehicleModel::GetAdditionalRoadSpeed(uint32_t type, bool isCityRoad,
if (s)
{
auto const & res = isCityRoad ? s->m_inCity : s->m_outCity;
speed = speed ? Pick<min>(*speed, res) : res;
// Take max, because combination of highway=footway + bicycle=yes should emit best bicycle speed
// even if highway=footway is prohibited for cycling and has small dismount speed.
speed = speed ? Pick<max>(*speed, res) : res;
}
}