kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[downloader] Fix behavior for absent description

Browse source
This commit is contained in:
Ilya Grechuhin 2016-04-20 16:48:13 +03:00
parent 81edaa14e2
commit c294c3c212
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/country_name_getter.cpp
View file

@ -15,14 +15,19 @@ void CountryNameGetter::SetLocaleForTesting(string const & jsonBuffer, string co
m_getCurLang = platform::ForTestingGetTextByIdFactory(jsonBuffer, locale);
}
string CountryNameGetter::operator()(TCountryId const & countryId) const
string CountryNameGetter::Get(string const & key) const
{
ASSERT(!countryId.empty(), ());
ASSERT(!key.empty(), ());
if (m_getCurLang == nullptr)
return countryId;
return string();
string name = (*m_getCurLang)(countryId);
return (*m_getCurLang)(key);
}
string CountryNameGetter::operator()(TCountryId const & countryId) const
{
string const name = Get(countryId);
if (name.empty())
return countryId;

5
storage/country_name_getter.hpp
View file

@ -27,6 +27,11 @@ public:
/// \note See countries/languages.txt for the full list of available locales.
void SetLocale(string const & locale);
/// \brief Gets localized string for key. If not found returns empty string.
/// @param key is a string for lookup.
/// \note Unlike operator (), does not return key if localized string is not found.
string Get(string const & key) const;
string operator()(TCountryId const & countryId) const;
// for testing

2
storage/storage.cpp
View file

@ -1332,7 +1332,7 @@ void Storage::GetNodeAttrs(TCountryId const & countryId, NodeAttrs & nodeAttrs)
nodeAttrs.m_status = statusAndErr.status;
nodeAttrs.m_error = statusAndErr.error;
nodeAttrs.m_nodeLocalName = m_countryNameGetter(countryId);
nodeAttrs.m_nodeLocalDescription = m_countryNameGetter(countryId + LOCALIZATION_DESCRIPTION_SUFFIX);
nodeAttrs.m_nodeLocalDescription = m_countryNameGetter.Get(countryId + LOCALIZATION_DESCRIPTION_SUFFIX);
// Progress.
if (nodeAttrs.m_status == NodeStatus::OnDisk)