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

[tests] Fix for man_made=tower

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2024-12-11 01:05:56 +03:00
parent 38b44ce040
commit ea01aeb994
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generator/generator_tests/osm_type_test.cpp
View file

@ -2141,7 +2141,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
// {"area:highway", "track"},
// {"area:highway", "trunk"},
// {"area:highway", "unclassified"},
// {"barrier", "cycle_barrier"},
{"barrier", "cycle_barrier"},
// {"boundary", "administrative"},
// {"communication", "line"},
// {"earthquake:damage", "spontaneous_camp"},
@ -2152,13 +2152,13 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
// {"landuse", "greenfield"},
// {"landuse", "greenhouse_horticulture"},
// {"landuse", "retail"},
// {"man_made", "cairn"},
{"man_made", "cairn"},
// {"man_made", "pipeline"},
// {"man_made", "surveillance"},
// {"man_made", "tower"},
{"man_made", "tower"},
// {"man_made", "wastewater_plant"},
// {"man_made", "water_tower"},
// {"man_made", "water_well"},
{"man_made", "water_tower"},
{"man_made", "water_well"},
// {"mapswithme", "grid"},
// {"military", "bunker"},
// {"natural", "cliff"},

9
search/search_integration_tests/smoke_test.cpp
View file

@ -231,8 +231,6 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest)
// No point drawing rules for country scale range.
base::StringIL const arrInvisible[] = {
{"man_made", "tower"},
{"place", "continent"},
{"place", "county"},
{"place", "region"},
@ -248,7 +246,6 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest)
{"highway", "motorway_junction"},
{"landuse"},
{"man_made", "chimney"},
{"man_made", "tower"},
{"natural"},
{"office"},
{"place"},
@ -264,12 +261,10 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest)
for (auto const & tags : arrNoEmptyNames)
noEmptyNames.insert(cl.GetTypeByPath(tags));
uint32_t const commTower = cl.GetTypeByPath({"man_made", "tower", "communication"});
ftypes::TwoLevelPOIChecker isPoi;
auto const isNoEmptyName = [commTower, &isPoi, &noEmptyNames](uint32_t t)
auto const isNoEmptyName = [&isPoi, &noEmptyNames](uint32_t t)
{
if (t != commTower)
ftype::TruncValue(t, 2);
ftype::TruncValue(t, 2);
if (noEmptyNames.count(t) > 0)
return true;

2
search/types_skipper.cpp
View file

@ -21,10 +21,8 @@ TypesSkipper::TypesSkipper()
for (auto const & e : arrSkipEmptyName1)
m_skipIfEmptyName[0].push_back(c.GetTypeByPath(e));
// Test for exact type (man_made-tower-communication is not).
StringIL const arrSkipEmptyNameExact[] = {
{"man_made", "chimney"},
{"man_made", "tower"},
};
for (auto const & e : arrSkipEmptyNameExact)
m_skipIfEmptyName[1].push_back(c.GetTypeByPath(e));