Style fixes.

generator/routing_generator.cpp

@@ -323,8 +323,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
       Index::FeaturesLoaderGuard loader(index, p.first);
       if (!loader.GetFeatureByIndex(fID, ft))
       {
-        LOG(LWARNING,
-            ("Can't read feature for way:", seg.wayId, "probably map is damaged or deleted."));
+        LOG(LWARNING, ("Can't read feature with id:", fID, "for way:", seg.wayId));
         continue;
       }
 

map/address_finder.cpp

@@ -479,7 +479,7 @@ search::AddressInfo Framework::GetAddressInfoAtPoint(m2::PointD const & pt) cons
 search::AddressInfo Framework::GetFeatureAddressInfo(FeatureID const & fid) const
 {
   FeatureType ft;
-  if (!GetFeatureByID(fid, true /* parse */, ft))
+  if (!GetFeatureByID(fid, ft))
     return {};
   return GetFeatureAddressInfo(ft);
 }

map/framework.cpp

@@ -1350,7 +1350,7 @@ void Framework::LoadSearchResultMetadata(search::Result & res) const
   // TODO @yunikkk refactor to format search result metadata accordingly with place_page::Info
 
   FeatureType ft;
-  if (!GetFeatureByID(id, true /* parse */, ft))
+  if (!GetFeatureByID(id, ft))
     return;
 
   search::ProcessMetadata(ft, res.m_metadata);
@@ -1900,7 +1900,7 @@ unique_ptr<FeatureType> Framework::GetFeatureAtPoint(m2::PointD const & mercator
   return poi ? move(poi) : (area ? move(area) : move(line));
 }
 
-bool Framework::GetFeatureByID(FeatureID const & fid, bool parse, FeatureType & ft) const
+bool Framework::GetFeatureByID(FeatureID const & fid, FeatureType & ft) const
 {
   ASSERT(fid.IsValid(), ());
 
@@ -1908,8 +1908,7 @@ bool Framework::GetFeatureByID(FeatureID const & fid, bool parse, FeatureType &
   if (!guard.GetFeatureByIndex(fid.m_index, ft))
     return false;
 
-  if (parse)
-    ft.ParseEverything();
+  ft.ParseEverything();
   return true;
 }
 
@@ -2616,7 +2615,7 @@ bool Framework::ParseEditorDebugCommand(search::SearchParams const & params)
       FeatureID const & fid = edit.first;
 
       FeatureType ft;
-      if (!GetFeatureByID(fid, true /* parse */, ft))
+      if (!GetFeatureByID(fid, ft))
       {
         LOG(LERROR, ("Feature can't be loaded:", fid));
         return true;
@@ -2806,7 +2805,7 @@ bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObje
     return false;
 
   FeatureType ft;
-  if (!GetFeatureByID(fid, true /* parse */, ft))
+  if (!GetFeatureByID(fid, ft))
     return false;
 
   emo.SetFromFeatureType(ft);
@@ -2967,7 +2966,7 @@ void Framework::DeleteFeature(FeatureID const & fid) const
   // TODO(AlexZ): Use FeatureID in the editor interface.
 
   FeatureType ft;
-  if (!GetFeatureByID(fid, true /* parse */, ft))
+  if (!GetFeatureByID(fid, ft))
     return;
 
   osm::Editor::Instance().DeleteFeature(ft);

map/framework.hpp

@@ -541,7 +541,7 @@ public:
   /// Set parse to false if you don't need all feature fields ready.
   /// TODO(AlexZ): Refactor code which uses this method to get rid of it.
   /// FeatureType instances shoud not be used outside ForEach* core methods.
-  WARN_UNUSED_RESULT bool GetFeatureByID(FeatureID const & fid, bool parse, FeatureType & ft) const;
+  WARN_UNUSED_RESULT bool GetFeatureByID(FeatureID const & fid, FeatureType & ft) const;
 
   void MemoryWarning();
   void EnterBackground();

routing/routing_integration_tests/bicycle_turn_test.cpp

@@ -59,7 +59,6 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointTurnTest)
   TRouteResult const routeResult =
       integration::CalculateRoute(integration::GetBicycleComponents(), point, {0.0, 0.0}, point);
 
-  Route const & route = *routeResult.first;
   IRouter::ResultCode const result = routeResult.second;
   TEST_EQUAL(result, IRouter::IRouter::RouteNotFound, ());
 }

search/ranker.cpp

@@ -256,7 +256,7 @@ public:
     string name;
     string country;
 
-    if (LoadFeature(res1.GetId(), ft, center, name, country))
+    if (!LoadFeature(res1.GetId(), ft, center, name, country))
       return unique_ptr<PreResult2>();
 
     auto res2 = make_unique<PreResult2>(ft, &res1, center, m_ranker.m_params.m_position /* pivot */,