Commit 4ec356e7 authored by oscar's avatar oscar

去除刚启动时候做判断

parent a1081697
...@@ -755,14 +755,18 @@ void JfxEvents::DetectEvents(TrkObjsPtr& objsPtr) ...@@ -755,14 +755,18 @@ void JfxEvents::DetectEvents(TrkObjsPtr& objsPtr)
} }
else if (isChange == 1 || isChange == 2) else if (isChange == 1 || isChange == 2)
{ {
if (objA.stableLaneNum != objA.lastLandNum && objA.stableLaneNum == curLandNum)//变道的原来车道不是稳定车道,并且变过去的是稳定车道就取消变道逻辑 if (objA.stableLaneNum == 0 || (objA.stableLaneNum != objA.lastLandNum && objA.stableLaneNum == curLandNum) )//变道的原来车道不是稳定车道,并且变过去的是稳定车道就取消变道逻辑
{ {
isChange = 0; isChange = 0;
} }
} }
else if (isChange == 3) else if (isChange == 3)
{ {
if (objA.stableRoadId != objA.lastRoadId) if (objA.stableLaneNum == 0)
{
isChange = 0;
}
else if (objA.stableRoadId != objA.lastRoadId)
{ {
std::vector<long>& ntx = m_roadInfos[objA.stableRoadId][objA.stableLaneNum].vctlOutNxtRoadId; std::vector<long>& ntx = m_roadInfos[objA.stableRoadId][objA.stableLaneNum].vctlOutNxtRoadId;
if (std::find(ntx.begin(), ntx.end(), objA.lastRoadId) == ntx.end()) if (std::find(ntx.begin(), ntx.end(), objA.lastRoadId) == ntx.end())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment