From e782d2babbb4657386b83421399a1e872bf05c10 Mon Sep 17 00:00:00 2001 From: Taekjin LEE Date: Wed, 12 Jun 2024 18:31:36 +0900 Subject: [PATCH] Revert "refactor(crosswalk_traffic_light_estimator)!: add autoware_ prefix (#7365)" This reverts commit d37dbb9e4a1a771a8ec6aba0c32059633c0fdfca. --- .github/CODEOWNERS | 2 +- .../traffic_light_recognition/traffic_light.launch.xml | 4 ++-- launch/tier4_perception_launch/package.xml | 2 +- .../CMakeLists.txt | 8 ++++---- .../README.md | 0 .../crosswalk_traffic_light_estimator.param.yaml | 0 .../images/intersection1.svg | 0 .../images/intersection2.svg | 0 .../images/straight.drawio.svg | 0 .../crosswalk_traffic_light_estimator}/node.hpp | 10 +++++----- .../crosswalk_traffic_light_estimator.launch.xml | 4 ++-- .../package.xml | 4 ++-- .../crosswalk_traffic_light_estimator.schema.json | 0 .../src/node.cpp | 9 ++++----- 14 files changed, 21 insertions(+), 22 deletions(-) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/CMakeLists.txt (61%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/README.md (100%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/config/crosswalk_traffic_light_estimator.param.yaml (100%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/images/intersection1.svg (100%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/images/intersection2.svg (100%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/images/straight.drawio.svg (100%) rename perception/{autoware_crosswalk_traffic_light_estimator/include/autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator/include/crosswalk_traffic_light_estimator}/node.hpp (93%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/launch/crosswalk_traffic_light_estimator.launch.xml (78%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/package.xml (86%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/schema/crosswalk_traffic_light_estimator.schema.json (100%) rename perception/{autoware_crosswalk_traffic_light_estimator => crosswalk_traffic_light_estimator}/src/node.cpp (98%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 45fc1dd5176d6..5f1b5fa20cf89 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -104,7 +104,7 @@ map/map_loader/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp koji.minoda@ti map/map_projection_loader/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp koji.minoda@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp map/map_tf_generator/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp map/util/lanelet2_map_preprocessor/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp -perception/autoware_crosswalk_traffic_light_estimator/** satoshi.ota@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp +perception/crosswalk_traffic_light_estimator/** satoshi.ota@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp perception/autoware_map_based_prediction/** kotaro.uetake@tier4.jp kyoichi.sugahara@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp yoshi.ri@tier4.jp perception/bytetrack/** manato.hirabayashi@tier4.jp yoshi.ri@tier4.jp perception/cluster_merger/** dai.nguyen@tier4.jp shunsuke.miura@tier4.jp yukihiro.saito@tier4.jp 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 index ed7ff059a6e53..21143aa0cb28a 100644 --- 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 @@ - + @@ -158,7 +158,7 @@ - + diff --git a/launch/tier4_perception_launch/package.xml b/launch/tier4_perception_launch/package.xml index 6ec706a4aad32..c74ef297aba6b 100644 --- a/launch/tier4_perception_launch/package.xml +++ b/launch/tier4_perception_launch/package.xml @@ -12,10 +12,10 @@ ament_cmake_auto autoware_cmake - autoware_crosswalk_traffic_light_estimator autoware_map_based_prediction cluster_merger compare_map_segmentation + crosswalk_traffic_light_estimator detected_object_feature_remover detected_object_validation detection_by_tracker diff --git a/perception/autoware_crosswalk_traffic_light_estimator/CMakeLists.txt b/perception/crosswalk_traffic_light_estimator/CMakeLists.txt similarity index 61% rename from perception/autoware_crosswalk_traffic_light_estimator/CMakeLists.txt rename to perception/crosswalk_traffic_light_estimator/CMakeLists.txt index 31a098a8686ec..2947070eca01e 100644 --- a/perception/autoware_crosswalk_traffic_light_estimator/CMakeLists.txt +++ b/perception/crosswalk_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/perception/autoware_crosswalk_traffic_light_estimator/README.md b/perception/crosswalk_traffic_light_estimator/README.md similarity index 100% rename from perception/autoware_crosswalk_traffic_light_estimator/README.md rename to perception/crosswalk_traffic_light_estimator/README.md diff --git a/perception/autoware_crosswalk_traffic_light_estimator/config/crosswalk_traffic_light_estimator.param.yaml b/perception/crosswalk_traffic_light_estimator/config/crosswalk_traffic_light_estimator.param.yaml similarity index 100% rename from perception/autoware_crosswalk_traffic_light_estimator/config/crosswalk_traffic_light_estimator.param.yaml rename to perception/crosswalk_traffic_light_estimator/config/crosswalk_traffic_light_estimator.param.yaml diff --git a/perception/autoware_crosswalk_traffic_light_estimator/images/intersection1.svg b/perception/crosswalk_traffic_light_estimator/images/intersection1.svg similarity index 100% rename from perception/autoware_crosswalk_traffic_light_estimator/images/intersection1.svg rename to perception/crosswalk_traffic_light_estimator/images/intersection1.svg diff --git a/perception/autoware_crosswalk_traffic_light_estimator/images/intersection2.svg b/perception/crosswalk_traffic_light_estimator/images/intersection2.svg similarity index 100% rename from perception/autoware_crosswalk_traffic_light_estimator/images/intersection2.svg rename to perception/crosswalk_traffic_light_estimator/images/intersection2.svg diff --git a/perception/autoware_crosswalk_traffic_light_estimator/images/straight.drawio.svg b/perception/crosswalk_traffic_light_estimator/images/straight.drawio.svg similarity index 100% rename from perception/autoware_crosswalk_traffic_light_estimator/images/straight.drawio.svg rename to perception/crosswalk_traffic_light_estimator/images/straight.drawio.svg diff --git a/perception/autoware_crosswalk_traffic_light_estimator/include/autoware_crosswalk_traffic_light_estimator/node.hpp b/perception/crosswalk_traffic_light_estimator/include/crosswalk_traffic_light_estimator/node.hpp similarity index 93% rename from perception/autoware_crosswalk_traffic_light_estimator/include/autoware_crosswalk_traffic_light_estimator/node.hpp rename to perception/crosswalk_traffic_light_estimator/include/crosswalk_traffic_light_estimator/node.hpp index de53d78d7f782..5072f8b8fc296 100644 --- a/perception/autoware_crosswalk_traffic_light_estimator/include/autoware_crosswalk_traffic_light_estimator/node.hpp +++ b/perception/crosswalk_traffic_light_estimator/include/crosswalk_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 #include @@ -36,7 +36,7 @@ #include #include #include -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 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/perception/autoware_crosswalk_traffic_light_estimator/launch/crosswalk_traffic_light_estimator.launch.xml b/perception/crosswalk_traffic_light_estimator/launch/crosswalk_traffic_light_estimator.launch.xml similarity index 78% rename from perception/autoware_crosswalk_traffic_light_estimator/launch/crosswalk_traffic_light_estimator.launch.xml rename to perception/crosswalk_traffic_light_estimator/launch/crosswalk_traffic_light_estimator.launch.xml index 2e1437ecd7d93..21d718c3439cd 100644 --- a/perception/autoware_crosswalk_traffic_light_estimator/launch/crosswalk_traffic_light_estimator.launch.xml +++ b/perception/crosswalk_traffic_light_estimator/launch/crosswalk_traffic_light_estimator.launch.xml @@ -11,9 +11,9 @@ limitations under the License. --> - + - + diff --git a/perception/autoware_crosswalk_traffic_light_estimator/package.xml b/perception/crosswalk_traffic_light_estimator/package.xml similarity index 86% rename from perception/autoware_crosswalk_traffic_light_estimator/package.xml rename to perception/crosswalk_traffic_light_estimator/package.xml index d844ea27b52b5..123b721c40e0a 100644 --- a/perception/autoware_crosswalk_traffic_light_estimator/package.xml +++ b/perception/crosswalk_traffic_light_estimator/package.xml @@ -1,8 +1,8 @@ - autoware_crosswalk_traffic_light_estimator + crosswalk_traffic_light_estimator 0.1.0 - The autoware_crosswalk_traffic_light_estimator package + The crosswalk_traffic_light_estimator package Satoshi Ota Shunsuke Miura diff --git a/perception/autoware_crosswalk_traffic_light_estimator/schema/crosswalk_traffic_light_estimator.schema.json b/perception/crosswalk_traffic_light_estimator/schema/crosswalk_traffic_light_estimator.schema.json similarity index 100% rename from perception/autoware_crosswalk_traffic_light_estimator/schema/crosswalk_traffic_light_estimator.schema.json rename to perception/crosswalk_traffic_light_estimator/schema/crosswalk_traffic_light_estimator.schema.json diff --git a/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp b/perception/crosswalk_traffic_light_estimator/src/node.cpp similarity index 98% rename from perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp rename to perception/crosswalk_traffic_light_estimator/src/node.cpp index 2c4da0b95b161..2a760b3f00e4e 100644 --- a/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp +++ b/perception/crosswalk_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 #include @@ -21,7 +21,7 @@ #include #include -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( - autoware::crosswalk_traffic_light_estimator::CrosswalkTrafficLightEstimatorNode) +RCLCPP_COMPONENTS_REGISTER_NODE(traffic_light::CrosswalkTrafficLightEstimatorNode)