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

[classifier] Match common "noexit" type.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-01-17 13:07:47 +03:00
parent 9f934e29fd
commit 0dec081af9
3 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/mapcss-mapping.csv
View file

@ -411,7 +411,7 @@ deprecated|deprecated;410;x
deprecated|deprecated;411;x
leisure|park|private;[leisure=park][access=private];;name;int_name;412;
deprecated|deprecated;413;x
noexit|motor_vehicle;414;
noexit;[noexit?];;name;int_name;414;
healthcare|laboratory;415;
highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416;
railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417;

Can't render this file because it has a wrong number of fields in line 11.

3
data/strings/types_strings.txt
View file

@ -11943,9 +11943,6 @@
ru = Тупик
uk = Тупик
[type.noexit.motor_vehicle]
ref = type.noexit
[type.office]
en = Office
ar = مكتب

28
generator/generator_tests/osm_type_test.cpp
View file

@ -1262,6 +1262,32 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_CuisineType)
}
}
/// @todo We don't have drawing rules for 'noexit' now.
/*
UNIT_CLASS_TEST(TestWithClassificator, OsmType_NoExit)
{
{
Tags const tags = { {"noexit", "yes" } };
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 1, (params));
TEST(params.IsTypeExist(GetType({"noexit"})), (params));
}
{
Tags const tags = { {"noexit", "motor_vehicle" } };
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 1, (params));
TEST(params.IsTypeExist(GetType({"noexit"})), (params));
}
{
Tags const tags = { {"noexit", "no" } };
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 0, (params));
}
}
*/
UNIT_CLASS_TEST(TestWithClassificator, OsmType_Junctions)
{
for (char const * value : { "yes", "circular", "jughandle" })
@ -1332,7 +1358,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
// {"natural", "tree"},
// {"natural", "tree_row"},
// {"natural", "vineyard"},
// {"noexit", "motor_vehicle"},
// {"noexit"},
// {"place", "county"},
// {"power", "generator"},
// {"power", "minor_line"},