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

git-clang-format

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-08-10 17:49:14 +03:00
parent 419b4d933d
commit 2952f8e237
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
routing/car_model.cpp
View file

@ -30,31 +30,30 @@ double constexpr kSpeedFerryMotorcarVehicleKMpH = 15.0;
double constexpr kSpeedRailMotorcarVehicleKMpH = 25.0;
double constexpr kSpeedShuttleTrainKMpH = 25.0;
routing::VehicleModel::InitListT const s_carLimits =
{
{ {"highway", "motorway"}, kSpeedMotorwayKMpH },
{ {"highway", "trunk"}, kSpeedTrunkKMpH },
{ {"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH },
{ {"highway", "trunk_link"}, kSpeedTrunkLinkKMpH },
{ {"highway", "primary"}, kSpeedPrimaryKMpH },
{ {"highway", "primary_link"}, kSpeedPrimaryLinkKMpH },
{ {"highway", "secondary"}, kSpeedSecondaryKMpH },
{ {"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH },
{ {"highway", "tertiary"}, kSpeedTertiaryKMpH },
{ {"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH },
{ {"highway", "residential"}, kSpeedResidentialKMpH },
{ {"highway", "pedestrian"}, kSpeedPedestrianKMpH },
{ {"highway", "unclassified"}, kSpeedUnclassifiedKMpH },
{ {"highway", "service"}, kSpeedServiceKMpH },
{ {"highway", "living_street"}, kSpeedLivingStreetKMpH },
{ {"highway", "road"}, kSpeedRoadKMpH },
{ {"highway", "track"}, kSpeedTrackKMpH },
/// @todo: Add to classificator
//{ {"highway", "shuttle_train"}, 10 },
//{ {"highway", "ferry"}, 5 },
//{ {"highway", "default"}, 10 },
/// @todo: Check type
//{ {"highway", "construction"}, 40 },
routing::VehicleModel::InitListT const s_carLimits = {
{{"highway", "motorway"}, kSpeedMotorwayKMpH},
{{"highway", "trunk"}, kSpeedTrunkKMpH},
{{"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH},
{{"highway", "primary"}, kSpeedPrimaryKMpH},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH},
{{"highway", "secondary"}, kSpeedSecondaryKMpH},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH},
{{"highway", "residential"}, kSpeedResidentialKMpH},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH},
{{"highway", "service"}, kSpeedServiceKMpH},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH},
{{"highway", "road"}, kSpeedRoadKMpH},
{{"highway", "track"}, kSpeedTrackKMpH},
/// @todo: Add to classificator
//{ {"highway", "shuttle_train"}, 10 },
//{ {"highway", "ferry"}, 5 },
//{ {"highway", "default"}, 10 },
/// @todo: Check type
//{ {"highway", "construction"}, 40 },
};
} // namespace

2
routing/vehicle_model.cpp
View file

@ -13,7 +13,7 @@
namespace routing
{
VehicleModel::AdditionalRoadType::AdditionalRoadType(Classificator const & c,
AdditionalRoadTags const & tag)
AdditionalRoadTags const & tag)
: m_type(c.GetTypeByPath(tag.m_hwtag)), m_speedKMpH(tag.m_speedKMpH)
{
}