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

[ios] Fixed dropped pin (again).

Browse source
This commit is contained in:
VladiMihaylenko 2016-01-28 16:14:00 +03:00 • committed by Sergey Yershov
parent d35342cfa9
commit 0de05e707f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/Classes/MWMPlacePageEntity.mm
View file

@ -215,14 +215,15 @@ NSString * mwmToOSMCuisineString(NSString * mwmCuisine)
{
NSString * emptyName = L(@"dropped_pin");
// Custom name is used in shared links and should override default feature's name in PP.
self.title = customName.length > 0 ? customName : emptyName;
BOOL const customNameIsEmpty = customName.length == 0;
self.title = customNameIsEmpty ? emptyName : customName;
// feature can be nullptr if user selected any empty area.
if (feature)
{
search::AddressInfo const info = GetFramework().GetFeatureAddressInfo(*feature);
feature::Metadata const & metadata = feature->GetMetadata();
NSString * const name = @(info.GetPinName().c_str());
if (0 == self.title.length)
if (customNameIsEmpty)
self.title = name.length > 0 ? name : emptyName;
self.category = @(info.GetPinType().c_str());
self.address = @(info.FormatAddress().c_str());