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

[search] [bookmarks] Enabled indexing of the custom name.

Browse source
This commit is contained in:
Maxim Pimenov 2019-08-14 17:10:19 +03:00 • committed by Tatiana Yan
parent 2695b29b38
commit dbadbf5fc0
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
search/bookmarks/data.hpp
View file

@ -19,13 +19,14 @@ struct Data
{
Data() = default;
Data(std::string const & name, std::string const & description)
: m_name(name), m_description(description)
Data(std::string const & name, std::string customName, std::string const & description)
: m_name(name), m_customName(customName), m_description(description)
{
}
Data(kml::BookmarkData const & bookmarkData)
: m_name(kml::GetDefaultStr(bookmarkData.m_name))
, m_customName(kml::GetDefaultStr(bookmarkData.m_customName))
, m_description(kml::GetDefaultStr(bookmarkData.m_description))
{
}
@ -38,6 +39,7 @@ struct Data
};
ForEachNormalizedToken(m_name, withDefaultLang);
ForEachNormalizedToken(m_customName, withDefaultLang);
}
template <typename Fn>
@ -51,6 +53,7 @@ struct Data
}
std::string m_name;
std::string m_customName;
std::string m_description;
};

7
search/search_tests/bookmarks_processor_tests.cpp
View file

@ -76,11 +76,14 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, Smoke)
GetProcessor().EnableIndexingOfDescriptions(true);
Add(10, {"Double R Diner" /* name */,
"2R Diner" /* customName */,
"They've got a cherry pie there that'll kill ya!" /* description */});
Add(18, {"Silver Mustang Casino" /* name */,
"Ag Mustang" /* customName */,
"Joyful place, owners Bradley and Rodney are very friendly!"});
Add(20, {"Great Northern Hotel" /* name */,
"N Hotel" /* customName */,
"Clean place with a reasonable price" /* description */});
TEST_EQUAL(Search("R&R food"), Ids({10}), ());
@ -88,6 +91,8 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, Smoke)
TEST_EQUAL(Search("great silver hotel"), Ids({20, 18}), ());
TEST_EQUAL(Search("double r cafe"), Ids({10}), ());
TEST_EQUAL(Search("dine"), Ids({10}), ());
TEST_EQUAL(Search("2R"), Ids({10}), ());
TEST_EQUAL(Search("Ag"), Ids({18}), ());
AttachToGroup(Id{10}, GroupId{0});
AttachToGroup(Id{18}, GroupId{0});
@ -104,6 +109,7 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, IndexDescriptions)
GetProcessor().EnableIndexingOfDescriptions(true);
Add(10, {"Double R Diner" /* name */,
"2R Diner" /* customName */,
"They've got a cherry pie there that'll kill ya!" /* description */});
TEST_EQUAL(Search("diner"), Ids({10}), ());
TEST_EQUAL(Search("cherry pie"), Ids({10}), ());
@ -114,6 +120,7 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, IndexDescriptions)
GetProcessor().EnableIndexingOfDescriptions(false);
Add(10, {"Double R Diner" /* name */,
"2R Diner" /* customName */,
"They've got a cherry pie there that'll kill ya!" /* description */});
TEST_EQUAL(Search("diner"), Ids({10}), ());
TEST_EQUAL(Search("cherry pie"), Ids(), ());