diff options
author | Maxim Pimenov <m@maps.me> | 2017-09-06 14:23:25 +0300 |
---|---|---|
committer | tatiana-kondakova <tatiana.kondakova@gmail.com> | 2017-09-06 16:10:21 +0300 |
commit | f41b708c07a597ac44da69283f3580a0ee75b6b2 (patch) | |
tree | 250d3b75d01c01e90337386de6508bd4962ac9c8 /track_analyzing | |
parent | 26f3fcfb6e6bd677466defded5c2e9b33ea74037 (diff) |
Fixed the build.
Diffstat (limited to 'track_analyzing')
-rw-r--r-- | track_analyzing/track_analyzer/cmd_table.cpp | 3 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_track.cpp | 3 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_tracks.cpp | 3 | ||||
-rw-r--r-- | track_analyzing/track_matcher.cpp | 9 | ||||
-rw-r--r-- | track_analyzing/track_matcher.hpp | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp index 90692bf6af..ebf086adeb 100644 --- a/track_analyzing/track_analyzer/cmd_table.cpp +++ b/track_analyzing/track_analyzer/cmd_table.cpp @@ -214,7 +214,8 @@ void CmdTagsTable(string const & filepath, string const & trackExtension, String if (mwmFilter(mwmName)) return; - shared_ptr<IVehicleModel> vehicleModel = CarModelFactory().GetVehicleModelForCountry(mwmName); + shared_ptr<VehicleModelInterface> vehicleModel = + CarModelFactory({}).GetVehicleModelForCountry(mwmName); string const mwmFile = GetCurrentVersionMwmFile(storage, mwmName); MatchedTrackPointToMoveType pointToMoveType(mwmFile); Geometry geometry(GeometryLoader::CreateFromFile(mwmFile, vehicleModel)); diff --git a/track_analyzing/track_analyzer/cmd_track.cpp b/track_analyzing/track_analyzer/cmd_track.cpp index e3fc660f4e..89452960f5 100644 --- a/track_analyzing/track_analyzer/cmd_track.cpp +++ b/track_analyzing/track_analyzer/cmd_track.cpp @@ -34,7 +34,8 @@ void CmdTrack(string const & trackFile, string const & mwmName, string const & u GetMatchedTrack(mwmToMatchedTracks, *numMwmIds, mwmName, user, trackIdx); string const mwmFile = GetCurrentVersionMwmFile(storage, mwmName); - shared_ptr<IVehicleModel> vehicleModel = CarModelFactory().GetVehicleModelForCountry(mwmName); + shared_ptr<VehicleModelInterface> vehicleModel = + CarModelFactory({}).GetVehicleModelForCountry(mwmName); FeaturesVectorTest featuresVector(FilesContainerR(make_unique<FileReader>(mwmFile))); Geometry geometry(GeometryLoader::CreateFromFile(mwmFile, vehicleModel)); diff --git a/track_analyzing/track_analyzer/cmd_tracks.cpp b/track_analyzing/track_analyzer/cmd_tracks.cpp index 69cb29e02f..8c8bc7a6f8 100644 --- a/track_analyzing/track_analyzer/cmd_tracks.cpp +++ b/track_analyzing/track_analyzer/cmd_tracks.cpp @@ -143,7 +143,8 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil TrackStats & mwmStats = mwmToStats[mwmName]; - shared_ptr<IVehicleModel> vehicleModel = CarModelFactory().GetVehicleModelForCountry(mwmName); + shared_ptr<VehicleModelInterface> vehicleModel = + CarModelFactory({}).GetVehicleModelForCountry(mwmName); Geometry geometry( GeometryLoader::CreateFromFile(GetCurrentVersionMwmFile(storage, mwmName), vehicleModel)); diff --git a/track_analyzing/track_matcher.cpp b/track_analyzing/track_matcher.cpp index f98fd25735..09f2c94ce8 100644 --- a/track_analyzing/track_matcher.cpp +++ b/track_analyzing/track_matcher.cpp @@ -53,7 +53,7 @@ namespace track_analyzing TrackMatcher::TrackMatcher(storage::Storage const & storage, NumMwmId mwmId, platform::CountryFile const & countryFile) : m_mwmId(mwmId) - , m_vehicleModel(CarModelFactory().GetVehicleModelForCountry(countryFile.GetName())) + , m_vehicleModel(CarModelFactory({}).GetVehicleModelForCountry(countryFile.GetName())) { auto localCountryFile = storage.GetLatestLocalFile(countryFile); CHECK(localCountryFile, ("Can't find latest country file for", countryFile.GetName())); @@ -129,10 +129,9 @@ TrackMatcher::Step::Step(DataPoint const & dataPoint) { } -void TrackMatcher::Step::FillCandidatesWithNearbySegments(Index const & index, - IndexGraph const & graph, - IVehicleModel const & vehicleModel, - NumMwmId mwmId) +void TrackMatcher::Step::FillCandidatesWithNearbySegments( + Index const & index, IndexGraph const & graph, VehicleModelInterface const & vehicleModel, + NumMwmId mwmId) { index.ForEachInRect( [&](FeatureType const & ft) { diff --git a/track_analyzing/track_matcher.hpp b/track_analyzing/track_matcher.hpp index 8f8fab782b..e4e818ebc9 100644 --- a/track_analyzing/track_matcher.hpp +++ b/track_analyzing/track_matcher.hpp @@ -57,7 +57,7 @@ private: routing::Segment const & GetSegment() const { return m_segment; } bool HasCandidates() const { return !m_candidates.empty(); } void FillCandidatesWithNearbySegments(Index const & index, routing::IndexGraph const & graph, - routing::IVehicleModel const & vehicleModel, + routing::VehicleModelInterface const & vehicleModel, routing::NumMwmId mwmId); void FillCandidates(Step const & previousStep, routing::IndexGraph & graph); void ChooseSegment(Step const & nextStep, routing::IndexGraph & indexGraph); @@ -75,7 +75,7 @@ private: routing::NumMwmId const m_mwmId; Index m_index; - std::shared_ptr<routing::IVehicleModel> m_vehicleModel; + std::shared_ptr<routing::VehicleModelInterface> m_vehicleModel; std::unique_ptr<routing::IndexGraph> m_graph; uint64_t m_tracksCount = 0; uint64_t m_pointsCount = 0; |