Skip to content

Commit f4dab56

Browse files
youtalktby-udel
youtalk
authored and
tby-udel
committed
feat: add autoware_ prefix to lanelet2_extension (autowarefoundation#7640)
Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
1 parent 6c37549 commit f4dab56

File tree

192 files changed

+326
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+326
-313
lines changed

‎build_depends.repos

+13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
repositories:
22
# core
3+
# TODO(youtalk): Remove autoware_common when https://github.com/autowarefoundation/autoware/issues/4911 is closed
34
core/autoware_common:
45
type: git
56
url: https://github.com/autowarefoundation/autoware_common.git
7+
version: remove-autoware-cmake-utils
8+
core/autoware_cmake:
9+
type: git
10+
url: https://github.com/autowarefoundation/autoware_cmake.git
11+
version: main
12+
core/autoware_utils:
13+
type: git
14+
url: https://github.com/autowarefoundation/autoware_utils.git
15+
version: main
16+
core/autoware_lanelet2_extension:
17+
type: git
18+
url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
619
version: main
720
core/autoware.core:
821
type: git

‎common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#define AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_
1717

1818
#include <autoware/universe_utils/geometry/geometry.hpp>
19+
#include <autoware_lanelet2_extension/io/autoware_osm_parser.hpp>
20+
#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
21+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
22+
#include <autoware_lanelet2_extension/utility/utilities.hpp>
1923
#include <component_interface_specs/planning.hpp>
20-
#include <lanelet2_extension/io/autoware_osm_parser.hpp>
21-
#include <lanelet2_extension/projection/mgrs_projector.hpp>
22-
#include <lanelet2_extension/utility/message_conversion.hpp>
23-
#include <lanelet2_extension/utility/utilities.hpp>
2424

2525
#include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
2626
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>

‎common/autoware_test_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<buildtool_depend>autoware_cmake</buildtool_depend>
1717

1818
<depend>autoware_control_msgs</depend>
19+
<depend>autoware_lanelet2_extension</depend>
1920
<depend>autoware_map_msgs</depend>
2021
<depend>autoware_perception_msgs</depend>
2122
<depend>autoware_planning_msgs</depend>
2223
<depend>autoware_universe_utils</depend>
2324
<depend>autoware_vehicle_msgs</depend>
2425
<depend>component_interface_specs</depend>
2526
<depend>component_interface_utils</depend>
26-
<depend>lanelet2_extension</depend>
2727
<depend>lanelet2_io</depend>
2828
<depend>nav_msgs</depend>
2929
<depend>rclcpp</depend>

‎common/geography_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1111
<buildtool_depend>autoware_cmake</buildtool_depend>
1212

13+
<depend>autoware_lanelet2_extension</depend>
1314
<depend>geographic_msgs</depend>
1415
<depend>geographiclib</depend>
1516
<depend>geometry_msgs</depend>
16-
<depend>lanelet2_extension</depend>
1717
<depend>lanelet2_io</depend>
1818
<depend>tier4_map_msgs</depend>
1919

‎common/geography_utils/src/lanelet2_projector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// limitations under the License.
1414

1515
#include <GeographicLib/Geoid.hpp>
16+
#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
17+
#include <autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp>
1618
#include <geography_utils/lanelet2_projector.hpp>
17-
#include <lanelet2_extension/projection/mgrs_projector.hpp>
18-
#include <lanelet2_extension/projection/transverse_mercator_projector.hpp>
1919

2020
#include <lanelet2_projection/UTM.h>
2121

‎common/geography_utils/src/projection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// limitations under the License.
1414

1515
#include <GeographicLib/Geoid.hpp>
16+
#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
1617
#include <geography_utils/lanelet2_projector.hpp>
1718
#include <geography_utils/projection.hpp>
18-
#include <lanelet2_extension/projection/mgrs_projector.hpp>
1919

2020
namespace geography_utils
2121
{

‎common/tier4_traffic_light_rviz_plugin/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1111
<buildtool_depend>autoware_cmake</buildtool_depend>
1212

13+
<depend>autoware_lanelet2_extension</depend>
1314
<depend>autoware_map_msgs</depend>
1415
<depend>autoware_perception_msgs</depend>
15-
<depend>lanelet2_extension</depend>
1616
<depend>libqt5-core</depend>
1717
<depend>libqt5-gui</depend>
1818
<depend>libqt5-widgets</depend>

‎common/tier4_traffic_light_rviz_plugin/src/traffic_light_publish_panel.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <QString>
2323
#include <QStringList>
2424
#include <QVBoxLayout>
25-
#include <lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
26-
#include <lanelet2_extension/utility/message_conversion.hpp>
27-
#include <lanelet2_extension/utility/query.hpp>
25+
#include <autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
26+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
27+
#include <autoware_lanelet2_extension/utility/query.hpp>
2828
#include <rviz_common/display_context.hpp>
2929

3030
#include <lanelet2_core/primitives/RegulatoryElement.h>

‎common/traffic_light_recognition_marker_publisher/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<buildtool_depend>ament_cmake</buildtool_depend>
1313
<buildtool_depend>autoware_cmake</buildtool_depend>
1414

15+
<depend>autoware_lanelet2_extension</depend>
1516
<depend>autoware_map_msgs</depend>
1617
<depend>autoware_perception_msgs</depend>
1718
<depend>autoware_universe_utils</depend>
1819
<depend>geometry_msgs</depend>
19-
<depend>lanelet2_extension</depend>
2020
<depend>rclcpp</depend>
2121
<depend>rclcpp_components</depend>
2222
<depend>visualization_msgs</depend>

‎common/traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#ifndef TRAFFIC_LIGHT_RECOGNITION_MARKER_PUBLISHER_HPP_
1616
#define TRAFFIC_LIGHT_RECOGNITION_MARKER_PUBLISHER_HPP_
1717

18-
#include <lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
19-
#include <lanelet2_extension/utility/message_conversion.hpp>
20-
#include <lanelet2_extension/utility/query.hpp>
21-
#include <lanelet2_extension/visualization/visualization.hpp>
18+
#include <autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
19+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
20+
#include <autoware_lanelet2_extension/utility/query.hpp>
21+
#include <autoware_lanelet2_extension/visualization/visualization.hpp>
2222
#include <rclcpp/rclcpp.hpp>
2323

2424
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>

‎common/traffic_light_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<test_depend>ament_lint_auto</test_depend>
1717
<test_depend>autoware_lint_common</test_depend>
1818

19+
<depend>autoware_lanelet2_extension</depend>
1920
<depend>autoware_perception_msgs</depend>
20-
<depend>lanelet2_extension</depend>
2121
<depend>tier4_perception_msgs</depend>
2222

2323
<export>

‎control/autoware_lane_departure_checker/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1414
<buildtool_depend>autoware_cmake</buildtool_depend>
1515

16+
<depend>autoware_lanelet2_extension</depend>
1617
<depend>autoware_map_msgs</depend>
1718
<depend>autoware_motion_utils</depend>
1819
<depend>autoware_planning_msgs</depend>
@@ -22,7 +23,6 @@
2223
<depend>diagnostic_updater</depend>
2324
<depend>eigen</depend>
2425
<depend>geometry_msgs</depend>
25-
<depend>lanelet2_extension</depend>
2626
<depend>nav_msgs</depend>
2727
<depend>rclcpp</depend>
2828
<depend>rclcpp_components</depend>

‎control/autoware_lane_departure_checker/src/lane_departure_checker_node/lane_departure_checker_node.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include <autoware/universe_utils/math/unit_conversion.hpp>
1818
#include <autoware/universe_utils/ros/marker_helper.hpp>
1919
#include <autoware/universe_utils/system/stop_watch.hpp>
20-
#include <lanelet2_extension/utility/message_conversion.hpp>
21-
#include <lanelet2_extension/utility/query.hpp>
22-
#include <lanelet2_extension/utility/route_checker.hpp>
23-
#include <lanelet2_extension/utility/utilities.hpp>
24-
#include <lanelet2_extension/visualization/visualization.hpp>
20+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
21+
#include <autoware_lanelet2_extension/utility/query.hpp>
22+
#include <autoware_lanelet2_extension/utility/route_checker.hpp>
23+
#include <autoware_lanelet2_extension/utility/utilities.hpp>
24+
#include <autoware_lanelet2_extension/visualization/visualization.hpp>
2525

2626
#include <autoware_planning_msgs/msg/lanelet_segment.hpp>
2727

‎evaluator/perception_online_evaluator/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1818
<buildtool_depend>autoware_cmake</buildtool_depend>
1919

20+
<depend>autoware_lanelet2_extension</depend>
2021
<depend>autoware_motion_utils</depend>
2122
<depend>autoware_perception_msgs</depend>
2223
<depend>autoware_universe_utils</depend>
@@ -25,7 +26,6 @@
2526
<depend>eigen</depend>
2627
<depend>geometry_msgs</depend>
2728
<depend>glog</depend>
28-
<depend>lanelet2_extension</depend>
2929
<depend>nav_msgs</depend>
3030
<depend>object_recognition_utils</depend>
3131
<depend>pluginlib</depend>

‎localization/autoware_landmark_based_localizer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ So, if the 4 vertices are considered as forming a tetrahedron and its volume exc
4343

4444
## Map specifications
4545

46-
See <https://github.com/autowarefoundation/autoware_common/blob/main/tmp/lanelet2_extension/docs/lanelet2_format_extension.md#localization-landmarks>
46+
See <https://github.com/autowarefoundation/autoware_lanelet2_extension/blob/main/autoware_lanelet2_extension/docs/lanelet2_format_extension.md#localization-landmarks>
4747

4848
## About `consider_orientation`
4949

‎localization/autoware_landmark_based_localizer/autoware_ar_tag_based_localizer/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<depend>ament_index_cpp</depend>
2020
<depend>aruco</depend>
2121
<depend>autoware_landmark_manager</depend>
22+
<depend>autoware_lanelet2_extension</depend>
2223
<depend>cv_bridge</depend>
2324
<depend>diagnostic_msgs</depend>
24-
<depend>lanelet2_extension</depend>
2525
<depend>localization_util</depend>
2626
<depend>rclcpp</depend>
2727
<depend>rclcpp_components</depend>

‎localization/autoware_landmark_based_localizer/autoware_landmark_manager/include/autoware/landmark_manager/landmark_manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef AUTOWARE__LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_
1616
#define AUTOWARE__LANDMARK_MANAGER__LANDMARK_MANAGER_HPP_
1717

18-
#include "lanelet2_extension/localization/landmark.hpp"
18+
#include "autoware_lanelet2_extension/localization/landmark.hpp"
1919

2020
#include <rclcpp/rclcpp.hpp>
2121

‎localization/autoware_landmark_based_localizer/autoware_landmark_manager/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<build_depend>eigen</build_depend>
2020

21+
<depend>autoware_lanelet2_extension</depend>
2122
<depend>autoware_map_msgs</depend>
2223
<depend>geometry_msgs</depend>
23-
<depend>lanelet2_extension</depend>
2424
<depend>localization_util</depend>
2525
<depend>rclcpp</depend>
2626
<depend>tf2_eigen</depend>

‎localization/autoware_landmark_based_localizer/autoware_landmark_manager/src/landmark_manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "autoware/landmark_manager/landmark_manager.hpp"
1616

1717
#include "autoware/universe_utils/geometry/geometry.hpp"
18-
#include "lanelet2_extension/utility/message_conversion.hpp"
18+
#include "autoware_lanelet2_extension/utility/message_conversion.hpp"
1919
#include "localization_util/util_func.hpp"
2020

2121
#include <Eigen/Core>

‎localization/pose_estimator_arbiter/example_rule/src/pose_estimator_arbiter/rule_helper/pose_estimator_area.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#include "pose_estimator_arbiter/rule_helper/pose_estimator_area.hpp"
1616

17-
#include <lanelet2_extension/utility/message_conversion.hpp>
18-
#include <lanelet2_extension/utility/utilities.hpp>
17+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
18+
#include <autoware_lanelet2_extension/utility/utilities.hpp>
1919
#include <rclcpp/logging.hpp>
2020

2121
#include <boost/geometry/geometry.hpp>

‎localization/pose_estimator_arbiter/example_rule/test/test_rule_helper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "pose_estimator_arbiter/rule_helper/pcd_occupancy.hpp"
1717
#include "pose_estimator_arbiter/rule_helper/pose_estimator_area.hpp"
1818

19-
#include <lanelet2_extension/utility/message_conversion.hpp>
19+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
2020

2121
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
2222

‎localization/pose_estimator_arbiter/example_rule/test/test_vector_map_based_rule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "pose_estimator_arbiter/switch_rule/vector_map_based_rule.hpp"
1616

17-
#include <lanelet2_extension/utility/message_conversion.hpp>
17+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
1818

1919
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
2020

‎localization/pose_estimator_arbiter/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<build_depend>autoware_cmake</build_depend>
1919

2020
<depend>autoware_adapi_v1_msgs</depend>
21+
<depend>autoware_lanelet2_extension</depend>
2122
<depend>autoware_map_msgs</depend>
2223
<depend>autoware_universe_utils</depend>
2324
<depend>diagnostic_msgs</depend>
2425
<depend>geometry_msgs</depend>
25-
<depend>lanelet2_extension</depend>
2626
<depend>magic_enum</depend>
2727
<depend>pcl_conversions</depend>
2828
<depend>pcl_ros</depend>

‎localization/yabloc/yabloc_common/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<buildtool_depend>autoware_cmake</buildtool_depend>
1717
<buildtool_depend>rosidl_default_generators</buildtool_depend>
1818

19+
<depend>autoware_lanelet2_extension</depend>
1920
<depend>autoware_map_msgs</depend>
2021
<depend>autoware_universe_utils</depend>
2122
<depend>cv_bridge</depend>
2223
<depend>geometry_msgs</depend>
2324
<depend>lanelet2_core</depend>
24-
<depend>lanelet2_extension</depend>
2525
<depend>pcl_conversions</depend>
2626
<depend>rclcpp</depend>
2727
<depend>rclcpp_components</depend>

‎localization/yabloc/yabloc_common/src/ground_server/ground_server_core.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "yabloc_common/ground_server/util.hpp"
1818

1919
#include <Eigen/Eigenvalues>
20-
#include <lanelet2_extension/utility/message_conversion.hpp>
20+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
2121
#include <yabloc_common/color.hpp>
2222
#include <yabloc_common/pub_sub.hpp>
2323

‎localization/yabloc/yabloc_common/src/ll2_decomposer/ll2_decomposer_core.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "yabloc_common/ll2_decomposer/ll2_decomposer.hpp"
1616

1717
#include <autoware/universe_utils/ros/marker_helper.hpp>
18-
#include <lanelet2_extension/utility/message_conversion.hpp>
18+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
1919
#include <yabloc_common/pub_sub.hpp>
2020

2121
#include <geometry_msgs/msg/polygon.hpp>

‎localization/yabloc/yabloc_pose_initializer/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<buildtool_depend>autoware_cmake</buildtool_depend>
1717
<buildtool_depend>rosidl_default_generators</buildtool_depend>
1818

19+
<depend>autoware_lanelet2_extension</depend>
1920
<depend>autoware_map_msgs</depend>
2021
<depend>cv_bridge</depend>
2122
<depend>geometry_msgs</depend>
22-
<depend>lanelet2_extension</depend>
2323
<depend>libopencv-dev</depend>
2424
<depend>rclcpp</depend>
2525
<depend>rclcpp_components</depend>

‎localization/yabloc/yabloc_pose_initializer/src/camera/camera_pose_initializer_core.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
#include "yabloc_pose_initializer/camera/camera_pose_initializer.hpp"
1616

17-
#include <lanelet2_extension/utility/message_conversion.hpp>
18-
#include <lanelet2_extension/utility/query.hpp>
19-
#include <lanelet2_extension/utility/utilities.hpp>
17+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
18+
#include <autoware_lanelet2_extension/utility/query.hpp>
19+
#include <autoware_lanelet2_extension/utility/utilities.hpp>
2020
#include <opencv2/highgui.hpp>
2121
#include <opencv2/imgproc.hpp>
2222

‎map/map_height_fitter/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
1111
)
1212
target_link_libraries(map_height_fitter ${PCL_LIBRARIES})
1313

14-
# When adding `<depend>lanelet2_extension</depend>` to package.xml, many warnings are generated.
14+
# When adding `<depend>autoware_lanelet2_extension</depend>` to package.xml, many warnings are generated.
1515
# These are treated as errors in compile, so pedantic warnings are disabled for this package.
1616
target_compile_options(map_height_fitter PRIVATE -Wno-pedantic)
1717

‎map/map_height_fitter/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<buildtool_depend>ament_cmake</buildtool_depend>
1919
<buildtool_depend>autoware_cmake</buildtool_depend>
2020

21+
<depend>autoware_lanelet2_extension</depend>
2122
<depend>autoware_map_msgs</depend>
2223
<depend>geometry_msgs</depend>
23-
<depend>lanelet2_extension</depend>
2424
<depend>libpcl-common</depend>
2525
<depend>pcl_conversions</depend>
2626
<depend>rclcpp</depend>

‎map/map_height_fitter/src/map_height_fitter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#include "map_height_fitter/map_height_fitter.hpp"
1616

17-
#include <lanelet2_extension/utility/message_conversion.hpp>
18-
#include <lanelet2_extension/utility/query.hpp>
17+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
18+
#include <autoware_lanelet2_extension/utility/query.hpp>
1919

2020
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
2121
#include <autoware_map_msgs/srv/get_partial_point_cloud_map.hpp>

‎map/map_loader/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Please see [tier4_autoware_msgs/msg/MapProjectorInfo.msg](https://github.com/tie
151151
{{ json_to_markdown("map/map_loader/schema/lanelet2_map_loader.schema.json") }}
152152

153153
`use_waypoints` decides how to handle a centerline.
154-
This flag enables to use the `overwriteLaneletsCenterlineWithWaypoints` function instead of `overwriteLaneletsCenterline`. Please see [the document of the lanelet2_extension package](https://github.com/autowarefoundation/autoware_common/blob/main/tmp/lanelet2_extension/docs/lanelet2_format_extension.md#centerline) in detail.
154+
This flag enables to use the `overwriteLaneletsCenterlineWithWaypoints` function instead of `overwriteLaneletsCenterline`. Please see [the document of the autoware_lanelet2_extension package](https://github.com/autowarefoundation/autoware_lanelet2_extension/blob/main/autoware_lanelet2_extension/docs/lanelet2_format_extension.md#centerline) in detail.
155155

156156
---
157157

0 commit comments

Comments
 (0)