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

Small fixes for review

Browse source 
Signed-off-by: Anton Makouski <anton.makouski@gmail.com>
This commit is contained in:
Anton Makouski 2022-06-07 10:31:27 +03:00
parent d7cde8cce1
commit ee3bfa0d20
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
generator/osm2meta.cpp
View file

@ -148,7 +148,18 @@ string MetadataTagProcessorImpl::ValidateAndFormat_ele(string const & v) const
string MetadataTagProcessorImpl::ValidateAndFormat_destination(string const & v) const
{
return v;
{
// Normalization. "a1 a2;b1-b2; c,d " " -> "a1 a2; b1-b2; c; d".
string r;
strings::Tokenize(v, ";,", [&](std::string_view d)
{
if (r.empty())
r = strings::Trim(d);
else
r += "; " + string(strings::Trim(d));
});
return r;
}
}
string MetadataTagProcessorImpl::ValidateAndFormat_destination_ref(string const & v) const

16
routing/routing_session.cpp
View file

@ -341,20 +341,6 @@ SessionState RoutingSession::OnLocationPositionChanged(GpsInfo const & info)
return m_state;
}
string FormatRoadDestination(string const & v)
{
// Normalization. "a ;b; c,d " " -> "a; b; c; d".
string r;
strings::Tokenize(v, " ;,", [&](std::string_view d)
{
if (r.empty())
r = d;
else
r += "; " + string(d);
});
return r;
}
// For next street returns "[ref] name" .
// For highway exits (or main roads with exit info) returns "[junction:ref]: [target:ref] > target".
// If no |target| - it will be replaced by |name| of next street.
@ -377,7 +363,7 @@ void GetFullRoadName(RouteSegment::RoadNameInfo & road, string & name)
name += string(name.empty() ? "" : ": ") + "[" + road.m_destination_ref + "]";
if (!road.m_destination.empty())
name += string(name.empty() ? "" : " ") + "> " + FormatRoadDestination(road.m_destination);
name += string(name.empty() ? "" : " ") + "> " + road.m_destination;
else if (!road.m_name.empty())
name += (road.m_destination_ref.empty() ? string(name.empty() ? "" : " ") : ": ") + road.m_name;
}