更新gps_type.h

src/decition/decition_brain_sf_jsguide_new/JS_build_files.txt

@@ -0,0 +1,6 @@
+driver_cloud_grpc_client_BS
+driver_map_trace
+driver_map_xodrload
+ui_ads_hmi
+tool_xodrobj
+decition_brain_sf_jsguide

src/driver/driver_cloud_grpc_client_BS/gps_type.h

@@ -19,6 +19,13 @@ namespace iv {
         double gps_y = 0;
         double gps_z = 0;
 
+        double frenet_s=0;
+        double frenet_s_dot=0;
+        double frenet_s_dot_dot=0;
+        double frenet_d=0;
+        double frenet_d_dot=0;
+        double frenet_d_dot_dot=0;
+
         double ins_roll_angle = 0;	//横滚角 一般定义载体的右、前、上三个方向构成右手系，绕向前的轴旋转就是横滚角，绕向右的轴旋转就是俯仰角，绕向上的轴旋转就是航向角
         double ins_pitch_angle = 0;	//俯仰角
         double ins_heading_angle = 0;	//航向角
@@ -75,24 +82,38 @@ namespace iv {
         int mnreserved[5];
         double mfreserved[2];
 
+
+
     };
 
     typedef boost::shared_ptr<iv::GPS_INS> GPSData;
-     class Point2D
-    {
-      public:
-         double x = 0, y = 0, speed=0;
-         int v1 = 0, v2 = 0;
-
-         Point2D()
-        {
-            x = y = v1 = 0;
-        }
-
-         Point2D(double _x, double _y)
-        {
-            x = _x; y = _y;
-        }
-     };
+    class Point2D
+   {
+     public:
+        double x = 0, y = 0, speed=0,obs_speed_x=0,obs_speed_y=0;
+        int v1 = 0, v2 = 0;
+        int roadMode = 0;
+        int obs_type=0;
+
+        double s=0;   //frenet coordinate : s,d;   add at 20220209
+        double d=0;
+
+
+        Point2D()
+       {
+           x = y = v1 = 0;
+       }
+
+        Point2D(double _x, double _y)
+       {
+           x = _x; y = _y;
+       }
+
+
+    };
+
+
+
+
 }
 #endif // !_IV_COMMON_GPS_TYPE_

src/driver/driver_map_trace/gps_type.h

@@ -19,6 +19,13 @@ namespace iv {
         double gps_y = 0;
         double gps_z = 0;
 
+        double frenet_s=0;
+        double frenet_s_dot=0;
+        double frenet_s_dot_dot=0;
+        double frenet_d=0;
+        double frenet_d_dot=0;
+        double frenet_d_dot_dot=0;
+
         double ins_roll_angle = 0;	//横滚角 一般定义载体的右、前、上三个方向构成右手系，绕向前的轴旋转就是横滚角，绕向右的轴旋转就是俯仰角，绕向上的轴旋转就是航向角
         double ins_pitch_angle = 0;	//俯仰角
         double ins_heading_angle = 0;	//航向角
@@ -80,24 +87,30 @@ namespace iv {
     };
 
     typedef boost::shared_ptr<iv::GPS_INS> GPSData;
-     class Point2D
-    {
-      public:
-          double x = 0, y = 0, speed=0;
-         int v1 = 0, v2 = 0;
+    class Point2D
+   {
+     public:
+        double x = 0, y = 0, speed=0,obs_speed_x=0,obs_speed_y=0;
+        int v1 = 0, v2 = 0;
+        int roadMode = 0;
+        int obs_type=0;
+
+        double s=0;   //frenet coordinate : s,d;   add at 20220209
+        double d=0;
 
-         Point2D()
-        {
-            x = y = v1 = 0;
-        }
 
-         Point2D(double _x, double _y)
-        {
-            x = _x; y = _y;
-        }
+        Point2D()
+       {
+           x = y = v1 = 0;
+       }
 
+        Point2D(double _x, double _y)
+       {
+           x = _x; y = _y;
+       }
 
-     };
+
+    };
 
 
 

src/driver/driver_map_xodrload/gps_type.h

@@ -19,6 +19,13 @@ namespace iv {
         double gps_y = 0;
         double gps_z = 0;
 
+        double frenet_s=0;
+        double frenet_s_dot=0;
+        double frenet_s_dot_dot=0;
+        double frenet_d=0;
+        double frenet_d_dot=0;
+        double frenet_d_dot_dot=0;
+
         double ins_roll_angle = 0;	//横滚角 一般定义载体的右、前、上三个方向构成右手系，绕向前的轴旋转就是横滚角，绕向右的轴旋转就是俯仰角，绕向上的轴旋转就是航向角
         double ins_pitch_angle = 0;	//俯仰角
         double ins_heading_angle = 0;	//航向角
@@ -80,24 +87,30 @@ namespace iv {
     };
 
     typedef boost::shared_ptr<iv::GPS_INS> GPSData;
-     class Point2D
-    {
-      public:
-          double x = 0, y = 0, speed=0;
-         int v1 = 0, v2 = 0;
+    class Point2D
+   {
+     public:
+        double x = 0, y = 0, speed=0,obs_speed_x=0,obs_speed_y=0;
+        int v1 = 0, v2 = 0;
+        int roadMode = 0;
+        int obs_type=0;
+
+        double s=0;   //frenet coordinate : s,d;   add at 20220209
+        double d=0;
 
-         Point2D()
-        {
-            x = y = v1 = 0;
-        }
 
-         Point2D(double _x, double _y)
-        {
-            x = _x; y = _y;
-        }
+        Point2D()
+       {
+           x = y = v1 = 0;
+       }
 
+        Point2D(double _x, double _y)
+       {
+           x = _x; y = _y;
+       }
 
-     };
+
+    };
 
 
 

src/tool/tool_xodrobj/gps_type.h

@@ -19,6 +19,13 @@ namespace iv {
         double gps_y = 0;
         double gps_z = 0;
 
+        double frenet_s=0;
+        double frenet_s_dot=0;
+        double frenet_s_dot_dot=0;
+        double frenet_d=0;
+        double frenet_d_dot=0;
+        double frenet_d_dot_dot=0;
+
         double ins_roll_angle = 0;	//横滚角 一般定义载体的右、前、上三个方向构成右手系，绕向前的轴旋转就是横滚角，绕向右的轴旋转就是俯仰角，绕向上的轴旋转就是航向角
         double ins_pitch_angle = 0;	//俯仰角
         double ins_heading_angle = 0;	//航向角
@@ -80,24 +87,30 @@ namespace iv {
     };
 
     typedef boost::shared_ptr<iv::GPS_INS> GPSData;
-     class Point2D
-    {
-      public:
-          double x = 0, y = 0, speed=0;
-         int v1 = 0, v2 = 0;
+    class Point2D
+   {
+     public:
+        double x = 0, y = 0, speed=0,obs_speed_x=0,obs_speed_y=0;
+        int v1 = 0, v2 = 0;
+        int roadMode = 0;
+        int obs_type=0;
+
+        double s=0;   //frenet coordinate : s,d;   add at 20220209
+        double d=0;
 
-         Point2D()
-        {
-            x = y = v1 = 0;
-        }
 
-         Point2D(double _x, double _y)
-        {
-            x = _x; y = _y;
-        }
+        Point2D()
+       {
+           x = y = v1 = 0;
+       }
 
+        Point2D(double _x, double _y)
+       {
+           x = _x; y = _y;
+       }
 
-     };
+
+    };
 
 
 

src/ui/ui_ads_hmi/common/gps_type.h

@@ -19,6 +19,13 @@ namespace iv {
         double gps_y = 0;
         double gps_z = 0;
 
+        double frenet_s=0;
+        double frenet_s_dot=0;
+        double frenet_s_dot_dot=0;
+        double frenet_d=0;
+        double frenet_d_dot=0;
+        double frenet_d_dot_dot=0;
+
         double ins_roll_angle = 0;	//横滚角 一般定义载体的右、前、上三个方向构成右手系，绕向前的轴旋转就是横滚角，绕向右的轴旋转就是俯仰角，绕向上的轴旋转就是航向角
         double ins_pitch_angle = 0;	//俯仰角
         double ins_heading_angle = 0;	//航向角
@@ -88,6 +95,9 @@ namespace iv {
         int roadMode = 0;
         int obs_type=0;
 
+        double s=0;   //frenet coordinate : s,d;   add at 20220209
+        double d=0;
+
 
         Point2D()
        {

src/ui/xviz_civetweb/common/gps_type.h

@@ -19,6 +19,13 @@ namespace iv {
         double gps_y = 0;
         double gps_z = 0;
 
+        double frenet_s=0;
+        double frenet_s_dot=0;
+        double frenet_s_dot_dot=0;
+        double frenet_d=0;
+        double frenet_d_dot=0;
+        double frenet_d_dot_dot=0;
+
         double ins_roll_angle = 0;	//横滚角 一般定义载体的右、前、上三个方向构成右手系，绕向前的轴旋转就是横滚角，绕向右的轴旋转就是俯仰角，绕向上的轴旋转就是航向角
         double ins_pitch_angle = 0;	//俯仰角
         double ins_heading_angle = 0;	//航向角
@@ -88,6 +95,9 @@ namespace iv {
         int roadMode = 0;
         int obs_type=0;
 
+        double s=0;   //frenet coordinate : s,d;   add at 20220209
+        double d=0;
+
 
         Point2D()
        {

src/v2x/platform/common/gps_type.h

@@ -19,6 +19,13 @@ namespace iv {
         double gps_y = 0;
         double gps_z = 0;
 
+        double frenet_s=0;
+        double frenet_s_dot=0;
+        double frenet_s_dot_dot=0;
+        double frenet_d=0;
+        double frenet_d_dot=0;
+        double frenet_d_dot_dot=0;
+
         double ins_roll_angle = 0;	//横滚角 一般定义载体的右、前、上三个方向构成右手系，绕向前的轴旋转就是横滚角，绕向右的轴旋转就是俯仰角，绕向上的轴旋转就是航向角
         double ins_pitch_angle = 0;	//俯仰角
         double ins_heading_angle = 0;	//航向角
@@ -80,24 +87,30 @@ namespace iv {
     };
 
     typedef boost::shared_ptr<iv::GPS_INS> GPSData;
-     class Point2D
-    {
-      public:
-          double x = 0, y = 0, speed=0;
-         int v1 = 0, v2 = 0;
+    class Point2D
+   {
+     public:
+        double x = 0, y = 0, speed=0,obs_speed_x=0,obs_speed_y=0;
+        int v1 = 0, v2 = 0;
+        int roadMode = 0;
+        int obs_type=0;
+
+        double s=0;   //frenet coordinate : s,d;   add at 20220209
+        double d=0;
 
-         Point2D()
-        {
-            x = y = v1 = 0;
-        }
 
-         Point2D(double _x, double _y)
-        {
-            x = _x; y = _y;
-        }
+        Point2D()
+       {
+           x = y = v1 = 0;
+       }
 
+        Point2D(double _x, double _y)
+       {
+           x = _x; y = _y;
+       }
 
-     };
+
+    };