diff --git a/iphone/Maps/Classes/MWMBookmarkCell.xib b/iphone/Maps/Classes/MWMBookmarkCell.xib index ef6bc172ac..255a432b19 100644 --- a/iphone/Maps/Classes/MWMBookmarkCell.xib +++ b/iphone/Maps/Classes/MWMBookmarkCell.xib @@ -24,6 +24,7 @@ + diff --git a/iphone/Maps/Classes/MWMPlacePageLayout.mm b/iphone/Maps/Classes/MWMPlacePageLayout.mm index 525c51c6a0..e212f4f3e5 100644 --- a/iphone/Maps/Classes/MWMPlacePageLayout.mm +++ b/iphone/Maps/Classes/MWMPlacePageLayout.mm @@ -30,7 +30,8 @@ enum class State Top }; -CGFloat const kMinOffset = 0; +// Minimal offset for collapse. If place page offset is below this value we should hide place page. +CGFloat const kMinOffset = 1; CGFloat const kOpenPlacePageStopValue = 0.7; CGFloat const kLuftDraggingOffset = 30; @@ -154,7 +155,7 @@ void animate(TMWMVoidBlock animate, TMWMVoidBlock completion = nil) - (void)showWithData:(MWMPlacePageData *)data { self.isPlacePageButtonsEnabled = YES; - self.data = nil; + self.data = data; self.ppPreviewCell = nil; self.bookmarkCell = nil; @@ -163,7 +164,6 @@ void animate(TMWMVoidBlock animate, TMWMVoidBlock completion = nil) [self collapse]; - self.data = data; [self.actionBar configureWithData:static_cast>(data)]; [self.placePageView.tableView reloadData]; } diff --git a/iphone/Maps/Classes/Routing/MWMRouter.mm b/iphone/Maps/Classes/Routing/MWMRouter.mm index d1b1e7bd6f..776fda1495 100644 --- a/iphone/Maps/Classes/Routing/MWMRouter.mm +++ b/iphone/Maps/Classes/Routing/MWMRouter.mm @@ -142,8 +142,8 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi { [self clearAltitudeImagesData]; // Taxi can't be used as best router. - if (bestRouter) - bestRouter = ![MWMRouter isTaxi]; + if ([MWMRouter isTaxi]) + bestRouter = NO; auto const setTags = ^(RouterType t, BOOL isP2P) { @@ -260,6 +260,10 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi - (void)doStop { + // Don't save taxi routing type as default. + if ([MWMRouter isTaxi]) + GetFramework().SetRouter(routing::RouterType::Vehicle); + [self clearAltitudeImagesData]; GetFramework().CloseRouting(); MapsAppDelegate * app = [MapsAppDelegate theApp];