From c7140e065396f6cdce2e409f72f7cb787289f263 Mon Sep 17 00:00:00 2001
From: Henry Winkel <henrywinkel@bundeswehr.org>
Date: Wed, 1 Nov 2023 09:44:23 +0100
Subject: [PATCH] ADD: rounded some numbers and changed that only strings are
 sended to the ws

---
 .../src/components/control/EntityControl.jsx  | 24 ++++++++++---------
 .../control/Tracklist/tracklist.jsx           |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/webapp/src/components/control/EntityControl.jsx b/webapp/src/components/control/EntityControl.jsx
index a65142b..5abbe78 100644
--- a/webapp/src/components/control/EntityControl.jsx
+++ b/webapp/src/components/control/EntityControl.jsx
@@ -4,6 +4,7 @@ import { useForm, SubmitHandler } from "react-hook-form"
 import Form from 'react-bootstrap/Form';
 import FloatingLabel from 'react-bootstrap/FloatingLabel';
 import InputGroup from 'react-bootstrap/InputGroup';
+import round from "../Utils";
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
@@ -14,7 +15,8 @@ import './controls.css'
 
 function EntityControl(props)
 {    
-   
+   const RoundPrecision = 2;
+   const RoundPrecisionPosition = 4;
 
 
     const [Entity, setEntity] = useState(undefined);
@@ -33,20 +35,20 @@ function EntityControl(props)
 
             if(props.Entity !== undefined)
             {
-                console.log(props.Entity)
+                // console.log(props.Entity)
                 if(Entity === undefined)
                 {
                     setEntity(props.Entity);
-                    setFormData({name:props.Entity.Name,course:props.Entity.Course,speed:props.Entity.Speed,position:props.Entity.Position,height:props.Entity.Height })
+                    setFormData({name:props.Entity.Name,course:props.Entity.Course,speed:props.Entity.Speed,position:props.Entity.Position,height:round(props.Entity.Height,RoundPrecision) })
 
                 }else if(Entity.id !== props.Entity.id)
                 {
                     setEntity(props.Entity);
-                    setFormData({name:props.Entity.Name,course:props.Entity.Course,speed:props.Entity.Speed,position:props.Entity.Position,height:props.Entity.Height})
+                    setFormData({name:props.Entity.Name,course:props.Entity.Course,speed:props.Entity.Speed,position:props.Entity.Position,height:round(props.Entity.Height,RoundPrecision)})
 
                 } else if(Entity.id === props.Entity.id && Entity.Position !== props.Entity.Position)
                 {
-                    setFormData({...formData,position:props.Entity.Position,height:props.Entity.Height})
+                    setFormData({...formData,position:props.Entity.Position,height:round(props.Entity.Height,RoundPrecision)})
                     setPositionDragged(true);
                     
 
@@ -235,8 +237,8 @@ const handleClick = (e) => {
                   Name: formData.name,
                   Speed: formData.speed.toString(),
                   Course: formData.course.toString(),
-                  Position: formData.position,
-                  Height: formData.height,
+                  Position: [formData.position[0].toString(),formData.position[1].toString()],
+                  Height: formData.height.toString(),
                   SetPosition: true
               
                 }
@@ -257,8 +259,8 @@ const handleClick = (e) => {
                   ID: Entity.id,
                   Speed: formData.speed.toString(),
                   Course: formData.course.toString(),
-                  Position: formData.position,
-                  Height: formData.height,
+                  Position: [formData.position[0].toString(),formData.position[1].toString()],
+                  Height: formData.height.toString(),
                   SetPosition: setPos
               
                 }
@@ -353,14 +355,14 @@ const handleClick = (e) => {
             <div class="div7"> 
                 <div class="input-group mb-3 NumberInputsGroup">
                     <span class="input-group-text">Lat</span>
-                    <input className="ControlInput NumberInputs" name="Lat" type="text"   onChange={handleInput}    value={formData.position[0]} />
+                    <input className="ControlInput NumberInputs" name="Lat" type="text"   onChange={handleInput}    value={round(formData.position[0],RoundPrecisionPosition)} />
                 </div>
             </div>
             <div class="div8"> 
             <div class="input-group mb-3 NumberInputsGroup" >
                     <span class="input-group-text">Lon</span>
                     {/* <input className="ControlInput" name="Lat" readOnly={true} type="text"  onClick={handleClick}     value={formData.position[0]} /> */}
-                    <input className="ControlInput NumberInputs" name="Lon" readOnly={true} type="text"  onClick={handleClick}  onChange={handleInput}   value={formData.position[1]}/>
+                    <input className="ControlInput NumberInputs" name="Lon" readOnly={true} type="text"  onClick={handleClick}  onChange={handleInput}   value={round(formData.position[1],RoundPrecisionPosition)}/>
                 </div>
                 {/* <div  className="flex">
                     <div className="ControlHeader">Lon:</div>
diff --git a/webapp/src/components/control/Tracklist/tracklist.jsx b/webapp/src/components/control/Tracklist/tracklist.jsx
index 2e7649e..7e9c574 100644
--- a/webapp/src/components/control/Tracklist/tracklist.jsx
+++ b/webapp/src/components/control/Tracklist/tracklist.jsx
@@ -31,8 +31,8 @@ class Tracklist extends React.Component
                                     <td >{val.Name}</td>
                                     <td className='TracklistCell'>{val.Course}</td>
                                     <td className='TracklistCell'>{val.Speed}</td>
-                                    <td className='TracklistCell'>{round(val.Position[0],3)}</td>
-                                    <td className='TracklistCell'>{round(val.Position[1],3)}</td>
+                                    <td className='TracklistCell'>{round(val.Position[0],4)}</td>
+                                    <td className='TracklistCell'>{round(val.Position[1],4)}</td>
                                     <td className='TracklistCell'>{val.Type}</td>
                                     <td className='TracklistCell'>{val.Side}</td>