From 4c14c4b3fa399ff79e83e0f043ccd592c92a8339 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Wed, 5 Sep 2018 17:45:27 +0300
Subject: [PATCH] [eye][tips] review fixes

---
 map/map_tests/tips_tests.cpp        | 4 ++--
 map/tips_api.cpp                    | 4 ++--
 metrics/eye_info.hpp                | 6 +++---
 metrics/metrics_tests/eye_tests.cpp | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/map/map_tests/tips_tests.cpp b/map/map_tests/tips_tests.cpp
index 35ca5f9d5b..3885f999ca 100644
--- a/map/map_tests/tips_tests.cpp
+++ b/map/map_tests/tips_tests.cpp
@@ -29,7 +29,7 @@ public:
   // TipsApi::Delegate overrides:
   boost::optional<m2::PointD> GetCurrentPosition() const override
   {
-    return boost::optional<m2::PointD>();
+    return {};
   }
 
   bool IsCountryLoaded(m2::PointD const & pt) const override { return false; }
@@ -65,7 +65,7 @@ boost::optional<eye::Tip::Type> GetTipForTesting(TipsApi::Duration showAnyTipPer
     [] (eye::Info const & info) { return true; },
     // Condition for Tips::Type::DiscoverButton type.
     [] (eye::Info const & info) { return true; },
-     // Condition for Tips::Type::MapsLayers type.
+     // Condition for Tips::Type::PublicTransport type.
     [] (eye::Info const & info) { return true; }
   }};
   return TipsApi::GetTipForTesting(showAnyTipPeriod, showSameTipPeriod, delegate, conditions);
diff --git a/map/tips_api.cpp b/map/tips_api.cpp
index 5f04b9db30..07a3a16941 100644
--- a/map/tips_api.cpp
+++ b/map/tips_api.cpp
@@ -159,12 +159,12 @@ TipsApi::TipsApi(Delegate const & delegate)
 
       return m_delegate.IsCountryLoaded(pos.get());
     },
-    // Condition for Tips::Type::MapsLayers type.
+    // Condition for Tips::Type::PublicTransport type.
     [this] (eye::Info const & info)
     {
       for (auto const & layer : info.m_layers)
       {
-        if (layer.m_type == Layer::PublicTransport &&
+        if (layer.m_type == Layer::Type::PublicTransport &&
             layer.m_lastTimeUsed.time_since_epoch().count() != 0)
         {
           return false;
diff --git a/metrics/eye_info.hpp b/metrics/eye_info.hpp
index 66e67592e4..b0ef53b267 100644
--- a/metrics/eye_info.hpp
+++ b/metrics/eye_info.hpp
@@ -110,7 +110,7 @@ struct Discovery
 
 struct Layer
 {
-  enum Type
+  enum class Type : uint8_t
   {
     TrafficJams,
     PublicTransport
@@ -135,7 +135,7 @@ struct Tip
     BookmarksCatalog,
     BookingHotels,
     DiscoverButton,
-    MapsLayers,
+    PublicTransport,
 
     Count
   };
@@ -181,7 +181,7 @@ inline std::string DebugPrint(Tip::Type const & type)
   case Tip::Type::BookmarksCatalog: return "BookmarksCatalog";
   case Tip::Type::BookingHotels: return "BookingHotels";
   case Tip::Type::DiscoverButton: return "DiscoverButton";
-  case Tip::Type::MapsLayers: return "MapsLayers";
+  case Tip::Type::PublicTransport: return "PublicTransport";
   case Tip::Type::Count: return "Count";
   }
 }
diff --git a/metrics/metrics_tests/eye_tests.cpp b/metrics/metrics_tests/eye_tests.cpp
index 6e01004c41..2c927c2b2b 100644
--- a/metrics/metrics_tests/eye_tests.cpp
+++ b/metrics/metrics_tests/eye_tests.cpp
@@ -118,7 +118,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, AppendTipTest)
 
   Time prevShowTime;
   {
-    EyeForTesting::AppendTip(Tip::Type::MapsLayers, Tip::Event::ActionClicked);
+    EyeForTesting::AppendTip(Tip::Type::PublicTransport, Tip::Event::ActionClicked);
 
     auto const info = Eye::Instance().GetInfo();
     auto const & tips = info->m_tips;
@@ -126,7 +126,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, AppendTipTest)
 
     TEST_EQUAL(tips.size(), 2, ());
     TEST_NOT_EQUAL(tips[1].m_lastShownTime.time_since_epoch().count(), 0, ());
-    TEST_EQUAL(tips[1].m_type, Tip::Type::MapsLayers, ());
+    TEST_EQUAL(tips[1].m_type, Tip::Type::PublicTransport, ());
     TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::GotitClicked), 0, ());
     TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::ActionClicked), 1, ());
     TEST_NOT_EQUAL(lastShownTipTime.time_since_epoch().count(), 0, ());
@@ -135,7 +135,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, AppendTipTest)
     prevShowTime = lastShownTipTime;
   }
   {
-    EyeForTesting::AppendTip(Tip::Type::MapsLayers, Tip::Event::GotitClicked);
+    EyeForTesting::AppendTip(Tip::Type::PublicTransport, Tip::Event::GotitClicked);
 
     auto const info = Eye::Instance().GetInfo();
     auto const & tips = info->m_tips;
@@ -143,7 +143,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, AppendTipTest)
 
     TEST_EQUAL(tips.size(), 2, ());
     TEST_NOT_EQUAL(tips[1].m_lastShownTime.time_since_epoch().count(), 0, ());
-    TEST_EQUAL(tips[1].m_type, Tip::Type::MapsLayers, ());
+    TEST_EQUAL(tips[1].m_type, Tip::Type::PublicTransport, ());
     TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::GotitClicked), 1, ());
     TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::ActionClicked), 1, ());
     TEST_NOT_EQUAL(lastShownTipTime.time_since_epoch().count(), 0, ());