From 4f376bdd4735a77484e58f6021ce1e2a23bf5d9d Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Thu, 7 Dec 2017 16:22:56 +0300
Subject: [PATCH] Fixed local experts api and rating absense

---
 .../RatingSummaryView+DefaultConfig.swift     |  1 +
 .../UI/Discovery/DiscoveryLocalExpertCell.xib |  2 ++
 .../Content/ViatorCells/ViatorElement.xib     |  2 ++
 partners_api/locals_api.cpp                   | 32 ++++---------------
 partners_api/locals_api.hpp                   |  2 +-
 5 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/iphone/Maps/Categories/RatingSummaryView+DefaultConfig.swift b/iphone/Maps/Categories/RatingSummaryView+DefaultConfig.swift
index 170a0f2a26..ad9acc57a0 100644
--- a/iphone/Maps/Categories/RatingSummaryView+DefaultConfig.swift
+++ b/iphone/Maps/Categories/RatingSummaryView+DefaultConfig.swift
@@ -1,5 +1,6 @@
 extension RatingSummaryView {
   func defaultConfig() {
+    noValueColor = UIColor.blackSecondaryText()
     horribleColor = UIColor.ratingRed()
     badColor = UIColor.ratingOrange()
     normalColor = UIColor.ratingYellow()
diff --git a/iphone/Maps/UI/Discovery/DiscoveryLocalExpertCell.xib b/iphone/Maps/UI/Discovery/DiscoveryLocalExpertCell.xib
index 1b4e5e819e..f684224b88 100644
--- a/iphone/Maps/UI/Discovery/DiscoveryLocalExpertCell.xib
+++ b/iphone/Maps/UI/Discovery/DiscoveryLocalExpertCell.xib
@@ -72,6 +72,7 @@
                             <userDefinedRuntimeAttribute type="number" keyPath="trailingTextOffset">
                                 <real key="value" value="6"/>
                             </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="image" keyPath="noValueImage" value="ic_12px_rating_normal"/>
                         </userDefinedRuntimeAttributes>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5vR-oH-2gt">
@@ -121,6 +122,7 @@
         </collectionViewCell>
     </objects>
     <resources>
+        <image name="ic_12px_rating_normal" width="12" height="12"/>
         <image name="ic_24px_rating_bad" width="24" height="24"/>
         <image name="ic_24px_rating_excellent" width="24" height="24"/>
         <image name="ic_24px_rating_horrible" width="24" height="24"/>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ViatorCells/ViatorElement.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ViatorCells/ViatorElement.xib
index 3f5ba22055..020c60b96a 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ViatorCells/ViatorElement.xib
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ViatorCells/ViatorElement.xib
@@ -81,6 +81,7 @@
                             <userDefinedRuntimeAttribute type="number" keyPath="margin">
                                 <real key="value" value="4"/>
                             </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="image" keyPath="noValueImage" value="ic_12px_rating_normal"/>
                         </userDefinedRuntimeAttributes>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vji-Hy-ASy">
@@ -136,6 +137,7 @@
         </collectionViewCell>
     </objects>
     <resources>
+        <image name="ic_12px_rating_normal" width="12" height="12"/>
         <image name="ic_24px_rating_bad" width="24" height="24"/>
         <image name="ic_24px_rating_excellent" width="24" height="24"/>
         <image name="ic_24px_rating_good" width="24" height="24"/>
diff --git a/partners_api/locals_api.cpp b/partners_api/locals_api.cpp
index f7ecc6112a..18e6eb47e2 100644
--- a/partners_api/locals_api.cpp
+++ b/partners_api/locals_api.cpp
@@ -14,25 +14,10 @@
 
 #include "private.h"
 
-#define LOCALS_MOCKING_ENABLED
-
 namespace
 {
 using namespace locals;
 
-#ifdef LOCALS_MOCKING_ENABLED
-std::string const kTempImageLink = "https://cdn.pixabay.com/photo/2017/08/01/08/29/people-2563491_1280.jpg";
-std::string const kTempImageLink2 = "https://cdn.pixabay.com/photo/2017/06/26/02/47/people-2442565_1280.jpg";
-std::vector<LocalExpert> const kLocalsMocking =
-{
-  {1, "Angelina", "Russian Federation", "Moscow", 10.0, 2, 100.0, "USD", "", "", "", "", kTempImageLink},
-  {2, "Veronika", "Russian Federation", "Moscow", 8.0, 3, 89.99, "USD", "", "", "", "", ""},
-  {3, "Snejana", "Russian Federation", "Moscow", 7.5, 4, 200.0, "USD", "", "", "", "", ""},
-  {4, "Ella Petrovna", "Russian Federation", "Saint-Petersburg", 10.0, 1500, 0.0, "", "", "", "", "", ""},
-  {5, "Boris", "Russian Federation", "Chelyabinsk", 9.0, 7, 1000.0, "RUB", "", "", "", "", kTempImageLink2}
-};
-#endif
-
 void ParseError(std::string const & src, int & errorCode, std::string & message)
 {
   message.clear();
@@ -71,10 +56,14 @@ void ParseLocals(std::string const & src, std::vector<LocalExpert> & locals,
     FromJSONObject(item, "about_me", local.m_aboutExpert);
     FromJSONObject(item, "i_will_show_you", local.m_offerDescription);
 
-    // Rescale rating to [0.0; 10.0] range.
-    local.m_rating *= 2;
+    // Rescale rating to (0.0; 10.0] range. Rating 0.0 is invalid.
+    static double const kInvalidRating = -1.0;
+    if (local.m_rating == 0.0)
+      local.m_rating = kInvalidRating;
+    else
+      local.m_rating *= 2.0;
 
-    locals.push_back(move(local));
+    locals.push_back(std::move(local));
   }
 }
 }  // namespace
@@ -117,7 +106,6 @@ uint64_t Api::GetLocals(double lat, double lon, std::string const & lang,
   GetPlatform().RunTask(Platform::Thread::Network,
                         [id, lat, lon, lang, resultsOnPage, pageNumber, successFn, errorFn]()
   {
-#ifndef LOCALS_MOCKING_ENABLED
     std::string result;
     if (!RawApi::Get(lat, lon, lang, resultsOnPage, pageNumber, result))
     {
@@ -148,11 +136,6 @@ uint64_t Api::GetLocals(double lat, double lon, std::string const & lang,
       LOG(LWARNING, ("Locals response parsing failed:", e.Msg(), ", response:", result));
       errorFn(id, kUnknownErrorCode, "Response parsing failed: " + e.Msg());
     }
-#else
-    std::vector<LocalExpert> locals = kLocalsMocking;
-    bool hasPreviousPage = false;
-    bool hasNextPage = false;
-#endif
 
     successFn(id, locals, pageNumber, resultsOnPage, hasPreviousPage, hasNextPage);
   });
@@ -174,5 +157,4 @@ std::string DebugPrint(LocalExpert const & localExpert)
       << "motto: " << localExpert.m_motto << std::endl;
   return out.str();
 }
-
 }  // namespace locals
diff --git a/partners_api/locals_api.hpp b/partners_api/locals_api.hpp
index 21015456b8..6252a1a8dd 100644
--- a/partners_api/locals_api.hpp
+++ b/partners_api/locals_api.hpp
@@ -5,7 +5,7 @@
 
 #include <string>
 
-#define STAGE_LOCALS_SERVER
+//#define STAGE_LOCALS_SERVER
 
 namespace locals
 {