Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorИлья Гречухин <i.grechuhin@gmail.com>2016-10-25 08:47:03 +0300
committerGitHub <noreply@github.com>2016-10-25 08:47:03 +0300
commit97517485578e77facbf05b05f0eb841a54aa74fd (patch)
treec3f24e24b52d154c9f6e5c52d34c5253aabb29f4
parent8bc77b5e2d8bd14a7fc78d097050b6de35a39eae (diff)
parenta1eaa852e7d8171ed9d4e0f59ce023f387613afc (diff)
Merge pull request #4550 from VladiMihaylenko/master
[ios] Spinner for taxi.
-rw-r--r--iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm1
-rw-r--r--iphone/Maps/Classes/Routing/MWMRouter.mm3
2 files changed, 3 insertions, 1 deletions
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index d0403351d9..ec7586181f 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -164,6 +164,7 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
{
[self setMenuState:MWMBottomMenuStateGo];
[self.routePreview stateReady];
+ [self setRouteBuilderProgress:100.];
}
failure:^
{
diff --git a/iphone/Maps/Classes/Routing/MWMRouter.mm b/iphone/Maps/Classes/Routing/MWMRouter.mm
index a586ad1c11..d2142b43b7 100644
--- a/iphone/Maps/Classes/Routing/MWMRouter.mm
+++ b/iphone/Maps/Classes/Routing/MWMRouter.mm
@@ -401,7 +401,8 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
- (void)processRouteBuilderProgress:(CGFloat)progress
{
- [[MWMNavigationDashboardManager manager] setRouteBuilderProgress:progress];
+ if (![MWMRouter isTaxi])
+ [[MWMNavigationDashboardManager manager] setRouteBuilderProgress:progress];
}
#pragma mark - Alerts