|
@@ -1041,7 +1041,7 @@ static std::vector<PlanPoint> getlinepoint(GeometryLine * pline,const double fsp
|
|
PlanPoint pp;
|
|
PlanPoint pp;
|
|
pp.x = x;
|
|
pp.x = x;
|
|
pp.y = y;
|
|
pp.y = y;
|
|
- pp.dis = i*0.1;
|
|
|
|
|
|
+ pp.dis = i*fspace;
|
|
pp.hdg = pline->GetHdg();
|
|
pp.hdg = pline->GetHdg();
|
|
pp.mS = pline->GetS() + i*fspace;
|
|
pp.mS = pline->GetS() + i*fspace;
|
|
xvectorPP.push_back(pp);
|
|
xvectorPP.push_back(pp);
|
|
@@ -1085,8 +1085,8 @@ static std::vector<PlanPoint> getarcpoint(GeometryArc * parc,const double fspace
|
|
|
|
|
|
pp.x = x;
|
|
pp.x = x;
|
|
pp.y = y;
|
|
pp.y = y;
|
|
- pp.dis = i*0.1;
|
|
|
|
- pp.mS = parc->GetS() + i*0.1;
|
|
|
|
|
|
+ pp.dis = i*fspace;
|
|
|
|
+ pp.mS = parc->GetS() + i*fspace;
|
|
xvectorPP.push_back(pp);
|
|
xvectorPP.push_back(pp);
|
|
}
|
|
}
|
|
return xvectorPP;
|
|
return xvectorPP;
|
|
@@ -1906,6 +1906,11 @@ double getoff(Road * pRoad,int nlane,const double s)
|
|
double fds = s - s_lane - s_section;
|
|
double fds = s - s_lane - s_section;
|
|
double fwidth= pLW->GetA() + pLW->GetB() * fds
|
|
double fwidth= pLW->GetA() + pLW->GetB() * fds
|
|
+pLW->GetC() * pow(fds,2) + pLW->GetD() * pow(fds,3);
|
|
+pLW->GetC() * pow(fds,2) + pLW->GetD() * pow(fds,3);
|
|
|
|
+
|
|
|
|
+// if((pRoad->GetRoadId() == "211210") &&(nlane == -1) &&(pLane->GetId() == -1))
|
|
|
|
+// {
|
|
|
|
+// qDebug("fs is %f width is %f",fds,fwidth);
|
|
|
|
+// }
|
|
if(nlane == pLane->GetId())
|
|
if(nlane == pLane->GetId())
|
|
{
|
|
{
|
|
foff = foff + fwidth/2.0;
|
|
foff = foff + fwidth/2.0;
|