Skip to content
This repository has been archived by the owner on Jul 1, 2024. It is now read-only.

fix(log-messages): reduce excessive log messages #224

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,12 @@ lanelet::ConstLineStrings3d getAllPartitions(const lanelet::LaneletMapConstPtr &
// query all fences in lanelet2 map
lanelet::ConstLineStrings3d getAllFences(const lanelet::LaneletMapConstPtr & lanelet_map_ptr);

// query all pedestrian markings in lanelet2 map
lanelet::ConstLineStrings3d getAllPedestrianMarkings(
// query all pedestrian polygon markings in lanelet2 map
lanelet::ConstLineStrings3d getAllPedestrianPolygonMarkings(
const lanelet::LaneletMapConstPtr & lanelet_map_ptr);

// query all pedestrian line markings in lanelet2 map
lanelet::ConstLineStrings3d getAllPedestrianLineMarkings(
const lanelet::LaneletMapConstPtr & lanelet_map_ptr);

// query all parking spaces in lanelet2 map
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,22 @@ visualization_msgs::msg::MarkerArray crosswalkAreasAsMarkerArray(
const rclcpp::Duration & duration = rclcpp::Duration(0, 0));

/**
* [pedestrianMarkingsAsMarkerArray creates marker array to visualize pedestrian markings]
* @param pedestrian_markings [pedestrian marking polygon]
* [pedestrianPolygonMarkingsAsMarkerArray creates marker array to visualize pedestrian polygon
* markings]
* @param pedestrian_polygon_markings [pedestrian marking polygon]
* @param c [color of the marker]
*/
visualization_msgs::msg::MarkerArray pedestrianMarkingsAsMarkerArray(
const lanelet::ConstLineStrings3d & pedestrian_markings, const std_msgs::msg::ColorRGBA & c);
visualization_msgs::msg::MarkerArray pedestrianPolygonMarkingsAsMarkerArray(
const lanelet::ConstLineStrings3d & pedestrian_polygon_markings,
const std_msgs::msg::ColorRGBA & c);

/**
* [pedestrianLineMarkingsAsMarkerArray creates marker array to visualize pedestrian line markings]
* @param pedestrian_line_markings [pedestrian marking line]
* @param c [color of the marker]
*/
visualization_msgs::msg::MarkerArray pedestrianLineMarkingsAsMarkerArray(
const lanelet::ConstLineStrings3d & pedestrian_line_markings, const std_msgs::msg::ColorRGBA & c);

/**
* [parkingLotsAsMarkerArray creates marker array to visualize parking lots]
Expand Down
23 changes: 18 additions & 5 deletions tmp/lanelet2_extension/lib/query.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,17 +381,30 @@
return fences;
}

lanelet::ConstLineStrings3d query::getAllPedestrianMarkings(
lanelet::ConstLineStrings3d query::getAllPedestrianPolygonMarkings(

Check warning on line 384 in tmp/lanelet2_extension/lib/query.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension/lib/query.cpp#L384

Added line #L384 was not covered by tests
const lanelet::LaneletMapConstPtr & lanelet_map_ptr)
{
lanelet::ConstLineStrings3d pedestrian_markings;
lanelet::ConstLineStrings3d pedestrian_polygon_markings;
for (const auto & ls : lanelet_map_ptr->lineStringLayer) {
const std::string type = ls.attributeOr(lanelet::AttributeName::Type, "none");
if (type == "pedestrian_marking") {
pedestrian_markings.push_back(ls);
if ((type == "pedestrian_marking") && (ls.size() >= 3)) {
pedestrian_polygon_markings.push_back(ls);
}
}
return pedestrian_markings;
return pedestrian_polygon_markings;
}

Check warning on line 395 in tmp/lanelet2_extension/lib/query.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension/lib/query.cpp#L394-L395

Added lines #L394 - L395 were not covered by tests

lanelet::ConstLineStrings3d query::getAllPedestrianLineMarkings(

Check warning on line 397 in tmp/lanelet2_extension/lib/query.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension/lib/query.cpp#L397

Added line #L397 was not covered by tests
const lanelet::LaneletMapConstPtr & lanelet_map_ptr)
{
lanelet::ConstLineStrings3d pedestrian_line_markings;
for (const auto & ls : lanelet_map_ptr->lineStringLayer) {
const std::string type = ls.attributeOr(lanelet::AttributeName::Type, "none");
if ((type == "pedestrian_marking") && (ls.size() < 3)) {
pedestrian_line_markings.push_back(ls);
}
}
return pedestrian_line_markings;

Check warning on line 407 in tmp/lanelet2_extension/lib/query.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension/lib/query.cpp#L407

Added line #L407 was not covered by tests
}

lanelet::ConstLineStrings3d query::getAllParkingSpaces(
Expand Down
44 changes: 36 additions & 8 deletions tmp/lanelet2_extension/lib/visualization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -974,29 +974,57 @@
return marker_array;
}

visualization_msgs::msg::MarkerArray visualization::pedestrianMarkingsAsMarkerArray(
const lanelet::ConstLineStrings3d & pedestrian_markings, const std_msgs::msg::ColorRGBA & c)
visualization_msgs::msg::MarkerArray visualization::pedestrianPolygonMarkingsAsMarkerArray(

Check warning on line 977 in tmp/lanelet2_extension/lib/visualization.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension/lib/visualization.cpp#L977

Added line #L977 was not covered by tests
const lanelet::ConstLineStrings3d & pedestrian_polygon_markings,
const std_msgs::msg::ColorRGBA & c)
{
visualization_msgs::msg::MarkerArray marker_array;
if (pedestrian_markings.empty()) {
if (pedestrian_polygon_markings.empty()) {
return marker_array;
}

visualization_msgs::msg::Marker marker = createPolygonMarker("pedestrian_marking", c);
for (const auto & linestring : pedestrian_markings) {
visualization_msgs::msg::Marker polygon_marker =
createPolygonMarker("pedestrian_polygon_marking", c);
for (const auto & linestring : pedestrian_polygon_markings) {
lanelet::ConstPolygon3d polygon;
if (utils::lineStringToPolygon(linestring, &polygon)) {
pushPolygonMarker(&marker, polygon, c);
pushPolygonMarker(&polygon_marker, polygon, c);
} else {
RCLCPP_WARN_STREAM(
rclcpp::get_logger("lanelet2_extension.visualization"),
"pedestrian marking " << linestring.id() << " failed conversion.");
}
}

if (!marker.points.empty()) {
marker_array.markers.push_back(marker);
if (!polygon_marker.points.empty()) {
marker_array.markers.push_back(polygon_marker);
}

return marker_array;
}

Check warning on line 1004 in tmp/lanelet2_extension/lib/visualization.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension/lib/visualization.cpp#L1004

Added line #L1004 was not covered by tests

visualization_msgs::msg::MarkerArray visualization::pedestrianLineMarkingsAsMarkerArray(

Check warning on line 1006 in tmp/lanelet2_extension/lib/visualization.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension/lib/visualization.cpp#L1006

Added line #L1006 was not covered by tests
const lanelet::ConstLineStrings3d & pedestrian_line_markings, const std_msgs::msg::ColorRGBA & c)
{
visualization_msgs::msg::MarkerArray marker_array;
if (pedestrian_line_markings.empty()) {
return marker_array;
}

const float lss = 0.1; // line string size
visualization_msgs::msg::Marker line_marker;
visualization::initLineStringMarker(&line_marker, "map", "pedestrian_line_marking", c);

for (const auto & linestring : pedestrian_line_markings) {
if ((linestring.size() < 3) && (linestring.front().id() != linestring.back().id())) {
pushLineStringMarker(&line_marker, linestring, c, lss);
}
}

if (!line_marker.points.empty()) {
marker_array.markers.push_back(line_marker);
}

return marker_array;
}

Expand Down
3 changes: 2 additions & 1 deletion tmp/lanelet2_extension_python/example/example.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ def test_utility_query(lanelet_map, routing_graph):
print(f"""{len(query.getAllPartitions(lanelet_map))=}""")
print(f"""{len(query.getAllParkingSpaces(lanelet_map))=}""")
print(f"""{len(query.getAllFences(lanelet_map))=}""")
print(f"""{len(query.getAllPedestrianMarkings(lanelet_map))=}""")
print(f"""{len(query.getAllPedestrianPolygonMarkings(lanelet_map))=}""")
print(f"""{len(query.getAllPedestrianLineMarkings(lanelet_map))=}""")
print(f"""{len(query.stopLinesLanelets(lanelets))=}""")
print(f"""{len(query.stopLinesLanelet(lanelet108))=}""")
print(f"""{len(query.stopSignStopLines(lanelets))=}""")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
getAllParkingLots = _utility_cpp.getAllParkingLots
getAllPartitions = _utility_cpp.getAllPartitions
getAllFences = _utility_cpp.getAllFences
getAllPedestrianMarkings = _utility_cpp.getAllPedestrianMarkings
getAllPedestrianPolygonMarkings = _utility_cpp.getAllPedestrianPolygonMarkings
getAllPedestrianLineMarkings = _utility_cpp.getAllPedestrianLineMarkings
getAllParkingSpaces = _utility_cpp.getAllParkingSpaces
getLinkedParkingSpaces = _utility_cpp.getLinkedParkingSpaces
getLinkedLanelet = _utility_cpp.getLinkedLanelet
Expand Down
4 changes: 3 additions & 1 deletion tmp/lanelet2_extension_python/src/utility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,9 @@
bp::def("getAllParkingLots", lanelet::utils::query::getAllParkingLots);
bp::def("getAllPartitions", lanelet::utils::query::getAllPartitions);
bp::def("getAllFences", lanelet::utils::query::getAllFences);
bp::def("getAllPedestrianMarkings", lanelet::utils::query::getAllPedestrianMarkings);
bp::def(

Check warning on line 473 in tmp/lanelet2_extension_python/src/utility.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension_python/src/utility.cpp#L473

Added line #L473 was not covered by tests
"getAllPedestrianPolygonMarkings", lanelet::utils::query::getAllPedestrianPolygonMarkings);
bp::def("getAllPedestrianLineMarkings", lanelet::utils::query::getAllPedestrianLineMarkings);

Check warning on line 475 in tmp/lanelet2_extension_python/src/utility.cpp

View check run for this annotation

Codecov / codecov/patch

tmp/lanelet2_extension_python/src/utility.cpp#L475

Added line #L475 was not covered by tests
bp::def("getAllParkingSpaces", lanelet::utils::query::getAllParkingSpaces);

bp::def<lanelet::ConstLineStrings3d(
Expand Down
Loading