Merge pull request tier4#1309 from tier4/autoware_lanelet2_extension

feat: use autoware_lanelet2_extension instead of lanelet2_extension

Author: HansRobo

dependency_humble.repos

@@ -11,9 +11,17 @@ repositories:
     type: git
     url: https://github.com/tier4/autoware_auto_msgs.git
     version: tier4/main
-  autoware_common:
+  autoware_cmake:
     type: git
-    url: https://github.com/autowarefoundation/autoware_common.git
+    url: https://github.com/autowarefoundation/autoware_cmake.git
+    version: main
+  autoware_utils:
+    type: git
+    url: https://github.com/autowarefoundation/autoware_utils.git
+    version: main
+  autoware_lanelet2_extension:
+    type: git
+    url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
     version: main
   color_names:
     type: git

simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp

@@ -29,15 +29,15 @@
 #include <tf2/LinearMath/Matrix3x3.h>
 
 #include <autoware_auto_mapping_msgs/msg/had_map_bin.hpp>
+#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
+#include <autoware_lanelet2_extension/utility/query.hpp>
+#include <autoware_lanelet2_extension/utility/utilities.hpp>
 #include <boost/filesystem.hpp>
 #include <geographic_msgs/msg/geo_point.hpp>
 #include <geometry/spline/catmull_rom_spline.hpp>
 #include <geometry/spline/catmull_rom_spline_interface.hpp>
 #include <geometry/spline/hermite_curve.hpp>
 #include <geometry_msgs/msg/pose_stamped.hpp>
-#include <lanelet2_extension/utility/message_conversion.hpp>
-#include <lanelet2_extension/utility/query.hpp>
-#include <lanelet2_extension/utility/utilities.hpp>
 #include <map>
 #include <memory>
 #include <optional>

simulation/traffic_simulator/package.xml

@@ -13,12 +13,12 @@
 
   <depend>ament_index_cpp</depend>
   <depend>arithmetic</depend>
+  <depend>autoware_lanelet2_extension</depend>
   <depend>concealer</depend>
   <depend>color_names</depend>
   <depend>geographic_msgs</depend>
   <depend>geometry_msgs</depend>
   <depend>lanelet2_core</depend>
-  <depend>lanelet2_extension</depend>
   <depend>lanelet2_io</depend>
   <depend>lanelet2_matching</depend>
   <depend>lanelet2_projection</depend>

simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp

@@ -18,6 +18,12 @@
 #include <lanelet2_projection/UTM.h>
 
 #include <algorithm>
+#include <autoware_lanelet2_extension/io/autoware_osm_parser.hpp>
+#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
+#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
+#include <autoware_lanelet2_extension/utility/query.hpp>
+#include <autoware_lanelet2_extension/utility/utilities.hpp>
+#include <autoware_lanelet2_extension/visualization/visualization.hpp>
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/assign/list_of.hpp>
@@ -36,12 +42,6 @@
 #include <geometry/vector3/inner_product.hpp>
 #include <geometry/vector3/normalize.hpp>
 #include <geometry/vector3/operator.hpp>
-#include <lanelet2_extension/io/autoware_osm_parser.hpp>
-#include <lanelet2_extension/projection/mgrs_projector.hpp>
-#include <lanelet2_extension/utility/message_conversion.hpp>
-#include <lanelet2_extension/utility/query.hpp>
-#include <lanelet2_extension/utility/utilities.hpp>
-#include <lanelet2_extension/visualization/visualization.hpp>
 #include <memory>
 #include <optional>
 #include <scenario_simulator_exception/exception.hpp>

test_runner/random_test_runner/src/lanelet_utils.cpp

@@ -21,10 +21,10 @@
 #include <lanelet2_routing/RoutingCost.h>
 #include <lanelet2_traffic_rules/TrafficRulesFactory.h>
 
+#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 #include <geographic_msgs/msg/geo_point.hpp>
 #include <geometry/vector3/normalize.hpp>
 #include <geometry/vector3/operator.hpp>
-#include <lanelet2_extension/projection/mgrs_projector.hpp>
 #include <optional>
 #include <traffic_simulator/hdmap_utils/hdmap_utils.hpp>