Skip to content

Commit 2e03c9b

Browse files
style(pre-commit): autofix
1 parent 2ca6c7b commit 2e03c9b

File tree

2 files changed

+46
-38
lines changed

2 files changed

+46
-38
lines changed

simulator/CARLA_Autoware/carla_gnss_interface/include/carla_gnss_interface/carla_gnss_interface_node.hpp

+21-20
Original file line numberDiff line numberDiff line change
@@ -88,37 +88,38 @@ class GPSPoint
8888
class WayPoint
8989
{
9090
public:
91-
GPSPoint pos;
92-
WayPoint() {}
93-
94-
WayPoint(const double & x, const double & y, const double & z, const double & a)
95-
{
96-
pos.x = x;
97-
pos.y = y;
98-
pos.z = z;
99-
pos.a = a;
100-
}
91+
GPSPoint pos;
92+
WayPoint() {}
93+
94+
WayPoint(const double & x, const double & y, const double & z, const double & a)
95+
{
96+
pos.x = x;
97+
pos.y = y;
98+
pos.z = z;
99+
pos.a = a;
100+
}
101101
};
102102

103-
struct MappingParameters {
104-
std::string proj_str;
105-
WayPoint org;
106-
double lat;
107-
double lon;
108-
double alt;
103+
struct MappingParameters
104+
{
105+
std::string proj_str;
106+
WayPoint org;
107+
double lat;
108+
double lon;
109+
double alt;
109110
};
110111

111112
class MappingUtils
112113
{
113114
public:
114-
MappingUtils();
115-
virtual ~MappingUtils();
115+
MappingUtils();
116+
virtual ~MappingUtils();
116117

117-
static void llaToxyz(const MappingParameters &params, double &x_out, double &y_out, double &z_out);
118+
static void llaToxyz(
119+
const MappingParameters & params, double & x_out, double & y_out, double & z_out);
118120
};
119121

120122
} // namespace gnss
121123
} // namespace interface
122124

123-
124125
#endif // CARLA_GNSS_INTERFACE__CARLA_GNSS_INTERFACE_NODE_HPP_

simulator/CARLA_Autoware/carla_gnss_interface/src/carla_gnss_interface/carla_gnss_interface_node.cpp

+25-18
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,35 @@ namespace interface
2121
namespace gnss
2222
{
2323

24-
MappingUtils::MappingUtils() {}
24+
MappingUtils::MappingUtils()
25+
{
26+
}
2527

26-
MappingUtils::~MappingUtils() {}
28+
MappingUtils::~MappingUtils()
29+
{
30+
}
2731

28-
void MappingUtils::llaToxyz(const MappingParameters &params, double &x_out, double &y_out, double &z_out) {
29-
if (params.proj_str.size() < 8) return;
32+
void MappingUtils::llaToxyz(
33+
const MappingParameters & params, double & x_out, double & y_out, double & z_out)
34+
{
35+
if (params.proj_str.size() < 8) return;
3036

31-
PJ_CONTEXT *C = proj_context_create();
32-
PJ *P = proj_create_crs_to_crs(C, "EPSG:4326", params.proj_str.c_str(), NULL);
37+
PJ_CONTEXT * C = proj_context_create();
38+
PJ * P = proj_create_crs_to_crs(C, "EPSG:4326", params.proj_str.c_str(), NULL);
3339

34-
if (P == nullptr) {
35-
proj_context_destroy(C);
36-
return;
37-
}
40+
if (P == nullptr) {
41+
proj_context_destroy(C);
42+
return;
43+
}
3844

39-
PJ_COORD gps_degrees = proj_coord(params.lat, params.lon, params.alt, 0);
40-
PJ_COORD xyz_out = proj_trans(P, PJ_FWD, gps_degrees);
41-
x_out = xyz_out.enu.e + params.org.pos.x;
42-
y_out = xyz_out.enu.n + params.org.pos.y;
43-
z_out = xyz_out.enu.u + params.org.pos.z;
45+
PJ_COORD gps_degrees = proj_coord(params.lat, params.lon, params.alt, 0);
46+
PJ_COORD xyz_out = proj_trans(P, PJ_FWD, gps_degrees);
47+
x_out = xyz_out.enu.e + params.org.pos.x;
48+
y_out = xyz_out.enu.n + params.org.pos.y;
49+
z_out = xyz_out.enu.u + params.org.pos.z;
4450

45-
proj_destroy(P);
46-
proj_context_destroy(C);
51+
proj_destroy(P);
52+
proj_context_destroy(C);
4753
}
4854
} // namespace gnss
4955
} // namespace interface
@@ -58,7 +64,8 @@ void GnssInterface::GnssCallBack(const sensor_msgs::msg::NavSatFix::SharedPtr ms
5864

5965
// Create MappingParameters struct to hold the parameters
6066
interface::gnss::MappingParameters params;
61-
params.proj_str = "+proj=tmerc +lat_0=0 +lon_0=0 +k=0.9999 +x_0=0 +y_0=0 +ellps=GRS80 +units=m +no_defs";
67+
params.proj_str =
68+
"+proj=tmerc +lat_0=0 +lon_0=0 +k=0.9999 +x_0=0 +y_0=0 +ellps=GRS80 +units=m +no_defs";
6269
params.lat = msg->latitude;
6370
params.lon = msg->longitude;
6471
params.alt = msg->altitude;

0 commit comments

Comments
 (0)