This commit is contained in:
Kilian Hofmann 2025-07-15 01:36:52 +02:00
parent e41d002cef
commit 8b04be187e
25 changed files with 666 additions and 328 deletions

View File

@ -206,7 +206,9 @@ LGAV KOR1D SID (Cycle 2507, ID 10679)
### Instructions
- From present position, fly direct to fix identified by `WptID`
- From present position, fly direct to fix identified by `WptID`.
- If preceding fix and fix identified by `WptId` are the same, execute 360° turn
(requires `TurnDir`).
### Units

View File

@ -9,19 +9,20 @@ import L from "leaflet";
const parser = await Parser.instance();
const terminals = [
10394, 10395, 10475, 10480, 10482, 10485, 10653, 10654, 10657, 10659,
10394, 10395, 10475, 10480, 10482, 10485, 10653, 10654, 10657, 10659, 10679,
11798, 11909, 12765,
];
function App() {
const [selectedTerminal, setSelectedTerminal] = useState(terminals[0]);
const [procedure, setProcedure] = useState<object>();
const [procedures, setProcedures] = useState<object[]>([]);
const mapRef = createRef<Leaflet.Map>();
const layerRef = createRef<Leaflet.GeoJSON>();
useEffect(() => {
(async () => {
setProcedure(await parser.parse(selectedTerminal));
setProcedures(await parser.parse(selectedTerminal));
})();
}, [selectedTerminal]);
@ -49,6 +50,8 @@ function App() {
attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
/>
{procedures.map((procedure) => (
<>
<GeoJSON
key={hash(procedure ?? "") + "lines"}
data={procedure}
@ -101,14 +104,21 @@ function App() {
}}
filter={(feature) => feature.geometry.type === "Point"}
/>
</>
))}
</MapContainer>
<div
style={{
overflowY: "scroll",
width: "200px",
}}
>
<div
style={{
padding: "5px",
display: "flex",
flexDirection: "column",
gap: "10px",
width: "max-content",
}}
>
{terminals.map((terminal) => (
@ -117,7 +127,12 @@ function App() {
style={{
display: "flex",
flexDirection: "column",
background: selectedTerminal === terminal ? "#eeeeee" : undefined,
background: "#eeeeee",
border:
selectedTerminal === terminal
? "1px solid black"
: "1px solid #eeeeee",
padding: "5px",
}}
onClick={() => setSelectedTerminal(terminal)}
>
@ -132,6 +147,7 @@ function App() {
))}
</div>
</div>
</div>
);
}

View File

@ -14,4 +14,4 @@ fetch = async (path: string) => {
const parser = await Parser.instance();
console.log(JSON.stringify(await parser.parse(10480)));
console.log(JSON.stringify(await parser.parse(12765)));

View File

@ -17,6 +17,15 @@ import { TerminatorsDF } from "./terminators/DF.ts";
import { TerminatorsFD } from "./terminators/FD.ts";
import { TerminatorsFA } from "./terminators/FA.ts";
import { TerminatorsCD } from "./terminators/CD.ts";
import { TerminatorsVR } from "./terminators/VR.ts";
import { TerminatorsIF } from "./terminators/IF.ts";
import { TerminatorsFC } from "./terminators/FC.ts";
/*
Runway IDs for LIED
26156 - 34L
26157 - 34R
*/
class Parser {
private static _instance: Parser;
@ -62,6 +71,31 @@ class Parser {
}
public parse = async (terminalID: number) => {
// Get Procedure main
const terminal = this.terminals.find(({ ID }) => ID === terminalID);
if (!terminal) throw new Error("Procedure does not exists");
// Get runway this procedure is for
let runway = this.runways.find(({ ID }) => ID === terminal.RwyID);
if (!runway) {
let id = 26156;
if (typeof prompt !== "undefined")
// throw new Error("Prompt not defined, cannot continue");
id = Number.parseInt(prompt("Runway ID") ?? "");
runway = this.runways.find(({ ID }) => ID === id);
if (!runway) throw new Error("Procedure links to non existent Runway");
}
// Load procedure
const procedures = (await (
await fetch(`NavData/TermID_${terminalID}.json`)
).json()) as TerminalEntry[];
// Split into transitions
const transitions = new Set(procedures.map((proc) => proc.Transition));
const output: object[] = [];
// Main
transitions.forEach((transition) => {
// Private functions
/**
* @param line Line segments
@ -96,17 +130,6 @@ class Parser {
}
};
// Get Procedure main
const terminal = this.terminals.find(({ ID }) => ID === terminalID);
if (!terminal) throw new Error("Procedure does not exists");
// Get runway this procedure is for
const runway = this.runways.find(({ ID }) => ID === terminal.RwyID);
if (!runway) throw new Error("Procedure links to non existent Runway");
// Load procedure
const procedure = (await (
await fetch(`NavData/TermID_${terminalID}.json`)
).json()) as TerminalEntry[];
// Output variables
const navFixes: NavFix[] = [];
const lineSegments: { line: LineSegment[]; [x: string]: unknown }[] = [];
@ -121,7 +144,9 @@ class Parser {
});
let lastCourse = runway.TrueHeading;
// Main
const procedure = procedures.filter(
(proc) => proc.Transition === transition
);
for (let index = 0; index < procedure.length; index++) {
const leg = procedure[index];
const previousFix = navFixes.at(-1)!;
@ -203,9 +228,15 @@ class Parser {
update(fixToAdd, lineToAdd);
break;
}
case "FC":
console.error("Unknown TrackCode", leg.TrackCode);
case "FC": {
const [fixToAdd, lineToAdd] = TerminatorsFC(
leg as FCTerminalEntry,
previousFix,
lastCourse
);
update(fixToAdd, lineToAdd);
break;
}
case "FD": {
const [fixToAdd, lineToAdd] = TerminatorsFD(
leg as FDTerminalEntry,
@ -227,7 +258,14 @@ class Parser {
case "HA":
case "HF":
case "HM":
case "IF":
console.error("Unknown TrackCode", leg.TrackCode);
break;
case "IF": {
const fixToAdd = TerminatorsIF(leg as RFTerminalEntry, waypoint);
navFixes.length = 0;
navFixes.push(fixToAdd);
break;
}
case "PI":
console.error("Unknown TrackCode", leg.TrackCode);
break;
@ -289,17 +327,30 @@ class Parser {
update(fixToAdd, lineToAdd, { isManual: true });
break;
}
case "VR":
case "VR": {
const [fixToAdd, lineToAdd] = TerminatorsVR(
leg as VRTerminalEntry,
previousFix,
lastCourse
);
update(fixToAdd, lineToAdd);
break;
}
default:
console.error("Unknown TrackCode", leg.TrackCode);
break;
}
}
return geojson.parse([...navFixes, ...lineSegments], {
output.push(
geojson.parse([...navFixes, ...lineSegments], {
LineString: "line",
Point: ["latitude", "longitude"],
})
);
});
return output;
};
}

View File

@ -8,6 +8,7 @@ import { computeTurnRate } from "../utils/computeTurnRate.ts";
* @param start Arc origin point
* @param speed Speed within arc
* @param turnDir Turn direction
* @param force360 If true, force a 360° turn
* @returns Line segments
*/
export const generatePerformanceArc = (
@ -15,14 +16,16 @@ export const generatePerformanceArc = (
crsFromOrigin: number,
start: NavFix,
speed: number,
turnDir?: TurnDirection
turnDir?: TurnDirection,
force360?: boolean
) => {
const turnRate = computeTurnRate(speed, Parser.AC_BANK);
const originalCrsFromOrigin = crsFromOrigin;
const line: LineSegment[] = [[start.longitude, start.latitude]];
// Check if there even is an arc
if (!crsFromOrigin.equal(crsIntoEndpoint)) {
if (force360 || !crsFromOrigin.equal(crsIntoEndpoint)) {
// Turn Dir
if (!turnDir || turnDir === "E") {
let prov = crsFromOrigin - crsIntoEndpoint;
@ -56,6 +59,39 @@ export const generatePerformanceArc = (
line.push([arcFix.longitude, arcFix.latitude]);
}
// Second half
if (force360) {
const temp = crsIntoEndpoint;
crsIntoEndpoint = originalCrsFromOrigin;
crsFromOrigin = temp;
while (!crsFromOrigin.equal(crsIntoEndpoint)) {
let time = 0;
if (turnDir === "R") {
const delta = (crsIntoEndpoint - crsFromOrigin).normaliseDegrees();
const increment = delta < 1 ? delta : 1;
crsFromOrigin = (crsFromOrigin + increment).normaliseDegrees();
time = increment / turnRate;
} else {
const delta = (crsFromOrigin - crsIntoEndpoint).normaliseDegrees();
const increment = delta < 1 ? delta : 1;
crsFromOrigin = (crsFromOrigin - increment).normaliseDegrees();
time = increment / turnRate;
}
const arcFix = geolib.computeDestinationPoint(
{
latitude: line.at(-1)![1],
longitude: line.at(-1)![0],
},
((speed / 3600) * time).toMetre(),
crsFromOrigin
);
line.push([arcFix.longitude, arcFix.latitude]);
}
}
}
return line;

View File

@ -89,7 +89,6 @@ export const generateTangentArc = (
crsOrthogonalOnOrigin -= delta < 1 ? delta : 1;
crsOrthogonalOnOrigin = crsOrthogonalOnOrigin.normaliseDegrees();
}
if (crsOrthogonalOnOrigin === crsOrthogonalOnEndpoint) break;
const arcFix = geolib.computeDestinationPoint(
arcCenter,

View File

@ -28,6 +28,7 @@ export const TerminatorsAF = (
longitude: leg.WptLon,
}
);
const line = generateAFArc(
arcEndCrs,
leg.Course.toTrue({ latitude: leg.NavLat, longitude: leg.NavLon }),

View File

@ -12,6 +12,7 @@ export const TerminatorsCA = (
const crsIntoEndpoint = leg.Course.toTrue(previousFix);
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
line = generatePerformanceArc(
crsIntoEndpoint,
@ -48,7 +49,7 @@ export const TerminatorsCA = (
name: leg.Alt,
isFlyOver: true,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -15,6 +15,7 @@ export const TerminatorsCD = (
const speed = computeSpeed(leg, previousFix);
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
const crsIntoEndpoint = leg.Course.toTrue(previousFix);
@ -58,7 +59,7 @@ export const TerminatorsCD = (
name: leg.Distance.toString(),
isFlyOver: true,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -15,7 +15,7 @@ export const TerminatorsCF = (
name: waypoint?.Ident ?? undefined,
isFlyOver: leg.IsFlyOver,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -22,7 +22,7 @@ export const TerminatorsCI = (
)!,
isFlyOver: leg.IsFlyOver,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -1,38 +1,56 @@
import * as geolib from "geolib";
import { computeIntersection } from "../utils/computeIntersection.ts";
import { handleTurnAtFix } from "../pathGenerators/handleTurnAtFix.ts";
import { computeSpeed } from "../utils/computeSpeed.ts";
import { generatePerformanceArc } from "../pathGenerators/generatePerformanceArc.ts";
export const TerminatorsCR = (
leg: CRTerminalEntry,
previousFix: NavFix,
lastCourse: number
): [NavFix?, LineSegment[]?] => {
const crsIntoEndpoint = leg.Course.toTrue(previousFix);
const navaid = {
latitude: leg.NavLat,
longitude: leg.NavLon,
};
const crsFromEndpoint = leg.Course.toTrue(previousFix);
const crsIntoEndpoint = leg.NavBear.toTrue(navaid);
const speed = computeSpeed(leg, previousFix);
const interceptFix: NavFix = {
...computeIntersection(
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
line = generatePerformanceArc(
crsFromEndpoint,
lastCourse,
previousFix,
crsIntoEndpoint,
{ latitude: leg.NavLat, longitude: leg.NavLon },
leg.NavBear.toTrue({ latitude: leg.NavLat, longitude: leg.NavLon })
)!,
speed,
leg.TurnDir
);
} else {
line.push([previousFix.longitude, previousFix.latitude]);
}
const arcEnd = { latitude: line.at(-1)![1], longitude: line.at(-1)![0] };
if (line.length > 1) {
lastCourse = geolib.getGreatCircleBearing(
{
latitude: line.at(-2)![1],
longitude: line.at(-2)![0],
},
arcEnd
);
}
const interceptFix: NavFix = {
...computeIntersection(arcEnd, crsFromEndpoint, navaid, crsIntoEndpoint)!,
isFlyOver: leg.IsFlyOver,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};
const line = handleTurnAtFix(
crsIntoEndpoint,
leg.Course.toTrue(previousFix),
lastCourse,
previousFix,
interceptFix,
speed,
leg.TurnDir
);
line.push([interceptFix.longitude, interceptFix.latitude]);
return [interceptFix, line];
};

View File

@ -22,6 +22,7 @@ export const TerminatorsDF = (
};
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
const crsIntoEndpoint = geolib.getGreatCircleBearing(
previousFix,
@ -33,7 +34,9 @@ export const TerminatorsDF = (
lastCourse,
previousFix,
speed,
leg.TurnDir
leg.TurnDir,
previousFix.latitude.equal(targetFix.latitude) &&
previousFix.longitude.equal(targetFix.longitude)
);
} else {
line.push([previousFix.longitude, previousFix.latitude]);

View File

@ -16,6 +16,7 @@ export const TerminatorsFA = (
const crsIntoEndpoint = leg.Course.toTrue(refFix);
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
line = generatePerformanceArc(
crsIntoEndpoint,
@ -52,7 +53,7 @@ export const TerminatorsFA = (
name: leg.Alt,
isFlyOver: true,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -0,0 +1,98 @@
import * as geolib from "geolib";
import { computeSpeed } from "../utils/computeSpeed.ts";
import Parser from "../parser.ts";
import { computeTurnRate } from "../utils/computeTurnRate.ts";
// NOTE: Distance not adjusted for altitude in this demo
export const TerminatorsFC = (
leg: FCTerminalEntry,
previousFix: NavFix,
lastCourse: number
): [NavFix?, LineSegment[]?] => {
const refFix = {
latitude: leg.WptLat,
longitude: leg.WptLon,
};
const speed = computeSpeed(leg, previousFix);
const turnRate = computeTurnRate(speed, Parser.AC_BANK);
const trackIntoEndpoint = leg.Course.toTrue(refFix);
const line: LineSegment[] = [[previousFix.longitude, previousFix.latitude]];
if (previousFix.isFlyOver) {
let crsIntoEndpoint = trackIntoEndpoint;
// Check if there even is an arc
if (!crsIntoEndpoint.equal(lastCourse)) {
// Turn Dir
if (!leg.TurnDir || leg.TurnDir === "E") {
let prov = lastCourse - crsIntoEndpoint;
prov = prov > 180 ? prov - 360 : prov <= -180 ? prov + 360 : prov;
leg.TurnDir = prov > 0 ? "L" : "R";
}
// Generate arc
let condition = false;
do {
let time = 0;
if (leg.TurnDir === "R") {
const delta = (crsIntoEndpoint - lastCourse).normaliseDegrees();
const increment = delta < 1 ? delta : 1;
lastCourse = (lastCourse + increment).normaliseDegrees();
time = increment / turnRate;
} else {
const delta = (lastCourse - crsIntoEndpoint).normaliseDegrees();
const increment = delta < 1 ? delta : 1;
lastCourse = (lastCourse - increment).normaliseDegrees();
time = increment / turnRate;
}
const arcFix = geolib.computeDestinationPoint(
{
latitude: line.at(-1)![1],
longitude: line.at(-1)![0],
},
((speed * time) / 3600).toMetre(),
lastCourse
);
line.push([arcFix.longitude, arcFix.latitude]);
if (leg.TurnDir === "R") {
condition = lastCourse > trackIntoEndpoint;
} else {
condition = lastCourse < trackIntoEndpoint;
}
} while (condition);
}
}
const arcEnd = { latitude: line.at(-1)![1], longitude: line.at(-1)![0] };
if (line.length > 1) {
lastCourse = geolib.getGreatCircleBearing(
{
latitude: line.at(-2)![1],
longitude: line.at(-2)![0],
},
arcEnd
);
}
const targetFix: NavFix = {
...geolib.computeDestinationPoint(
arcEnd,
leg.Distance.toMetre(),
lastCourse
),
name: leg.Distance.toString(),
isFlyOver: true,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};
line.push([targetFix.longitude, targetFix.latitude]);
return [targetFix, line];
};

View File

@ -19,6 +19,7 @@ export const TerminatorsFD = (
const speed = computeSpeed(leg, previousFix);
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
const crsIntoEndpoint = leg.Course.toTrue(refFix);
@ -62,7 +63,7 @@ export const TerminatorsFD = (
name: leg.Distance.toString(),
isFlyOver: true,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -0,0 +1,19 @@
import Parser from "../parser.ts";
export const TerminatorsIF = (
leg: IFTerminalEntry,
waypoint?: Waypoint
): NavFix => {
const targetFix: NavFix = {
latitude: leg.WptLat,
longitude: leg.WptLon,
name: waypoint?.Ident ?? undefined,
isFlyOver: leg.IsFlyOver,
altitude: leg.Alt ? leg.Alt.parseAltitude() : 0,
speed: leg.SpeedLimit ? leg.SpeedLimit : Parser.AC_SPEED,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};
return targetFix;
};

View File

@ -29,6 +29,7 @@ export const TerminatorsRF = (
{ latitude: leg.CenterLat, longitude: leg.CenterLon },
leg.TurnDir
);
line.push([targetFix.longitude, targetFix.latitude]);
return [targetFix, line];

View File

@ -13,6 +13,7 @@ export const TerminatorsVA = (
const crsIntoEndpoint = leg.Course.toTrue(previousFix);
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
line = generatePerformanceArc(
crsIntoEndpoint,
@ -49,7 +50,7 @@ export const TerminatorsVA = (
name: leg.Alt,
isFlyOver: true,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -16,6 +16,7 @@ export const TerminatorsVD = (
const speed = computeSpeed(leg, previousFix);
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
const crsIntoEndpoint = leg.Course.toTrue(previousFix);
@ -59,7 +60,7 @@ export const TerminatorsVD = (
name: leg.Distance.toString(),
isFlyOver: true,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -23,7 +23,7 @@ export const TerminatorsVI = (
)!,
isFlyOver: leg.IsFlyOver,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: computeSpeed(leg, previousFix),
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};

View File

@ -0,0 +1,57 @@
import * as geolib from "geolib";
import { computeIntersection } from "../utils/computeIntersection.ts";
import { computeSpeed } from "../utils/computeSpeed.ts";
import { generatePerformanceArc } from "../pathGenerators/generatePerformanceArc.ts";
// NOTE: No wind adjustments to be made, no clue how *that* would draw
export const TerminatorsVR = (
leg: VRTerminalEntry,
previousFix: NavFix,
lastCourse: number
): [NavFix?, LineSegment[]?] => {
const navaid = {
latitude: leg.NavLat,
longitude: leg.NavLon,
};
const crsFromEndpoint = leg.Course.toTrue(previousFix);
const crsIntoEndpoint = leg.NavBear.toTrue(navaid);
const speed = computeSpeed(leg, previousFix);
let line: LineSegment[] = [];
if (previousFix.isFlyOver) {
line = generatePerformanceArc(
crsFromEndpoint,
lastCourse,
previousFix,
speed,
leg.TurnDir
);
} else {
line.push([previousFix.longitude, previousFix.latitude]);
}
const arcEnd = { latitude: line.at(-1)![1], longitude: line.at(-1)![0] };
if (line.length > 1) {
lastCourse = geolib.getGreatCircleBearing(
{
latitude: line.at(-2)![1],
longitude: line.at(-2)![0],
},
arcEnd
);
}
const interceptFix: NavFix = {
...computeIntersection(arcEnd, crsFromEndpoint, navaid, crsIntoEndpoint)!,
isFlyOver: leg.IsFlyOver,
altitude: leg.Alt ? leg.Alt.parseAltitude() : previousFix.altitude,
speed: speed,
speedConstraint: leg.SpeedLimit,
altitudeConstraint: leg.Alt,
};
line.push([interceptFix.longitude, interceptFix.latitude]);
return [interceptFix, line];
};

19
browser/src/types/terminators/FC.d.ts vendored Normal file
View File

@ -0,0 +1,19 @@
export declare global {
type FCTerminalEntry = Required<
Pick<
TerminalEntry,
| "WptID"
| "WptLat"
| "WptLon"
| "IsFlyOver"
| "NavID"
| "NavLat"
| "NavLon"
| "NavBear"
| "NavDist"
| "Course"
| "Distance"
>
> &
TerminalEntry;
}

6
browser/src/types/terminators/IF.d.ts vendored Normal file
View File

@ -0,0 +1,6 @@
export declare global {
type IFTerminalEntry = Required<
Pick<TerminalEntry, "WptID" | "WptLat" | "WptLon">
> &
TerminalEntry;
}

6
browser/src/types/terminators/VR.d.ts vendored Normal file
View File

@ -0,0 +1,6 @@
export declare global {
type VRTerminalEntry = Required<
Pick<TerminalEntry, "NavID" | "NavLat" | "NavLon" | "NavBear" | "Course">
> &
TerminalEntry;
}