Skip to content

Commit 7d100a9

Browse files
committed
apply fixes.yaml
Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
1 parent 28f9edd commit 7d100a9

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

lanelet2_extension_python/src/projection.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@ BOOST_PYTHON_MODULE(_lanelet2_extension_python_boost_python_projection)
3131

3232
bp::class_<
3333
lanelet::projection::MGRSProjector, std::shared_ptr<lanelet::projection::MGRSProjector>,
34-
bp::bases<lanelet::Projector>>("MGRSProjector", bp::init<lanelet::Origin>("origin"));
34+
bp::bases<lanelet::Projector>>
35+
mgrs_projector("MGRSProjector", bp::init<lanelet::Origin>("origin"));
3536
bp::class_<
3637
lanelet::projection::TransverseMercatorProjector,
3738
std::shared_ptr<lanelet::projection::TransverseMercatorProjector>,
38-
bp::bases<lanelet::Projector>>(
39-
"TransverseMercatorProjector", bp::init<lanelet::Origin>("origin"));
39+
bp::bases<lanelet::Projector>>
40+
transverse_mercator_projector(
41+
"TransverseMercatorProjector", bp::init<lanelet::Origin>("origin"));
4042
}
4143

4244
// NOLINTEND(readability-identifier-naming)

lanelet2_extension_python/src/utility.cpp

+9-18
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ lanelet::Optional<lanelet::ConstPolygon3d> lineStringWithWidthToPolygon(
4545
lanelet::ConstPolygon3d poly{};
4646
if (lanelet::utils::lineStringWithWidthToPolygon(linestring, &poly)) {
4747
return poly;
48-
} else {
49-
return {};
5048
}
49+
return {};
5150
}
5251

5352
lanelet::Optional<lanelet::ConstPolygon3d> lineStringToPolygon(
@@ -56,9 +55,8 @@ lanelet::Optional<lanelet::ConstPolygon3d> lineStringToPolygon(
5655
lanelet::ConstPolygon3d poly{};
5756
if (lanelet::utils::lineStringToPolygon(linestring, &poly)) {
5857
return poly;
59-
} else {
60-
return {};
6158
}
59+
return {};
6260
}
6361

6462
lanelet::ArcCoordinates getArcCoordinates(
@@ -180,9 +178,8 @@ lanelet::Optional<lanelet::ConstLanelet> getLinkedLanelet(
180178
if (lanelet::utils::query::getLinkedLanelet(
181179
parking_space, all_road_lanelets, all_parking_lots, &linked_lanelet)) {
182180
return linked_lanelet;
183-
} else {
184-
return {};
185181
}
182+
return {};
186183
}
187184

188185
lanelet::Optional<lanelet::ConstLanelet> getLinkedLanelet(
@@ -192,9 +189,8 @@ lanelet::Optional<lanelet::ConstLanelet> getLinkedLanelet(
192189
lanelet::ConstLanelet linked_lanelet;
193190
if (lanelet::utils::query::getLinkedLanelet(parking_space, lanelet_map_ptr, &linked_lanelet)) {
194191
return linked_lanelet;
195-
} else {
196-
return {};
197192
}
193+
return {};
198194
}
199195

200196
lanelet::Optional<lanelet::ConstPolygon3d> getLinkedParkingLot(
@@ -203,9 +199,8 @@ lanelet::Optional<lanelet::ConstPolygon3d> getLinkedParkingLot(
203199
lanelet::ConstPolygon3d linked_parking_lot;
204200
if (lanelet::utils::query::getLinkedParkingLot(lanelet, all_parking_lots, &linked_parking_lot)) {
205201
return linked_parking_lot;
206-
} else {
207-
return {};
208202
}
203+
return {};
209204
}
210205

211206
lanelet::Optional<lanelet::ConstPolygon3d> getLinkedParkingLot(
@@ -215,9 +210,8 @@ lanelet::Optional<lanelet::ConstPolygon3d> getLinkedParkingLot(
215210
if (lanelet::utils::query::getLinkedParkingLot(
216211
current_position, all_parking_lots, &linked_parking_lot)) {
217212
return linked_parking_lot;
218-
} else {
219-
return {};
220213
}
214+
return {};
221215
}
222216

223217
lanelet::Optional<lanelet::ConstPolygon3d> getLinkedParkingLot(
@@ -228,9 +222,8 @@ lanelet::Optional<lanelet::ConstPolygon3d> getLinkedParkingLot(
228222
if (lanelet::utils::query::getLinkedParkingLot(
229223
parking_space, all_parking_lots, &linked_parking_lot)) {
230224
return linked_parking_lot;
231-
} else {
232-
return {};
233225
}
226+
return {};
234227
}
235228

236229
lanelet::ConstLanelets getLaneletsWithinRange_point(
@@ -299,9 +292,8 @@ lanelet::Optional<lanelet::ConstLanelet> getClosestLanelet(
299292
lanelet::ConstLanelet closest_lanelet{};
300293
if (lanelet::utils::query::getClosestLanelet(lanelets, pose, &closest_lanelet)) {
301294
return closest_lanelet;
302-
} else {
303-
return {};
304295
}
296+
return {};
305297
}
306298

307299
lanelet::Optional<lanelet::ConstLanelet> getClosestLaneletWithConstrains(
@@ -323,9 +315,8 @@ lanelet::Optional<lanelet::ConstLanelet> getClosestLaneletWithConstrains(
323315
if (lanelet::utils::query::getClosestLaneletWithConstrains(
324316
lanelets, pose, &closest_lanelet, dist_threshold, yaw_threshold)) {
325317
return closest_lanelet;
326-
} else {
327-
return {};
328318
}
319+
return {};
329320
}
330321

331322
lanelet::ConstLanelets getCurrentLanelets_point(

0 commit comments

Comments
 (0)