Symposium

orizabal · Mar 21, 2024 · 29a78e6 · 29a78e6
1 parent a8bb01a
commit 29a78e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/dao/db/rubble_rescue.db b/app/dao/db/rubble_rescue.db
diff --git a/rubble-rescue-ui/src/components/mapItems/User.js b/rubble-rescue-ui/src/components/mapItems/User.js
@@ -18,8 +18,8 @@ const User = () => {
         navigator.geolocation.getCurrentPosition(success, error)
     }
 
-    let left = position ? Math.floor(position[0]) : null;
-    let top = position ? Math.floor(position[1]) : null;
+    let left = position ? Math.floor(position[0])  + 8: null;
+    let top = position ? Math.floor(position[1]) + 22 : null;
 
     if (left < 0) left += 100;
     if (top < 0) top += 100;

diff --git a/rubble-rescue-ui/src/components/mapItems/Victim.js b/rubble-rescue-ui/src/components/mapItems/Victim.js
@@ -3,10 +3,8 @@ import classes from './Victim.module.css';
 
 const Victim = (props) => {
     // let coords = props.victim['coordinates'].split(", ");
-    console.log(props.victim.xCoordinate);
-    console.log(props.victim.yCoordinate);
-    let left = `${Math.floor(parseFloat(props.victim.xCoordinate)) + 51.2}%`;
-    let top = `${Math.floor(parseFloat(props.victim.yCoordinate)) + 50.5}%`;
+    let left = `${Math.floor(parseFloat(props.victim.xCoordinate)) + 51.1}%`;
+    let top = `${Math.floor(parseFloat(props.victim.yCoordinate)) + 48.5}%`;
 
     const style = {"left": left, "top": top}
 

diff --git a/rubble-rescue-ui/src/components/victimMapInfo/VictimInfoPopUp.js b/rubble-rescue-ui/src/components/victimMapInfo/VictimInfoPopUp.js
@@ -3,9 +3,12 @@ import classes from './VictimInfoPopUp.module.css';
 
 const VictimInfoPopUp = (props) => {
     // let coords = props.coordinates.split(", ");
-    let left = `${Math.floor(parseFloat(props.xCoordinate)) + 1}%`;
-    let topVal = Math.floor(parseFloat(props.yCoordinate)) - 10;
-    let top = `${topVal < 0 ? (topVal + 14) : topVal}%`;
+    // let left = `${Math.floor(parseFloat(props.xCoordinate)) + 1}%`;
+    // let topVal = Math.floor(parseFloat(props.yCoordinate)) - 10;
+
+    let left = `${Math.floor(parseFloat(props.xCoordinate)) + 51.1 + 1}%`;
+    let top = `${Math.floor(parseFloat(props.yCoordinate)) + 48.5 - 11}%`;
+    // let top = `${topVal < 0 ? (topVal + 14) : topVal}%`;
 
     const style = {"left": left, "top": top}