Skip to content

Commit 7a921f4

Browse files
authored
Merge branch 'main' into chore/planning-bvp/remove-unused-lanelet2-extension
2 parents a2febca + 771964d commit 7a921f4

6 files changed

Lines changed: 0 additions & 10 deletions

File tree

common/autoware_lanelet2_utils/src/nn_search.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <autoware/lanelet2_utils/geometry.hpp>
1717
#include <autoware/lanelet2_utils/kind.hpp>
1818
#include <autoware/lanelet2_utils/nn_search.hpp>
19-
#include <autoware_lanelet2_extension/utility/utilities.hpp>
2019
#include <autoware_utils_math/normalization.hpp>
2120
#include <range/v3/view/enumerate.hpp>
2221
#include <tf2/utils.hpp>

common/autoware_marker_utils/test/marker_conversion.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
#include <ament_index_cpp/get_package_share_directory.hpp>
1616
#include <autoware/marker_utils/marker_conversion.hpp>
17-
#include <autoware_lanelet2_extension/regulatory_elements/detection_area.hpp>
18-
#include <autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp>
1917
#include <autoware_utils_geometry/boost_polygon_utils.hpp>
2018
#include <autoware_utils_visualization/marker_helper.hpp>
2119
#include <rclcpp/clock.hpp>

map/autoware_map_height_fitter/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
1111
)
1212
target_link_libraries(${PROJECT_NAME} ${PCL_LIBRARIES})
1313

14-
# When adding `<depend>autoware_lanelet2_extension</depend>` to package.xml, many warnings are generated.
15-
# These are treated as errors in compile, so pedantic warnings are disabled for this package.
16-
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-pedantic)
17-
1814
rclcpp_components_register_node(${PROJECT_NAME}
1915
PLUGIN "autoware::map_height_fitter::MapHeightFitterNode"
2016
EXECUTABLE ${PROJECT_NAME}_node

map/autoware_map_height_fitter/package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<buildtool_depend>autoware_cmake</buildtool_depend>
1616

1717
<depend>autoware_internal_localization_msgs</depend>
18-
<depend>autoware_lanelet2_extension</depend>
1918
<depend>autoware_lanelet2_utils</depend>
2019
<depend>autoware_map_msgs</depend>
2120
<depend>autoware_qos_utils</depend>

map/autoware_map_height_fitter/src/map_height_fitter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include <autoware/lanelet2_utils/conversion.hpp>
1818
#include <autoware/qos_utils/qos_compatibility.hpp>
19-
#include <autoware_lanelet2_extension/utility/query.hpp>
2019
#include <tf2_ros/transform_listener.hpp>
2120

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

map/autoware_map_projection_loader/include/autoware/map_projection_loader/load_info_from_lanelet2_map.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include <autoware_lanelet2_extension/io/autoware_osm_parser.hpp>
1919
#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
20-
#include <autoware_lanelet2_extension/utility/utilities.hpp>
2120

2221
#include "autoware_map_msgs/msg/map_projector_info.hpp"
2322

0 commit comments

Comments
 (0)