update

usdot-fhwa-OPS · Jul 24, 2023 · e9e32c7 · e9e32c7
1 parent f75137d
commit e9e32c7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 41 deletions.
diff --git a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp
@@ -25,7 +25,6 @@ CARMAStreetsPlugin::CARMAStreetsPlugin(string name) :
 	AddMessageFilter < tsm2Message > (this, &CARMAStreetsPlugin::HandleMobilityPathMessage);
 	AddMessageFilter < MapDataMessage > (this, &CARMAStreetsPlugin::HandleMapMessage);
 	AddMessageFilter < SrmMessage > (this, &CARMAStreetsPlugin::HandleSRMMessage);
-	AddMessageFilter < simulation::SensorDetectedObject > (this, &CARMAStreetsPlugin::HandleSimulatedExternalMessage );
 
 	SubscribeToMessages();
 }
@@ -630,12 +629,6 @@ void CARMAStreetsPlugin::SubscribeSSMKafkaTopic(){
 
 }
 
-void CARMAStreetsPlugin::HandleSimulatedExternalMessage(simulation::SensorDetectedObject &msg, routeable_message &routeableMsg)
-{
-	auto json_str = tmx::utils::sim::SimulationSensorDetectedObjectConverter::simExternalObjToJsonStr(msg);
-	PLOG(logINFO) <<  "Produce External Object Message in JSON format:  " << json_str <<std::endl;
-	produce_kafka_msg(json_str, _transmitSimExternalObjTopic);
-}
 
 bool CARMAStreetsPlugin::getEncodedtsm3( tsm3EncodedMessage *tsm3EncodedMsg,  Json::Value metadata, Json::Value payload_json )
 {

diff --git a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.h b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.h
@@ -21,7 +21,6 @@
 #include <kafka/kafka_consumer_worker.h>
 #include "JsonToJ2735SSMConverter.h"
 #include <simulation/SensorDetectedObject.h>
-#include <simulation/SimulationSensorDetectedObjectConverter.h>
 #include "PluginClientClockAware.h"
 
 
@@ -50,7 +49,6 @@ class CARMAStreetsPlugin: public PluginClientClockAware {
 	void HandleMobilityOperationMessage(tsm3Message &msg, routeable_message &routeableMsg);
 	void HandleMobilityPathMessage(tsm2Message &msg, routeable_message &routeableMsg);
 	void HandleBasicSafetyMessage(BsmMessage &msg, routeable_message &routeableMsg);
-	void HandleSimulatedExternalMessage(simulation::SensorDetectedObject &msg, routeable_message &routeableMsg);
 	/**
 	 * @brief Overide PluginClientClockAware HandleTimeSyncMessage to producer TimeSyncMessage to kafka for CARMA Streets Time Synchronization.
 	 * @param msg TimeSyncMessage received by plugin when in simulation mode. Message provides current simulation time to all processes.

diff --git a/src/v2i-hub/CDASimAdapter/src/CDASimConnection.cpp b/src/v2i-hub/CDASimAdapter/src/CDASimConnection.cpp
@@ -136,8 +136,7 @@ namespace CDASimAdapter{
         if(external_object_listener)
         {
             std::string str_msg = consume_server_message(external_object_listener);
-            //To populate the simulation external object, this JSON string has to follow this specification: https://usdot-carma.atlassian.net/wiki/spaces/CRMSIM/pages/2563899417/Detected+Objects+Specification#CARMA-Street-and-V2xHub
-            tmx::utils::sim::SimulationSensorDetectedObjectConverter::jsonToSimExternalObj(str_msg, externalObj);
+            //ToDo: To populate the simulation detected object, this JSON string has to follow this specification: https://usdot-carma.atlassian.net/wiki/spaces/CRMSIM/pages/2563899417/Detected+Objects+Specification#CARMA-Street-and-V2xHub
         }
         else
         {

diff --git a/src/v2i-hub/CDASimAdapter/src/include/CDASimConnection.hpp b/src/v2i-hub/CDASimAdapter/src/include/CDASimConnection.hpp
@@ -8,7 +8,6 @@
 #include <jsoncpp/json/json.h>
 #include <PluginLog.h>
 #include <gtest/gtest.h>
-#include <simulation/SimulationSensorDetectedObjectConverter.h>
 
 
 namespace CDASimAdapter {

diff --git a/src/v2i-hub/CDASimAdapter/test/TestSimulationMessages.cpp b/src/v2i-hub/CDASimAdapter/test/TestSimulationMessages.cpp