diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-08-10 17:15:37 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-08-19 10:24:03 +0300 |
commit | 419b4d933dec20728885e917597253b7b7e21f52 (patch) | |
tree | 2c2d970414ef15fe34440f000b8484319e8e9d8f /routing | |
parent | ac5740849fca526d80b2e6372b1b5cafb7d5fe37 (diff) |
Review fixes.
Diffstat (limited to 'routing')
-rw-r--r-- | routing/vehicle_model.cpp | 10 | ||||
-rw-r--r-- | routing/vehicle_model.hpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/routing/vehicle_model.cpp b/routing/vehicle_model.cpp index efa0b982c4..55dc513262 100644 --- a/routing/vehicle_model.cpp +++ b/routing/vehicle_model.cpp @@ -62,8 +62,8 @@ double VehicleModel::GetMinTypeSpeed(feature::TypesHolder const & types) const if (it != m_types.end()) speed = min(speed, it->second); - auto const addRoadInfoIter = GetRoadTypeIter(type); - if (addRoadInfoIter != m_addRoadTypes.end()) + auto const addRoadInfoIter = FindRoadType(type); + if (addRoadInfoIter != m_addRoadTypes.cend()) speed = min(speed, addRoadInfoIter->m_speedKMpH); } if (speed <= m_maxSpeedKMpH) @@ -96,7 +96,7 @@ bool VehicleModel::IsRoad(FeatureType const & f) const bool VehicleModel::IsRoadType(uint32_t type) const { - return GetRoadTypeIter(type) != m_addRoadTypes.end() || + return FindRoadType(type) != m_addRoadTypes.cend() || m_types.find(ftypes::BaseChecker::PrepareToMatch(type, 2)) != m_types.end(); } @@ -105,10 +105,10 @@ IVehicleModel::RoadAvailability VehicleModel::GetRoadAvailability(feature::Types return RoadAvailability::Unknown; } -vector<VehicleModel::AdditionalRoadType>::const_iterator VehicleModel::GetRoadTypeIter( +vector<VehicleModel::AdditionalRoadType>::const_iterator VehicleModel::FindRoadType( uint32_t type) const { - return find_if(m_addRoadTypes.begin(), m_addRoadTypes.end(), + return find_if(m_addRoadTypes.begin(), m_addRoadTypes.cend(), [&type](AdditionalRoadType const & t) { return t.m_type == type; }); } diff --git a/routing/vehicle_model.hpp b/routing/vehicle_model.hpp index cd9f4cc153..bd550cc3a0 100644 --- a/routing/vehicle_model.hpp +++ b/routing/vehicle_model.hpp @@ -123,7 +123,7 @@ private: double const m_speedKMpH; }; - vector<AdditionalRoadType>::const_iterator GetRoadTypeIter(uint32_t type) const; + vector<AdditionalRoadType>::const_iterator FindRoadType(uint32_t type) const; unordered_map<uint32_t, double> m_types; |