diff --git a/include/opendrive_geometry.h b/include/opendrive_geometry.h index a49f6700825e70e620dc572e08f7337986fb0c60..6296d80e0212118fb13e62421bc14e6b792f8624 100644 --- a/include/opendrive_geometry.h +++ b/include/opendrive_geometry.h @@ -13,6 +13,8 @@ class COpendriveGeometry friend class COpendriveRoadNode; private: protected: + COpendriveGeometry(); + COpendriveGeometry(const COpendriveGeometry &object); void load(const planView::geometry_type &geometry_info); double scale_factor; double min_s; ///< Starting track coordenate "s" for the geometry. @@ -24,14 +26,12 @@ class COpendriveGeometry virtual std::string get_name(void)=0; void set_scale_factor(double scale); public: - COpendriveGeometry(); - COpendriveGeometry(double min_s, double max_s, double x, double y, double heading); - COpendriveGeometry(const COpendriveGeometry &object); virtual COpendriveGeometry *clone(void) = 0; bool get_local_pose(TOpendriveTrackPoint &track,TOpendriveLocalPoint &local) const; bool get_world_pose(TOpendriveTrackPoint &track,TOpendriveWorldPoint &world) const; bool in_range(double s) const; double get_length(void) const; + virtual void get_curvature(double &start,double &end)=0; void operator=(const COpendriveGeometry &object); friend std::ostream& operator<<(std::ostream& out, COpendriveGeometry &geom); virtual ~COpendriveGeometry(); diff --git a/src/opendrive_geometry.cpp b/src/opendrive_geometry.cpp index 4f8779b4f52b349a52b53307818456810565595e..84ad25bab5831bf44a84f293dbc5887235a6b07e 100644 --- a/src/opendrive_geometry.cpp +++ b/src/opendrive_geometry.cpp @@ -11,16 +11,6 @@ COpendriveGeometry::COpendriveGeometry() this->scale_factor=DEFAULT_SCALE_FACTOR; } -COpendriveGeometry::COpendriveGeometry(double min_s, double max_s, double x, double y, double heading) -{ - this->min_s = min_s; - this->max_s = max_s; - this->pose.x = x; - this->pose.y = y; - this->pose.heading = heading; - this->scale_factor=DEFAULT_SCALE_FACTOR; -} - COpendriveGeometry::COpendriveGeometry(const COpendriveGeometry &object) { this->min_s = object.min_s;