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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-08-10 17:15:37 +03:00
parent ac5740849f
commit 419b4d933d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routing/vehicle_model.cpp
View file

@ -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; });
}

2
routing/vehicle_model.hpp
View file

@ -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;