|
@@ -253,6 +253,7 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
|
}else{
|
|
|
circleMode=false;
|
|
|
}
|
|
|
+
|
|
|
// circleMode = true;
|
|
|
|
|
|
|
|
@@ -1853,6 +1854,7 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
|
//------------------------------v2x traffic light end--------------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
+ transferGpsMode2(gpsMapLine);
|
|
|
|
|
|
// if(obsDistance>6.5){
|
|
|
// obsDistance=500;
|
|
@@ -3400,4 +3402,11 @@ float iv::decition::DecideGps00::computeTrafficSpeedLimt(float trafficDis){
|
|
|
return limit;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+void iv::decition::DecideGps00::transferGpsMode2( const std::vector<GPSData> gpsMapLine){
|
|
|
+ if( gpsMapLine[PathPoint]->mode2==3000){
|
|
|
+ if(obsDistance>5){
|
|
|
+ obsDistance=200;
|
|
|
+ }
|
|
|
+ dSpeed=min(dSpeed,5.0);
|
|
|
+ }
|
|
|
+}
|