organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[editor] Improvements in editor.config #4050

Merged
Jean-BaptisteC merged 2 commits from fix_editor into master 2023-02-08 16:30:03 +00:00
Conversation 10 Commits 2 Files changed 2 +207 -315
2 changed files with 207 additions and 315 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

507
data/editor.config
View file

File diff suppressed because it is too large Load diff

15
editor/editor_tests/editor_config_test.cpp
View file

@ -10,10 +10,11 @@ UNIT_TEST(EditorConfig_TypeDescription)
using EType = feature::Metadata::EType;
using Fields = editor::TypeAggregatedDescription::FeatureFields;
Fields const poi = {
Fields const poiInternet = {
EType::FMD_OPEN_HOURS,
EType::FMD_PHONE_NUMBER,
EType::FMD_WEBSITE,
EType::FMD_INTERNET,
EType::FMD_EMAIL,
EType::FMD_LEVEL,
EType::FMD_CONTACT_FACEBOOK,
@ -44,10 +45,7 @@ UNIT_TEST(EditorConfig_TypeDescription)
TEST(config.GetTypeDescription({"shop-toys"}, desc), ());
TEST(desc.IsNameEditable(), ());
TEST(desc.IsAddressEditable(), ());
auto fields = poi;
fields.push_back(EType::FMD_INTERNET);
base::SortUnique(fields);
TEST_EQUAL(desc.GetEditableFields(), fields, ());
TEST_EQUAL(desc.GetEditableFields(), poiInternet, ());
}
{
// Test that amenity-bank is selected as it goes first in config.
@ -55,17 +53,14 @@ UNIT_TEST(EditorConfig_TypeDescription)
TEST(config.GetTypeDescription({"amenity-bicycle_rental", "amenity-bank"}, desc), ());
TEST(desc.IsNameEditable(), ());
TEST(desc.IsAddressEditable(), ());
auto fields = poi;
fields.push_back(EType::FMD_INTERNET);
base::SortUnique(fields);
TEST_EQUAL(desc.GetEditableFields(), fields, ());
TEST_EQUAL(desc.GetEditableFields(), poiInternet, ());
}
{
// Testing type inheritance
editor::TypeAggregatedDescription desc;
TEST(config.GetTypeDescription({"amenity-place_of_worship-christian"}, desc), ());
TEST(desc.IsNameEditable(), ());
TEST_EQUAL(desc.GetEditableFields(), poi, ());
TEST_EQUAL(desc.GetEditableFields(), poiInternet, ());
}
{
// Testing long type inheritance on a fake object