refactor(goal_distance_calculator): prefix package and namespace with…

… autoware

Signed-off-by: Esteve Fernandez <[email protected]>

common/goal_distance_calculator/CMakeLists.txt

@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.14)
-project(goal_distance_calculator)
+project(autoware_goal_distance_calculator)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
 
-ament_auto_add_library(goal_distance_calculator SHARED
+ament_auto_add_library(${PROJECT_NAME} SHARED
   src/goal_distance_calculator_node.cpp
   src/goal_distance_calculator.cpp
 )
 
-rclcpp_components_register_node(goal_distance_calculator
-  PLUGIN "goal_distance_calculator::GoalDistanceCalculatorNode"
-  EXECUTABLE goal_distance_calculator_node
+rclcpp_components_register_node(${PROJECT_NAME}
+  PLUGIN "autoware::goal_distance_calculator::GoalDistanceCalculatorNode"
+  EXECUTABLE autoware_goal_distance_calculator_node
 )
 
 ament_auto_package(

common/goal_distance_calculator/Readme.md

@@ -1,4 +1,4 @@
-# goal_distance_calculator
+# autoware_goal_distance_calculator
 
 ## Purpose
 

common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator.hpp → common/goal_distance_calculator/include/autoware/goal_distance_calculator/goal_distance_calculator.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
-#define GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
+#ifndef AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
+#define AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
 
 #include <autoware/universe_utils/geometry/pose_deviation.hpp>
 #include <rclcpp/rclcpp.hpp>
@@ -23,7 +23,7 @@
 
 #include <boost/optional.hpp>
 
-namespace goal_distance_calculator
+namespace autoware::goal_distance_calculator
 {
 using autoware::universe_utils::PoseDeviation;
 
@@ -52,6 +52,6 @@ class GoalDistanceCalculator
 private:
   Param param_;
 };
-}  // namespace goal_distance_calculator
+}  // namespace autoware::goal_distance_calculator
 
-#endif  // GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
+#endif  // AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_

common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator_node.hpp → common/goal_distance_calculator/include/autoware/goal_distance_calculator/goal_distance_calculator_node.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
-#define GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
+#ifndef AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
+#define AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
 
 #include "goal_distance_calculator/goal_distance_calculator.hpp"
 
@@ -30,7 +30,7 @@
 
 #include <memory>
 
-namespace goal_distance_calculator
+namespace autoware::goal_distance_calculator
 {
 struct NodeParam
 {
@@ -66,5 +66,5 @@ class GoalDistanceCalculatorNode : public rclcpp::Node
   // Core
   std::unique_ptr<GoalDistanceCalculator> goal_distance_calculator_;
 };
-}  // namespace goal_distance_calculator
-#endif  // GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
+}  // namespace autoware::goal_distance_calculator
+#endif  // AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_

common/goal_distance_calculator/launch/goal_distance_calculator.launch.xml

@@ -1,6 +1,6 @@
 <launch>
   <arg name="config_file" default="$(find-pkg-share goal_distance_calculator)/config/goal_distance_calculator.param.yaml"/>
-  <node pkg="goal_distance_calculator" exec="goal_distance_calculator_node" name="goal_distance_calculator" output="screen">
+  <node pkg="autoware_goal_distance_calculator" exec="autoware_goal_distance_calculator_node" name="autoware_goal_distance_calculator" output="screen">
     <param from="$(var config_file)"/>
   </node>
 </launch>

common/goal_distance_calculator/package.xml

@@ -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>goal_distance_calculator</name>
+  <name>autoware_goal_distance_calculator</name>
   <version>0.0.0</version>
-  <description>The goal_distance_calculator package</description>
+  <description>The autoware_goal_distance_calculator package</description>
   <maintainer email="[email protected]">Taiki Tanaka</maintainer>
   <license>Apache License 2.0</license>
 

common/goal_distance_calculator/src/goal_distance_calculator.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "goal_distance_calculator/goal_distance_calculator.hpp"
+#include "autoware/goal_distance_calculator/goal_distance_calculator.hpp"
 
-namespace goal_distance_calculator
+namespace autoware::goal_distance_calculator
 {
 Output GoalDistanceCalculator::update(const Input & input)
 {
@@ -26,4 +26,4 @@ Output GoalDistanceCalculator::update(const Input & input)
   return output;
 }
 
-}  // namespace goal_distance_calculator
+}  // namespace autoware::goal_distance_calculator

common/goal_distance_calculator/src/goal_distance_calculator_node.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "goal_distance_calculator/goal_distance_calculator_node.hpp"
+#include "autoware/goal_distance_calculator/goal_distance_calculator_node.hpp"
 
 #include <autoware/universe_utils/math/unit_conversion.hpp>
 #include <rclcpp/rclcpp.hpp>
@@ -26,7 +26,7 @@
 #include <string>
 #include <utility>
 
-namespace goal_distance_calculator
+namespace autoware::goal_distance_calculator
 {
 GoalDistanceCalculatorNode::GoalDistanceCalculatorNode(const rclcpp::NodeOptions & options)
 : Node("goal_distance_calculator", options),
@@ -117,7 +117,7 @@ void GoalDistanceCalculatorNode::onTimer()
     rclcpp::shutdown();
   }
 }
-}  // namespace goal_distance_calculator
+}  // namespace autoware::goal_distance_calculator
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(goal_distance_calculator::GoalDistanceCalculatorNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::goal_distance_calculator::GoalDistanceCalculatorNode)