Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes

- Merged 292 changed files from dlbo snapshot
- Fixed IDL enum collisions (PortType, PdmEventType)
- Fixed Grantlee template for C++11 scoped enums
- Fixed CMake VERSION_GREATER syntax
- Added missing directories (THP, LtsRestClient, etc.)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "aes_handler.h"
-#include "Core/function_reply_object.h"
+#include "DDS/Core/function_reply_object.h"
 #include "aes.hpp"
 #include "json_dispatcher.h"
 #include <QJsonArray>
@@ -525,7 +525,11 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
     // maye wrong?
     // not only maybe.. we need to swap .. yes..
     area.height(data.zieldaten.breiteRadius);
-    area.width(data.zieldaten.tiefe);
+    if (data.zieldaten.tiefe > 0)
+      area.width(data.zieldaten.tiefe);
+    else
+      if (data.zieldaten.geometrie == ProjectDataManagement::L4_TargetGeometry::Linear)
+        area.width(5); // E01562-472 [Verbund] ImpactWidth invalid. Ein Wirkfeld mit der Zielgeometrie "Linear" kann nicht verarbeitet werden.
   }
 
   if (!createArea)

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "Core/function_reply_object.h"
+#include "DDS/Core/function_reply_object.h"
 #include "logger.h"
 #include "main_dispatcher.h"
 #include "telegrams.h"

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp

@@ -477,25 +477,17 @@ void JsonDispatcher::onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS)
   const bool isVerbund = true;
   auto saa = getSAAByWs(wsId);
   int partyId = saa->getPartyId();
-  QStringList args;
-
   const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQWS.einheit.verein, partyId, isVerbund);
 
-  QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br /><B>Unit:</B> %2/%3/%4"));
-  args.append(QString::number(part.id()));
-  args.append(ortsIdMap.key(exSQWS.einheit.oi));
-  args.append(QString::number(exSQWS.einheit.r));
-  args.append(exSQWS.einheit.verein);
-
-  DEBUG_LOG(m_logger) << "Stellungsmeldung Waffensystem content=" << content;
-  createNotificationRequest(wsId,
-                            QString::fromUtf8(tr_lts("Notification","Weapon System Position Report")),
-                            NotificationManagement::MessageType_def::Info,
-                            NotificationManagement::NotificationType::AdlerNotification,
-                            content,
-                            args);
-  // Parse in party SAA
   m_ppmHandler->parseSQWS(exSQWS, wsId);
+  if (part.id() > 0)
+  {
+    sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQWS.einheit);
+    return;
+  }
+  QTimer::singleShot(5000, this, [this, wsId, partyId, isVerbund, exSQWS]() {
+    sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQWS.einheit);
+  });
 }
 
 void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS)
@@ -504,25 +496,17 @@ void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS
   auto saa = getSAAByWs(wsId);
   int partyId = saa->getPartyId();
   const bool isVerbund = true;
-  QStringList args;
 
-  const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQFS.feuereinheit.verein, partyId, isVerbund);
-
-  QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br /><B>Unit:</B> %2/%3/%4"));
-  args.append(QString::number(part.id()));
-  args.append(ortsIdMap.key(exSQFS.feuereinheit.oi));
-  args.append(QString::number(exSQFS.feuereinheit.r));
-  args.append(exSQFS.feuereinheit.verein);
-
-  DEBUG_LOG(m_logger) << "Stellungsmeldung Feuerstellung content=" << content;
-  createNotificationRequest(wsId,
-                            QString::fromUtf8(tr_lts("Notification","Position Report: Firing Unit")),
-                            NotificationManagement::MessageType_def::Info,
-                            NotificationManagement::NotificationType::AdlerNotification,
-                            content,
-                            args);
-  // Parse in party SAA
   m_ppmHandler->parseSQFS(exSQFS, wsId);
+  const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQFS.feuereinheit.verein, partyId, isVerbund);
+  if (part.id() > 0)
+  {
+    sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQFS.feuereinheit);
+    return;
+  }
+  QTimer::singleShot(5000, this, [this, wsId, partyId, isVerbund, exSQFS]() {
+    sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQFS.feuereinheit);
+  });
 }
 
 void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
@@ -531,17 +515,35 @@ void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
   auto saa = getSAAByWs(wsId);
   int partyId = saa->getPartyId();
   const bool isVerbund = true;
-  QStringList args;
 
   const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQLP.einheit.verein, partyId, isVerbund);
-  DEBUG_LOG(m_logger) << "ParticipantId=" << part.id();
+
+
+  m_ppmHandler->parseSQLP(exSQLP, wsId);
+  if (part.id() > 0)
+  {
+    sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQLP.einheit);
+    return;
+  }
+  QTimer::singleShot(5000, this, [this, wsId, partyId, exSQLP]() {
+    sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQLP.einheit);
+  });
+}
+
+void JsonDispatcher::sendParticipantInfoNotification(const int wsId, const int partyId, const bool isVerbund, const Einheit &einheit)
+{
+  DEBUG_LOG(m_logger) << "sendParticipantInfoNotification";
+  QStringList args;
+
+  const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(einheit.verein, partyId, isVerbund);
+  DEBUG_LOG(m_logger) << "sendParticipantInfoNotification ParticipantId=" << part.id();
 
   QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br /><B>Unit:</B> %2/%3/%4"));
 
   args.append(QString::number(part.id()));
-  args.append(ortsIdMap.key(exSQLP.einheit.oi));
-  args.append(QString::number(exSQLP.einheit.r));
-  args.append(exSQLP.einheit.verein);
+  args.append(ortsIdMap.key(einheit.oi));
+  args.append(QString::number(einheit.r));
+  args.append(einheit.verein);
 
   createNotificationRequest(wsId,
                             QString::fromUtf8(tr_lts("Notification","Loading Point Position Report")),
@@ -549,9 +551,7 @@ void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
                             NotificationManagement::NotificationType::AdlerNotification,
                             content,
                             args);
-  DEBUG_LOG(m_logger) << "Stellungsmeldung Ladeplatz content=" << content;
-  // Parse in party SAA
-  m_ppmHandler->parseSQLP(exSQLP, wsId);
+  DEBUG_LOG(m_logger) << "Stellungsmeldung content=" << content;
 }
 
 void JsonDispatcher::onSAATrajectoryData(const int wsId, const Flugbahndaten &exFlugbahndaten, const QString referenceUuid)

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h

@@ -13,7 +13,7 @@
 #include <QObject>
 #include <QVector>
 #include <QWebSocket>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include <TrainingAreaBase/tab_plugin_interface.h>
 // #include "logger.h"
 #include "aes_handler.h"
@@ -98,6 +98,7 @@ class JsonDispatcher final
   void onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS);
   void onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS);
   void onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP);
+  void sendParticipantInfoNotification(const int wsId, const int partyId, const bool isVerbund, const Einheit &einheit);
   void onSAAHXGuidingLines(const int wsId, const Koordinierungsdaten &koordinierungsdaten);
   void onSAAHXGuidingLinesAndBoundaries(const int wsId, const Fuehrungsdaten &fuehrungsdaten);
   void onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuerhaltdaten);

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp

@@ -89,16 +89,16 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
         m_dispatcher->onSAAStatus(wsId, exStatus);
         break;
       }
-    case TelegramIds::EX_TQ(): // Technische Quittierung
-    {
-      WARNING_LOG(m_logger) << "[EX_TQ] Technische Quittierung -------------------------------------";
-      const auto data = telegram[JsonKeys::DATA()].toObject();
-      bool bOk = true;
-      TechnischeDaten technischeDaten;
-      AdlerJson::technischeDatenFromJson(data, technischeDaten, bOk);
-      m_dispatcher->onSAAExceptionStatus(wsId, technischeDaten);
-      break;
-    }
+      case TelegramIds::EX_TQ(): // Technische Quittierung
+      {
+        WARNING_LOG(m_logger) << "[EX_TQ] Technische Quittierung -------------------------------------";
+        const auto data = telegram[JsonKeys::DATA()].toObject();
+        bool bOk = true;
+        TechnischeDaten technischeDaten;
+        AdlerJson::technischeDatenFromJson(data, technischeDaten, bOk);
+        m_dispatcher->onSAAExceptionStatus(wsId, technischeDaten);
+        break;
+      }
       case TelegramIds::EX_FIRE(): // EX-FQ(FN) Feuern
       {
         WARNING_LOG(m_logger) << "[EX-FQ(FN)] EX-Feuern -------------------------------------";
@@ -203,12 +203,13 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       {
         DEBUG_LOG(m_logger) << "[EX_GUIDING_LINES] EX-HQ Koordinierungsmassnahmen";
         auto data = telegram[JsonKeys::DATA()].toObject();
+        const QString artStr = data.value(JsonKeys::ART()).toString(QStringLiteral("Koordinierungsmassnahmen"));
         Koordinierungsdaten koordinierungsdaten;
         bool bOk = true;
         koordinierungsdatenFromJson(data, koordinierungsdaten, bOk);
 
         if (koordinierungsdaten.name.isEmpty())
-          koordinierungsdaten.name = QString(QStringLiteral("%1 - %2")).arg(typeName).arg(uuid);
+          koordinierungsdaten.name = QString(QStringLiteral("%1 - %2")).arg(typeName).arg(artStr);
         else
           koordinierungsdaten.name = QString(QStringLiteral("%1 - %2")).arg(typeName).arg(koordinierungsdaten.name);
 
@@ -219,12 +220,13 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       {
         DEBUG_LOG(m_logger) << "[EX_GUIDING_LINES_AND_BOUNDARIES] EX-HQ(G)Fuehrungslinien und Grenzen ";
         auto data = telegram[JsonKeys::DATA()].toObject();
+        const QString artStr = data.value(JsonKeys::ART()).toString(QStringLiteral("Fuehrungslinien und Grenzen"));
         Fuehrungsdaten fuehrungsdaten;
         bool bOk = true;
         fuehrungsdatenFromJson(data, fuehrungsdaten, bOk);
 
         if (fuehrungsdaten.name.isEmpty())
-          fuehrungsdaten.name = QString(QStringLiteral("%1 - %2")).arg(typeName).arg(uuid);
+          fuehrungsdaten.name = QString(QStringLiteral("%1 - %2")).arg(typeName).arg(artStr);
         else
           fuehrungsdaten.name = QString(QStringLiteral("%1 - %2")).arg(typeName).arg(fuehrungsdaten.name);
 

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp

@@ -12,7 +12,7 @@
 #include "json_dispatcher.h"
 //#include "json_handler_tx.h"
 #include <nglsettings/nglsettings_settings.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <QTimer>
 
 namespace AdlerJson

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h

@@ -11,7 +11,7 @@
 
 #include <QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include <TrainingAreaBase/dds_handler.h>
 //#include "logger.h"
 #include "ppm_handler.h"

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp

@@ -1916,33 +1916,13 @@ Szenarstatus strToSzenarstatus(QString status) { return szenarstatusMap.value(st
 
 int getFeuerkommandoRaketeEffectDurationMsec(const QJsonObject &data)
 {
-  bool bOk = false;
-  int wirkzeitMsec;
-  switch (toInteger(data[JsonKeys::WIRKZEIT()], bOk)){
-  case 1:
-    wirkzeitMsec = 3 * 60 * 60 * 1000;
-    break;
-  case 2:
-    wirkzeitMsec = 6 * 60 * 60 * 1000;
-    break;
-  case 3:
-    wirkzeitMsec = 12 * 60 * 60 * 1000;
-    break;
-  case 4:
-    wirkzeitMsec = 24 * 60 * 60 * 1000;
-    break;
-  case 5:
-    wirkzeitMsec = 48 * 60 * 60 * 1000;
-    break;
-  case 6:
-    wirkzeitMsec = 96 * 60 * 60 * 1000;
-    break;
-  default:
-    wirkzeitMsec = 3 * 60 * 60 * 1000;
-    break;
-  }
+  constexpr int hourToMsec = 60 * 60 * 1000;
+  constexpr int defaultWirkzeitMsec = 3 * hourToMsec;
 
-  return wirkzeitMsec;
+  bool bOk = false;
+  int wirkzeitHour = toInteger(data[JsonKeys::WIRKZEIT()], bOk);
+
+  return (bOk ? wirkzeitHour * hourToMsec : defaultWirkzeitMsec);
 }
 
 } // namespace AdlerJson

Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h

@@ -383,15 +383,15 @@ template <> QJsonObject EXStatus::toJsonInternal<EXStatus>();
 // EX-L13
 struct SAATELEGRAMS_EXPORT Koordinate
 {
-  double latitude;  // -90.0…90.0
-  double longitude; // -180.0…180.0
+  double latitude  {0.0};  // -90.0…90.0
+  double longitude {0.0};  // -180.0…180.0
 };
 
 // EX-L14
 struct SAATELEGRAMS_EXPORT KoordinateMitHoehe
 {
   Koordinate koordinate; // EX-L13
-  int hoehe;             // EX-L5 -399…9999  Meter
+  int hoehe {0};        // EX-L5 -399…9999  Meter
 };
 
 // EX-L6 Abfeuerungsart
@@ -683,10 +683,10 @@ struct SAATELEGRAMS_EXPORT FeuerkommandoGeschosse
   QString ladung;          // EX-L10 (table pdm_load_type)
   QString zuender;         // EX-L11 (table pdm_igniter_type)
   QString zuenderFunktion; // EX-L41 (table pdm_igniter_function)
-  double zuenderZeit;      // [ms]
-  int anzahl;
-  int ladungsNummer;
-  double intervall; // [s]
+  double zuenderZeit {0.0};// [ms]
+  int anzahl {-1};
+  int ladungsNummer {-1};
+  double intervall {0.0}; // [s]
 };
 
 // EX-L35 Flugbahnpunkt
@@ -744,22 +744,22 @@ struct SAATELEGRAMS_EXPORT WirkmittelFeuerkommando
 struct SAATELEGRAMS_EXPORT Treffpunkt
 {
   KoordinateMitHoehe koordinate; // EX-L14
-  int anzahl;
+  int anzahl {-1};
 };
 
 // EX-L49 Wirkmittel Feuerkommando Rakete
 struct SAATELEGRAMS_EXPORT WirkmittelFeuerkommandoRakete
 {
-  ProjectDataManagement::L27_EffectorId kenner; // EX-L27
+  ProjectDataManagement::L27_EffectorId kenner {ProjectDataManagement::L27_EffectorId_def::get_default()}; // EX-L27
   QVector<Treffpunkt> treffpunkte;
-  double flugzeit;
-  int gipfelhoehe;
-  double schussrichtung;
-  int fallwinkel;
-  ProjectDataManagement::L48_TrajectoryRocket anflug;
+  double flugzeit {0.0};
+  int gipfelhoehe {0};
+  double schussrichtung {0.0};
+  int fallwinkel {0};
+  ProjectDataManagement::L48_TrajectoryRocket anflug {ProjectDataManagement::L48_TrajectoryRocket_def::get_default()};
   FeuerkommandoGeschosse geschoss;
-  ProjectDataManagement::L46_GpsFrequency gps;
-  int wirkzeit;
+  ProjectDataManagement::L46_GpsFrequency gps {ProjectDataManagement::L46_GpsFrequency_def::get_default()};
+  int wirkzeit {-1};
 };
 
 // EX-L33 Feuerkommando

Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace ApHlaJson
 {

Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h

@@ -11,7 +11,7 @@
 #include <QObject>
 #include <QWebSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "logger.h"
 #include "ppm_handler.h"
 #include "aes_handler.h"

Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h

@@ -10,7 +10,7 @@
 
 #include <QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "dds_handler.h"
 #include "logger.h"
 #include "ppm_handler.h"

Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.h

@@ -10,7 +10,7 @@
 
 #include <QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include "../TetraJson/convert_from_json.h"
 #include "convert_to_json_file.h"
 

Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h

@@ -11,7 +11,7 @@
 #include <QObject>
 #include <QWebSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "logger.h"
 
 class QTimer;

Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h

@@ -10,7 +10,7 @@
 
 #include <QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "logger.h"
 
 namespace HlaJson

Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h

@@ -10,7 +10,7 @@
 
 #include <QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "logger.h"
 
 namespace Nmea

Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h

@@ -15,7 +15,7 @@
 #include <QUdpSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <nglsettings/nglsettings_settings.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "logger.h"
 
 namespace Nmea

Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h

@@ -12,7 +12,7 @@
 
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <TrainingAreaBase/dds_handler.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 
 #include <QObject>
 

Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h

@@ -10,7 +10,7 @@
 
 #include <QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "logger.h"
 
 namespace WlsTetra

Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h

@@ -14,7 +14,7 @@
 #include <QTimer>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <PrtCnv/PrtCnvApplication.hpp>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "tetra_prtcnv.h"
 #include "logger.h"
 

Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h

@@ -11,7 +11,7 @@
 #include <QObject>
 #include <QWebSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <Core/function_reply_object.h> // tr_lts
+#include <DDS/Core/function_reply_object.h> // tr_lts
 #include "logger.h"
 
 class QTimer;

Lts/Proxies/TrainingAreaBase/dds_handler.cpp

@@ -10,7 +10,7 @@
 
 #include <DDS/DDSConnector/publisher.h>
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <DDS/DTC/generic_dtc_impl.h>
 #include <DDS/DTS/generic_dts_impl.h>
 

Lts/Proxies/TrainingAreaBase/dds_handler.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/core_dtc_types.h>
+#include <DDS/Core/core_dtc_types.h>
 
 #include <TrainingAreaBase/tab_dts_types.h>
 #include <TrainingAreaBase/tab_dts.h>

Lts/Proxies/TrainingAreaBase/main_handler.cpp

@@ -13,7 +13,7 @@
 #include "WebSocketInterface/json_keys.h"
 
 #include <AssetManagement/asm_dtc.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <ExerciseManagement/exm_dtc.h>
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <TrainingAreaBase/tab_record_replay_plugin.h>

Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp

@@ -310,7 +310,10 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
     //data.aesTetraIdUnused = m_mainHandler->aesHandler()->tetraIdFromDdsId(request.aesId());
     data.aesDdsId = request.aesId();
     //TODO: !!!!!! Use new EventType to check which AreaEffectSimulationType will be chosen.
-    data.aesType = m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
+    if (request.eventType() == ProjectDataManagement::EventType::ExplosionCluster)
+      data.aesType = TetraIcd::AreaEffectSimulationType::ExplosionArea;
+    else
+      data.aesType = m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
     /*!
      \brief Take the new event type attribute to check if its is a HazardArea(DangerZone/Gefahrenbereich)
      *