diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-09-18 11:36:19 +0300 |
|---|---|---|
| committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-09-20 18:05:43 +0300 |
| commit | 44b9bca5413a3485b2b61f933536474d33d32069 (patch) | |
| tree | dc03d8c557e837b9a4318d8d0c434ff7174d6cd1 /track_analyzing | |
| parent | 3d50d1089f6e1718a0b8ebdeb5df418201b89bba (diff) | |
Passing CityRoads class to GeometryLoader.
Diffstat (limited to 'track_analyzing')
| -rw-r--r-- | track_analyzing/track_matcher.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/track_analyzing/track_matcher.cpp b/track_analyzing/track_matcher.cpp index 751f900f3a..ae2ca32b65 100644 --- a/track_analyzing/track_matcher.cpp +++ b/track_analyzing/track_matcher.cpp @@ -2,15 +2,16 @@ #include "track_analyzing/exceptions.hpp" -#include <routing/index_graph_loader.hpp> +#include "routing/city_roads.hpp" +#include "routing/index_graph_loader.hpp" -#include <routing_common/car_model.hpp> +#include "routing_common/car_model.hpp" -#include <indexer/scales.hpp> +#include "indexer/scales.hpp" -#include <geometry/parametrized_segment.hpp> +#include "geometry/parametrized_segment.hpp" -#include <base/stl_helpers.hpp> +#include "base/stl_helpers.hpp" using namespace routing; using namespace std; @@ -64,8 +65,9 @@ TrackMatcher::TrackMatcher(storage::Storage const & storage, NumMwmId mwmId, MwmSet::MwmHandle const handle = m_dataSource.GetMwmHandleByCountryFile(countryFile); m_graph = make_unique<IndexGraph>( - make_shared<Geometry>( - GeometryLoader::Create(m_dataSource, handle, m_vehicleModel, false /* loadAltitudes */)), + make_shared<Geometry>(GeometryLoader::Create(m_dataSource, handle, m_vehicleModel, + LoadCityRoads(m_dataSource, handle), + false /* loadAltitudes */)), EdgeEstimator::Create(VehicleType::Car, *m_vehicleModel, nullptr /* trafficStash */)); DeserializeIndexGraph(*handle.GetValue<MwmValue>(), VehicleType::Car, *m_graph); |