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

Review fixes.

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-17 16:08:19 +03:00 • committed by Sergey Yershov
parent 6eedc3e723
commit e5126c9448
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
search/intermediate_result.cpp
View file

@ -173,13 +173,10 @@ string FormatStreetAndHouse(ReverseGeocoder::Address const & addr)
string FormatFullAddress(ReverseGeocoder::Address const & addr, string const & region)
{
// TODO: Print "near" for not exact addresses.
string res;
//if (addr.GetDistance() >= 0 && addr.GetDistance() < 50.0)
if (addr.GetDistance() == 0)
res = FormatStreetAndHouse(addr);
else
if (addr.GetDistance() != 0)
return region;
return res + ", " + region;
return FormatStreetAndHouse(addr) + (region.empty() ? "" : ", ") + region;
}
} // namespace

2
search/result.cpp
View file

@ -122,7 +122,7 @@ pair<uint16_t, uint16_t> const & Result::GetHighlightRange(size_t idx) const
void Result::AppendCity(string const & name)
{
// Append only if city is absent in region (mwm) name.
// Prepend only if city is absent in region (mwm) name.
if (m_address.find(name) == string::npos)
m_address = name + ", " + m_address;
}