Skip to content

Commit

Permalink
Feature/porting occlusion spot (autowarefoundation#309)
Browse files Browse the repository at this point in the history
* add occulusion_spot marker (autowarefoundation#266)

* add blindspot marker

* to occlusion spot slow down

* remove debug info from marker (autowarefoundation#287)

* remove debug info from marker

* remove debug arrow

* fix format

* update behavior launch

* apply pep8

* fix format

Co-authored-by: taikitanaka3 <65527974+taikitanaka3@users.noreply.github.com>
  • Loading branch information
tkimura4 and taikitanaka3 authored Jul 30, 2021
1 parent 5711e5f commit d3ca30d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
18 changes: 18 additions & 0 deletions autoware_launch/rviz/autoware.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,24 @@ Visualization Manager:
Reliability Policy: Reliable
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/debug/detection_area
Value: true
- Class: rviz_default_plugins/MarkerArray
Enabled: true
Name: OcclusionSpot
Namespaces:
arrow: false
occlusion spot slow down: true
collision: false
info_obstacle: false
obstacle: false
sidewalk: false
slow factor_text: true
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/debug/occlusion_spot
Value: true
- Class: rviz_plugins/Path
Color Border Vel Max: 3
Enabled: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,14 @@ def generate_launch_description():
with open(traffic_light_param_path, 'r') as f:
traffic_light_param = yaml.safe_load(f)['/**']['ros__parameters']

occlusion_spot_param_path = os.path.join(
get_package_share_directory('behavior_velocity_planner'),
'config',
'occlusion_spot.param.yaml',
)
with open(occlusion_spot_param_path, 'r') as f:
occlusion_spot_param = yaml.safe_load(f)['/**']['ros__parameters']

behavior_velocity_planner_component = ComposableNode(
package='behavior_velocity_planner',
plugin='behavior_velocity_planner::BehaviorVelocityPlannerNode',
Expand All @@ -189,6 +197,7 @@ def generate_launch_description():
'/perception/traffic_light_recognition/traffic_light_states'),
('~/input/external_traffic_light_states',
'/awapi/traffic_light/put/traffic_light_status'),
('~/input/occupancy_grid', '/sensing/lidar/occupancy_grid'),
('~/output/path', 'path'),
('~/output/stop_reasons',
'/planning/scenario_planning/status/stop_reasons'),
Expand All @@ -202,6 +211,7 @@ def generate_launch_description():
'launch_intersection': True,
'launch_blind_spot': True,
'launch_detection_area': True,
'launch_occlusion_spot': True,
'forward_path_length': 1000.0,
'backward_path_length': 5.0,
'max_accel': -2.8,
Expand All @@ -212,7 +222,8 @@ def generate_launch_description():
detection_area_param,
intersection_param,
stop_line_param,
traffic_light_param
traffic_light_param,
occlusion_spot_param
],
extra_arguments=[{
'use_intra_process_comms': LaunchConfiguration('use_intra_process')
Expand Down

0 comments on commit d3ca30d

Please sign in to comment.