front: use matchPathStepAndOp() in pathStepMatchesOp()

The logic in matchPathStepAndOp() is more general.
pathStepMatchesOp() performs some special checks on kp/name/opId
so retain these.

Also need to adapt the argument type for matchPathStepAndOp() to
only pick the properties we really need.

Signed-off-by: Simon Ser <contact@emersion.fr>

front/src/modules/pathfinding/utils.ts

@@ -34,7 +34,10 @@ export const formatSuggestedOperationalPoints = (
     coordinates: getPointCoordinates(geometry, pathLength, op.position),
   }));
 
-export const matchPathStepAndOp = (step: PathStep, op: SuggestedOP) => {
+export const matchPathStepAndOp = (
+  step: PathStep,
+  op: Pick<SuggestedOP, 'opId' | 'uic' | 'ch' | 'trigram' | 'track' | 'offsetOnTrack'>
+) => {
   if ('operational_point' in step) {
     return step.operational_point === op.opId;
   }
@@ -155,15 +158,22 @@ export const upsertPathStepsInOPs = (ops: SuggestedOP[], pathSteps: PathStep[]):
 
 export const pathStepMatchesOp = (
   pathStep: PathStep,
-  op: Pick<SuggestedOP, 'uic' | 'ch' | 'kp' | 'name' | 'opId'>,
+  op: Pick<
+    SuggestedOP,
+    'opId' | 'uic' | 'ch' | 'trigram' | 'track' | 'offsetOnTrack' | 'name' | 'kp'
+  >,
   withKP = false
-) =>
-  ('uic' in pathStep &&
-    'ch' in pathStep &&
-    pathStep.uic === op.uic &&
-    pathStep.ch === op.ch &&
-    (withKP ? pathStep.kp === op.kp : pathStep.name === op.name)) ||
-  pathStep.id === op.opId;
+) => {
+  if (!matchPathStepAndOp(pathStep, op)) {
+    // TODO: we abuse the PathStep.id field here, the backend also sets it to an
+    // ID which has nothing to do with OPs
+    return pathStep.id === op.opId;
+  }
+  if ('uic' in pathStep) {
+    return withKP ? pathStep.kp === op.kp : pathStep.name === op.name;
+  }
+  return true;
+};
 
 /**
  * Check if a suggested operational point is a via.
@@ -175,7 +185,10 @@ export const pathStepMatchesOp = (
  */
 export const isVia = (
   vias: PathStep[],
-  op: Pick<SuggestedOP, 'uic' | 'ch' | 'kp' | 'name' | 'opId'>,
+  op: Pick<
+    SuggestedOP,
+    'opId' | 'uic' | 'ch' | 'trigram' | 'track' | 'offsetOnTrack' | 'name' | 'kp'
+  >,
   { withKP = false } = {}
 ) => vias.some((via) => pathStepMatchesOp(via, op, withKP));