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

Pedestrian models review fix.

Browse source
This commit is contained in:
Lev Dragunov 2016-01-14 15:41:39 +03:00
parent 839a00918e
commit 68dad62d37
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
routing/pedestrian_model.cpp
View file

@ -72,6 +72,32 @@ routing::VehicleModel::InitListT const s_pedestrianLimits_Default =
{ {"highway", "platform"}, kSpeedPlatformKMpH }, // *
};
// All options available.
routing::VehicleModel::InitListT const s_pedestrianLimits_All =
{
{ {"highway", "trunk"}, kSpeedPedestrianKMpH },
{ {"highway", "trunk_link"}, kSpeedPedestrianKMpH },
{ {"highway", "primary"}, kSpeedPedestrianKMpH },
{ {"highway", "primary_link"}, kSpeedPedestrianKMpH },
{ {"highway", "secondary"}, kSpeedPedestrianKMpH },
{ {"highway", "secondary_link"}, kSpeedPedestrianKMpH },
{ {"highway", "tertiary"}, kSpeedPedestrianKMpH },
{ {"highway", "tertiary_link"}, kSpeedPedestrianKMpH },
{ {"highway", "service"}, kSpeedPedestrianKMpH },
{ {"highway", "unclassified"}, kSpeedPedestrianKMpH },
{ {"highway", "road"}, kSpeedPedestrianKMpH },
{ {"highway", "track"}, kSpeedPedestrianKMpH },
{ {"highway", "path"}, kSpeedPedestrianKMpH },
{ {"highway", "bridleway"}, kSpeedPedestrianKMpH },
{ {"highway", "cycleway"}, kSpeedPedestrianKMpH },
{ {"highway", "residential"}, kSpeedPedestrianKMpH },
{ {"highway", "living_street"}, kSpeedPedestrianKMpH },
{ {"highway", "steps"}, kSpeedPedestrianKMpH },
{ {"highway", "pedestrian"}, kSpeedPedestrianKMpH },
{ {"highway", "footway"}, kSpeedPedestrianKMpH },
{ {"highway", "platform"}, kSpeedPedestrianKMpH },
};
// Australia
routing::VehicleModel::InitListT const s_pedestrianLimits_Australia =
{
@ -579,10 +605,9 @@ routing::VehicleModel::InitListT const s_pedestrianLimits_USA =
namespace routing
{
// Use Australia limits because it has all track types availible for pedestrian.
// If one of feature types will be disabled for pedestrian, features of this type will be simplyfied
// in generator. Look FeatureBuilder1::IsRoad() for more details.
PedestrianModel::PedestrianModel() : VehicleModel(classif(), s_pedestrianLimits_Australia)
PedestrianModel::PedestrianModel() : VehicleModel(classif(), s_pedestrianLimits_All)
{
Init();
}
@ -632,7 +657,7 @@ double PedestrianModel::GetSpeed(FeatureType const & f) const
PedestrianModelFactory::PedestrianModelFactory()
{
m_models[string()] = make_shared<PedestrianModel>();
m_models[string()] = make_shared<PedestrianModel>(s_pedestrianLimits_Default);
m_models["Australia"] = make_shared<PedestrianModel>(s_pedestrianLimits_Australia);
m_models["Austria"] = make_shared<PedestrianModel>(s_pedestrianLimits_Austria);
m_models["Belarus"] = make_shared<PedestrianModel>(s_pedestrianLimits_Belarus);