kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

git-clang-format

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-06-09 10:05:05 +03:00 • committed by Tatiana Yan
parent 317e6da20b
commit fd04c3c3dd
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing_common/vehicle_model.cpp
View file

@ -165,7 +165,7 @@ bool VehicleModel::HasPassThroughType(feature::TypesHolder const & types) const
bool VehicleModel::IsRoadType(uint32_t type) const
{
return FindRoadType(type) != m_addRoadTypes.cend() ||
m_highwayTypes.find(ftypes::BaseChecker::PrepareToMatch(type, 2)) != m_highwayTypes.end();
m_highwayTypes.find(ftypes::BaseChecker::PrepareToMatch(type, 2)) != m_highwayTypes.end();
}
VehicleModelInterface::RoadAvailability VehicleModel::GetRoadAvailability(feature::TypesHolder const & /* types */) const

9
routing_common/vehicle_model.hpp
View file

@ -81,9 +81,9 @@ public:
// psurface|unpaved_good and psurface|unpaved_bad.
struct FeatureTypeSurface
{
char const * m_types[2]; // 2-arity road type
double m_speedFactor; // Factor (lowering) which reduces speed on feature in case of
// bad pavement. It should be from 0.0 to 1.0.
char const * m_types[2]; // 2-arity road type
double m_speedFactor; // Factor (lowering) which reduces speed on feature in case of
// bad pavement. It should be from 0.0 to 1.0.
};
struct AdditionalRoadTags final
@ -129,8 +129,7 @@ public:
bool EqualsForTests(VehicleModel const & rhs) const
{
return (m_highwayTypes == rhs.m_highwayTypes) &&
(m_addRoadTypes == rhs.m_addRoadTypes) &&
return (m_highwayTypes == rhs.m_highwayTypes) && (m_addRoadTypes == rhs.m_addRoadTypes) &&
(m_onewayType == rhs.m_onewayType);
}