Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync upstream #172

Merged
merged 20 commits into from
Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d3768c4
fix(ndt_scan_matcher): add regularization_scale_factor declaration (#…
kminoda Nov 8, 2022
2058c7d
refactor(longitudinal_controller): add debug code velocity controller…
TakaHoribe Nov 8, 2022
da9e5f0
chore(map_loader): add maintainer (#2245)
kminoda Nov 8, 2022
d57c310
refactor(ndt_scan_matcher): simplify parameter interface of ndt_ptr_ …
kminoda Nov 8, 2022
ed6b5c8
feat(tier4_control_launch): add obstacle_collision_checker in control…
brkay54 Nov 8, 2022
ea8553e
fix(compare_map_segmentation): publish processing-time and cyclic-tim…
yukke42 Nov 9, 2022
ea16796
feat(tier4_autoware_utils): add quaternion operation (#2244)
takayuki5168 Nov 9, 2022
b030c7f
fix(behavior_path_planner): pull over stop path (#2207)
kosuke55 Nov 9, 2022
2a48d14
refactor(ndt_scan_matcher): modularize map_callback (#2249)
kminoda Nov 9, 2022
f1efcc2
fix(behavior_path_planner): pull over remove overlapping points (#2246)
kosuke55 Nov 9, 2022
ed51a8b
fix(obstacle_avoidance_planner): use fisrt ref point to find nearest …
kosuke55 Nov 9, 2022
36b7001
refactor(perception_utils): add test in object_classification (#2083)
YoshiRi Nov 9, 2022
6d8af25
chore: update CODEOWNERS (#2203)
awf-autoware-bot[bot] Nov 9, 2022
8f8ec9d
refactor(map_loader): modularization (#2243)
kminoda Nov 9, 2022
9ccc24f
fix(behavior_velocity_planner): fix intersection interval in getStopL…
soblin Nov 9, 2022
1321f64
fix(intersection): fixed (stop) point insertion (#2214)
soblin Nov 9, 2022
444e56b
fix(behavior_path_planner): die when using getExtendedCurrentLanes in…
kosuke55 Nov 9, 2022
28c047d
feat: apply renaming of vector map route message (#2257)
isamu-takagi Nov 9, 2022
0d9c92f
feat(tier4_perception_launch): sync perception launch to autoware_lau…
miursh Nov 9, 2022
536a958
refactor(trajectory_follower/trajectory_follower_nodes): remove autow…
takayuki5168 Nov 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: apply renaming of vector map route message (autowarefoundation#…
…2257)

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
  • Loading branch information
isamu-takagi authored Nov 9, 2022
commit 28c047d210dd6bab3dff4adc27e0008339768582
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ namespace

using autoware_auto_mapping_msgs::msg::HADMapSegment;
using autoware_auto_mapping_msgs::msg::MapPrimitive;
using autoware_planning_msgs::msg::VectorMapPrimitive;
using autoware_planning_msgs::msg::VectorMapSegment;
using autoware_planning_msgs::msg::LaneletPrimitive;
using autoware_planning_msgs::msg::LaneletSegment;

MapPrimitive convert(const VectorMapPrimitive & p)
MapPrimitive convert(const LaneletPrimitive & p)
{
MapPrimitive primitive;
primitive.id = p.id;
primitive.primitive_type = p.primitive_type;
return primitive;
}

HADMapSegment convert(const VectorMapSegment & s)
HADMapSegment convert(const LaneletSegment & s)
{
HADMapSegment segment;
segment.preferred_primitive_id = s.preferred_primitive.id;
Expand Down
4 changes: 2 additions & 2 deletions system/default_ad_api/src/utils/route_conversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ namespace
{

using ApiPrimitive = autoware_adapi_v1_msgs::msg::RoutePrimitive;
using MapPrimitive = autoware_planning_msgs::msg::VectorMapPrimitive;
using MapPrimitive = autoware_planning_msgs::msg::LaneletPrimitive;
using HadPrimitive = autoware_auto_mapping_msgs::msg::MapPrimitive;
using ApiSegment = autoware_adapi_v1_msgs::msg::RouteSegment;
using MapSegment = autoware_planning_msgs::msg::LaneletSegment;
using HadSegment = autoware_auto_mapping_msgs::msg::HADMapSegment;
using MapSegment = autoware_planning_msgs::msg::VectorMapSegment;

template <class RetT, class ArgT>
RetT convert(const ArgT & arg);
Expand Down