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

Merge pull request #6233 from bykoianko/master-buildfix

Browse source 
[master] Build fix.
This commit is contained in:
Roman Kuznetsov 2017-06-09 17:35:49 +03:00 • committed by GitHub
commit 93ec45f1c5
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
map/routing_manager.cpp
View file

@ -156,14 +156,17 @@ void RoutingManager::SetRouterImpl(routing::RouterType type)
return m_callbacks.m_countryInfoGetter().GetRegionCountryId(p);
};
auto numMwmIds = make_shared<routing::NumMwmIds>();
m_delegate.RegisterCountryFilesOnRoute(numMwmIds);
if (type == RouterType::Pedestrian)
{
router = CreatePedestrianAStarBidirectionalRouter(indexGetterFn(), countryFileGetter);
router = CreatePedestrianAStarBidirectionalRouter(indexGetterFn(), countryFileGetter, numMwmIds);
m_routingSession.SetRoutingSettings(routing::GetPedestrianRoutingSettings());
}
else if (type == RouterType::Bicycle)
{
router = CreateBicycleAStarBidirectionalRouter(indexGetterFn(), countryFileGetter);
router = CreateBicycleAStarBidirectionalRouter(indexGetterFn(), countryFileGetter, numMwmIds);
m_routingSession.SetRoutingSettings(routing::GetBicycleRoutingSettings());
}
else
@ -179,10 +182,6 @@ void RoutingManager::SetRouterImpl(routing::RouterType type)
return version::MwmTraits(mwmId.GetInfo()->m_version).HasRoutingIndex();
};
auto numMwmIds = make_shared<routing::NumMwmIds>();
m_delegate.RegisterCountryFilesOnRoute(numMwmIds);
auto const getMwmRectByName = [this](std::string const & countryId) -> m2::RectD {
return m_callbacks.m_countryInfoGetter().GetLimitRectForLeaf(countryId);
};

1
map/routing_manager.hpp
View file

@ -28,7 +28,6 @@ class DrapeEngine;
namespace storage
{
class CountryInfoGetter;
class Storage;
}
namespace routing