From 4466dc4331444f93379c08fdf442380ecabdaa17 Mon Sep 17 00:00:00 2001
From: Henry Winkel <henrywinkel@bundeswehr.org>
Date: Thu, 14 Mar 2024 18:35:52 +0100
Subject: [PATCH] ADD: added own ship icon and adaption for cms result

---
 webapp/public/Own_Ship.svg                    | 72 +++++++++++++++++++
 .../components/perceivedTruth/map/map.jsx     |  2 +-
 .../perceivedTruth/tracklist/tracklist.jsx    | 12 +++-
 .../SimControl/components/OpenSeaMap/icon.jsx |  9 ++-
 4 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 webapp/public/Own_Ship.svg

diff --git a/webapp/public/Own_Ship.svg b/webapp/public/Own_Ship.svg
new file mode 100644
index 0000000..9c23768
--- /dev/null
+++ b/webapp/public/Own_Ship.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   height="592.92773"
+   width="592.92773"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="NATO Map Symbol - Friendly Sea - Own Ship.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1536"
+     inkscape:window-height="801"
+     id="namedview65"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1"
+     inkscape:cx="68.45469"
+     inkscape:cy="233.21213"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:object-nodes="true" />
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#00c8ff;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path2988"
+     d="m 514.47312,296.57436 a 218.00928,218.00928 0 0 1 -436.018504,0 218.00928,218.00928 0 1 1 436.018504,0 z"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#00c8ff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 296.46387,78.454681 0,436.018369"
+     id="path4136"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#00c8ff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 514.47305,296.46387 -436.018363,0"
+     id="path4136-5"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+</svg>
diff --git a/webapp/src/components/Debug/components/perceivedTruth/map/map.jsx b/webapp/src/components/Debug/components/perceivedTruth/map/map.jsx
index d0a1d16..7eb73e2 100644
--- a/webapp/src/components/Debug/components/perceivedTruth/map/map.jsx
+++ b/webapp/src/components/Debug/components/perceivedTruth/map/map.jsx
@@ -98,7 +98,7 @@ function MyMap({center,Tracklist}) {
       var Symbol = {
         ID: element.ID,
         Name:element.Name,
-        Position: [element.Position.PositionGeodesic.lat, element.Position.PositionGeodesic.lon] ,
+        Position: [element.Position[0], element.Position[1]] ,
         IconData:  createIcon(element.Type, element.Side),
       }
       
diff --git a/webapp/src/components/Debug/components/perceivedTruth/tracklist/tracklist.jsx b/webapp/src/components/Debug/components/perceivedTruth/tracklist/tracklist.jsx
index 85a9f6b..9ac89af 100644
--- a/webapp/src/components/Debug/components/perceivedTruth/tracklist/tracklist.jsx
+++ b/webapp/src/components/Debug/components/perceivedTruth/tracklist/tracklist.jsx
@@ -47,11 +47,14 @@ function TrackList(props)
                     <div class="divTableBody">
                         <div class="divTableRow">
                             <div class="divTableCell">NR</div>
+                            <div class="divTableCell">ID</div>
                             <div class="divTableCell">Name</div>
                             <div class="divTableCell">Position</div>
                             <div class="divTableCell">Bearing</div>
                             <div class="divTableCell">Range</div>
+                            <div class="divTableCell">Threat</div>
                             <div class="divTableCell">Sensors</div>
+                            <div class="divTableCell">Status</div>
                         </div>
                         {/* {<MakeRow />} */}
 
@@ -65,11 +68,16 @@ function TrackList(props)
                                     <div class="divTableRow">
                            
                              <div class="divTableCell">{index}</div>
+                             <div class="divTableCell">{elem.ID}</div>
                             <div class="divTableCell">{elem.Name}</div>
-                            <div class="divTableCell">{round(elem.Position.PositionGeodesic.lat,4)}, {round(elem.Position.PositionGeodesic.lon,4)}</div>
+                            <div class="divTableCell">{round(elem.Position[0],4)}, {round(elem.Position[1],4)}</div>
                             <div class="divTableCell">{round(elem.Bearing,2)}</div>
                             <div class="divTableCell">{round(elem.Distance,2)}</div>
-                            <div class="divTableCell">{MakeSensorList(elem) }</div> 
+                            <div class="divTableCell">{elem.Threat}</div>
+                            <div class="divTableCell">{}</div>
+                            <div class="divTableCell">{elem.Status}</div>
+
+                            {/* <div class="divTableCell">{MakeSensorList(elem) }</div>  */}
                         </div>
                             )
                         }
diff --git a/webapp/src/components/SimControl/components/OpenSeaMap/icon.jsx b/webapp/src/components/SimControl/components/OpenSeaMap/icon.jsx
index d0c3265..0a11fc6 100644
--- a/webapp/src/components/SimControl/components/OpenSeaMap/icon.jsx
+++ b/webapp/src/components/SimControl/components/OpenSeaMap/icon.jsx
@@ -93,4 +93,11 @@ const Hostile = new Icon({
   iconAnchor: [hostile.getAnchor().x, hostile.getAnchor().y],
 });
 
-export { iconShip, friend,Hostile,createIcon };
\ No newline at end of file
+
+
+var OwnShipIcon = new Icon({
+  iconUrl: 'Own_Ship.svg',
+  iconSize:     [50, 50], // size of the icon
+});
+
+export {OwnShipIcon, iconShip, friend,Hostile,createIcon };
\ No newline at end of file