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

Review fixes.

Browse source
This commit is contained in:
tatiana-yan 2020-07-02 11:23:27 +03:00 • committed by mpimenov
parent 20a0710c49
commit 7444c87a02
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
indexer/ftypes_matcher.cpp
View file

@ -320,12 +320,17 @@ SuburbType IsSuburbChecker::GetType(uint32_t t) const
SuburbType IsSuburbChecker::GetType(feature::TypesHolder const & types) const
{
auto smallestType = SuburbType::Count;
for (uint32_t t : types)
{
auto const type = GetType(t);
if (type != SuburbType::None)
return type;
if (type != SuburbType::None && type < smallestType)
smallestType = type;
}
if (smallestType != SuburbType::Count)
return smallestType;
return SuburbType::None;
}

5
indexer/ftypes_matcher.hpp
View file

@ -136,8 +136,9 @@ public:
DECLARE_CHECKER_INSTANCE(IsSquareChecker);
};
/// Type of locality (do not change values and order - they have detalization order)
/// Suburb > Neighbourhood > Residential
// Type of suburb.
// Do not change values and order - they are in the order of decreasing specificity.
// Suburb > Neighbourhood > Residential
enum class SuburbType
{
None = -1,