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

Merge pull request #4522 from VladiMihaylenko/master

Browse source 
Fixed rebase bugs
This commit is contained in:
Илья Гречухин 2016-10-19 12:15:38 +03:00 • committed by GitHub
commit f472916925
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
View file

@ -22,6 +22,7 @@ CGFloat constexpr kAdditionalHeight = 20.;
@property(weak, nonatomic) IBOutlet UIView * pedestrian;
@property(weak, nonatomic) IBOutlet UIView * vehicle;
@property(weak, nonatomic) IBOutlet UIView * bicycle;
@property(weak, nonatomic) IBOutlet UIView * taxi;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * planningRouteViewHeight;
@property(weak, nonatomic) IBOutlet UIButton * extendButton;
@property(weak, nonatomic) IBOutlet UIButton * goButton;
@ -79,6 +80,7 @@ CGFloat constexpr kAdditionalHeight = 20.;
[self addProgress:self.vehicle imageName:@"ic_drive" routerType:type::Vehicle];
[self addProgress:self.pedestrian imageName:@"ic_walk" routerType:type::Pedestrian];
[self addProgress:self.bicycle imageName:@"ic_bike_route" routerType:type::Bicycle];
[self addProgress:self.taxi imageName:@"ic_taxi" routerType:type::Taxi];
}
- (void)addProgress:(UIView *)parentView

8
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
View file

@ -94,11 +94,14 @@ using namespace uber;
m_products.clear();
m_from = MercatorBounds::ToLatLon(from.Point());
m_to = MercatorBounds::ToLatLon(to.Point());
self.collectionView.hidden = YES;
auto cv = self.collectionView;
cv.hidden = YES;
cv.pageControl.hidden = YES;
m_requestId = m_api.GetAvailableProducts(m_from, m_to, [self, completion, failure](vector<Product> const & products,
uint64_t const requestId)
{
dispatch_async(dispatch_get_main_queue(), ^
dispatch_async(dispatch_get_main_queue(), [products, requestId, self, completion, failure]
{
if (self->m_requestId != requestId)
return;
@ -112,6 +115,7 @@ using namespace uber;
self->m_products = products;
auto cv = self.collectionView;
cv.hidden = NO;
cv.pageControl.hidden = NO;
cv.numberOfPages = self->m_products.size();
[cv reloadData];
cv.contentOffset = {};

4
iphone/Maps/Classes/MWMPlacePageManager.mm
View file

@ -170,7 +170,7 @@
{
[Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute)
withParameters:@{kStatValue : kStatSource}];
[[MWMRouter router] buildFromPoint:self.target bestRouter:YES];
[[MWMRouter router] buildFromPoint:self.target bestRouter:![MWMRouter isTaxi]];
[self closePlacePage];
}
@ -178,7 +178,7 @@
{
[Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute)
withParameters:@{kStatValue : kStatDestination}];
[[MWMRouter router] buildToPoint:self.target bestRouter:YES];
[[MWMRouter router] buildToPoint:self.target bestRouter:![MWMRouter isTaxi]];
[self closePlacePage];
}

2
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -790,6 +790,7 @@
F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */; };
F67E751C1DB635FE00D6741F /* MWMPPView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F67E751B1DB635FE00D6741F /* MWMPPView.xib */; };
F67E751D1DB635FE00D6741F /* MWMPPView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F67E751B1DB635FE00D6741F /* MWMPPView.xib */; };
F67E751E1DB76DFC00D6741F /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6F778791DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm */; };
F68FCB851DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = F68FCB841DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm */; };
F68FCB861DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = F68FCB841DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm */; };
F68FCB8A1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F68FCB881DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm */; };
@ -4126,6 +4127,7 @@
34FED5511D21121000183B1B /* CLLocation+Mercator.mm in Sources */,
6741A9A31BF340DE002C974C /* main.mm in Sources */,
6741A9A41BF340DE002C974C /* MWMSearchTabbedViewController.mm in Sources */,
F67E751E1DB76DFC00D6741F /* MWMTaxiCollectionLayout.mm in Sources */,
6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */,
34BF68611D74585D001752F6 /* MWMSearch+CoreSpotlight.mm in Sources */,
34F9FB911C43AF2400F71201 /* MWMStreetEditorEditTableViewCell.mm in Sources */,