From 09a72a0ac1446c16bb9f2184a13b6ca749be7708 Mon Sep 17 00:00:00 2001
From: Henry Winkel <henrywinkel@bundeswehr.org>
Date: Thu, 9 Nov 2023 17:31:38 +0100
Subject: [PATCH] ADD: added new way of passing config vars and updated
 dockerfile

---
 Dockerfile                    |  2 +-
 libs/KubeControl              |  2 +-
 libs/OrderLibrary             |  2 +-
 libs/SimCore                  |  2 +-
 src/SimControl/SimControl.cpp | 39 +++++++++++++++++++++++++++--------
 5 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 740d413..69448c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ COPY build/libs/SimCore/libs/geographiclib/src/libGeographicLib.so.23 /usr/lib/
 COPY build/libs/KubeControl/libs/yaml-cpp/libyaml-cpp.so.0.8 /usr/lib/
 COPY build/libs/KubeControl/libs/curlpp/libcurlpp.so.1  /usr/lib/
 # COPY build/libs/EntityLibrary/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/
-COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0  /usr/lib/
+# COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0  /usr/lib/
 COPY build/libs/SimCore/libs/crossguid/libcrossguid-dgb.so.0  /usr/lib/
 
 COPY build/libs/ixwebsocket/libixwebsocket.so.0.1.0  /usr/lib/
diff --git a/libs/KubeControl b/libs/KubeControl
index f59652a..f11742c 160000
--- a/libs/KubeControl
+++ b/libs/KubeControl
@@ -1 +1 @@
-Subproject commit f59652ada171d389dff669b1472e89672f59829c
+Subproject commit f11742ce64a56307401e2a4110d68103f75703af
diff --git a/libs/OrderLibrary b/libs/OrderLibrary
index 3c86a05..a330169 160000
--- a/libs/OrderLibrary
+++ b/libs/OrderLibrary
@@ -1 +1 @@
-Subproject commit 3c86a057ce43635fe396e48a24d6ea8e59faa79a
+Subproject commit a33016976e8e25fdec9ec1ca73a6bd99af1c46bc
diff --git a/libs/SimCore b/libs/SimCore
index 7bb7c4b..630e8c4 160000
--- a/libs/SimCore
+++ b/libs/SimCore
@@ -1 +1 @@
-Subproject commit 7bb7c4bb8ef62c910a4bf2a189f2ae3b4cf444cd
+Subproject commit 630e8c4d74b95a6dcab834b42d23798535760e40
diff --git a/src/SimControl/SimControl.cpp b/src/SimControl/SimControl.cpp
index b33a5e2..59c63a0 100644
--- a/src/SimControl/SimControl.cpp
+++ b/src/SimControl/SimControl.cpp
@@ -274,14 +274,32 @@ namespace SimControl {
   {
     std::string uuid = name;
     kubecontrol::KubePod ShipPod1("controller",uuid,"ship","ship:latest",Namespace_);
-    ShipPod1.setEnvironmentVar("ENTITY_ID", uuid);
-    ShipPod1.setEnvironmentVar("ENTITY_NAME", "hamburg");
-    ShipPod1.setEnvironmentVar("POS_LAT", "\"55\"");
-    ShipPod1.setEnvironmentVar("POS_LONG", "\"8\"");
-    ShipPod1.setEnvironmentVar("POS_HEIGHT", "\"0\"");
-    ShipPod1.setEnvironmentVar("GROUNDTRUTH_PORT", "\""+std::to_string(this->GroundTruthPort_)+"\"");
-    ShipPod1.setEnvironmentVar("GROUNDTRUTH_ADDR", "\""+this->GroundTruthAddr_+"\"");
-    ShipPod1.setEnvironmentVar("COMMAND_PORT", "\""+CommandPort_+"\"");
+
+    nlohmann::json vars;
+    vars["ENTITY_ID"] = uuid;
+    vars["ENTITY_NAME"] = "hamburg";
+    vars["POSITION"]["LAT"] = "55";
+    vars["POSITION"]["LON"] = "8";
+    vars["POSITION"]["Height"] = "0";
+    vars["COURSE"] = "0";
+    vars["SPEED"] = "0";
+    vars["GROUNDTRUTH_PORT"] = std::to_string(this->GroundTruthPort_);
+    vars["GROUNDTRUTH_ADDR"] = this->GroundTruthAddr_;
+    vars["COMMAND_PORT"] = CommandPort_;
+    vars["ENTITY_RCS"] = std::to_string(850);
+
+    vars["ENTITY_SENSORS"].push_back("radar:latest");
+    ShipPod1.setEnvironmentVar("CONFIG", vars.dump());
+
+
+    // ShipPod1.setEnvironmentVar("ENTITY_ID", uuid);
+    // ShipPod1.setEnvironmentVar("ENTITY_NAME", "hamburg");
+    // ShipPod1.setEnvironmentVar("POS_LAT", "\"55\"");
+    // ShipPod1.setEnvironmentVar("POS_LONG", "\"8\"");
+    // ShipPod1.setEnvironmentVar("POS_HEIGHT", "\"0\"");
+    // ShipPod1.setEnvironmentVar("GROUNDTRUTH_PORT", "\""+std::to_string(this->GroundTruthPort_)+"\"");
+    // ShipPod1.setEnvironmentVar("GROUNDTRUTH_ADDR", "\""+this->GroundTruthAddr_+"\"");
+    // ShipPod1.setEnvironmentVar("COMMAND_PORT", "\""+CommandPort_+"\"");
 
     ShipPod1.createYAML();
     PodController_->startPod(ShipPod1);
@@ -307,6 +325,9 @@ namespace SimControl {
     vars["GROUNDTRUTH_PORT"] = std::to_string(this->GroundTruthPort_);
     vars["GROUNDTRUTH_ADDR"] = this->GroundTruthAddr_;
     vars["COMMAND_PORT"] = CommandPort_;
+    vars["ENTITY_RCS"] = std::to_string(850);
+
+    vars["ENTITY_SENSORS"].push_back("radar:latest");
 
     ShipPod1.setEnvironmentVar("ENTITY_ID", uuid);
     ShipPod1.setEnvironmentVar("ENTITY_NAME", Name);
@@ -423,7 +444,7 @@ namespace SimControl {
       int counter  = 0;
       double distance = 10000;
 
-      int rasterSize = 10;
+      int rasterSize = 5;
 
       for (int i = 0; i < rasterSize; i++ ) 
       {