From a251f555c7e5f8f26977a5b4c554d3c8962a5e62 Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Fri, 20 Apr 2018 12:07:20 +0300
Subject: [PATCH] UGC search results.

---
 map/api_mark_point.cpp |  2 +-
 map/framework.cpp      | 10 ++++++++++
 map/search_mark.cpp    | 21 ++++++++++++++-------
 map/search_mark.hpp    |  2 ++
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/map/api_mark_point.cpp b/map/api_mark_point.cpp
index 68359da2bd..86763184f8 100644
--- a/map/api_mark_point.cpp
+++ b/map/api_mark_point.cpp
@@ -42,7 +42,7 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> ApiMarkPoint::GetSymbolNames()
 {
   //TODO: use its own icon.
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();
-  symbol->insert(std::make_pair(1 /* zoomLevel */, "searchbooking-default-s"));
+  symbol->insert(std::make_pair(1 /* zoomLevel */, "coloredmark-default-s"));
   return symbol;
 }
 
diff --git a/map/framework.cpp b/map/framework.cpp
index 1ca7121f6c..d3e40ac28e 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1583,6 +1583,7 @@ void Framework::FillSearchResultsMarks(bool clear, search::Results::ConstIter be
     auto const isFeature = r.GetResultType() == search::Result::Type::Feature;
     if (isFeature)
       mark->SetFoundFeature(r.GetFeatureID());
+
     mark->SetMatchedName(r.GetString());
 
     // TODO: Remove after FC2018 finishing.
@@ -1595,6 +1596,15 @@ void Framework::FillSearchResultsMarks(bool clear, search::Results::ConstIter be
       mark->SetRating(r.m_metadata.m_hotelRating);
       mark->SetPricing(r.m_metadata.m_hotelPricing);
     }
+    else if (isFeature)
+    {
+      auto product = GetProductInfo(r);
+      if (product.m_ugcRating != search::ProductInfo::kInvalidRating)
+      {
+        mark->SetMarkType(SearchMarkType::UGC);
+        mark->SetRating(product.m_ugcRating);
+      }
+    }
 
     if (isFeature && m_localAdsManager.Contains(r.GetFeatureID()))
     {
diff --git a/map/search_mark.cpp b/map/search_mark.cpp
index 52beffa17f..1a2a612a3e 100644
--- a/map/search_mark.cpp
+++ b/map/search_mark.cpp
@@ -14,9 +14,10 @@ namespace
 std::vector<std::string> const kSymbols =
 {
   "search-result",              // Default.
-  "searchbooking-default-l",    // Booking.
+  "coloredmark-default-l",     // Booking.
   "search-adv",                 // Local Ads.
   "searchbookingadv-default-l", // Local Ads + Booking.
+  "coloredmark-default-l",     // UGC.
   "search-football",            // FC 2018.
 
   "non-found-search-result",    // NotFound.
@@ -25,9 +26,10 @@ std::vector<std::string> const kSymbols =
 std::vector<std::string> const kPreparingSymbols =
 {
   "search-result",              // Default.
-  "searchbooking-inactive",     // Booking.
+  "coloredmark-inactive",      // Booking.
   "search-adv",                 // Local Ads.
   "searchbookingadv-default-l", // Local Ads + Booking.
+  "coloredmark-inactive",      // UGC.
   "search-football",            // FC 2018.
 
   "non-found-search-result",    // NotFound.
@@ -70,7 +72,7 @@ bool NeedShowBookingBadge(float rating, int pricing)
 std::string GetBookingSmallIcon(SearchMarkType type)
 {
   if (type == SearchMarkType::Booking)
-    return "searchbooking-default-s";
+    return "coloredmark-default-s";
   if (type == SearchMarkType::LocalAdsBooking)
     return "search-adv";
   return {};
@@ -104,7 +106,7 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> SearchMarkPoint::GetSymbolNames
   }
 
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();
-  if (IsBookingSpecialMark())
+  if (IsBookingSpecialMark() || IsUGCMark())
   {
     symbol->insert(std::make_pair(1 /* zoomLevel */, m_rating < kRatingThreshold ?
                                                      GetBookingSmallIcon(m_type) : name));
@@ -158,7 +160,7 @@ drape_ptr<df::UserPointMark::SymbolOffsets> SearchMarkPoint::GetSymbolOffsets()
 
 df::ColorConstant SearchMarkPoint::GetColorConstant() const
 {
-  if (!IsBookingSpecialMark())
+  if (!IsBookingSpecialMark() && !IsUGCMark())
     return {};
 
   if (m_type == SearchMarkType::LocalAdsBooking)
@@ -179,7 +181,7 @@ df::ColorConstant SearchMarkPoint::GetColorConstant() const
 
 drape_ptr<df::UserPointMark::TitlesInfo> SearchMarkPoint::GetTitleDecl() const
 {
-  if (!IsBookingSpecialMark() || fabs(m_rating) < 1e-5)
+  if (!(IsBookingSpecialMark() || IsUGCMark()) || fabs(m_rating) < 1e-5)
     return nullptr;
 
   auto titles = make_unique_dp<TitlesInfo>();
@@ -189,7 +191,7 @@ drape_ptr<df::UserPointMark::TitlesInfo> SearchMarkPoint::GetTitleDecl() const
 
 int SearchMarkPoint::GetMinTitleZoom() const
 {
-  if (IsBookingSpecialMark() && m_rating < kRatingThreshold)
+  if ((IsBookingSpecialMark() || IsUGCMark()) && m_rating < kRatingThreshold)
     return 17;
   return 1;
 }
@@ -236,6 +238,11 @@ bool SearchMarkPoint::IsBookingSpecialMark() const
          !m_isPreparing;
 }
 
+bool SearchMarkPoint::IsUGCMark() const
+{
+  return m_type == SearchMarkType::UGC;
+}
+
 // static
 std::map<std::string, m2::PointF> SearchMarks::m_searchMarksSizes;
 
diff --git a/map/search_mark.hpp b/map/search_mark.hpp
index a7246432dd..9cfb29df94 100644
--- a/map/search_mark.hpp
+++ b/map/search_mark.hpp
@@ -21,6 +21,7 @@ enum class SearchMarkType
   Booking,
   LocalAds,
   LocalAdsBooking,
+  UGC,
   Fc2018,
   NotFound, // Service value used in developer tools.
   Count
@@ -63,6 +64,7 @@ protected:
   }
 
   bool IsBookingSpecialMark() const;
+  bool IsUGCMark() const;
 
   SearchMarkType m_type = SearchMarkType::Default;
   FeatureID m_featureID;