diff --git a/include/opendrive_line.h b/include/opendrive_line.h index 02b87ee8d86ad45ee89b772a259bbc2d2fad600c..02a3cd2ab73a6eafa347819791e7f0b9c650c9c4 100644 --- a/include/opendrive_line.h +++ b/include/opendrive_line.h @@ -5,17 +5,18 @@ class COpendriveLine : public COpendriveGeometry { + friend class COpendriveRoadNode; private: protected: + COpendriveLine(); + COpendriveLine(const COpendriveGeometry &object); virtual bool transform_local_pose(TOpendriveTrackPoint &track,TOpendriveLocalPoint &local) const; virtual void print(std::ostream &out); virtual void load_params(const planView::geometry_type &geometry_info); virtual std::string get_name(void); public: - COpendriveLine(); - COpendriveLine(double min_s, double max_s, double x, double y, double heading); - COpendriveLine(const COpendriveGeometry &object); virtual COpendriveGeometry *clone(void); + virtual void get_curvature(double &start,double &end); void operator=(const COpendriveLine &object); ~COpendriveLine(); }; diff --git a/src/opendrive_line.cpp b/src/opendrive_line.cpp index d0933ccea2cf92796d9fdeedeb566b07b9f78c36..e25c7b6470445ef5293a25622f608e629bf2c5ee 100644 --- a/src/opendrive_line.cpp +++ b/src/opendrive_line.cpp @@ -5,11 +5,6 @@ COpendriveLine::COpendriveLine() } -COpendriveLine::COpendriveLine(double min_s, double max_s, double x, double y, double heading) : COpendriveGeometry(min_s,max_s,x,y,heading) -{ - -} - COpendriveLine::COpendriveLine(const COpendriveGeometry &object) : COpendriveGeometry(object) { @@ -17,7 +12,7 @@ COpendriveLine::COpendriveLine(const COpendriveGeometry &object) : COpendriveGeo bool COpendriveLine::transform_local_pose(TOpendriveTrackPoint &track,TOpendriveLocalPoint &local) const { - local.u=track.s-this->min_s/this->scale_factor; + local.u=track.s; local.v=track.t; local.heading=track.heading; @@ -46,6 +41,12 @@ COpendriveGeometry *COpendriveLine::clone(void) return new_line; } +void COpendriveLine::get_curvature(double &start,double &end) +{ + start=0.0; + end=0.0; +} + void COpendriveLine::operator=(const COpendriveLine &object) { COpendriveGeometry::operator=(object);