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

Fixes after rebase.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2015-02-13 18:52:03 +03:00 • committed by Alex Zolotarev
parent 1f90085d0e
commit 4c54c5ccd7
5 changed files with 39 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration_tests/osrm_route_test.cpp
View file

@ -10,13 +10,13 @@ namespace
{
shared_ptr<integration::OsrmRouterComponents> routerComponents = integration::GetAllMaps();
integration::CalculateRouteAndTestRouteLength(routerComponents, {37.53758809983519, 67.536162466434234},
{0., 0.}, {37.40993977728661, 67.644784047393685}, 14296.);
{0., 0.}, {37.40993977728661, 67.644784047393685}, 14296.);
}
UNIT_TEST(RussiaMoscowGerPanfilovtsev22SolodchaPravdiRouteTest)
{
shared_ptr<integration::OsrmRouterComponents> routerComponents = integration::GetAllMaps();
integration::CalculateRouteAndTestRouteLength(routerComponents, {37.409929478750627, 67.644798619710073},
{0., 0.}, {39.836562407458047, 65.774372510437971}, 253275.);
{0., 0.}, {39.836562407458047, 65.774372510437971}, 253275.);
}
}

69
integration_tests/osrm_test_tools.cpp
View file

@ -20,39 +20,6 @@ using namespace routing;
namespace integration
{
class OsrmRouterWrapper : public OsrmRouter
{
public:
OsrmRouterWrapper(Index const * index, CountryFileFnT const & fn) :
OsrmRouter(index, fn) {}
ResultCode SyncCalculateRoute(m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt, Route & route)
{
SetFinalPoint(finalPt);
return CalculateRouteImpl(startPt, startDr, finalPt, route);
}
};
shared_ptr<search::Engine> CreateSearchEngine(search::Engine::IndexType const * pIndex)
{
ASSERT(pIndex, ());
Platform const & pl = GetPlatform();
try
{
shared_ptr<search::Engine> searchEngine(new search::Engine(
pIndex,
pl.GetReader(SEARCH_CATEGORIES_FILE_NAME),
pl.GetReader(PACKED_POLYGONS_FILE),
pl.GetReader(COUNTRIES_FILE),
languages::GetCurrentOrig()));
return searchEngine;
}
catch (RootException const &)
{
ASSERT(false, ());
return nullptr;
}
}
shared_ptr<model::FeaturesFetcher> CreateFeaturesFetcher(vector<string> const & mapNames)
{
shared_ptr<model::FeaturesFetcher> featuresFetcher(new model::FeaturesFetcher);
@ -71,16 +38,34 @@ namespace integration
shared_ptr<search::Engine> CreateSearchEngine(shared_ptr<model::FeaturesFetcher> featuresFetcher)
{
shared_ptr<search::Engine> searchEngine = CreateSearchEngine(&featuresFetcher->GetIndex());
if (!searchEngine.get())
ASSERT(featuresFetcher.get(), ());
search::Engine::IndexType const & index = featuresFetcher->GetIndex();
Platform const & pl = GetPlatform();
try
{
shared_ptr<search::Engine> searchEngine(new search::Engine(
&index,
pl.GetReader(SEARCH_CATEGORIES_FILE_NAME),
pl.GetReader(PACKED_POLYGONS_FILE),
pl.GetReader(COUNTRIES_FILE),
languages::GetCurrentOrig()));
return searchEngine;
}
catch (RootException const &)
{
ASSERT(false, ());
return searchEngine;
return nullptr;
}
}
shared_ptr<OsrmRouterWrapper> CreateOsrmRouter(shared_ptr<model::FeaturesFetcher> featuresFetcher,
shared_ptr<OsrmRouter> CreateOsrmRouter(shared_ptr<model::FeaturesFetcher> featuresFetcher,
shared_ptr<search::Engine> searchEngine)
{
shared_ptr<OsrmRouterWrapper> osrmRouter(new OsrmRouterWrapper(&featuresFetcher->GetIndex(),
ASSERT(featuresFetcher.get(), ());
ASSERT(searchEngine.get(), ());
shared_ptr<OsrmRouter> osrmRouter(new OsrmRouter(&featuresFetcher->GetIndex(),
[searchEngine] (m2::PointD const & pt)
{
return searchEngine->GetCountryFile(pt);
@ -95,11 +80,11 @@ namespace integration
m_featuresFetcher(CreateFeaturesFetcher(mapNames)),
m_searchEngine(CreateSearchEngine(m_featuresFetcher)),
m_osrmRouter(CreateOsrmRouter(m_featuresFetcher, m_searchEngine)) {}
OsrmRouterWrapper * GetOsrmRouter() const { return m_osrmRouter.get(); }
OsrmRouter * GetOsrmRouter() const { return m_osrmRouter.get(); }
private:
shared_ptr<model::FeaturesFetcher> m_featuresFetcher;
shared_ptr<search::Engine> m_searchEngine;
shared_ptr<OsrmRouterWrapper> m_osrmRouter;
shared_ptr<OsrmRouter> m_osrmRouter;
};
void GetMapNames(vector<string> & maps)
@ -137,10 +122,10 @@ namespace integration
m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt)
{
ASSERT(routerComponents.get(), ());
OsrmRouterWrapper * osrmRouter = routerComponents->GetOsrmRouter();
OsrmRouter * osrmRouter = routerComponents->GetOsrmRouter();
ASSERT(osrmRouter, ());
shared_ptr<Route> route(new Route("mapsme"));
OsrmRouter::ResultCode result = osrmRouter->SyncCalculateRoute(startPt, startDr, finalPt, *route.get());
OsrmRouter::ResultCode result = osrmRouter->CalculateRouteImpl(startPt, startDr, finalPt, *route.get());
return RouteResultT(route, result);
}

2
integration_tests/osrm_turn_test.cpp
View file

@ -12,7 +12,7 @@ UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest)
shared_ptr<integration::OsrmRouterComponents> routerComponents = integration::GetAllMaps();
RouteResultT const routeResult = integration::CalculateRoute(routerComponents, {37.537544383032568, 67.536216737893028},
{0., 0.}, {37.538908531885973, 67.54544090660923});
{0., 0.}, {37.538908531885973, 67.54544090660923});
shared_ptr<Route> const route = routeResult.first;
OsrmRouter::ResultCode const result = routeResult.second;

21
routing/osrm_router.cpp
View file

@ -505,6 +505,12 @@ void OsrmRouter::CalculateRouteAsync(ReadyCallback const & callback)
startPt = m_startPt;
finalPt = m_finalPt;
startDr = m_startDr;
if (m_isFinalChanged)
m_cachedFinalNodes.clear();
m_isFinalChanged = false;
m_requestCancel = false;
}
try
@ -558,24 +564,9 @@ bool IsRouteExist(RawRouteData const & r)
void OsrmRouter::FindWeightsMatrix(MultiroutingTaskPointT const & sources, MultiroutingTaskPointT const & targets,
RawDataFacadeT &facade, vector<EdgeWeight> &result)
{
SearchEngineData engineData;
NMManyToManyRouting<RawDataFacadeT> pathFinder(&facade, engineData);
{
threads::MutexGuard params(m_paramsMutex);
UNUSED_VALUE(params);
if (m_isFinalChanged)
m_cachedFinalNodes.clear();
m_isFinalChanged = false;
m_requestCancel = false;
}
// 1. Find country file name and check that we are in the same MWM.
//string fName = m_countryFn(startPt);
//if (fName != m_countryFn(finalPt))
// return PointsInDifferentMWM;
PhantomNodeArray sourcesTaskVector(sources.size());
PhantomNodeArray targetsTaskVector(targets.size());
for (int i = 0; i < sources.size(); ++i)

8
routing/osrm_router.hpp
View file

@ -121,10 +121,8 @@ public:
*/
class RoutingIndexManager
{
protected:
typedef function<string (m2::PointD const &)> CountryFileFnT;
private:
CountryFileFnT m_countryFn;
map<string, RoutingMappingPtrT> m_mapping;
public:
@ -134,7 +132,6 @@ public:
RoutingMappingPtrT GetMappingByName(string const & fName, Index const * pIndex);
public:
void Clear()
{
m_mapping.clear();
@ -198,6 +195,8 @@ public:
void ActivateAdditionalFeatures() {m_additionalFeatures = true;}
ResultCode CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt, Route & route);
protected:
IRouter::ResultCode FindPhantomNodes(string const & fName, m2::PointD const & point, m2::PointD const & direction,
FeatureGraphNodeVecT & res, size_t maxCount, RoutingMappingPtrT const & mapping);
@ -227,7 +226,6 @@ protected:
vector<m2::PointD> & points, Route::TurnsT & turnsDir,Route::TimesT & times, turns::TurnsGeomT & turnsGeom);
void CalculateRouteAsync(ReadyCallback const & callback);
ResultCode CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt, Route & route);
private:
typedef pair<size_t,string> MwmOutT;