From 3c85bb6b5596e9fd770db17ec8e0e1dc0a2bc4f0 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Tue, 4 Aug 2020 14:09:49 +0300
Subject: [PATCH] [booking] unused parameters are removed

---
 map/booking_utils.cpp | 15 +++++----------
 map/booking_utils.hpp | 12 ++----------
 map/framework.cpp     |  4 ++--
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/map/booking_utils.cpp b/map/booking_utils.cpp
index 99af7f2242..fb3e70cec8 100644
--- a/map/booking_utils.cpp
+++ b/map/booking_utils.cpp
@@ -12,6 +12,7 @@
 
 #include <algorithm>
 #include <utility>
+#include <vector>
 
 namespace booking
 {
@@ -81,8 +82,7 @@ void SetUnavailable(std::vector<FeatureID> const & filteredOut, SearchMarks & se
 }
 }  // namespace
 
-filter::TasksInternal MakeInternalTasks(search::Results const & results,
-                                        filter::Tasks const & filterTasks,
+filter::TasksInternal MakeInternalTasks(filter::Tasks const & filterTasks,
                                         SearchMarks & searchMarks, bool inViewport)
 {
   using namespace booking::filter;
@@ -101,7 +101,7 @@ filter::TasksInternal MakeInternalTasks(search::Results const & results,
     ParamsInternal paramsInternal
       {
         apiParams,
-        [results, &searchMarks, type, apiParams, cb, inViewport](ResultInternal<search::Results> && result)
+        [&searchMarks, type, apiParams, cb, inViewport](ResultInternal<search::Results> && result)
         {
           if (type == Type::Availability)
             SetUnavailable(result.m_filteredOut, searchMarks);
@@ -147,16 +147,13 @@ filter::TasksInternal MakeInternalTasks(search::Results const & results,
   return tasksInternal;
 }
 
-filter::TasksRawInternal MakeInternalTasks(std::vector<FeatureID> const & features,
-                                           filter::Tasks const & filterTasks,
+filter::TasksRawInternal MakeInternalTasks(filter::Tasks const & filterTasks,
                                            SearchMarks & searchMarks)
 {
   using namespace booking::filter;
 
   TasksRawInternal tasksInternal;
 
-  ASSERT(std::is_sorted(features.cbegin(), features.cend()), ());
-
   for (auto const & task : filterTasks)
   {
     auto const type = task.m_type;
@@ -169,7 +166,7 @@ filter::TasksRawInternal MakeInternalTasks(std::vector<FeatureID> const & featur
     ParamsRawInternal paramsInternal
       {
         apiParams,
-        [features, &searchMarks, type, apiParams, cb](ResultInternal<std::vector<FeatureID>> && result)
+        [&searchMarks, type, apiParams, cb](ResultInternal<std::vector<FeatureID>> && result)
         {
           if (type == Type::Availability)
             SetUnavailable(result.m_filteredOut, searchMarks);
@@ -177,8 +174,6 @@ filter::TasksRawInternal MakeInternalTasks(std::vector<FeatureID> const & featur
           auto & sortedFeatures = result.m_passedFilter;
           auto & extras = result.m_extras;
 
-          ASSERT(std::is_sorted(features.cbegin(), features.cend()), ());
-
           if (sortedFeatures.empty())
             return;
 
diff --git a/map/booking_utils.hpp b/map/booking_utils.hpp
index f80a8ab4d0..20607d868e 100644
--- a/map/booking_utils.hpp
+++ b/map/booking_utils.hpp
@@ -3,24 +3,16 @@
 #include "map/booking_filter_params.hpp"
 
 #include <string>
-#include <vector>
 
 struct FeatureID;
 
 class SearchMarks;
 
-namespace search
-{
-class Results;
-}
-
 namespace booking
 {
-filter::TasksInternal MakeInternalTasks(search::Results const & results,
-                                        filter::Tasks const & filterTasks,
+filter::TasksInternal MakeInternalTasks(filter::Tasks const & filterTasks,
                                         SearchMarks & searchMarks, bool inViewport);
-filter::TasksRawInternal MakeInternalTasks(std::vector<FeatureID> const & features,
-                                           filter::Tasks const & filterTasks,
+filter::TasksRawInternal MakeInternalTasks(filter::Tasks const & filterTasks,
                                            SearchMarks & searchMarks);
 class PriceFormatter
 {
diff --git a/map/framework.cpp b/map/framework.cpp
index dcf52f7902..02837e1eb9 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -4266,14 +4266,14 @@ ugc::Reviews Framework::FilterUGCReviews(ugc::Reviews const & reviews) const
 void Framework::FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
                                             search::Results const & results, bool inViewport)
 {
-  auto tasksInternal = booking::MakeInternalTasks(results, filterTasks, m_searchMarks, inViewport);
+  auto tasksInternal = booking::MakeInternalTasks(filterTasks, m_searchMarks, inViewport);
   m_bookingFilterProcessor.ApplyFilters(results, move(tasksInternal), filterTasks.GetMode());
 }
 
 void Framework::FilterHotels(booking::filter::Tasks const & filterTasks,
                              vector<FeatureID> && featureIds)
 {
-  auto tasksInternal = booking::MakeInternalTasks(featureIds, filterTasks, m_searchMarks);
+  auto tasksInternal = booking::MakeInternalTasks(filterTasks, m_searchMarks);
   m_bookingFilterProcessor.ApplyFilters(move(featureIds), move(tasksInternal),
                                         filterTasks.GetMode());
 }