From 1cb34e4ba9d167df60d440b848f15f6fd8df7a82 Mon Sep 17 00:00:00 2001 From: Mamoru Sobue Date: Tue, 20 Aug 2024 11:08:14 +0900 Subject: [PATCH] release format_v2 Signed-off-by: Mamoru Sobue --- .../projection/mgrs_projector.hpp | 4 ++-- .../projection/transverse_mercator_projector.hpp | 4 ++-- .../regulatory_elements/Forward.hpp | 15 ++++----------- .../autoware_traffic_light.hpp | 4 ++-- .../regulatory_elements/bus_stop_area.hpp | 3 +-- .../regulatory_elements/crosswalk.hpp | 4 ++-- .../regulatory_elements/detection_area.hpp | 4 ++-- .../regulatory_elements/no_parking_area.hpp | 4 ++-- .../regulatory_elements/no_stopping_area.hpp | 4 ++-- .../regulatory_elements/road_marking.hpp | 4 ++-- .../regulatory_elements/speed_bump.hpp | 4 ++-- .../regulatory_elements/virtual_traffic_light.hpp | 4 ++-- .../autoware_lanelet2_extension/utility/query.hpp | 4 ++-- .../autoware_lanelet2_extension/version.hpp | 4 ++-- .../visualization/visualization.hpp | 4 ++-- autoware_lanelet2_extension/lib/query.cpp | 4 ++-- autoware_lanelet2_extension/lib/visualization.cpp | 4 ++-- 17 files changed, 35 insertions(+), 43 deletions(-) diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/mgrs_projector.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/mgrs_projector.hpp index 6656378..1adfaa2 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/mgrs_projector.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/mgrs_projector.hpp @@ -31,7 +31,7 @@ namespace lanelet::projection { -inline namespace format_v1 +inline namespace format_v2 { class MGRSProjector : public Projector { @@ -111,7 +111,7 @@ class MGRSProjector : public Projector */ mutable std::string projected_grid_; }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::projection diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp index d27ee96..4f77ca5 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp @@ -28,7 +28,7 @@ namespace lanelet::projection { -inline namespace format_v1 +inline namespace format_v2 { class TransverseMercatorProjector : public Projector { @@ -56,7 +56,7 @@ class TransverseMercatorProjector : public Projector double origin_y_; double central_meridian_; }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::projection diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/Forward.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/Forward.hpp index ba2810d..514edd1 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/Forward.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/Forward.hpp @@ -25,7 +25,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class AutowareTrafficLight; class Crosswalk; @@ -35,10 +35,6 @@ class NoStoppingArea; class RoadMarking; class SpeedBump; class VirtualTrafficLight; -} // namespace format_v1 - -namespace format_v2 -{ class BusStopArea; } // namespace format_v2 @@ -46,7 +42,8 @@ class BusStopArea; namespace lanelet { -inline namespace format_v1 + +inline namespace format_v2 { using TrafficSignConstPtr = std::shared_ptr; using TrafficLightConstPtr = std::shared_ptr; @@ -57,11 +54,7 @@ using NoStoppingAreaConstPtr = std::shared_ptr; using SpeedBumpConstPtr = std::shared_ptr; using CrosswalkConstPtr = std::shared_ptr; -} // namespace format_v1 - -namespace format_v2 -{ -using BusStopAreaConstPtr = std::shared_ptr; +using BusStopAreaConstPtr = std::shared_ptr; } // namespace format_v2 } // namespace lanelet diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp index e2da92f..f072f6d 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp @@ -29,7 +29,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class AutowareTrafficLight : public lanelet::TrafficLight { @@ -86,7 +86,7 @@ class AutowareTrafficLight : public lanelet::TrafficLight friend class RegisterRegulatoryElement; explicit AutowareTrafficLight(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/bus_stop_area.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/bus_stop_area.hpp index f625243..ea0ecb5 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/bus_stop_area.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/bus_stop_area.hpp @@ -26,8 +26,7 @@ namespace lanelet::autoware { -// TODO(Mamoru Sobue): when updating existing elements from format_v1, prefix this with inline -namespace format_v2 +inline namespace format_v2 { class BusStopArea : public lanelet::RegulatoryElement { diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp index 596e03d..39f8ce5 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp @@ -26,7 +26,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class Crosswalk : public lanelet::RegulatoryElement { @@ -87,7 +87,7 @@ class Crosswalk : public lanelet::RegulatoryElement friend class RegisterRegulatoryElement; explicit Crosswalk(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/detection_area.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/detection_area.hpp index 847a4a5..e538303 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/detection_area.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/detection_area.hpp @@ -28,7 +28,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class DetectionArea : public lanelet::RegulatoryElement { @@ -91,7 +91,7 @@ class DetectionArea : public lanelet::RegulatoryElement friend class RegisterRegulatoryElement; explicit DetectionArea(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp index 589412d..acc3f2a 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_parking_area.hpp @@ -26,7 +26,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class NoParkingArea : public lanelet::RegulatoryElement { @@ -67,7 +67,7 @@ class NoParkingArea : public lanelet::RegulatoryElement friend class RegisterRegulatoryElement; explicit NoParkingArea(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp index 77d9f2a..16e7c5b 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/no_stopping_area.hpp @@ -26,7 +26,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class NoStoppingArea : public lanelet::RegulatoryElement { @@ -89,7 +89,7 @@ class NoStoppingArea : public lanelet::RegulatoryElement friend class RegisterRegulatoryElement; explicit NoStoppingArea(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/road_marking.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/road_marking.hpp index 750931d..3231542 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/road_marking.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/road_marking.hpp @@ -26,7 +26,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class RoadMarking : public lanelet::RegulatoryElement { @@ -67,7 +67,7 @@ class RoadMarking : public lanelet::RegulatoryElement friend class RegisterRegulatoryElement; explicit RoadMarking(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp index e7b4688..9c5a12a 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/speed_bump.hpp @@ -28,7 +28,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class SpeedBump : public lanelet::RegulatoryElement { @@ -69,7 +69,7 @@ class SpeedBump : public lanelet::RegulatoryElement friend class RegisterRegulatoryElement; explicit SpeedBump(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp index 0eb0afb..6042392 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/regulatory_elements/virtual_traffic_light.hpp @@ -26,7 +26,7 @@ namespace lanelet::autoware { -inline namespace format_v1 +inline namespace format_v2 { class VirtualTrafficLight : public lanelet::RegulatoryElement { @@ -74,7 +74,7 @@ class VirtualTrafficLight : public lanelet::RegulatoryElement friend class RegisterRegulatoryElement; explicit VirtualTrafficLight(const lanelet::RegulatoryElementDataPtr & data); }; -} // namespace format_v1 +} // namespace format_v2 } // namespace lanelet::autoware diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/query.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/query.hpp index 4af3bf1..c6cefd5 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/query.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/utility/query.hpp @@ -40,7 +40,7 @@ namespace lanelet::utils::query { -inline namespace format_v1 +inline namespace format_v2 { /** * [crosswalkLanelets extracts crosswalk lanelets] @@ -207,7 +207,7 @@ std::vector stopLinesLanelet(const lanelet::ConstLan */ std::vector stopSignStopLines( const lanelet::ConstLanelets & lanelets, const std::string & stop_sign_id = "stop_sign"); -} // namespace format_v1 +} // namespace format_v2 /** * [laneletLayer converts laneletLayer into lanelet vector] diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/version.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/version.hpp index 183d4ea..88356d1 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/version.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/version.hpp @@ -26,11 +26,11 @@ namespace lanelet::autoware */ enum class Version : int { none = 0, - format_v1, + format_v2, }; // current format_version -static constexpr Version version = Version::format_v1; +static constexpr Version version = Version::format_v2; } // namespace lanelet::autoware #endif // AUTOWARE_LANELET2_EXTENSION__VERSION_HPP_ diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/visualization/visualization.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/visualization/visualization.hpp index ed4f335..3886c56 100644 --- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/visualization/visualization.hpp +++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/visualization/visualization.hpp @@ -38,7 +38,7 @@ namespace lanelet::visualization { -inline namespace format_v1 +inline namespace format_v2 { /** * [autowareTrafficLightsAsMarkerArray creates marker array to visualize traffic @@ -217,7 +217,7 @@ visualization_msgs::msg::MarkerArray noObstacleSegmentationAreaForRunOutAsMarker visualization_msgs::msg::MarkerArray hatchedRoadMarkingsAreaAsMarkerArray( const lanelet::ConstPolygons3d & hatched_road_markings_area, const std_msgs::msg::ColorRGBA & area_color, const std_msgs::msg::ColorRGBA & line_color); -} // namespace format_v1 +} // namespace format_v2 /** * [lanelet2Triangle converts lanelet into vector of triangles. Used for diff --git a/autoware_lanelet2_extension/lib/query.cpp b/autoware_lanelet2_extension/lib/query.cpp index 8b1ad6d..1d11914 100644 --- a/autoware_lanelet2_extension/lib/query.cpp +++ b/autoware_lanelet2_extension/lib/query.cpp @@ -55,7 +55,7 @@ namespace lanelet::utils namespace query { -inline namespace format_v1 +inline namespace format_v2 { lanelet::ConstLanelets crosswalkLanelets(const lanelet::ConstLanelets & lls) { @@ -699,7 +699,7 @@ std::vector stopSignStopLines( } return stoplines; } -} // namespace format_v1 +} // namespace format_v2 } // namespace query // returns all lanelets in laneletLayer - don't know how to convert diff --git a/autoware_lanelet2_extension/lib/visualization.cpp b/autoware_lanelet2_extension/lib/visualization.cpp index a96dcb7..2b24907 100644 --- a/autoware_lanelet2_extension/lib/visualization.cpp +++ b/autoware_lanelet2_extension/lib/visualization.cpp @@ -351,7 +351,7 @@ namespace lanelet namespace visualization { -inline namespace format_v1 +inline namespace format_v2 { visualization_msgs::msg::MarkerArray autowareTrafficLightsAsMarkerArray( const std::vector & tl_reg_elems, @@ -1075,7 +1075,7 @@ visualization_msgs::msg::MarkerArray hatchedRoadMarkingsAreaAsMarkerArray( return marker_array; } -} // namespace format_v1 +} // namespace format_v2 } // namespace visualization void visualization::lanelet2Triangle(