format files

pageldev · pageldev · commit 7332cc2f8207 · 2025-09-10T18:56:09.000Z
diff --git a/include/Lane.h b/include/Lane.h
@@ -37,10 +37,16 @@ struct LaneKey
         return this->road_id == other.road_id && this->lanesection_s0 == other.lanesection_s0 && this->lane_id == other.lane_id;
     }
 
-    bool operator!=(const LaneKey& other) const { return !(*this == other); }
+    bool operator!=(const LaneKey& other) const
+    {
+        return !(*this == other);
+    }
 };
 
-inline std::ostream& operator<<(std::ostream& os, const LaneKey& lk) { return os << lk.to_string(); }
+inline std::ostream& operator<<(std::ostream& os, const LaneKey& lk)
+{
+    return os << lk.to_string();
+}
 
 struct Lane : public XmlNode
 {
diff --git a/include/RoutingGraph.h b/include/RoutingGraph.h
@@ -54,7 +54,10 @@ struct equal_to<odr::RoutingGraphEdge>
 template<>
 struct hash<odr::WeightedLaneKey>
 {
-    size_t operator()(const odr::WeightedLaneKey& w_key) const { return (hash<odr::LaneKey>()(w_key) ^ (hash<double>()(w_key.weight) << 1)); }
+    size_t operator()(const odr::WeightedLaneKey& w_key) const
+    {
+        return (hash<odr::LaneKey>()(w_key) ^ (hash<double>()(w_key.weight) << 1));
+    }
 };
 
 template<>
diff --git a/include/Utils.hpp b/include/Utils.hpp
@@ -33,7 +33,10 @@ namespace odr
 template<class C, class T, T C::*member>
 struct PtrCmp
 {
-    bool operator()(const C* lhs, const C* rhs) const { return (*lhs).*member < (*rhs).*member; }
+    bool operator()(const C* lhs, const C* rhs) const
+    {
+        return (*lhs).*member < (*rhs).*member;
+    }
 };
 
 template<class K, class V>
diff --git a/include/earcut.hpp b/include/earcut.hpp
@@ -38,7 +38,10 @@ namespace util
 template<std::size_t I, typename T>
 struct nth
 {
-    inline static typename std::tuple_element<I, T>::type get(const T& t) { return std::get<I>(t); };
+    inline static typename std::tuple_element<I, T>::type get(const T& t)
+    {
+        return std::get<I>(t);
+    };
 };
 
 } // namespace util
@@ -122,8 +125,14 @@ class Earcut
     {
     public:
         ObjectPool() {}
-        ObjectPool(std::size_t blockSize_) { reset(blockSize_); }
-        ~ObjectPool() { clear(); }
+        ObjectPool(std::size_t blockSize_)
+        {
+            reset(blockSize_);
+        }
+        ~ObjectPool()
+        {
+            clear();
+        }
         template<typename... Args>
         T* construct(Args&&... args)
         {
@@ -148,7 +157,10 @@ class Earcut
             currentBlock = nullptr;
             currentIndex = blockSize;
         }
-        void clear() { reset(blockSize); }
+        void clear()
+        {
+            reset(blockSize);
+        }
 
     private:
         T*                                            currentBlock = nullptr;
diff --git a/src/Geometries/Arc.cpp b/src/Geometries/Arc.cpp
@@ -10,7 +10,10 @@ Arc::Arc(double s0, double x0, double y0, double hdg0, double length, double cur
 {
 }
 
-std::unique_ptr<RoadGeometry> Arc::clone() const { return std::make_unique<Arc>(*this); }
+std::unique_ptr<RoadGeometry> Arc::clone() const
+{
+    return std::make_unique<Arc>(*this);
+}
 
 Vec2D Arc::get_xy(double s) const
 {
diff --git a/src/Geometries/CubicSpline.cpp b/src/Geometries/CubicSpline.cpp
@@ -26,9 +26,15 @@ Poly3::Poly3(double s0, double a, double b, double c, double d)
     this->d = d;
 }
 
-double Poly3::get(double s) const { return a + b * s + c * s * s + d * s * s * s; }
+double Poly3::get(double s) const
+{
+    return a + b * s + c * s * s + d * s * s * s;
+}
 
-double Poly3::get_grad(double s) const { return b + 2 * c * s + 3 * d * s * s; }
+double Poly3::get_grad(double s) const
+{
+    return b + 2 * c * s + 3 * d * s * s;
+}
 
 double Poly3::get_max(double s_start, double s_end) const
 {
@@ -102,7 +108,10 @@ void Poly3::negate()
     d = -d;
 }
 
-bool Poly3::is_zero() const { return (a == 0) && (b == 0) && (c == 0) && (d == 0); }
+bool Poly3::is_zero() const
+{
+    return (a == 0) && (b == 0) && (c == 0) && (d == 0);
+}
 
 void Poly3::set_zero()
 {
@@ -112,11 +121,20 @@ void Poly3::set_zero()
     d = 0;
 }
 
-bool Poly3::isnan() const { return (std::isnan(this->a) || std::isnan(this->b) || std::isnan(this->c) || std::isnan(this->d)); }
+bool Poly3::isnan() const
+{
+    return (std::isnan(this->a) || std::isnan(this->b) || std::isnan(this->c) || std::isnan(this->d));
+}
 
-bool CubicSpline::empty() const { return this->s0_to_poly.empty(); }
+bool CubicSpline::empty() const
+{
+    return this->s0_to_poly.empty();
+}
 
-std::size_t CubicSpline::size() const { return this->s0_to_poly.size(); }
+std::size_t CubicSpline::size() const
+{
+    return this->s0_to_poly.size();
+}
 
 double CubicSpline::get(double s, double default_val, bool extend_start) const
 {
diff --git a/src/Geometries/Line.cpp b/src/Geometries/Line.cpp
@@ -9,7 +9,10 @@ namespace odr
 
 Line::Line(double s0, double x0, double y0, double hdg0, double length) : RoadGeometry(s0, x0, y0, hdg0, length, GeometryType_Line) {}
 
-std::unique_ptr<RoadGeometry> Line::clone() const { return std::make_unique<Line>(*this); }
+std::unique_ptr<RoadGeometry> Line::clone() const
+{
+    return std::make_unique<Line>(*this);
+}
 
 Vec2D Line::get_xy(double s) const
 {
@@ -18,8 +21,14 @@ Vec2D Line::get_xy(double s) const
     return Vec2D{x, y};
 }
 
-Vec2D Line::get_grad(double s) const { return {{std::cos(hdg0), std::sin(hdg0)}}; }
+Vec2D Line::get_grad(double s) const
+{
+    return {{std::cos(hdg0), std::sin(hdg0)}};
+}
 
-std::set<double> Line::approximate_linear(double eps) const { return {s0, s0 + length}; }
+std::set<double> Line::approximate_linear(double eps) const
+{
+    return {s0, s0 + length};
+}
 
 } // namespace odr
diff --git a/src/Geometries/ParamPoly3.cpp b/src/Geometries/ParamPoly3.cpp
@@ -51,7 +51,10 @@ ParamPoly3::ParamPoly3(double s0,
     this->cubic_bezier.valid_length = length;
 }
 
-std::unique_ptr<RoadGeometry> ParamPoly3::clone() const { return std::make_unique<ParamPoly3>(*this); }
+std::unique_ptr<RoadGeometry> ParamPoly3::clone() const
+{
+    return std::make_unique<ParamPoly3>(*this);
+}
 
 Vec2D ParamPoly3::get_xy(double s) const
 {
diff --git a/src/Geometries/Spiral.cpp b/src/Geometries/Spiral.cpp
@@ -18,7 +18,10 @@ Spiral::Spiral(double s0, double x0, double y0, double hdg0, double length, doub
     odrSpiral(s0_spiral, c_dot, &x0_spiral, &y0_spiral, &a0_spiral);
 }
 
-std::unique_ptr<RoadGeometry> Spiral::clone() const { return std::make_unique<Spiral>(*this); }
+std::unique_ptr<RoadGeometry> Spiral::clone() const
+{
+    return std::make_unique<Spiral>(*this);
+}
 
 Vec2D Spiral::get_xy(double s) const
 {
diff --git a/src/Lane.cpp b/src/Lane.cpp
@@ -11,7 +11,10 @@ HeightOffset::HeightOffset(double inner, double outer) : inner(inner), outer(out
 
 LaneKey::LaneKey(std::string road_id, double lanesection_s0, int lane_id) : road_id(road_id), lanesection_s0(lanesection_s0), lane_id(lane_id) {}
 
-std::string LaneKey::to_string() const { return string_format("%s/%.17g/%d", this->road_id.c_str(), this->lanesection_s0, this->lane_id); }
+std::string LaneKey::to_string() const
+{
+    return string_format("%s/%.17g/%d", this->road_id.c_str(), this->lanesection_s0, this->lane_id);
+}
 
 Lane::Lane(std::string road_id, double lanesection_s0, int id, bool level, std::string type) :
     key(road_id, lanesection_s0, id), id(id), level(level), type(type)
diff --git a/src/LaneSection.cpp b/src/LaneSection.cpp
@@ -8,7 +8,10 @@ namespace odr
 {
 LaneSection::LaneSection(std::string road_id, double s0) : road_id(road_id), s0(s0) {}
 
-std::vector<Lane> LaneSection::get_lanes() const { return get_map_values(this->id_to_lane); }
+std::vector<Lane> LaneSection::get_lanes() const
+{
+    return get_map_values(this->id_to_lane);
+}
 
 int LaneSection::get_lane_id(const double s, const double t) const
 {
@@ -38,8 +41,14 @@ int LaneSection::get_lane_id(const double s, const double t) const
     return target_iter->second;
 }
 
-Lane LaneSection::get_lane(const int id) const { return this->id_to_lane.at(id); }
+Lane LaneSection::get_lane(const int id) const
+{
+    return this->id_to_lane.at(id);
+}
 
-Lane LaneSection::get_lane(const double s, const double t) const { return this->id_to_lane.at(this->get_lane_id(s, t)); }
+Lane LaneSection::get_lane(const double s, const double t) const
+{
+    return this->id_to_lane.at(this->get_lane_id(s, t));
+}
 
 } // namespace odr
diff --git a/src/Log.cpp b/src/Log.cpp
@@ -24,7 +24,10 @@ const char* log_level_to_string(const LogLevel level)
 
 static LogFunction _log_callback = [](const LogLevel level, const char* message) { printf("[%s] %s\n", log_level_to_string(level), message); };
 
-void set_log_callback(LogFunction log_function) { _log_callback = log_function; }
+void set_log_callback(LogFunction log_function)
+{
+    _log_callback = log_function;
+}
 
 void log_msg(const LogLevel level, const char* format, ...)
 {
diff --git a/src/OpenDriveMap.cpp b/src/OpenDriveMap.cpp
@@ -681,13 +681,25 @@ OpenDriveMap::OpenDriveMap(const std::string& xodr_file,
     }
 }
 
-Road OpenDriveMap::get_road(const std::string& id) const { return this->id_to_road.at(id); }
+Road OpenDriveMap::get_road(const std::string& id) const
+{
+    return this->id_to_road.at(id);
+}
 
-Junction OpenDriveMap::get_junction(const std::string& id) const { return this->id_to_junction.at(id); }
+Junction OpenDriveMap::get_junction(const std::string& id) const
+{
+    return this->id_to_junction.at(id);
+}
 
-std::vector<Road> OpenDriveMap::get_roads() const { return get_map_values(this->id_to_road); }
+std::vector<Road> OpenDriveMap::get_roads() const
+{
+    return get_map_values(this->id_to_road);
+}
 
-std::vector<Junction> OpenDriveMap::get_junctions() const { return get_map_values(this->id_to_junction); }
+std::vector<Junction> OpenDriveMap::get_junctions() const
+{
+    return get_map_values(this->id_to_junction);
+}
 
 RoadNetworkMesh OpenDriveMap::get_road_network_mesh(const double eps) const
 {
diff --git a/src/Road.cpp b/src/Road.cpp
@@ -50,10 +50,19 @@ RoadNeighbor::RoadNeighbor(std::string id, std::string side, std::string directi
 
 SpeedRecord::SpeedRecord(std::string max, std::string unit) : max(max), unit(unit) {}
 
-std::vector<LaneSection> Road::get_lanesections() const { return get_map_values(this->s_to_lanesection); }
-std::vector<RoadObject>  Road::get_road_objects() const { return get_map_values(this->id_to_object); }
+std::vector<LaneSection> Road::get_lanesections() const
+{
+    return get_map_values(this->s_to_lanesection);
+}
+std::vector<RoadObject> Road::get_road_objects() const
+{
+    return get_map_values(this->id_to_object);
+}
 
-std::vector<RoadSignal> Road::get_road_signals() const { return get_map_values(this->id_to_signal); }
+std::vector<RoadSignal> Road::get_road_signals() const
+{
+    return get_map_values(this->id_to_signal);
+}
 
 Road::Road(std::string id, double length, std::string junction, std::string name, bool left_hand_traffic) :
     length(length), id(id), junction(junction), name(name), left_hand_traffic(left_hand_traffic), ref_line(id, length)
@@ -84,7 +93,10 @@ LaneSection Road::get_lanesection(const double s) const
     return this->s_to_lanesection.at(lanesec_s0);
 }
 
-double Road::get_lanesection_end(const LaneSection& lanesection) const { return this->get_lanesection_end(lanesection.s0); }
+double Road::get_lanesection_end(const LaneSection& lanesection) const
+{
+    return this->get_lanesection_end(lanesection.s0);
+}
 
 double Road::get_lanesection_end(const double lanesection_s0) const
 {
diff --git a/src/RoadNetworkMesh.cpp b/src/RoadNetworkMesh.cpp
@@ -40,7 +40,10 @@ double LanesMesh::get_lanesec_s0(const std::size_t vert_idx) const
     return get_nearest_lower_val<size_t, double>(this->lanesec_start_indices, vert_idx);
 }
 
-int LanesMesh::get_lane_id(const std::size_t vert_idx) const { return get_nearest_lower_val<size_t, int>(this->lane_start_indices, vert_idx); }
+int LanesMesh::get_lane_id(const std::size_t vert_idx) const
+{
+    return get_nearest_lower_val<size_t, int>(this->lane_start_indices, vert_idx);
+}
 
 std::array<size_t, 2> RoadsMesh::get_idx_interval_road(const std::size_t vert_idx) const
 {
@@ -57,7 +60,10 @@ std::array<size_t, 2> LanesMesh::get_idx_interval_lane(const std::size_t vert_id
     return get_key_interval<size_t, int>(this->lane_start_indices, vert_idx, this->vertices.size());
 }
 
-std::vector<size_t> LanesMesh::get_lane_outline_indices() const { return get_outline_indices<int>(this->lane_start_indices, this->vertices.size()); }
+std::vector<size_t> LanesMesh::get_lane_outline_indices() const
+{
+    return get_outline_indices<int>(this->lane_start_indices, this->vertices.size());
+}
 
 std::string RoadmarksMesh::get_roadmark_type(const std::size_t vert_idx) const
 {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,10 @@ Arc::Arc(double s0, double x0, double y0, double hdg0, double length, double cur`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`13`		`-std::unique_ptr<RoadGeometry> Arc::clone() const { return std::make_unique<Arc>(*this); }`
	`13`	`+std::unique_ptr<RoadGeometry> Arc::clone() const`
	`14`	`+{`
	`15`	`+ return std::make_unique<Arc>(*this);`
	`16`	`+}`
`14`	`17`
`15`	`18`	`Vec2D Arc::get_xy(double s) const`
`16`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,10 @@ ParamPoly3::ParamPoly3(double s0,`
`51`	`51`	`this->cubic_bezier.valid_length = length;`
`52`	`52`	`}`
`53`	`53`
`54`		`-std::unique_ptr<RoadGeometry> ParamPoly3::clone() const { return std::make_unique<ParamPoly3>(*this); }`
	`54`	`+std::unique_ptr<RoadGeometry> ParamPoly3::clone() const`
	`55`	`+{`
	`56`	`+ return std::make_unique<ParamPoly3>(*this);`
	`57`	`+}`
`55`	`58`
`56`	`59`	`Vec2D ParamPoly3::get_xy(double s) const`
`57`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@ Spiral::Spiral(double s0, double x0, double y0, double hdg0, double length, doub`
`18`	`18`	`odrSpiral(s0_spiral, c_dot, &x0_spiral, &y0_spiral, &a0_spiral);`
`19`	`19`	`}`
`20`	`20`
`21`		`-std::unique_ptr<RoadGeometry> Spiral::clone() const { return std::make_unique<Spiral>(*this); }`
	`21`	`+std::unique_ptr<RoadGeometry> Spiral::clone() const`
	`22`	`+{`
	`23`	`+ return std::make_unique<Spiral>(*this);`
	`24`	`+}`
`22`	`25`
`23`	`26`	`Vec2D Spiral::get_xy(double s) const`
`24`	`27`	`{`