Commit aa6be703 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Merge branch 'development' into 'master'

Development

See merge request !1
parents 93c22482 e7e7843e
Pipeline #6452 passed with stages
in 1 minute and 47 seconds
......@@ -68,6 +68,7 @@ class COpendriveObject
bool is_box(void) const;
bool is_cylinder(void) const;
bool is_polygon(void) const;
bool is_parking_space(void) const;
TOpendriveBox get_box_data(void) const;
TOpendriveCylinder get_cylinder_data(void) const;
TOpendrivePolygon get_polygon_data(void) const;
......
......@@ -187,6 +187,14 @@ bool COpendriveObject::is_polygon(void) const
return false;
}
bool COpendriveObject::is_parking_space(void) const
{
if(this->type=="parkingSpace")
return true;
else
return false;
}
TOpendriveBox COpendriveObject::get_box_data(void) const
{
TOpendriveBox data;
......
......@@ -853,7 +853,7 @@ std::vector<const COpendriveRoadSegment *> COpendriveRoadSegment::get_prev_segme
for(unsigned int i=1;i<=this->get_num_right_lanes();i++)
{
const COpendriveLane &lane=this->get_lane(-i);
for(unsigned int j=0;j<lane.get_num_next_lanes();j++)
for(unsigned int j=0;j<lane.get_num_prev_lanes();j++)
{
already_present=false;
for(unsigned int k=0;k<segment_candidates.size();k++)
......@@ -875,7 +875,7 @@ std::vector<const COpendriveRoadSegment *> COpendriveRoadSegment::get_prev_segme
for(unsigned int i=1;i<=this->get_num_left_lanes();i++)
{
const COpendriveLane &lane=this->get_lane(i);
for(unsigned int j=0;j<lane.get_num_next_lanes();j++)
for(unsigned int j=0;j<lane.get_num_prev_lanes();j++)
{
already_present=false;
for(unsigned int k=0;k<segment_candidates.size();k++)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment