[indexer] Disallow copy and move of FeatureType, remove FeatureType::ParseEverything().

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;