diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-08-10 17:49:14 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-08-19 10:24:03 +0300 |
| commit | 2952f8e237f5e28d3179aab2bd2d743879443fa5 (patch) | |
| tree | 76027465ff087161a3815ab8d3da4ea6404d4e1e /routing | |
| parent | 419b4d933dec20728885e917597253b7b7e21f52 (diff) | |
git-clang-format
Diffstat (limited to 'routing')
| -rw-r--r-- | routing/car_model.cpp | 49 | ||||
| -rw-r--r-- | routing/vehicle_model.cpp | 2 |
2 files changed, 25 insertions, 26 deletions
diff --git a/routing/car_model.cpp b/routing/car_model.cpp index 5bd2350359..31a6e4c78b 100644 --- a/routing/car_model.cpp +++ b/routing/car_model.cpp @@ -30,31 +30,30 @@ double constexpr kSpeedFerryMotorcarVehicleKMpH = 15.0; double constexpr kSpeedRailMotorcarVehicleKMpH = 25.0; double constexpr kSpeedShuttleTrainKMpH = 25.0; -routing::VehicleModel::InitListT const s_carLimits = -{ - { {"highway", "motorway"}, kSpeedMotorwayKMpH }, - { {"highway", "trunk"}, kSpeedTrunkKMpH }, - { {"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH }, - { {"highway", "trunk_link"}, kSpeedTrunkLinkKMpH }, - { {"highway", "primary"}, kSpeedPrimaryKMpH }, - { {"highway", "primary_link"}, kSpeedPrimaryLinkKMpH }, - { {"highway", "secondary"}, kSpeedSecondaryKMpH }, - { {"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH }, - { {"highway", "tertiary"}, kSpeedTertiaryKMpH }, - { {"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH }, - { {"highway", "residential"}, kSpeedResidentialKMpH }, - { {"highway", "pedestrian"}, kSpeedPedestrianKMpH }, - { {"highway", "unclassified"}, kSpeedUnclassifiedKMpH }, - { {"highway", "service"}, kSpeedServiceKMpH }, - { {"highway", "living_street"}, kSpeedLivingStreetKMpH }, - { {"highway", "road"}, kSpeedRoadKMpH }, - { {"highway", "track"}, kSpeedTrackKMpH }, - /// @todo: Add to classificator - //{ {"highway", "shuttle_train"}, 10 }, - //{ {"highway", "ferry"}, 5 }, - //{ {"highway", "default"}, 10 }, - /// @todo: Check type - //{ {"highway", "construction"}, 40 }, +routing::VehicleModel::InitListT const s_carLimits = { + {{"highway", "motorway"}, kSpeedMotorwayKMpH}, + {{"highway", "trunk"}, kSpeedTrunkKMpH}, + {{"highway", "motorway_link"}, kSpeedMotorwayLinkKMpH}, + {{"highway", "trunk_link"}, kSpeedTrunkLinkKMpH}, + {{"highway", "primary"}, kSpeedPrimaryKMpH}, + {{"highway", "primary_link"}, kSpeedPrimaryLinkKMpH}, + {{"highway", "secondary"}, kSpeedSecondaryKMpH}, + {{"highway", "secondary_link"}, kSpeedSecondaryLinkKMpH}, + {{"highway", "tertiary"}, kSpeedTertiaryKMpH}, + {{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH}, + {{"highway", "residential"}, kSpeedResidentialKMpH}, + {{"highway", "pedestrian"}, kSpeedPedestrianKMpH}, + {{"highway", "unclassified"}, kSpeedUnclassifiedKMpH}, + {{"highway", "service"}, kSpeedServiceKMpH}, + {{"highway", "living_street"}, kSpeedLivingStreetKMpH}, + {{"highway", "road"}, kSpeedRoadKMpH}, + {{"highway", "track"}, kSpeedTrackKMpH}, + /// @todo: Add to classificator + //{ {"highway", "shuttle_train"}, 10 }, + //{ {"highway", "ferry"}, 5 }, + //{ {"highway", "default"}, 10 }, + /// @todo: Check type + //{ {"highway", "construction"}, 40 }, }; } // namespace diff --git a/routing/vehicle_model.cpp b/routing/vehicle_model.cpp index 55dc513262..47724d7313 100644 --- a/routing/vehicle_model.cpp +++ b/routing/vehicle_model.cpp @@ -13,7 +13,7 @@ namespace routing { VehicleModel::AdditionalRoadType::AdditionalRoadType(Classificator const & c, - AdditionalRoadTags const & tag) + AdditionalRoadTags const & tag) : m_type(c.GetTypeByPath(tag.m_hwtag)), m_speedKMpH(tag.m_speedKMpH) { } |