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

Fixed roads shield parsing in US

Browse source
This commit is contained in:
r.kuznetsov 2017-06-27 16:37:29 +03:00 • committed by Ilya Zverev
parent 334d30f1ba
commit cea279344b
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
indexer/road_shields_parser.cpp
View file

@ -87,7 +87,7 @@ public:
}
// Minimum length for the network tag is 4 (US:I).
if (network.size() > 4)
if (network.size() >= 4)
{
strings::AsciiToLower(network);
@ -111,11 +111,17 @@ public:
std::vector<std::string> shieldsRawTests = strings::Tokenize(m_baseRoadNumber, ";");
for (std::string const & rawText : shieldsRawTests)
{
RoadShield shield;
auto slashPos = rawText.find('/');
RoadShield shield = slashPos == std::string::npos
? ParseRoadShield(rawText)
: RoadShield{FindNetworkShield(rawText.substr(0, slashPos)),
rawText.substr(slashPos + 1)};
if (slashPos == std::string::npos)
{
shield = ParseRoadShield(rawText);
}
else
{
shield = ParseRoadShield(rawText.substr(slashPos + 1));
shield.m_type = FindNetworkShield(rawText.substr(0, slashPos));
}
if (!shield.m_name.empty() && shield.m_type != RoadShieldType::Hidden)
result.insert(std::move(shield));
}