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

[ios] Fixed route restoring.

Browse source
This commit is contained in:
VladiMihaylenko 2015-12-08 13:35:38 +03:00
parent 0d54e7a5b4
commit b43063e024
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
View file

@ -40,6 +40,7 @@
#pragma mark - MWMNavigationDashboardManager
- (void)setupRoutingDashboard:(location::FollowingInfo const &)info;
- (void)restoreRouteTo:(m2::PointD const &)to;
- (void)routingHidden;
- (void)routingReady;
- (void)routingPrepare;

10
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -266,6 +266,16 @@ extern NSString * const kAlohalyticsTapEventKey;
f.SetRouter(f.GetBestRouter(self.routeSource.Point(), self.routeDestination.Point()));
}
- (void)restoreRouteTo:(const m2::PointD &)to
{
auto & f = GetFramework();
m2::PointD const myPosition = [MapsAppDelegate theApp].m_locationManager.lastLocation.mercator;
f.SetRouter(f.GetBestRouter(myPosition, to));
self.routeSource = MWMRoutePoint(myPosition);
self.routeDestination = {to, @"Destionation"};
GetFramework().BuildRoute(myPosition, to, 0 /* timeoutSec */);
}
- (void)buildRouteFrom:(MWMRoutePoint const &)from to:(MWMRoutePoint const &)to
{
self.menuController.p2pButton.selected = YES;

17
iphone/Maps/Classes/MapViewController.mm
View file

@ -200,10 +200,7 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction)
- (void)restoreRoute
{
self.forceRoutingStateChange = ForceRoutingStateChangeStartFollowing;
auto & f = GetFramework();
m2::PointD const location = [MapsAppDelegate theApp].m_locationManager.lastLocation.mercator;
f.SetRouter(f.GetBestRouter(location, self.restoreRouteDestination));
GetFramework().BuildRoute(location, self.restoreRouteDestination, 0 /* timeoutSec */);
[self.controlsManager restoreRouteTo:self.restoreRouteDestination];
}
#pragma mark - Map Navigation
@ -484,8 +481,8 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction)
{
Framework & f = GetFramework();
typedef void (*UserMarkActivatedFnT)(id, SEL, unique_ptr<UserMarkCopy>);
typedef void (*PlacePageDismissedFnT)(id, SEL);
using UserMarkActivatedFnT = void (*)(id, SEL, unique_ptr<UserMarkCopy>);
using PlacePageDismissedFnT = void (*)(id, SEL);
SEL userMarkSelector = @selector(onUserMarkClicked:);
UserMarkActivatedFnT userMarkFn = (UserMarkActivatedFnT)[self methodForSelector:userMarkSelector];
@ -543,11 +540,9 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction)
f.SetRouteBuildingListener([self, &f](routing::IRouter::ResultCode code, vector<storage::TIndex> const & absentCountries, vector<storage::TIndex> const & absentRoutes)
{
vector<storage::TIndex> countries = absentCountries;
vector<storage::TIndex> routes = absentRoutes;
dispatch_async(dispatch_get_main_queue(), ^
dispatch_async(dispatch_get_main_queue(), [=]
{
[self processRoutingBuildingEvent:code countries:countries routes:routes];
[self processRoutingBuildingEvent:code countries:absentCountries routes:absentRoutes];
});
});
@ -743,7 +738,7 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction)
if (self.popoverVC)
f.ActivateUserMark(nullptr, true);
double const sf = self.view.contentScaleFactor;
CGFloat const sf = self.view.contentScaleFactor;
m2::PointD tmp = m2::PointD(f.GtoP(m2::PointD(m_popoverPos.x, m_popoverPos.y)));