Revert "refactor(crosswalk_traffic_light_estimator)!: add autoware_ p…

…refix (#7365)" This reverts commit d37dbb9. Signed-off-by: Taekjin LEE <[email protected]>
autowarefoundation · Jun 12, 2024 · 28d0210 · 28d0210
1 parent 763c112
commit 28d0210
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 22 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -104,7 +104,7 @@ map/map_loader/** [email protected] [email protected] koji.minoda@ti
 map/map_projection_loader/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 map/map_tf_generator/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 map/util/lanelet2_map_preprocessor/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
-perception/autoware_crosswalk_traffic_light_estimator/** [email protected] [email protected] [email protected]
+perception/crosswalk_traffic_light_estimator/** [email protected] [email protected] [email protected]
 perception/autoware_map_based_prediction/** [email protected] [email protected] [email protected] [email protected] [email protected]
 perception/bytetrack/** [email protected] [email protected]
 perception/cluster_merger/** [email protected] [email protected] [email protected]

diff --git a/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml b/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml
@@ -17,7 +17,7 @@
   <arg name="external/traffic_signals" default="/perception/traffic_light_recognition/external/traffic_signals"/>
   <arg name="output/traffic_signals" default="/perception/traffic_light_recognition/traffic_signals"/>
   <arg name="use_crosswalk_traffic_light_estimator" default="true" description="output pedestrian's traffic light signals"/>
-  <arg name="crosswalk_traffic_light_estimator_param_file" default="$(find-pkg-share autoware_crosswalk_traffic_light_estimator)/config/crosswalk_traffic_light_estimator.param.yaml"/>
+  <arg name="crosswalk_traffic_light_estimator_param_file" default="$(find-pkg-share crosswalk_traffic_light_estimator)/config/crosswalk_traffic_light_estimator.param.yaml"/>
   <arg name="image_number" default="1" description="choose image raw number(1-2)"/>
   <arg name="namespace1" default="camera6"/>
   <arg name="namespace2" default="camera7"/>
@@ -158,7 +158,7 @@
   </group>
 
   <group if="$(var use_crosswalk_traffic_light_estimator)">
-    <node pkg="autoware_crosswalk_traffic_light_estimator" exec="crosswalk_traffic_light_estimator_node" name="crosswalk_traffic_light_estimator" output="screen">
+    <node pkg="crosswalk_traffic_light_estimator" exec="crosswalk_traffic_light_estimator_node" name="crosswalk_traffic_light_estimator" output="screen">
       <remap from="~/input/vector_map" to="/map/vector_map"/>
       <remap from="~/input/route" to="/planning/mission_planning/route"/>
       <remap from="~/input/classified/traffic_signals" to="$(var judged/traffic_signals)"/>

diff --git a/launch/tier4_perception_launch/package.xml b/launch/tier4_perception_launch/package.xml
@@ -12,10 +12,10 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
-  <exec_depend>autoware_crosswalk_traffic_light_estimator</exec_depend>
   <exec_depend>autoware_map_based_prediction</exec_depend>
   <exec_depend>cluster_merger</exec_depend>
   <exec_depend>compare_map_segmentation</exec_depend>
+  <exec_depend>crosswalk_traffic_light_estimator</exec_depend>
   <exec_depend>detected_object_feature_remover</exec_depend>
   <exec_depend>detected_object_validation</exec_depend>
   <exec_depend>detection_by_tracker</exec_depend>

diff --git a/...lk_traffic_light_estimator/CMakeLists.txt → ...lk_traffic_light_estimator/CMakeLists.txt b/...lk_traffic_light_estimator/CMakeLists.txt → ...lk_traffic_light_estimator/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(autoware_crosswalk_traffic_light_estimator)
+project(crosswalk_traffic_light_estimator)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -10,12 +10,12 @@ autoware_package()
 
 include_directories()
 
-ament_auto_add_library(autoware_crosswalk_traffic_light_estimator SHARED
+ament_auto_add_library(crosswalk_traffic_light_estimator SHARED
   src/node.cpp
 )
 
-rclcpp_components_register_node(autoware_crosswalk_traffic_light_estimator
-  PLUGIN "autoware::crosswalk_traffic_light_estimator::CrosswalkTrafficLightEstimatorNode"
+rclcpp_components_register_node(crosswalk_traffic_light_estimator
+  PLUGIN "traffic_light::CrosswalkTrafficLightEstimatorNode"
   EXECUTABLE crosswalk_traffic_light_estimator_node
 )
 

diff --git a/...osswalk_traffic_light_estimator/README.md → ...osswalk_traffic_light_estimator/README.md b/...osswalk_traffic_light_estimator/README.md → ...osswalk_traffic_light_estimator/README.md
diff --git a/...sswalk_traffic_light_estimator.param.yaml → ...sswalk_traffic_light_estimator.param.yaml b/...sswalk_traffic_light_estimator.param.yaml → ...sswalk_traffic_light_estimator.param.yaml
diff --git a/..._light_estimator/images/intersection1.svg → ..._light_estimator/images/intersection1.svg b/..._light_estimator/images/intersection1.svg → ..._light_estimator/images/intersection1.svg
diff --git a/..._light_estimator/images/intersection2.svg → ..._light_estimator/images/intersection2.svg b/..._light_estimator/images/intersection2.svg → ..._light_estimator/images/intersection2.svg
diff --git a/...ight_estimator/images/straight.drawio.svg → ...ight_estimator/images/straight.drawio.svg b/...ight_estimator/images/straight.drawio.svg → ...ight_estimator/images/straight.drawio.svg
diff --git a/...rosswalk_traffic_light_estimator/node.hpp → ...rosswalk_traffic_light_estimator/node.hpp b/...rosswalk_traffic_light_estimator/node.hpp → ...rosswalk_traffic_light_estimator/node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_CROSSWALK_TRAFFIC_LIGHT_ESTIMATOR__NODE_HPP_
-#define AUTOWARE_CROSSWALK_TRAFFIC_LIGHT_ESTIMATOR__NODE_HPP_
+#ifndef CROSSWALK_TRAFFIC_LIGHT_ESTIMATOR__NODE_HPP_
+#define CROSSWALK_TRAFFIC_LIGHT_ESTIMATOR__NODE_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 #include <tier4_autoware_utils/ros/debug_publisher.hpp>
@@ -36,7 +36,7 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-namespace autoware::crosswalk_traffic_light_estimator
+namespace traffic_light
 {
 
 using autoware_map_msgs::msg::LaneletMapBin;
@@ -117,6 +117,6 @@ class CrosswalkTrafficLightEstimatorNode : public rclcpp::Node
   std::shared_ptr<DebugPublisher> pub_processing_time_;
 };
 
-}  // namespace autoware::crosswalk_traffic_light_estimator
+}  // namespace traffic_light
 
-#endif  // AUTOWARE_CROSSWALK_TRAFFIC_LIGHT_ESTIMATOR__NODE_HPP_
+#endif  // CROSSWALK_TRAFFIC_LIGHT_ESTIMATOR__NODE_HPP_
diff --git a/...sswalk_traffic_light_estimator.launch.xml → ...sswalk_traffic_light_estimator.launch.xml b/...sswalk_traffic_light_estimator.launch.xml → ...sswalk_traffic_light_estimator.launch.xml
@@ -11,9 +11,9 @@
   limitations under the License.
 -->
 <launch>
-  <arg name="crosswalk_traffic_light_estimator_param_file" default="$(find-pkg-share autoware_crosswalk_traffic_light_estimator)/config/crosswalk_traffic_light_estimator.param.yaml"/>
+  <arg name="crosswalk_traffic_light_estimator_param_file" default="$(find-pkg-share crosswalk_traffic_light_estimator)/config/crosswalk_traffic_light_estimator.param.yaml"/>
 
-  <node pkg="autoware_crosswalk_traffic_light_estimator" exec="crosswalk_traffic_light_estimator_node" name="crosswalk_traffic_light_estimator" output="screen">
+  <node pkg="crosswalk_traffic_light_estimator" exec="crosswalk_traffic_light_estimator_node" name="crosswalk_traffic_light_estimator" output="screen">
     <remap from="~/input/vector_map" to="/map/vector_map"/>
     <remap from="~/input/route" to="/planning/mission_planning/route"/>
     <remap from="~/input/classified/traffic_signals" to="classified/traffic_signals"/>

diff --git a/...swalk_traffic_light_estimator/package.xml → ...swalk_traffic_light_estimator/package.xml b/...swalk_traffic_light_estimator/package.xml → ...swalk_traffic_light_estimator/package.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package format="2">
-  <name>autoware_crosswalk_traffic_light_estimator</name>
+  <name>crosswalk_traffic_light_estimator</name>
   <version>0.1.0</version>
-  <description>The autoware_crosswalk_traffic_light_estimator package</description>
+  <description>The crosswalk_traffic_light_estimator package</description>
 
   <maintainer email="[email protected]">Satoshi Ota</maintainer>
   <maintainer email="[email protected]">Shunsuke Miura</maintainer>

diff --git a/...swalk_traffic_light_estimator.schema.json → ...swalk_traffic_light_estimator.schema.json b/...swalk_traffic_light_estimator.schema.json → ...swalk_traffic_light_estimator.schema.json
diff --git a/...walk_traffic_light_estimator/src/node.cpp → ...walk_traffic_light_estimator/src/node.cpp b/...walk_traffic_light_estimator/src/node.cpp → ...walk_traffic_light_estimator/src/node.cpp
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "autoware_crosswalk_traffic_light_estimator/node.hpp"
+#include "crosswalk_traffic_light_estimator/node.hpp"
 
 #include <lanelet2_extension/regulatory_elements/Forward.hpp>
 #include <lanelet2_extension/utility/message_conversion.hpp>
@@ -21,7 +21,7 @@
 #include <utility>
 #include <vector>
 
-namespace autoware::crosswalk_traffic_light_estimator
+namespace traffic_light
 {
 namespace
 {
@@ -538,9 +538,8 @@ void CrosswalkTrafficLightEstimatorNode::removeDuplicateIds(TrafficSignalArray &
     signals.end());
 }
 
-}  // namespace autoware::crosswalk_traffic_light_estimator
+}  // namespace traffic_light
 
 #include <rclcpp_components/register_node_macro.hpp>
 
-RCLCPP_COMPONENTS_REGISTER_NODE(
-  autoware::crosswalk_traffic_light_estimator::CrosswalkTrafficLightEstimatorNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(traffic_light::CrosswalkTrafficLightEstimatorNode)