fix #14474

eclipse-sumo · Mar 13, 2024 · 0248956 · 0248956
1 parent 04b2d90
commit 0248956
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/microsim/MSLink.cpp b/src/microsim/MSLink.cpp
@@ -230,7 +230,7 @@ MSLink::setRequestInformation(int index, bool hasFoes, bool isCont,
         myOffFoeLinks = new std::vector<MSLink*>();
         if (isEntryLink()) {
             for (MSLane* foeLane : foeLanes) {
-                assert(foeLane->isInternal());
+                assert(foeLane->isInternal() || foeLane->isCrossing());
                 MSLink* viaLink = foeLane->getIncomingLanes().front().viaLink;
                 if (viaLink->getLaneBefore()->isNormal()) {
                     myOffFoeLinks->push_back(viaLink);

diff --git a/src/microsim/traffic_lights/NEMAController.cpp b/src/microsim/traffic_lights/NEMAController.cpp
@@ -728,7 +728,10 @@ NEMALogic::getLaneInfoFromNEMAState(std::string state, StringVector& laneIDs, In
         if (ch == 'G') {
             stateIndex.push_back(i);
             for (auto link : myLinks[i]) {
-                laneIDs.push_back(link->getLaneBefore()->getID());
+                const MSLane* incoming = link->getLaneBefore();
+                if (incoming->isNormal()) {
+                    laneIDs.push_back(incoming->getID());
+                }
             }
         }
     }