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

[booking] Hidden loading of booking deals in filters is suppressed when network policy is not allowed.

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-07-31 13:47:51 +03:00
parent d801f165f5
commit 7f23a22464
2 changed files with 44 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/com/mapswithme/maps/SearchEngine.cpp
View file

@ -12,6 +12,8 @@
#include "search/mode.hpp"
#include "search/result.hpp"
#include "platform/network_policy.hpp"
#include "base/assert.hpp"
#include "base/logging.hpp"
@ -532,7 +534,7 @@ public:
{
result = BuildAvailability(env, bookingFilterParams);
}
else
else if (platform::GetCurrentNetworkPolicy().CanUse())
{
result = g_framework->NativeFramework()->GetLastBookingAvailabilityParams();
if (result.IsEmpty())

65
iphone/Maps/Core/Search/MWMSearch.mm
View file

@ -9,12 +9,18 @@
#include "Framework.h"
#include "partners_api/booking_availability_params.hpp"
#include "partners_api/ads_engine.hpp"
#include "map/everywhere_search_params.hpp"
#include "map/viewport_search_params.hpp"
#include "map/booking_filter_params.hpp"
#include "platform/network_policy.hpp"
#include <chrono>
#include <memory>
#include <utility>
extern NSString * const kLuggageCategory;
@ -23,6 +29,36 @@ namespace
{
using Observer = id<MWMSearchObserver>;
using Observers = NSHashTable<Observer>;
booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params && availabilityParams)
{
booking::filter::Tasks tasks;
if (availabilityParams.IsEmpty())
{
if (!platform::GetCurrentNetworkPolicy().CanUse())
return {};
auto params = GetFramework().GetLastBookingAvailabilityParams();
if (params.IsEmpty())
params = booking::AvailabilityParams::MakeDefault();
params.m_dealsOnly = true;
booking::filter::Params dp(std::make_shared<booking::AvailabilityParams>(params), {});
tasks.EmplaceBack(booking::filter::Type::Deals, move(dp));
}
else
{
booking::AvailabilityParams dp;
dp.Set(*(availabilityParams.m_apiParams));
dp.m_dealsOnly = true;
booking::filter::Params dealsParams(std::make_shared<booking::AvailabilityParams>(dp), {});
tasks.EmplaceBack(booking::filter::Type::Availability, std::move(availabilityParams));
tasks.EmplaceBack(booking::filter::Type::Deals, std::move(dealsParams));
}
return tasks;
}
} // namespace
@interface MWMSearch ()<MWMFrameworkDrapeObserver>
@ -152,31 +188,12 @@ using Observers = NSHashTable<Observer>;
shared_ptr<search::hotels_filter::Rule> const hotelsRules = self.filter ? [self.filter rules] : nullptr;
m_viewportParams.m_hotelsFilter = hotelsRules;
m_everywhereParams.m_hotelsFilter = hotelsRules;
auto availabilityParams =
self.filter ? [self.filter availabilityParams] : booking::filter::Params();
booking::filter::Tasks tasks;
if (availabilityParams.IsEmpty())
{
auto params = GetFramework().GetLastBookingAvailabilityParams();
if (params.IsEmpty())
params = booking::AvailabilityParams::MakeDefault();
params.m_dealsOnly = true;
booking::filter::Params dp(std::make_shared<booking::AvailabilityParams>(params), {});
tasks.EmplaceBack(booking::filter::Type::Deals, move(dp));
}
else
{
booking::AvailabilityParams dp;
dp.Set(*(availabilityParams.m_apiParams));
dp.m_dealsOnly = true;
booking::filter::Params dealsParams(std::make_shared<booking::AvailabilityParams>(dp), {});
tasks.EmplaceBack(booking::filter::Type::Availability, std::move(availabilityParams));
tasks.EmplaceBack(booking::filter::Type::Deals, std::move(dealsParams));
}
auto availabilityParams =
self.filter ? [self.filter availabilityParams] : booking::filter::Params();
auto const tasks = MakeBookingFilterTasks(std::move(availabilityParams));
m_viewportParams.m_bookingFilterTasks = tasks;
m_everywhereParams.m_bookingFilterTasks = tasks;
}