refactor: move Position column more to the end of the drone status line

skybrush-io · Nov 2, 2024 · 07fc068 · 07fc068
1 parent 38a1270
commit 07fc068
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/views/uavs/DroneStatusLine.jsx b/src/views/uavs/DroneStatusLine.jsx
@@ -169,13 +169,6 @@ const DroneStatusLine = ({
           >
             {abbreviateGPSFixType(gpsFixType)}
           </StatusPill>
-          {localPosition ? (
-            padEnd(localCoordinateFormatter(localPosition), 25)
-          ) : position ? (
-            padEnd(coordinateFormatter([position.lon, position.lat]), 25)
-          ) : (
-            <span className={classes.muted}>{padEnd('no position', 25)}</span>
-          )}
           {!isNil(amsl) ? (
             padStart(position.amsl.toFixed(1), 6) + 'm'
           ) : (
@@ -194,6 +187,13 @@ const DroneStatusLine = ({
           <StatusText status={headingDeviationToStatus(headingDeviation)}>
             {padStart(!isNil(heading) ? Math.round(heading) + '°' : '', 5)}
           </StatusText>
+          {localPosition ? (
+            padEnd(localCoordinateFormatter(localPosition), 25)
+          ) : position ? (
+            padEnd(coordinateFormatter([position.lon, position.lat]), 25)
+          ) : (
+            <span className={classes.muted}>{padEnd('no position', 25)}</span>
+          )}
           <span className={classes.debugString}>
             {debugString ? ' ' + debugString : ''}
           </span>

diff --git a/src/views/uavs/SortAndFilterHeader.jsx b/src/views/uavs/SortAndFilterHeader.jsx
@@ -200,13 +200,6 @@ const COMMON_HEADER_TEXT_PARTS = Object.freeze([
       width: 40,
     },
   },
-  {
-    label: 'Position',
-    style: {
-      textAlign: 'left',
-      width: 198,
-    },
-  },
   {
     label: 'AMSL',
     sortKey: UAVSortKey.ALTITUDE_MSL,
@@ -239,6 +232,13 @@ const COMMON_HEADER_TEXT_PARTS = Object.freeze([
       width: 40,
     },
   },
+  {
+    label: 'Position',
+    style: {
+      textAlign: 'left',
+      width: 198,
+    },
+  },
   {
     label: 'Details',
     style: {