drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-23 14:43:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[traffic] Exclude roundabouts from decoded locations (with exceptions)

Browse Source 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
This commit is contained in:
mvglasow
2025-10-25 15:09:28 +03:00
parent 46d363ae24
commit 9065f45b21
4 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/routing/directions_engine.cpp
View File

@@ -85,6 +85,7 @@ void DirectionsEngine::LoadPathAttributes(FeatureID const & featureId, LoadedPat
pathSegment.m_isOneWay = m_onewayChecker(types);
pathSegment.m_roadNameInfo.m_isLink = pathSegment.m_isLink;
pathSegment.m_roadNameInfo.m_onRoundabout = pathSegment.m_onRoundabout;
pathSegment.m_roadNameInfo.m_junction_ref = ft->GetMetadata(feature::Metadata::FMD_JUNCTION_REF);
pathSegment.m_roadNameInfo.m_destination_ref = ft->GetMetadata(feature::Metadata::FMD_DESTINATION_REF);
pathSegment.m_roadNameInfo.m_destination = ft->GetMetadata(feature::Metadata::FMD_DESTINATION);

4
libs/routing/route.hpp
View File

@@ -121,6 +121,10 @@ public:
* @brief Whether the road is of a link type.
*/
bool m_isLink = false;
/**
* @brief Whether the road is part of a roundabout.
*/
bool m_onRoundabout = false;
RoadNameInfo() = default;
RoadNameInfo(std::string name) : m_name(std::move(name)) {}

39
libs/traffxml/traff_decoder.cpp
View File

@@ -1030,6 +1030,32 @@ void RoutingTraffDecoder::DecodeLocationDirection(traffxml::TraffMessage & messa
TruncateRoute(rsegments, checkpoints);
/*
* `m_onRoundabout` is set only for the first segment after the junction. In order to identify
* all roundabout segments, cache the last segment with `m_onRoundabout` set. Any subsequent
* segment with the same MWM and feature ID is also a roundabout segment.
*/
routing::Segment lastRoundaboutSegment;
/*
* We usually discard roundabouts, unless the location is a point (`at` point set) or the entire
* decoded location is a roundabout.
*/
bool keepRoundabouts = true;
if (!message.m_location.value().m_at)
for (auto & rsegment : rsegments)
{
if (rsegment.GetRoadNameInfo().m_onRoundabout)
lastRoundaboutSegment = rsegment.GetSegment();
else if ((rsegment.GetSegment().GetMwmId() != lastRoundaboutSegment.GetMwmId())
|| (rsegment.GetSegment().GetFeatureId() != lastRoundaboutSegment.GetFeatureId()))
{
keepRoundabouts = false;
break;
}
}
if (!backwards && message.m_location.value().m_at && !message.m_location.value().m_to)
// from–at in forward direction, add last segment
AddDecodedSegment(decoded, rsegments.back().GetSegment());
@@ -1070,6 +1096,19 @@ void RoutingTraffDecoder::DecodeLocationDirection(traffxml::TraffMessage & messa
{
routing::Segment & segment = rsegment.GetSegment();
// Skip roundabouts to avoid side effects on crossing roads
if (!keepRoundabouts)
{
if (rsegment.GetRoadNameInfo().m_onRoundabout)
{
lastRoundaboutSegment = segment;
continue;
}
else if ((segment.GetMwmId() == lastRoundaboutSegment.GetMwmId())
&& (segment.GetFeatureId() == lastRoundaboutSegment.GetFeatureId()))
continue;
}
// If we have more than two checkpoints, fake segments can occur in the middle, skip them.
if (segment.GetMwmId() == routing::kFakeNumMwmId)
continue;