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

Build fix.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-04-19 14:50:25 +03:00 • committed by Tatiana Yan
parent 0762359c1d
commit da27366427
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/routing_index_generator.cpp
View file

@ -390,7 +390,7 @@ void FillWeights(string const & path, string const & mwmFile, string const & cou
shared_ptr<VehicleModelInterface> vehicleModel =
CarModelFactory(countryParentNameGetterFn).GetVehicleModelForCountry(country);
IndexGraph graph(
GeometryLoader::CreateFromFile(mwmFile, vehicleModel),
make_shared<Geometry>(GeometryLoader::CreateFromFile(mwmFile, vehicleModel)),
EdgeEstimator::Create(VehicleType::Car, *vehicleModel, nullptr /* trafficStash */));
MwmValue mwmValue(LocalCountryFile(path, platform::CountryFile(country), 0 /* version */));

3
track_analyzing/track_matcher.cpp
View file

@ -63,7 +63,8 @@ TrackMatcher::TrackMatcher(storage::Storage const & storage, NumMwmId mwmId,
MwmSet::MwmHandle const handle = m_index.GetMwmHandleByCountryFile(countryFile);
m_graph = make_unique<IndexGraph>(
GeometryLoader::Create(m_index, handle, m_vehicleModel, false /* loadAltitudes */),
make_shared<Geometry>(
GeometryLoader::Create(m_index, handle, m_vehicleModel, false /* loadAltitudes */)),
EdgeEstimator::Create(VehicleType::Car, *m_vehicleModel, nullptr /* trafficStash */));
DeserializeIndexGraph(*handle.GetValue<MwmValue>(), VehicleType::Car, *m_graph);