kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[search] [bookmarks] Fixed the tests.

Browse source
This commit is contained in:
Maxim Pimenov 2019-07-29 13:03:38 +03:00 • committed by Tatiana Yan
parent f04fb3ae6a
commit a3712427de
7 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
map/map_tests/search_api_tests.cpp
View file

@ -145,6 +145,7 @@ UNIT_CLASS_TEST(SearchAPITest, BookmarksSearch)
kml::SetDefaultStr(data.m_name, "Great Northern Hotel");
kml::SetDefaultStr(data.m_description, "Clean place with a reasonable price");
marks.emplace_back(2, data);
m_api.EnableIndexingOfBookmarksDescriptions(true);
m_api.OnBookmarksCreated(marks);
m_api.OnViewportChanged(m2::RectD(-1, -1, 1, 1));

5
map/search_api.cpp
View file

@ -390,6 +390,11 @@ void SearchAPI::FilterAllHotelsInViewport(m2::RectD const & viewport,
m_delegate.FilterHotels(filterTasks, move(featureIds));
}
void SearchAPI::EnableIndexingOfBookmarksDescriptions(bool enable)
{
m_engine.EnableIndexingOfBookmarksDescriptions(enable);
}
void SearchAPI::OnBookmarksCreated(vector<BookmarkInfo> const & marks)
{
vector<BookmarkIdDoc> data;

2
map/search_api.hpp
View file

@ -144,6 +144,8 @@ public:
void FilterAllHotelsInViewport(m2::RectD const & viewport,
booking::filter::Tasks const & filterTasks) override;
void EnableIndexingOfBookmarksDescriptions(bool enable);
void OnBookmarksCreated(std::vector<BookmarkInfo> const & marks);
void OnBookmarksUpdated(std::vector<BookmarkInfo> const & marks);
void OnBookmarksDeleted(std::vector<kml::MarkId> const & marks);

7
search/engine.cpp
View file

@ -158,6 +158,13 @@ void Engine::LoadCountriesTree()
[](Processor & processor) { processor.LoadCountriesTree(); });
}
void Engine::EnableIndexingOfBookmarksDescriptions(bool enable)
{
PostMessage(Message::TYPE_BROADCAST, [enable](Processor & processor) {
processor.EnableIndexingOfBookmarksDescriptions(enable);
});
}
void Engine::OnBookmarksCreated(vector<pair<bookmarks::Id, bookmarks::Doc>> const & marks)
{
PostMessage(Message::TYPE_BROADCAST,

2
search/engine.hpp
View file

@ -108,6 +108,8 @@ public:
// Posts request to load countries tree.
void LoadCountriesTree();
void EnableIndexingOfBookmarksDescriptions(bool enable);
void OnBookmarksCreated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
void OnBookmarksUpdated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
void OnBookmarksDeleted(std::vector<bookmarks::Id> const & marks);

5
search/processor.cpp
View file

@ -324,6 +324,11 @@ void Processor::LoadCitiesBoundaries()
void Processor::LoadCountriesTree() { m_ranker.LoadCountriesTree(); }
void Processor::EnableIndexingOfBookmarksDescriptions(bool enable)
{
m_bookmarksProcessor.EnableIndexingOfDescriptions(enable);
}
void Processor::OnBookmarksCreated(vector<pair<bookmarks::Id, bookmarks::Doc>> const & marks)
{
for (auto const & idDoc : marks)

2
search/processor.hpp
View file

@ -94,6 +94,8 @@ public:
void LoadCitiesBoundaries();
void LoadCountriesTree();
void EnableIndexingOfBookmarksDescriptions(bool enable);
void OnBookmarksCreated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
void OnBookmarksUpdated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
void OnBookmarksDeleted(std::vector<bookmarks::Id> const & marks);