fix merge issue

usdot-fhwa-OPS · Jul 27, 2023 · 4aef6b1 · 4aef6b1
1 parent 917fa34
commit 4aef6b1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/v2i-hub/CDASimAdapter/src/CDASimConnection.cpp b/src/v2i-hub/CDASimAdapter/src/CDASimConnection.cpp
@@ -35,7 +35,7 @@ namespace CDASimAdapter{
 
 
     std::string CDASimConnection::get_handshake_json(const std::string &infrastructure_id, const std::string &local_ip,  const uint time_sync_port, const uint simulated_interaction_port, const uint v2x_port, 
-                                const Point &location) const
+                                const tmx::utils::Point &location) const
 
     {
         Json::Value message;   
@@ -65,7 +65,7 @@ namespace CDASimAdapter{
 
     bool CDASimConnection::carma_simulation_handshake(const std::string &simulation_ip, const std::string &infrastructure_id, const uint simulation_registration_port, 
                                 const std::string &local_ip,  const uint time_sync_port, const uint simulated_interaction_port, const uint v2x_port, 
-                                const Point &location) 
+                                const tmx::utils::Point &location) 
     {
         // Create JSON message with the content 
         std::string payload = "";

diff --git a/src/v2i-hub/CDASimAdapter/src/include/CDASimConnection.hpp b/src/v2i-hub/CDASimAdapter/src/include/CDASimConnection.hpp
@@ -137,19 +137,19 @@ namespace CDASimAdapter {
              * @param location simulated location of infrastructure hardware.
              * @return true if handshake successful and false if handshake unsuccessful.
              */
-            std::string get_handshake_json(const std::string &infrastructure_id, const std::string &local_ip,  const uint time_sync_port, 
-                const uint v2x_port, const tmx::utils::Point &location) const; 
+            std::string get_handshake_json(const std::string &infrastructure_id, const std::string &local_ip,  const uint time_sync_port, const uint simulated_interaction_port, const uint v2x_port, 
+                                const tmx::utils::Point &location) const; 
 
             /**
-             * @brief Read local file that has the sensor information in JSON format from disk. Populate global sensor json variable with the information.
-             * @param file_path A string of file location in the host machine.
-             * @return A reference to the location where the sensors inforation is updated and stored.
+             * @brief Read Json file specified by the file path from disk, and convert the json into Json::Value object.
+             * @param file_path A string of file path in the host machine.
+             * @return A Json::Value object.
             */
             Json::Value read_json_file(const std::string& file_path) const;
              /**
-             * @brief Read local file that has the sensor information in JSON format from disk. Populate global sensor json variable with the information.
+             * @brief Convert the Json string into Json::Value object.
              * @param json_str A JSON string.
-             * @return A reference to JSON value.
+             * @return A Json::Value object.
             */
             Json::Value string_to_json(const std::string &json_str) const;