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

[search] Do index recycling=XXX types.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-03-21 11:36:58 +03:00
parent c03726e57f
commit 174be1e379
3 changed files with 43 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
indexer/feature_visibility.cpp
View file

@ -250,7 +250,6 @@ namespace
static uint32_t const shuttle = cl.GetTypeByPath({"route", "shuttle_train"});
static uint32_t const internet = cl.GetTypeByPath({"internet_access"});
static uint32_t const organic = cl.GetTypeByPath({"organic"});
static uint32_t const complexEntry = cl.GetTypeByPath({"complex_entry"});
if ((g == GeomType::Line || g == GeomType::Undefined) && type == shuttle)
@ -261,9 +260,19 @@ namespace
if (g != GeomType::Line)
{
// Exclude generic 1-arity types like [organic].
if (type == internet || (type == organic && typeLevel >= 2))
if (type == internet)
return true;
// Exclude generic 1-arity types like [organic].
if (typeLevel >= 2)
{
static uint32_t const arrTypes[] = {
cl.GetTypeByPath({"organic"}),
cl.GetTypeByPath({"recycling"})
};
if (base::IsExist(arrTypes, type))
return true;
}
}
return (type == complexEntry);
@ -298,17 +307,9 @@ namespace
static uint32_t const arrTypes[] = {
cl.GetTypeByPath({"wheelchair"}),
cl.GetTypeByPath({"cuisine"}),
cl.GetTypeByPath({"recycling"})
cl.GetTypeByPath({"cuisine"})
};
for (uint32_t t : arrTypes)
{
if (t == type)
return true;
}
return false;
return base::IsExist(arrTypes, type);
}
/// @}
} // namespace

28
search/search_integration_tests/processor_test.cpp
View file

@ -1609,6 +1609,34 @@ UNIT_CLASS_TEST(ProcessorTest, OrganicTest)
TEST_EQUAL(GetResultsNumber("органическая обувь", "ru"), 0, ());
}
UNIT_CLASS_TEST(ProcessorTest, RecyclingTest)
{
string const countryName = "Wonderland";
TestPOI paper(m2::PointD(1.0, 1.0), "Макулатура", "ru");
paper.SetTypes({{"amenity", "recycling", "container"}, {"recycling", "paper"}});
TestPOI metal(m2::PointD(1.0, 1.0), "Armatura", "en");
metal.SetTypes({{"amenity", "recycling", "centre"}, {"recycling", "scrap_metal"}});
auto countryId = BuildCountry(countryName, [&](TestMwmBuilder & builder) {
builder.Add(paper);
builder.Add(metal);
});
SetViewport(m2::RectD(-1, -1, 1, 1));
{
Rules rules{ExactMatch(countryId, paper), ExactMatch(countryId, metal)};
TEST(ResultsMatch("прием вторсырья", "ru", rules), ());
}
{
Rules rules{ExactMatch(countryId, paper)};
TEST(ResultsMatch("прием бумаги", "ru", rules), ());
}
TEST_EQUAL(GetResultsNumber("прием обуви", "ru"), 0, ());
}
UNIT_CLASS_TEST(ProcessorTest, AirportTest)
{
string const countryName = "Wonderland";

8
search/search_integration_tests/smoke_test.cpp
View file

@ -242,13 +242,7 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest)
TestPOI poi(m2::PointD(1.0, 1.0), "poi", "en");
auto typeTokens = strings::Tokenize(classif().GetFullObjectName(type), "|");
if (ftypes::IsRecyclingTypeChecker::Instance()(type))
{
// recycling=XXX types are not drawable/visible alone.
poi.SetTypes({{"amenity", "recycling", "container"}, std::move(typeTokens)});
}
else
poi.SetTypes({std::move(typeTokens)});
poi.SetTypes({std::move(typeTokens)});
auto id = BuildMwm(countryName, DataHeader::MapType::Country,
[&](TestMwmBuilder & builder) { builder.Add(poi); });