From f44435a7f8719caf33924ad04368353dcff6cb50 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Thu, 7 Feb 2019 14:26:29 +0300
Subject: [PATCH] notifications] review fixes

---
 map/caching_address_getter.hpp                      | 13 +++++--------
 map/notifications/notification_manager.hpp          |  1 -
 map/notifications/notification_manager_delegate.cpp |  2 +-
 map/notifications/notification_manager_delegate.hpp |  6 ++++--
 map/notifications/notification_queue.cpp            |  2 +-
 map/utils.hpp                                       |  2 --
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/map/caching_address_getter.hpp b/map/caching_address_getter.hpp
index ecbc4c7239..9668639306 100644
--- a/map/caching_address_getter.hpp
+++ b/map/caching_address_getter.hpp
@@ -2,6 +2,8 @@
 
 #include "search/reverse_geocoder.hpp"
 
+// TODO: get rid of this class when version 8.6 will not be supported.
+// TODO: because of fast algorithm and new mwm section which were implemented for 9.0.
 // Note: this class is NOT thread-safe.
 class CachingAddressGetter
 {
@@ -9,20 +11,15 @@ public:
   search::ReverseGeocoder::Address GetAddressAtPoint(DataSource const & dataSource,
                                                      m2::PointD const & pt) const
   {
-    if (pt == m_cache.m_point)
+    if (pt.EqualDxDy(m_cache.m_point, kMwmPointAccuracy))
       return m_cache.m_address;
 
     double const kDistanceThresholdMeters = 0.5;
     m_cache.m_point = pt;
+    m_cache.m_address = {};
 
     search::ReverseGeocoder const coder(dataSource);
-    search::ReverseGeocoder::Address address;
-    coder.GetNearbyAddress(pt, m_cache.m_address);
-
-    // We do not init nearby address info for points that are located
-    // outside of the nearby building.
-    if (address.GetDistance() >= kDistanceThresholdMeters)
-      m_cache.m_address = {};
+    coder.GetNearbyAddress(pt, kDistanceThresholdMeters, m_cache.m_address);
 
     return m_cache.m_address;
   }
diff --git a/map/notifications/notification_manager.hpp b/map/notifications/notification_manager.hpp
index bad68ea5f0..07fd4f0295 100644
--- a/map/notifications/notification_manager.hpp
+++ b/map/notifications/notification_manager.hpp
@@ -11,7 +11,6 @@
 #include <string>
 
 #include <boost/optional.hpp>
-#include <search/reverse_geocoder.hpp>
 
 namespace notifications
 {
diff --git a/map/notifications/notification_manager_delegate.cpp b/map/notifications/notification_manager_delegate.cpp
index 4f6abd3f12..0edf049b00 100644
--- a/map/notifications/notification_manager_delegate.cpp
+++ b/map/notifications/notification_manager_delegate.cpp
@@ -30,7 +30,7 @@ ugc::Api & NotificationManagerDelegate::GetUGCApi()
   return m_ugcApi;
 }
 
-string NotificationManagerDelegate::GetAddress(m2::PointD const & pt)
+std::string NotificationManagerDelegate::GetAddress(m2::PointD const & pt)
 {
   auto const address = m_addressGetter.GetAddressAtPoint(m_dataSource, pt).FormatAddress();
   auto const langIndex = StringUtf8Multilang::GetLangIndex(languages::GetCurrentNorm());
diff --git a/map/notifications/notification_manager_delegate.hpp b/map/notifications/notification_manager_delegate.hpp
index 7acf357f7d..18f160599b 100644
--- a/map/notifications/notification_manager_delegate.hpp
+++ b/map/notifications/notification_manager_delegate.hpp
@@ -4,6 +4,8 @@
 
 #include "geometry/point2d.hpp"
 
+#include <string>
+
 class DataSource;
 class CachingAddressGetter;
 
@@ -27,7 +29,7 @@ public:
 
   // NotificationManager::Delegate overrides:
   ugc::Api & GetUGCApi() override;
-  string GetAddress(m2::PointD const & pt) override;
+  std::string GetAddress(m2::PointD const & pt) override;
 
 private:
   DataSource const & m_dataSource;
@@ -35,4 +37,4 @@ private:
   CachingAddressGetter & m_addressGetter;
   ugc::Api & m_ugcApi;
 };
-}
+}  // namespace notifications
diff --git a/map/notifications/notification_queue.cpp b/map/notifications/notification_queue.cpp
index e7b5c842c0..bad262dafa 100644
--- a/map/notifications/notification_queue.cpp
+++ b/map/notifications/notification_queue.cpp
@@ -5,7 +5,7 @@
 namespace notifications
 {
 NotificationCandidate::NotificationCandidate(Type type)
-  : m_type(NotificationCandidate::Type::UgcReview)
+  : m_type(type)
   , m_created(Clock::now())
 {
 }
diff --git a/map/utils.hpp b/map/utils.hpp
index f791c1921b..b3d4c8589b 100644
--- a/map/utils.hpp
+++ b/map/utils.hpp
@@ -2,8 +2,6 @@
 
 #include "metrics/eye_info.hpp"
 
-#include "geometry/point2d.hpp"
-
 namespace place_page
 {
 class Info;