From 1d92900842d287117960a8a3c4a0ed829d2f754b Mon Sep 17 00:00:00 2001 From: vng Date: Sun, 21 Mar 2021 18:21:30 +0300 Subject: [PATCH] Fixed overhead bug with lightweight CountryInfoGetter. Signed-off-by: vng --- map/framework_light.hpp | 12 +++++++++--- routing/routes_builder/routes_builder.hpp | 1 - storage/country_info_reader_light.cpp | 3 +++ storage/country_info_reader_light.hpp | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/map/framework_light.hpp b/map/framework_light.hpp index dde8a93db4..dc1f1c88f7 100644 --- a/map/framework_light.hpp +++ b/map/framework_light.hpp @@ -40,9 +40,12 @@ enum RequestType using RequestTypeMask = unsigned; -// A class which allows you to acquire data in a synchronous way. -// The common use case is to create an instance of Framework -// with specified mask, acquire data according to the mask and destroy the instance. +/** @brief A class which allows you to acquire data in a synchronous way. + * The common use case is to create an instance of Framework + * with specified mask, acquire data according to the mask and destroy the instance. + * @note Seems like we can delete it, at first sight 'lightweight' used only in tracking, + * but the class looks usefull itself (comparing with heavy ::Framework). + */ class Framework { @@ -63,7 +66,10 @@ public: size_t GetNumberOfUnsentUGC() const; size_t GetNumberOfUnsentEdits() const; bool IsBookmarksCloudEnabled() const; + + /// @note Be careful here, because "lightweight" has no region's geometry cache. CountryInfoReader::Info GetLocation(m2::PointD const & pt) const; + std::vector GetLocalAdsFeatures(double lat, double lon, double radiusInMeters, uint32_t maxCount); Statistics * GetLocalAdsStatistics(); diff --git a/routing/routes_builder/routes_builder.hpp b/routing/routes_builder/routes_builder.hpp index b5fbfa4681..f05ca41cdd 100644 --- a/routing/routes_builder/routes_builder.hpp +++ b/routing/routes_builder/routes_builder.hpp @@ -12,7 +12,6 @@ #include "traffic/traffic_cache.hpp" #include "storage/country_info_getter.hpp" -#include "storage/country_info_reader_light.hpp" #include "storage/country_parent_getter.hpp" #include "routing_common/num_mwm_id.hpp" diff --git a/storage/country_info_reader_light.cpp b/storage/country_info_reader_light.cpp index 6564a2a021..f599b3e33f 100644 --- a/storage/country_info_reader_light.cpp +++ b/storage/country_info_reader_light.cpp @@ -59,6 +59,9 @@ void CountryInfoReader::LoadRegionsFromDisk(size_t id, std::vector bool CountryInfoReader::BelongsToRegion(m2::PointD const & pt, size_t id) const { + if (!m_countries[id].m_rect.IsPointInside(pt)) + return false; + std::vector regions; LoadRegionsFromDisk(id, regions); diff --git a/storage/country_info_reader_light.hpp b/storage/country_info_reader_light.hpp index dc23f4a6a4..70e4a23df2 100644 --- a/storage/country_info_reader_light.hpp +++ b/storage/country_info_reader_light.hpp @@ -16,7 +16,6 @@ namespace lightweight { -// Protected inheritance for test purposes only. class CountryInfoReader : protected storage::CountryInfoGetterBase { public: @@ -27,6 +26,7 @@ public: }; CountryInfoReader(); + /// @note Be careful here, because "lightweight" has no region's geometry cache. Info GetMwmInfo(m2::PointD const & pt) const; protected: