Skip to content

Fixes #780 #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatteoRagni wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fixes #780 #781

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9a692f
Fixes #780
MatteoRagni Feb 27, 2026
71626a3
Minor formatting
eknabevcc Mar 19, 2026
342a5c0
Further minor formatting
eknabevcc Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions EnvironmentSimulator/Modules/ScenarioEngine/SourceFiles/OSIReporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,20 +1550,36 @@ int OSIReporter::UpdateOSIIntersection()
incomming_road->GetDrivingLaneById(incomming_s_value, junctionlanelink->from_)->GetGlobalId());

roadmanager::Lane *lane = connecting_road->GetDrivingLaneById(connecting_outgoing_s_value, junctionlanelink->to_);
roadmanager::Lane *successor_lane =
lane != nullptr ? outgoing_road->GetDrivingLaneById(outgoing_s_value, lane->GetLink(connecting_road_link_type)->GetId())
: nullptr;
if (lane != nullptr && successor_lane != nullptr)
if (!lane)
{
laneparing->mutable_successor_lane_id()->set_value(successor_lane->GetGlobalId());
LOG_ERROR("Connecting road {} incoming road {} failed get lane by id {}",
connecting_road->GetId(),
connection->GetIncomingRoad()->GetId(),
junctionlanelink->to_);
continue;
}
else

roadmanager::LaneLink *lane_link = lane->GetLink(connecting_road_link_type);
if (!lane_link)
{
LOG_ERROR("Connecting road {} incoming road {} failed get lane by id {}",
LOG_ERROR("Connecting road {} incoming road {} failed get lane by id {}, missing link: maybe vanishing lane?",
connecting_road->GetId(),
connection->GetIncomingRoad()->GetId(),
junctionlanelink->to_);
continue;
}

roadmanager::Lane *successor_lane = outgoing_road->GetDrivingLaneById(outgoing_s_value, lane_link->GetId());
if (!successor_lane)
{
LOG_ERROR("Outgoing road {} incoming road {} failed get lane by id {}",
outgoing_road->GetId(),
connection->GetIncomingRoad()->GetId(),
lane_link->GetId());
continue;
}

laneparing->mutable_successor_lane_id()->set_value(successor_lane->GetGlobalId());
}
}
}
Expand Down