@fboes/aerofly-data 1.0.0 → 1.1.0

package/README.md

@@ -17,7 +17,7 @@ The `data` directory contains the following files:
 | [`airport-list.json`](./data/airport-list.json)           | JSON file containing an array of all ICAO codes.                                        |
 | [`airports.geojson`](./data/airports.geojson)             | GeoJSON file containing the location of all airports in Aerofly FS 4.                   |
 
-[](https://fboes.github.io/aerofly-data/dist/)
+There is also a [ICAO code checker](https://fboes.github.io/aerofly-data/dist/), which checks if a given ICAO airport code exists in Aerofly FS 4.
 
 ## Building
 

package/data/aircraft-select-optgroup.html

@@ -0,0 +1,55 @@
+<select id="aircraft-select-optgroup">
+  <optgroup label="Airliner">
+    <option value="a319">Airbus A319-115</option>
+    <option value="a320">Airbus A320-214</option>
+    <option value="a321">Airbus A321-213</option>
+    <option value="a350_1000">Airbus A350-1000</option>
+    <option value="a380">Airbus A380-800</option>
+    <option value="b737_max9">Boeing 737 MAX 9</option>
+    <option value="b737">Boeing 737-500</option>
+    <option value="b737_900">Boeing 737-900ER</option>
+    <option value="b747">Boeing 747-400</option>
+    <option value="b777_300er">Boeing 777-300ER</option>
+    <option value="b777f">Boeing 777F</option>
+    <option value="b787">Boeing 787-10 Dreamliner</option>
+    <option value="crj900">Bombardier CRJ-900LR</option>
+    <option value="q400">Bombardier Dash-8 Q400</option>
+  </optgroup>
+  <optgroup label="Helicopters">
+    <option value="ec135">Eurocopter EC135-T1</option>
+    <option value="r22">Robinson R22 Beta II</option>
+    <option value="uh60">Sikorsky UH-60M Black Hawk</option>
+  </optgroup>
+  <optgroup label="General Aviation">
+    <option value="b58">Beechcraft Baron 58</option>
+    <option value="c90gtx">Beechcraft King Air C90 GTx</option>
+    <option value="lj45">Bombardier Learjet 45</option>
+    <option value="c172">Cessna 172 SP Skyhawk</option>
+    <option value="dr400">Robin DR400</option>
+  </optgroup>
+  <optgroup label="Historical Aircraft">
+    <option value="concorde">Aérospatiale/BAC Concorde</option>
+    <option value="jungmeister">Bücker Bü-133 Jungmeister</option>
+    <option value="dr1">Fokker Dr.I</option>
+    <option value="ju52">Junkers Ju 52/3m</option>
+    <option value="p38">Lockheed P-38 Lightning</option>
+    <option value="bf109e">Messerschmitt Bf 109E</option>
+    <option value="camel">Sopwith F.1 Camel</option>
+    <option value="f4u">Vought F4U Corsair</option>
+  </optgroup>
+  <optgroup label="Military Aircraft">
+    <option value="mb339">Aermacchi MB-339</option>
+    <option value="f15e">McDonnell Douglas F-15E Strike Eagle</option>
+    <option value="f18">McDonnell Douglas F/A-18C Hornet</option>
+  </optgroup>
+  <optgroup label="Aerobatic aircraft">
+    <option value="extra330">Extra 330 LX</option>
+    <option value="pitts">Pitts S-2B</option>
+  </optgroup>
+  <optgroup label="Gliders">
+    <option value="antares">Antares 21 Electro</option>
+    <option value="swift">Marganski Swift S1</option>
+    <option value="asg29">Schleicher ASG 29-18m</option>
+    <option value="ask21">Schleicher ASK 21</option>
+  </optgroup>
+</select>

package/data/aircraft.md

@@ -2,42 +2,42 @@
 
 | Aircraft Name                        | ICAO Code | Aerofly FS Code | Approach Speed (kts) | Cruise Altitude (ft) | Cruise Speed (kts) | Maximum Range (nm) |
 | ------------------------------------ | --------- | --------------- | -------------------: | -------------------: | -----------------: | -----------------: |
+| Aermacchi MB-339 | `M339` | `mb339` | 120 | 25000 | 486 | 1188 |
+| Aérospatiale/BAC Concorde | `CONC` | `concorde` | 165 | 55000 | 1177 | 3900 |
 | Airbus A319-115 | `A319` | `a319` | 142 | 32000 | 453 | 3747 |
 | Airbus A320-214 | `A320` | `a320` | 142 | 32000 | 453 | 3321 |
 | Airbus A321-213 | `A321` | `a321` | 145 | 32000 | 453 | 3186 |
 | Airbus A350-1000 | `A35K` | `a350_1000` | 151 | 37000 | 488 | 8909 |
 | Airbus A380-800 | `A388` | `a380` | 142 | 36000 | 517 | 8207 |
 | Antares 21 Electro | `LAE1` | `antares` | 65 | 8202 | 81 | 313 |
-| Schleicher ASG 29-18m | `AS29` | `asg29` | 54 | 8202 | 76 | 0 |
-| Schleicher ASK 21 | `AS21` | `ask21` | 57 | 4921 | 59 | 0 |
 | Beechcraft Baron 58 | `BE58` | `b58` | 90 | 11000 | 202 | 1229 |
+| Beechcraft King Air C90 GTx | `BE9L` | `c90gtx` | 100 | 18000 | 272 | 1192 |
+| Boeing 737 MAX 9 | `B39M` | `b737_max9` | 144 | 37000 | 453 | 3548 |
 | Boeing 737-500 | `B735` | `b737` | 125 | 33000 | 490 | 2808 |
 | Boeing 737-900ER | `B739` | `b737_900` | 144 | 37000 | 453 | 2948 |
-| Boeing 737 MAX 9 | `B39M` | `b737_max9` | 144 | 37000 | 453 | 3548 |
 | Boeing 747-400 | `B744` | `b747` | 145 | 34000 | 492 | 7262 |
-| Boeing 777F | `B77F` | `b777f` | 147 | 41000 | 482 | 9750 |
 | Boeing 777-300ER | `B77W` | `b777_300er` | 145 | 41000 | 482 | 7370 |
+| Boeing 777F | `B77F` | `b777f` | 147 | 41000 | 482 | 9750 |
 | Boeing 787-10 Dreamliner | `B78X` | `b787` | 150 | 40000 | 482 | 6425 |
-| Messerschmitt Bf 109E | `ME09` | `bf109e` | 94 | 13123 | 309 | 432 |
-| Cessna 172 SP Skyhawk | `C172` | `c172` | 62 | 8000 | 130 | 1031 |
-| Beechcraft King Air C90 GTx | `BE9L` | `c90gtx` | 100 | 18000 | 272 | 1192 |
-| Sopwith F.1 Camel | `CAML` | `camel` | 45 | 9843 | 100 | 124 |
-| Aérospatiale/BAC Concorde | `CONC` | `concorde` | 165 | 55000 | 1177 | 3900 |
 | Bombardier CRJ-900LR | `CRJ9` | `crj900` | 125 | 38000 | 470 | 1550 |
-| Fokker Dr.I | `DR1` | `dr1` | 49 | 9843 | 100 | 162 |
-| Robin DR400 | `DR40` | `dr400` | 62 | 5991 | 167 | 586 |
+| Bombardier Dash-8 Q400 | `DH8D` | `q400` | 135 | 24000 | 286 | 2808 |
+| Bombardier Learjet 45 | `LJ45` | `lj45` | 120 | 41000 | 486 | 1710 |
+| Bücker Bü-133 Jungmeister | `BU33` | `jungmeister` | 55 | 13123 | 119 | 270 |
+| Cessna 172 SP Skyhawk | `C172` | `c172` | 62 | 8000 | 130 | 1031 |
 | Eurocopter EC135-T1 | `EC35` | `ec135` | 60 | 9000 | 135 | 343 |
 | Extra 330 LX | `E300` | `extra330` | 90 | 9843 | 220 | 459 |
-| McDonnell Douglas F-15E Strike Eagle | `F15` | `f15e` | 140 | 40000 | 1458 | 3100 |
-| McDonnell Douglas F/A-18C Hornet | `F18` | `f18` | 135 | 40000 | 1034 | 1080 |
-| Vought F4U Corsair | `CORS` | `f4u` | 105 | 20000 | 389 | 930 |
+| Fokker Dr.I | `DR1` | `dr1` | 49 | 9843 | 100 | 162 |
 | Junkers Ju 52/3m | `JU52` | `ju52` | 65 | 19685 | 136 | 1080 |
-| Bücker Bü-133 Jungmeister | `BU33` | `jungmeister` | 55 | 13123 | 119 | 270 |
-| Bombardier Learjet 45 | `LJ45` | `lj45` | 120 | 41000 | 486 | 1710 |
-| Aermacchi MB-339 | `M339` | `mb339` | 120 | 25000 | 486 | 1188 |
 | Lockheed P-38 Lightning | `P38` | `p38` | 109 | 20000 | 315 | 1031 |
+| Marganski Swift S1 | `` | `swift` | 63 | 6562 | 65 | 0 |
+| McDonnell Douglas F-15E Strike Eagle | `F15` | `f15e` | 140 | 40000 | 1458 | 3100 |
+| McDonnell Douglas F/A-18C Hornet | `F18` | `f18` | 135 | 40000 | 1034 | 1080 |
+| Messerschmitt Bf 109E | `ME09` | `bf109e` | 94 | 13123 | 309 | 432 |
 | Pitts S-2B | `PTS2` | `pitts` | 90 | 9843 | 132 | 216 |
-| Bombardier Dash-8 Q400 | `DH8D` | `q400` | 135 | 24000 | 286 | 2808 |
+| Robin DR400 | `DR40` | `dr400` | 62 | 5991 | 167 | 586 |
 | Robinson R22 Beta II | `R22` | `r22` | 60 | 6562 | 105 | 208 |
-| Marganski Swift S1 | `` | `swift` | 63 | 6562 | 65 | 0 |
-| Sikorsky UH-60M Black Hawk | `H60` | `uh60` | 70 | 9843 | 160 | 252 |
+| Schleicher ASG 29-18m | `AS29` | `asg29` | 54 | 8202 | 76 | 0 |
+| Schleicher ASK 21 | `AS21` | `ask21` | 57 | 4921 | 59 | 0 |
+| Sikorsky UH-60M Black Hawk | `H60` | `uh60` | 70 | 9843 | 160 | 252 |
+| Sopwith F.1 Camel | `CAML` | `camel` | 45 | 9843 | 100 | 124 |
+| Vought F4U Corsair | `CORS` | `f4u` | 105 | 20000 | 389 | 930 |

package/dist/index.html

@@ -1,53 +1,165 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Aerofly FS Airport Code Validator</title>
-  <style>
-    body {
-      font-family: Arial, sans-serif;
-      margin: 20px;
-      text-align: center;
-    }
-    #status {
-      font-size: 1.5em;
-      margin-left: 10px;
-    }
-  </style>
-</head>
-<body>
-  <h1>Aerofly FS Airport Code Validator</h1>
-  <p>Enter an ICAO airport code:</p>
-  <input type="text" id="icaoInput" placeholder="Enter ICAO code" pattern="A-Za-z0-9" autocapitalize="on" />
-  <span id="status">❓</span>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Aerofly FS Airport Code Validator</title>
+    <meta
+      name="description"
+      content="Check if an airport is present in Aerofly FS 4 using its ICAO code."
+    />
+    <style>
+      :root {
+        color-scheme: light dark;
+      }
+      * {
+        margin: 0;
+        padding: 0;
+      }
+      body {
+        font-family: Arial, sans-serif;
+        margin: 20px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        min-height: 100vh;
+      }
+      main {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        text-align: center;
+        padding-bottom: 2em;
+      }
+      h1 {
+        font-size: 1.8em;
+        margin-bottom: 0.75em;
+        border-bottom: 1px solid #ccc;
+        padding: 0 1em 0.25em;
+      }
+      label {
+        display: block;
+        margin-bottom: 1em;
+      }
+      input {
+        font: inherit;
+        padding: 0.25em;
+        border-radius: 0.25em;
+        width: 6em;
+      }
+      .inputbox {
+        display: flex;
+        align-items: center;
+        gap: 0.5em;
+        font-size: 1.25em;
+      }
+      #status {
+        font-size: 1.25em;
+      }
+      #status2, p {
+        margin-top: 1em;
+      }
+    </style>
+  </head>
+  <body>
+    <main>
+      <h1>Aerofly FS Airport Code Validator</h1>
+      <label for="icaoInput"
+        >Check if an airport is present in Aerofly FS 4 using its ICAO
+        code:</label
+      >
+      <div class="inputbox">
+        <input
+          type="text"
+          id="icaoInput"
+          list="icaoInputList"
+          placeholder="ICAO code"
+          pattern="A-Za-z0-9"
+          autocapitalize="characters"
+          autofocus="autofocus"
+        />
+        <datalist id="icaoInputList">
+          <option value="KATL">KATL</option>
+          <option value="KLAX">KLAX</option>
+          <option value="EGLL">EGLL</option>
+          <option value="OMDB">OMDB</option>
+          <option value="RJTT">RJTT</option>
+        </datalist>
+        <span
+          id="status"
+          title="Enter an ICAO code to check if the airport is present in Aerofly FS 4"
+          >❓</span
+        >
+      </div>
+      <div id="status2">
+        Enter an ICAO code to check if the airport is present in Aerofly FS 4
+      </div>
+      <p>Data source: <a href="..">Aerofly FS 4 data repository</a>.</p>
+    </main>
 
-  <script>
-    // Load the airport list from the JSON file
-    let airportList = [];
-    fetch('./data/airport-list.json')
-      .then(response => response.json())
-      .then(data => {
-        airportList = data;
-      })
-      .catch(error => {
-        console.error('Error loading airport list:', error);
-      });
+    <script>
+      // Load the airport list from the JSON file
+      let airportList = [];
+      fetch("../data/airport-list.json")
+        .then((response) => response.json())
+        .then((data) => {
+          airportList = data;
+        })
+        .catch((error) => {
+          console.error("Error loading airport list:", error);
+        });
 
-    // Validate the input
-    const inputField = document.getElementById('icaoInput');
-    const status = document.getElementById('status');
+      // Validate the input
+      const inputField = document.getElementById("icaoInput");
+      const status = document.getElementById("status");
+      const status2 = document.getElementById("status2");
 
-    inputField.addEventListener('input', () => {
-      const inputValue = inputField.value.toUpperCase();
-      if (airportList.includes(inputValue)) {
-        status.textContent = '✅'; // Green checkmark
-      } else if (inputValue.trim() === '') {
-        status.textContent = '❓'; // Question mark for empty input
-      } else {
-        status.textContent = '🚫'; // Red forbidden sign
-      }
-    });
-  </script>
-</body>
-</html>
+      inputField.addEventListener("input", () => {
+        const inputValue = inputField.value.toUpperCase();
+
+        // Autocomplete: Populate datalist if input has 2+ chars
+        const datalist = document.getElementById("icaoInputList");
+        if (inputValue.length >= 2) {
+          // Filter airportList for codes starting with inputValue
+          const filtered = airportList.filter((code) =>
+            code.startsWith(inputValue)
+          );
+          // Clear existing options
+          datalist.innerHTML = "";
+          // Add filtered options
+          filtered.forEach((code) => {
+            const option = document.createElement("option");
+            option.value = code;
+            datalist.appendChild(option);
+          });
+        } else {
+          // Restore default options if input < 2 chars
+          datalist.innerHTML = `
+            <option value="KATL">KATL</option>
+            <option value="KLAX">KLAX</option>
+            <option value="EGLL">EGLL</option>
+            <option value="OMDB">OMDB</option>
+            <option value="RJTT">RJTT</option>
+          `;
+        }
+
+        if (airportList.includes(inputValue)) {
+          status.textContent = "✅"; // Green checkmark
+          status.title = "Airport is present in Aerofly FS 4";
+          status2.textContent = "Airport is present in Aerofly FS 4";
+        } else if (inputValue.trim() === "") {
+          status.textContent = "❓"; // Question mark for empty input
+          status.title =
+            "Enter an ICAO code to check if the airport is present in Aerofly FS 4";
+          status2.textContent =
+            "Enter an ICAO code to check if the airport is present in Aerofly FS 4";
+        } else {
+          status.textContent = "🚫"; // Red forbidden sign
+          status.title = "Airport is NOT present in Aerofly FS 4";
+          status2.textContent = "Airport is NOT present in Aerofly FS 4";
+        }
+      });
+    </script>
+  </body>
+</html>

package/get-aircraft.js

@@ -4,181 +4,11 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-
-/**
- * @typedef AeroflyAircraftParsed
- * @type {{
- *   name: string,
- *   nameFull: string,
- *   icaoCode: string,
- *   tags: string[],
- *   approachAirspeedKts: number,
- *   cruiseAltitudeFt: number,
- *   cruiseSpeedKts: number,
- *   maximumRangeNm: number,
- * }}
- */
-
-/**
- * @typedef AeroflyAircraft
- * @type {AeroflyAircraftParsed & {
- *   aeroflyCode: string,
- *   liveries: {
- *     aeroflyCode: string,
- *     name: string,
- *   }[],
- * }}
- */
-
-/**
- *
- * @param {string} directory
- * @returns {AeroflyAircraft[]}
- */
-const getAeroflyAircraft = (directory) => {
-  return fs
-    .readdirSync(directory, { withFileTypes: true })
-    .filter((dirent) => dirent.isDirectory())
-    .sort()
-    .map((dirent) => {
-      const tmdFileContent = fs.readFileSync(
-        path.join(dirent.parentPath, dirent.name, dirent.name + ".tmc"),
-        "utf8"
-      );
-
-      const tmdOptionFileContent = fs.readFileSync(
-        path.join(dirent.parentPath, dirent.name, "option.tmc"),
-        "utf8"
-      );
-
-      const liveries = [
-        {
-          aeroflyCode: "default",
-          name: parseTmdLine(tmdOptionFileContent, "Description"),
-        },
-        ...fs
-          .readdirSync(path.join(dirent.parentPath, dirent.name), {
-            withFileTypes: true,
-          })
-          .filter((dirent) => dirent.isDirectory())
-          .filter((dirent) =>
-            fs.existsSync(
-              path.join(dirent.parentPath, dirent.name, "preview.ttx")
-            )
-          )
-          .sort()
-          .map((dirent) => {
-            const tmdFileContent = fs.readFileSync(
-              path.join(dirent.parentPath, dirent.name, "option.tmc"),
-              "utf8"
-            );
-
-            return {
-              aeroflyCode: dirent.name,
-              name: parseTmdLine(tmdFileContent, "Description"),
-            };
-          }),
-      ];
-
-      return {
-        ...parseAircraft(tmdFileContent),
-        aeroflyCode: dirent.name,
-        liveries,
-      };
-    });
-};
-
-/**
- * @param {string} tmdFileContent
- * @returns {AeroflyAircraftParsed}
- */
-const parseAircraft = (tmdFileContent) => {
-  const tags = parseTmdLine(tmdFileContent, "Tags").trim().split(" ");
-
-  // type: ;
-  return {
-    name: parseTmdLine(tmdFileContent, "DisplayName"),
-    nameFull: parseTmdLine(tmdFileContent, "DisplayNameFull"),
-    icaoCode: parseTmdLine(tmdFileContent, "ICAO"),
-    tags,
-    /*MinimumAirspeed: convertSpeed(
-      parseTmdLine(tmdFileContent, "MinimumAirspeed")
-    ),*/
-    approachAirspeedKts: convertSpeed(
-      parseTmdLine(tmdFileContent, "ApproachAirspeed")
-    ),
-    /*CruiseAirspeed: convertSpeed(
-      parseTmdLine(tmdFileContent, "CruiseAirspeed")
-    ),*/
-    cruiseAltitudeFt: convertAltitude(
-      parseTmdLine(tmdFileContent, "CruiseAltitude")
-    ),
-    cruiseSpeedKts: convertSpeed(parseTmdLine(tmdFileContent, "CruiseSpeed")),
-    /*MaximumAirspeed: convertSpeed(
-      parseTmdLine(tmdFileContent, "MaximumAirspeed")
-    ),
-    MaximumAltitude: convertAltitude(
-      parseTmdLine(tmdFileContent, "MaximumAltitude")
-    ),
-    MaximumSpeed: convertSpeed(parseTmdLine(tmdFileContent, "MaximumSpeed")),*/
-    maximumRangeNm: convertDistance(
-      parseTmdLine(tmdFileContent, "MaximumRange")
-    ),
-    /*FlapAirspeedRange: parseTmdLine(tmdFileContent, "FlapAirspeedRange")
-      .trim()
-      .split(" ")
-      .map((v) => convertSpeed(v)),
-    NormalAirspeedRange: parseTmdLine(tmdFileContent, "NormalAirspeedRange")
-      .trim()
-      .split(" ")
-      .map((v) => convertSpeed(v)),
-    CautionAirspeedRange: parseTmdLine(tmdFileContent, "CautionAirspeedRange")
-      .trim()
-      .split(" ")
-      .map((v) => convertSpeed(v)),*/
-  };
-};
-
-/**
- *
- * @param {string} tmdFileContent
- * @param {string} key
- * @returns {string}
- */
-const parseTmdLine = (tmdFileContent, key) => {
-  const r = new RegExp("\\[" + key + "\\]\\s*\\[(.+?)\\]");
-  const match = tmdFileContent.match(r);
-  return match && match[1] ? match[1] : "";
-};
-
-/**
- *
- * @param {string} speed in m/s
- * @returns {number} in kts
- */
-const convertSpeed = (speed) => {
-  return Math.round(Number(speed) * 1.94384449);
-};
-
-/**
- *
- * @param {string} altitude in m
- * @returns {number} in ft
- */
-const convertAltitude = (altitude) => {
-  return Math.round(Number(altitude) * 3.28084);
-};
-
-/**
- *
- * @param {string} range in m
- * @returns {number} in kts
- */
-const convertDistance = (range) => {
-  return Math.round(Number(range) / 1852);
-};
-
-// -----------------------------------------------------------------------------
+import {
+  getAeroflyAircraft,
+  getSelectOptgroupOptions,
+  getSelectOptions,
+} from "./src/aircraft-functions.js";
 
 const inputDirectory = process.argv[2] ?? ".";
 const aeroflyAircraft = getAeroflyAircraft(inputDirectory);
@@ -223,6 +53,11 @@ process.stderr.write(
   `Abbreviated aircraft data (without liveries) written to \x1b[92m${outputFilePathWithoutLiveries}\x1b[0m\n`
 );
 
+// Sort aeroflyAircraft by nameFull
+const sortedAircraft = aeroflyAircraft.sort((a, b) =>
+  a.nameFull.localeCompare(b.nameFull)
+);
+
 // Write summary to aircraft.md
 const summaryFilePath = path.join(outputDirectory, "aircraft.md");
 let summaryContent = `\
@@ -231,7 +66,7 @@ let summaryContent = `\
 | Aircraft Name                        | ICAO Code | Aerofly FS Code | Approach Speed (kts) | Cruise Altitude (ft) | Cruise Speed (kts) | Maximum Range (nm) |
 | ------------------------------------ | --------- | --------------- | -------------------: | -------------------: | -----------------: | -----------------: |
 `;
-summaryContent += aeroflyAircraft
+summaryContent += sortedAircraft
   .map((aircraft) => {
     return `| ${aircraft.nameFull} | \`${aircraft.icaoCode}\` | \`${aircraft.aeroflyCode}\` | ${aircraft.approachAirspeedKts} | ${aircraft.cruiseAltitudeFt} | ${aircraft.cruiseSpeedKts} | ${aircraft.maximumRangeNm} |`;
   })
@@ -242,25 +77,33 @@ process.stderr.write(`Summary written to \x1b[92m${summaryFilePath}\x1b[0m\n`);
 
 // Write HTML <select> options to aircraft-select.html
 const selectFilePath = path.join(outputDirectory, "aircraft-select.html");
-let selectContent = `\
-<select id="aircraft-select">
-`;
 
-// Sort aeroflyAircraft by nameFull
-const sortedAircraft = aeroflyAircraft.sort((a, b) =>
-  a.nameFull.localeCompare(b.nameFull)
-);
 
-selectContent += sortedAircraft
-  .map((aircraft) => {
-    return `  <option value="${aircraft.aeroflyCode}">${aircraft.nameFull}</option>`;
-  })
-  .join("\n");
-selectContent += `
-</select>
-`;
+let selectContent = getSelectOptions(sortedAircraft);
 
 await fs.promises.writeFile(selectFilePath, selectContent, "utf-8");
 process.stderr.write(
   `HTML <select> options written to \x1b[92m${selectFilePath}\x1b[0m\n`
 );
+
+// Write HTML <select> with <optgroup> to aircraft-select-optgroup.html
+const selectOptgroupFilePath = path.join(
+  outputDirectory,
+  "aircraft-select-optgroup.html"
+);
+
+let selectOptgroupContent = getSelectOptgroupOptions(sortedAircraft);
+
+await fs.promises.writeFile(
+  selectOptgroupFilePath,
+  selectOptgroupContent,
+  "utf-8"
+);
+process.stderr.write(
+  `HTML <select> with <optgroup> options written to \x1b[92m${selectOptgroupFilePath}\x1b[0m\n`
+);
+
+process.stderr.write(
+  `\nAll aircraft files written to \x1b[92m${path.resolve(outputDirectory)}\x1b[0m\n`
+);
+

package/get-airports.js

@@ -6,69 +6,7 @@ import GeoJSON from "@fboes/geojson";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { parse } from "csv-parse/sync";
-
-/**
- *
- * @param {string} type
- * @param {boolean} isMilitary
- * @param {number|undefined} lenght in Bytes
- * @returns {string}
- */
-const geoJsonType = (type, isMilitary, lenght) => {
-  if (type === "heliport") {
-    return type;
-  }
-
-  if (lenght !== undefined) {
-    let size = "closed";
-    if (lenght > 1200) {
-      size = "large";
-    } else if (lenght > 1050) {
-      size = "medium";
-    } else if (lenght > 920) {
-      size = "small";
-    }
-
-    if (size === "closed") {
-      return size;
-    }
-
-    return size + "_" + (isMilitary ? "airbase" : "airport");
-  }
-
-  return type;
-};
-
-/**
- *
- * @param {string} directory
- * @param {RegExp?} icaoFilter
- * @returns {Map<string,number>}
- */
-const getAeroflyAirports = (directory, icaoFilter) => {
-  const aeroflyAirports = new Map();
-  let maxLength = 0;
-  let minLength = 10_000;
-
-  const files = fs
-    .readdirSync(directory)
-    .filter((fn) => fn.endsWith(".wad"))
-    .sort();
-
-  for (const file of files) {
-    const icaoCode = file.replace(/\.wad$/, "").toUpperCase();
-    if (!icaoFilter || icaoCode.match(icaoFilter)) {
-      const stats = fs.statSync(path.join(directory, file));
-      maxLength = Math.max(maxLength, stats.size);
-      minLength = Math.min(minLength, stats.size);
-      aeroflyAirports.set(icaoCode, stats.size);
-    }
-  }
-
-  return aeroflyAirports;
-};
-
-// -----------------------------------------------------------------------------
+import { geoJsonType, getAeroflyAirports } from "./src/airport-functions.js";
 
 const inputDirectory = process.argv[2] ?? ".";
 const icaoFilterArg = process.argv[3]?.replace(/[^A-Z]/, "").toUpperCase();

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fboes/aerofly-data",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "This project contains data sets for airports and aircraft present in Aerofly FS 4.",
   "main": "build.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo \"Error: no test specified\"",
     "fetch-csv": "curl -o tmp/airports.csv https://davidmegginson.github.io/ourairports-data/airports.csv",
     "eslint": "npx eslint **/*.js --fix",
     "prettier": "npx prettier --cache --write .",

package/src/aircraft-functions.js

@@ -0,0 +1,288 @@
+import * as fs from "node:fs";
+import * as path from "path";
+
+/**
+ * @typedef AeroflyAircraftParsed
+ * @type {{
+ *   name: string,
+ *   nameFull: string,
+ *   icaoCode: string,
+ *   tags: string[],
+ *   approachAirspeedKts: number,
+ *   cruiseAltitudeFt: number,
+ *   cruiseSpeedKts: number,
+ *   maximumRangeNm: number,
+ * }}
+ */
+/**
+ * @typedef AeroflyAircraft
+ * @type {AeroflyAircraftParsed & {
+ *   aeroflyCode: string,
+ *   liveries: {
+ *     aeroflyCode: string,
+ *     name: string,
+ *   }[],
+ * }}
+ */
+
+/**
+ *
+ * @param {string} directory
+ * @returns {AeroflyAircraft[]}
+ */
+export const getAeroflyAircraft = (directory) => {
+  return fs
+    .readdirSync(directory, { withFileTypes: true })
+    .filter((dirent) => dirent.isDirectory())
+    .sort()
+    .map((dirent) => {
+      const tmdFileContent = fs.readFileSync(
+        path.join(dirent.parentPath, dirent.name, dirent.name + ".tmc"),
+        "utf8"
+      );
+
+      const tmdOptionFileContent = fs.readFileSync(
+        path.join(dirent.parentPath, dirent.name, "option.tmc"),
+        "utf8"
+      );
+
+      const liveries = [
+        {
+          aeroflyCode: "default",
+          name: parseTmdLine(tmdOptionFileContent, "Description"),
+        },
+        ...fs
+          .readdirSync(path.join(dirent.parentPath, dirent.name), {
+            withFileTypes: true,
+          })
+          .filter((dirent) => dirent.isDirectory())
+          .filter((dirent) =>
+            fs.existsSync(
+              path.join(dirent.parentPath, dirent.name, "preview.ttx")
+            )
+          )
+          .sort()
+          .map((dirent) => {
+            const tmdFileContent = fs.readFileSync(
+              path.join(dirent.parentPath, dirent.name, "option.tmc"),
+              "utf8"
+            );
+
+            return {
+              aeroflyCode: dirent.name,
+              name: parseTmdLine(tmdFileContent, "Description"),
+            };
+          }),
+      ];
+
+      return {
+        ...parseAircraft(tmdFileContent),
+        aeroflyCode: dirent.name,
+        liveries,
+      };
+    });
+};
+
+/**
+ * @param {string} tmdFileContent
+ * @returns {AeroflyAircraftParsed}
+ */
+export const parseAircraft = (tmdFileContent) => {
+  const tags = parseTmdLine(tmdFileContent, "Tags").trim().split(" ");
+
+  // type: ;
+  return {
+    name: parseTmdLine(tmdFileContent, "DisplayName"),
+    nameFull: parseTmdLine(tmdFileContent, "DisplayNameFull"),
+    icaoCode: parseTmdLine(tmdFileContent, "ICAO"),
+    tags,
+    /*MinimumAirspeed: convertSpeed(
+      parseTmdLine(tmdFileContent, "MinimumAirspeed")
+    ),*/
+    approachAirspeedKts: convertSpeed(
+      parseTmdLine(tmdFileContent, "ApproachAirspeed")
+    ),
+    /*CruiseAirspeed: convertSpeed(
+      parseTmdLine(tmdFileContent, "CruiseAirspeed")
+    ),*/
+    cruiseAltitudeFt: convertAltitude(
+      parseTmdLine(tmdFileContent, "CruiseAltitude")
+    ),
+    cruiseSpeedKts: convertSpeed(parseTmdLine(tmdFileContent, "CruiseSpeed")),
+    /*MaximumAirspeed: convertSpeed(
+      parseTmdLine(tmdFileContent, "MaximumAirspeed")
+    ),
+    MaximumAltitude: convertAltitude(
+      parseTmdLine(tmdFileContent, "MaximumAltitude")
+    ),
+    MaximumSpeed: convertSpeed(parseTmdLine(tmdFileContent, "MaximumSpeed")),*/
+    maximumRangeNm: convertDistance(
+      parseTmdLine(tmdFileContent, "MaximumRange")
+    ),
+    /*FlapAirspeedRange: parseTmdLine(tmdFileContent, "FlapAirspeedRange")
+      .trim()
+      .split(" ")
+      .map((v) => convertSpeed(v)),
+    NormalAirspeedRange: parseTmdLine(tmdFileContent, "NormalAirspeedRange")
+      .trim()
+      .split(" ")
+      .map((v) => convertSpeed(v)),
+    CautionAirspeedRange: parseTmdLine(tmdFileContent, "CautionAirspeedRange")
+      .trim()
+      .split(" ")
+      .map((v) => convertSpeed(v)),*/
+  };
+};
+
+/**
+ *
+ * @param {string} tmdFileContent
+ * @param {string} key
+ * @returns {string}
+ */
+export const parseTmdLine = (tmdFileContent, key) => {
+  const r = new RegExp("\\[" + key + "\\]\\s*\\[(.+?)\\]");
+  const match = tmdFileContent.match(r);
+  return match && match[1] ? match[1] : "";
+};
+
+/**
+ *
+ * @param {string} speed in m/s
+ * @returns {number} in kts
+ */
+export const convertSpeed = (speed) => {
+  return Math.round(Number(speed) * 1.94384449);
+};
+
+/**
+ *
+ * @param {string} altitude in m
+ * @returns {number} in ft
+ */
+export const convertAltitude = (altitude) => {
+  return Math.round(Number(altitude) * 3.28084);
+};
+
+/**
+ *
+ * @param {string} range in m
+ * @returns {number} in kts
+ */
+export const convertDistance = (range) => {
+  return Math.round(Number(range) / 1852);
+};
+
+/**
+ *
+ * @param {AeroflyAircraft[]} sortedAircraft
+ * @returns {string}
+ */
+export const getSelectOptions = (sortedAircraft) => {
+  const selectContent = sortedAircraft
+    .map((aircraft) => {
+      return `  <option value="${aircraft.aeroflyCode}">${aircraft.nameFull}</option>`;
+    })
+    .join("\n");
+
+  return `\
+<select id="aircraft-select">
+${selectContent}
+</select>
+`;
+};
+
+/**
+ *
+ * @param {AeroflyAircraft[]} sortedAircraft
+ * @returns {string}
+ */
+export const getSelectOptgroupOptions = (sortedAircraft) => {
+  /**
+   * @type {{
+   *   [key: string]: {
+   *     label: string,
+   *     options: { value: string; label: string }[]
+   *   }
+   * }}
+   */
+  const options = {
+    airliner: {
+      label: "Airliner",
+      options: [],
+    },
+    helicopter: {
+      label: "Helicopters",
+      options: [],
+    },
+    general_aviation: {
+      label: "General Aviation",
+      options: [],
+    },
+    historical: {
+      label: "Historical Aircraft",
+      options: [],
+    },
+    military: {
+      label: "Military Aircraft",
+      options: [],
+    },
+    aerobatic: {
+      label: "Aerobatic aircraft",
+      options: [],
+    },
+    glider: {
+      label: "Gliders",
+      options: [],
+    },
+  };
+
+  for (const aircraft of sortedAircraft) {
+    const o = {
+      value: aircraft.aeroflyCode,
+      label: aircraft.nameFull,
+    };
+
+    if (aircraft.tags.includes("historical")) {
+      options.historical.options.push(o);
+    } else if (aircraft.tags.includes("airliner")) {
+      options.airliner.options.push(o);
+    } else if (aircraft.tags.includes("helicopter")) {
+      options.helicopter.options.push(o);
+    } else if (aircraft.tags.includes("military")) {
+      options.military.options.push(o);
+    } else if (aircraft.tags.includes("glider")) {
+      options.glider.options.push(o);
+    } else if (aircraft.tags.includes("aerobatic")) {
+      options.aerobatic.options.push(o);
+    } else {
+      options.general_aviation.options.push(o);
+    }
+  }
+
+  let html = "";
+  for (const optgroup of [
+    options.airliner,
+    options.helicopter,
+    options.general_aviation,
+    options.historical,
+    options.military,
+    options.aerobatic,
+    options.glider,
+  ]) {
+    if (optgroup.options.length === 0) {
+      continue;
+    }
+    html += `  <optgroup label="${optgroup.label}">` + "\n";
+    for (const option of optgroup.options) {
+      html += `    <option value="${option.value}">${option.label}</option>` + "\n";
+    }
+    html += "  </optgroup>\n";
+  }
+
+  return `\
+<select id="aircraft-select-optgroup">
+${html}\
+</select>
+`;
+};

package/src/airport-functions.js

@@ -0,0 +1,63 @@
+import * as fs from "node:fs";
+import * as path from "path";
+
+/**
+ *
+ * @param {string} type
+ * @param {boolean} isMilitary
+ * @param {number|undefined} lenght in Bytes
+ * @returns {string}
+ */
+export const geoJsonType = (type, isMilitary, lenght) => {
+  if (type === "heliport") {
+    return type;
+  }
+
+  if (lenght !== undefined) {
+    let size = "closed";
+    if (lenght > 1200) {
+      size = "large";
+    } else if (lenght > 1050) {
+      size = "medium";
+    } else if (lenght > 920) {
+      size = "small";
+    }
+
+    if (size === "closed") {
+      return size;
+    }
+
+    return size + "_" + (isMilitary ? "airbase" : "airport");
+  }
+
+  return type;
+};
+
+/**
+ *
+ * @param {string} directory
+ * @param {RegExp?} icaoFilter
+ * @returns {Map<string,number>}
+ */
+export const getAeroflyAirports = (directory, icaoFilter) => {
+  const aeroflyAirports = new Map();
+  let maxLength = 0;
+  let minLength = 10000;
+
+  const files = fs
+    .readdirSync(directory)
+    .filter((fn) => fn.endsWith(".wad"))
+    .sort();
+
+  for (const file of files) {
+    const icaoCode = file.replace(/\.wad$/, "").toUpperCase();
+    if (!icaoFilter || icaoCode.match(icaoFilter)) {
+      const stats = fs.statSync(path.join(directory, file));
+      maxLength = Math.max(maxLength, stats.size);
+      minLength = Math.min(minLength, stats.size);
+      aeroflyAirports.set(icaoCode, stats.size);
+    }
+  }
+
+  return aeroflyAirports;
+};