feat(rtk): position saving and reloading

CHANGELOG.md

@@ -35,6 +35,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed double event handling on the Logs panel of the UAV properties dialog.
 
+- RTK base station coordinates can now be restored from positions stored during
+  earlier surveys.
+
 ## [2.12.1] - 2025-12-15
 
 ### Fixed

src/features/rtk/AntennaPositionIndicator.jsx

@@ -1,3 +1,5 @@
+import Restore from '@mui/icons-material/Restore';
+import Box from '@mui/material/Box';
 import IconButton from '@mui/material/IconButton';
 import Typography from '@mui/material/Typography';
 import PropTypes from 'prop-types';
@@ -15,15 +17,17 @@ import {
 import { getAntennaInfoSummary } from './selectors';
 
 const AntennaPositionIndicator = ({
+  hasSavedCoordinates,
   onCopyAntennaPositionToClipboard,
   onClick,
+  onShowSavedCoordinates,
   position,
   t,
 }) => {
   const hasAntennaPosition = Boolean(position);
 
   return (
-    <>
+    <Box display='flex' alignItems='center' gap={0.5}>
       <Tooltip content={t('antennaPositionIndicator.clickToToggle')}>
         <Typography
           variant='body2'
@@ -46,15 +50,33 @@ const AntennaPositionIndicator = ({
           </IconButton>
         </Tooltip>
       )}
-    </>
+      {onShowSavedCoordinates && (
+        <Tooltip
+          content={t('antennaPositionIndicator.useSavedCoordinate')}
+          // Explicitly set trigger to 'mouseenter' only to prevent the tooltip
+          // from showing when the dialog closes and focus returns to this button.
+          trigger='mouseenter'
+        >
+          <IconButton
+            disabled={!hasSavedCoordinates}
+            size='large'
+            onClick={onShowSavedCoordinates}
+          >
+            <Restore />
+          </IconButton>
+        </Tooltip>
+      )}
+    </Box>
   );
 };
 
 AntennaPositionIndicator.propTypes = {
   // description: PropTypes.string,
+  hasSavedCoordinates: PropTypes.bool,
   position: PropTypes.string,
   onClick: PropTypes.func,
   onCopyAntennaPositionToClipboard: PropTypes.func,
+  onShowSavedCoordinates: PropTypes.func,
   t: PropTypes.func,
 };
 

src/features/rtk/RTKCoordinateRestorationDialog.jsx

@@ -0,0 +1,132 @@
+import formatDate from 'date-fns/format';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemButton from '@mui/material/ListItemButton';
+import ListItemText from '@mui/material/ListItemText';
+
+import { BackgroundHint } from '@skybrush/mui-components';
+
+import { closeCoordinateRestorationDialog } from '~/features/rtk/slice';
+import {
+  getCoordinateRestorationDialogState,
+  getPreferredSavedRTKPositionFormatter,
+  getSavedCoordinatesForPreset,
+} from '~/features/rtk/selectors';
+import { useSavedCoordinateForPreset } from '~/features/rtk/actions';
+import Download from '~/icons/Download';
+import { formatDistance } from '~/utils/formatting';
+
+const SavedCoordinateItem = ({ coordinate, coordinateFormatter, onClick }) => {
+  const { accuracy, savedAt } = coordinate;
+  const savedDateTime = formatDate(new Date(savedAt), 'yyyy-MM-dd HH:mm:ss');
+
+  const formattedPosition = coordinateFormatter(coordinate);
+
+  return (
+    <ListItem disablePadding>
+      <ListItemButton onClick={() => onClick(coordinate)}>
+        <Box
+          sx={{
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'space-between',
+            width: '100%',
+          }}
+        >
+          <ListItemText
+            primary={formattedPosition}
+            secondary={`Accuracy: ${formatDistance(accuracy, 3)} • ${savedDateTime}`}
+          />
+          <Download sx={{ marginLeft: 2 }} />
+        </Box>
+      </ListItemButton>
+    </ListItem>
+  );
+};
+
+const RTKCoordinateRestorationDialog = ({
+  coordinateFormatter,
+  dialog,
+  onClose,
+  onUseSaved,
+  savedCoordinates,
+  t,
+}) => {
+  const { presetId } = dialog;
+
+  const handleUseSaved = (coordinate) => {
+    onClose(); // Close dialog first
+    void onUseSaved(presetId, coordinate); // Then start async operation
+  };
+
+  return (
+    <Dialog fullWidth open={dialog.open} maxWidth='sm' onClose={onClose}>
+      <DialogTitle>{t('RTKCoordinateRestorationDialog.title')}</DialogTitle>
+      <DialogContent>
+        <Box>
+          {savedCoordinates.length === 0 ? (
+            <BackgroundHint
+              text={t('RTKCoordinateRestorationDialog.noSavedCoordinates')}
+            />
+          ) : (
+            <List>
+              {savedCoordinates.map((coordinate) => (
+                <SavedCoordinateItem
+                  key={coordinate.savedAt}
+                  coordinate={coordinate}
+                  coordinateFormatter={coordinateFormatter}
+                  onClick={handleUseSaved}
+                />
+              ))}
+            </List>
+          )}
+        </Box>
+      </DialogContent>
+      <DialogActions>
+        <Button color='primary' onClick={onClose}>
+          {t('general.action.cancel')}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+RTKCoordinateRestorationDialog.propTypes = {
+  coordinateFormatter: PropTypes.func,
+  dialog: PropTypes.object,
+  onClose: PropTypes.func,
+  onUseSaved: PropTypes.func,
+  savedCoordinates: PropTypes.array,
+  t: PropTypes.func,
+};
+
+export default connect(
+  (state) => {
+    const dialog = getCoordinateRestorationDialogState(state);
+
+    const coordinateFormatter = getPreferredSavedRTKPositionFormatter(state);
+
+    return {
+      dialog,
+      savedCoordinates: dialog.presetId
+        ? getSavedCoordinatesForPreset(state, dialog.presetId)
+        : [],
+      coordinateFormatter,
+    };
+  },
+  {
+    onClose: closeCoordinateRestorationDialog,
+    onUseSaved: useSavedCoordinateForPreset,
+  }
+)(withTranslation()(RTKCoordinateRestorationDialog));

src/features/rtk/RTKCorrectionSourceSelector.jsx

@@ -9,7 +9,10 @@ import { withTranslation } from 'react-i18next';
 import { connect } from 'react-redux';
 import { useAsync, useAsyncFn } from 'react-use';
 
-import { resetRTKStatistics } from '~/features/rtk/slice';
+import {
+  resetRTKStatistics,
+  setCurrentRTKPresetId,
+} from '~/features/rtk/slice';
 import messageHub from '~/message-hub';
 
 const NULL_ID = '__null__';
@@ -19,7 +22,11 @@ const nullPreset = {
   title: 'RTK disabled',
 };
 
-const RTKCorrectionSourceSelector = ({ onSourceChanged, t }) => {
+const RTKCorrectionSourceSelector = ({
+  onSourceChanged,
+  setCurrentRTKPresetId,
+  t,
+}) => {
   const [selectedByUser, setSelectedByUser] = useState();
   const [selectionState, getSelectionFromServer] = useAsyncFn(async () =>
     messageHub.query.getSelectedRTKPresetId()
@@ -31,9 +38,13 @@ const RTKCorrectionSourceSelector = ({ onSourceChanged, t }) => {
   );
 
   const loading = presetsState.loading || selectionState.loading;
-  const hasError = presetsState.error || selectionState.error;
+  const hasError = presetsState.error;
 
-  const presets = presetsState.value ? presetsState.value : [];
+  if (selectionState.error) {
+    console.warn('Failed to load RTK selection state:', selectionState.error);
+  }
+
+  const presets = presetsState.value ?? [];
   const hasSelectionFromServer = selectionState.value !== undefined;
   const selectedOnServer =
     selectionState.value !== undefined
@@ -44,16 +55,27 @@ const RTKCorrectionSourceSelector = ({ onSourceChanged, t }) => {
   const hasPresets = presets && presets.length > 0;
 
   const handleChange = async (event) => {
+    const newPresetId = event.target.value;
+
     // We assume that the request will succeed so we eagerly select the new
     // value. If changing the RTK source fails, it will be changed back in the
     // response handler triggered by the effect that we set up below.
-    setSelectedByUser(event.target.value);
+    setSelectedByUser(newPresetId);
 
     if (onSourceChanged) {
       onSourceChanged();
     }
   };
 
+  // Update current preset ID in Redux
+  useEffect(() => {
+    const currentId = selectedByUser ?? selectedOnServer;
+    // Convert NULL_ID to undefined or keep as is? The selector uses 'undefined' for no selection usually.
+    // But presets have IDs.
+    const effectiveId = currentId === NULL_ID ? undefined : currentId;
+    setCurrentRTKPresetId(effectiveId);
+  }, [selectedByUser, selectedOnServer, setCurrentRTKPresetId]);
+
   // If we have the preset list, but we don't have the current selection yet,
   // load the current selection
   useEffect(() => {
@@ -143,14 +165,15 @@ const RTKCorrectionSourceSelector = ({ onSourceChanged, t }) => {
 
 RTKCorrectionSourceSelector.propTypes = {
   onSourceChanged: PropTypes.func,
+  setCurrentRTKPresetId: PropTypes.func,
   t: PropTypes.func,
 };
 
 export default connect(
-  // mapStateToProps
   null,
   // mapDispatchToProps
   {
     onSourceChanged: resetRTKStatistics,
+    setCurrentRTKPresetId,
   }
 )(withTranslation()(RTKCorrectionSourceSelector));

src/features/rtk/RTKSetupDialog.jsx

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import RTKCorrectionSourceSelector from './RTKCorrectionSourceSelector';
+import RTKCoordinateRestorationDialog from './RTKCoordinateRestorationDialog';
 import RTKMessageStatistics from './RTKMessageStatistics';
 import RTKSetupDialogBottomPanel from './RTKSetupDialogBottomPanel';
 import RTKStatusUpdater from './RTKStatusUpdater';
@@ -14,25 +15,28 @@ import { closeRTKSetupDialog } from './slice';
  * monitor the RTK correction source for the UAVs.
  */
 const RTKSetupDialog = ({ onClose, open }) => (
-  <Dialog fullWidth open={open} maxWidth='sm' onClose={onClose}>
-    <RTKStatusUpdater />
-    <Box>
-      <Box sx={{ mx: 3, mt: 3 }}>
-        <RTKCorrectionSourceSelector />
-        <Box
-          sx={{
-            height: 100,
-            my: 2,
-            boxSizing: 'content-box',
-            overflow: 'auto',
-          }}
-        >
-          <RTKMessageStatistics />
+  <>
+    <Dialog fullWidth open={open} maxWidth='sm' onClose={onClose}>
+      <RTKStatusUpdater />
+      <Box>
+        <Box sx={{ mx: 3, mt: 3 }}>
+          <RTKCorrectionSourceSelector />
+          <Box
+            sx={{
+              height: 100,
+              my: 2,
+              boxSizing: 'content-box',
+              overflow: 'auto',
+            }}
+          >
+            <RTKMessageStatistics />
+          </Box>
         </Box>
+        <RTKSetupDialogBottomPanel />
       </Box>
-      <RTKSetupDialogBottomPanel />
-    </Box>
-  </Dialog>
+    </Dialog>
+    <RTKCoordinateRestorationDialog />
+  </>
 );
 
 RTKSetupDialog.propTypes = {