From 5d539c0219c782fce857a2506dcb58274ec92eed Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 17 Aug 2017 14:31:57 +0300 Subject: [PATCH] [MAPSME-5374] [ios] Added router recommendations support. --- .../Core/Framework/MWMFrameworkListener.mm | 19 ++++++++++++++++--- .../Core/Framework/MWMFrameworkObservers.h | 3 +++ iphone/Maps/Core/Routing/MWMRouter.mm | 13 +++++++++++++ .../Core/Routing/MWMRouterRecommendation.h | 3 +++ iphone/Maps/Maps.xcodeproj/project.pbxproj | 2 ++ 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 iphone/Maps/Core/Routing/MWMRouterRecommendation.h diff --git a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm index 573415b20b..4db0e18b26 100644 --- a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm +++ b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm @@ -95,7 +95,6 @@ void loopWrappers(Observers * observers, TLoopBlock block) using namespace routing; using namespace storage; Observers * observers = self.routeBuildingObservers; - auto & f = GetFramework(); // TODO(ldragunov,rokuz): Thise two routing callbacks are the only framework callbacks which does // not guarantee // that they are called on a main UI thread context. Discuss it with Lev. @@ -103,18 +102,32 @@ void loopWrappers(Observers * observers, TLoopBlock block) // This will help to avoid unnecessary parameters copying and will make all our framework // callbacks // consistent: every notification to UI will run on a main UI thread. - f.GetRoutingManager().SetRouteBuildingListener( + auto & rm = GetFramework().GetRoutingManager(); + rm.SetRouteBuildingListener( [observers](IRouter::ResultCode code, TCountriesVec const & absentCountries) { loopWrappers(observers, [code, absentCountries](TRouteBuildingObserver observer) { [observer processRouteBuilderEvent:code countries:absentCountries]; }); }); - f.GetRoutingManager().SetRouteProgressListener([observers](float progress) { + rm.SetRouteProgressListener([observers](float progress) { loopWrappers(observers, [progress](TRouteBuildingObserver observer) { if ([observer respondsToSelector:@selector(processRouteBuilderProgress:)]) [observer processRouteBuilderProgress:progress]; }); }); + rm.SetRouteRecommendationListener([observers](RoutingManager::Recommendation recommendation) { + MWMRouterRecommendation rec; + switch (recommendation) + { + case RoutingManager::Recommendation::RebuildAfterPointsLoading: + rec = MWMRouterRecommendationRebuildAfterPointsLoading; + break; + } + loopWrappers(observers, [rec](TRouteBuildingObserver observer) { + if ([observer respondsToSelector:@selector(processRouteRecommendation:)]) + [observer processRouteRecommendation:rec]; + }); + }); } #pragma mark - MWMFrameworkStorageObserver diff --git a/iphone/Maps/Core/Framework/MWMFrameworkObservers.h b/iphone/Maps/Core/Framework/MWMFrameworkObservers.h index 49cff62c71..946c811df6 100644 --- a/iphone/Maps/Core/Framework/MWMFrameworkObservers.h +++ b/iphone/Maps/Core/Framework/MWMFrameworkObservers.h @@ -1,3 +1,5 @@ +#import "MWMRouterRecommendation.h" + #include "routing/router.hpp" #include "storage/index.hpp" #include "storage/storage.hpp" @@ -16,6 +18,7 @@ using namespace storage; @optional - (void)processRouteBuilderProgress:(CGFloat)progress; +- (void)processRouteRecommendation:(MWMRouterRecommendation)recommendation; @end diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 96c1e36a3a..421d77b78e 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -9,6 +9,7 @@ #import "MWMMapViewControlsManager.h" #import "MWMNavigationDashboardManager+Entity.h" #import "MWMRoutePoint+CPP.h" +#import "MWMRouterRecommendation.h" #import "MWMSearch.h" #import "MWMStorage.h" #import "MapViewController.h" @@ -625,6 +626,18 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType) [[MWMNavigationDashboardManager manager] setRouteBuilderProgress:progress]; } +- (void)processRouteRecommendation:(MWMRouterRecommendation)recommendation +{ + switch (recommendation) + { + case MWMRouterRecommendationRebuildAfterPointsLoading: + [MWMRouter + addPointAndRebuild:[[MWMRoutePoint alloc] initWithLastLocationAndType:MWMRoutePointTypeStart + intermediateIndex:0]]; + break; + } +} + #pragma mark - Alerts - (void)presentDownloaderAlert:(routing::IRouter::ResultCode)code diff --git a/iphone/Maps/Core/Routing/MWMRouterRecommendation.h b/iphone/Maps/Core/Routing/MWMRouterRecommendation.h new file mode 100644 index 0000000000..76e16bce80 --- /dev/null +++ b/iphone/Maps/Core/Routing/MWMRouterRecommendation.h @@ -0,0 +1,3 @@ +typedef NS_ENUM(NSUInteger, MWMRouterRecommendation) { + MWMRouterRecommendationRebuildAfterPointsLoading +}; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 8a8fcb9d6d..0d9d25151d 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -1874,6 +1874,7 @@ 342360B11F349F9800AFE44D /* MWMRouteManagerPointType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouteManagerPointType.h; sourceTree = ""; }; 342639461EA0FDB30025EB89 /* MWMSearchItemType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchItemType.h; sourceTree = ""; }; 3426DEB11F45AE2800D1C43C /* MWMRouterType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterType.h; sourceTree = ""; }; + 3426DEB21F45AE5100D1C43C /* MWMRouterRecommendation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterRecommendation.h; sourceTree = ""; }; 3427AF0B1E49E3A500D466DB /* MWMConsts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMConsts.h; sourceTree = ""; }; 342CC5EF1C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationLoginViewController.h; sourceTree = ""; }; 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationLoginViewController.mm; sourceTree = ""; }; @@ -3085,6 +3086,7 @@ 340475361E081A4600C92850 /* MWMRouter.mm */, 340B33C41F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm */, 3426DEB11F45AE2800D1C43C /* MWMRouterType.h */, + 3426DEB21F45AE5100D1C43C /* MWMRouterRecommendation.h */, ); path = Routing; sourceTree = "";