Arc 258 more humble

.github/workflows/humble-upgraded-packages.txt

@@ -1 +1 @@
-approximate_intersection carma motion_prediction_visualizer system_controller object_visualizer mock_controller_driver object_detection_tracking gnss_to_map_convertor mobilitypath_visualizer bsm_generator trajectory_visualizer trajectory_executor lightbar_manager mobilitypath_publisher guidance port_drayage_plugin subsystem_controllers carma_wm roadway_objects basic_autonomy carma_guidance_plugins plan_delegator traffic_incident_parser platooning_tactical_plugin intersection_transit_maneuvering light_controlled_intersection_tactical_plugin stop_and_dwell_strategic_plugin cooperative_lanechange lci_strategic_plugin stop_controlled_intersection_tactical_plugin sci_strategic_plugin inlanecruising_plugin platooning_control trajectory_follower_wrapper approaching_emergency_vehicle_plugin yield_plugin
+approximate_intersection carma motion_prediction_visualizer system_controller object_visualizer mock_controller_driver object_detection_tracking gnss_to_map_convertor mobilitypath_visualizer bsm_generator trajectory_visualizer trajectory_executor lightbar_manager mobilitypath_publisher guidance port_drayage_plugin subsystem_controllers carma_wm roadway_objects basic_autonomy carma_guidance_plugins plan_delegator traffic_incident_parser platooning_tactical_plugin intersection_transit_maneuvering light_controlled_intersection_tactical_plugin stop_and_dwell_strategic_plugin cooperative_lanechange lci_strategic_plugin stop_controlled_intersection_tactical_plugin sci_strategic_plugin inlanecruising_plugin platooning_control trajectory_follower_wrapper approaching_emergency_vehicle_plugin yield_plugin arbitrator carma_cloud_client carma_cooperative_perception carma_wm_ctrl frame_transformer pure_pursuit_wrapper stop_and_wait_plugin

arbitrator/include/arbitrator.hpp

@@ -24,8 +24,9 @@
 #include <geometry_msgs/msg/pose_stamped.hpp>
 #include <geometry_msgs/msg/twist_stamped.hpp>
 #include <tf2_ros/transform_listener.h>
+#include <tf2_ros/buffer.h>
 #include <tf2/LinearMath/Transform.h>
-#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
+#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 
 #include "vehicle_state.hpp"
 #include "arbitrator_state_machine.hpp"
@@ -64,7 +65,7 @@ namespace arbitrator
                 sm_(sm),
                 nh_(nh),
                 min_plan_duration_(min_plan_duration),
-                time_between_plans_(planning_period),
+                time_between_plans_(rclcpp::Duration::from_seconds(planning_period)),
                 capabilities_interface_(ci),
                 planning_strategy_(planning_strategy),
                 initialized_(false),

arbitrator/include/capabilities_interface.tpp

@@ -87,7 +87,7 @@ namespace arbitrator
                         continue;
                     }
 
-                    const auto response = client->async_send_request(msg);
+                    auto response = client->async_send_request(msg);
 
                     switch (const auto status{response.wait_for(500ms)}) {
                         case std::future_status::ready:

arbitrator/package.xml

@@ -39,6 +39,7 @@
   <depend>carma_wm</depend>
   <depend>tf</depend>
   <depend>tf2</depend>
+  <depend>tf2_ros</depend>
   <depend>tf2_geometry_msgs</depend> 
   <depend>rapidjson</depend>
 

arbitrator/src/arbitrator_node.cpp

@@ -67,7 +67,7 @@ namespace arbitrator
         auto bss = std::make_shared<arbitrator::BeamSearchStrategy>(config_.beam_width);
 
         auto png = std::make_shared<arbitrator::PluginNeighborGenerator<arbitrator::CapabilitiesInterface>>(ci);
-        arbitrator::TreePlanner tp(cf, png, bss, rclcpp::Duration(config_.target_plan_duration* 1e9));
+        arbitrator::TreePlanner tp(cf, png, bss, rclcpp::Duration::from_nanoseconds(config_.target_plan_duration* 1e9));
 
         wm_listener_ = std::make_shared<carma_wm::WMListener>(
             this->get_node_base_interface(), this->get_node_logging_interface(),
@@ -81,7 +81,7 @@ namespace arbitrator
             std::make_shared<ArbitratorStateMachine>(sm),
             ci,
             std::make_shared<TreePlanner>(tp),
-            rclcpp::Duration(config_.min_plan_duration* 1e9),
+            rclcpp::Duration::from_nanoseconds(config_.min_plan_duration* 1e9),
             1/config_.planning_frequency,
             wm_ );
 

arbitrator/src/tree_planner.cpp

@@ -32,7 +32,7 @@ namespace arbitrator
         open_list_to_evaluate.push_back(std::make_pair(root, INF));
 
         carma_planning_msgs::msg::ManeuverPlan longest_plan = root; // Track longest plan in case target length is never reached
-        rclcpp::Duration longest_plan_duration = rclcpp::Duration(0);
+        rclcpp::Duration longest_plan_duration = rclcpp::Duration::from_nanoseconds(0);
 
 
         while (!open_list_to_evaluate.empty())

carma_cloud_client/package.xml

@@ -37,6 +37,7 @@
   <depend>j2735_v2x_msgs</depend>
   <depend>carma_v2x_msgs</depend>
   <depend>j2735_convertor</depend>
+  <depend>std_srvs</depend>
 
   <!-- <depend>qhttpengine</depend> -->
   <!-- <depend>v2xhubWebAPI</depend> -->

carma_cooperative_perception/CMakeLists.txt

@@ -29,11 +29,6 @@ carma_check_ros_version(2)
 # `dependencies.cmake`.
 find_package(ament_cmake_auto REQUIRED)
 
-# Needed so CMake can find the vendored PROJ4 module file. Th FindPROJ4.cmake
-# module file can be removed if we upgrade to a more recent PROJ version. See
-# https://github.com/usdot-fhwa-stol/carma-platform/issues/2139 for updates.
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
 include(cmake_options.cmake)
 include(dependencies.cmake)
 
@@ -48,8 +43,7 @@ file(TOUCH ${PROJECT_BINARY_DIR}/COLCON_IGNORE)
 # Configures CARMA package default settings
 carma_package()
 
-# C17 CMake support added in CMake 3.21
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_C_STANDARD 11)
 
 # This will automatically add include files from include/carma_cooperative_perception
@@ -69,7 +63,7 @@ ament_auto_add_library(carma_cooperative_perception SHARED
 )
 
 target_link_libraries(carma_cooperative_perception
-  ${PROJ4_LIBRARIES}  # Note: Newer versions of PROJ use PROJ::proj
+  ${PROJ_LIBRARIES} 
   GSL  # Note: Newer versions of GSL use Microsoft.GSL::GSL
   units::units
   multiple_object_tracking::multiple_object_tracking

carma_cooperative_perception/cmake/FindPROJ.cmake

@@ -0,0 +1,91 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file COPYING-CMAKE-SCRIPTS or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindPROJ
+---------
+
+CMake module to search for PROJ(PROJ.4 and PROJ) library
+
+On success, the macro sets the following variables:
+``PROJ_FOUND``
+  if the library found
+
+``PROJ_LIBRARIES``
+  full path to the library
+
+``PROJ_INCLUDE_DIRS``
+  where to find the library headers
+
+``PROJ_VERSION_STRING``
+  version string of PROJ
+
+Copyright (c) 2009 Mateusz Loskot <[email protected]>
+Copyright (c) 2015 NextGIS <[email protected]>
+Copyright (c) 2018 Hiroshi Miura
+
+#]=======================================================================]
+
+find_path(PROJ_INCLUDE_DIR proj.h
+          PATHS ${PROJ_ROOT}/include
+          DOC "Path to PROJ library include directory")
+
+set(PROJ_NAMES ${PROJ_NAMES} proj proj_i)
+set(PROJ_NAMES_DEBUG ${PROJ_NAMES_DEBUG} projd proj_d)
+
+if(NOT PROJ_LIBRARY)
+  find_library(PROJ_LIBRARY_RELEASE NAMES ${PROJ_NAMES})
+  find_library(PROJ_LIBRARY_DEBUG NAMES ${PROJ_NAMES_DEBUG})
+  include(SelectLibraryConfigurations)
+  select_library_configurations(PROJ)
+  mark_as_advanced(PROJ_LIBRARY_RELEASE PROJ_LIBRARY_DEBUG)
+endif()
+
+unset(PROJ_NAMES)
+unset(PROJ_NAMES_DEBUG)
+
+if(PROJ_INCLUDE_DIR)
+    file(READ "${PROJ_INCLUDE_DIR}/proj.h" PROJ_H_CONTENTS)
+    string(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${PROJ_H_CONTENTS}")
+    string(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${PROJ_H_CONTENTS}")
+    string(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${PROJ_H_CONTENTS}")
+    unset(PROJ_H_CONTENTS)
+    set(PROJ_VERSION_STRING "${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}")
+endif ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PROJ
+                                  REQUIRED_VARS PROJ_LIBRARY PROJ_INCLUDE_DIR
+                                  VERSION_VAR PROJ_VERSION_STRING)
+mark_as_advanced(PROJ_INCLUDE_DIR PROJ_LIBRARY)
+
+if(PROJ_FOUND)
+  set(PROJ_LIBRARIES "${PROJ_LIBRARY}")
+  set(PROJ_INCLUDE_DIRS "${PROJ_INCLUDE_DIR}")
+  if(NOT TARGET PROJ::proj)
+    add_library(PROJ::proj UNKNOWN IMPORTED)
+    set_target_properties(PROJ::proj PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${PROJ_INCLUDE_DIR}"
+                          IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+    if(EXISTS "${PROJ_LIBRARY}")
+      set_target_properties(PROJ::proj PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${PROJ_LIBRARY}")
+    endif()
+    if(EXISTS "${PROJ_LIBRARY_RELEASE}")
+      set_property(TARGET PROJ::proj APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS RELEASE)
+      set_target_properties(PROJ::proj PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION_RELEASE "${PROJ_LIBRARY_RELEASE}")
+    endif()
+    if(EXISTS "${PROJ_LIBRARY_DEBUG}")
+      set_property(TARGET PROJ::proj APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS DEBUG)
+      set_target_properties(PROJ::proj PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+        IMPORTED_LOCATION_DEBUG "${PROJ_LIBRARY_DEBUG}")
+    endif()
+  endif()
+endif()
+

carma_cooperative_perception/dependencies.cmake

@@ -28,13 +28,7 @@ CPMAddPackage(NAME units
 
 find_package(multiple_object_tracking REQUIRED)
 
-# CARMA currently uses PROJ version 6.3.1, which is not designed to be incorporated
-# as a subdirectory into larger projects. If CARMA upgrades to a newer version, we
-# could use the CPMAddPackage(...) command to install PROJ as a source dependency
-# if there is no version already locally available.
-# See https://github.com/usdot-fhwa-stol/carma-platform/issues/2139 for the PROJ
-# version upgrade plans.
-find_package(PROJ4 REQUIRED MODULE)
+find_package(PROJ REQUIRED MODULE)
 
 # lint_cmake: -readability/wonkycase
 CPMAddPackage(NAME Microsoft.GSL

carma_cooperative_perception/src/detection_list_viz_component.cpp

@@ -28,7 +28,7 @@ DetectionListVizNode::DetectionListVizNode(const rclcpp::NodeOptions & options)
       [this](carma_cooperative_perception_interfaces::msg::DetectionList::ConstSharedPtr msg_ptr) {
         visualization_msgs::msg::MarkerArray markers;
 
-        for (const auto detection : msg_ptr->detections) {
+        for (const auto& detection : msg_ptr->detections) {
           visualization_msgs::msg::Marker marker;
 
           marker.header = detection.header;

carma_cooperative_perception/src/host_vehicle_filter_component.cpp

@@ -75,7 +75,7 @@ auto HostVehicleFilterNode::handle_on_configure(
 
             RCLCPP_ERROR(
               get_logger(),
-              "Cannot change parameter 'distance_threshold_meters': " + result.reason);
+              ("Cannot change parameter 'distance_threshold_meters': " + result.reason).c_str());
 
             break;
           }
@@ -86,7 +86,7 @@ auto HostVehicleFilterNode::handle_on_configure(
 
             RCLCPP_ERROR(
               get_logger(),
-              "Cannot change parameter 'distance_threshold_meters': " + result.reason);
+              ("Cannot change parameter 'distance_threshold_meters': " + result.reason).c_str());
 
             break;
           } else {

carma_cooperative_perception/src/msg_conversion.cpp

@@ -14,7 +14,7 @@
 
 #include "carma_cooperative_perception/msg_conversion.hpp"
 
-#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
+#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 #include <carma_cooperative_perception_interfaces/msg/track.hpp>
 #include <carma_cooperative_perception_interfaces/msg/track_list.hpp>
 #include <carma_perception_msgs/msg/external_object.hpp>

carma_cooperative_perception/src/multiple_object_tracker_component.cpp

@@ -14,7 +14,7 @@
 
 #include "carma_cooperative_perception/multiple_object_tracker_component.hpp"
 
-#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
+#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 #include <units.h>
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp_components/register_node_macro.hpp>
@@ -283,7 +283,7 @@ auto MultipleObjectTrackerNode::handle_on_configure(
             result.reason = "parameter is read-only while node is in 'Active' state";
 
             RCLCPP_ERROR(
-              get_logger(), "Cannot change parameter 'execution_frequency_hz': " + result.reason);
+              get_logger(), ("Cannot change parameter 'execution_frequency_hz': " + result.reason).c_str());
 
             break;
           } else {
@@ -295,7 +295,7 @@ auto MultipleObjectTrackerNode::handle_on_configure(
             result.reason = "parameter is read-only while node is in 'Active' state";
 
             RCLCPP_ERROR(
-              get_logger(), "Cannot change parameter 'execution_frequency_hz': " + result.reason);
+              get_logger(), ("Cannot change parameter 'execution_frequency_hz': " + result.reason).c_str());
 
             break;
           } else {
@@ -313,7 +313,7 @@ auto MultipleObjectTrackerNode::handle_on_configure(
             result.reason = "parameter is read-only while node is in 'Active' state";
 
             RCLCPP_ERROR(
-              get_logger(), "Cannot change parameter 'execution_frequency_hz': " + result.reason);
+              get_logger(), ("Cannot change parameter 'execution_frequency_hz': " + result.reason).c_str());
 
             break;
           } else {

carma_wm/include/carma_wm/WorldModel.hpp

@@ -19,6 +19,7 @@
 #include <exception>
 #include <memory>
 #include <tuple>
+#include <optional>
 #include <lanelet2_core/LaneletMap.h>
 #include <lanelet2_core/primitives/Area.h>
 #include <lanelet2_core/primitives/Lanelet.h>
@@ -450,4 +451,4 @@ class WorldModel
 };
 // Helpful using declarations for carma_wm classes
 using WorldModelConstPtr = std::shared_ptr<const WorldModel>;
-}  // namespace carma_wm
+}  // namespace carma_wm