|
@@ -1911,6 +1911,10 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
//------------------------------v2x traffic light end--------------------------------------------------------------------------------------
|
|
//------------------------------v2x traffic light end--------------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
+ transferGpsMode2(gpsMapLine);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
if((ServiceCarStatus.msysparam.mvehtype=="hapo")&&(abs(realspeed)<18)){
|
|
if((ServiceCarStatus.msysparam.mvehtype=="hapo")&&(abs(realspeed)<18)){
|
|
if(obsDistance>0 && obsDistance<6){
|
|
if(obsDistance>0 && obsDistance<6){
|
|
dSpeed=0;
|
|
dSpeed=0;
|
|
@@ -3788,4 +3792,11 @@ bool iv::decition::DecideGps00::adjuseultra(){
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
+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);
|
|
|
|
+ }
|
|
|
|
+}
|