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

[bookmarks] Add house number to pin text if name is empty.

Browse source
This commit is contained in:
vng 2013-02-13 20:29:34 +03:00 • committed by Alex Zolotarev
parent 129b857579
commit f2e148b7b9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/address_finder.cpp
View file

@ -576,16 +576,19 @@ void Framework::AddressInfo::MakeFrom(search::Result const & res)
string Framework::AddressInfo::FormatPinText() const
{
// select name or house if name is empty
string const & ret = (m_name.empty() ? m_house : m_name);
char const * type = GetBestType();
if (type)
{
if (m_name.empty())
if (ret.empty())
return type;
else
return m_name + " (" + string(type) + ')';
return ret + " (" + string(type) + ')';
}
else
return m_name;
return ret;
}
string Framework::AddressInfo::FormatAddress() const