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

PR review fixes. Improved stripAtSymbol function

Browse source 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
Sergiy Kozyr 2021-10-28 13:27:20 +03:00 • committed by Viktor Govako
parent 73ea3f239b
commit 6df229036c
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
generator/osm2meta.cpp
View file

@ -293,25 +293,15 @@ string MetadataTagProcessorImpl::ValidateAndFormat_vk(string const & vkPage) con
return {};
}
string const stripAtSymbol(string const & lineId)
// Strip '%40' and `@` chars from Line ID start.
string stripAtSymbol(string const & lineId)
{
if (lineId.empty())
return lineId;
if (strings::StartsWith(lineId, "%40")) // Strip '%40' chars from Line ID.
return lineId.substr(3);
if (lineId.front() == '@') // Strip '@' char from Line ID.
if (lineId.front() == '@')
return lineId.substr(1);
return lineId;
}
string & stripAtSymbol(string & lineId)
{
if (lineId.empty())
return lineId;
if (strings::StartsWith(lineId, "%40")) // Strip '%40' chars from Line ID.
lineId = lineId.substr(3);
if (lineId.front() == '@') // Strip '@' char from Line ID.
lineId = lineId.erase(0, 1);
if (strings::StartsWith(lineId, "%40"))
return lineId.substr(3);
return lineId;
}