diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index edfbedeaec..c5a933e4ad 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -528,11 +528,9 @@ public: } else { - // Use tomorrow and day after tomorrow by default. - result.m_checkin = booking::AvailabilityParams::Clock::now() + chrono::hours(24); - result.m_checkout = booking::AvailabilityParams::Clock::now() + chrono::hours(48); - // Use two adults without children. - result.m_rooms.emplace_back(2, -1); + result = g_framework->NativeFramework()->GetLastBookingAvailabilityParams(); + if (result.IsEmpty()) + result = booking::AvailabilityParams::MakeDefault(); } result.m_dealsOnly = true; diff --git a/android/jni/com/mapswithme/maps/SearchEngine.hpp b/android/jni/com/mapswithme/maps/SearchEngine.hpp index ac2ee53148..521b510324 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.hpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.hpp @@ -2,9 +2,8 @@ #include "com/mapswithme/core/jni_helper.hpp" -#include "search/result.hpp" - #include "map/everywhere_search_callback.hpp" +#include "search/result.hpp" #include diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 403b541558..5ec7016554 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -154,12 +154,9 @@ using Observers = NSHashTable; booking::filter::Tasks tasks; if (availabilityParams.IsEmpty()) { - booking::AvailabilityParams params; - // Use tomorrow and day after tomorrow by default. - params.m_checkin = booking::AvailabilityParams::Clock::now() + std::chrono::hours(24); - params.m_checkout = booking::AvailabilityParams::Clock::now() + std::chrono::hours(48); - // Use two adults without children. - params.m_rooms.emplace_back(2, -1); + auto params = GetFramework().GetLastBookingAvailabilityParams(); + if (params.IsEmpty()) + params = booking::AvailabilityParams::MakeDefault(); params.m_dealsOnly = true; booking::filter::Params dp(std::make_shared(params), {}); diff --git a/map/booking_filter_params.hpp b/map/booking_filter_params.hpp index f99acdbdb1..8b317db885 100644 --- a/map/booking_filter_params.hpp +++ b/map/booking_filter_params.hpp @@ -70,8 +70,12 @@ using TaskInternal = TaskImpl; enum ApplyMode { + /// Apply filters independently on provided list of search results. + /// Every filter will be applied on own copy of search results. Independent, - Consecutively + /// Apply each filter one by one on provided list of search results. + /// All filters will be applied on joint copy of search results. + Consecutive }; template diff --git a/map/booking_filter_processor.cpp b/map/booking_filter_processor.cpp index 247738e2ea..ea285e439b 100644 --- a/map/booking_filter_processor.cpp +++ b/map/booking_filter_processor.cpp @@ -24,8 +24,8 @@ void FilterProcessor::ApplyFilters(search::Results const & results, TasksInterna switch (mode) { - case Independent: ApplyIndependent(results, tasks); break; - case Consecutively: ApplyConsecutively(results, tasks); break; + case Independent: ApplyIndependently(results, tasks); break; + case Consecutive: ApplyConsecutively(results, tasks); break; } }); } @@ -71,7 +71,7 @@ void FilterProcessor::ApplyConsecutively(search::Results const & results, TasksI auto const & cb = tasks[i - 1].m_filterParams.m_callback; tasks[i - 1].m_filterParams.m_callback = - [ this, cb, nextTask = std::move(tasks[i]) ](search::Results const & results) mutable + [this, cb, nextTask = std::move(tasks[i])](search::Results const & results) mutable { cb(results); // Run the next filter with obtained results from the previous one. @@ -82,16 +82,15 @@ void FilterProcessor::ApplyConsecutively(search::Results const & results, TasksI }); }; } - // Run first filter. + // Run the first filter. m_filters.at(tasks.front().m_type)->ApplyFilter(results, tasks.front().m_filterParams); } -void FilterProcessor::ApplyIndependent(search::Results const & results, TasksInternal const & tasks) +void FilterProcessor::ApplyIndependently(search::Results const & results, + TasksInternal const & tasks) { for (auto const & task : tasks) - { m_filters.at(task.m_type)->ApplyFilter(results, task.m_filterParams); - } } } // namespace filter } // namespace booking diff --git a/map/booking_filter_processor.hpp b/map/booking_filter_processor.hpp index 245002a6f1..a356cef8bc 100644 --- a/map/booking_filter_processor.hpp +++ b/map/booking_filter_processor.hpp @@ -46,7 +46,7 @@ public: private: void ApplyConsecutively(search::Results const & results, TasksInternal & tasks); - void ApplyIndependent(search::Results const & results, TasksInternal const & tasks); + void ApplyIndependently(search::Results const & results, TasksInternal const & tasks); Index const & m_index; Api const & m_api; diff --git a/map/everywhere_search_callback.cpp b/map/everywhere_search_callback.cpp index b66557490e..61c9c097bd 100644 --- a/map/everywhere_search_callback.cpp +++ b/map/everywhere_search_callback.cpp @@ -26,7 +26,7 @@ void EverywhereSearchCallback::operator()(Results const & results) if (results.IsEndedNormal() && results.GetType() == Results::Type::Hotels) { - m_delegate.FilterSearchResultsOnBooking(m_bookingFilterTasks, results, false /* inViewport */); + m_delegate.FilterResultsForHotelsQuery(m_bookingFilterTasks, results, false /* inViewport */); } ASSERT_EQUAL(m_productInfo.size(), results.GetCount(), ()); diff --git a/map/everywhere_search_callback.hpp b/map/everywhere_search_callback.hpp index 5ed2bc31f0..0b2e49075a 100644 --- a/map/everywhere_search_callback.hpp +++ b/map/everywhere_search_callback.hpp @@ -23,8 +23,8 @@ public: virtual ~Delegate() = default; virtual ProductInfo GetProductInfo(Result const & result) const = 0; - virtual void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) = 0; + virtual void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) = 0; }; EverywhereSearchCallback(Delegate & delegate, booking::filter::Tasks const & bookingFilterTasks, diff --git a/map/everywhere_search_params.hpp b/map/everywhere_search_params.hpp index 8c5808a42f..4f65f7079f 100644 --- a/map/everywhere_search_params.hpp +++ b/map/everywhere_search_params.hpp @@ -1,7 +1,6 @@ #pragma once #include "map/booking_filter_params.hpp" -#include "map/everywhere_search_callback.hpp" #include "search/hotels_filter.hpp" #include "search/result.hpp" diff --git a/map/framework.cpp b/map/framework.cpp index a2dbfa7394..24c6cdb475 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -3125,15 +3125,17 @@ void Framework::SetSearchDisplacementModeEnabled(bool enabled) SetDisplacementMode(DisplacementModeManager::SLOT_INTERACTIVE_SEARCH, enabled /* show */); } +void Framework::ShowViewportSearchResults(bool clear, search::Results::ConstIter begin, + search::Results::ConstIter end) +{ + FillSearchResultsMarks(clear, begin, end); +} + void Framework::ShowViewportSearchResults(bool clear, booking::filter::Types types, search::Results::ConstIter begin, search::Results::ConstIter end) { - if (types.empty()) - { - FillSearchResultsMarks(clear, begin, end); - return; - } + ASSERT(!types.empty(), ()); search::Results results; results.AddResultsNoChecks(begin, end); @@ -3408,8 +3410,8 @@ ugc::Reviews Framework::FilterUGCReviews(ugc::Reviews const & reviews) const return result; } -void Framework::FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) +void Framework::FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) { using namespace booking::filter; @@ -3434,9 +3436,7 @@ void Framework::FilterSearchResultsOnBooking(booking::filter::Tasks const & filt std::vector features; for (auto const & r : results) - { features.push_back(r.GetFeatureID()); - } std::sort(features.begin(), features.end()); @@ -3448,7 +3448,7 @@ void Framework::FilterSearchResultsOnBooking(booking::filter::Tasks const & filt { case Type::Deals: m_searchMarks.SetSales(features, true /* hasSale */); - break; + break; case Type::Availability: m_searchMarks.SetPreparingState(features, false /* isPreparing */); break; @@ -3475,3 +3475,8 @@ void Framework::OnBookingFilterParamsUpdate(booking::filter::Tasks const & filte m_bookingFilterProcessor.OnParamsUpdated(task.m_type, task.m_filterParams.m_apiParams); } } + +booking::AvailabilityParams Framework::GetLastBookingAvailabilityParams() const +{ + return m_bookingAvailabilityParams; +} diff --git a/map/framework.hpp b/map/framework.hpp index 0c5986a5d1..2f43d3e131 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -342,6 +342,8 @@ public: // SearchAPI::Delegate overrides: void RunUITask(function fn) override; void SetSearchDisplacementModeEnabled(bool enabled) override; + void ShowViewportSearchResults(bool clear, search::Results::ConstIter begin, + search::Results::ConstIter end) override; void ShowViewportSearchResults(bool clear, booking::filter::Types types, search::Results::ConstIter begin, search::Results::ConstIter end) override; @@ -843,10 +845,12 @@ private: ugc::Reviews FilterUGCReviews(ugc::Reviews const & reviews) const; public: - void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) override; + void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) override; void OnBookingFilterParamsUpdate(booking::filter::Tasks const & filterTasks) override; + booking::AvailabilityParams GetLastBookingAvailabilityParams() const; + private: // m_discoveryManager must be bellow m_searchApi, m_viatorApi, m_localsApi unique_ptr m_discoveryManager; diff --git a/map/map_integration_tests/CMakeLists.txt b/map/map_integration_tests/CMakeLists.txt index 76ec6b4eac..b559d8facd 100644 --- a/map/map_integration_tests/CMakeLists.txt +++ b/map/map_integration_tests/CMakeLists.txt @@ -40,4 +40,4 @@ omim_link_libraries( ${LIBZ} ) -link_qt5_core(${PROJECT_NAME}) \ No newline at end of file +link_qt5_core(${PROJECT_NAME}) diff --git a/map/map_integration_tests/interactive_search_test.cpp b/map/map_integration_tests/interactive_search_test.cpp index 41ef0df757..a92e7e9497 100644 --- a/map/map_integration_tests/interactive_search_test.cpp +++ b/map/map_integration_tests/interactive_search_test.cpp @@ -1,7 +1,7 @@ #include "testing/testing.hpp" #include "search/mode.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_results_matching.hpp" #include "search/search_tests_support/test_search_request.hpp" @@ -41,16 +41,21 @@ public: bool IsViewportSearchActive() const override { return true; } - void ShowViewportSearchResults(bool clear, booking::filter::Types /* types */, - Results::ConstIter begin, Results::ConstIter end) override + void ShowViewportSearchResults(bool clear, Results::ConstIter begin, + Results::ConstIter end) override { if (clear) m_stats.m_numShownResults = 0; m_stats.m_numShownResults += distance(begin, end); } - void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) override + void ShowViewportSearchResults(bool clear, booking::filter::Types types, + Results::ConstIter begin, Results::ConstIter end) override + { + } + + void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) override { } diff --git a/map/search_api.cpp b/map/search_api.cpp index f30297eb1a..774eb89c02 100644 --- a/map/search_api.cpp +++ b/map/search_api.cpp @@ -337,6 +337,12 @@ bool SearchAPI::IsViewportSearchActive() const return !m_searchIntents[static_cast(Mode::Viewport)].m_params.m_query.empty(); } +void SearchAPI::ShowViewportSearchResults(bool clear, Results::ConstIter begin, + Results::ConstIter end) +{ + return m_delegate.ShowViewportSearchResults(clear, begin, end); +} + void SearchAPI::ShowViewportSearchResults(bool clear, booking::filter::Types types, Results::ConstIter begin, Results::ConstIter end) { @@ -348,10 +354,10 @@ ProductInfo SearchAPI::GetProductInfo(Result const & result) const return m_delegate.GetProductInfo(result); } -void SearchAPI::FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) +void SearchAPI::FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) { - m_delegate.FilterSearchResultsOnBooking(filterTasks, results, inViewport); + m_delegate.FilterResultsForHotelsQuery(filterTasks, results, inViewport); } void SearchAPI::OnBookmarksCreated(vector> const & marks) diff --git a/map/search_api.hpp b/map/search_api.hpp index 49ce54b9d1..96a02d280e 100644 --- a/map/search_api.hpp +++ b/map/search_api.hpp @@ -53,6 +53,11 @@ public: virtual void SetSearchDisplacementModeEnabled(bool /* enabled */) {} + virtual void ShowViewportSearchResults(bool clear, search::Results::ConstIter begin, + search::Results::ConstIter end) + { + } + virtual void ShowViewportSearchResults(bool clear, booking::filter::Types types, search::Results::ConstIter begin, search::Results::ConstIter end) @@ -70,8 +75,8 @@ public: virtual double GetMinDistanceBetweenResults() const { return 0.0; }; - virtual void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) + virtual void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) { } @@ -119,12 +124,14 @@ public: void RunUITask(std::function fn) override; void SetHotelDisplacementMode() override; bool IsViewportSearchActive() const override; + void ShowViewportSearchResults(bool clear, search::Results::ConstIter begin, + search::Results::ConstIter end) override; void ShowViewportSearchResults(bool clear, booking::filter::Types types, search::Results::ConstIter begin, search::Results::ConstIter end) override; search::ProductInfo GetProductInfo(search::Result const & result) const override; - void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) override; + void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) override; void OnBookmarksCreated(std::vector> const & marks); void OnBookmarksUpdated(std::vector> const & marks); diff --git a/map/viewport_search_callback.cpp b/map/viewport_search_callback.cpp index a507ce2bd2..76d3ca6fcc 100644 --- a/map/viewport_search_callback.cpp +++ b/map/viewport_search_callback.cpp @@ -77,14 +77,23 @@ void ViewportSearchCallback::operator()(Results const & results) m_delegate.RunUITask([&delegate, firstCall, types, results, lastResultsSize]() { if (!delegate.IsViewportSearchActive()) return; - delegate.ShowViewportSearchResults(firstCall, types, results.begin() + lastResultsSize, - results.end()); + + if (types.empty()) + { + delegate.ShowViewportSearchResults(firstCall, results.begin() + lastResultsSize, + results.end()); + } + else + { + delegate.ShowViewportSearchResults(firstCall, types, results.begin() + lastResultsSize, + results.end()); + } }); } if (results.IsEndedNormal() && results.GetType() == Results::Type::Hotels) { - m_delegate.FilterSearchResultsOnBooking(m_bookingFilterTasks, results, true /* inViewport */); + m_delegate.FilterResultsForHotelsQuery(m_bookingFilterTasks, results, true /* inViewport */); } m_lastResultsSize = results.GetCount(); diff --git a/map/viewport_search_callback.hpp b/map/viewport_search_callback.hpp index 01085ed233..f7fbe8dadd 100644 --- a/map/viewport_search_callback.hpp +++ b/map/viewport_search_callback.hpp @@ -24,10 +24,12 @@ public: virtual void RunUITask(std::function fn) = 0; virtual void SetHotelDisplacementMode() = 0; virtual bool IsViewportSearchActive() const = 0; + virtual void ShowViewportSearchResults(bool clear, Results::ConstIter begin, + Results::ConstIter end) = 0; virtual void ShowViewportSearchResults(bool clear, booking::filter::Types types, Results::ConstIter begin, Results::ConstIter end) = 0; - virtual void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks, - search::Results const & results, bool inViewport) = 0; + virtual void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks, + search::Results const & results, bool inViewport) = 0; }; using OnResults = SearchParams::OnResults; diff --git a/partners_api/booking_availability_params.cpp b/partners_api/booking_availability_params.cpp index 1ab0f3471a..341e4d32da 100644 --- a/partners_api/booking_availability_params.cpp +++ b/partners_api/booking_availability_params.cpp @@ -73,6 +73,19 @@ bool AvailabilityParams::Room::operator==(AvailabilityParams::Room const & rhs) return !this->operator!=(rhs); } +// static +AvailabilityParams AvailabilityParams::MakeDefault() +{ + AvailabilityParams result; + // Use tomorrow and day after tomorrow by default. + result.m_checkin = Clock::now() + std::chrono::hours(24); + result.m_checkout = Clock::now() + std::chrono::hours(48); + // Use two adults without children. + result.m_rooms = {{2, Room::kNoChildren}}; + + return result; +} + url::Params AvailabilityParams::Get(UrlFilter const & filter /* = {} */) const { url::Params result; diff --git a/partners_api/booking_availability_params.hpp b/partners_api/booking_availability_params.hpp index 21f7f148dc..3f3bc26db9 100644 --- a/partners_api/booking_availability_params.hpp +++ b/partners_api/booking_availability_params.hpp @@ -43,6 +43,8 @@ struct AvailabilityParams : public ParamsBase using Rooms = std::vector; using Stars = std::vector; + static AvailabilityParams MakeDefault(); + using UrlFilter = std::unordered_set; base::url::Params Get(UrlFilter const & filter = {}) const; @@ -70,7 +72,7 @@ struct AvailabilityParams : public ParamsBase double m_minReviewScore = {}; /// Limit to hotels with the given number(s) of stars. Supported values 1-5. Stars m_stars; - /// Only show rates that are deals of given types. + /// Only show rates that are deals of types: smart, lastm. bool m_dealsOnly = false; }; } // namespace booking diff --git a/search/hotels_classifier.cpp b/search/hotels_classifier.cpp index 3ee7cee47f..4fb309ec5a 100644 --- a/search/hotels_classifier.cpp +++ b/search/hotels_classifier.cpp @@ -1,4 +1,5 @@ #include "search/hotels_classifier.hpp" + #include "search/result.hpp" #include "std/cstdint.hpp" @@ -9,11 +10,9 @@ namespace search bool HotelsClassifier::IsHotelResults(Results const & results) { HotelsClassifier classifier; - auto first = results.begin(); - for (; first != results.end(); ++first) - { - classifier.Add(*first); - } + for ( auto const & r : results) + classifier.Add(r); + return classifier.IsHotelResults(); } diff --git a/search/result.hpp b/search/result.hpp index 4ca69dda06..049964d93d 100644 --- a/search/result.hpp +++ b/search/result.hpp @@ -164,7 +164,7 @@ public: enum class Type { - Simple, + Default, Hotels }; @@ -222,7 +222,7 @@ public: Type GetType() const { - return m_hotelsClassif.IsHotelResults() ? Type::Hotels : Type::Simple; + return m_hotelsClassif.IsHotelResults() ? Type::Hotels : Type::Default; } private: diff --git a/search/search_integration_tests/downloader_search_test.cpp b/search/search_integration_tests/downloader_search_test.cpp index af1919cdd5..63030ba02b 100644 --- a/search/search_integration_tests/downloader_search_test.cpp +++ b/search/search_integration_tests/downloader_search_test.cpp @@ -5,7 +5,7 @@ #include "search/downloader_search_callback.hpp" #include "search/mode.hpp" #include "search/result.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_results_matching.hpp" #include "search/search_tests_support/test_search_request.hpp" diff --git a/search/search_integration_tests/pre_ranker_test.cpp b/search/search_integration_tests/pre_ranker_test.cpp index bade42643d..6d05cfcade 100644 --- a/search/search_integration_tests/pre_ranker_test.cpp +++ b/search/search_integration_tests/pre_ranker_test.cpp @@ -7,7 +7,7 @@ #include "search/model.hpp" #include "search/pre_ranker.hpp" #include "search/ranker.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_search_engine.hpp" #include "search/suggest.hpp" diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp index e4f66d2bd3..dafe6ab58b 100644 --- a/search/search_integration_tests/processor_test.cpp +++ b/search/search_integration_tests/processor_test.cpp @@ -3,7 +3,7 @@ #include "search/cities_boundaries_table.hpp" #include "search/features_layer_path_finder.hpp" #include "search/retrieval.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_results_matching.hpp" #include "search/search_tests_support/test_search_request.hpp" #include "search/token_range.hpp" diff --git a/search/search_integration_tests/ranker_test.cpp b/search/search_integration_tests/ranker_test.cpp index 30f33f0c87..e3ccc6ca13 100644 --- a/search/search_integration_tests/ranker_test.cpp +++ b/search/search_integration_tests/ranker_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_results_matching.hpp" #include "generator/generator_tests_support/test_feature.hpp" diff --git a/search/search_integration_tests/search_edited_features_test.cpp b/search/search_integration_tests/search_edited_features_test.cpp index 8936788980..9e9ca96f59 100644 --- a/search/search_integration_tests/search_edited_features_test.cpp +++ b/search/search_integration_tests/search_edited_features_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_results_matching.hpp" diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp index 40f50b0805..e16791c060 100644 --- a/search/search_integration_tests/smoke_test.cpp +++ b/search/search_integration_tests/smoke_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_results_matching.hpp" #include "search/search_tests_support/test_search_request.hpp" diff --git a/search/search_integration_tests/tracer_tests.cpp b/search/search_integration_tests/tracer_tests.cpp index 4e383fbf42..79f0547209 100644 --- a/search/search_integration_tests/tracer_tests.cpp +++ b/search/search_integration_tests/tracer_tests.cpp @@ -1,7 +1,7 @@ #include "testing/testing.hpp" #include "search/geocoder_context.hpp" -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "search/search_tests_support/test_results_matching.hpp" #include "search/tracer.hpp" diff --git a/search/search_tests_support/CMakeLists.txt b/search/search_tests_support/CMakeLists.txt index 3464f8033c..3e56080a73 100644 --- a/search/search_tests_support/CMakeLists.txt +++ b/search/search_tests_support/CMakeLists.txt @@ -2,8 +2,8 @@ project(search_tests_support) set( SRC - integration_tests_helpers.cpp - integration_tests_helpers.hpp + helpers.cpp + helpers.hpp test_results_matching.cpp test_results_matching.hpp test_search_engine.cpp diff --git a/search/search_tests_support/integration_tests_helpers.cpp b/search/search_tests_support/helpers.cpp similarity index 97% rename from search/search_tests_support/integration_tests_helpers.cpp rename to search/search_tests_support/helpers.cpp index d230dc13a0..d23a7ec9cd 100644 --- a/search/search_tests_support/integration_tests_helpers.cpp +++ b/search/search_tests_support/helpers.cpp @@ -1,4 +1,4 @@ -#include "search/search_tests_support/integration_tests_helpers.hpp" +#include "search/search_tests_support/helpers.hpp" #include "storage/country_info_getter.hpp" diff --git a/search/search_tests_support/integration_tests_helpers.hpp b/search/search_tests_support/helpers.hpp similarity index 100% rename from search/search_tests_support/integration_tests_helpers.hpp rename to search/search_tests_support/helpers.hpp diff --git a/xcode/map/map_tests copy-Info.plist b/xcode/map/map_tests copy-Info.plist deleted file mode 100644 index 7327b8f105..0000000000 --- a/xcode/map/map_tests copy-Info.plist +++ /dev/null @@ -1,269 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleDocumentTypes - - - CFBundleTypeIconFiles - - 320-pro.png - 64-pro.png - 44x58-pro.png - 22x29-pro.png - - CFBundleTypeName - Google Earth KML Document - LSItemContentTypes - - com.google.earth.kml - - - - CFBundleTypeIconFiles - - 320-pro.png - 64-pro.png - 44x58-pro.png - 22x29-pro.png - - CFBundleTypeName - Google Earth KMZ Document - LSItemContentTypes - - com.google.earth.kmz - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - ${CURRENT_PROJECT_VERSION} - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleTypeRole - Viewer - CFBundleURLName - com.mapswithme.maps - CFBundleURLSchemes - - mapswithme - mapsme - ge0 - geo - fb185237551520383 - mapswithmepro - - - - CFBundleTypeRole - Editor - CFBundleURLSchemes - - com.googleusercontent.apps.1033279251462-k2pp753lp1f39dacjn0pkurcc8pbbvsi - - - - CFBundleVersion - 0 - Fabric - - APIKey - 2773ac2121a74ed96c8cfd4009ed7ea1eb0d2313 - Kits - - - KitInfo - - KitName - Crashlytics - - - - FacebookAppID - 185237551520383 - FacebookDisplayName - MapsWithMe, offline maps - LSApplicationQueriesSchemes - - fbapi - fb-messenger-api - fbauth2 - fbshareextension - uber - yandextaxi - tel - booking - - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSExceptionDomains - - akamaihd.net - - NSIncludesSubdomains - - NSThirdPartyExceptionRequiresForwardSecrecy - - - facebook.com - - NSIncludesSubdomains - - NSThirdPartyExceptionRequiresForwardSecrecy - - - fbcdn.net - - NSIncludesSubdomains - - NSThirdPartyExceptionRequiresForwardSecrecy - - - maps.me - - NSExceptionAllowsInsecureHTTPLoads - - NSIncludesSubdomains - - - mapswithme.com - - NSExceptionAllowsInsecureHTTPLoads - - NSIncludesSubdomains - - - - - NSCameraUsageDescription - Unused by an application - NSPhotoLibraryUsageDescription - Unused by an application - PW_USE_GPS - - Pushwoosh_APPID - 84E00-0F767 - Pushwoosh_LOG_LEVEL - WARNING - UIApplicationShortcutItems - - - UIApplicationShortcutItemIconFile - ic_3dtouch_search - UIApplicationShortcutItemTitle - search - UIApplicationShortcutItemType - me.maps.3daction.search - - - UIApplicationShortcutItemIconFile - ic_3dtouch_bookmarks - UIApplicationShortcutItemTitle - bookmarks - UIApplicationShortcutItemType - me.maps.3daction.bookmarks - - - UIApplicationShortcutItemIconFile - ic_3dtouch_planing_route - UIApplicationShortcutItemTitle - route - UIApplicationShortcutItemType - me.maps.3daction.route - - - UIBackgroundModes - - audio - fetch - location - remote-notification - - UIFileSharingEnabled - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIPrerenderedIcon - - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UTImportedTypeDeclarations - - - UTTypeConformsTo - - public.xml - - UTTypeDescription - Google Earth KML Document - UTTypeIdentifier - com.google.earth.kml - UTTypeReferenceURL - http://earth.google.com/kml/ - UTTypeTagSpecification - - com.apple.ostype - GKml - public.filename-extension - - kml - - public.mime-type - application/vnd.google-earth.kml+xml - - - - UTTypeConformsTo - - com.pkware.zip-archive - - UTTypeDescription - Google Earth KMZ Document - UTTypeIdentifier - com.google.earth.kmz - UTTypeReferenceURL - http://earth.google.com/kmz/ - UTTypeTagSpecification - - com.apple.ostype - GKmz - public.filename-extension - - kmz - - public.mime-type - application/vnd.google-earth.kmz+xml - - - - -