@squawk/flightplan 0.10.0 → 0.11.0

package/README.md

@@ -120,8 +120,8 @@ Each element has a `type` discriminant and a `raw` field with the original token
 | Type            | Description                               | Key fields                                                                   |
 | --------------- | ----------------------------------------- | ---------------------------------------------------------------------------- |
 | `airport`       | Resolved airport (ICAO or FAA ID)         | `airport`                                                                    |
-| `sid`           | Standard Instrument Departure             | `procedure`, `legs`, `transition`                                            |
-| `star`          | Standard Terminal Arrival Route           | `procedure`, `legs`, `transition`                                            |
+| `sid`           | Standard Instrument Departure             | `procedure`, `legs`, `transition`, `airportMismatch`                         |
+| `star`          | Standard Terminal Arrival Route           | `procedure`, `legs`, `transition`, `airportMismatch`                         |
 | `airway`        | Airway segment between entry and exit fix | `airway`, `entryFix`, `exitFix`, `waypoints`, `gaps`, `unusable`, `reversed` |
 | `direct`        | DCT (direct) indicator                    | -                                                                            |
 | `waypoint`      | Resolved fix or navaid                    | `fix` and/or `navaid`, `lat`, `lon`                                          |
@@ -192,6 +192,17 @@ which is how routes are usually filed (`KJFK DEEZZ6 CANDR`). Otherwise the
 common route alone is expanded. The `sid` or `star` element records the merged
 transition in `transition`.
 
+Many procedure identifiers are published as a separate adaptation at each of
+several airports, and the adaptations' legs differ (PANGG7 has seven common
+legs at 05C and five at KMDW). A SID is matched to the route's departure
+airport, the last airport before it, and a STAR to the arrival airport, the
+first airport after it. When no adaptation serves that airport the first one
+published is expanded, so the route still draws, and the element carries the
+airport in `airportMismatch`: the route files the procedure at an airport it
+does not serve, so it is not valid as filed. A STAR with no airport after it,
+or a SID with none before it, is expanded from the first adaptation without a
+flag.
+
 A procedure that cannot be expanded is marked `unresolved`: either the dotted
 transition is not one of its transitions, or the procedure has no common route
 (some SIDs and STARs are published as transitions only) and no adjacent fix
@@ -203,10 +214,18 @@ When a token could match multiple entity types (e.g. a 3-letter code matching
 both an airport and a navaid), the resolver uses this priority order:
 
 1. Airway (if previous waypoint context exists and next token available)
-2. Airport (ICAO or FAA ID)
-3. Procedure (SID/STAR)
-4. Fix
-5. Navaid
+2. Navaid, when the token is an airport's FAA ID, names a navaid, and is
+   directly followed by an airway that lists it as a waypoint
+3. Airport (ICAO or FAA ID)
+4. Procedure (SID/STAR)
+5. Fix
+6. Navaid
+
+Rule 2 covers the hundreds of airports that share their FAA ID with a navaid,
+sometimes miles apart: ahead of an airway, `SAT` in `SAT Q24 LSU` is the SAT
+VORTAC the airway is joined at, 6.6 nm from San Antonio's airport. Anywhere
+else the token is the airport, and an ICAO code (`KSAT`) always names the
+airport.
 
 The same fix or navaid identifier is sometimes published in more than one
 region. When the `fixes` or `navaids` provider exposes `byIdentAtPosition`, the

package/dist/resolver.d.ts

@@ -100,6 +100,14 @@ export interface SidRouteElement {
     procedure: Procedure;
     /** Name of the transition merged into `legs`: the one named in a dotted token (`DEEZZ6.CANDR`), or the fix following the SID when it names one of the procedure's transitions. Absent when only the common route was expanded. */
     transition?: string;
+    /**
+     * Identifier of the route's departure airport (the last airport before the
+     * SID) when no published adaptation of the procedure serves it. The SID is
+     * still expanded, from the first adaptation published, so the route can be
+     * drawn and measured, but it is not valid as filed. Absent when an
+     * adaptation serves the departure airport or the route names none.
+     */
+    airportMismatch?: string;
     /** Ordered legs for the procedure expansion. */
     legs: ProcedureLeg[];
 }
@@ -115,6 +123,14 @@ export interface StarRouteElement {
     procedure: Procedure;
     /** Name of the transition merged into `legs`: the one named in a dotted token (`AALLE4.BBOTL`), or the waypoint preceding the STAR when it names one of the procedure's transitions. Absent when only the common route was expanded. */
     transition?: string;
+    /**
+     * Identifier of the route's arrival airport (the first airport after the
+     * STAR) when no published adaptation of the procedure serves it. The STAR
+     * is still expanded, from the first adaptation published, so the route can
+     * be drawn and measured, but it is not valid as filed. Absent when an
+     * adaptation serves the arrival airport or the route names none.
+     */
+    airportMismatch?: string;
     /** Ordered legs for the procedure expansion. */
     legs: ProcedureLeg[];
 }

package/dist/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}

package/dist/resolver.js

@@ -100,9 +100,13 @@ function tryAirport(token, airports) {
 /**
  * Attempts to resolve a token as a SID or STAR procedure at a given
  * airport context. The airport context is the identifier of the most
- * recently seen airport (for SIDs, the departure airport; for STARs,
- * the arrival airport - but since the route is parsed left-to-right,
- * the most recent airport is the best available hint).
+ * route's departure airport for a SID (the last airport before the token)
+ * and its arrival airport for a STAR (the first airport after it), since
+ * one identifier is often published as a separate adaptation at each of
+ * several airports, and the adaptations' legs differ. When no adaptation
+ * serves that airport, the first one published is expanded and the element
+ * carries `airportMismatch`; when the route names no such airport, the
+ * first one is expanded without a flag.
  *
  * Accepts both the bare CIFP identifier (e.g. `DEEZZ6`) and the dotted
  * identifier-with-transition form (e.g. `DEEZZ6.CANDR`). A dotted
@@ -118,7 +122,7 @@ function tryAirport(token, airports) {
  * expanded: the dotted transition is not one of its transitions, or it
  * has no common route and no adjacent fix names a transition.
  */
-function tryProcedure(token, procedures, airportContext, previousWaypoint, nextToken) {
+function tryProcedure(token, procedures, previousAirport, resolveNextAirport, previousWaypoint, nextToken) {
     if (!procedures) {
         return undefined;
     }
@@ -132,14 +136,20 @@ function tryProcedure(token, procedures, airportContext, previousWaypoint, nextT
     if (candidates.length === 0) {
         return undefined;
     }
-    let proc;
-    if (airportContext !== undefined) {
-        const upperAirport = airportContext.toUpperCase();
-        proc = candidates.find((c) => c.airports.some((a) => a.toUpperCase() === upperAirport));
-    }
-    if (proc === undefined) {
-        proc = candidates[0];
+    // The arrival airport is only looked up when a STAR candidate needs it.
+    let nextAirport;
+    let nextAirportResolved = false;
+    function routeAirportFor(candidate) {
+        if (candidate.type !== 'STAR') {
+            return previousAirport;
+        }
+        if (!nextAirportResolved) {
+            nextAirport = resolveNextAirport();
+            nextAirportResolved = true;
+        }
+        return nextAirport;
     }
+    const proc = candidates.find((c) => servesAirport(c, routeAirportFor(c))) ?? candidates[0];
     if (proc === undefined || proc.type === 'IAP') {
         return undefined;
     }
@@ -159,8 +169,23 @@ function tryProcedure(token, procedures, airportContext, previousWaypoint, nextT
     if (transitionName !== undefined) {
         element.transition = transitionName;
     }
+    const routeAirport = routeAirportFor(proc);
+    if (routeAirport !== undefined && !servesAirport(proc, routeAirport)) {
+        element.airportMismatch = routeAirport;
+    }
     return element;
 }
+/**
+ * Whether a procedure adaptation is published for the given airport
+ * identifier. An undefined airport is served by nothing.
+ */
+function servesAirport(procedure, airport) {
+    if (airport === undefined) {
+        return false;
+    }
+    const upper = airport.toUpperCase();
+    return procedure.airports.some((a) => a.toUpperCase() === upper);
+}
 /**
  * Returns the procedure's transition whose name matches the adjacent fix
  * token, in the procedure's own spelling, or `undefined` when there is
@@ -207,6 +232,55 @@ function tryNavaid(token, navaids, anchor) {
     }
     return undefined;
 }
+/**
+ * Resolves a token as the navaid where the following airway is entered, when
+ * the token matches an airport by its FAA identifier and also names a navaid
+ * that is a waypoint of that airway (`SAT Q24 LSU`, `SJN J108 INK`). Hundreds
+ * of airports share their FAA identifier with a navaid, sometimes miles away
+ * (San Antonio's airport is 6.6 nm from the SAT VORTAC), and a token directly
+ * ahead of an airway names the point the airway is joined at. The navaid is
+ * chosen by proximity to that airway waypoint.
+ *
+ * Returns `undefined`, leaving the token to resolve as the airport, when it
+ * matches an airport by ICAO code (an ICAO code always names the airport),
+ * matches no airport, is not followed by an airway that lists it, or names no
+ * navaid there.
+ */
+function tryAirwayEntryNavaid(token, nextToken, airports, navaids, airways) {
+    if (!airports || !navaids || !airways || nextToken === undefined) {
+        return undefined;
+    }
+    if (airports.byIcao(token) !== undefined || airports.byFaaId(token) === undefined) {
+        return undefined;
+    }
+    for (const airway of airways.byDesignation(nextToken)) {
+        const entry = airway.waypoints.find((w) => w.identifier?.toUpperCase() === token);
+        if (entry !== undefined) {
+            return tryNavaid(token, navaids, { lat: entry.lat, lon: entry.lon });
+        }
+    }
+    return undefined;
+}
+/**
+ * Identifier of the first airport among the tokens from `start` on, by the
+ * same rules the parse applies (a token that resolves as an airway-entry
+ * navaid is not an airport), as the airport's ICAO code when it has one and
+ * its FAA identifier otherwise. Returns `undefined` when none follows. Used
+ * as the arrival airport of a STAR.
+ */
+function findNextAirport(tokens, start, airports, navaids, airways) {
+    for (let j = start; j < tokens.length; j++) {
+        const token = tokens[j].toUpperCase();
+        if (tryAirwayEntryNavaid(token, tokens[j + 1]?.toUpperCase(), airports, navaids, airways)) {
+            continue;
+        }
+        const airportElement = tryAirport(token, airports);
+        if (airportElement) {
+            return airportElement.airport.icao ?? airportElement.airport.faaId;
+        }
+    }
+    return undefined;
+}
 // ---------------------------------------------------------------------------
 // Main parse implementation
 // ---------------------------------------------------------------------------
@@ -334,13 +408,23 @@ export function createFlightplanResolver(options) {
                     i++;
                     continue;
                 }
+                // An FAA airport identifier that also names a navaid on the airway
+                // that follows is where the airway is joined, not the airport.
+                const entryNavaid = tryAirwayEntryNavaid(token, tokens[i + 1]?.toUpperCase(), airports, navaids, airways);
+                if (entryNavaid) {
+                    elements.push(entryNavaid);
+                    lastWaypointIdent = token;
+                    lastPosition = { lat: entryNavaid.lat, lon: entryNavaid.lon };
+                    i++;
+                    continue;
+                }
                 // Try airport
                 const airportElement = tryAirport(token, airports);
                 if (airportElement) {
                     elements.push(airportElement);
                     // Preserve the token as lastWaypointIdent so a following airway can
-                    // use it as the entry fix (e.g. "BOS V16 CCC" where BOS is both an
-                    // airport and a navaid on V16).
+                    // still use it as the entry fix when no navaid lookup resolved it
+                    // above.
                     lastWaypointIdent = token;
                     lastAirportIdent = airportElement.airport.icao ?? airportElement.airport.faaId;
                     lastPosition = { lat: airportElement.airport.lat, lon: airportElement.airport.lon };
@@ -349,7 +433,8 @@ export function createFlightplanResolver(options) {
                 }
                 // Try procedure (SID/STAR). The fix after a SID or before a STAR may
                 // name the transition when the token itself does not.
-                const procElement = tryProcedure(token, procedures, lastAirportIdent, lastWaypointIdent, tokens[i + 1]?.toUpperCase());
+                const nextIndex = i + 1;
+                const procElement = tryProcedure(token, procedures, lastAirportIdent, () => findNextAirport(tokens, nextIndex, airports, navaids, airways), lastWaypointIdent, tokens[i + 1]?.toUpperCase());
                 if (procElement) {
                     elements.push(procElement);
                     if (procElement.type === 'unresolved') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squawk/flightplan",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "type": "module",
   "description": "Flight plan route string parsing and resolution using composed navigation resolvers",
   "author": "Neil Cochran",
@@ -43,21 +43,21 @@
   },
   "dependencies": {
     "@squawk/flight-math": "^0.5.9",
-    "@squawk/geo": "^0.5.6",
-    "@squawk/types": "^0.16.1",
+    "@squawk/geo": "^0.5.7",
+    "@squawk/types": "^0.17.0",
     "@types/geojson": "^7946.0.16"
   },
   "devDependencies": {
-    "@squawk/airport-data": "^0.9.1",
-    "@squawk/airports": "^0.8.0",
-    "@squawk/airway-data": "^0.7.2",
-    "@squawk/airways": "^0.8.0",
-    "@squawk/fix-data": "^0.8.0",
-    "@squawk/fixes": "^0.5.9",
-    "@squawk/navaid-data": "^0.8.1",
-    "@squawk/navaids": "^0.7.0",
-    "@squawk/procedure-data": "^0.9.4",
-    "@squawk/procedures": "^0.8.5",
+    "@squawk/airport-data": "^0.9.2",
+    "@squawk/airports": "^0.8.1",
+    "@squawk/airway-data": "^0.7.3",
+    "@squawk/airways": "^0.8.1",
+    "@squawk/fix-data": "^0.8.1",
+    "@squawk/fixes": "^0.5.10",
+    "@squawk/navaid-data": "^0.8.2",
+    "@squawk/navaids": "^0.7.1",
+    "@squawk/procedure-data": "^0.9.5",
+    "@squawk/procedures": "^0.8.6",
     "@types/node": "^26.6.5"
   },
   "keywords": [