Skip to content

Commit 44106ad

Browse files
style(pre-commit): autofix
1 parent 25df93b commit 44106ad

8 files changed

Lines changed: 17 additions & 22 deletions

map/autoware_map_loader/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,17 @@ Cell IDs equal the absolute file path of the corresponding `.osm` file.
153153
The node determines bounding boxes for each cell in one of two ways:
154154

155155
1. **From a metadata YAML file** — when `metadata_file_path` points to an
156-
existing file. The expected format is:
156+
existing file. The expected format is:
157157

158158
```yaml
159159
x_resolution: 100.0
160160
y_resolution: 100.0
161-
1.osm: [58700.0, 42500.0] # [min_x, min_y] of this cell
161+
1.osm: [58700.0, 42500.0] # [min_x, min_y] of this cell
162162
2.osm: [58800.0, 42500.0]
163163
```
164164

165165
Relative filenames are resolved against the directory that contains the
166-
YAML file. The bounding box of each cell is
166+
YAML file. The bounding box of each cell is
167167
`[min_x, min_y, min_x + x_resolution, min_y + y_resolution]`.
168168

169169
2. **Computed from the loaded map** — when `metadata_file_path` is empty or
@@ -181,11 +181,11 @@ The node determines bounding boxes for each cell in one of two ways:
181181
### Published Topics
182182

183183
- `/map/vector_map` (autoware_map_msgs/LaneletMapBin) : Merged binary Lanelet2 map
184-
- `output/lanelet2_map_metadata` (autoware_map_msgs/LaneletMapMetaData) : Per-cell bounding-box metadata *(only when `enable_selected_map_loading` is `true`)*
184+
- `output/lanelet2_map_metadata` (autoware_map_msgs/LaneletMapMetaData) : Per-cell bounding-box metadata _(only when `enable_selected_map_loading` is `true`)_
185185

186186
### Services
187187

188-
- `service/get_selected_lanelet2_map` (autoware_map_msgs/srv/GetSelectedLanelet2Map) : Returns the binary map for a requested set of cell IDs *(only when `enable_selected_map_loading` is `true`)*
188+
- `service/get_selected_lanelet2_map` (autoware_map_msgs/srv/GetSelectedLanelet2Map) : Returns the binary map for a requested set of cell IDs _(only when `enable_selected_map_loading` is `true`)_
189189

190190
### Parameters
191191

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_map_loader_node.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,13 @@ void Lanelet2MapLoaderNode::on_map_projector_info(
9292
const auto lanelet2_map_path = get_parameter("lanelet2_map_path").as_string();
9393
const auto center_line_resolution = get_parameter("center_line_resolution").as_double();
9494
const auto use_waypoints = get_parameter("use_waypoints").as_bool();
95-
const auto enable_selected_map_loading =
96-
get_parameter("enable_selected_map_loading").as_bool();
95+
const auto enable_selected_map_loading = get_parameter("enable_selected_map_loading").as_bool();
9796
const auto metadata_file_path = get_parameter("metadata_file_path").as_string();
9897

9998
// get lanelet2 file paths (handles both a single .osm file and a directory)
10099
const std::vector<std::string> lanelet2_paths = utils::get_lanelet2_paths(lanelet2_map_path);
101100
if (lanelet2_paths.empty()) {
102-
RCLCPP_ERROR(
103-
get_logger(), "No lanelet2 map files found from %s", lanelet2_map_path.c_str());
101+
RCLCPP_ERROR(get_logger(), "No lanelet2 map files found from %s", lanelet2_map_path.c_str());
104102
return;
105103
}
106104

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_map_loader_utils.cpp

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

1515
#include "lanelet2_map_loader_utils.hpp"
1616

17+
#include <rclcpp/logging.hpp>
18+
1719
#include <lanelet2_core/LaneletMap.h>
1820
#include <lanelet2_core/primitives/Area.h>
1921
#include <lanelet2_core/primitives/Lanelet.h>
@@ -22,8 +24,6 @@
2224
#include <lanelet2_core/primitives/Polygon.h>
2325
#include <lanelet2_core/primitives/RegulatoryElement.h>
2426

25-
#include <rclcpp/logging.hpp>
26-
2727
#include <algorithm>
2828
#include <filesystem>
2929
#include <string>

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_map_loader_utils.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef LANELET2_MAP_LOADER_UTILS_HPP_
16-
#define LANELET2_MAP_LOADER_UTILS_HPP_
15+
#ifndef LANELET2_MAP_LOADER__LANELET2_MAP_LOADER_UTILS_HPP_
16+
#define LANELET2_MAP_LOADER__LANELET2_MAP_LOADER_UTILS_HPP_
1717

1818
#include <lanelet2_core/LaneletMap.h>
1919

@@ -53,4 +53,4 @@ void merge_lanelet2_maps(lanelet::LaneletMap & merge_target, lanelet::LaneletMap
5353

5454
} // namespace autoware::map_loader::utils
5555

56-
#endif // LANELET2_MAP_LOADER_UTILS_HPP_
56+
#endif // LANELET2_MAP_LOADER__LANELET2_MAP_LOADER_UTILS_HPP_

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_selected_map_loader_module.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class Lanelet2SelectedMapLoaderModule
5050
/// @param use_waypoints If true, use waypoint-based centerline overwrite.
5151
Lanelet2SelectedMapLoaderModule(
5252
rclcpp::Node * node, std::map<std::string, Lanelet2FileMetaData> cell_metadata_dict,
53-
const autoware_map_msgs::msg::MapProjectorInfo & projector_info,
54-
double center_line_resolution, bool use_waypoints);
53+
const autoware_map_msgs::msg::MapProjectorInfo & projector_info, double center_line_resolution,
54+
bool use_waypoints);
5555

5656
private:
5757
rclcpp::Logger logger_;

map/autoware_map_loader/test/test_lanelet2_map_cell_metadata.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "../src/lanelet2_map_loader/lanelet2_map_cell_metadata.hpp"
1616

1717
#include <gtest/gtest.h>
18-
1918
#include <lanelet2_core/LaneletMap.h>
2019
#include <lanelet2_core/primitives/LineString.h>
2120
#include <lanelet2_core/primitives/Point.h>

map/autoware_map_loader/test/test_lanelet2_map_loader_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "../src/lanelet2_map_loader/lanelet2_map_loader_utils.hpp"
1616

1717
#include <ament_index_cpp/get_package_share_directory.hpp>
18-
#include <gtest/gtest.h>
1918

19+
#include <gtest/gtest.h>
2020
#include <lanelet2_core/LaneletMap.h>
2121
#include <lanelet2_core/primitives/Area.h>
2222
#include <lanelet2_core/primitives/Lanelet.h>

map/autoware_map_loader/test/test_lanelet2_selected_map_loader_module.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ TEST_F(TestLanelet2SelectedMapLoaderModule, LoadKnownCellReturnsNonEmptyMap)
101101
request->cell_ids = {test_map_path()};
102102

103103
auto future = client_->async_send_request(request);
104-
ASSERT_EQ(
105-
rclcpp::spin_until_future_complete(node_, future), rclcpp::FutureReturnCode::SUCCESS);
104+
ASSERT_EQ(rclcpp::spin_until_future_complete(node_, future), rclcpp::FutureReturnCode::SUCCESS);
106105

107106
const auto response = future.get();
108107
EXPECT_EQ(response->header.frame_id, "map");
@@ -118,8 +117,7 @@ TEST_F(TestLanelet2SelectedMapLoaderModule, LoadUnknownCellReturnsFalse)
118117
request->cell_ids = {"/nonexistent/path/map.osm"};
119118

120119
auto future = client_->async_send_request(request);
121-
ASSERT_EQ(
122-
rclcpp::spin_until_future_complete(node_, future), rclcpp::FutureReturnCode::SUCCESS);
120+
ASSERT_EQ(rclcpp::spin_until_future_complete(node_, future), rclcpp::FutureReturnCode::SUCCESS);
123121

124122
// Service returns false for unknown IDs; lanelet2_cells should be empty.
125123
const auto response = future.get();

0 commit comments

Comments
 (0)