@fboes/aerofly-custom-missions 1.12.0 → 1.13.0

package/dist/node/Convert.test.js

@@ -1,41 +1,41 @@
 import { describe, it } from "node:test";
 import { strict as assert } from "node:assert";
-import { Convert } from "./Convert.js";
+import { convertDegreeToMatrix, convertFeetToMeter, convertLonLatToVector, convertMatrixToDegree, convertMeterToFeet, convertVectorToLonLat, } from "./Convert.js";
 describe("Convert", () => {
     it("should convert feet to meters correctly", () => {
         const feet = 1000;
-        const expectedMeters = 304.79999024640034;
-        const actualMeters = Convert.convertFeetToMeter(feet);
+        const expectedMeters = 304.8;
+        const actualMeters = convertFeetToMeter(feet);
         assert.strictEqual(actualMeters, expectedMeters, `Expected ${feet} feet to be ${expectedMeters} meters, got ${actualMeters} meters`);
     });
     it("should convert meters to feet correctly", () => {
         const meters = 500;
-        const expectedFeet = 1640.42;
-        const actualFeet = Convert.convertMeterToFeet(meters);
-        assert.strictEqual(actualFeet, expectedFeet, `Expected ${meters} meters to be ${expectedFeet} feet, got ${actualFeet} feet`);
+        const expectedFeet = 1640.4199;
+        const actualFeet = convertMeterToFeet(meters);
+        assert.strictEqual(actualFeet.toPrecision(4), expectedFeet.toPrecision(4), `Expected ${meters} meters to be ${expectedFeet} feet, got ${actualFeet} feet`);
     });
     it("should convert longitude / latitude to vector and back correctly", () => {
         const longitude = -122.3088;
         const latitude = 47.4502;
         const expectedLongitude = -122.3088;
         const expectedLatitude = 47.4502;
-        const vector = Convert.convertLonLatToVector(longitude, latitude, 0);
-        const lonLat = Convert.convertVectorToLonLat(vector);
+        const vector = convertLonLatToVector(longitude, latitude, 0);
+        const lonLat = convertVectorToLonLat(vector);
         assert.strictEqual(lonLat.longitude.toFixed(4), expectedLongitude.toFixed(4), `Expected longitude to be ${expectedLongitude.toFixed(4)}, got ${lonLat.longitude.toFixed(4)}`);
         assert.strictEqual(lonLat.latitude.toFixed(4), expectedLatitude.toFixed(4), `Expected latitude to be ${expectedLatitude.toFixed(4)}, got ${lonLat.latitude.toFixed(4)}`);
     });
     it("should convert heading degree to orientation matrix and back correctly", () => {
         const orientationMatrix = [0, -1, 0, 1, 0, 0, 0, 0, 1];
         const expectedHeadingDegree = 90;
-        const actualHeadingDegree = Convert.convertMatrixToDegree(orientationMatrix);
+        const actualHeadingDegree = convertMatrixToDegree(orientationMatrix);
         assert.strictEqual(actualHeadingDegree.toFixed(4), expectedHeadingDegree.toFixed(4), `Expected heading degree to be ${expectedHeadingDegree.toFixed(4)}, got ${actualHeadingDegree.toFixed(4)}`);
     });
     it("should convert heading degree to orientation matrix and back correctly", () => {
         const heading_degree = 90;
         const expectedHeadingDegree = 90;
-        const orientationMatrix = Convert.convertDegreeToMatrix(heading_degree);
+        const orientationMatrix = convertDegreeToMatrix(heading_degree);
         console.log("Orientation Matrix:", orientationMatrix);
-        const actualHeadingDegree = Convert.convertMatrixToDegree(orientationMatrix);
+        const actualHeadingDegree = convertMatrixToDegree(orientationMatrix);
         assert.strictEqual(actualHeadingDegree.toFixed(4), expectedHeadingDegree.toFixed(4), `Expected heading degree to be ${expectedHeadingDegree.toFixed(4)}, got ${actualHeadingDegree.toFixed(4)}`);
     });
     it("should show the orientation at Tellruide correctly", () => {
@@ -44,7 +44,7 @@ describe("Convert", () => {
             -0.206738179058507, -0.207947329711721, -0.710293000184874, 0.672489228132418,
         ];
         const expectedHeadingDegree = 117.3585;
-        const actualHeadingDegree = Convert.convertMatrixToDegree(orientationMatrix);
+        const actualHeadingDegree = convertMatrixToDegree(orientationMatrix);
         assert.strictEqual(actualHeadingDegree.toFixed(4), expectedHeadingDegree.toFixed(4), `Expected heading degree to be ${expectedHeadingDegree.toFixed(4)}, got ${actualHeadingDegree.toFixed(4)}`);
     });
 });

package/docs/flight.json

@@ -17,7 +17,7 @@
     "onGround": true,
     "airport": "KTEX",
     "runway": "",
-    "altitude_ft": 9072.275604893097
+    "altitude_ft": 9072.275314580287
   },
   "fuelLoadSetting": {
     "aircraft": "c172",
@@ -56,7 +56,7 @@
         "longitude": -81.75955555555561,
         "latitude": 24.55611111111108,
         "uid": "5033935394767185920",
-        "elevation_ft": 3.000000096
+        "elevation_ft": 3
       },
       {
         "type": "departure_runway",
@@ -65,8 +65,8 @@
         "latitude": 24.556052777777765,
         "uid": "5033564859348430848",
         "direction_degree": null,
-        "elevation_ft": 3.000000096,
-        "runwayLength_ft": 4801.000153632001
+        "elevation_ft": 3,
+        "runwayLength_ft": 4801
       },
       {
         "type": "waypoint",
@@ -74,6 +74,7 @@
         "longitude": -122.3088,
         "latitude": 47.4502,
         "uid": null,
+        "navaidUid": null,
         "flyOver": false,
         "altitude_ft": null,
         "navaidFrequency_khz": 260
@@ -84,6 +85,7 @@
         "longitude": -122.3088,
         "latitude": 47.4502,
         "uid": null,
+        "navaidUid": null,
         "flyOver": false,
         "altitude_ft": null,
         "navaidFrequency_khz": null
@@ -94,6 +96,7 @@
         "longitude": -122.3088,
         "latitude": 47.4502,
         "uid": null,
+        "navaidUid": null,
         "flyOver": false,
         "altitude_ft": null,
         "navaidFrequency_khz": 108200
@@ -107,7 +110,7 @@
         "airport": "KMIA",
         "transition": "",
         "transitionUid": null,
-        "elevation_ft": 8.000000256
+        "elevation_ft": 8
       },
       {
         "type": "destination_runway",
@@ -116,8 +119,8 @@
         "latitude": 25.80289722222224,
         "uid": "5108645015094833152",
         "direction_degree": null,
-        "elevation_ft": 8.000000256,
-        "runwayLength_ft": 8600.0002752
+        "elevation_ft": 8,
+        "runwayLength_ft": 8600
       },
       {
         "type": "destination",
@@ -125,10 +128,10 @@
         "longitude": -80.29011111111112,
         "latitude": 25.79536111111115,
         "uid": "5109231054766614528",
-        "elevation_ft": 9.000000287999999
+        "elevation_ft": 8.999999999999998
       }
     ],
-    "cruiseAltitude_ft": 32000.001024
+    "cruiseAltitude_ft": 32000
   },
   "visibility_meter": 7999.994999999999,
   "_missionTitle": "Mission title",

package/docs/flight.mcf

@@ -47,41 +47,45 @@
         >
         <[tmnavigation_config][navigation][]
             <[tmnav_route][Route][]
-                <[float64][CruiseAltitude][9753.6]> // 32001 ft
+                <[float64][CruiseAltitude][9753.6]> // 32000 ft
                 <[pointer_list_tmnav_route_way][Ways][]
                     <[tmnav_route_origin][KEYW][0]
                         <[string8u][Identifier][KEYW]>
                         <[vector3_float64][Position][831962.2473395835 -5744690.224311131 2634431.8120697998]> // Lon -81.759556, Lat 24.556111
                         <[uint64][Uid][5033935394767185920]>
-                        <[float64][Elevation][0.9144]> // Elevation 4 ft
+                        <[float64][Elevation][0.9144]> // Elevation 3 ft
                     >
                     <[tmnav_route_departure_runway][09][1]
                         <[string8u][Identifier][09]>
                         <[vector3_float64][Position][831239.6121807017 -5744797.5451743435 2634425.9351001014]> // Lon -81.766767, Lat 24.556053
                         <[uint64][Uid][5033564859348430848]>
-                        <[float64][Elevation][0.9144]> // Elevation 4 ft
+                        <[float64][Elevation][0.9144]> // Elevation 3 ft
                         <[float64][RunwayLength][1463.3448]> // Runway length 4801 ft
                     >
                     <[tmnav_route_waypoint][MTH][2]
                         <[string8u][Identifier][MTH]>
                         <[vector3_float64][Position][-2309470.142824746 -3651978.5471377173 4675755.385390146]> // Lon -122.308800, Lat 47.450200
-                        // <[uint64][Uid][]>
+                        <[uint64][Uid][2956153176169775104]> // Fallback UID, not matching Aerofly FS internal UID
                         <[float64][NavaidFrequency][260000]>
+                        <[uint64][NavaidUid][0]>
                         <[vector2_float64][Altitude][-1001 100001]> // unrestricted
                         <[bool][FlyOver][false]>
                     >
                     <[tmnav_route_waypoint][MNATE][3]
                         <[string8u][Identifier][MNATE]>
                         <[vector3_float64][Position][-2309470.142824746 -3651978.5471377173 4675755.385390146]> // Lon -122.308800, Lat 47.450200
-                        // <[uint64][Uid][]>
+                        <[uint64][Uid][2956153176169775104]> // Fallback UID, not matching Aerofly FS internal UID
+                        <[float64][NavaidFrequency][0]>
+                        <[uint64][NavaidUid][0]>
                         <[vector2_float64][Altitude][-1001 100001]> // unrestricted
                         <[bool][FlyOver][false]>
                     >
                     <[tmnav_route_waypoint][HST][4]
                         <[string8u][Identifier][HST]>
                         <[vector3_float64][Position][-2309470.142824746 -3651978.5471377173 4675755.385390146]> // Lon -122.308800, Lat 47.450200
-                        // <[uint64][Uid][]>
+                        <[uint64][Uid][2956153176169775104]> // Fallback UID, not matching Aerofly FS internal UID
                         <[float64][NavaidFrequency][108200000]>
+                        <[uint64][NavaidUid][0]>
                         <[vector2_float64][Altitude][-1001 100001]> // unrestricted
                         <[bool][FlyOver][false]>
                     >
@@ -91,7 +95,7 @@
                         <[uint64][Uid][5109231054766956544]>
                         <[string8u][Airport][KMIA]>
                         <[vector3_float64][Direction][0 0 0]>
-                        <[float64][Elevation][2.4384]> // Elevation 9 ft
+                        <[float64][Elevation][2.4384]> // Elevation 8 ft
                         <[string8u][Transition][]>
                         <[uint64][TransitionUid][0]>
                     >
@@ -99,14 +103,14 @@
                         <[string8u][Identifier][08L]>
                         <[vector3_float64][Position][967964.1844961813 -5663741.310440378 2759419.1621422493]> // Lon -80.301542, Lat 25.802897
                         <[uint64][Uid][5108645015094833152]>
-                        <[float64][Elevation][2.4384]> // Elevation 9 ft
+                        <[float64][Elevation][2.4384]> // Elevation 8 ft
                         <[float64][RunwayLength][2621.28]> // Runway length 8600 ft
                     >
                     <[tmnav_route_destination][KMIA][7]
                         <[string8u][Identifier][KMIA]>
                         <[vector3_float64][Position][969155.3700254696 -5663906.240326158 2758667.49173681]> // Lon -80.290111, Lat 25.795361
                         <[uint64][Uid][5109231054766614528]>
-                        <[float64][Elevation][2.7432]> // Elevation 10 ft
+                        <[float64][Elevation][2.7432]> // Elevation 9 ft
                     >
                 >
             >

package/docs/flight.xml

@@ -47,41 +47,45 @@
         </clouds>
         <navigation type="tmnavigation_config">
             <Route type="tmnav_route">
-                <CruiseAltitude type="float64">9753.6</CruiseAltitude> <!-- 32001 ft -->
+                <CruiseAltitude type="float64">9753.6</CruiseAltitude> <!-- 32000 ft -->
                 <Ways type="pointer_list_tmnav_route_way">
                     <KEYW type="tmnav_route_origin" index="0">
                         <Identifier type="string8u">KEYW</Identifier>
                         <Position type="vector3_float64">831962.2473395835 -5744690.224311131 2634431.8120697998</Position> <!-- Lon -81.759556, Lat 24.556111 -->
                         <Uid type="uint64">5033935394767185920</Uid>
-                        <Elevation type="float64">0.9144</Elevation> <!-- Elevation 4 ft -->
+                        <Elevation type="float64">0.9144</Elevation> <!-- Elevation 3 ft -->
                     </KEYW>
                     <09 type="tmnav_route_departure_runway" index="1">
                         <Identifier type="string8u">09</Identifier>
                         <Position type="vector3_float64">831239.6121807017 -5744797.5451743435 2634425.9351001014</Position> <!-- Lon -81.766767, Lat 24.556053 -->
                         <Uid type="uint64">5033564859348430848</Uid>
-                        <Elevation type="float64">0.9144</Elevation> <!-- Elevation 4 ft -->
+                        <Elevation type="float64">0.9144</Elevation> <!-- Elevation 3 ft -->
                         <RunwayLength type="float64">1463.3448</RunwayLength> <!-- Runway length 4801 ft -->
                     </09>
                     <MTH type="tmnav_route_waypoint" index="2">
                         <Identifier type="string8u">MTH</Identifier>
                         <Position type="vector3_float64">-2309470.142824746 -3651978.5471377173 4675755.385390146</Position> <!-- Lon -122.308800, Lat 47.450200 -->
-                        <!-- Uid type="uint64"></Uid -->
+                        <Uid type="uint64">2956153176169775104</Uid> <!-- Fallback UID, not matching Aerofly FS internal UID -->
                         <NavaidFrequency type="float64">260000</NavaidFrequency>
+                        <NavaidUid type="uint64">0</NavaidUid>
                         <Altitude type="vector2_float64">-1001 100001</Altitude> <!-- unrestricted -->
                         <FlyOver type="bool">false</FlyOver>
                     </MTH>
                     <MNATE type="tmnav_route_waypoint" index="3">
                         <Identifier type="string8u">MNATE</Identifier>
                         <Position type="vector3_float64">-2309470.142824746 -3651978.5471377173 4675755.385390146</Position> <!-- Lon -122.308800, Lat 47.450200 -->
-                        <!-- Uid type="uint64"></Uid -->
+                        <Uid type="uint64">2956153176169775104</Uid> <!-- Fallback UID, not matching Aerofly FS internal UID -->
+                        <NavaidFrequency type="float64">0</NavaidFrequency>
+                        <NavaidUid type="uint64">0</NavaidUid>
                         <Altitude type="vector2_float64">-1001 100001</Altitude> <!-- unrestricted -->
                         <FlyOver type="bool">false</FlyOver>
                     </MNATE>
                     <HST type="tmnav_route_waypoint" index="4">
                         <Identifier type="string8u">HST</Identifier>
                         <Position type="vector3_float64">-2309470.142824746 -3651978.5471377173 4675755.385390146</Position> <!-- Lon -122.308800, Lat 47.450200 -->
-                        <!-- Uid type="uint64"></Uid -->
+                        <Uid type="uint64">2956153176169775104</Uid> <!-- Fallback UID, not matching Aerofly FS internal UID -->
                         <NavaidFrequency type="float64">108200000</NavaidFrequency>
+                        <NavaidUid type="uint64">0</NavaidUid>
                         <Altitude type="vector2_float64">-1001 100001</Altitude> <!-- unrestricted -->
                         <FlyOver type="bool">false</FlyOver>
                     </HST>
@@ -91,7 +95,7 @@
                         <Uid type="uint64">5109231054766956544</Uid>
                         <Airport type="string8u">KMIA</Airport>
                         <Direction type="vector3_float64">0 0 0</Direction>
-                        <Elevation type="float64">2.4384</Elevation> <!-- Elevation 9 ft -->
+                        <Elevation type="float64">2.4384</Elevation> <!-- Elevation 8 ft -->
                         <Transition type="string8u"></Transition>
                         <TransitionUid type="uint64">0</TransitionUid>
                     </L08L>
@@ -99,14 +103,14 @@
                         <Identifier type="string8u">08L</Identifier>
                         <Position type="vector3_float64">967964.1844961813 -5663741.310440378 2759419.1621422493</Position> <!-- Lon -80.301542, Lat 25.802897 -->
                         <Uid type="uint64">5108645015094833152</Uid>
-                        <Elevation type="float64">2.4384</Elevation> <!-- Elevation 9 ft -->
+                        <Elevation type="float64">2.4384</Elevation> <!-- Elevation 8 ft -->
                         <RunwayLength type="float64">2621.28</RunwayLength> <!-- Runway length 8600 ft -->
                     </08L>
                     <KMIA type="tmnav_route_destination" index="7">
                         <Identifier type="string8u">KMIA</Identifier>
                         <Position type="vector3_float64">969155.3700254696 -5663906.240326158 2758667.49173681</Position> <!-- Lon -80.290111, Lat 25.795361 -->
                         <Uid type="uint64">5109231054766614528</Uid>
-                        <Elevation type="float64">2.7432</Elevation> <!-- Elevation 10 ft -->
+                        <Elevation type="float64">2.7432</Elevation> <!-- Elevation 9 ft -->
                     </KMIA>
                 </Ways>
             </Route>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fboes/aerofly-custom-missions",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Builder for Aerofly FS4 Custom Missions Files",
   "main": "dist/index.js",
   "scripts": {

package/src/dto-flight/AeroflyNavRouteAirports.ts

@@ -1,5 +1,5 @@
 import { AeroflyConfigurationNode } from "../node/AeroflyConfigurationNode.js";
-import { Convert } from "../node/Convert.js";
+import { convertFeetToMeter, convertMeterToFeet } from "../node/Convert.js";
 import { AeroflyNavRouteBase, type AeroflyNavRouteType } from "./AeroflyNavRouteBase.js";
 
 class AeroflyNavRouteAirport extends AeroflyNavRouteBase {
@@ -36,11 +36,11 @@ class AeroflyNavRouteAirport extends AeroflyNavRouteBase {
      * @returns {number | null} elevation in feet, null if not set
      */
     get elevation_ft(): number | null {
-        return this.elevation !== null ? Convert.convertMeterToFeet(this.elevation) : null;
+        return this.elevation !== null ? convertMeterToFeet(this.elevation) : null;
     }
 
     set elevation_ft(elevation_ft: number | null) {
-        this.elevation = elevation_ft !== null ? Convert.convertFeetToMeter(elevation_ft) : null;
+        this.elevation = elevation_ft !== null ? convertFeetToMeter(elevation_ft) : null;
     }
 
     getElement(index: number = 0): AeroflyConfigurationNode {

package/src/dto-flight/AeroflyNavRouteBase.test.ts

@@ -0,0 +1,30 @@
+import { describe, it } from "node:test";
+import { AeroflyNavRouteDestination } from "../index.js";
+
+describe("AeroflyNavRouteBase", () => {
+    it("should create a valid AeroflyNavRouteBase structure", () => {
+        const waypoints = [
+            { wp: new AeroflyNavRouteDestination("MAX-NE", 179.999, 89.999), uid: 0n },
+            { wp: new AeroflyNavRouteDestination("MAX-SW", -179.999, -89.999), uid: 0n },
+            { wp: new AeroflyNavRouteDestination("KEYW", -81.7599558, 24.5561197), uid: 5033914504046249216n },
+            { wp: new AeroflyNavRouteDestination("EGLL", -0.45277777, 51.47138888), uid: 9199731073154483456n },
+            { wp: new AeroflyNavRouteDestination("YSSY", 151.177, -33.4961), uid: 16969837613165511936n },
+            { wp: new AeroflyNavRouteDestination("RJTT", 139.779, 35.709), uid: 16385890514078663936n },
+        ];
+
+        for (const waypoint of waypoints) {
+            console.log(waypoint.wp.getUidFallback(), waypoint.uid);
+        }
+    });
+
+    it("should test some unpacking of UIDs", () => {
+        const unpackPayload = (packed: bigint) => {
+            return Number(packed & 0xffffn);
+        };
+
+        console.log("KEYW", unpackPayload(5033914504046314752n));
+        console.log("EGLL", unpackPayload(9200173076798702848n));
+        console.log("YSSY", unpackPayload(16969826619723154688n));
+        console.log("RJTT", unpackPayload(16385782762532177152n));
+    });
+});

package/src/dto-flight/AeroflyNavRouteBase.ts

@@ -1,5 +1,5 @@
-import { Convert, type AeroflyVector3Float } from "../node/Convert.js";
-import { AeroflyConfigurationNode, AeroflyConfigurationNodeComment } from "../node/AeroflyConfigurationNode.js";
+import { convertLonLatToVector, convertVectorToLonLat, type AeroflyVector3Float } from "../node/Convert.js";
+import { AeroflyConfigurationNode } from "../node/AeroflyConfigurationNode.js";
 
 export type AeroflyNavRouteType =
     | "origin"
@@ -33,7 +33,7 @@ export class AeroflyNavRouteBase {
     latitude: number;
 
     /**
-     * @property {?bigint} uid unique identifier for the waypoint, must match Aerofly FS internal UID if used in an existing mission, can be null for new waypoints
+     * @property {?bigint} uid unique identifier for the waypoint, must match Aerofly FS internal UID if used in an existing mission. Obviously the UID encodes the geographic position as well as the name of the waypoint.
      */
     uid: bigint | null;
 
@@ -43,7 +43,7 @@ export class AeroflyNavRouteBase {
      * @param {number} longitude WGS84
      * @param {number} latitude WGS84
      * @param {object} [options] additional options for the waypoint
-     * @param {?bigint} [options.uid] unique identifier for the waypoint, must match Aerofly FS internal UID if used in an existing mission, can be null for new waypoints
+     * @param {?bigint} [options.uid] unique identifier for the waypoint, must match Aerofly FS internal UID if used in an existing mission. Obviously the UID encodes the geographic position as well as the name of the waypoint.
      */
     constructor(
         type: AeroflyNavRouteType,
@@ -63,11 +63,11 @@ export class AeroflyNavRouteBase {
      * @returns {AeroflyVector3Float} to use in Aerofly FS4's `main.mcf`
      */
     get position(): AeroflyVector3Float {
-        return Convert.convertLonLatToVector(this.longitude, this.latitude, 0);
+        return convertLonLatToVector(this.longitude, this.latitude, 0);
     }
 
     set position(position: AeroflyVector3Float) {
-        const latLonAlt = Convert.convertVectorToLonLat(position);
+        const latLonAlt = convertVectorToLonLat(position);
         this.longitude = latLonAlt.longitude;
         this.latitude = latLonAlt.latitude;
     }
@@ -91,15 +91,76 @@ export class AeroflyNavRouteBase {
                 this.position,
                 `Lon ${this.longitude.toFixed(6)}, Lat ${this.latitude.toFixed(6)}`,
             )
-            .append(
-                this.uid
-                    ? new AeroflyConfigurationNode("uint64", "Uid", this.uid)
-                    : new AeroflyConfigurationNodeComment("uint64", "Uid", ""),
+            .appendChild(
+                "uint64",
+                "Uid",
+                this.uid ?? this.getUidFallback(),
+                this.uid ? "" : "Fallback UID, not matching Aerofly FS internal UID",
             );
 
         return element;
     }
 
+    /**
+     * @returns {bigint} 24 bit longitude
+     * @see https://www.aerofly.com/community/forum/index.php?thread/29490-navdata-coordinates-to-uid/
+     */
+    private encodeLongitude(): bigint {
+        let scaled = this.longitude / 180;
+        scaled = 65536.0 * (0.5 + 0.5 * scaled); // 16 bit
+        return BigInt(Math.round(256.0 * scaled + 0.5)); // 24 bit
+    }
+
+    /**
+     * @returns {bigint} 24 bit latitude
+     * @see https://www.aerofly.com/community/forum/index.php?thread/29490-navdata-coordinates-to-uid/
+     */
+    private encodeLatitude(): bigint {
+        const worldGridConstantA = 2.3311223704144;
+
+        let scaled = this.latitude / 180;
+        scaled = Math.tan(worldGridConstantA * scaled) / worldGridConstantA;
+        scaled = 65536.0 * (0.5 + 0.5 * scaled); // 16 bit
+        return BigInt(Math.round(256.0 * scaled + 0.5)); // 24 bit
+    }
+
+    /**
+     * @returns {number} 16 bit type
+     */
+    private encodeWaypointType(): number {
+        // Type code (airport (0500) / runway (0800) / SID (4400) / STAR (4800) / Approach (4C00) / RNAV waypoint (C000) / airways (4000)
+        switch (this.type) {
+            case "origin":
+            case "destination":
+                return 0x0500;
+            case "departure_runway":
+            case "destination_runway":
+                return 0x0800;
+            case "departure":
+                return 0x4400;
+            case "arrival":
+                return 0x4800;
+            case "approach":
+                return 0x4c00;
+        }
+        return 0;
+    }
+
+    /**
+     * @returns {bigint} Packs both into a single 64-bit value:
+     * - Bits 63..40 → longitude  (24 bit)
+     * - Bits 39..16 → latitude   (24 bit)
+     * - Bits 15..0  → payload    (16 bit)
+     * @see https://www.aerofly.com/community/forum/index.php?thread/29490-navdata-coordinates-to-uid/
+     */
+    getUidFallback(): bigint {
+        return (
+            (this.encodeLongitude() << 40n) |
+            (this.encodeLatitude() << 16n) |
+            (BigInt(this.encodeWaypointType()) & 0xffffn)
+        );
+    }
+
     toJSON() {
         return {
             ...this,

package/src/dto-flight/AeroflyNavRouteRunway.ts

@@ -1,4 +1,4 @@
-import { type AeroflyVector3Float, Convert } from "../node/Convert.js";
+import { convertFeetToMeter, convertMeterToFeet, type AeroflyVector3Float } from "../node/Convert.js";
 import { AeroflyConfigurationNode } from "../node/AeroflyConfigurationNode.js";
 import { AeroflyNavRouteBase, type AeroflyNavRouteType } from "./AeroflyNavRouteBase.js";
 
@@ -44,22 +44,22 @@ class AeroflyNavRouteRunway extends AeroflyNavRouteBase {
      * @returns {number | null} elevation in feet, null if not set
      */
     get elevation_ft(): number | null {
-        return this.elevation !== null ? Convert.convertMeterToFeet(this.elevation) : null;
+        return this.elevation !== null ? convertMeterToFeet(this.elevation) : null;
     }
 
     set elevation_ft(elevation_ft: number | null) {
-        this.elevation = elevation_ft !== null ? Convert.convertFeetToMeter(elevation_ft) : null;
+        this.elevation = elevation_ft !== null ? convertFeetToMeter(elevation_ft) : null;
     }
 
     /**
      * @returns {number | null} runway length in feet, null if not set
      */
     get runwayLength_ft(): number | null {
-        return this.runwayLength !== null ? Convert.convertMeterToFeet(this.runwayLength) : null;
+        return this.runwayLength !== null ? convertMeterToFeet(this.runwayLength) : null;
     }
 
     set runwayLength_ft(runwayLength_ft: number | null) {
-        this.runwayLength = runwayLength_ft !== null ? Convert.convertFeetToMeter(runwayLength_ft) : null;
+        this.runwayLength = runwayLength_ft !== null ? convertFeetToMeter(runwayLength_ft) : null;
     }
 
     /**

package/src/dto-flight/AeroflyNavRouteTransition.ts

@@ -1,4 +1,4 @@
-import { type AeroflyVector3Float, Convert } from "../node/Convert.js";
+import { convertFeetToMeter, convertMeterToFeet, type AeroflyVector3Float } from "../node/Convert.js";
 import { AeroflyConfigurationNode } from "../node/AeroflyConfigurationNode.js";
 import { AeroflyNavRouteBase, type AeroflyNavRouteType } from "./AeroflyNavRouteBase.js";
 
@@ -41,11 +41,11 @@ class AeroflyNavRouteTransition extends AeroflyNavRouteBase {
      * @returns {number | null} elevation in feet, null if not set
      */
     get elevation_ft(): number | null {
-        return this.elevation !== null ? Convert.convertMeterToFeet(this.elevation) : null;
+        return this.elevation !== null ? convertMeterToFeet(this.elevation) : null;
     }
 
     set elevation_ft(elevation_ft: number | null) {
-        this.elevation = elevation_ft !== null ? Convert.convertFeetToMeter(elevation_ft) : null;
+        this.elevation = elevation_ft !== null ? convertFeetToMeter(elevation_ft) : null;
     }
 
     /**

package/src/dto-flight/AeroflyNavRouteWaypoint.ts

@@ -1,4 +1,10 @@
-import { Convert, type AeroflyVector3Float } from "../node/Convert.js";
+import {
+    convertFeetToMeter,
+    convertLonLatToVector,
+    convertMeterToFeet,
+    convertVectorToLonLat,
+    type AeroflyVector3Float,
+} from "../node/Convert.js";
 import { AeroflyConfigurationNode } from "../node/AeroflyConfigurationNode.js";
 import { AeroflyNavRouteBase } from "./AeroflyNavRouteBase.js";
 
@@ -8,6 +14,11 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
      */
     navaidFrequency: number | null;
 
+    /**
+     * @property {?bigint} navaidUid if the waypoint is a navaid, its unique identifier, must match Aerofly FS internal UID if used in an existing mission
+     */
+    navaidUid: bigint | null;
+
     /**
      * @property {number | null} altitude in meter, null if not set
      */
@@ -24,6 +35,9 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
      * @param {number} latitude WGS84
      * @param {object} [options] additional options for the waypoint
      * @param {?number} [options.navaidFrequency] if the waypoint is a navaid, its frequency in Hz
+     * @param {?number} [options.navaidFrequency_khz] if the waypoint is a navaid, its frequency in kHz, will override navaidFrequency in Hz if provided
+     * @param {?number} [options.navaidFrequency_mhz] if the waypoint is a navaid, its frequency in MHz, will override navaidFrequency in Hz if provided
+     * @param {?bigint} [options.navaidUid] if the waypoint is a navaid, its unique identifier, must match Aerofly FS internal UID if used in an existing mission
      * @param {number} [options.altitude] in meter
      * @param {?number} [options.altitude_ft] altitude in feet, will override altitude in meter if provided
      * @param {boolean} [options.flyOver] if true, the waypoint is meant to be flown over, otherwise it can be used as a fly-by waypoint
@@ -37,6 +51,7 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
             navaidFrequency = null,
             navaidFrequency_khz = null,
             navaidFrequency_mhz = null,
+            navaidUid = null,
             altitude = null,
             altitude_ft = null,
             flyOver = false,
@@ -45,6 +60,7 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
     ) {
         super("waypoint", identifier, longitude, latitude, { uid });
         this.navaidFrequency = navaidFrequency;
+        this.navaidUid = navaidUid;
         this.altitude = altitude;
 
         if (altitude_ft !== null) {
@@ -64,11 +80,11 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
      * @returns {number | null} altitude in feet, null if not set
      */
     get altitude_ft(): number | null {
-        return this.altitude !== null ? Convert.convertMeterToFeet(this.altitude) : null;
+        return this.altitude !== null ? convertMeterToFeet(this.altitude) : null;
     }
 
     set altitude_ft(altitude_ft: number | null) {
-        this.altitude = altitude_ft !== null ? Convert.convertFeetToMeter(altitude_ft) : null;
+        this.altitude = altitude_ft !== null ? convertFeetToMeter(altitude_ft) : null;
     }
 
     get navaidFrequency_khz(): number | null {
@@ -91,11 +107,11 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
      * @returns {AeroflyVector3Float} to use in Aerofly FS4's `main.mcf`
      */
     get position(): AeroflyVector3Float {
-        return Convert.convertLonLatToVector(this.longitude, this.latitude, this.altitude || 0);
+        return convertLonLatToVector(this.longitude, this.latitude, this.altitude || 0);
     }
 
     set position(position: AeroflyVector3Float) {
-        const { longitude, latitude, altitude_meter } = Convert.convertVectorToLonLat(position);
+        const { longitude, latitude, altitude_meter } = convertVectorToLonLat(position);
         this.longitude = longitude;
         this.latitude = latitude;
         this.altitude = altitude_meter;
@@ -104,11 +120,9 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
     getElement(index: number = 0): AeroflyConfigurationNode {
         const element = super.getElement(index);
 
-        if (this.navaidFrequency) {
-            element.appendChild("float64", "NavaidFrequency", this.navaidFrequency);
-        }
-
         element
+            .appendChild("float64", "NavaidFrequency", this.navaidFrequency ?? 0)
+            .appendChild("uint64", "NavaidUid", this.navaidUid ?? BigInt(0))
             .appendChild(
                 "vector2_float64",
                 "Altitude",
@@ -128,6 +142,7 @@ export class AeroflyNavRouteWaypoint extends AeroflyNavRouteBase {
             altitude_ft: this.altitude_ft,
             navaidFrequency: undefined,
             navaidFrequency_khz: this.navaidFrequency_khz,
+            navaidUid: this.navaidUid !== null ? this.navaidUid.toString() : null,
         };
     }
 }