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-20 16:44:59 +03:00 • committed by Maksim Andrianov
parent c27d2f3461
commit c6bf6ee721
4 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/osm2meta.hpp
View file

@ -39,7 +39,7 @@ class MetadataTagProcessor : private MetadataTagProcessorImpl
public:
/// Make base class constructor public.
using MetadataTagProcessorImpl::MetadataTagProcessorImpl;
/// TODO(mgsergio): Move to cpp after merge with https://github.com/mapsme/omim/pull/1314
void operator()(std::string const & k, std::string const & v)
{
if (v.empty())

21
generator/osm2type.cpp
View file

@ -239,20 +239,7 @@ private:
void LeaveLongestTypes(vector<generator::TypeStrings> & matchedTypes)
{
auto const less = [](auto const & lhs, auto const & rhs) {
for (auto lhsIt = lhs.begin(), rhsIt = rhs.begin();; ++lhsIt, ++rhsIt)
{
if (lhsIt == lhs.end() && rhsIt == rhs.end())
return false;
if (lhsIt == lhs.end() && rhsIt != rhs.end())
return false;
if (lhsIt != lhs.end() && rhsIt == rhs.end())
return true;
if (*lhsIt != *rhsIt)
return *lhsIt < *rhsIt;
}
};
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();
@ -272,10 +259,10 @@ void MatchTypes(OsmElement * p, FeatureBuilderParams & params, function<bool(uin
auto static const rules = generator::ParseMapCSS(GetPlatform().GetReader("mapcss-mapping.csv"));
vector<generator::TypeStrings> matchedTypes;
for (auto const & rule : rules)
for (auto const & [typeString, rule] : rules)
{
if (rule.second.Matches(p->m_tags))
matchedTypes.push_back(rule.first);
if (rule.Matches(p->m_tags))
matchedTypes.push_back(typeString);
}
LeaveLongestTypes(matchedTypes);

4
generator/utils.cpp
View file

@ -237,7 +237,7 @@ MapcssRules ParseMapCSS(std::unique_ptr<Reader> reader)
// column. It works only for simple types that are produced from tags replacing '=' with '|'.
std::string line;
while (getline(data, line))
while (std::getline(data, line))
{
std::vector<std::string> fields;
strings::ParseCSVRow(line, ';', fields);
@ -246,7 +246,7 @@ MapcssRules ParseMapCSS(std::unique_ptr<Reader> reader)
if (fields.size() == 3 && fields[2].empty())
processShort(fields[0]);
// Ful format, not obsolete.
// Full format, not obsolete.
if (fields.size() == 7 && fields[2] != "x")
processFull(fields[0], fields[1]);
}

13
indexer/feature_data.cpp
View file

@ -412,20 +412,17 @@ void FeatureParams::AddTypes(FeatureParams const & rhs, uint32_t skipType2)
bool FeatureParams::FinishAddingTypes()
{
vector<uint32_t> newTypes = m_types;
base::SortUnique(newTypes);
base::SortUnique(m_types);
if (newTypes.size() > kMaxTypesCount)
if (m_types.size() > kMaxTypesCount)
{
// Put common types to the end to leave the most important types.
auto const & checker = UselessTypesChecker::Instance();
UNUSED_VALUE(base::RemoveIfKeepValid(newTypes.begin(), newTypes.end(), checker));
newTypes.resize(kMaxTypesCount);
sort(newTypes.begin(), newTypes.end());
UNUSED_VALUE(base::RemoveIfKeepValid(m_types.begin(), m_types.end(), checker));
m_types.resize(kMaxTypesCount);
sort(m_types.begin(), m_types.end());
}
m_types.swap(newTypes);
// Patch fix that removes house number from localities.
if (!house.IsEmpty() && ftypes::IsLocalityChecker::Instance()(m_types))
{