diff options
author | Sergey Yershov <syershov@maps.me> | 2018-06-18 11:39:14 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-06-22 12:22:30 +0300 |
commit | 37d3d2f748769f024a0e6b8a969822746de93971 (patch) | |
tree | 2e4dec2e01a056f5d03a9e91a3f3e8ac15cc777e /track_analyzing | |
parent | c92fe0a11d20e99ae47c723a2746d44d304a5cd0 (diff) |
[indexer][editor] Refactor Index into DataSource
Remove namespace datasource
Diffstat (limited to 'track_analyzing')
-rw-r--r-- | track_analyzing/track_analyzer/cmd_table.cpp | 4 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_track.cpp | 2 | ||||
-rw-r--r-- | track_analyzing/track_matcher.cpp | 4 | ||||
-rw-r--r-- | track_analyzing/track_matcher.hpp | 6 | ||||
-rw-r--r-- | track_analyzing/utils.cpp | 2 |
5 files changed, 14 insertions, 4 deletions
diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp index 5c1f48ebc5..c8cc817e08 100644 --- a/track_analyzing/track_analyzer/cmd_table.cpp +++ b/track_analyzing/track_analyzer/cmd_table.cpp @@ -9,7 +9,9 @@ #include "traffic/speed_groups.hpp" #include "indexer/classificator.hpp" +#include "indexer/feature.hpp" #include "indexer/feature_data.hpp" +#include "indexer/features_vector.hpp" #include "storage/routing_helpers.hpp" #include "storage/storage.hpp" @@ -17,6 +19,8 @@ #include "coding/file_name_utils.hpp" #include "coding/file_reader.hpp" +#include "base/timer.hpp" + #include <iostream> using namespace routing; diff --git a/track_analyzing/track_analyzer/cmd_track.cpp b/track_analyzing/track_analyzer/cmd_track.cpp index 0c0bc5aa25..1791c627c2 100644 --- a/track_analyzing/track_analyzer/cmd_track.cpp +++ b/track_analyzing/track_analyzer/cmd_track.cpp @@ -17,6 +17,8 @@ #include "geometry/mercator.hpp" +#include "base/timer.hpp" + using namespace routing; using namespace std; diff --git a/track_analyzing/track_matcher.cpp b/track_analyzing/track_matcher.cpp index cc9069bb05..f9d708504b 100644 --- a/track_analyzing/track_matcher.cpp +++ b/track_analyzing/track_matcher.cpp @@ -10,6 +10,8 @@ #include <geometry/distance.hpp> +#include <base/stl_helpers.hpp> + using namespace routing; using namespace std; using namespace track_analyzing; @@ -130,7 +132,7 @@ TrackMatcher::Step::Step(DataPoint const & dataPoint) } void TrackMatcher::Step::FillCandidatesWithNearbySegments( - Index const & index, IndexGraph const & graph, VehicleModelInterface const & vehicleModel, + DataSourceBase const & index, IndexGraph const & graph, VehicleModelInterface const & vehicleModel, NumMwmId mwmId) { index.ForEachInRect( diff --git a/track_analyzing/track_matcher.hpp b/track_analyzing/track_matcher.hpp index 6a3e5cfee3..9a3b1b4eba 100644 --- a/track_analyzing/track_matcher.hpp +++ b/track_analyzing/track_matcher.hpp @@ -7,7 +7,7 @@ #include "routing_common/num_mwm_id.hpp" -#include "indexer/index.hpp" +#include "indexer/data_source.hpp" #include <storage/storage.hpp> @@ -57,7 +57,7 @@ private: DataPoint const & GetDataPoint() const { return m_dataPoint; } routing::Segment const & GetSegment() const { return m_segment; } bool HasCandidates() const { return !m_candidates.empty(); } - void FillCandidatesWithNearbySegments(Index const & index, routing::IndexGraph const & graph, + void FillCandidatesWithNearbySegments(DataSourceBase const & index, routing::IndexGraph const & graph, routing::VehicleModelInterface const & vehicleModel, routing::NumMwmId mwmId); void FillCandidates(Step const & previousStep, routing::IndexGraph & graph); @@ -75,7 +75,7 @@ private: }; routing::NumMwmId const m_mwmId; - Index m_index; + DataSource m_index; std::shared_ptr<routing::VehicleModelInterface> m_vehicleModel; std::unique_ptr<routing::IndexGraph> m_graph; uint64_t m_tracksCount = 0; diff --git a/track_analyzing/utils.cpp b/track_analyzing/utils.cpp index 1860f7064b..f96ff4c9e5 100644 --- a/track_analyzing/utils.cpp +++ b/track_analyzing/utils.cpp @@ -8,6 +8,8 @@ #include "coding/file_name_utils.hpp" +#include "geometry/mercator.hpp" + #include <cstdint> using namespace routing; |