Adapt eclipse-sumo#5527 fix for case ENCOUNTER_TYPE_FOLLOWING_LEADER

Signed-off-by: m-kro <m.barthauer@t-online.de>
m-kro · May 5, 2019 · d1fa90b · d1fa90b
1 parent 00a18e6
commit d1fa90b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/microsim/devices/MSDevice_SSM.cpp b/src/microsim/devices/MSDevice_SSM.cpp
@@ -45,13 +45,13 @@
 // ===========================================================================
 // Debug constants
 // ===========================================================================
-//#define DEBUG_SSM
+#define DEBUG_SSM
 //#define DEBUG_SSM_DRAC
 //#define DEBUG_SSM_SURROUNDING
 //#define DEBUG_SSM_NOTIFICATIONS
 //#define DEBUG_COND MSNet::getInstance()->getCurrentTimeStep() > 308000
 //#define DEBUG_COND1(ego) MSNet::getInstance()->getCurrentTimeStep() > 308000
-//#define DEBUG_COND1(ego) ego!=nullptr && ego->isSelected()
+#define DEBUG_COND1(ego) ego!=nullptr && ego->isSelected()
 //#define DEBUG_COND1(ego) ego!=nullptr && ego->getID() == "ego1"
 #define DEBUG_COND false
 
@@ -1871,6 +1871,9 @@ MSDevice_SSM::classifyEncounter(const FoeInfo* foeInfo, EncounterApproachInfo& e
                     // ego on junction, foe not yet
                     type = ENCOUNTER_TYPE_FOLLOWING_LEADER;
                     eInfo.foeConflictEntryDist = foeDistToConflictLane + e->ego->getBackPositionOnLane();
+                    if (e->ego->getLane()->getIncomingLanes()[0].lane->isInternal()) {
+                        eInfo.foeConflictEntryDist += e->ego->getLane()->getIncomingLanes()[0].lane->getLength();
+                    }
 #ifdef DEBUG_SSM
                     if (DEBUG_COND1(myHolderMS))
                         std::cout << "-> Encounter type: Ego '" << e->ego->getID() << "' on lane '" << egoLane->getID() << "' leads foe '"