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

[generator] GetInternationalName

Browse source
This commit is contained in:
LaGrunge 2019-07-17 08:47:40 +03:00 • committed by cc-engineering
parent f51d070a60
commit fa428b3fed
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
generator/regions/region.cpp
View file

@ -49,16 +49,11 @@ std::string Region::GetTranslatedOrTransliteratedName(LanguageCode languageCode)
std::string Region::GetInternationalName() const
{
if (!m_placeLabel)
{
std::string intName =
RegionWithName::GetTranslatedOrTransliteratedName(StringUtf8Multilang::kInternationalCode);
return intName.empty() ? RegionWithName::GetName() : intName;
}
return RegionWithName::GetInternationalName();
std::string const & intName =
m_placeLabel->GetTranslatedOrTransliteratedName(StringUtf8Multilang::kInternationalCode);
std::string intName = m_placeLabel->GetInternationalName();
return intName;
return intName.empty() ? RegionWithName::GetInternationalName() : intName;
}
std::string Region::GetName(int8_t lang) const

8
generator/regions/region_base.cpp
View file

@ -17,6 +17,14 @@ std::string RegionWithName::GetTranslatedOrTransliteratedName(LanguageCode langu
return ::generator::GetTranslatedOrTransliteratedName(m_name, languageCode);
}
std::string RegionWithName::GetInternationalName() const
{
std::string intName = ::generator::GetTranslatedOrTransliteratedName(
m_name, StringUtf8Multilang::kInternationalCode);
return intName.empty() ? GetName() : intName;
}
StringUtf8Multilang const & RegionWithName::GetMultilangName() const { return m_name; }
base::GeoObjectId RegionWithData::GetId() const { return m_regionData.GetOsmId(); }

3
generator/regions/region_base.hpp
View file

@ -31,7 +31,8 @@ public:
explicit RegionWithName(StringUtf8Multilang name) : m_name(std::move(name)) {}
std::string GetTranslatedOrTransliteratedName(LanguageCode languageCode) const;
// returns default name if int_name is empty
std::string GetInternationalName() const;
std::string GetName(int8_t lang = StringUtf8Multilang::kDefaultCode) const;
StringUtf8Multilang const & GetMultilangName() const;