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

[routing] Add error codes to routing algorithm

Browse source
This commit is contained in:
Denis Koronchik 2014-09-30 13:14:13 +03:00 • committed by Alex Zolotarev
parent 288b497de7
commit 1ea3c1e1eb
6 changed files with 78 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -1836,7 +1836,7 @@ bool Framework::StartRoutingSession(m2::PointD const & destination)
CancelRoutingSession();
m_routingSession.BuildRoute(state->Position(), destination,
[this, state](routing::Route const & route)
[this, state](routing::Route const & route, routing::IRouter::ResultCode e)
{
InsertRoute(route);
state->StartRoutingMode();
@ -1914,7 +1914,7 @@ void Framework::CheckLocationForRouting()
m2::PointD const & position = state->Position();
if (m_routingSession.OnLocationPositionChanged(position, state->GetErrorRadius()) == routing::RoutingSession::RouteLeft)
{
m_routingSession.RebuildRoute(position, [this] (routing::Route const & route)
m_routingSession.RebuildRoute(position, [this] (routing::Route const & route, routing::IRouter::ResultCode e)
{
InsertRoute(route);
});

4
map/routing_session.cpp
View file

@ -29,14 +29,14 @@ void RoutingSession::RebuildRoute(m2::PointD const & startPoint, IRouter::ReadyC
m2::RectD const errorRect = MercatorBounds::RectByCenterXYAndSizeInMeters(startPoint, 20);
m_tolerance = (errorRect.SizeX() + errorRect.SizeY()) / 2.0;
m_router->CalculateRoute(startPoint, [this, callback](Route const & route)
m_router->CalculateRoute(startPoint, [this, callback](Route const & route, IRouter::ResultCode e)
{
if (route.GetPoly().GetSize() < 2)
return;
m_state = RouteNotStarted;
m_route = route;
callback(route);
callback(route, e);
});
}

2
routing/osrm_online_router.cpp
View file

@ -101,7 +101,7 @@ void OsrmOnlineRouter::OnRouteReceived(downloader::HttpRequest & request, ReadyC
{
LOG(LINFO, ("Received route with", route.size(), "points"));
Route result(GetName(), route, routeName + " " + my::FormatCurrentTime());
callback(result);
callback(result, NoError);
}
}
catch (my::Json::Exception const & ex)

152
routing/osrm_router.cpp
View file

@ -128,71 +128,65 @@ void OsrmRouter::SetFinalPoint(m2::PointD const & finalPt)
m_finalPt = finalPt;
}
namespace
{
class MakeResultGuard
{
IRouter::ReadyCallback const & m_callback;
Route m_route;
string m_errorMsg;
public:
MakeResultGuard(IRouter::ReadyCallback const & callback, string const & name)
: m_callback(callback), m_route(name)
{
}
~MakeResultGuard()
{
if (!m_errorMsg.empty())
LOG(LINFO, ("Failed calculate route", m_errorMsg));
m_callback(m_route);
}
void SetErrorMsg(char const * msg) { m_errorMsg = msg; }
void SetGeometry(vector<m2::PointD> const & vec)
{
m_route.SetGeometry(vec.begin(), vec.end());
m_errorMsg.clear();
}
};
}
void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback const & callback)
{
MakeResultGuard resGuard(callback, GetName());
string const fName = m_countryFn(startingPt);
if (fName != m_countryFn(m_finalPt))
Route route(GetName());
try
{
resGuard.SetErrorMsg("Points are in different MWMs");
return;
ResultCode code = CalculateRouteImpl(startingPt, m_finalPt, route);
switch (code)
{
case StartPointNotFound:
LOG(LERROR, ("Can't find start point node"));
break;
case EndPointNotFound:
LOG(LERROR, ("Can't find end point node"));
break;
case PointsInDifferentMWM:
LOG(LERROR, ("Points are in different MWMs"));
break;
case FeaturesInDifferentMWM:
LOG(LERROR, ("Found features are in different MWMs"));
break;
case RouteNotFound:
LOG(LERROR, ("Route not found"));
break;
case NoError:
LOG(LINFO, ("Route found"));
break;
default:
LOG(LERROR, ("Internal error"));
}
callback(route, code);
}
catch(Reader::Exception const & e)
{
LOG(LERROR, ("Routing index absent or incorrect. Error while loading routing index:", e.Msg()));
callback(route, InternalError);
}
}
OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & finalPt, Route & route)
{
string const fName = m_countryFn(startPt);
if (fName != m_countryFn(finalPt))
return PointsInDifferentMWM;
string const fPath = GetPlatform().WritablePathForFile(fName + DATA_FILE_EXTENSION + ROUTING_FILE_EXTENSION);
if (NeedReload(fPath))
{
LOG(LDEBUG, ("Load routing index for file:", fPath));
try
{
// Clear data while m_container is valid.
m_dataFacade.Clear();
m_mapping.Clear();
// Clear data while m_container is valid.
m_dataFacade.Clear();
m_mapping.Clear();
m_container.Open(fPath);
m_container.Open(fPath);
m_mapping.Load(m_container);
}
catch (Reader::Exception const & e)
{
LOG(LERROR, ("Error while loading routing index:", fPath, e.Msg()));
resGuard.SetErrorMsg("Routing index absent or incorrect.");
return;
}
m_mapping.Load(m_container);
}
SearchEngineData engineData;
@ -204,38 +198,20 @@ void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback con
OsrmFtSegMapping::FtSeg segBegin;
m2::PointD segPointStart;
uint32_t mwmIdStart = -1;
if (!FindPhantomNode(startingPt, nodes.source_phantom, mwmIdStart, segBegin, segPointStart))
{
resGuard.SetErrorMsg("Can't find start point node");
return;
}
if (!FindPhantomNode(startPt, nodes.source_phantom, mwmIdStart, segBegin, segPointStart))
return StartPointNotFound;
uint32_t mwmIdEnd = -1;
OsrmFtSegMapping::FtSeg segEnd;
m2::PointD segPointEnd;
if (!FindPhantomNode(m_finalPt, nodes.target_phantom, mwmIdEnd, segEnd, segPointEnd))
{
resGuard.SetErrorMsg("Can't find end point node");
return;
}
if (!FindPhantomNode(finalPt, nodes.target_phantom, mwmIdEnd, segEnd, segPointEnd))
return EndPointNotFound;
if (mwmIdEnd != mwmIdStart || mwmIdEnd == -1 || mwmIdStart == -1)
{
resGuard.SetErrorMsg("Found features are in different MWMs");
return;
}
return FeaturesInDifferentMWM;
try
{
m_mapping.Clear();
m_dataFacade.Load(m_container);
}
catch(Reader::Exception const & e)
{
LOG(LERROR, ("Error while loading routing data:", fPath, e.Msg()));
resGuard.SetErrorMsg("Routing data absent or incorrect.");
return;
}
m_mapping.Clear();
m_dataFacade.Load(m_container);
rawRoute.segment_end_coordinates.push_back(nodes);
@ -247,21 +223,9 @@ void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback con
if (INVALID_EDGE_WEIGHT == rawRoute.shortest_path_length
|| rawRoute.segment_end_coordinates.empty()
|| rawRoute.source_traversed_in_reverse.empty())
{
resGuard.SetErrorMsg("Route not found");
return;
}
return RouteNotFound;
try
{
m_mapping.Load(m_container);
}
catch(Reader::Exception const & e)
{
LOG(LERROR, ("Error while loading routing index:", fPath, e.Msg()));
resGuard.SetErrorMsg("Routing index absent or incorrect.");
return;
}
m_mapping.Load(m_container);
// restore route
vector<m2::PointD> points;
@ -334,7 +298,9 @@ void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback con
points.front() = segPointStart;
points.back() = segPointEnd;
resGuard.SetGeometry(points);
route.SetGeometry(points.begin(), points.end());
return NoError;
}
bool OsrmRouter::FindPhantomNode(m2::PointD const & pt, PhantomNode & resultNode,

2
routing/osrm_router.hpp
View file

@ -35,6 +35,8 @@ protected:
OsrmFtSegMapping::FtSeg & seg, m2::PointD & segPt);
bool NeedReload(string const & fPath) const;
ResultCode CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & finalPt, Route & route);
private:
Index const * m_pIndex;

13
routing/router.hpp
View file

@ -14,7 +14,18 @@ class Route;
class IRouter
{
public:
typedef function<void (Route const &)> ReadyCallback;
enum ResultCode
{
NoError = 0,
StartPointNotFound,
EndPointNotFound,
PointsInDifferentMWM,
FeaturesInDifferentMWM,
RouteNotFound,
InternalError
};
typedef function<void (Route const &, ResultCode)> ReadyCallback;
virtual ~IRouter() {}