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

[ios] Support routing api.

Browse source
This commit is contained in:
VladiMihaylenko 2016-07-27 12:06:28 +03:00
parent 747b385db9
commit bc5a666c97
3 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -254,11 +254,32 @@ using namespace osm_auth_ios;
}
else if (m_mwmURL)
{
if (f.ShowMapForURL([m_mwmURL UTF8String]))
string const url = m_mwmURL.UTF8String;
auto const parsingType = f.ParseApiURL(url);
switch (parsingType)
{
[[Statistics instance] logApiUsage:m_sourceApplication];
case url_scheme::ParsingResult::Incorrect:
LOG(LWARNING, ("Incorrect parsing result for url:", url));
break;
case url_scheme::ParsingResult::Route:
{
auto const parsedData = f.GetParsedRoutingData();
f.SetRouter(parsedData.second);
auto const points = parsedData.first;
auto const & p1 = points[0];
auto const & p2 = points[1];
[[MWMRouter router] buildFromPoint:MWMRoutePoint(p1.m_org, @(p1.m_name.c_str()))
toPoint:MWMRoutePoint(p2.m_org, @(p2.m_name.c_str()))
bestRouter:YES];
[self showMap];
[self.mapViewController showAPIBar];
break;
}
case url_scheme::ParsingResult::Map:
f.ShowMapForURL(url);
[self showMap];
[self.mapViewController showAPIBar];
break;
}
}
else if (m_fileURL)
@ -802,7 +823,8 @@ using namespace osm_auth_ios;
m_geoURL = [url absoluteString];
return YES;
}
else if ([scheme isEqualToString:@"mapswithme"] || [scheme isEqualToString:@"mwm"])
else if ([scheme isEqualToString:@"mapswithme"] || [scheme isEqualToString:@"mwm"] ||
[scheme isEqualToString:@"mapsme"])
{
m_mwmURL = [url absoluteString];
return YES;

3
iphone/Maps/Classes/Routing/MWMRouter.h
View file

@ -13,6 +13,9 @@
- (void)swapPointsAndRebuild;
- (void)buildFromPoint:(MWMRoutePoint const &)start bestRouter:(BOOL)bestRouter;
- (void)buildToPoint:(MWMRoutePoint const &)finish bestRouter:(BOOL)bestRouter;
- (void)buildFromPoint:(MWMRoutePoint const &)start
toPoint:(MWMRoutePoint const &)finish
bestRouter:(BOOL)bestRouter;
- (void)rebuildWithBestRouter:(BOOL)bestRouter;
- (void)start;
- (void)stop;

9
iphone/Maps/Classes/Routing/MWMRouter.mm
View file

@ -116,6 +116,15 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
[self rebuildWithBestRouter:bestRouter];
}
- (void)buildFromPoint:(MWMRoutePoint const &)start
toPoint:(MWMRoutePoint const &)finish
bestRouter:(BOOL)bestRouter
{
self.startPoint = start;
self.finishPoint = finish;
[self rebuildWithBestRouter:bestRouter];
}
- (void)rebuildWithBestRouter:(BOOL)bestRouter
{
if (self.startPoint.IsMyPosition())