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

Optimization step 'generate_features': Added overloading for AddTag.

Browse source
This commit is contained in:
Maksim Andrianov 2019-06-25 15:01:56 +03:00 • committed by mpimenov
parent dfd72c0b52
commit 94eb883725
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
generator/osm_element.cpp
View file

@ -31,13 +31,13 @@ std::string DebugPrint(OsmElement::EntityType type)
UNREACHABLE();
}
void OsmElement::AddTag(std::string const & key, std::string const & value)
void OsmElement::AddTag(char const * key, char const * value)
{
// Seems like source osm data has empty values. They are useless for us.
if (key.empty() || value.empty())
if (key[0] == '\0' || value[0] == '\0')
return;
#define SKIP_KEY(skippedKey) if (strncmp(key.data(), skippedKey, sizeof(key)-1) == 0) return;
#define SKIP_KEY(skippedKey) if (strncmp(key, skippedKey, sizeof(skippedKey)-1) == 0) return;
// OSM technical info tags
SKIP_KEY("created_by");
SKIP_KEY("source");
@ -63,9 +63,14 @@ void OsmElement::AddTag(std::string const & key, std::string const & value)
SKIP_KEY("official_name");
#undef SKIP_KEY
std::string val{std::string{value}};
std::string val{value};
strings::Trim(val);
m_tags.emplace_back(std::string{key}, std::move(val));
m_tags.emplace_back(key, std::move(val));
}
void OsmElement::AddTag(std::string const & key, std::string const & value)
{
AddTag(key.data(), value.data());
}
bool OsmElement::HasTag(std::string const & key) const

1
generator/osm_element.hpp
View file

@ -123,6 +123,7 @@ struct OsmElement
m_members.emplace_back(ref, type, role);
}
void AddTag(char const * key, char const * value);
void AddTag(std::string const & key, std::string const & value);
bool HasTag(std::string const & key) const;
bool HasTag(std::string const & key, std::string const & value) const;