From 8d7bf171c087d7d1ec3e69224fe5bba201d6bffd Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Thu, 11 Jun 2020 19:14:33 +0300
Subject: [PATCH] Review fixes.

---
 search/geocoder.cpp            |  2 +-
 search/intersection_result.cpp | 12 ++++++------
 search/intersection_result.hpp |  2 +-
 search/model.hpp               |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 4701883c3a..400d357890 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -1554,7 +1554,7 @@ void Geocoder::FindPaths(BaseContext & ctx)
       if (tokenType == BaseContext::TokenType::TOKEN_TYPE_SUBPOI)
         id = result.m_subpoi;
       if (tokenType == BaseContext::TokenType::TOKEN_TYPE_COMPLEX_POI)
-        id = result.m_complex_poi;
+        id = result.m_complexPoi;
       if (tokenType == BaseContext::TokenType::TOKEN_TYPE_STREET)
         id = result.m_street;
 
diff --git a/search/intersection_result.cpp b/search/intersection_result.cpp
index dab7ab53cf..2463cc2e79 100644
--- a/search/intersection_result.cpp
+++ b/search/intersection_result.cpp
@@ -12,7 +12,7 @@ void IntersectionResult::Set(Model::Type type, uint32_t id)
   switch (type)
   {
   case Model::TYPE_SUBPOI: m_subpoi = id; break;
-  case Model::TYPE_COMPLEX_POI: m_complex_poi = id; break;
+  case Model::TYPE_COMPLEX_POI: m_complexPoi = id; break;
   case Model::TYPE_BUILDING: m_building = id; break;
   case Model::TYPE_STREET: m_street = id; break;
   case Model::TYPE_SUBURB: m_suburb = id; break;
@@ -29,8 +29,8 @@ uint32_t IntersectionResult::InnermostResult() const
 {
   if (m_subpoi != kInvalidId)
     return m_subpoi;
-  if (m_complex_poi != kInvalidId)
-    return m_complex_poi;
+  if (m_complexPoi != kInvalidId)
+    return m_complexPoi;
   if (m_building != kInvalidId)
     return m_building;
   if (m_street != kInvalidId)
@@ -43,7 +43,7 @@ uint32_t IntersectionResult::InnermostResult() const
 void IntersectionResult::Clear()
 {
   m_subpoi = kInvalidId;
-  m_complex_poi = kInvalidId;
+  m_complexPoi = kInvalidId;
   m_building = kInvalidId;
   m_street = kInvalidId;
   m_suburb = kInvalidId;
@@ -55,8 +55,8 @@ std::string DebugPrint(IntersectionResult const & result)
   os << "IntersectionResult [ ";
   if (result.m_subpoi != IntersectionResult::kInvalidId)
     os << "SUBPOI:" << result.m_subpoi << " ";
-  if (result.m_complex_poi != IntersectionResult::kInvalidId)
-    os << "COMPLEX_POI:" << result.m_complex_poi << " ";
+  if (result.m_complexPoi != IntersectionResult::kInvalidId)
+    os << "COMPLEX_POI:" << result.m_complexPoi << " ";
   if (result.m_building != IntersectionResult::kInvalidId)
     os << "BUILDING:" << result.m_building << " ";
   if (result.m_street != IntersectionResult::kInvalidId)
diff --git a/search/intersection_result.hpp b/search/intersection_result.hpp
index 917694bbdc..926ca297a1 100644
--- a/search/intersection_result.hpp
+++ b/search/intersection_result.hpp
@@ -27,7 +27,7 @@ struct IntersectionResult
   void Clear();
 
   uint32_t m_subpoi = kInvalidId;
-  uint32_t m_complex_poi = kInvalidId;
+  uint32_t m_complexPoi = kInvalidId;
   uint32_t m_building = kInvalidId;
   uint32_t m_street = kInvalidId;
   uint32_t m_suburb = kInvalidId;
diff --git a/search/model.hpp b/search/model.hpp
index 4a85f113c0..840044e0b7 100644
--- a/search/model.hpp
+++ b/search/model.hpp
@@ -28,7 +28,8 @@ public:
   enum Type
   {
     // Low-level features such as amenities, offices, shops, buildings without house number, etc.
-    // Can be located inside COMPLEX_POIs. E.g. cafes/shops inside airports/universities/museums.
+    // Can be stand-alone or located inside COMPLEX_POIs. E.g. cafes/shops inside
+    // airports/universities/museums.
     TYPE_SUBPOI,
 
     // Big pois which can contain SUBPOIs. E.g. airports, train stations, malls, parks.