Skip to content

Commit

Permalink
Revert "refactor(crosswalk_traffic_light_estimator)!: add autoware_ p…
Browse files Browse the repository at this point in the history
…refix (autowarefoundation#7365)"

This reverts commit d37dbb9.

Signed-off-by: Taekjin LEE <[email protected]>
  • Loading branch information
technolojin committed Jun 12, 2024
1 parent 763c112 commit 28d0210
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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)"/>
Expand Down
2 changes: 1 addition & 1 deletion launch/tier4_perception_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -21,7 +21,7 @@
#include <utility>
#include <vector>

namespace autoware::crosswalk_traffic_light_estimator
namespace traffic_light
{
namespace
{
Expand Down Expand Up @@ -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)

0 comments on commit 28d0210

Please sign in to comment.