pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[core] simple caching address getter is added

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-02-06 12:43:26 +03:00 • committed by Aleksandr Zatsepin
parent afa8a90026
commit c800cf47f3
9 changed files with 57 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
map/CMakeLists.txt
View file

@ -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

37
map/caching_address_getter.hpp Normal file
View file

@ -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;
};

6
map/framework.cpp
View file

@ -385,7 +385,7 @@ void Framework::Migrate(bool keepDownloaded)
RegisterAllMaps();
m_notificationManager.SetDelegate(
std::make_unique<NotificationManagerDelegate>(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<NotificationManagerDelegate>(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

2
map/framework.hpp
View file

@ -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<search::CityFinder> m_cityFinder;
CachingAddressGetter m_addressGetter;
unique_ptr<ads::Engine> m_adsEngine;
// The order matters here: storage::CountryInfoGetter and
// search::CityFinder must be initialized before

10
map/notifications/notification_manager_delegate.cpp
View file

@ -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);

4
map/notifications/notification_manager_delegate.hpp
View file

@ -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;
};
}

17
map/utils.cpp
View file

@ -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

6
map/utils.hpp
View file

@ -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

4
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
3DD692AE2209E272001C3C62 /* notification_manager_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_manager_delegate.hpp; sourceTree = "<group>"; };
3DD692AF2209E272001C3C62 /* notification_manager_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_manager_delegate.cpp; sourceTree = "<group>"; };
3DD692B2220AD240001C3C62 /* caching_address_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = caching_address_getter.hpp; sourceTree = "<group>"; };
3DEE1ADA21EE03B400054A91 /* power_management_schemas.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = power_management_schemas.hpp; sourceTree = "<group>"; };
3DEE1ADB21EE03B400054A91 /* power_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = power_manager.hpp; sourceTree = "<group>"; };
3DEE1ADC21EE03B400054A91 /* power_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = power_manager.cpp; sourceTree = "<group>"; };
@ -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 */,