Merge remote-tracking branch 'origin/main' into feat/lanelet2_map_val…

…idator/add_test_environment

Signed-off-by: TaikiYamada4 <[email protected]>

driving_environment_analyzer/launch/driving_environment_analyzer.launch.xml

@@ -7,7 +7,7 @@
   <arg name="map_projection_loader_param_path" default="$(find-pkg-share autoware_launch)/config/map/map_projection_loader.param.yaml"/>
 
   <node_container pkg="rclcpp_components" exec="component_container" name="map_container" namespace="" output="screen">
-    <composable_node pkg="map_loader" plugin="Lanelet2MapLoaderNode" name="lanelet2_map_loader">
+    <composable_node pkg="autoware_map_loader" plugin="autoware::map_loader::Lanelet2MapLoaderNode" name="lanelet2_map_loader">
       <param from="$(var lanelet2_map_loader_param_path)"/>
       <param name="lanelet2_map_path" value="$(var map_path)/lanelet2_map.osm"/>
       <remap from="output/lanelet2_map" to="/map/vector_map"/>

map/autoware_lanelet2_map_validator/src/common/cli.cpp

@@ -16,11 +16,7 @@
 
 namespace po = boost::program_options;
 
-namespace lanelet
-{
-namespace autoware
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 
 MetaConfig parseCommandLine(int argc, const char * argv[])
@@ -102,6 +98,4 @@ MetaConfig parseCommandLine(int argc, const char * argv[])
   return config;
 }
 
-}  // namespace validation
-}  // namespace autoware
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/common/validation.cpp

@@ -39,11 +39,7 @@
 
 // cSpell:words indegree Indegree
 
-namespace lanelet
-{
-namespace autoware
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 
 std::unique_ptr<lanelet::Projector> getProjector(
@@ -416,6 +412,4 @@ void process_requirements(json json_data, const MetaConfig & validator_config)
   }
 }
 
-}  // namespace validation
-}  // namespace autoware
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/cli.hpp

@@ -22,11 +22,7 @@
 #include <iostream>
 #include <string>
 
-namespace lanelet
-{
-namespace autoware
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 struct MetaConfig
 {
@@ -38,8 +34,6 @@ struct MetaConfig
 
 MetaConfig parseCommandLine(int argc, const char * argv[]);
 
-}  // namespace validation
-}  // namespace autoware
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 #endif  // LANELET2_MAP_VALIDATOR__CLI_HPP_

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/utils.hpp

@@ -21,11 +21,7 @@
 #include <string>
 #include <vector>
 
-namespace lanelet
-{
-namespace autoware
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 template <typename T>
 void appendIssues(std::vector<T> & to, std::vector<T> && from)
@@ -76,8 +72,6 @@ void checkPrimitivesType(
   }
 }
 
-}  // namespace validation
-}  // namespace autoware
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 #endif  // LANELET2_MAP_VALIDATOR__UTILS_HPP_

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validation.hpp

@@ -46,11 +46,7 @@ constexpr const char * utm = "utm";
 }  // namespace projector_names
 }  // namespace
 
-namespace lanelet
-{
-namespace autoware
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 struct ValidatorInfo
 {
@@ -90,8 +86,6 @@ lanelet::validation::ValidationConfig replace_validator(
 
 void process_requirements(
   json json_data, const lanelet::autoware::validation::MetaConfig & validator_config);
-}  // namespace validation
-}  // namespace autoware
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 #endif  // LANELET2_MAP_VALIDATOR__VALIDATION_HPP_

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp

@@ -18,9 +18,7 @@
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 class MissingRegulatoryElementsForCrosswalksValidator : public lanelet::validation::MapValidator
 {
@@ -33,8 +31,7 @@ class MissingRegulatoryElementsForCrosswalksValidator : public lanelet::validati
   lanelet::validation::Issues checkMissingRegulatoryElementsForCrosswalks(
     const lanelet::LaneletMap & map);
 };
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 // clang-format off
 #endif  // LANELET2_MAP_VALIDATOR__VALIDATORS__CROSSWALK__MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_  // NOLINT

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validators/crosswalk/regulatory_element_details_for_crosswalks.hpp

@@ -18,9 +18,7 @@
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 class RegulatoryElementsDetailsForCrosswalksValidator : public lanelet::validation::MapValidator
 {
@@ -33,8 +31,7 @@ class RegulatoryElementsDetailsForCrosswalksValidator : public lanelet::validati
 private:
   lanelet::validation::Issues checkRegulatoryElementOfCrosswalks(const lanelet::LaneletMap & map);
 };
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 // clang-format off
 #endif  // LANELET2_MAP_VALIDATOR__VALIDATORS__CROSSWALK__REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_  // NOLINT

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp

@@ -18,9 +18,7 @@
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 class MissingRegulatoryElementsForStopLinesValidator : public lanelet::validation::MapValidator
 {
@@ -33,8 +31,7 @@ class MissingRegulatoryElementsForStopLinesValidator : public lanelet::validatio
   lanelet::validation::Issues checkMissingRegulatoryElementsForStopLines(
     const lanelet::LaneletMap & map);
 };
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 // clang-format off
 #endif  // LANELET2_MAP_VALIDATOR__VALIDATORS__STOP_LINE__MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_  // NOLINT

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp

@@ -18,9 +18,7 @@
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 class MissingRegulatoryElementsForTrafficLightsValidator : public lanelet::validation::MapValidator
 {
@@ -36,8 +34,7 @@ class MissingRegulatoryElementsForTrafficLightsValidator : public lanelet::valid
   lanelet::validation::Issues checkMissingRegulatoryElementsForTrafficLights(
     const lanelet::LaneletMap & map);
 };
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 // clang-format off
 #endif  // LANELET2_MAP_VALIDATOR__VALIDATORS__TRAFFIC_LIGHT__MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_  // NOLINT

map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp

@@ -20,9 +20,7 @@
 
 #include <vector>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 class RegulatoryElementsDetailsForTrafficLightsValidator : public lanelet::validation::MapValidator
 {
@@ -40,8 +38,7 @@ class RegulatoryElementsDetailsForTrafficLightsValidator : public lanelet::valid
   lanelet::validation::Issues checkRegulatoryElementOfTrafficLights(
     const lanelet::LaneletMap & map);
 };
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 // clang-format off
 #endif  // LANELET2_MAP_VALIDATOR__VALIDATORS__TRAFFIC_LIGHT__REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_  // NOLINT

map/autoware_lanelet2_map_validator/src/validators/crosswalk/missing_regulatory_elements_for_crosswalk.cpp

@@ -21,9 +21,7 @@
 
 #include <set>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 namespace
 {
@@ -91,5 +89,4 @@ MissingRegulatoryElementsForCrosswalksValidator::checkMissingRegulatoryElementsF
 
   return issues;
 }
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/validators/crosswalk/regulatory_element_details_for_crosswalks.cpp

@@ -22,9 +22,7 @@
 #include <lanelet2_core/LaneletMap.h>
 #include <lanelet2_validation/Validation.h>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 namespace
 {
@@ -125,5 +123,4 @@ RegulatoryElementsDetailsForCrosswalksValidator::checkRegulatoryElementOfCrosswa
   return issues;
 }
 
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/validators/stop_line/missing_regulatory_elements_for_stop_lines.cpp

@@ -25,9 +25,7 @@
 #include <algorithm>
 #include <set>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 namespace
 {
@@ -102,5 +100,4 @@ MissingRegulatoryElementsForStopLinesValidator::checkMissingRegulatoryElementsFo
   return issues;
 }
 
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.cpp

@@ -25,9 +25,7 @@
 #include <algorithm>
 #include <set>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 namespace
 {
@@ -92,5 +90,4 @@ MissingRegulatoryElementsForTrafficLightsValidator::checkMissingRegulatoryElemen
   return issues;
 }
 
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/validators/traffic_light/regulatory_element_details_for_traffic_lights.cpp

@@ -21,9 +21,7 @@
 #include <lanelet2_core/LaneletMap.h>
 #include <lanelet2_validation/Validation.h>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 namespace
 {
@@ -111,5 +109,4 @@ RegulatoryElementsDetailsForTrafficLightsValidator::checkRegulatoryElementOfTraf
   return issues;
 }
 
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/validators/validator_template.cpp

@@ -14,9 +14,7 @@
 
 #include "validator_template.hpp"
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 namespace
 {
@@ -32,5 +30,4 @@ lanelet::validation::Issues ValidatorTemplate::operator()(const lanelet::Lanelet
 
   return issues;
 }
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation

map/autoware_lanelet2_map_validator/src/validators/validator_template.hpp

@@ -18,9 +18,7 @@
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
 
-namespace lanelet
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 class ValidatorTemplate : public lanelet::validation::MapValidator
 {
@@ -32,7 +30,6 @@ class ValidatorTemplate : public lanelet::validation::MapValidator
 
 private:
 };
-}  // namespace validation
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation
 
 #endif  // VALIDATORS__VALIDATOR_TEMPLATE_HPP_

map/autoware_lanelet2_map_validator/test/src/test_json_processing.cpp

@@ -27,11 +27,7 @@
 
 using json = nlohmann::json;
 
-namespace lanelet
-{
-namespace autoware
-{
-namespace validation
+namespace lanelet::autoware::validation
 {
 
 class JsonProcessingTest : public ::testing::Test
@@ -156,6 +152,4 @@ TEST_F(JsonProcessingTest, SummarizeValidatorResults)
   EXPECT_NE(output.find("Total of 1 errors were found"), std::string::npos);
   EXPECT_EQ(output.find("warnings were found"), std::string::npos);
 }
-}  // namespace validation
-}  // namespace autoware
-}  // namespace lanelet
+}  // namespace lanelet::autoware::validation