Skip to content

Commit 5c43260

Browse files
esteveesteve
committed
fix(autoware_static_centerline_generator): fix build issues
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent 8415c9d commit 5c43260

9 files changed

+32
-23
lines changed

‎planning/static_centerline_generator/include/static_centerline_generator/centerline_source/bag_ego_trajectory_based_centerline.hpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717

1818
#include "rclcpp/rclcpp.hpp"
1919
#include "static_centerline_generator/type_alias.hpp"
20+
#include "autoware_auto_planning_msgs/msg/trajectory_point.hpp"
2021

2122
#include <vector>
2223

23-
namespace static_centerline_generator
24+
namespace autoware::static_centerline_generator
2425
{
26+
using ::autoware_auto_planning_msgs::msg::TrajectoryPoint;
2527
std::vector<TrajectoryPoint> generate_centerline_with_bag(rclcpp::Node & node);
26-
} // namespace static_centerline_generator
28+
} // namespace autoware::static_centerline_generator
2729
#endif // STATIC_CENTERLINE_GENERATOR__CENTERLINE_SOURCE__BAG_EGO_TRAJECTORY_BASED_CENTERLINE_HPP_

‎planning/static_centerline_generator/include/static_centerline_generator/centerline_source/optimization_trajectory_based_centerline.hpp

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,20 @@
1616
#define STATIC_CENTERLINE_GENERATOR__CENTERLINE_SOURCE__OPTIMIZATION_TRAJECTORY_BASED_CENTERLINE_HPP_ // NOLINT
1717

1818
#include "rclcpp/rclcpp.hpp"
19+
#include "route_handler/route_handler.hpp"
1920
#include "static_centerline_generator/type_alias.hpp"
21+
#include "autoware_auto_planning_msgs/msg/trajectory_point.hpp"
22+
#include "autoware_auto_planning_msgs/msg/path_with_lane_id.hpp"
23+
#include "autoware_auto_planning_msgs/msg/path.hpp"
2024

2125
#include <vector>
2226

23-
namespace static_centerline_generator
27+
namespace autoware::static_centerline_generator
2428
{
29+
using ::autoware_auto_planning_msgs::msg::TrajectoryPoint;
30+
using ::autoware_auto_planning_msgs::msg::PathWithLaneId;
31+
using ::route_handler::RouteHandler;
32+
using ::autoware_auto_planning_msgs::msg::Path;
2533
class OptimizationTrajectoryBasedCenterline
2634
{
2735
public:
@@ -37,7 +45,7 @@ class OptimizationTrajectoryBasedCenterline
3745
rclcpp::Publisher<PathWithLaneId>::SharedPtr pub_raw_path_with_lane_id_{nullptr};
3846
rclcpp::Publisher<Path>::SharedPtr pub_raw_path_{nullptr};
3947
};
40-
} // namespace static_centerline_generator
48+
} // namespace autoware::static_centerline_generator
4149
// clang-format off
4250
#endif // STATIC_CENTERLINE_GENERATOR__CENTERLINE_SOURCE__OPTIMIZATION_TRAJECTORY_BASED_CENTERLINE_HPP_ // NOLINT
4351
// clang-format on

‎planning/static_centerline_generator/include/static_centerline_generator/static_centerline_generator_node.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#define STATIC_CENTERLINE_GENERATOR__STATIC_CENTERLINE_GENERATOR_NODE_HPP_
1717

1818
#include "rclcpp/rclcpp.hpp"
19-
#include "autoware_static_centerline_generator/centerline_source/optimization_trajectory_based_centerline.hpp"
19+
#include "static_centerline_generator/centerline_source/optimization_trajectory_based_centerline.hpp"
2020
#include "autoware_static_centerline_generator/srv/load_map.hpp"
2121
#include "autoware_static_centerline_generator/srv/plan_path.hpp"
2222
#include "autoware_static_centerline_generator/srv/plan_route.hpp"
23-
#include "autoware_static_centerline_generator/type_alias.hpp"
23+
#include "static_centerline_generator/type_alias.hpp"
2424
#include "vehicle_info_util/vehicle_info_util.hpp"
2525

2626
#include <geography_utils/lanelet2_projector.hpp>
@@ -36,9 +36,9 @@
3636

3737
namespace autoware::static_centerline_generator
3838
{
39-
using autoware::static_centerline_generator::srv::LoadMap;
40-
using autoware::static_centerline_generator::srv::PlanPath;
41-
using autoware::static_centerline_generator::srv::PlanRoute;
39+
using autoware_static_centerline_generator::srv::LoadMap;
40+
using autoware_static_centerline_generator::srv::PlanPath;
41+
using autoware_static_centerline_generator::srv::PlanRoute;
4242
using ::route_handler::RouteHandler;
4343

4444
struct CenterlineWithRoute

‎planning/static_centerline_generator/include/static_centerline_generator/utils.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define STATIC_CENTERLINE_GENERATOR__UTILS_HPP_
1717

1818
#include "route_handler/route_handler.hpp"
19-
#include "autoware_static_centerline_generator/type_alias.hpp"
19+
#include "static_centerline_generator/type_alias.hpp"
2020

2121
#include <rclcpp/time.hpp>
2222

@@ -26,6 +26,8 @@
2626

2727
namespace autoware::static_centerline_generator::utils
2828
{
29+
using ::route_handler::RouteHandler;
30+
2931
rclcpp::QoS create_transient_local_qos();
3032

3133
lanelet::ConstLanelets get_lanelets_from_ids(

‎planning/static_centerline_generator/src/centerline_source/bag_ego_trajectory_based_centerline.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <nav_msgs/msg/odometry.hpp>
2222

23-
namespace static_centerline_generator
23+
namespace autoware::static_centerline_generator
2424
{
2525
std::vector<TrajectoryPoint> generate_centerline_with_bag(rclcpp::Node & node)
2626
{
@@ -79,4 +79,4 @@ std::vector<TrajectoryPoint> generate_centerline_with_bag(rclcpp::Node & node)
7979

8080
return centerline_traj_points;
8181
}
82-
} // namespace static_centerline_generator
82+
} // namespace autoware::static_centerline_generator

‎planning/static_centerline_generator/src/centerline_source/optimization_trajectory_based_centerline.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "static_centerline_generator/utils.hpp"
2323
#include "tier4_autoware_utils/ros/parameter.hpp"
2424

25-
namespace static_centerline_generator
25+
namespace autoware::static_centerline_generator
2626
{
2727
namespace
2828
{
@@ -180,4 +180,4 @@ std::vector<TrajectoryPoint> OptimizationTrajectoryBasedCenterline::optimize_tra
180180

181181
return whole_optimized_traj_points;
182182
}
183-
} // namespace static_centerline_generator
183+
} // namespace autoware::static_centerline_generator

‎planning/static_centerline_generator/src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_static_centerline_generator/static_centerline_generator_node.hpp"
15+
#include "static_centerline_generator/static_centerline_generator_node.hpp"
1616

1717
int main(int argc, char * argv[])
1818
{

‎planning/static_centerline_generator/src/static_centerline_generator_node.cpp

+4-7
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,19 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_static_centerline_generator/static_centerline_generator_node.hpp"
15+
#include "static_centerline_generator/static_centerline_generator_node.hpp"
1616

17-
#include "autoware_static_centerline_optimizer/msg/points_with_lane_id.hpp"
18-
#include "autoware_static_centerline_optimizer/type_alias.hpp"
19-
#include "autoware_static_centerline_optimizer/utils.hpp"
2017
#include "lanelet2_extension/utility/message_conversion.hpp"
2118
#include "lanelet2_extension/utility/query.hpp"
2219
#include "lanelet2_extension/utility/utilities.hpp"
2320
#include "map_loader/lanelet2_map_loader_node.hpp"
2421
#include "map_projection_loader/load_info_from_lanelet2_map.hpp"
2522
#include "motion_utils/resample/resample.hpp"
2623
#include "motion_utils/trajectory/conversion.hpp"
27-
#include "autoware_static_centerline_generator/centerline_source/bag_ego_trajectory_based_centerline.hpp"
24+
#include "static_centerline_generator/centerline_source/bag_ego_trajectory_based_centerline.hpp"
2825
#include "autoware_static_centerline_generator/msg/points_with_lane_id.hpp"
29-
#include "autoware_static_centerline_generator/type_alias.hpp"
30-
#include "autoware_static_centerline_generator/utils.hpp"
26+
#include "static_centerline_generator/type_alias.hpp"
27+
#include "static_centerline_generator/utils.hpp"
3128
#include "obstacle_avoidance_planner/node.hpp"
3229
#include "path_smoother/elastic_band_smoother.hpp"
3330
#include "tier4_autoware_utils/geometry/geometry.hpp"

‎planning/static_centerline_generator/src/utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_static_centerline_generator/utils.hpp"
15+
#include "static_centerline_generator/utils.hpp"
1616

1717
#include "behavior_path_planner_common/data_manager.hpp"
1818
#include "behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp"

0 commit comments

Comments
 (0)