Skip to content

Commit 0f7a66f

Browse files
committed
build(static_centerline_optimizer): prefix package and namespace with autoware_
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent aa0c633 commit 0f7a66f

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

planning/static_centerline_optimizer/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(static_centerline_optimizer)
2+
project(autoware_static_centerline_optimizer)
33

44
find_package(autoware_cmake REQUIRED)
55

@@ -11,7 +11,7 @@ find_package(Eigen3 REQUIRED)
1111
find_package(OpenCV REQUIRED)
1212

1313
rosidl_generate_interfaces(
14-
static_centerline_optimizer
14+
autoware_static_centerline_optimizer
1515
"srv/LoadMap.srv"
1616
"srv/PlanRoute.srv"
1717
"srv/PlanPath.srv"

planning/static_centerline_optimizer/include/static_centerline_optimizer/static_centerline_optimizer_node.hpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
#include <string>
2727
#include <vector>
2828

29+
namespace autoware
30+
{
2931
namespace static_centerline_optimizer
3032
{
31-
using static_centerline_optimizer::srv::LoadMap;
32-
using static_centerline_optimizer::srv::PlanPath;
33-
using static_centerline_optimizer::srv::PlanRoute;
33+
using autoware::static_centerline_optimizer::srv::LoadMap;
34+
using autoware::static_centerline_optimizer::srv::PlanPath;
35+
using autoware::static_centerline_optimizer::srv::PlanRoute;
3436

3537
class StaticCenterlineOptimizerNode : public rclcpp::Node
3638
{
@@ -86,4 +88,5 @@ class StaticCenterlineOptimizerNode : public rclcpp::Node
8688
vehicle_info_util::VehicleInfo vehicle_info_;
8789
};
8890
} // namespace static_centerline_optimizer
91+
} // namespace autoware
8992
#endif // STATIC_CENTERLINE_OPTIMIZER__STATIC_CENTERLINE_OPTIMIZER_NODE_HPP_

planning/static_centerline_optimizer/include/static_centerline_optimizer/type_alias.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include "autoware_planning_msgs/msg/lanelet_route.hpp"
2727
#include "visualization_msgs/msg/marker_array.hpp"
2828

29+
namespace autoware
30+
{
2931
namespace static_centerline_optimizer
3032
{
3133
using autoware_auto_mapping_msgs::msg::HADMapBin;
@@ -42,5 +44,6 @@ using tier4_autoware_utils::LineString2d;
4244
using tier4_autoware_utils::Point2d;
4345
using visualization_msgs::msg::MarkerArray;
4446
} // namespace static_centerline_optimizer
47+
} // namespace autoware
4548

4649
#endif // STATIC_CENTERLINE_OPTIMIZER__TYPE_ALIAS_HPP_

planning/static_centerline_optimizer/include/static_centerline_optimizer/utils.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
#include <string>
2525
#include <vector>
2626

27+
namespace autoware
28+
{
2729
namespace static_centerline_optimizer
2830
{
2931
namespace utils
@@ -49,5 +51,6 @@ MarkerArray create_distance_text_marker(
4951
const std::array<double, 3> & marker_color, const rclcpp::Time & now, const size_t idx);
5052
} // namespace utils
5153
} // namespace static_centerline_optimizer
54+
} // namespace autoware
5255

5356
#endif // STATIC_CENTERLINE_OPTIMIZER__UTILS_HPP_

planning/static_centerline_optimizer/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>static_centerline_optimizer</name>
4+
<name>autoware_static_centerline_optimizer</name>
55
<version>0.1.0</version>
66
<description>The static_centerline_optimizer package</description>
77
<maintainer email="takayuki.murooka@tier4.jp">Takayuki Murooka</maintainer>

planning/static_centerline_optimizer/src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ int main(int argc, char * argv[])
2121
// initialize node
2222
rclcpp::NodeOptions node_options;
2323
auto node =
24-
std::make_shared<static_centerline_optimizer::StaticCenterlineOptimizerNode>(node_options);
24+
std::make_shared<autoware::static_centerline_optimizer::StaticCenterlineOptimizerNode>(node_options);
2525

2626
// get ros parameter
2727
const bool run_background = node->declare_parameter<bool>("run_background");

planning/static_centerline_optimizer/src/static_centerline_optimizer_node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ void StaticCenterlineOptimizerNode::on_plan_path(
580580

581581
if (!current_lanelet_points.empty()) {
582582
// register points with lane_id
583-
static_centerline_optimizer::msg::PointsWithLaneId points_with_lane_id;
583+
autoware_static_centerline_optimizer::msg::PointsWithLaneId points_with_lane_id;
584584
points_with_lane_id.lane_id = lanelet.id();
585585
points_with_lane_id.points = current_lanelet_points;
586586
response->points_with_lane_ids.push_back(points_with_lane_id);

0 commit comments

Comments
 (0)