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

[editor] name validation fix - # and № are allowed

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-11-28 16:11:06 +03:00 • committed by Ilya Zverev
parent 9f63e855b9
commit 6482843cb0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
indexer/editable_map_object.cpp
View file

@ -768,13 +768,13 @@ bool EditableMapObject::ValidateName(string const & name)
return true;
if (strings::IsASCIIString(name))
return regex_match(name, regex(R"(^[ A-Za-z0-9.,?!@$%()\-:;"'`]+$)"));
return regex_match(name, regex(R"(^[ A-Za-z0-9.,?!@#$%()\-:;"'`]+$)"));
std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
std::u32string const u32name = converter.from_bytes(name);
std::u32string const excludedSymbols = U"^~§><{}[]*=_#№±\n\t\r\v\f|√•π÷׶∆°";
std::u32string const excludedSymbols = U"^~§><{}[]*=_±\n\t\r\v\f|√•π÷׶∆°";
for (auto const ch : u32name)
{

8
indexer/indexer_tests/editable_map_object_test.cpp
View file

@ -191,11 +191,11 @@ UNIT_TEST(EditableMapObject_ValidateEmail)
UNIT_TEST(EditableMapObject_ValidateName)
{
vector<string> correctNames = {"abc", "абв", "ᆺᆯㅕ", "꫞ꪺꫀꪸ", "a b?c", "a!b.c", "a(b)c", "a,b.c",
"a$bc", "a%bc", };
"a$bc", "a%bc", "a#bc", "a№bc"};
vector<string> incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a<bc", "a{bc", "a[bc", "*",
"a*bc", "a=bc", "a_bc", "a#bc", "a№bc", "a±bc", "a\nbc", "a\tbc",
"a\rbc", "a\vbc", "a\fbc", "a|bc", "N√",
"Hello World!\U0001F600", "Exit →", "∫0dx = C", "\U0001210A"};
"a*bc", "a=bc", "a_bc", "a±bc", "a\nbc", "a\tbc", "a\rbc",
"a\vbc", "a\fbc", "a|bc", "N√", "Hello World!\U0001F600",
"Exit →", "∫0dx = C", "\U0001210A"};
for (auto const & name : correctNames)
{