diff options
author | tatiana-yan <tatiana.kondakova@gmail.com> | 2019-03-12 15:31:48 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-03-18 22:38:39 +0300 |
commit | f1c58fbfcc0fd0bbd98285734e9a2d9e4435a33d (patch) | |
tree | 9c1d71beb7bcb46a3a94e4e9990ed19e5358aa02 /track_analyzing | |
parent | 2bf94c95dd55f70951a82b5c306b8a29a72a4180 (diff) |
[indexer] Disallow copy and move of FeatureType, remove FeatureType::ParseEverything().
Diffstat (limited to 'track_analyzing')
-rw-r--r-- | track_analyzing/track_analyzer/cmd_table.cpp | 10 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_track.cpp | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp index f608bdc7c5..c41a687f38 100644 --- a/track_analyzing/track_analyzer/cmd_table.cpp +++ b/track_analyzing/track_analyzer/cmd_table.cpp @@ -335,8 +335,8 @@ private: if (featureId == m_prevFeatureId) return m_prevRoadInfo; - FeatureType feature; - m_featuresVector.GetVector().GetByIndex(featureId, feature); + auto feature = m_featuresVector.GetVector().GetByIndex(featureId); + CHECK(feature, ()); auto const maxspeed = m_maxspeeds.GetMaxspeed(featureId); auto const maxspeedValueKMpH = maxspeed.IsValid() ? @@ -344,10 +344,8 @@ private: kInvalidSpeed; m_prevFeatureId = featureId; - m_prevRoadInfo = {m_carModelTypes.GetType(feature), - maxspeedValueKMpH, - m_cityRoads.IsCityRoad(featureId), - m_vehicleModel.IsOneWay(feature)}; + m_prevRoadInfo = {m_carModelTypes.GetType(*feature), maxspeedValueKMpH, + m_cityRoads.IsCityRoad(featureId), m_vehicleModel.IsOneWay(*feature)}; return m_prevRoadInfo; } diff --git a/track_analyzing/track_analyzer/cmd_track.cpp b/track_analyzing/track_analyzer/cmd_track.cpp index f6d66b5320..eb8eeca1e7 100644 --- a/track_analyzing/track_analyzer/cmd_track.cpp +++ b/track_analyzing/track_analyzer/cmd_track.cpp @@ -51,8 +51,6 @@ void CmdTrack(string const & trackFile, string const & mwmName, string const & u for (size_t i = 0; i < track.size(); ++i) { MatchedTrackPoint const & point = track[i]; - FeatureType feature; - featuresVector.GetVector().GetByIndex(point.GetSegment().GetFeatureId(), feature); double speed = 0.0; uint64_t elapsed = 0; |