Merge branch 'development' into 'master'

Development

See merge request !1

include/opendrive_object.h

@@ -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;

src/opendrive_object.cpp

@@ -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;

src/opendrive_road_segment.cpp

@@ -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++)