From 1bb30fc057ee053873cd1e7ade7cb62ac0a8fda9 Mon Sep 17 00:00:00 2001
From: y <y@maps.me>
Date: Tue, 1 Aug 2017 18:26:27 +0300
Subject: [PATCH] Review fixes.

---
 map/framework.cpp   | 5 +----
 search/geocoder.cpp | 5 +----
 search/model.cpp    | 4 ++--
 search/model.hpp    | 5 ++---
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index 9501d65e70..7a6cbfde1d 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1390,10 +1390,7 @@ bool Framework::SearchInViewport(search::ViewportSearchParams const & params)
     std::string query = params.m_query;
     strings::Trim(query);
     strings::AsciiToLower(query);
-    if (query == "cian")
-      m_cianSearchMode = true;
-    else
-      m_cianSearchMode = false;
+    m_cianSearchMode = (query == "cian");
   }
 
   search::SearchParams p;
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 2d3d5b9231..2e88d511e3 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -339,10 +339,7 @@ Geocoder::~Geocoder() {}
 void Geocoder::SetParams(Params const & params)
 {
   m_params = params;
-  if (m_params.m_cianMode)
-    m_model.EnableCian();
-  else
-    m_model.DisableCian();
+  m_model.SetCianEnabled(m_params.m_cianMode);
 
   m_tokenRequests.clear();
   m_prefixTokenRequest.Clear();
diff --git a/search/model.cpp b/search/model.cpp
index d097eb3999..8ccb942a8a 100644
--- a/search/model.cpp
+++ b/search/model.cpp
@@ -107,10 +107,10 @@ SearchModel::SearchType SearchModel::GetSearchType(FeatureType const & feature)
   static auto const & localityChecker = IsLocalityChecker::Instance();
   static auto const & poiChecker = IsPoiChecker::Instance();
 
-  if (m_cianMode && cianChecker(feature))
+  if (m_cianEnabled && cianChecker(feature))
     return SEARCH_TYPE_BUILDING;
 
-  if (!m_cianMode && buildingChecker(feature))
+  if (!m_cianEnabled && buildingChecker(feature))
     return SEARCH_TYPE_BUILDING;
 
   if (streetChecker(feature))
diff --git a/search/model.hpp b/search/model.hpp
index d07a81b9c1..7f43d1287c 100644
--- a/search/model.hpp
+++ b/search/model.hpp
@@ -49,11 +49,10 @@ public:
 
   SearchType GetSearchType(FeatureType const & feature) const;
 
-  void EnableCian() { m_cianMode = true; }
-  void DisableCian() { m_cianMode = false; }
+  void SetCianEnabled(bool enabled) { m_cianEnabled = enabled; }
 
 private:
-  bool m_cianMode = false;
+  bool m_cianEnabled = false;
 };
 
 string DebugPrint(SearchModel::SearchType type);