Renaming kSpeed constants to kOutCitySpeed constants.

3 files changed, 517 insertions, 517 deletions

diff --git a/routing_common/bicycle_model.cpp b/routing_common/bicycle_model.cpp
index acffd79620..173022c6fe 100644
--- a/routing_common/bicycle_model.cpp
+++ b/routing_common/bicycle_model.cpp
@@ -28,148 +28,148 @@ namespace
 // less bicycle. As result of such heuristic road is not totally the shortest, but it avoids non bicycle roads, which were
 // not marked as "hwtag=nobicycle" in OSM.
 
-double constexpr kSpeedTrunkKMpH = 3.0;
-double constexpr kSpeedTrunkLinkKMpH = 3.0;
-double constexpr kSpeedPrimaryKMpH = 5.0;
-double constexpr kSpeedPrimaryLinkKMpH = 5.0;
-double constexpr kSpeedSecondaryKMpH = 15.0;
-double constexpr kSpeedSecondaryLinkKMpH = 15.0;
-double constexpr kSpeedTertiaryKMpH = 15.0;
-double constexpr kSpeedTertiaryLinkKMpH = 15.0;
-double constexpr kSpeedServiceKMpH = 12.0;
-double constexpr kSpeedUnclassifiedKMpH = 12.0;
-double constexpr kSpeedRoadKMpH = 10.0;
-double constexpr kSpeedTrackKMpH = 8.0;
-double constexpr kSpeedPathKMpH = 6.0;
-double constexpr kSpeedBridlewayKMpH = 4.0;
-double constexpr kSpeedCyclewayKMpH = 15.0;
-double constexpr kSpeedResidentialKMpH = 8.0;
-double constexpr kSpeedLivingStreetKMpH = 7.0;
-double constexpr kSpeedStepsKMpH = 1.0;
-double constexpr kSpeedPedestrianKMpH = 5.0;
-double constexpr kSpeedFootwayKMpH = 7.0;
-double constexpr kSpeedPlatformKMpH = 3.0;
-double constexpr kSpeedPierKMpH = 7.0;
-double constexpr kSpeedOffroadKMpH = 3.0;
-double constexpr kSpeedFerryKMpH = 3.0;
+double constexpr kOutCitySpeedTrunkKMpH = 3.0;
+double constexpr kOutCitySpeedTrunkLinkKMpH = 3.0;
+double constexpr kOutCitySpeedPrimaryKMpH = 5.0;
+double constexpr kOutCitySpeedPrimaryLinkKMpH = 5.0;
+double constexpr kOutCitySpeedSecondaryKMpH = 15.0;
+double constexpr kOutCitySpeedSecondaryLinkKMpH = 15.0;
+double constexpr kOutCitySpeedTertiaryKMpH = 15.0;
+double constexpr kOutCitySpeedTertiaryLinkKMpH = 15.0;
+double constexpr kOutCitySpeedServiceKMpH = 12.0;
+double constexpr kOutCitySpeedUnclassifiedKMpH = 12.0;
+double constexpr kOutCitySpeedRoadKMpH = 10.0;
+double constexpr kOutCitySpeedTrackKMpH = 8.0;
+double constexpr kOutCitySpeedPathKMpH = 6.0;
+double constexpr kOutCitySpeedBridlewayKMpH = 4.0;
+double constexpr kOutCitySpeedCyclewayKMpH = 15.0;
+double constexpr kOutCitySpeedResidentialKMpH = 8.0;
+double constexpr kOutCitySpeedLivingStreetKMpH = 7.0;
+double constexpr kOutCitySpeedStepsKMpH = 1.0;
+double constexpr kOutCitySpeedPedestrianKMpH = 5.0;
+double constexpr kOutCitySpeedFootwayKMpH = 7.0;
+double constexpr kOutCitySpeedPlatformKMpH = 3.0;
+double constexpr kOutCitySpeedPierKMpH = 7.0;
+double constexpr kOutCitySpeedOffroadKMpH = 3.0;
+double constexpr kOutCitySpeedFerryKMpH = 3.0;
 
 // Default
 VehicleModel::LimitsInitList const g_bicycleLimitsDefault =
 {
   // {{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", "cycleway"},       kSpeedCyclewayKMpH,      true},
-  {{"highway", "residential"},    kSpeedResidentialKMpH,   true},
-  {{"highway", "living_street"},  kSpeedLivingStreetKMpH,  true},
-  {{"highway", "steps"},          kSpeedStepsKMpH,         true},
-  {{"highway", "platform"},       kSpeedPlatformKMpH,      true}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // All options available.
 VehicleModel::LimitsInitList const g_bicycleLimitsAll =
 {
-  {{"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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "bridleway"},      kOutCitySpeedBridlewayKMpH,     true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Same as defaults except trunk and trunk_link are not allowed
 VehicleModel::LimitsInitList const g_bicycleLimitsNoTrunk =
 {
-  {{"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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Same as defaults except pedestrian is allowed
 VehicleModel::LimitsInitList const g_bicycleLimitsPedestrianAllowed =
 {
-  {{"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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Same as defaults except bridleway is allowed
 VehicleModel::LimitsInitList const g_bicycleLimitsBridlewayAllowed =
 {
-  {{"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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "bridleway"},      kOutCitySpeedBridlewayKMpH,     true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      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,       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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Belarus
 VehicleModel::LimitsInitList const g_bicycleLimitsBelarus =
 {
   // Footway and pedestrian are allowed
-  {{"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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Belgium
@@ -227,49 +227,49 @@ VehicleModel::LimitsInitList const g_bicycleLimitsBelgium =
 {
   // No trunk, trunk_link
   // Pedestrian is allowed
-  {{"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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Brazil
 VehicleModel::LimitsInitList const g_bicycleLimitsBrazil =
 {
   // Bridleway and fotway are allowed
-  {{"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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "bridleway"},      kOutCitySpeedBridlewayKMpH,     true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Denmark
@@ -280,23 +280,23 @@ VehicleModel::LimitsInitList const g_bicycleLimitsFrance =
 {
   // No trunk, trunk_link
   // Pedestrian is allowed
-  {{"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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      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,         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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       false},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  false},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      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,       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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       false},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  false},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      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,         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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "bridleway"},      kOutCitySpeedBridlewayKMpH,     true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 VehicleModel::SurfaceInitList const g_bicycleSurface = {
@@ -452,8 +452,8 @@ void BicycleModel::Init()
 
   vector<AdditionalRoadTags> const additionalTags = {
       {hwtagYesBicycle, m_maxSpeed},
-      {{"route", "ferry"}, kSpeedFerryKMpH},
-      {{"man_made", "pier"}, kSpeedPierKMpH}
+      {{"route", "ferry"}, kOutCitySpeedFerryKMpH},
+      {{"man_made", "pier"}, kOutCitySpeedPierKMpH}
   };
 
   SetAdditionalRoadTypes(classif(), additionalTags);
@@ -483,7 +483,7 @@ bool BicycleModel::IsOneWay(FeatureType & f) const
   return VehicleModel::IsOneWay(f);
 }
 
-double BicycleModel::GetOffroadSpeed() const { return kSpeedOffroadKMpH; }
+double BicycleModel::GetOffroadSpeed() const { return kOutCitySpeedOffroadKMpH; }
 
 // If one of feature types will be disabled for bicycles, features of this type will be simplyfied
 // in generator. Look FeatureBuilder1::IsRoad() for more details.
diff --git a/routing_common/car_model.cpp b/routing_common/car_model.cpp
index 61d4af46e0..7dab197586 100644
--- a/routing_common/car_model.cpp
+++ b/routing_common/car_model.cpp
@@ -17,48 +17,48 @@ namespace
 // See road types here:
 //   https://wiki.openstreetmap.org/wiki/Key:highway
 
-double constexpr kSpeedMotorwayKMpH = 115.37;
-double constexpr kSpeedMotorwayLinkKMpH = 75.0;
-double constexpr kSpeedTrunkKMpH = 93.89;
-double constexpr kSpeedTrunkLinkKMpH = 70.0;
-double constexpr kSpeedPrimaryKMpH = 84.29;
-double constexpr kSpeedPrimaryLinkKMpH = 60.0;
-double constexpr kSpeedSecondaryKMpH = 72.23;
-double constexpr kSpeedSecondaryLinkKMpH = 50.0;
-double constexpr kSpeedTertiaryKMpH = 62.63;
-double constexpr kSpeedTertiaryLinkKMpH = 30.0;
-double constexpr kSpeedResidentialKMpH = 25.0;
-double constexpr kSpeedUnclassifiedKMpH = 51.09;
-double constexpr kSpeedServiceKMpH = 15.0;
-double constexpr kSpeedLivingStreetKMpH = 10.0;
-double constexpr kSpeedRoadKMpH = 10.0;
-double constexpr kSpeedTrackKMpH = 5.0;
-double constexpr kSpeedFerryMotorcarKMpH = 15.0;
-double constexpr kSpeedFerryMotorcarVehicleKMpH = 15.0;
-double constexpr kSpeedRailMotorcarVehicleKMpH = 25.0;
-double constexpr kSpeedShuttleTrainKMpH = 25.0;
-double constexpr kSpeedPierKMpH = 10.0;
-double constexpr kSpeedOffroadKMpH = 10.0;
+double constexpr kOutCitySpeedMotorwayKMpH = 115.37;
+double constexpr kOutCitySpeedMotorwayLinkKMpH = 75.0;
+double constexpr kOutCitySpeedTrunkKMpH = 93.89;
+double constexpr kOutCitySpeedTrunkLinkKMpH = 70.0;
+double constexpr kOutCitySpeedPrimaryKMpH = 84.29;
+double constexpr kOutCitySpeedPrimaryLinkKMpH = 60.0;
+double constexpr kOutCitySpeedSecondaryKMpH = 72.23;
+double constexpr kOutCitySpeedSecondaryLinkKMpH = 50.0;
+double constexpr kOutCitySpeedTertiaryKMpH = 62.63;
+double constexpr kOutCitySpeedTertiaryLinkKMpH = 30.0;
+double constexpr kOutCitySpeedResidentialKMpH = 25.0;
+double constexpr kOutCitySpeedUnclassifiedKMpH = 51.09;
+double constexpr kOutCitySpeedServiceKMpH = 15.0;
+double constexpr kOutCitySpeedLivingStreetKMpH = 10.0;
+double constexpr kOutCitySpeedRoadKMpH = 10.0;
+double constexpr kOutCitySpeedTrackKMpH = 5.0;
+double constexpr kOutCitySpeedFerryMotorcarKMpH = 15.0;
+double constexpr kOutCitySpeedFerryMotorcarVehicleKMpH = 15.0;
+double constexpr kOutCitySpeedRailMotorcarVehicleKMpH = 25.0;
+double constexpr kOutCitySpeedShuttleTrainKMpH = 25.0;
+double constexpr kOutCitySpeedPierKMpH = 10.0;
+double constexpr kOutCitySpeedOffroadKMpH = 10.0;
 
 VehicleModel::LimitsInitList const g_carLimitsDefault =
 {
   // {{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}
+  {{"highway", "motorway"},       kOutCitySpeedMotorwayKMpH,      true},
+  {{"highway", "motorway_link"},  kOutCitySpeedMotorwayLinkKMpH,  true},
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         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,      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}
+  {{"highway", "motorway"},       kOutCitySpeedMotorwayKMpH,      true},
+  {{"highway", "motorway_link"},  kOutCitySpeedMotorwayLinkKMpH,  true},
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  false},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true}
 };
 
 VehicleModel::LimitsInitList const g_carLimitsNoPassThroughLivingStreetAndService =
 {
-  {{"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}
+  {{"highway", "motorway"},       kOutCitySpeedMotorwayKMpH,      true},
+  {{"highway", "motorway_link"},  kOutCitySpeedMotorwayLinkKMpH,  true},
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       false},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  false},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         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,       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", "motorway"},       kOutCitySpeedMotorwayKMpH,       true},
+  {{"highway", "motorway_link"},  kOutCitySpeedMotorwayLinkKMpH,  true},
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          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,      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}
+  {{"highway", "motorway"},       kOutCitySpeedMotorwayKMpH,      true},
+  {{"highway", "motorway_link"},  kOutCitySpeedMotorwayLinkKMpH,  true},
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         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},
-  {{"route", "ferry", "motor_vehicle"}, kSpeedFerryMotorcarVehicleKMpH},
-  {{"railway", "rail", "motor_vehicle"}, kSpeedRailMotorcarVehicleKMpH},
-  {{"route", "shuttle_train"}, kSpeedShuttleTrainKMpH},
-  {{"route", "ferry"}, kSpeedFerryMotorcarKMpH},
-  {{"man_made", "pier"}, kSpeedPierKMpH}
+  {{"route", "ferry", "motorcar"}, kOutCitySpeedFerryMotorcarKMpH},
+  {{"route", "ferry", "motor_vehicle"}, kOutCitySpeedFerryMotorcarVehicleKMpH},
+  {{"railway", "rail", "motor_vehicle"}, kOutCitySpeedRailMotorcarVehicleKMpH},
+  {{"route", "shuttle_train"}, kOutCitySpeedShuttleTrainKMpH},
+  {{"route", "ferry"}, kOutCitySpeedFerryMotorcarKMpH},
+  {{"man_made", "pier"}, kOutCitySpeedPierKMpH}
 };
 
 VehicleModel::SurfaceInitList const g_carSurface = {
@@ -226,7 +226,7 @@ CarModel::CarModel(VehicleModel::LimitsInitList const & roadLimits)
   InitAdditionalRoadTypes();
 }
 
-double CarModel::GetOffroadSpeed() const { return kSpeedOffroadKMpH; }
+double CarModel::GetOffroadSpeed() const { return kOutCitySpeedOffroadKMpH; }
 
 void CarModel::InitAdditionalRoadTypes()
 {
diff --git a/routing_common/pedestrian_model.cpp b/routing_common/pedestrian_model.cpp
index 6faab036af..73f855db8f 100644
--- a/routing_common/pedestrian_model.cpp
+++ b/routing_common/pedestrian_model.cpp
@@ -28,151 +28,151 @@ namespace
 // less pedestrian. As result of such heuristic road is not totally the shortest, but it avoids non pedestrian roads, which were
 // not marked as "foot=no" in OSM.
 
-double constexpr kSpeedTrunkKMpH = 1.0;
-double constexpr kSpeedTrunkLinkKMpH = 1.0;
-double constexpr kSpeedPrimaryKMpH = 2.0;
-double constexpr kSpeedPrimaryLinkKMpH = 2.0;
-double constexpr kSpeedSecondaryKMpH = 3.0;
-double constexpr kSpeedSecondaryLinkKMpH = 3.0;
-double constexpr kSpeedTertiaryKMpH = 4.0;
-double constexpr kSpeedTertiaryLinkKMpH = 4.0;
-double constexpr kSpeedServiceKMpH = 5.0;
-double constexpr kSpeedUnclassifiedKMpH = 4.5;
-double constexpr kSpeedRoadKMpH = 4.0;
-double constexpr kSpeedTrackKMpH = 5.0;
-double constexpr kSpeedPathKMpH = 5.0;
-double constexpr kSpeedBridlewayKMpH = 1.0;
-double constexpr kSpeedCyclewayKMpH = 4.0;
-double constexpr kSpeedResidentialKMpH = 4.5;
-double constexpr kSpeedLivingStreetKMpH = 5.0;
-double constexpr kSpeedStepsKMpH = 4.9;
-double constexpr kSpeedPedestrianKMpH = 5.0;
-double constexpr kSpeedFootwayKMpH = 5.0;
-double constexpr kSpeedPlatformKMpH = 5.0;
-double constexpr kSpeedPierKMpH = 4.0;
-double constexpr kSpeedOffroadKMpH = 3.0;
-double constexpr kSpeedFerryKMpH = 1.0;
+double constexpr kOutCitySpeedTrunkKMpH = 1.0;
+double constexpr kOutCitySpeedTrunkLinkKMpH = 1.0;
+double constexpr kOutCitySpeedPrimaryKMpH = 2.0;
+double constexpr kOutCitySpeedPrimaryLinkKMpH = 2.0;
+double constexpr kOutCitySpeedSecondaryKMpH = 3.0;
+double constexpr kOutCitySpeedSecondaryLinkKMpH = 3.0;
+double constexpr kOutCitySpeedTertiaryKMpH = 4.0;
+double constexpr kOutCitySpeedTertiaryLinkKMpH = 4.0;
+double constexpr kOutCitySpeedServiceKMpH = 5.0;
+double constexpr kOutCitySpeedUnclassifiedKMpH = 4.5;
+double constexpr kOutCitySpeedRoadKMpH = 4.0;
+double constexpr kOutCitySpeedTrackKMpH = 5.0;
+double constexpr kOutCitySpeedPathKMpH = 5.0;
+double constexpr kOutCitySpeedBridlewayKMpH = 1.0;
+double constexpr kOutCitySpeedCyclewayKMpH = 4.0;
+double constexpr kOutCitySpeedResidentialKMpH = 4.5;
+double constexpr kOutCitySpeedLivingStreetKMpH = 5.0;
+double constexpr kOutCitySpeedStepsKMpH = 4.9;
+double constexpr kOutCitySpeedPedestrianKMpH = 5.0;
+double constexpr kOutCitySpeedFootwayKMpH = 5.0;
+double constexpr kOutCitySpeedPlatformKMpH = 5.0;
+double constexpr kOutCitySpeedPierKMpH = 4.0;
+double constexpr kOutCitySpeedOffroadKMpH = 3.0;
+double constexpr kOutCitySpeedFerryKMpH = 1.0;
 
 // Default
 VehicleModel::LimitsInitList const g_pedestrianLimitsDefault =
 {
   // {{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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // All options available.
 VehicleModel::LimitsInitList const g_pedestrianLimitsAll =
 {
-  {{"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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "bridleway"},      kOutCitySpeedBridlewayKMpH,     true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Same as defaults except trunk and trunk link are not allowed.
 VehicleModel::LimitsInitList const g_pedestrianLimitsNoTrunk =
 {
-  {{"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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Same as defaults except cycleway is allowed.
 VehicleModel::LimitsInitList const g_pedestrianLimitsCyclewayAllowed =
 {
-  {{"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}
+  {{"highway", "trunk"},          kOutCitySpeedTrunkKMpH,         true},
+  {{"highway", "trunk_link"},     kOutCitySpeedTrunkLinkKMpH,     true},
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Same as defaults except cycleway is allowed and trunk and trunk_link are not allowed.
 VehicleModel::LimitsInitList const g_pedestrianLimitsCyclewayAllowedNoTrunk =
 {
-  {{"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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,        true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,    true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,      true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH,  true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,       true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,   true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,        true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,   true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,           true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,          true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,           true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,       true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,    true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,   true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,          true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,     true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,        true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,       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,       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}
+  {{"highway", "primary"},        kOutCitySpeedPrimaryKMpH,       true},
+  {{"highway", "primary_link"},   kOutCitySpeedPrimaryLinkKMpH,   true},
+  {{"highway", "secondary"},      kOutCitySpeedSecondaryKMpH,     true},
+  {{"highway", "secondary_link"}, kOutCitySpeedSecondaryLinkKMpH, true},
+  {{"highway", "tertiary"},       kOutCitySpeedTertiaryKMpH,      true},
+  {{"highway", "tertiary_link"},  kOutCitySpeedTertiaryLinkKMpH,  true},
+  {{"highway", "service"},        kOutCitySpeedServiceKMpH,       true},
+  {{"highway", "unclassified"},   kOutCitySpeedUnclassifiedKMpH,  true},
+  {{"highway", "road"},           kOutCitySpeedRoadKMpH,          true},
+  {{"highway", "track"},          kOutCitySpeedTrackKMpH,         true},
+  {{"highway", "path"},           kOutCitySpeedPathKMpH,          true},
+  {{"highway", "bridleway"},      kOutCitySpeedBridlewayKMpH,     true},
+  {{"highway", "cycleway"},       kOutCitySpeedCyclewayKMpH,      true},
+  {{"highway", "residential"},    kOutCitySpeedResidentialKMpH,   true},
+  {{"highway", "living_street"},  kOutCitySpeedLivingStreetKMpH,  true},
+  {{"highway", "steps"},          kOutCitySpeedStepsKMpH,         true},
+  {{"highway", "pedestrian"},     kOutCitySpeedPedestrianKMpH,    true},
+  {{"highway", "footway"},        kOutCitySpeedFootwayKMpH,       true},
+  {{"highway", "platform"},       kOutCitySpeedPlatformKMpH,      true}
 };
 
 // Brazil
@@ -293,7 +293,7 @@ PedestrianModel::PedestrianModel(VehicleModel::LimitsInitList const & speedLimit
   Init();
 }
 
-double PedestrianModel::GetOffroadSpeed() const { return kSpeedOffroadKMpH; }
+double PedestrianModel::GetOffroadSpeed() const { return kOutCitySpeedOffroadKMpH; }
 
 void PedestrianModel::Init()
 {
@@ -304,8 +304,8 @@ void PedestrianModel::Init()
 
   vector<AdditionalRoadTags> const additionalTags = {
     {hwtagYesFoot, m_maxSpeed},
-    {{"route", "ferry"}, kSpeedFerryKMpH},
-    {{"man_made", "pier"}, kSpeedPierKMpH}
+    {{"route", "ferry"}, kOutCitySpeedFerryKMpH},
+    {{"man_made", "pier"}, kOutCitySpeedPierKMpH}
   };
 
   SetAdditionalRoadTypes(classif(), additionalTags);