|
@@ -435,13 +435,13 @@ static void ToGPSTrace(std::vector<PlanPoint> xPlan)
|
|
|
ShareMap(mapdata);
|
|
|
}
|
|
|
|
|
|
-int avoidroadid[] = {10002,10019,10003,10098,10099,10063};
|
|
|
+int avoidroadid[] = {10002,10019,10003,10098,10099,10063,10099,10100,10104,10110,10111};
|
|
|
|
|
|
inline bool isboringroad(int nroadid)
|
|
|
{
|
|
|
int i;
|
|
|
bool brtn = false;
|
|
|
- for(i=0;i<6;i++)
|
|
|
+ for(i=0;i<11;i++)
|
|
|
{
|
|
|
if(avoidroadid[i] == nroadid)
|
|
|
{
|
|
@@ -529,24 +529,24 @@ void SetPlan(xodrobj xo)
|
|
|
#ifdef BOAVOID
|
|
|
if(isboringroad(xPlan[i].nRoadID))
|
|
|
{
|
|
|
- const int nrangeavoid = 600;
|
|
|
+ const int nrangeavoid = 300;
|
|
|
if((i+(nrangeavoid + 10))<nSize)
|
|
|
{
|
|
|
double fhdg1 = xPlan[i].hdg;
|
|
|
bool bavoid = true;
|
|
|
- int k;
|
|
|
- for(k=0;k<=10;k++)
|
|
|
- {
|
|
|
- double fhdg5 = xPlan[i+nrangeavoid*k/10].hdg;
|
|
|
- double fhdgdiff1 = fhdg5 - fhdg1;
|
|
|
- while(fhdgdiff1<0)fhdgdiff1 = fhdgdiff1 + 2.0*M_PI;
|
|
|
- if((fhdgdiff1>(M_PI/3.0))&&(fhdgdiff1<(5.0*M_PI/3.0)))
|
|
|
- {
|
|
|
- bavoid = false;
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
+// int k;
|
|
|
+// for(k=0;k<=10;k++)
|
|
|
+// {
|
|
|
+// double fhdg5 = xPlan[i+nrangeavoid*k/10].hdg;
|
|
|
+// double fhdgdiff1 = fhdg5 - fhdg1;
|
|
|
+// while(fhdgdiff1<0)fhdgdiff1 = fhdgdiff1 + 2.0*M_PI;
|
|
|
+// if((fhdgdiff1>(M_PI/3.0))&&(fhdgdiff1<(5.0*M_PI/3.0)))
|
|
|
+// {
|
|
|
+// bavoid = false;
|
|
|
+// break;
|
|
|
+// }
|
|
|
+
|
|
|
+// }
|
|
|
if(bavoid)
|
|
|
{
|
|
|
data->roadSum = 2;
|