diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index 8a2aaa9dc1..fa8f06e906 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -31,6 +31,7 @@ set( bookmark_manager.cpp bookmark_manager.hpp bookmarks_search_params.hpp + caching_address_getter.hpp chart_generator.cpp chart_generator.hpp cloud.cpp diff --git a/map/caching_address_getter.hpp b/map/caching_address_getter.hpp new file mode 100644 index 0000000000..ecbc4c7239 --- /dev/null +++ b/map/caching_address_getter.hpp @@ -0,0 +1,37 @@ +#pragma once + +#include "search/reverse_geocoder.hpp" + +// Note: this class is NOT thread-safe. +class CachingAddressGetter +{ +public: + search::ReverseGeocoder::Address GetAddressAtPoint(DataSource const & dataSource, + m2::PointD const & pt) const + { + if (pt == m_cache.m_point) + return m_cache.m_address; + + double const kDistanceThresholdMeters = 0.5; + m_cache.m_point = pt; + + 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 = {}; + + return m_cache.m_address; + } +private: + struct Cache + { + m2::PointD m_point; + search::ReverseGeocoder::Address m_address; + }; + + mutable Cache m_cache; +}; diff --git a/map/framework.cpp b/map/framework.cpp index 3708395742..f054e987fe 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -385,7 +385,7 @@ void Framework::Migrate(bool keepDownloaded) RegisterAllMaps(); m_notificationManager.SetDelegate( std::make_unique(m_model.GetDataSource(), *m_cityFinder, - *m_ugcApi)); + m_addressGetter, *m_ugcApi)); m_trafficManager.SetCurrentDataVersion(GetStorage().GetCurrentDataVersion()); if (m_drapeEngine && m_isRenderingEnabled) @@ -554,7 +554,7 @@ Framework::Framework(FrameworkParams const & params) m_notificationManager.SetDelegate( std::make_unique(m_model.GetDataSource(), *m_cityFinder, - *m_ugcApi)); + m_addressGetter, *m_ugcApi)); m_notificationManager.Load(); m_notificationManager.TrimExpired(); @@ -815,7 +815,7 @@ void Framework::ResetBookmarkInfo(Bookmark const & bmk, place_page::Info & info) search::ReverseGeocoder::Address Framework::GetAddressAtPoint(m2::PointD const & pt) const { - return utils::GetAddressAtPoint(m_model.GetDataSource(), pt); + return m_addressGetter.GetAddressAtPoint(m_model.GetDataSource(), pt); } void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info) const diff --git a/map/framework.hpp b/map/framework.hpp index 60a8bcfcaf..f6c6b178c7 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -5,6 +5,7 @@ #include "map/booking_filter_processor.hpp" #include "map/bookmark.hpp" #include "map/bookmark_manager.hpp" +#include "map/caching_address_getter.hpp" #include "map/discovery/discovery_manager.hpp" #include "map/displacement_mode_manager.hpp" #include "map/feature_vec_model.hpp" @@ -857,6 +858,7 @@ public: private: unique_ptr m_cityFinder; + CachingAddressGetter m_addressGetter; unique_ptr m_adsEngine; // The order matters here: storage::CountryInfoGetter and // search::CityFinder must be initialized before diff --git a/map/notifications/notification_manager_delegate.cpp b/map/notifications/notification_manager_delegate.cpp index 52d16ab5fe..4f6abd3f12 100644 --- a/map/notifications/notification_manager_delegate.cpp +++ b/map/notifications/notification_manager_delegate.cpp @@ -2,7 +2,7 @@ #include "ugc/api.hpp" -#include "map/utils.hpp" +#include "map/caching_address_getter.hpp" #include "search/city_finder.hpp" @@ -16,8 +16,12 @@ namespace notifications { NotificationManagerDelegate::NotificationManagerDelegate(DataSource const & dataSource, search::CityFinder & cityFinder, + CachingAddressGetter & addressGetter, ugc::Api & ugcApi) - : m_dataSource(dataSource), m_cityFinder(cityFinder), m_ugcApi(ugcApi) + : m_dataSource(dataSource) + , m_cityFinder(cityFinder) + , m_addressGetter(addressGetter) + , m_ugcApi(ugcApi) { } @@ -28,7 +32,7 @@ ugc::Api & NotificationManagerDelegate::GetUGCApi() string NotificationManagerDelegate::GetAddress(m2::PointD const & pt) { - auto const address = utils::GetAddressAtPoint(m_dataSource, pt).FormatAddress(); + auto const address = m_addressGetter.GetAddressAtPoint(m_dataSource, pt).FormatAddress(); auto const langIndex = StringUtf8Multilang::GetLangIndex(languages::GetCurrentNorm()); auto const city = m_cityFinder.GetCityName(pt, langIndex); diff --git a/map/notifications/notification_manager_delegate.hpp b/map/notifications/notification_manager_delegate.hpp index 684a50d6ff..7acf357f7d 100644 --- a/map/notifications/notification_manager_delegate.hpp +++ b/map/notifications/notification_manager_delegate.hpp @@ -5,6 +5,7 @@ #include "geometry/point2d.hpp" class DataSource; +class CachingAddressGetter; namespace search { @@ -22,7 +23,7 @@ class NotificationManagerDelegate : public NotificationManager::Delegate { public: NotificationManagerDelegate(DataSource const & dataSource, search::CityFinder & cityFinder, - ugc::Api & ugcApi); + CachingAddressGetter & addressGetter, ugc::Api & ugcApi); // NotificationManager::Delegate overrides: ugc::Api & GetUGCApi() override; @@ -31,6 +32,7 @@ public: private: DataSource const & m_dataSource; search::CityFinder & m_cityFinder; + CachingAddressGetter & m_addressGetter; ugc::Api & m_ugcApi; }; } diff --git a/map/utils.cpp b/map/utils.cpp index 69bf4650d8..2ada12633d 100644 --- a/map/utils.cpp +++ b/map/utils.cpp @@ -50,21 +50,4 @@ eye::MapObject MakeEyeMapObject(FeatureType & ft) return mapObject; } - -search::ReverseGeocoder::Address GetAddressAtPoint(DataSource const & dataSource, - m2::PointD const & pt) -{ - double const kDistanceThresholdMeters = 0.5; - - search::ReverseGeocoder const coder(dataSource); - search::ReverseGeocoder::Address address; - coder.GetNearbyAddress(pt, address); - - // We do not init nearby address info for points that are located - // outside of the nearby building. - if (address.GetDistance() < kDistanceThresholdMeters) - return address; - - return {}; -} } // namespace utils diff --git a/map/utils.hpp b/map/utils.hpp index bb0f08ba4e..f791c1921b 100644 --- a/map/utils.hpp +++ b/map/utils.hpp @@ -1,7 +1,5 @@ #pragma once -#include "search/reverse_geocoder.hpp" - #include "metrics/eye_info.hpp" #include "geometry/point2d.hpp" @@ -11,14 +9,10 @@ namespace place_page class Info; } -class DataSource; class FeatureType; namespace utils { eye::MapObject MakeEyeMapObject(place_page::Info const & info); eye::MapObject MakeEyeMapObject(FeatureType & ft); - -search::ReverseGeocoder::Address GetAddressAtPoint(DataSource const & dataSource, - m2::PointD const & pt); } // namespace utils diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 373ef1d939..6b33e14209 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -90,6 +90,7 @@ 3DD692AD2209E253001C3C62 /* notification_queue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD692AC2209E253001C3C62 /* notification_queue.cpp */; }; 3DD692B02209E272001C3C62 /* notification_manager_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD692AE2209E272001C3C62 /* notification_manager_delegate.hpp */; }; 3DD692B12209E272001C3C62 /* notification_manager_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD692AF2209E272001C3C62 /* notification_manager_delegate.cpp */; }; + 3DD692B3220AD240001C3C62 /* caching_address_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD692B2220AD240001C3C62 /* caching_address_getter.hpp */; }; 3DEE1ADE21EE03B400054A91 /* power_management_schemas.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DEE1ADA21EE03B400054A91 /* power_management_schemas.hpp */; }; 3DEE1ADF21EE03B400054A91 /* power_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DEE1ADB21EE03B400054A91 /* power_manager.hpp */; }; 3DEE1AE021EE03B400054A91 /* power_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DEE1ADC21EE03B400054A91 /* power_manager.cpp */; }; @@ -332,6 +333,7 @@ 3DD692AC2209E253001C3C62 /* notification_queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_queue.cpp; sourceTree = ""; }; 3DD692AE2209E272001C3C62 /* notification_manager_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_manager_delegate.hpp; sourceTree = ""; }; 3DD692AF2209E272001C3C62 /* notification_manager_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_manager_delegate.cpp; sourceTree = ""; }; + 3DD692B2220AD240001C3C62 /* caching_address_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = caching_address_getter.hpp; sourceTree = ""; }; 3DEE1ADA21EE03B400054A91 /* power_management_schemas.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = power_management_schemas.hpp; sourceTree = ""; }; 3DEE1ADB21EE03B400054A91 /* power_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = power_manager.hpp; sourceTree = ""; }; 3DEE1ADC21EE03B400054A91 /* power_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = power_manager.cpp; sourceTree = ""; }; @@ -791,6 +793,7 @@ 675345BD1A4054AD00A0A8C3 /* map */ = { isa = PBXGroup; children = ( + 3DD692B2220AD240001C3C62 /* caching_address_getter.hpp */, 3DEE1AD921EE03B400054A91 /* power_management */, 45201E921CE4AC90008A4842 /* api_mark_point.cpp */, 34921F611BFA0A6900737D6E /* api_mark_point.hpp */, @@ -964,6 +967,7 @@ BBFC7E3B202D29C000531BE7 /* user_mark_layer.hpp in Headers */, 3D4E99A51FB4A6410025B48C /* booking_filter.hpp in Headers */, 56C116612090E5670068BBC0 /* extrapolator.hpp in Headers */, + 3DD692B3220AD240001C3C62 /* caching_address_getter.hpp in Headers */, 3D62CBDA20FF6C8B00E7BB6E /* discovery_search.hpp in Headers */, 3DD1166C21888AAD007A2ED4 /* notification_queue_serdes.hpp in Headers */, 675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */,