Skip to content

Commit

Permalink
refactor(autoware_path_distance_calculator): prefix package and names…
Browse files Browse the repository at this point in the history
…pace with autoware (autowarefoundation#8085)

Signed-off-by: Esteve Fernandez <[email protected]>
  • Loading branch information
esteve authored Aug 6, 2024
1 parent 4c3057a commit b68cce2
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ common/autoware_grid_map_utils/** [email protected]
common/autoware_motion_utils/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
common/autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/** [email protected]
common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/** [email protected]
common/autoware_path_distance_calculator/** [email protected]
common/autoware_perception_rviz_plugin/** [email protected] [email protected] [email protected] [email protected] [email protected]
common/autoware_point_types/** [email protected] [email protected]
common/autoware_test_utils/** [email protected] [email protected] [email protected] [email protected]
Expand All @@ -24,7 +25,6 @@ common/interpolation/** [email protected] [email protected]
common/kalman_filter/** [email protected] [email protected] [email protected]
common/object_recognition_utils/** [email protected] [email protected] [email protected]
common/osqp_interface/** [email protected] [email protected] [email protected] [email protected]
common/path_distance_calculator/** [email protected]
common/perception_utils/** [email protected] [email protected]
common/polar_grid/** [email protected]
common/qp_interface/** [email protected] [email protected] [email protected] [email protected]
Expand Down
2 changes: 1 addition & 1 deletion common/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ nav:
- 'traffic_light_recognition_marker_publisher': common/traffic_light_recognition_marker_publisher/Readme
- 'Node':
- 'Goal Distance Calculator': common/goal_distance_calculator/Readme
- 'Path Distance Calculator': common/path_distance_calculator/Readme
- 'Path Distance Calculator': common/autoware_path_distance_calculator/Readme
- 'Others':
- 'autoware_ad_api_specs': common/autoware_ad_api_specs
- 'component_interface_specs': common/component_interface_specs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(path_distance_calculator)
project(autoware_path_distance_calculator)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand All @@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
)

rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "PathDistanceCalculator"
PLUGIN "autoware::path_distance_calculator::PathDistanceCalculator"
EXECUTABLE ${PROJECT_NAME}_node
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# path_distance_calculator
# autoware_path_distance_calculator

## Purpose

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<launch>
<arg name="path" default="/planning/scenario_planning/lane_driving/behavior_planning/path"/>
<arg name="distance" default="~/distance"/>
<node pkg="path_distance_calculator" exec="path_distance_calculator_node" name="path_distance_calculator">
<node pkg="autoware_path_distance_calculator" exec="path_distance_calculator_node" name="path_distance_calculator">
<remap from="~/input/path" to="$(var path)"/>
<remap from="~/output/distance" to="$(var distance)"/>
</node>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>path_distance_calculator</name>
<name>autoware_path_distance_calculator</name>
<version>0.0.0</version>
<description>The path_distance_calculator package</description>
<description>The autoware_path_distance_calculator package</description>
<maintainer email="[email protected]">Takagi, Isamu</maintainer>
<license>Apache License 2.0</license>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include <utility>
#include <vector>

namespace autoware::path_distance_calculator
{
PathDistanceCalculator::PathDistanceCalculator(const rclcpp::NodeOptions & options)
: Node("path_distance_calculator", options), self_pose_listener_(this)
{
Expand Down Expand Up @@ -54,6 +56,6 @@ PathDistanceCalculator::PathDistanceCalculator(const rclcpp::NodeOptions & optio
pub_dist_->publish(msg);
});
}

} // namespace autoware::path_distance_calculator
#include <rclcpp_components/register_node_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(PathDistanceCalculator)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::path_distance_calculator::PathDistanceCalculator)
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#include <autoware_planning_msgs/msg/path.hpp>
#include <tier4_debug_msgs/msg/float64_stamped.hpp>

namespace autoware::path_distance_calculator
{

class PathDistanceCalculator : public rclcpp::Node
{
public:
Expand All @@ -35,4 +38,6 @@ class PathDistanceCalculator : public rclcpp::Node
autoware::universe_utils::SelfPoseListener self_pose_listener_;
};

} // namespace autoware::path_distance_calculator

#endif // PATH_DISTANCE_CALCULATOR_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<!-- autoware api utils -->
<group>
<push-ros-namespace namespace="autoware_api/utils"/>
<include file="$(find-pkg-share path_distance_calculator)/launch/path_distance_calculator.launch.xml"/>
<include file="$(find-pkg-share autoware_path_distance_calculator)/launch/path_distance_calculator.launch.xml"/>
</group>
</launch>
2 changes: 1 addition & 1 deletion launch/tier4_autoware_api_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<exec_depend>ad_api_adaptors</exec_depend>
<exec_depend>autoware_iv_external_api_adaptor</exec_depend>
<exec_depend>autoware_iv_internal_api_adaptor</exec_depend>
<exec_depend>autoware_path_distance_calculator</exec_depend>
<exec_depend>awapi_awiv_adapter</exec_depend>
<exec_depend>default_ad_api</exec_depend>
<exec_depend>path_distance_calculator</exec_depend>
<exec_depend>rosbridge_server</exec_depend>
<exec_depend>topic_tools</exec_depend>

Expand Down

0 comments on commit b68cce2

Please sign in to comment.