diff --git a/src/v2i-hub/CARMAStreetsPlugin/manifest.json b/src/v2i-hub/CARMAStreetsPlugin/manifest.json index 37e705a8d..8195c49fd 100644 --- a/src/v2i-hub/CARMAStreetsPlugin/manifest.json +++ b/src/v2i-hub/CARMAStreetsPlugin/manifest.json @@ -118,9 +118,9 @@ "description": "Apache Kafka consumer group ID for spat consumer." }, { - "key": "SimExternalObjTopic", - "default": "v2xhub_sim_external_object", - "description": "Apache Kafka topic plugin will transmit simulated external object to." + "key": "SimSensorDetectedObjTopic", + "default": "v2xhub_sim_sensor_detected_object", + "description": "Apache Kafka topic plugin will transmit simulated sensor detected object to." } ] diff --git a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp index bd16592dc..7e685a530 100755 --- a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp +++ b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp @@ -25,7 +25,7 @@ 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 ); + AddMessageFilter < simulation::SensorDetectedObject > (this, &CARMAStreetsPlugin::HandleSimulatedSensorDetectedMessage ); SubscribeToMessages(); } @@ -51,7 +51,7 @@ void CARMAStreetsPlugin::UpdateConfigSettings() { GetConfigValue("MobilityPathTopic", _transmitMobilityPathTopic); GetConfigValue("MapTopic", _transmitMAPTopic); GetConfigValue("SRMTopic", _transmitSRMTopic); - GetConfigValue("SimExternalObjTopic", _transmitSimExternalObjTopic); + GetConfigValue("SimSensorDetectedObjTopic", _transmitSimSensorDetectedObjTopic); // Populate strategies config string config; GetConfigValue("MobilityOperationStrategies", config); @@ -630,10 +630,10 @@ void CARMAStreetsPlugin::SubscribeSSMKafkaTopic(){ } -void CARMAStreetsPlugin::HandleSimulatedExternalMessage(simulation::SensorDetectedObject &msg, routeable_message &routeableMsg) +void CARMAStreetsPlugin::HandleSimulatedSensorDetectedMessage(simulation::SensorDetectedObject &msg, routeable_message &routeableMsg) { - PLOG(logINFO) << "Produce External Object Message in JSON format: " << msg.to_string() < _kafka_producer_ptr;