File tree 19 files changed +36
-34
lines changed
autoware_traffic_light_utils
include/autoware/traffic_light_utils
perception/autoware_traffic_light_occlusion_predictor
behavior_path_planner/autoware_behavior_path_planner_common
behavior_velocity_planner/autoware_behavior_velocity_traffic_light_module
motion_velocity_planner/autoware_motion_velocity_out_of_lane_module
19 files changed +36
-34
lines changed Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ common/autoware_test_utils/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp ta
25
25
common /autoware_testing /** adam.dabrowski@robotec.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
26
26
common /autoware_time_utils /** christopherj.ho@gmail.com shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
27
27
common /autoware_trajectory /** mamoru.sobue@tier4.jp takayuki.murooka@tier4.jp yukinari.hisaki.2@tier4.jp
28
+ common /autoware_traffic_light_utils /** kotaro.uetake@tier4.jp satoshi.ota@tier4.jp shunsuke.miura@tier4.jp
28
29
common /autoware_universe_utils /** mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
29
30
common /autoware_vehicle_info_utils /** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
30
31
common /bag_time_manager_rviz_plugin /** taiki.tanaka@tier4.jp
@@ -41,7 +42,6 @@ common/tier4_system_rviz_plugin/** koji.minoda@tier4.jp
41
42
common /tier4_traffic_light_rviz_plugin /** satoshi.ota@tier4.jp
42
43
common /tier4_vehicle_rviz_plugin /** yukihiro.saito@tier4.jp
43
44
common /traffic_light_recognition_marker_publisher /** shumpei.wakabayashi@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp
44
- common /traffic_light_utils /** kotaro.uetake@tier4.jp satoshi.ota@tier4.jp shunsuke.miura@tier4.jp
45
45
control /autoware_autonomous_emergency_braking /** daniel.sanchez@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp tomoya.kimura@tier4.jp
46
46
control /autoware_collision_detector /** go.sakayori@tier4.jp kyoichi.sugahara@tier4.jp tomohito.ando@tier4.jp
47
47
control /autoware_control_validator /** kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
Original file line number Diff line number Diff line change 22
22
- 'Signal Processing':
23
23
- 'Introduction': common/autoware_signal_processing
24
24
- 'Butterworth Filter': common/autoware_signal_processing/documentation/ButterworthFilter
25
+ - 'autoware_traffic_light_utils': common/autoware_traffic_light_utils
25
26
- 'autoware_universe_utils': common/autoware_universe_utils
26
- - 'traffic_light_utils': common/traffic_light_utils
27
27
- 'RVIZ2 Plugins':
28
28
- 'autoware_perception_rviz_plugin': common/autoware_perception_rviz_plugin
29
29
- 'autoware_overlay_rviz_plugin': common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin
File renamed without changes.
Original file line number Diff line number Diff line change 1
1
cmake_minimum_required (VERSION 3.14)
2
- project (traffic_light_utils )
2
+ project (autoware_traffic_light_utils )
3
3
4
4
find_package (autoware_cmake REQUIRED)
5
5
autoware_package()
6
6
7
7
find_package (Boost REQUIRED)
8
8
find_package (autoware_cmake REQUIRED)
9
9
10
- ament_auto_add_library(traffic_light_utils SHARED
10
+ ament_auto_add_library(${PROJECT_NAME} SHARED
11
11
src/traffic_light_utils.cpp
12
12
)
13
13
@@ -16,7 +16,7 @@ if(BUILD_TESTING)
16
16
file (GLOB_RECURSE TEST_SOURCES test /*.cpp)
17
17
ament_add_ros_isolated_gtest(test_traffic_light_utils ${TEST_SOURCES} )
18
18
target_include_directories (test_traffic_light_utils PRIVATE src/include )
19
- target_link_libraries (test_traffic_light_utils traffic_light_utils )
19
+ target_link_libraries (test_traffic_light_utils ${PROJECT_NAME} )
20
20
endif ()
21
21
22
22
ament_auto_package()
Original file line number Diff line number Diff line change 1
- # traffic_light_utils
1
+ # autoware_traffic_light_utils
2
2
3
3
## Purpose
4
4
Original file line number Diff line number Diff line change 12
12
// See the License for the specific language governing permissions and
13
13
// limitations under the License.
14
14
15
- #ifndef TRAFFIC_LIGHT_UTILS__TRAFFIC_LIGHT_UTILS_HPP_
16
- #define TRAFFIC_LIGHT_UTILS__TRAFFIC_LIGHT_UTILS_HPP_
15
+ #ifndef AUTOWARE__TRAFFIC_LIGHT_UTILS__TRAFFIC_LIGHT_UTILS_HPP_
16
+ #define AUTOWARE__TRAFFIC_LIGHT_UTILS__TRAFFIC_LIGHT_UTILS_HPP_
17
17
18
18
#include " autoware_perception_msgs/msg/traffic_light_element.hpp"
19
19
#include " autoware_perception_msgs/msg/traffic_light_group.hpp"
27
27
#include < tf2/LinearMath/Matrix3x3.h>
28
28
#include < tf2/LinearMath/Transform.h>
29
29
30
- namespace traffic_light_utils
30
+ namespace autoware :: traffic_light_utils
31
31
{
32
32
33
33
void setSignalUnknown (tier4_perception_msgs::msg::TrafficLight & signal, float confidence = -1 );
@@ -79,6 +79,6 @@ tf2::Vector3 getTrafficLightBottomRight(const lanelet::ConstLineString3d & traff
79
79
80
80
tf2::Vector3 getTrafficLightCenter (const lanelet::ConstLineString3d & traffic_light);
81
81
82
- } // namespace traffic_light_utils
82
+ } // namespace autoware:: traffic_light_utils
83
83
84
- #endif // TRAFFIC_LIGHT_UTILS__TRAFFIC_LIGHT_UTILS_HPP_
84
+ #endif // AUTOWARE__TRAFFIC_LIGHT_UTILS__TRAFFIC_LIGHT_UTILS_HPP_
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" ?>
2
2
<?xml-model href =" http://download.ros.org/schema/package_format3.xsd" schematypens =" http://www.w3.org/2001/XMLSchema" ?>
3
3
<package format =" 3" >
4
- <name >traffic_light_utils </name >
4
+ <name >autoware_traffic_light_utils </name >
5
5
<version >0.38.0</version >
6
- <description >The traffic_light_utils package</description >
6
+ <description >The autoware_traffic_light_utils package</description >
7
7
<maintainer email =" kotaro.uetake@tier4.jp" >Kotaro Uetake</maintainer >
8
8
<maintainer email =" shunsuke.miura@tier4.jp" >Shunsuke Miura</maintainer >
9
9
<maintainer email =" satoshi.ota@tier4.jp" >Satoshi Ota</maintainer >
Original file line number Diff line number Diff line change 12
12
// See the License for the specific language governing permissions and
13
13
// limitations under the License.
14
14
15
- #include " traffic_light_utils/traffic_light_utils.hpp"
15
+ #include " autoware/ traffic_light_utils/traffic_light_utils.hpp"
16
16
17
- namespace traffic_light_utils
17
+ namespace autoware :: traffic_light_utils
18
18
{
19
19
20
20
void setSignalUnknown (tier4_perception_msgs::msg::TrafficLight & signal, float confidence)
@@ -105,4 +105,4 @@ tf2::Vector3 getTrafficLightCenter(const lanelet::ConstLineString3d & traffic_li
105
105
return (top_left + bottom_right) / 2 ;
106
106
}
107
107
108
- } // namespace traffic_light_utils
108
+ } // namespace autoware:: traffic_light_utils
Original file line number Diff line number Diff line change 12
12
// See the License for the specific language governing permissions and
13
13
// limitations under the License.
14
14
15
+ #include " autoware/traffic_light_utils/traffic_light_utils.hpp"
15
16
#include " gtest/gtest.h"
16
- #include " traffic_light_utils/traffic_light_utils.hpp"
17
17
18
- namespace traffic_light_utils
18
+ namespace autoware :: traffic_light_utils
19
19
{
20
20
21
21
TEST (setSignalUnknown, set_signal_element)
@@ -53,4 +53,4 @@ TEST(getTrafficLightCenter, get_signal)
53
53
EXPECT_FLOAT_EQ (getTrafficLightCenter (test_light).z (), (float )1.5 );
54
54
}
55
55
56
- } // namespace traffic_light_utils
56
+ } // namespace autoware:: traffic_light_utils
Original file line number Diff line number Diff line change 15
15
16
16
<depend >autoware_lanelet2_extension</depend >
17
17
<depend >autoware_map_msgs</depend >
18
+ <depend >autoware_traffic_light_utils</depend >
18
19
<depend >autoware_universe_utils</depend >
19
20
<depend >geometry_msgs</depend >
20
21
<depend >image_geometry</depend >
27
28
<depend >tf2_eigen</depend >
28
29
<depend >tf2_ros</depend >
29
30
<depend >tier4_perception_msgs</depend >
30
- <depend >traffic_light_utils</depend >
31
31
32
32
<test_depend >ament_lint_auto</test_depend >
33
33
<test_depend >autoware_lint_common</test_depend >
Original file line number Diff line number Diff line change @@ -117,7 +117,8 @@ void TrafficLightOcclusionPredictorNode::mapCallback(
117
117
continue ;
118
118
}
119
119
lanelet::ConstLineString3d string3d = static_cast <lanelet::ConstLineString3d>(lsp);
120
- traffic_light_position_map_[lsp.id ()] = traffic_light_utils::getTrafficLightCenter (string3d);
120
+ traffic_light_position_map_[lsp.id ()] =
121
+ autoware::traffic_light_utils::getTrafficLightCenter (string3d);
121
122
}
122
123
}
123
124
}
@@ -166,7 +167,7 @@ void TrafficLightOcclusionPredictorNode::syncCallback(
166
167
out_msg_.signals .push_back (in_signal_msg->signals .at (i));
167
168
168
169
if (occlusion_ratios[i] >= config_.max_occlusion_ratio ) {
169
- traffic_light_utils::setSignalUnknown (out_msg_.signals .at (predicted_num + i), 0.0 );
170
+ autoware:: traffic_light_utils::setSignalUnknown (out_msg_.signals .at (predicted_num + i), 0.0 );
170
171
}
171
172
}
172
173
Original file line number Diff line number Diff line change 17
17
18
18
#include " occlusion_predictor.hpp"
19
19
20
+ #include < autoware/traffic_light_utils/traffic_light_utils.hpp>
20
21
#include < perception_utils/prime_synchronizer.hpp>
21
22
#include < rclcpp/rclcpp.hpp>
22
- #include < traffic_light_utils/traffic_light_utils.hpp>
23
23
24
24
#include < autoware_map_msgs/msg/lanelet_map_bin.hpp>
25
25
#include < geometry_msgs/msg/pose_stamped.hpp>
Original file line number Diff line number Diff line change 54
54
<depend >autoware_planning_msgs</depend >
55
55
<depend >autoware_route_handler</depend >
56
56
<depend >autoware_rtc_interface</depend >
57
+ <depend >autoware_traffic_light_utils</depend >
57
58
<depend >autoware_universe_utils</depend >
58
59
<depend >autoware_vehicle_info_utils</depend >
59
60
<depend >geometry_msgs</depend >
60
61
<depend >magic_enum</depend >
61
62
<depend >rclcpp</depend >
62
63
<depend >tf2</depend >
63
64
<depend >tier4_planning_msgs</depend >
64
- <depend >traffic_light_utils</depend >
65
65
<depend >visualization_msgs</depend >
66
66
67
67
<test_depend >ament_cmake_ros</test_depend >
Original file line number Diff line number Diff line change 14
14
15
15
#include < autoware/behavior_path_planner_common/utils/traffic_light_utils.hpp>
16
16
#include < autoware/motion_utils/trajectory/trajectory.hpp>
17
- #include < traffic_light_utils/traffic_light_utils.hpp>
17
+ #include < autoware/ traffic_light_utils/traffic_light_utils.hpp>
18
18
19
19
namespace autoware ::behavior_path_planner::utils::traffic_light
20
20
{
@@ -91,7 +91,7 @@ std::optional<double> calcDistanceToRedTrafficLight(
91
91
continue ;
92
92
}
93
93
94
- if (!traffic_light_utils::isTrafficSignalStop (
94
+ if (!autoware:: traffic_light_utils::isTrafficSignalStop (
95
95
lanelet, traffic_signal_stamped.value ().signal )) {
96
96
continue ;
97
97
}
@@ -143,7 +143,7 @@ bool isTrafficSignalStop(
143
143
continue ;
144
144
}
145
145
146
- if (traffic_light_utils::isTrafficSignalStop (
146
+ if (autoware:: traffic_light_utils::isTrafficSignalStop (
147
147
lanelet, traffic_signal_stamped.value ().signal )) {
148
148
return true ;
149
149
}
Original file line number Diff line number Diff line change 25
25
<depend >autoware_perception_msgs</depend >
26
26
<depend >autoware_planning_msgs</depend >
27
27
<depend >autoware_route_handler</depend >
28
+ <depend >autoware_traffic_light_utils</depend >
28
29
<depend >autoware_universe_utils</depend >
29
30
<depend >eigen</depend >
30
31
<depend >geometry_msgs</depend >
34
35
<depend >tf2_eigen</depend >
35
36
<depend >tf2_geometry_msgs</depend >
36
37
<depend >tier4_planning_msgs</depend >
37
- <depend >traffic_light_utils</depend >
38
38
<depend >visualization_msgs</depend >
39
39
40
40
<test_depend >ament_cmake_ros</test_depend >
Original file line number Diff line number Diff line change 18
18
19
19
#include < autoware/behavior_velocity_planner_common/utilization/util.hpp>
20
20
#include < autoware/motion_utils/trajectory/trajectory.hpp>
21
- #include < traffic_light_utils/traffic_light_utils.hpp>
21
+ #include < autoware/ traffic_light_utils/traffic_light_utils.hpp>
22
22
23
23
#include < boost/geometry/algorithms/distance.hpp>
24
24
#include < boost/geometry/algorithms/intersection.hpp>
@@ -177,7 +177,7 @@ bool TrafficLightModule::isStopSignal()
177
177
}
178
178
179
179
// Check if the current traffic signal state requires stopping
180
- return traffic_light_utils::isTrafficSignalStop (lane_, looking_tl_state_);
180
+ return autoware:: traffic_light_utils::isTrafficSignalStop (lane_, looking_tl_state_);
181
181
}
182
182
183
183
void TrafficLightModule::updateTrafficSignal ()
Original file line number Diff line number Diff line change 21
21
<depend >autoware_perception_msgs</depend >
22
22
<depend >autoware_planning_msgs</depend >
23
23
<depend >autoware_route_handler</depend >
24
+ <depend >autoware_traffic_light_utils</depend >
24
25
<depend >autoware_universe_utils</depend >
25
26
<depend >autoware_vehicle_info_utils</depend >
26
27
<depend >geometry_msgs</depend >
29
30
<depend >rclcpp</depend >
30
31
<depend >tf2</depend >
31
32
<depend >tier4_planning_msgs</depend >
32
- <depend >traffic_light_utils</depend >
33
33
<depend >visualization_msgs</depend >
34
34
35
35
<test_depend >ament_cmake_ros</test_depend >
Original file line number Diff line number Diff line change 15
15
#include " filter_predicted_objects.hpp"
16
16
17
17
#include < autoware/motion_utils/trajectory/trajectory.hpp>
18
+ #include < autoware/traffic_light_utils/traffic_light_utils.hpp>
18
19
#include < autoware/universe_utils/geometry/boost_geometry.hpp>
19
- #include < traffic_light_utils/traffic_light_utils.hpp>
20
20
21
21
#include < boost/geometry/algorithms/detail/intersects/interface.hpp>
22
22
#include < boost/geometry/algorithms/intersects.hpp>
Original file line number Diff line number Diff line change 26
26
#include < autoware/motion_utils/trajectory/trajectory.hpp>
27
27
#include < autoware/motion_velocity_planner_common/planner_data.hpp>
28
28
#include < autoware/route_handler/route_handler.hpp>
29
+ #include < autoware/traffic_light_utils/traffic_light_utils.hpp>
29
30
#include < autoware/universe_utils/geometry/boost_geometry.hpp>
30
31
#include < autoware/universe_utils/ros/parameter.hpp>
31
32
#include < autoware/universe_utils/ros/update_param.hpp>
32
33
#include < autoware/universe_utils/system/stop_watch.hpp>
33
- #include < traffic_light_utils/traffic_light_utils.hpp>
34
34
35
35
#include < boost/geometry/algorithms/envelope.hpp>
36
36
#include < boost/geometry/algorithms/intersects.hpp>
@@ -179,7 +179,8 @@ void prepare_stop_lines_rtree(
179
179
const auto traffic_signal_stamped = planner_data.get_traffic_signal (element->id ());
180
180
if (
181
181
traffic_signal_stamped.has_value () && element->stopLine ().has_value () &&
182
- traffic_light_utils::isTrafficSignalStop (ll, traffic_signal_stamped.value ().signal )) {
182
+ autoware::traffic_light_utils::isTrafficSignalStop (
183
+ ll, traffic_signal_stamped.value ().signal )) {
183
184
stop_line_node.second .stop_line .clear ();
184
185
for (const auto & p : element->stopLine ()->basicLineString ()) {
185
186
stop_line_node.second .stop_line .emplace_back (p.x (), p.y ());
You can’t perform that action at this time.
0 commit comments