Skip to content

Commit 79e5b56

Browse files
committed
Merge branch 'awf-latest' into revert-no-stopping-area-module
2 parents 5acb6d7 + 7bc9ae0 commit 79e5b56

File tree

108 files changed

+2243
-886
lines changed

Some content is hidden

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

108 files changed

+2243
-886
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ planning/autoware_behavior_path_side_shift_module/** fumiya.watanabe@tier4.jp ky
192192
planning/behavior_path_start_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
193193
planning/autoware_behavior_velocity_blind_spot_module/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
194194
planning/autoware_behavior_velocity_crosswalk_module/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp yuki.takagi@tier4.jp
195-
planning/behavior_velocity_dynamic_obstacle_stop_module/** mamoru.sobue@tier4.jp maxime.clement@tier4.jp
196195
planning/behavior_velocity_no_drivable_lane_module/** ahmed.ebrahim@leodrive.ai fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
197196
planning/autoware_behavior_velocity_no_stopping_area_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
198197
planning/autoware_behavior_velocity_occlusion_spot_module/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
199198
planning/autoware_behavior_velocity_planner_common/** fumiya.watanabe@tier4.jp isamu.takagi@tier4.jp mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
200199
planning/autoware_behavior_velocity_run_out_module/** kosuke.takeuchi@tier4.jp makoto.kurihara@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
201200
planning/behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
201+
planning/motion_velocity_planner/autoware_motion_velocity_dynamic_obstacle_stop_module/** mamoru.sobue@tier4.jp maxime.clement@tier4.jp
202202
planning/motion_velocity_planner/autoware_motion_velocity_obstacle_velocity_limiter_module/** maxime.clement@tier4.jp
203203
planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/** maxime.clement@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
204204
planning/motion_velocity_planner/autoware_motion_velocity_planner_common/** maxime.clement@tier4.jp

common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp

+39-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
#ifndef AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_
1616
#define AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_
1717

18-
#include "ament_index_cpp/get_package_share_directory.hpp"
19-
#include "rclcpp/rclcpp.hpp"
20-
2118
#include <component_interface_specs/planning.hpp>
2219
#include <lanelet2_extension/io/autoware_osm_parser.hpp>
2320
#include <lanelet2_extension/projection/mgrs_projector.hpp>
@@ -51,7 +48,6 @@
5148
#include <limits>
5249
#include <memory>
5350
#include <string>
54-
#include <utility>
5551
#include <vector>
5652

5753
namespace autoware::test_utils
@@ -174,6 +170,45 @@ LaneletRoute makeNormalRoute();
174170
*/
175171
OccupancyGrid makeCostMapMsg(size_t width = 150, size_t height = 150, double resolution = 0.2);
176172

173+
/**
174+
* @brief Get the absolute path to the lanelet map file.
175+
*
176+
* This function retrieves the absolute path to a lanelet map file located in the
177+
* package's share directory under the "test_map" folder.
178+
*
179+
* @param package_name The name of the package containing the map file.
180+
* @param map_filename The name of the map file.
181+
* @return A string representing the absolute path to the lanelet map file.
182+
*/
183+
std::string get_absolute_path_to_lanelet_map(
184+
const std::string & package_name, const std::string & map_filename);
185+
186+
/**
187+
* @brief Get the absolute path to the route file.
188+
*
189+
* This function retrieves the absolute path to a route file located in the
190+
* package's share directory under the "test_route" folder.
191+
*
192+
* @param package_name The name of the package containing the route file.
193+
* @param route_filename The name of the route file.
194+
* @return A string representing the absolute path to the route file.
195+
*/
196+
std::string get_absolute_path_to_route(
197+
const std::string & package_name, const std::string & route_filename);
198+
199+
/**
200+
* @brief Get the absolute path to the config file.
201+
*
202+
* This function retrieves the absolute path to a route file located in the
203+
* package's share directory under the "config" folder.
204+
*
205+
* @param package_name The name of the package containing the route file.
206+
* @param route_filename The name of the config file.
207+
* @return A string representing the absolute path to the config file.
208+
*/
209+
std::string get_absolute_path_to_config(
210+
const std::string & package_name, const std::string & config_filename);
211+
177212
/**
178213
* @brief Creates a LaneletMapBin message from a Lanelet map file.
179214
*

common/autoware_test_utils/src/autoware_test_utils.cpp

+34-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_test_utils/autoware_test_utils.hpp"
15+
#include <ament_index_cpp/get_package_share_directory.hpp>
16+
#include <autoware_test_utils/autoware_test_utils.hpp>
17+
#include <rclcpp/clock.hpp>
18+
#include <rclcpp/executors/single_threaded_executor.hpp>
19+
#include <rclcpp/logging.hpp>
20+
#include <rclcpp/node.hpp>
21+
22+
#include <utility>
23+
1624
namespace autoware::test_utils
1725
{
1826

@@ -103,6 +111,27 @@ OccupancyGrid makeCostMapMsg(size_t width, size_t height, double resolution)
103111
return costmap_msg;
104112
}
105113

114+
std::string get_absolute_path_to_lanelet_map(
115+
const std::string & package_name, const std::string & map_filename)
116+
{
117+
const auto dir = ament_index_cpp::get_package_share_directory(package_name);
118+
return dir + "/test_map/" + map_filename;
119+
}
120+
121+
std::string get_absolute_path_to_route(
122+
const std::string & package_name, const std::string & route_filename)
123+
{
124+
const auto dir = ament_index_cpp::get_package_share_directory(package_name);
125+
return dir + "/test_route/" + route_filename;
126+
}
127+
128+
std::string get_absolute_path_to_config(
129+
const std::string & package_name, const std::string & config_filename)
130+
{
131+
const auto dir = ament_index_cpp::get_package_share_directory(package_name);
132+
return dir + "/config/" + config_filename;
133+
}
134+
106135
LaneletMapBin make_map_bin_msg(
107136
const std::string & absolute_path, const double center_line_resolution)
108137
{
@@ -122,12 +151,8 @@ LaneletMapBin make_map_bin_msg(
122151

123152
LaneletMapBin makeMapBinMsg()
124153
{
125-
const auto autoware_test_utils_dir =
126-
ament_index_cpp::get_package_share_directory("autoware_test_utils");
127-
const auto lanelet2_path = autoware_test_utils_dir + "/test_map/lanelet2_map.osm";
128-
double center_line_resolution = 5.0;
129-
130-
return make_map_bin_msg(lanelet2_path, center_line_resolution);
154+
return make_map_bin_msg(
155+
get_absolute_path_to_lanelet_map("autoware_test_utils", "lanelet2_map.osm"));
131156
}
132157

133158
Odometry makeOdometry(const double shift)
@@ -251,9 +276,8 @@ void updateNodeOptions(
251276

252277
PathWithLaneId loadPathWithLaneIdInYaml()
253278
{
254-
const auto autoware_test_utils_dir =
255-
ament_index_cpp::get_package_share_directory("autoware_test_utils");
256-
const auto yaml_path = autoware_test_utils_dir + "/config/path_with_lane_id_data.yaml";
279+
const auto yaml_path =
280+
get_absolute_path_to_config("autoware_test_utils", "path_with_lane_id_data.yaml");
257281
YAML::Node yaml_node = YAML::LoadFile(yaml_path);
258282
PathWithLaneId path_msg;
259283

0 commit comments

Comments
 (0)