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

Review fixes

Browse source
This commit is contained in:
tatiana-yan 2020-01-21 16:26:12 +03:00 • committed by Maksim Andrianov
parent c6bf6ee721
commit 5bf52fd0c6
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
generator/osm2type.cpp
View file

@ -242,19 +242,15 @@ void LeaveLongestTypes(vector<generator::TypeStrings> & matchedTypes)
auto const less = [](auto const & lhs, auto const & rhs) { return lhs > rhs; };
auto const equals = [](auto const & lhs, auto const & rhs) {
for (auto lhsIt = lhs.begin(), rhsIt = rhs.begin(); lhsIt != lhs.end() && rhsIt != rhs.end();
++lhsIt, ++rhsIt)
{
if (*lhsIt != *rhsIt)
return false;
}
return true;
if (rhs.size() > lhs.size())
return equal(lhs.begin(), lhs.end(), rhs.begin());
return equal(rhs.begin(), rhs.end(), lhs.begin());
};
base::SortUnique(matchedTypes, less, equals);
}
void MatchTypes(OsmElement * p, FeatureBuilderParams & params, function<bool(uint32_t)> filterType)
void MatchTypes(OsmElement * p, FeatureBuilderParams & params, function<bool(uint32_t)> const & filterType)
{
auto static const rules = generator::ParseMapCSS(GetPlatform().GetReader("mapcss-mapping.csv"));