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

[iOS] Route building validation moved to RoutingManager

Browse source
This commit is contained in:
r.kuznetsov 2017-06-16 15:00:46 +03:00 • committed by Ilya Grechuhin
parent 8606c53a1c
commit 13d3fdd8d0
2 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -138,11 +138,6 @@ m2::PointD getMercator(MWMRoutePoint * p)
- (MWMRouterType)type { return routerType(GetFramework().GetRoutingManager().GetRouter()); }
- (BOOL)arePointsValidForRouting
{
return self.startPoint.isValid && self.finishPoint.isValid && self.startPoint != self.finishPoint;
}
- (void)applyRoutePoints
{
auto & rm = GetFramework().GetRoutingManager();
@ -254,41 +249,36 @@ m2::PointD getMercator(MWMRoutePoint * p)
{
[self clearAltitudeImagesData];
bool isP2P = false;
if (self.startPoint.isMyPosition)
auto & rm = GetFramework().GetRoutingManager();
auto points = rm.GetRoutePoints();
if (points.size() == 2)
{
[Statistics logEvent:kStatPointToPoint
withParameters:@{kStatAction : kStatBuildRoute, kStatValue : kStatFromMyPosition}];
}
else if (self.finishPoint.isMyPosition)
{
[Statistics logEvent:kStatPointToPoint
withParameters:@{kStatAction : kStatBuildRoute, kStatValue : kStatToMyPosition}];
}
else
{
[Statistics logEvent:kStatPointToPoint
withParameters:@{kStatAction : kStatBuildRoute, kStatValue : kStatPointToPoint}];
isP2P = true;
if (points.front().m_isMyPosition)
{
[Statistics logEvent:kStatPointToPoint
withParameters:@{kStatAction : kStatBuildRoute, kStatValue : kStatFromMyPosition}];
}
else if (points.back().m_isMyPosition)
{
[Statistics logEvent:kStatPointToPoint
withParameters:@{kStatAction : kStatBuildRoute, kStatValue : kStatToMyPosition}];
}
else
{
[Statistics logEvent:kStatPointToPoint
withParameters:@{kStatAction : kStatBuildRoute, kStatValue : kStatPointToPoint}];
}
}
MWMMapViewControlsManager * mapViewControlsManager = [MWMMapViewControlsManager manager];
[mapViewControlsManager onRoutePrepare];
auto & rm = GetFramework().GetRoutingManager();
auto points = rm.GetRoutePoints();
if (points.size() < 2 || ![self arePointsValidForRouting])
{
rm.CloseRouting(false /* remove route points */);
return;
}
// Taxi can't be used as best router.
if (bestRouter && ![[self class] isTaxi])
self.type = routerType(rm.GetBestRouter(points.front().m_position, points.back().m_position));
rm.BuildRoute(0 /* timeoutSec */);
[mapViewControlsManager onRouteRebuild];
rm.BuildRoute(0 /* timeoutSec */);
}
- (void)start

21
map/routing_manager.cpp
View file

@ -389,10 +389,8 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
auto routePoints = GetRoutePoints();
if (routePoints.size() < 2)
{
if (routePoints.empty() || routePoints.back().m_pointType != RouteMarkType::Finish)
CallRouteBuilded(IRouter::EndPointNotFound, storage::TCountriesVec());
else
CallRouteBuilded(IRouter::StartPointNotFound, storage::TCountriesVec());
CallRouteBuilded(IRouter::Cancelled, storage::TCountriesVec());
CloseRouting(false /* remove route points */);
return;
}
@ -411,6 +409,21 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
p.m_position = myPos;
}
// Check for equal points.
double const kEps = 1e-7;
for (size_t i = 0; i < routePoints.size(); i++)
{
for (size_t j = i + 1; j < routePoints.size(); j++)
{
if (routePoints[i].m_position.EqualDxDy(routePoints[j].m_position, kEps))
{
CallRouteBuilded(IRouter::Cancelled, storage::TCountriesVec());
CloseRouting(false /* remove route points */);
return;
}
}
}
bool const isP2P = !routePoints.front().m_isMyPosition && !routePoints.back().m_isMyPosition;
// Send tag to Push Woosh.