chore: move topic rename function to class member

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

sensing/pointcloud_preprocessor/include/pointcloud_preprocessor/concatenate_data/concatenate_and_time_sync_nodelet.hpp

@@ -85,24 +85,6 @@
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
 
-// replace topic name postfix
-inline std::string replace_topic_name_postfix(
-  const std::string & original_topic_name, const std::string & postfix)
-{
-  // separate the topic name by '/' and replace the last element with the new postfix
-  size_t pos = original_topic_name.find_last_of("/");
-  if (pos == std::string::npos) {
-    // not found '/': this is not a namespaced topic
-    std::cerr
-      << "The topic name is not namespaced. The postfix will be added to the end of the topic name."
-      << std::endl;
-    return original_topic_name + postfix;
-  } else {
-    // replace the last element with the new postfix
-    return original_topic_name.substr(0, pos) + "/" + postfix;
-  }
-}
-
 namespace pointcloud_preprocessor
 {
 using autoware_point_types::PointXYZI;
@@ -198,6 +180,8 @@ class PointCloudConcatenateDataSynchronizerComponent : public rclcpp::Node
   void timer_callback();
 
   void checkConcatStatus(diagnostic_updater::DiagnosticStatusWrapper & stat);
+  std::string replaceSyncTopicNamePostfix(
+    const std::string & original_topic_name, const std::string & postfix);
 
   /** \brief processing time publisher. **/
   std::unique_ptr<tier4_autoware_utils::StopWatch<std::chrono::milliseconds>> stop_watch_ptr_;

sensing/pointcloud_preprocessor/include/pointcloud_preprocessor/time_synchronizer/time_synchronizer_nodelet.hpp

@@ -85,23 +85,6 @@
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
 
-// replace topic name postfix
-inline std::string replace_topic_name_postfix(
-  const std::string & original_topic_name, const std::string & postfix)
-{
-  // separate the topic name by '/' and replace the last element with the new postfix
-  size_t pos = original_topic_name.find_last_of("/");
-  if (pos == std::string::npos) {
-    // not found '/': this is not a namespaced topic
-    std::cerr
-      << "The topic name is not namespaced. The postfix will be added to the end of the topic name."
-      << std::endl;
-    return original_topic_name + postfix;
-  } else {
-    // replace the last element with the new postfix
-    return original_topic_name.substr(0, pos) + '/' + postfix;
-  }
-}
 namespace pointcloud_preprocessor
 {
 using autoware_point_types::PointXYZI;
@@ -194,6 +177,8 @@ class PointCloudDataSynchronizerComponent : public rclcpp::Node
   void timer_callback();
 
   void checkSyncStatus(diagnostic_updater::DiagnosticStatusWrapper & stat);
+  std::string replaceSyncTopicNamePostfix(
+    const std::string & original_topic_name, const std::string & postfix);
 
   /** \brief processing time publisher. **/
   std::unique_ptr<tier4_autoware_utils::StopWatch<std::chrono::milliseconds>> stop_watch_ptr_;

sensing/pointcloud_preprocessor/src/concatenate_data/concatenate_and_time_sync_nodelet.cpp

@@ -61,7 +61,8 @@
 #include <utility>
 #include <vector>
 
-#define POSTFIX_NAME "_synchronized"  // default postfix name for synchronized pointcloud
+#define DEFAULT_SYNC_TOPIC_POSTFIX \
+  "_synchronized"  // default postfix name for synchronized pointcloud
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -190,15 +191,7 @@ PointCloudConcatenateDataSynchronizerComponent::PointCloudConcatenateDataSynchro
   // Transformed Raw PointCloud2 Publisher to publish the transformed pointcloud
   if (publish_synchronized_pointcloud_) {
     for (auto & topic : input_topics_) {
-      std::string new_topic = replace_topic_name_postfix(topic, synchronized_pointcloud_postfix_);
-      if (new_topic == topic) {
-        RCLCPP_WARN_STREAM(
-          get_logger(),
-          "The topic name "
-            << topic
-            << " does not have a postfix. The postfix will be added to the end of the topic name.");
-        new_topic = topic + POSTFIX_NAME;
-      }
+      std::string new_topic = replaceSyncTopicNamePostfix(topic, synchronized_pointcloud_postfix_);
       auto publisher = this->create_publisher<sensor_msgs::msg::PointCloud2>(
         new_topic, rclcpp::SensorDataQoS().keep_last(maximum_queue_size_));
       transformed_raw_pc_publisher_map_.insert({topic, publisher});
@@ -241,6 +234,35 @@ void PointCloudConcatenateDataSynchronizerComponent::transformPointCloud(
   }
 }
 
+std::string PointCloudConcatenateDataSynchronizerComponent::replaceSyncTopicNamePostfix(
+  const std::string & original_topic_name, const std::string & postfix)
+{
+  std::string replaced_topic_name;
+  // separate the topic name by '/' and replace the last element with the new postfix
+  size_t pos = original_topic_name.find_last_of("/");
+  if (pos == std::string::npos) {
+    // not found '/': this is not a namespaced topic
+    RCLCPP_WARN_STREAM(
+      get_logger(),
+      "The topic name is not namespaced. The postfix will be added to the end of the topic name.");
+    return original_topic_name + postfix;
+  } else {
+    // replace the last element with the new postfix
+    replaced_topic_name = original_topic_name.substr(0, pos) + "/" + postfix;
+  }
+
+  // if topic name is the same with original topic name, add postfix to the end of the topic name
+  if (replaced_topic_name == original_topic_name) {
+    RCLCPP_WARN_STREAM(
+      get_logger(), "The topic name "
+                      << original_topic_name
+                      << " have the same postfix with synchronized pointcloud. We use the postfix "
+                         "to the end of the topic name.");
+    replaced_topic_name = original_topic_name + DEFAULT_SYNC_TOPIC_POSTFIX;
+  }
+  return replaced_topic_name;
+}
+
 /**
  * @brief compute transform to adjust for old timestamp
  *

sensing/pointcloud_preprocessor/src/time_synchronizer/time_synchronizer_nodelet.cpp

@@ -34,7 +34,7 @@
 #include <vector>
 
 // postfix for output topics
-#define POSTFIX_NAME "_synchronized"
+#define DEFAULT_SYNC_TOPIC_POSTFIX "_synchronized"
 //////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace pointcloud_preprocessor
@@ -154,15 +154,7 @@ PointCloudDataSynchronizerComponent::PointCloudDataSynchronizerComponent(
   // Transformed Raw PointCloud2 Publisher
   {
     for (auto & topic : input_topics_) {
-      std::string new_topic = replace_topic_name_postfix(topic, synchronized_pointcloud_postfix);
-      if (new_topic == topic) {
-        RCLCPP_WARN_STREAM(
-          get_logger(),
-          "The topic name "
-            << topic
-            << " does not have a postfix. The postfix will be added to the end of the topic name.");
-        new_topic = topic + POSTFIX_NAME;
-      }
+      std::string new_topic = replaceSyncTopicNamePostfix(topic, synchronized_pointcloud_postfix);
       auto publisher = this->create_publisher<sensor_msgs::msg::PointCloud2>(
         new_topic, rclcpp::SensorDataQoS().keep_last(maximum_queue_size_));
       transformed_raw_pc_publisher_map_.insert({topic, publisher});
@@ -185,6 +177,35 @@ PointCloudDataSynchronizerComponent::PointCloudDataSynchronizerComponent(
   }
 }
 
+std::string PointCloudDataSynchronizerComponent::replaceSyncTopicNamePostfix(
+  const std::string & original_topic_name, const std::string & postfix)
+{
+  std::string replaced_topic_name;
+  // separate the topic name by '/' and replace the last element with the new postfix
+  size_t pos = original_topic_name.find_last_of("/");
+  if (pos == std::string::npos) {
+    // not found '/': this is not a namespaced topic
+    RCLCPP_WARN_STREAM(
+      get_logger(),
+      "The topic name is not namespaced. The postfix will be added to the end of the topic name.");
+    return original_topic_name + postfix;
+  } else {
+    // replace the last element with the new postfix
+    replaced_topic_name = original_topic_name.substr(0, pos) + "/" + postfix;
+  }
+
+  // if topic name is the same with original topic name, add postfix to the end of the topic name
+  if (replaced_topic_name == original_topic_name) {
+    RCLCPP_WARN_STREAM(
+      get_logger(), "The topic name "
+                      << original_topic_name
+                      << " have the same postfix with synchronized pointcloud. We use the postfix "
+                         "to the end of the topic name.");
+    replaced_topic_name = original_topic_name + DEFAULT_SYNC_TOPIC_POSTFIX;
+  }
+  return replaced_topic_name;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////////
 // overloaded functions
 void PointCloudDataSynchronizerComponent::transformPointCloud(