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

[tests] Added POI priority tests.

Browse source
This commit is contained in:
vng 2016-04-14 18:04:08 +03:00
parent b786254caf
commit 0c329c1672
1 changed files with 75 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
map/style_tests/classificator_tests.cpp
View file

@ -130,7 +130,7 @@ UNIT_TEST(Classificator_DrawingRules)
namespace
{
pair<int, int> GetMinMax(int level, vector<uint32_t> const & types)
pair<int, int> GetMinMax(int level, vector<uint32_t> const & types, drule::rule_type_t ruleType)
{
pair<int, int> res(numeric_limits<int>::max(), numeric_limits<int>::min());
@ -139,7 +139,7 @@ pair<int, int> GetMinMax(int level, vector<uint32_t> const & types)
for (size_t i = 0; i < keys.size(); ++i)
{
if (keys[i].m_type != drule::area)
if (keys[i].m_type != ruleType)
continue;
if (keys[i].m_priority < res.first)
@ -151,6 +151,43 @@ pair<int, int> GetMinMax(int level, vector<uint32_t> const & types)
return res;
}
void CheckPriority(vector<StringIL> const & arrT, vector<size_t> const & arrI, drule::rule_type_t ruleType)
{
Classificator const & c = classif();
vector<vector<uint32_t> > types;
styles::RunForEveryMapStyle([&](MapStyle)
{
types.clear();
size_t ind = 0;
for (size_t i = 0; i < arrI.size(); ++i)
{
types.push_back(vector<uint32_t>());
types.back().reserve(arrI[i]);
for (size_t j = 0; j < arrI[i]; ++j)
{
types.back().push_back(c.GetTypeByPath(arrT[ind]));
++ind;
}
}
TEST_EQUAL(ind, arrT.size(), ());
for (int level = scales::GetUpperWorldScale() + 1; level <= scales::GetUpperStyleScale(); ++level)
{
pair<int, int> minmax(numeric_limits<int>::max(), numeric_limits<int>::min());
for (size_t i = 0; i < types.size(); ++i)
{
pair<int, int> const mm = GetMinMax(level, types[i], ruleType);
TEST_LESS(minmax.second, mm.first, (i));
minmax = mm;
}
}
});
}
} // namespace
// Check area drawing priority according to the types order below (from downmost to upmost).
@ -162,56 +199,52 @@ pair<int, int> GetMinMax(int level, vector<uint32_t> const & types)
UNIT_TEST(Classificator_AreaPriority)
{
styles::RunForEveryMapStyle([](MapStyle)
vector<StringIL> types =
{
Classificator const & c = classif();
// 0
{"natural", "coastline"},
// 1
//{"waterway", "riverbank"}, - it's not a good idea to place it here
// 2
{"place", "island"}, {"natural", "land"},
// 3
{"natural", "wood"}, {"natural", "scrub"}, {"natural", "heath"}, {"natural", "grassland"},
{"landuse", "grass"}, {"landuse", "farm"}, {"landuse", "farmland"}, {"landuse", "forest"},
// 4
//{"leisure", "park"}, {"leisure", "garden"}, - maybe next time (too tricky to do it now)
// 5
{"natural", "water"}, {"natural", "lake"}, {"landuse", "basin"}
};
vector<vector<uint32_t> > types;
CheckPriority(types, {1, 2, 8, 3}, drule::area);
}
char const * arrT[][2] =
UNIT_TEST(Classificator_PoiPriority)
{
{
vector<StringIL> types =
{
// 0
{"natural", "coastline"},
// 1
//{"waterway", "riverbank"}, - it's not a good idea to place it here
{"amenity", "atm"},
// 2
{"place", "island"}, {"natural", "land"},
// 3
{"natural", "wood"}, {"natural", "scrub"}, {"natural", "heath"}, {"natural", "grassland"},
{"landuse", "grass"}, {"landuse", "farm"}, {"landuse", "farmland"}, {"landuse", "forest"},
// 4
//{"leisure", "park"}, {"leisure", "garden"}, - maybe next time (too tricky to do it now)
// 5
{"natural", "water"}, {"natural", "lake"}, {"landuse", "basin"}
{"amenity", "bank"}
};
size_t arrI[] = { 1, 2, 8, 3 };
size_t ind = 0;
for (size_t i = 0; i < ARRAY_SIZE(arrI); ++i)
CheckPriority(types, {1, 1}, drule::symbol);
}
{
vector<StringIL> types =
{
types.push_back(vector<uint32_t>());
types.back().reserve(arrI[i]);
// 1
{"amenity", "bench"}, {"amenity", "shelter"},
// 2
{"highway", "bus_stop"}, {"amenity", "bus_station"},
{"railway", "station"}, {"railway", "halt"}, {"railway", "tram_stop"},
};
for (size_t j = 0; j < arrI[i]; ++j)
{
types.back().push_back(c.GetTypeByPath(vector<string>(arrT[ind], arrT[ind] + 2)));
++ind;
}
}
TEST_EQUAL(ind, ARRAY_SIZE(arrT), ());
for (int level = scales::GetUpperWorldScale() + 1; level <= scales::GetUpperStyleScale(); ++level)
{
pair<int, int> minmax = GetMinMax(level, types[0]);
for (size_t i = 1; i < types.size(); ++i)
{
pair<int, int> const mm = GetMinMax(level, types[i]);
TEST_LESS(minmax.second, mm.first, (i));
minmax = mm;
}
}
});
CheckPriority(types, {2, 5}, drule::symbol);
}
}
UNIT_TEST(Classificator_GetType)