organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[routing] Fixed issues with OSRM router

Browse source
This commit is contained in:
Alex Zolotarev 2014-07-08 12:40:10 +02:00 • committed by Alex Zolotarev
parent 4d2d3244dc
commit 0dd5490a1f
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
routing/osrm_router.cpp
View file

@ -33,14 +33,15 @@ void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback con
{
// Construct OSRM url request to get the route
string url = OSRM_CAR_ROUTING_URL;
url += "loc=" + strings::to_string(startingPt.x) + "," + strings::to_string(startingPt.y)
+ "&loc=" + strings::to_string(m_finalPt.x) + "," + strings::to_string(m_finalPt.y);
using strings::to_string;
url += "loc=" + to_string(MercatorBounds::YToLat(startingPt.y)) + "," + to_string(MercatorBounds::XToLon(startingPt.x))
+ "&loc=" + to_string(MercatorBounds::YToLat(m_finalPt.y)) + "," + to_string(MercatorBounds::XToLon(m_finalPt.x));
// Request will be deleted in the callback
downloader::HttpRequest::Get(url, bind(&OsrmRouter::OnRouteReceived, this, _1));
downloader::HttpRequest::Get(url, bind(&OsrmRouter::OnRouteReceived, this, _1, callback));
}
void OsrmRouter::OnRouteReceived(downloader::HttpRequest & request)
void OsrmRouter::OnRouteReceived(downloader::HttpRequest & request, ReadyCallback callback)
{
if (request.Status() == downloader::HttpRequest::ECompleted)
{
@ -62,8 +63,8 @@ void OsrmRouter::OnRouteReceived(downloader::HttpRequest & request)
if (jcoords)
{
string const coords = json_string_value(jcoords);
string const strLon(coords, 0, coords.find(','));
string const strLat(coords, coords.find(',') + 1);
string const strLat(coords, 0, coords.find(','));
string const strLon(coords, coords.find(',') + 1);
double lat, lon;
if (strings::to_double(strLat, lat) && strings::to_double(strLon, lon))
route.push_back(MercatorBounds::FromLatLon(lat, lon));
@ -84,7 +85,7 @@ void OsrmRouter::OnRouteReceived(downloader::HttpRequest & request)
{
LOG(LINFO, ("Received route with", route.size(), "points"));
Route result(GetName(), route, routeName + " " + my::FormatCurrentTime());
m_callback(result);
callback(result);
}
}
catch (my::Json::Exception const & ex)

3
routing/osrm_router.hpp
View file

@ -12,10 +12,9 @@ namespace routing
class OsrmRouter : public IRouter
{
m2::PointD m_finalPt;
ReadyCallback m_callback;
/// Http callback from the server
void OnRouteReceived(downloader::HttpRequest & request);
void OnRouteReceived(downloader::HttpRequest & request, ReadyCallback callback);
public:
virtual string GetName() const;