refactor: use some functions from @skybrush/show-format instead of declaring them here

Author: ntamas

package-lock.json

@@ -53,7 +53,7 @@
     "@skybrush/math": "^1.0.1",
     "@skybrush/mui-components": "^6.9.0",
     "@skybrush/redux-toolkit": "^5.1.0",
-    "@skybrush/show-format": "^5.5.1",
+    "@skybrush/show-format": "^5.6.1",
     "@tippyjs/react": "^4.2.6",
     "@turf/boolean-contains": "^7.4.0",
     "@turf/buffer": "^7.4.0",

package.json

@@ -12,7 +12,11 @@ import type {
   Trajectory,
   ValidationSettings,
 } from '@skybrush/show-format';
-import { EnvironmentType } from '@skybrush/show-format';
+import {
+  EnvironmentType,
+  getTrajectoriesFromSpecification,
+  getTrajectoryDuration,
+} from '@skybrush/show-format';
 
 import {
   getMinimumIndoorTakeoffSpacing,
@@ -32,7 +36,6 @@ import {
   type TakeoffHeadingSpecification,
 } from '../constants';
 import { SettingsSynchronizationStatus } from '../enums';
-import { getDurationOfTrajectory, isValidTrajectory } from '../trajectory';
 import type {
   CoordinateSystem,
   EnvironmentState,
@@ -222,18 +225,16 @@ export const getNumberOfDronesInShow: AppSelector<number> = createSelector(
  * undefined for all the drones that have no fixed trajectories in the mission.
  */
 export const getTrajectories: AppSelector<Array<Trajectory | undefined>> =
-  createSelector(getDroneSwarmSpecification, (swarm) =>
-    swarm.map((drone) => {
-      const trajectory = drone.settings.trajectory;
-      return isValidTrajectory(trajectory) ? trajectory : undefined;
-    })
+  createSelector(
+    (state: RootState) => state.show.data,
+    (spec) => getTrajectoriesFromSpecification(spec)
   );
 
 /**
  * Returns the total duration of the show, in seconds.
  */
 export const getShowDuration = createSelector(getTrajectories, (trajectories) =>
-  max(trajectories.map((x) => (x ? (getDurationOfTrajectory(x) ?? 0) : 0)))
+  max(trajectories.map((x) => (x ? getTrajectoryDuration(x) : 0)))
 );
 
 /**

src/features/show/selectors/core.ts

@@ -10,6 +10,7 @@ import max from 'lodash-es/max';
 import { createCachedSelector } from 're-reselect';
 
 import { convexHull2D, getCentroid } from '@skybrush/math';
+import { isValidTrajectory } from '@skybrush/show-format';
 
 import { CommonClockId } from '~/features/clocks/types';
 import {
@@ -32,7 +33,6 @@ import {
   getMaximumHeightOfTrajectory,
   getMaximumHorizontalDistanceFromTakeoffPositionInTrajectory,
   getPointsOfTrajectory,
-  isValidTrajectory,
 } from '../trajectory';
 import { makeSegmentSelectors, transformPoints } from './trajectory';
 

src/features/show/selectors/js-core.js

@@ -7,6 +7,7 @@ import type {
   SwarmSpecification,
   TimeWindow,
 } from '@skybrush/show-format';
+import { isValidTrajectory } from '@skybrush/show-format';
 
 import { type GPSPosition } from '~/model/geography';
 import { type AppSelector } from '~/store/reducers';
@@ -17,7 +18,6 @@ import { EMPTY_ARRAY } from '~/utils/redux';
 import {
   getConvexHullOfTrajectory,
   getTrajectoryInTimeWindow,
-  isValidTrajectory,
 } from '../trajectory';
 import {
   isOutdoorCoordinateSystemWithOrigin,

src/features/show/selectors/trajectory.ts

@@ -1,12 +1,12 @@
-import isObject from 'lodash-es/isObject';
 import max from 'lodash-es/max';
 
 import { convexHull2D, euclideanDistance2D } from '@skybrush/math';
 import {
+  getTrajectorySegmentsInTimeWindow,
+  isValidTrajectory,
   type TimeWindow,
   type Trajectory,
   type TrajectorySegment,
-  trajectorySegmentsInTimeWindow,
 } from '@skybrush/show-format';
 
 import type { Coordinate2D, Coordinate3D } from '~/utils/math';
@@ -119,27 +119,6 @@ export const getPointsOfTrajectory = (
   return points.map((point) => point[1]);
 };
 
-/**
- * Returns the duration of a single drone trajectory, in seconds.
- */
-export const getDurationOfTrajectory = (
-  trajectory: Trajectory
-): number | undefined => {
-  if (!isValidTrajectory(trajectory)) {
-    return;
-  }
-
-  const { points, takeoffTime } = trajectory;
-
-  // TODO: `isValidTrajectory` already ensures `points.length > 0`...
-  if (points.length > 0) {
-    const lastPoint = points.at(-1);
-    if (Array.isArray(lastPoint) && lastPoint.length > 1) {
-      return lastPoint[0] + (takeoffTime ?? 0);
-    }
-  }
-};
-
 /**
  * Returns the subtrajectory of the given trajectory that is within the given time window.
  *
@@ -155,7 +134,7 @@ export function getTrajectoryInTimeWindow(
 ): Trajectory {
   return {
     ...trajectory,
-    points: trajectorySegmentsInTimeWindow(
+    points: getTrajectorySegmentsInTimeWindow(
       trajectory.points,
       timeWindow
       // TODO: Get rid of this type assertion! It only holds if the given
@@ -164,22 +143,3 @@ export function getTrajectoryInTimeWindow(
     ) as Trajectory['points'],
   };
 }
-
-/**
- * Returns whether a trajectory object "looks like" a valid trajectory.
- *
- * TODO: Add validation for the optional `takeoffTime` and `landingTime` fields
- *       Also, maybe this function should be in `@skybrush/show-format` instead
- */
-export const isValidTrajectory = (
-  trajectory: unknown
-): trajectory is Trajectory =>
-  // prettier-ignore
-  isObject(trajectory)
-  // `version` is valid
-  && 'version' in trajectory
-  && trajectory.version === 1
-  // `points` is a valid, non-empty array
-  && 'points' in trajectory
-  && Array.isArray(trajectory.points)
-  && trajectory.points.length > 0;

src/features/show/trajectory.ts

@@ -11,6 +11,7 @@ import {
   euclideanDistance2D,
   getMeanAngle,
 } from '@skybrush/math';
+import { isValidTrajectory } from '@skybrush/show-format';
 
 import { Status } from '~/components/semantics';
 import {
@@ -34,10 +35,7 @@ import {
   getTrajectories,
   isShowIndoor,
 } from '~/features/show/selectors';
-import {
-  getPointsOfTrajectory,
-  isValidTrajectory,
-} from '~/features/show/trajectory';
+import { getPointsOfTrajectory } from '~/features/show/trajectory';
 import {
   errorSeverityToSemantics,
   getSeverityOfErrorCode,