Merge remote-tracking branch 'upstream/main' into rolling

youtalk · youtalk · commit fb57074faaa3 · 2024-05-08T14:18:55.000+09:00
diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml
@@ -74,7 +74,7 @@ jobs:
 
       - name: Get modified files
         id: get-modified-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v44
         with:
           files: |
             **/*.cpp
diff --git a/autoware_lanelet2_extension/README.md b/autoware_lanelet2_extension/README.md
@@ -54,7 +54,7 @@ Autoware intersection module requires the information on which lanes can be igno
 This contains functions to convert lanelet map objects into ROS messages.
 Currently it contains following conversions:
 
-- lanelet::LaneletMapPtr to/from autoware_auto_mapping_msgs::msg::HADMapBin
+- lanelet::LaneletMapPtr to/from autoware_map_msgs::msg::LaneletMapBin
 - lanelet::Point3d to geometry_msgs::Point
 - lanelet::Point2d to geometry_msgs::Point
 - lanelet::BasicPoint3d to geometry_msgs::Point
diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/localization/landmark.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/localization/landmark.hpp
@@ -15,7 +15,7 @@
 #ifndef LANELET2_EXTENSION__LOCALIZATION__LANDMARK_HPP_
 #define LANELET2_EXTENSION__LOCALIZATION__LANDMARK_HPP_
 
-#include "autoware_auto_mapping_msgs/msg/had_map_bin.hpp"
+#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
 
 #include <lanelet2_core/primitives/Polygon.h>
 
@@ -28,7 +28,7 @@ namespace lanelet::localization
 {
 
 std::vector<lanelet::Polygon3d> parseLandmarkPolygons(
-  const autoware_auto_mapping_msgs::msg::HADMapBin::ConstSharedPtr & msg,
+  const autoware_map_msgs::msg::LaneletMapBin::ConstSharedPtr & msg,
   const std::string & target_subtype);
 
 }  // namespace lanelet::localization
diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/message_conversion.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/message_conversion.hpp
@@ -19,7 +19,7 @@
 
 // NOLINTBEGIN(readability-identifier-naming)
 
-#include <autoware_auto_mapping_msgs/msg/had_map_bin.hpp>
+#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
 #include <geometry_msgs/msg/point.hpp>
 #include <geometry_msgs/msg/point32.hpp>
 #include <geometry_msgs/msg/polygon.hpp>
@@ -36,17 +36,17 @@ namespace lanelet::utils::conversion
  * @param map [lanelet map data]
  * @param msg [converted ROS message. Only "data" field is filled]
  */
-void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_auto_mapping_msgs::msg::HADMapBin * msg);
+void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_map_msgs::msg::LaneletMapBin * msg);
 
 /**
  * [fromBinMsg converts ROS message into lanelet2 data. Similar implementation
  * to lanelet::io_handlers::BinHandler::parse()]
  * @param msg [ROS message for lanelet map]
  * @param map [Converted lanelet2 data]
  */
-void fromBinMsg(const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet::LaneletMapPtr map);
+void fromBinMsg(const autoware_map_msgs::msg::LaneletMapBin & msg, lanelet::LaneletMapPtr map);
 void fromBinMsg(
-  const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet::LaneletMapPtr map,
+  const autoware_map_msgs::msg::LaneletMapBin & msg, lanelet::LaneletMapPtr map,
   lanelet::traffic_rules::TrafficRulesPtr * traffic_rules,
   lanelet::routing::RoutingGraphPtr * routing_graph);
 
diff --git a/autoware_lanelet2_extension/lib/landmark.cpp b/autoware_lanelet2_extension/lib/landmark.cpp
@@ -24,7 +24,7 @@ namespace lanelet::localization
 {
 
 std::vector<lanelet::Polygon3d> parseLandmarkPolygons(
-  const autoware_auto_mapping_msgs::msg::HADMapBin::ConstSharedPtr & msg,
+  const autoware_map_msgs::msg::LaneletMapBin::ConstSharedPtr & msg,
   const std::string & target_subtype)
 {
   lanelet::LaneletMapPtr lanelet_map_ptr{std::make_shared<lanelet::LaneletMap>()};
diff --git a/autoware_lanelet2_extension/lib/message_conversion.cpp b/autoware_lanelet2_extension/lib/message_conversion.cpp
@@ -39,7 +39,7 @@
 
 namespace lanelet::utils::conversion
 {
-void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_auto_mapping_msgs::msg::HADMapBin * msg)
+void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_map_msgs::msg::LaneletMapBin * msg)
 {
   if (msg == nullptr) {
     std::cerr << __FUNCTION__ << "msg is null pointer!";
@@ -58,7 +58,7 @@ void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_auto_mapping_msgs::ms
   msg->data.assign(data_str.begin(), data_str.end());
 }
 
-void fromBinMsg(const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet::LaneletMapPtr map)
+void fromBinMsg(const autoware_map_msgs::msg::LaneletMapBin & msg, lanelet::LaneletMapPtr map)
 {
   if (!map) {
     std::cerr << __FUNCTION__ << ": map is null pointer!";
@@ -79,7 +79,7 @@ void fromBinMsg(const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet:
 }
 
 void fromBinMsg(
-  const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet::LaneletMapPtr map,
+  const autoware_map_msgs::msg::LaneletMapBin & msg, lanelet::LaneletMapPtr map,
   lanelet::traffic_rules::TrafficRulesPtr * traffic_rules,
   lanelet::routing::RoutingGraphPtr * routing_graph)
 {
diff --git a/autoware_lanelet2_extension/package.xml b/autoware_lanelet2_extension/package.xml
@@ -15,8 +15,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
-  <depend>autoware_auto_mapping_msgs</depend>
-  <depend>autoware_auto_planning_msgs</depend>
+  <depend>autoware_map_msgs</depend>
   <depend>autoware_planning_msgs</depend>
   <depend>autoware_utils</depend>
   <depend>geographiclib</depend>
diff --git a/autoware_lanelet2_extension/test/src/test_message_conversion.cpp b/autoware_lanelet2_extension/test/src/test_message_conversion.cpp
@@ -67,7 +67,7 @@ class TestSuite : public ::testing::Test  // NOLINT for gtest
 
 TEST_F(TestSuite, BinMsgConversion)  // NOLINT for gtest
 {
-  autoware_auto_mapping_msgs::msg::HADMapBin bin_msg;
+  autoware_map_msgs::msg::LaneletMapBin bin_msg;
   lanelet::LaneletMapPtr regenerated_map(new lanelet::LaneletMap);
 
   lanelet::utils::conversion::toBinMsg(single_lanelet_map_ptr, &bin_msg);
diff --git a/autoware_lanelet2_extension/test/src/test_route_checker.cpp b/autoware_lanelet2_extension/test/src/test_route_checker.cpp
@@ -17,7 +17,7 @@
 #include "autoware_lanelet2_extension/utility/message_conversion.hpp"
 #include "autoware_lanelet2_extension/utility/route_checker.hpp"
 
-#include <autoware_auto_mapping_msgs/msg/had_map_bin.hpp>
+#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
 #include <autoware_planning_msgs/msg/lanelet_route.hpp>
 
 #include <gtest/gtest.h>
@@ -74,7 +74,7 @@ class TestSuite : public ::testing::Test  // NOLINT for gtest
 
 TEST_F(TestSuite, isRouteValid)  // NOLINT for gtest
 {
-  autoware_auto_mapping_msgs::msg::HADMapBin bin_msg;
+  autoware_map_msgs::msg::LaneletMapBin bin_msg;
 
   const auto route_ptr1 =
     std::make_shared<autoware_planning_msgs::msg::LaneletRoute>(sample_route1);
diff --git a/build_depends.repos b/build_depends.repos
@@ -1,8 +1,4 @@
 repositories:
-  autoware_auto_msgs:
-    type: git
-    url: https://github.com/tier4/autoware_auto_msgs.git
-    version: tier4/main
   autoware_cmake:
     type: git
     url: https://github.com/autowarefoundation/autoware_cmake.git

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace lanelet::localization`
`24`	`24`	`{`
`25`	`25`
`26`	`26`	`std::vector<lanelet::Polygon3d> parseLandmarkPolygons(`
`27`		`- const autoware_auto_mapping_msgs::msg::HADMapBin::ConstSharedPtr & msg,`
	`27`	`+ const autoware_map_msgs::msg::LaneletMapBin::ConstSharedPtr & msg,`
`28`	`28`	`const std::string & target_subtype)`
`29`	`29`	`{`
`30`	`30`	`lanelet::LaneletMapPtr lanelet_map_ptr{std::make_shared<lanelet::LaneletMap>()};`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`
`40`	`40`	`namespace lanelet::utils::conversion`
`41`	`41`	`{`
`42`		`-void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_auto_mapping_msgs::msg::HADMapBin * msg)`
	`42`	`+void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_map_msgs::msg::LaneletMapBin * msg)`
`43`	`43`	`{`
`44`	`44`	`if (msg == nullptr) {`
`45`	`45`	`std::cerr << __FUNCTION__ << "msg is null pointer!";`
`@@ -58,7 +58,7 @@ void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_auto_mapping_msgs::ms`
`58`	`58`	`msg->data.assign(data_str.begin(), data_str.end());`
`59`	`59`	`}`
`60`	`60`
`61`		`-void fromBinMsg(const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet::LaneletMapPtr map)`
	`61`	`+void fromBinMsg(const autoware_map_msgs::msg::LaneletMapBin & msg, lanelet::LaneletMapPtr map)`
`62`	`62`	`{`
`63`	`63`	`if (!map) {`
`64`	`64`	`std::cerr << __FUNCTION__ << ": map is null pointer!";`
`@@ -79,7 +79,7 @@ void fromBinMsg(const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet:`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`void fromBinMsg(`
`82`		`- const autoware_auto_mapping_msgs::msg::HADMapBin & msg, lanelet::LaneletMapPtr map,`
	`82`	`+ const autoware_map_msgs::msg::LaneletMapBin & msg, lanelet::LaneletMapPtr map,`
`83`	`83`	`lanelet::traffic_rules::TrafficRulesPtr * traffic_rules,`
`84`	`84`	`lanelet::routing::RoutingGraphPtr * routing_graph)`
`85`	`85`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class TestSuite : public ::testing::Test // NOLINT for gtest`
`67`	`67`
`68`	`68`	`TEST_F(TestSuite, BinMsgConversion) // NOLINT for gtest`
`69`	`69`	`{`
`70`		`- autoware_auto_mapping_msgs::msg::HADMapBin bin_msg;`
	`70`	`+ autoware_map_msgs::msg::LaneletMapBin bin_msg;`
`71`	`71`	`lanelet::LaneletMapPtr regenerated_map(new lanelet::LaneletMap);`
`72`	`72`
`73`	`73`	`lanelet::utils::conversion::toBinMsg(single_lanelet_map_ptr, &bin_msg);`