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

[ads] banner absence is fixed when user position is not found

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-08-28 19:32:28 +03:00 • committed by Maksim Andrianov
parent 893f21742d
commit b57b6a480f
6 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
partners_api/ads/ads_base.cpp
View file

@ -90,20 +90,30 @@ std::string DownloadOnMapContainer::GetBanner(storage::CountryId const & country
std::optional<m2::PointD> const & userPos,
std::string const & userLanguage) const
{
if (!userPos || !HasBanner(countryId, *userPos, userLanguage))
if (!HasBanner(countryId, userPos, userLanguage))
return {};
return GetBannerInternal();
}
bool DownloadOnMapContainer::HasBanner(storage::CountryId const & countryId,
m2::PointD const & userPos,
std::optional<m2::PointD> const & userPos,
std::string const & userLanguage) const
{
storage::CountriesVec userPosCountries;
auto const userPosCountryId = m_delegate.GetCountryId(userPos);
userPosCountries.emplace_back(userPosCountryId);
userPosCountries.emplace_back(m_delegate.GetTopmostParentFor(userPosCountryId));
if (userPos)
{
auto const userPosCountryId = m_delegate.GetCountryId(*userPos);
userPosCountries.emplace_back(userPosCountryId);
userPosCountries.emplace_back(m_delegate.GetTopmostParentFor(userPosCountryId));
}
bool isUserPosSupported =
(userPosCountries.empty() && IsUserPosCountrySupported("")) ||
std::any_of(userPosCountries.begin(), userPosCountries.end(),
[this](auto const & id) { return IsUserPosCountrySupported(id); });
if (!isUserPosSupported)
return false;
storage::CountriesVec downloadMwmCountries;
downloadMwmCountries.emplace_back(countryId);
@ -113,8 +123,6 @@ bool DownloadOnMapContainer::HasBanner(storage::CountryId const & countryId,
[this](auto const & id) { return IsUserPosCountryExcluded(id); }) &&
!std::any_of(downloadMwmCountries.begin(), downloadMwmCountries.end(),
[this](auto const & id) { return IsCountryExcluded(id); }) &&
std::any_of(userPosCountries.begin(), userPosCountries.end(),
[this](auto const & id) { return IsUserPosCountrySupported(id); }) &&
std::any_of(downloadMwmCountries.begin(), downloadMwmCountries.end(),
[this](auto const & id) { return IsCountrySupported(id); }) &&
IsLanguageSupported(userLanguage);

4
partners_api/ads/ads_base.hpp
View file

@ -108,8 +108,8 @@ protected:
Delegate & m_delegate;
private:
virtual bool HasBanner(storage::CountryId const & countryId, m2::PointD const & userPos,
std::string const & userLanguage) const;
bool HasBanner(storage::CountryId const & countryId, std::optional<m2::PointD> const & userPos,
std::string const & userLanguage) const;
virtual std::string GetBannerInternal() const;
DISALLOW_COPY(DownloadOnMapContainer);

5
partners_api/partners_api_tests/mastercard_sberbank_tests.cpp
View file

@ -15,6 +15,11 @@ UNIT_TEST(MastercardSberbank_GetBanner)
auto const banner = masterSber.GetBanner("Russia_Tambov Oblast", point, "ru");
TEST(!banner.empty(), ());
}
{
delegate.SetTopmostParent("Russian Federation");
auto const banner = masterSber.GetBanner("Russia_Tambov Oblast", {}, "ru");
TEST(!banner.empty(), ());
}
{
delegate.SetTopmostParent("United States of America");
auto const banner = masterSber.GetBanner("US_North Carolina_Raleigh", point, "ru");

4
partners_api/partners_api_tests/skyeng_tests.cpp
View file

@ -18,6 +18,10 @@ UNIT_TEST(Skyeng_GetBanner)
auto const banner = skyeng.GetBanner("US_North Carolina_Raleigh", point, "ru");
TEST(!banner.empty(), ());
}
{
auto const banner = skyeng.GetBanner("US_North Carolina_Raleigh", {}, "ru");
TEST(!banner.empty(), ());
}
{
auto const banner = skyeng.GetBanner("Russia_Tambov Oblast", point, "en");
TEST(banner.empty(), ());

6
partners_api/partners_api_tests/tinkoff_airlines_tests.cpp
View file

@ -22,6 +22,12 @@ UNIT_TEST(TinkoffAirlines_GetBanner)
auto const banner = tinkoffAirlines.GetBanner("", point, "ru");
TEST(banner.empty(), ());
}
{
delegate.SetTopmostParent("Germany");
delegate.SetCountryId("Russian Federation");
auto const banner = tinkoffAirlines.GetBanner("", {}, "ru");
TEST(banner.empty(), ());
}
{
delegate.SetTopmostParent("Germany");
delegate.SetCountryId("Russian Federation");

6
partners_api/partners_api_tests/tinkoff_insurance_tests.cpp
View file

@ -21,6 +21,12 @@ UNIT_TEST(TinkoffInsurance_GetBanner)
auto const banner = tinkoffInsurance.GetBanner("", point, "ru");
TEST(!banner.empty(), ());
}
{
delegate.SetTopmostParent("France");
delegate.SetCountryId("Russian Federation");
auto const banner = tinkoffInsurance.GetBanner("", {}, "ru");
TEST(banner.empty(), ());
}
{
delegate.SetTopmostParent("France");
delegate.SetCountryId("Russian Federation");