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

Fixed iOS build

Browse source
This commit is contained in:
r.kuznetsov 2018-01-10 17:56:33 +03:00 • committed by Ilya Grechuhin
parent 1bb52bee14
commit 2802064b30
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/UI/Discovery/MWMDiscoveryController.mm
View file

@ -183,7 +183,7 @@ struct Callback
type == ItemType::Attractions ? m_model.GetAttractionAt(index) : m_model.GetCafeAt(index);
MWMRoutePoint * pt = [[MWMRoutePoint alloc] initWithPoint:item.GetFeatureCenter()
title:@(item.GetString().c_str())
subtitle:@(item.GetFeatureType().c_str())
subtitle:@(item.GetFeatureTypeName().c_str())
type:MWMRoutePointTypeFinish
intermediateIndex:0];
[MWMRouter setType:MWMRouterTypePedestrian];

2
iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm
View file

@ -344,7 +344,7 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
auto const & pt = type == ItemType::Attractions ? model.GetAttractionReferencePoint()
: model.GetCafeReferencePoint();
[cell configWithTitle:@(sr.GetString().c_str())
subtitle:@(sr.GetFeatureType().c_str())
subtitle:@(sr.GetFeatureTypeName().c_str())
distance:@(GetDistance(pt, sr.GetFeatureCenter()).c_str())
tap:^{
[self.delegate routeToItem:type atIndex:indexPath.row];

2
iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
View file

@ -30,7 +30,7 @@
isAvailable:(BOOL)isAvailable
{
[super config:result];
self.typeLabel.text = @(result.GetFeatureType().c_str()).capitalizedString;
self.typeLabel.text = @(result.GetFeatureTypeName().c_str()).capitalizedString;
auto const & ratingStr = result.GetHotelRating();
self.ratingLabel.text =
ratingStr.empty() ? @"" : [NSString stringWithFormat:L(@"place_page_booking_rating"),

2
iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
View file

@ -150,7 +150,7 @@
case MWMSearchItemTypeSuggestion:
{
auto const & suggestion = [MWMSearch resultWithContainerIndex:containerIndex];
NSString * suggestionString = @(suggestion.GetSuggestionString());
NSString * suggestionString = @(suggestion.GetSuggestionString().c_str());
[Statistics logEvent:kStatEventName(kStatSearch, kStatSelectResult)
withParameters:@{kStatValue : suggestionString, kStatScreen : kStatSearch}];
[delegate searchText:suggestionString forInputLocale:nil];