Browse Source

modify roadnow to roadOri

liusunan 3 years ago
parent
commit
aff6f35eb0

+ 4 - 0
src/decition/decition_brain/decition/decide_gps_00.cpp

@@ -986,6 +986,10 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
          gpsMapLine[PathPoint]->runMode=0;
     }
 
+    if(roadNowStart){
+        roadNow=roadOri;
+        roadNowStart=false;
+    }
 
  //   avoidX = (roadOri-roadNow)*roadWidth;
     avoidX=computeAvoidX(roadNow,roadOri,gpsMapLine[PathPoint],ServiceCarStatus.msysparam.vehWidth);

+ 1 - 0
src/decition/decition_brain/decition/decide_gps_00.h

@@ -233,6 +233,7 @@ public:
     double ObsTimeEnd=-1;
     float ObsTimeWidth=1500;
     std::vector<iv::TracePoint> planTrace;
+    bool roadNowStart=true;
 private:
     //  void changeRoad(int roadNum);
 

+ 5 - 0
src/decition/decition_brain_sf/decition/decide_gps_00.cpp

@@ -978,6 +978,11 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
         roadSum = gpsMapLine[PathPoint]->roadSum*3;
     }
 
+    if(roadNowStart){
+        roadNow=roadOri;
+        roadNowStart=false;
+    }
+
     if(ServiceCarStatus.avoidObs){
          gpsMapLine[PathPoint]->runMode=1;
     }else{

+ 2 - 0
src/decition/decition_brain_sf/decition/decide_gps_00.h

@@ -226,6 +226,8 @@ public:
     double ObsTimeEnd=-1;
     float ObsTimeWidth=1500;
     std::vector<iv::TracePoint> planTrace;
+
+    bool roadNowStart=true;
 private:
     //  void changeRoad(int roadNum);