diff options
Diffstat (limited to 'generator/osm_element.cpp')
| -rw-r--r-- | generator/osm_element.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/generator/osm_element.cpp b/generator/osm_element.cpp index c82f3a9257..4f7370de7d 100644 --- a/generator/osm_element.cpp +++ b/generator/osm_element.cpp @@ -3,11 +3,11 @@ #include "base/string_utils.hpp" #include "coding/parse_xml.hpp" -#include "std/algorithm.hpp" -#include "std/cstdio.hpp" -#include "std/sstream.hpp" +#include <algorithm> +#include <cstdio> +#include <sstream> -string DebugPrint(OsmElement::EntityType e) +std::string DebugPrint(OsmElement::EntityType e) { switch (e) { @@ -31,7 +31,7 @@ string DebugPrint(OsmElement::EntityType e) } -void OsmElement::AddTag(string const & k, string const & v) +void OsmElement::AddTag(std::string const & k, std::string const & v) { // Seems like source osm data has empty values. They are useless for us. if (k.empty() || v.empty()) @@ -64,19 +64,19 @@ void OsmElement::AddTag(string const & k, string const & v) SKIP_KEY("official_name"); #undef SKIP_KEY - string value = v; + std::string value = v; strings::Trim(value); m_tags.emplace_back(k, value); } -string OsmElement::ToString(string const & shift) const +std::string OsmElement::ToString(std::string const & shift) const { - stringstream ss; + std::stringstream ss; ss << (shift.empty() ? "\n" : shift); switch (type) { case EntityType::Node: - ss << "Node: " << id << " (" << fixed << setw(7) << lat << ", " << lon << ")" + ss << "Node: " << id << " (" << std::fixed << std::setw(7) << lat << ", " << lon << ")" << " tags: " << m_tags.size(); break; case EntityType::Nd: @@ -86,7 +86,7 @@ string OsmElement::ToString(string const & shift) const ss << "Way: " << id << " nds: " << m_nds.size() << " tags: " << m_tags.size(); if (!m_nds.empty()) { - string shift2 = shift; + std::string shift2 = shift; shift2 += shift2.empty() ? "\n " : " "; for (auto const & e : m_nds) ss << shift2 << e; @@ -96,7 +96,7 @@ string OsmElement::ToString(string const & shift) const ss << "Relation: " << id << " members: " << m_members.size() << " tags: " << m_tags.size(); if (!m_members.empty()) { - string shift2 = shift; + std::string shift2 = shift; shift2 += shift2.empty() ? "\n " : " "; for (auto const & e : m_members) ss << shift2 << e.ref << " " << DebugPrint(e.type) << " " << e.role; @@ -113,7 +113,7 @@ string OsmElement::ToString(string const & shift) const } if (!m_tags.empty()) { - string shift2 = shift; + std::string shift2 = shift; shift2 += shift2.empty() ? "\n " : " "; for (auto const & e : m_tags) ss << shift2 << e.key << " = " << e.value; @@ -121,9 +121,9 @@ string OsmElement::ToString(string const & shift) const return ss.str(); } -string OsmElement::GetTag(string const & key) const +std::string OsmElement::GetTag(std::string const & key) const { - auto const it = find_if(begin(m_tags), end(m_tags), [&key](Tag const & tag) + auto const it = std::find_if(begin(m_tags), end(m_tags), [&key](Tag const & tag) { return tag.key == key; }); @@ -134,14 +134,14 @@ string OsmElement::GetTag(string const & key) const return it->value; } -string DebugPrint(OsmElement const & e) +std::string DebugPrint(OsmElement const & e) { return e.ToString(); } -string DebugPrint(OsmElement::Tag const & tag) +std::string DebugPrint(OsmElement::Tag const & tag) { - stringstream ss; + std::stringstream ss; ss << tag.key << '=' << tag.value; return ss.str(); } |