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

Adding special ctor for case when weight and eta are the same for road graph and using it.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-08-29 14:15:27 +03:00 • committed by Vlad Mihaylenko
parent 7b353dbe12
commit d2fbb54f0a
4 changed files with 453 additions and 449 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

488
routing_common/bicycle_model.cpp
View file

@ -51,125 +51,125 @@ double constexpr kSpeedFootwayKMpH = 7.0;
double constexpr kSpeedPlatformKMpH = 3.0;
double constexpr kSpeedPierKMpH = 7.0;
double constexpr kSpeedOffroadKMpH = 3.0;
double constexpr kSpeedFerry = 3.0;
double constexpr kSpeedFerryKMpH = 3.0;
// Default
VehicleModel::LimitsInitList const g_bicycleLimitsDefault =
{
// {{roadType, roadType} {weightSpeedKMpH, etSpeedKMpH} passThroughAllowed}
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// All options available.
VehicleModel::LimitsInitList const g_bicycleLimitsAll =
{
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "bridleway"}, {kSpeedBridlewayKMpH, kSpeedBridlewayKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "bridleway"}, kSpeedBridlewayKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Same as defaults except trunk and trunk_link are not allowed
VehicleModel::LimitsInitList const g_bicycleLimitsNoTrunk =
{
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Same as defaults except pedestrian is allowed
VehicleModel::LimitsInitList const g_bicycleLimitsPedestrianAllowed =
{
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPlatformKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Same as defaults except bridleway is allowed
VehicleModel::LimitsInitList const g_bicycleLimitsBridlewayAllowed =
{
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "bridleway"}, {kSpeedBridlewayKMpH, kSpeedBridlewayKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "bridleway"}, kSpeedBridlewayKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Australia
@ -179,47 +179,47 @@ VehicleModel::LimitsInitList const g_bicycleLimitsAustralia = g_bicycleLimitsAll
VehicleModel::LimitsInitList const g_bicycleLimitsAustria =
{
// No trunk, trunk_link, path
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Belarus
VehicleModel::LimitsInitList const g_bicycleLimitsBelarus =
{
// Footway and pedestrian are allowed
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Belgium
@ -227,49 +227,49 @@ VehicleModel::LimitsInitList const g_bicycleLimitsBelgium =
{
// No trunk, trunk_link
// Pedestrian is allowed
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Brazil
VehicleModel::LimitsInitList const g_bicycleLimitsBrazil =
{
// Bridleway and fotway are allowed
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "bridleway"}, {kSpeedBridlewayKMpH, kSpeedBridlewayKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "bridleway"}, kSpeedBridlewayKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Denmark
@ -280,23 +280,23 @@ VehicleModel::LimitsInitList const g_bicycleLimitsFrance =
{
// No trunk, trunk_link
// Pedestrian is allowed
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Finland
@ -331,26 +331,26 @@ VehicleModel::LimitsInitList const g_bicycleLimitsRussia =
{
// Footway and pedestrian are allowed
// No pass through service and living_street
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, false},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, false},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, false},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, false},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedPedestrianKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Slovakia
@ -371,24 +371,24 @@ VehicleModel::LimitsInitList const g_bicycleLimitsUkraine =
// No trunk
// Footway and perestrian are allowed
// No pass through living_street and service
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, false},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, false},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, false},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, false},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// United Kingdom
@ -398,26 +398,26 @@ VehicleModel::LimitsInitList const g_bicycleLimitsUK = g_bicycleLimitsBridlewayA
VehicleModel::LimitsInitList const g_bicycleLimitsUS =
{
// Bridleway and pedesprian are allowed
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "bridleway"}, {kSpeedBridlewayKMpH, kSpeedBridlewayKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "bridleway"}, kSpeedBridlewayKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
VehicleModel::SurfaceInitList const g_bicycleSurface = {
@ -451,9 +451,9 @@ void BicycleModel::Init()
m_bidirBicycleType = classif().GetTypeByPath({"hwtag", "bidir_bicycle"});
vector<AdditionalRoadTags> const additionalTags = {
{hwtagYesBicycle, m_maxSpeed},
{{"route", "ferry"}, {kSpeedFerry, kSpeedFerry}},
{{"man_made", "pier"}, {kSpeedPierKMpH, kSpeedPierKMpH}}
{hwtagYesBicycle, m_maxSpeed},
{{"route", "ferry"}, kSpeedFerryKMpH},
{{"man_made", "pier"}, kSpeedPierKMpH}
};
SetAdditionalRoadTypes(classif(), additionalTags);

172
routing_common/car_model.cpp
View file

@ -42,23 +42,23 @@ double constexpr kSpeedOffroadKMpH = 10.0;
VehicleModel::LimitsInitList const g_carLimitsDefault =
{
// {{roadType, roadType} {weightSpeedKMpH, etSpeedKMpH} passThroughAllowed}
{{"highway", "motorway"}, {kSpeedMotorwayKMpH, kSpeedMotorwayKMpH}, true},
{{"highway", "motorway_link"}, {kSpeedMotorwayLinkKMpH, kSpeedMotorwayLinkKMpH}, true},
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true}
// {{roadType, roadType} {weightSpeedKMpH, etSpeedKMpH} passThroughAllowed}
{{"highway", "motorway"}, kSpeedMotorwayKMpH, true},
{{"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH, true},
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true}
/// @todo: Add to classificator
//{ {"highway", "shuttle_train"}, 10 },
//{ {"highway", "ferry"}, 5 },
@ -69,42 +69,42 @@ VehicleModel::LimitsInitList const g_carLimitsDefault =
VehicleModel::LimitsInitList const g_carLimitsNoPassThroughLivingStreet =
{
{{"highway", "motorway"}, {kSpeedMotorwayKMpH, kSpeedMotorwayKMpH}, true},
{{"highway", "motorway_link"}, {kSpeedMotorwayLinkKMpH, kSpeedMotorwayLinkKMpH}, true},
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, false},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true}
{{"highway", "motorway"}, kSpeedMotorwayKMpH, true},
{{"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH, true},
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, false},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true}
};
VehicleModel::LimitsInitList const g_carLimitsNoPassThroughLivingStreetAndService =
{
{{"highway", "motorway"}, {kSpeedMotorwayKMpH, kSpeedMotorwayKMpH}, true},
{{"highway", "motorway_link"}, {kSpeedMotorwayLinkKMpH, kSpeedMotorwayLinkKMpH}, true},
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, false},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, false},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true}
{{"highway", "motorway"}, kSpeedMotorwayKMpH, true},
{{"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH, true},
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, false},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, false},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true}
};
VehicleModel::LimitsInitList const g_carLimitsAustralia = g_carLimitsDefault;
@ -120,21 +120,21 @@ VehicleModel::LimitsInitList const g_carLimitsBrazil = g_carLimitsDefault;
VehicleModel::LimitsInitList const g_carLimitsDenmark =
{
// No track
{{"highway", "motorway"}, {kSpeedMotorwayKMpH, kSpeedMotorwayKMpH}, true},
{{"highway", "motorway_link"}, {kSpeedMotorwayLinkKMpH, kSpeedMotorwayLinkKMpH}, true},
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true}
{{"highway", "motorway"}, kSpeedMotorwayKMpH, true},
{{"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH, true},
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true}
};
VehicleModel::LimitsInitList const g_carLimitsFrance = g_carLimitsDefault;
@ -144,22 +144,22 @@ VehicleModel::LimitsInitList const g_carLimitsFinland = g_carLimitsDefault;
VehicleModel::LimitsInitList const g_carLimitsGermany =
{
// No pass through track
{{"highway", "motorway"}, {kSpeedMotorwayKMpH, kSpeedMotorwayKMpH}, true},
{{"highway", "motorway_link"}, {kSpeedMotorwayLinkKMpH, kSpeedMotorwayLinkKMpH}, true},
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedMotorwayLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, false}
{{"highway", "motorway"}, kSpeedMotorwayKMpH, true},
{{"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH, true},
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, false}
};
VehicleModel::LimitsInitList const g_carLimitsHungary = g_carLimitsNoPassThroughLivingStreet;
@ -194,12 +194,12 @@ VehicleModel::LimitsInitList const g_carLimitsUS = g_carLimitsDefault;
vector<VehicleModel::AdditionalRoadTags> const kAdditionalTags = {
// {{highway tags}, {weightSpeed, etaSpeed}}
{{"route", "ferry", "motorcar"}, {kSpeedFerryMotorcarKMpH, kSpeedFerryMotorcarKMpH}},
{{"route", "ferry", "motor_vehicle"}, {kSpeedFerryMotorcarVehicleKMpH, kSpeedFerryMotorcarVehicleKMpH}},
{{"railway", "rail", "motor_vehicle"}, {kSpeedRailMotorcarVehicleKMpH, kSpeedRailMotorcarVehicleKMpH}},
{{"route", "shuttle_train"}, {kSpeedShuttleTrainKMpH, kSpeedShuttleTrainKMpH}},
{{"route", "ferry"}, {kSpeedFerryMotorcarKMpH, kSpeedFerryMotorcarKMpH}},
{{"man_made", "pier"}, {kSpeedPierKMpH, kSpeedPierKMpH}}
{{"route", "ferry", "motorcar"}, kSpeedFerryMotorcarKMpH},
{{"route", "ferry", "motor_vehicle"}, kSpeedFerryMotorcarVehicleKMpH},
{{"railway", "rail", "motor_vehicle"}, kSpeedRailMotorcarVehicleKMpH},
{{"route", "shuttle_train"}, kSpeedShuttleTrainKMpH},
{{"route", "ferry"}, kSpeedFerryMotorcarKMpH},
{{"man_made", "pier"}, kSpeedPierKMpH}
};
VehicleModel::SurfaceInitList const g_carSurface = {

238
routing_common/pedestrian_model.cpp
View file

@ -51,128 +51,128 @@ double constexpr kSpeedFootwayKMpH = 5.0;
double constexpr kSpeedPlatformKMpH = 5.0;
double constexpr kSpeedPierKMpH = 4.0;
double constexpr kSpeedOffroadKMpH = 3.0;
double constexpr kSpeedFerry = 1.0;
double constexpr kSpeedFerryKMpH = 1.0;
// Default
VehicleModel::LimitsInitList const g_pedestrianLimitsDefault =
{
// {{roadType, roadType} {weightSpeedKMpH, etSpeedKMpH} passThroughAllowed}
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
// {{roadType, roadType} {weightSpeedKMpH, etSpeedKMpH} passThroughAllowed}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// All options available.
VehicleModel::LimitsInitList const g_pedestrianLimitsAll =
{
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "bridleway"}, {kSpeedBridlewayKMpH, kSpeedBridlewayKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "bridleway"}, kSpeedBridlewayKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Same as defaults except trunk and trunk link are not allowed.
VehicleModel::LimitsInitList const g_pedestrianLimitsNoTrunk =
{
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Same as defaults except cycleway is allowed.
VehicleModel::LimitsInitList const g_pedestrianLimitsCyclewayAllowed =
{
{{"highway", "trunk"}, {kSpeedTrunkKMpH, kSpeedTrunkKMpH}, true},
{{"highway", "trunk_link"}, {kSpeedTrunkLinkKMpH, kSpeedTrunkLinkKMpH}, true},
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "trunk"}, kSpeedTrunkKMpH, true},
{{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH, true},
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Same as defaults except cycleway is allowed and trunk and trunk_link are not allowed.
VehicleModel::LimitsInitList const g_pedestrianLimitsCyclewayAllowedNoTrunk =
{
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Australia
@ -189,25 +189,25 @@ VehicleModel::LimitsInitList const g_pedestrianLimitsBelgium =
{
// Trunk and trunk_link are not allowed
// Bridleway and cycleway are allowed
{{"highway", "primary"}, {kSpeedPrimaryKMpH, kSpeedPrimaryKMpH}, true},
{{"highway", "primary_link"}, {kSpeedPrimaryLinkKMpH, kSpeedPrimaryLinkKMpH}, true},
{{"highway", "secondary"}, {kSpeedSecondaryKMpH, kSpeedSecondaryKMpH}, true},
{{"highway", "secondary_link"}, {kSpeedSecondaryLinkKMpH, kSpeedSecondaryLinkKMpH}, true},
{{"highway", "tertiary"}, {kSpeedTertiaryKMpH, kSpeedTertiaryKMpH}, true},
{{"highway", "tertiary_link"}, {kSpeedTertiaryLinkKMpH, kSpeedTertiaryLinkKMpH}, true},
{{"highway", "service"}, {kSpeedServiceKMpH, kSpeedServiceKMpH}, true},
{{"highway", "unclassified"}, {kSpeedUnclassifiedKMpH, kSpeedUnclassifiedKMpH}, true},
{{"highway", "road"}, {kSpeedRoadKMpH, kSpeedRoadKMpH}, true},
{{"highway", "track"}, {kSpeedTrackKMpH, kSpeedTrackKMpH}, true},
{{"highway", "path"}, {kSpeedPathKMpH, kSpeedPathKMpH}, true},
{{"highway", "bridleway"}, {kSpeedBridlewayKMpH, kSpeedBridlewayKMpH}, true},
{{"highway", "cycleway"}, {kSpeedCyclewayKMpH, kSpeedCyclewayKMpH}, true},
{{"highway", "residential"}, {kSpeedResidentialKMpH, kSpeedResidentialKMpH}, true},
{{"highway", "living_street"}, {kSpeedLivingStreetKMpH, kSpeedLivingStreetKMpH}, true},
{{"highway", "steps"}, {kSpeedStepsKMpH, kSpeedStepsKMpH}, true},
{{"highway", "pedestrian"}, {kSpeedPedestrianKMpH, kSpeedPedestrianKMpH}, true},
{{"highway", "footway"}, {kSpeedFootwayKMpH, kSpeedFootwayKMpH}, true},
{{"highway", "platform"}, {kSpeedPlatformKMpH, kSpeedPlatformKMpH}, true}
{{"highway", "primary"}, kSpeedPrimaryKMpH, true},
{{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH, true},
{{"highway", "secondary"}, kSpeedSecondaryKMpH, true},
{{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH, true},
{{"highway", "tertiary"}, kSpeedTertiaryKMpH, true},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH, true},
{{"highway", "service"}, kSpeedServiceKMpH, true},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH, true},
{{"highway", "road"}, kSpeedRoadKMpH, true},
{{"highway", "track"}, kSpeedTrackKMpH, true},
{{"highway", "path"}, kSpeedPathKMpH, true},
{{"highway", "bridleway"}, kSpeedBridlewayKMpH, true},
{{"highway", "cycleway"}, kSpeedCyclewayKMpH, true},
{{"highway", "residential"}, kSpeedResidentialKMpH, true},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH, true},
{{"highway", "steps"}, kSpeedStepsKMpH, true},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH, true},
{{"highway", "footway"}, kSpeedFootwayKMpH, true},
{{"highway", "platform"}, kSpeedPlatformKMpH, true}
};
// Brazil
@ -304,8 +304,8 @@ void PedestrianModel::Init()
vector<AdditionalRoadTags> const additionalTags = {
{hwtagYesFoot, m_maxSpeed},
{{"route", "ferry"}, {kSpeedFerry, kSpeedFerry}},
{{"man_made", "pier"}, {kSpeedPierKMpH, kSpeedPierKMpH}}
{{"route", "ferry"}, kSpeedFerryKMpH},
{{"man_made", "pier"}, kSpeedPierKMpH}
};
SetAdditionalRoadTypes(classif(), additionalTags);

4
routing_common/vehicle_model.hpp
View file

@ -30,6 +30,10 @@ public:
/// Speeds which are used for edge weight and ETA estimations.
struct SpeedKMpH
{
SpeedKMpH() = default;
SpeedKMpH(double weight) noexcept : m_weight(weight), m_eta(weight) {}
SpeedKMpH(double weight, double eta) noexcept : m_weight(weight), m_eta(eta) {}
double m_weight = 0.0; // KMpH
double m_eta = 0.0; // KMpH