Migrates AreaEffectSimulation to generated rtiddsgen API

Converts accessor calls to plain member access across aes service and plugin.

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp

@@ -59,13 +59,13 @@ double distanceMeter(const LtsCoordTrans::UtmCoordinate &utmCoord1, const LtsCoo
 
 double distanceMeter(const Core::GeoPosition &geoPos, const LtsCoordTrans::UtmCoordinate &utmCoord)
 {
-  const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat());
+  const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat);
   return distanceMeter(utmPos, utmCoord);
 }
 
 double distanceMeter(const Core::GeoPosition2D &geoPos2D, const LtsCoordTrans::UtmCoordinate &utmCoord)
 {
-  const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos2D.lon(), geoPos2D.lat());
+  const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos2D.lon, geoPos2D.lat);
   return distanceMeter(utmPos, utmCoord);
 }
 
@@ -118,17 +118,17 @@ void ModuleTestAesOthers::onOffRouteMineRemoveReply(const Core::FunctionReplyObj
 void ModuleTestAesOthers::boobyTrapChanged(const BoobyTrap &data, DataModification modType)
 {
   Q_UNUSED(modType);
-  if (data.id() == -1)
+  if (data.id == -1)
     return;
 
   ++m_counterDds.cntBoobyTrap;
 
   m_dataBoobyTrap = data;
   qint64 startTimeMsec = -1;
-  if (m_dataBoobyTrap.effectStart().is_set())
-    startTimeMsec = m_dataBoobyTrap.effectStart().get();
+  if (m_dataBoobyTrap.effectStart.is_set())
+    startTimeMsec = m_dataBoobyTrap.effectStart.get();
 
-  DEBUG_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap.id() << ", state=" << m_dataBoobyTrap.effectStateId()
+  DEBUG_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap.id << ", state=" << m_dataBoobyTrap.effectStateId
                       << ", startTimeMsec=" << startTimeMsec
                       << ", cntBoobyTrap=" << m_counterDds.cntBoobyTrap;
   TRACE_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap;
@@ -137,17 +137,17 @@ void ModuleTestAesOthers::boobyTrapChanged(const BoobyTrap &data, DataModificati
 void ModuleTestAesOthers::offRouteMineChanged(const OffRouteMine &data, DataModification modType)
 {
   Q_UNUSED(modType);
-  if (data.id() == -1)
+  if (data.id == -1)
     return;
 
   ++m_counterDds.cntOffRouteMine;
 
   m_dataOffRouteMine = data;
   qint64 startTimeMsec = -1;
-  if (m_dataOffRouteMine.effectStart().is_set())
-    startTimeMsec = m_dataOffRouteMine.effectStart().get();
+  if (m_dataOffRouteMine.effectStart.is_set())
+    startTimeMsec = m_dataOffRouteMine.effectStart.get();
 
-  DEBUG_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine.id() << ", state=" << m_dataOffRouteMine.effectStateId()
+  DEBUG_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine.id << ", state=" << m_dataOffRouteMine.effectStateId
                       << ", startTimeMsec=" << startTimeMsec
                       << ", cntOffRouteMine=" << m_counterDds.cntOffRouteMine;
   TRACE_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine;
@@ -159,15 +159,15 @@ void ModuleTestAesOthers::onAesItemViewChanged(const AesItemView &aesItemView, D
   if (modType == DataModification::eRemoved)
     return;
 
-  AreaEffectSimulation::AesType_def::type aesType = aesItemView.aesTypeId().underlying();
+  AreaEffectSimulation::AesType::type aesType = aesItemView.aesTypeId().underlying();
   DEBUG_LOG(m_logger) << " got onAesItemViewChanged, aesType=" << aesType;
 
   switch (aesType)
   {
-  case AreaEffectSimulation::AesType_def::AtBoobyTrap:
-  case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
-  case AreaEffectSimulation::AesType_def::AtOffRouteMine:
-  case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
+  case AreaEffectSimulation::AesType::AtBoobyTrap:
+  case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
+  case AreaEffectSimulation::AesType::AtOffRouteMine:
+  case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
     ++m_counterDds.cntItemView;
     break;
   default:
@@ -215,18 +215,18 @@ void ModuleTestAesOthers::waitForEffectStatesBT(int lineNumber, int durPrep, int
   }
 
   INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsPrepared...";
-  if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, durPrep))
+  if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsPrepared;}, durPrep))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataBoobyTrap with id " << m_dataBoobyTrap.id
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
   INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsActivated...";
-  if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, durAct))
+  if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated;}, durAct))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataBoobyTrapr with id " << m_dataBoobyTrap.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataBoobyTrapr with id " << m_dataBoobyTrap.id
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
@@ -235,9 +235,9 @@ void ModuleTestAesOthers::waitForEffectStatesBT(int lineNumber, int durPrep, int
   if (durExp > 0)
   {
     INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsExpired...";
-    if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired;}, durExp))
+    if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}, durExp))
     {
-      ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
+      ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataBoobyTrap with id " << m_dataBoobyTrap.id
                           << ", lineNumber = " << lineNumber;
       QVERIFY2(false, "ERROR, exit");
       return;
@@ -255,18 +255,18 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
   }
 
   INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsPrepared...";
-  if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, durPrep))
+  if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId == AreaEffectSimulation::AesEffectState::EsPrepared;}, durPrep))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataOffRouteMine with id " << m_dataOffRouteMine.id
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
   INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsActivated...";
-  if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, durAct))
+  if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated;}, durAct))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataOffRouteMine with id " << m_dataOffRouteMine.id
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
@@ -275,9 +275,9 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
   if (durExp > 0)
   {
     INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsExpired...";
-    if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired;}, durExp))
+    if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}, durExp))
     {
-      ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
+      ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataOffRouteMine with id " << m_dataOffRouteMine.id
                           << ", lineNumber = " << lineNumber;
       QVERIFY2(false, "ERROR, exit");
       return;
@@ -296,8 +296,8 @@ void ModuleTestAesOthers::setupParticipants()
     ParticipantManagement::SetSimulatedPosition req;
 
     {
-      req.participantId(18);  // according testDB
-      req.onlyOutdatedParticipants(false);
+      req.participantId = 18;  // according testDB
+      req.onlyOutdatedParticipants = false;
 
       const LtsCoordTrans::UtmCoordinate &utmPos =
         LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7690018100")); // 32U PD 76900 18100
@@ -323,7 +323,7 @@ bool ModuleTestAesOthers::checkParticipant_18()
   // soll: QStringLiteral("32UPD7690018000")); // 32U PD 76900 18000
   const int partId = 18;
   const ParticipantManagement::ParticipantPosition &pos = m_ppmDtc->participantPosition(partId);
-  QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(pos.pos().lon(), pos.pos().lat());
+  QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(pos.pos.lon, pos.pos.lat);
   INFO_LOG(m_logger) << " for partId = '" << partId << "', we got position: " << mgrsStr;
 
   return mgrsStr == QStringLiteral("32U PD 76900 18100");
@@ -337,8 +337,8 @@ bool ModuleTestAesOthers::tryRemoveOldBoobyTraps()
 
   for (const auto &bt : btMap)
   {
-    qCritical() << " bt.name"  << bt.name().c_str();
-    int ret = m_aesFtc->boobyTrapRemoveRequest(Core::RemoveElementRequest(bt.id()));
+    qCritical() << " bt.name"  << bt.name.c_str();
+    int ret = m_aesFtc->boobyTrapRemoveRequest(Core::RemoveElementRequest(bt.id));
     qCritical() << " bt.name -> "  << ret;
   }
   return true;
@@ -347,17 +347,17 @@ bool ModuleTestAesOthers::tryRemoveOldBoobyTraps()
 
 int ModuleTestAesOthers::doBoobyTrapModifyRequest(const BoobyTrap &btData)
 {
-  BoobyTrapModifyRequest req(btData.id(),
-                             btData.name(),
-                             btData.effectDuration(),
-                             btData.chargeStruct().chargeTypeId(),
-                             btData.impactPosition(),
-                             btData.impactRadius(),
-                             btData.triggerRadius(),
-                             btData.rotationAngle(),
-                             btData.centralAngle(),
-                             btData.effectStart(),
-                             btData.partyId()
+  BoobyTrapModifyRequest req(btData.id,
+                             btData.name,
+                             btData.effectDuration,
+                             btData.chargeStruct.chargeTypeId,
+                             btData.impactPosition,
+                             btData.impactRadius,
+                             btData.triggerRadius,
+                             btData.rotationAngle,
+                             btData.centralAngle,
+                             btData.effectStart,
+                             btData.partyId
                             );
 
   int ret = m_aesFtc->boobyTrapModifyRequest(req, this);
@@ -366,14 +366,14 @@ int ModuleTestAesOthers::doBoobyTrapModifyRequest(const BoobyTrap &btData)
 
 int ModuleTestAesOthers::doOffRouteMineModifyRequest(const OffRouteMine &offRouteMine)
 {
-  OffRouteMineModifyRequest req(offRouteMine.id(),
-                                offRouteMine.name(),
-                                offRouteMine.effectDuration(),
-                                offRouteMine.chargeStruct().chargeTypeId(),
-                                offRouteMine.area(),
-                                offRouteMine.impactRadius(),
-                                offRouteMine.effectStart(),
-                                offRouteMine.partyId()
+  OffRouteMineModifyRequest req(offRouteMine.id,
+                                offRouteMine.name,
+                                offRouteMine.effectDuration,
+                                offRouteMine.chargeStruct.chargeTypeId,
+                                offRouteMine.area,
+                                offRouteMine.impactRadius,
+                                offRouteMine.effectStart,
+                                offRouteMine.partyId
                                 );
 
   int ret = m_aesFtc->offRouteMineModifyRequest(req, this);
@@ -384,8 +384,8 @@ int ModuleTestAesOthers::doMoveParticipant(int participantId, const QString &new
 {
   ParticipantManagement::SetSimulatedPosition req;
   {
-    req.participantId(participantId);  // according testDB
-    req.onlyOutdatedParticipants(false);
+    req.participantId = participantId;  // according testDB
+    req.onlyOutdatedParticipants = false;
 
     const LtsCoordTrans::UtmCoordinate &utmPos =
         LtsCoordTrans::UtmCoordinate::fromMgrs(newPositionMGRS); // 32U PD 76900 18100
@@ -481,8 +481,8 @@ void ModuleTestAesOthers::initTestCase()
   std::cout << "  waitForHistoricalDataExercise... Done" << std::endl;
 
   const ExerciseManagement::Exercise &exercise = m_exmDtc->exercise(m_exerciseId);
-  QVERIFY2(exercise.id() == m_exerciseId, "ERROR, exercise failed!!");
-  m_traingAreaId = exercise.trainingAreaId();
+  QVERIFY2(exercise.id == m_exerciseId, "ERROR, exercise failed!!");
+  m_traingAreaId = exercise.trainingAreaId;
 
   std::cout << "  ExerciseManagement"
             << ", m_traingAreaId = " << m_traingAreaId << std::endl;
@@ -549,22 +549,22 @@ void ModuleTestAesOthers::test_boobyTrap_01()
   QVERIFY2(checkParticipant_18(), "ERROR, checkParticipant_5 failed!!");
 
   AreaEffectSimulation::BoobyTrap bt;
-  bt.id(0);
-  bt.name(QString(QStringLiteral("ModuleTest_BoobyTrap01")).toStdString());
-  bt.chargeStruct().chargeTypeId(252);
-  bt.effectDuration(60000);
-  bt.partyId(2);
-  bt.impactRadius(10);
-  bt.triggerRadius(5);
+  bt.id = 0;
+  bt.name = QString(QStringLiteral("ModuleTest_BoobyTrap01")).toStdString();
+  bt.chargeStruct.chargeTypeId = 252;
+  bt.effectDuration = 60000;
+  bt.partyId = 2;
+  bt.impactRadius = 10;
+  bt.triggerRadius = 5;
 
   // Type1 == SchAbwMi      ohne rotationAngle, centralAngle
   // Type2 == SchAbwRiMi    mit rotationAngle, centralAngle
 
 
   LtsCoordinate lts = LtsCoordinate::fromUtmCoordinate(UtmCoordinate::fromMgrs(QStringLiteral("32U PD 77000 18100")), 0.0);
-  bt.impactPosition(lts.geoPosition2D());
+  bt.impactPosition = lts.geoPosition2D();
 
-  bt.effectStart((time(nullptr) + 10) * 1000);  // msec
+  bt.effectStart = (time(nullptr) + 10) * 1000;  // msec
 
   m_replyError = true;
   m_dataBoobyTrap = AreaEffectSimulation::BoobyTrap();
@@ -573,7 +573,7 @@ void ModuleTestAesOthers::test_boobyTrap_01()
   QVERIFY2(ret != 0, "ERROR, doBoobyTrapModifyRequest failed!!");
 
   waitForEffectStatesBT(__LINE__, 5, 15, 0);  // do _not_ wait for expired!
-  QVERIFY2(m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated, "ERROR, effectStateId failed!!");
+  QVERIFY2(m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated, "ERROR, effectStateId failed!!");
   dumpCnt();
   QVERIFY2(m_counterDds.cntBoobyTrap == 2, "ERROR, cnt failed!!"); // EsPrepared, EsActivated,
   QVERIFY2(m_counterDds.cntItemView  == 4, "ERROR, cnt failed!!"); //
@@ -588,9 +588,9 @@ void ModuleTestAesOthers::test_boobyTrap_01()
   doMoveParticipant(18, QStringLiteral("32U PD 77002 18103"));
 
   // wait until expired:
-  waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired; }, 60);
+  waitForData([this]() { return m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired; }, 60);
 
-  QVERIFY2(m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired, "ERROR, effectStateId failed!!");
+  QVERIFY2(m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired, "ERROR, effectStateId failed!!");
 
   // wait to let it disappear:
   waitForData([]() { return false; }, 15);
@@ -619,22 +619,22 @@ void ModuleTestAesOthers::test_boobyTrap_02_IMPL(const QString &name,
   QVERIFY2(checkParticipant_18(), "ERROR, checkParticipant_5 failed!!");
 
   AreaEffectSimulation::BoobyTrap bt;
-  bt.id(0);
-  bt.name(name.toStdString());
-  bt.chargeStruct().chargeTypeId(252);
-  bt.effectDuration(600000);
-  bt.partyId(2);
-  bt.impactRadius(10);
-  bt.triggerRadius(5);
+  bt.id = 0;
+  bt.name = name.toStdString();
+  bt.chargeStruct.chargeTypeId = 252;
+  bt.effectDuration = 600000;
+  bt.partyId = 2;
+  bt.impactRadius = 10;
+  bt.triggerRadius = 5;
 
-  bt.impactPosition(impactCoord.geoPosition());
+  bt.impactPosition = impactCoord.geoPosition();
 
   // Type1 == SchAbwMi      ohne rotationAngle, centralAngle
   // Type2 == SchAbwRiMi    mit rotationAngle, centralAngle
-  bt.rotationAngle(toOptional(rotationAngle));  // Q1: 30
-  bt.centralAngle(toOptional(90.0));
+  bt.rotationAngle = toOptional(rotationAngle);  // Q1: 30
+  bt.centralAngle = toOptional(90.0);
 
-  bt.effectStart((time(nullptr) + 10) * 1000);  // msec
+  bt.effectStart = (time(nullptr) + 10) * 1000;  // msec
 
   m_replyError = true;
   m_dataBoobyTrap = AreaEffectSimulation::BoobyTrap();
@@ -643,7 +643,7 @@ void ModuleTestAesOthers::test_boobyTrap_02_IMPL(const QString &name,
   QVERIFY2(ret != 0, "ERROR, doBoobyTrapModifyRequest failed!!");
 
   waitForEffectStatesBT(__LINE__, 5, 15, 0);  // do _not_ wait for expired!
-  QVERIFY2(m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated, "ERROR, m_dataBoobyTrap effectStateId failed!!");
+  QVERIFY2(m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated, "ERROR, m_dataBoobyTrap effectStateId failed!!");
   dumpCnt();
   QVERIFY2(m_counterDds.cntBoobyTrap == 2, "ERROR, cnt failed!!"); // EsPrepared, EsActivated,
   QVERIFY2(m_counterDds.cntItemView  == 4, "ERROR, cnt failed!!"); //
@@ -660,9 +660,9 @@ void ModuleTestAesOthers::test_boobyTrap_02_IMPL(const QString &name,
   doMoveParticipant(18, particpantCoord.mgrs());
 
   // wait until expired:
-  waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired; }, 60);
+  waitForData([this]() { return m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired; }, 60);
 
-  QVERIFY2(m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired, "ERROR, effectStateId failed!!");
+  QVERIFY2(m_dataBoobyTrap.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired, "ERROR, effectStateId failed!!");
 
   // wait to let it disappear:
   waitForData([]() { return false; }, 15);
@@ -721,21 +721,21 @@ void ModuleTestAesOthers::test_offRouteMine_02()
   //  offRouteMine2 = 254; // MIT  impactRadius
 
   AreaEffectSimulation::OffRouteMine orm;
-  orm.id(0);
-  orm.name(QString(QStringLiteral("test_offRouteMine_02")).toStdString());
-  orm.chargeStruct().chargeTypeId(254);
-  orm.effectDuration(600000);
-  orm.partyId(2);
-  orm.impactRadius(10); // 254 -> MIT impactRadius -> mit 3DSphere/Kugel
+  orm.id = 0;
+  orm.name = QString(QStringLiteral("test_offRouteMine_02")).toStdString();
+  orm.chargeStruct.chargeTypeId = 254;
+  orm.effectDuration = 600000;
+  orm.partyId = 2;
+  orm.impactRadius = 10; // 254 -> MIT impactRadius -> mit 3DSphere/Kugel
 
   const LtsCoordinate &coord =
       LtsCoordinate::fromUtmCoordinate(UtmCoordinate::fromMgrs(QStringLiteral("32U PD 77000 18100")), 0.0);
-  orm.area().cornerBottomLeft(coord.geoPosition());
-  orm.area().height(50);
-  orm.area().width(1);
-  orm.area().rotation(85);
+  orm.area.cornerBottomLeft = coord.geoPosition();
+  orm.area.height = 50;
+  orm.area.width = 1;
+  orm.area.rotation = 85;
 
-  orm.effectStart((time(nullptr) + 10) * 1000);  // msec
+  orm.effectStart = (time(nullptr) + 10) * 1000;  // msec
 
   m_replyError = true;
   m_dataOffRouteMine = AreaEffectSimulation::OffRouteMine();
@@ -744,7 +744,7 @@ void ModuleTestAesOthers::test_offRouteMine_02()
   QVERIFY2(ret != 0, "ERROR, doOffRouteMineModifyRequest failed!!");
 
   waitForEffectStatesORM(__LINE__, 5, 15, 0);  // do _not_ wait for expired!
-  QVERIFY2(m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated, "ERROR, effectStateId failed!!");
+  QVERIFY2(m_dataOffRouteMine.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated, "ERROR, effectStateId failed!!");
   dumpCnt();
   QVERIFY2(m_counterDds.cntOffRouteMine == 2, "ERROR, cnt failed!!"); // EsPrepared, EsActivated,
   QVERIFY2(m_counterDds.cntItemView     == 4, "ERROR, cnt failed!!"); //
@@ -761,13 +761,13 @@ void ModuleTestAesOthers::test_offRouteMine_02()
   doMoveParticipant(18, QStringLiteral("32U PD 77020 18095"));
 
   // wait until expired:
-  waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired; }, 60);
+  waitForData([this]() { return m_dataOffRouteMine.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired; }, 60);
 
-  QVERIFY2(m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired, "ERROR, m_dataOffRouteMine effectStateId failed!!");
+  QVERIFY2(m_dataOffRouteMine.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired, "ERROR, m_dataOffRouteMine effectStateId failed!!");
 
   // wait to let it disappear:
   waitForData([]() { return false; }, 15);
-  INFO_LOG(m_logger) << LOGFUNCTION << " END" << ", name =" << orm.name() << "'";
+  INFO_LOG(m_logger) << LOGFUNCTION << " END" << ", name =" << orm.name << "'";
 }
 
 void ModuleTestAesOthers::cleanupTestCase()