@fboes/aerofly-data 1.8.1 → 1.8.3

package/dist/main.js

@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @global Loaded from Mapbox GL JS script in index.html
+ * @global
  * @type {any} mapboxgl
  */
 var mapboxgl;

package/get-airports.js

@@ -14,8 +14,6 @@ import {
 } from "./src/airport-functions.js";
 
 const inputDirectory = process.argv[2] ?? ".";
-const icaoFilterArg = process.argv[3]?.replace(/[^A-Z]/, "").toUpperCase();
-const icaoFilter = icaoFilterArg ? new RegExp("^[" + icaoFilterArg + "]") : null;
 
 // Ensure the output directory exists
 const outputDirectory = path.join("data");
@@ -26,108 +24,144 @@ if (!fs.existsSync(outputDirectory)) {
 const aeroflyGeoJson = new GeoJSON.FeatureCollection();
 const aeroflyAirports = new Map([
   ...addCustomAeroflyAirportsToMap(path.join(outputDirectory, "airports-custom.md")),
-  ...getAeroflyAirports(inputDirectory, icaoFilter),
+  ...getAeroflyAirports(inputDirectory),
 ]);
 const aeroflyAirportsLength = aeroflyAirports.size;
 process.stdout.write(`Found \x1b[92m${aeroflyAirports.size}\x1b[0m Aerofly FS Airports
 `);
 
 const airportsSource = fs.readFileSync(`tmp/airports.csv`);
-/** @type {string[][]} with a single CSV line from airports.csv */
-const airportsRecords = parse(airportsSource, { bom: true });
 
+/** @type {string[][]} with a single CSV line from airports.csv */
+let airportsRecords = parse(airportsSource, { bom: true });
 let airportsRecordsProcessed = 0;
 
 // Collect all ICAO codes
+
+/**
+ * @type {string[]}
+ */
 const icaoCodes = [];
+
+/**
+ * @type {{
+ *  code: String,
+ *  name: String,
+ *  lat: Number,
+ *  lon: Number
+ * }[]}
+ */
 const icaoCoordinatesObject = [];
 
-for (const airportsRecord of airportsRecords) {
-  // 3685,"KMIA","large_airport","Miami International Airport",25.79319953918457,-80.29060363769531,8,"NA","US","US-FL","Miami","yes","KMIA","MIA","MIA","http://www.miami-airport.com/","https://en.wikipedia.org/wiki/
-  // 19927,"KGBN","small_airport","Gila Bend Air Force Auxiliary Airport",32.887501,-112.720001,883,"NA","US","US-AZ","Gila Bend","no",,,"KGXF","GXF",,"https://en.wikipedia.org/wiki/Gila_Bend_Air_Force_Auxiliary_Field",
+/**
+ *
+ * @param {string[]} searchWords
+ * @returns {[number, string]|[undefined, undefined]} Returns the length of the airport and the code if found, otherwise undefined.
+ */
+const getAeroflyAirport = (searchWords) => {
+  for (const word of searchWords) {
+    if (aeroflyAirports.has(word)) {
+      return [aeroflyAirports.get(word) || 0, word];
+    }
+  }
+  return [undefined, undefined];
+};
+
+/**
+ * @param {string} aeroflyCode
+ * @param {string} bestCode
+ * @param {string[]} airportsRecord
+ * @param {number} length
+ */
+const addRecord = (aeroflyCode, bestCode, airportsRecord, length) => {
+  // Remove airport from list of Aerofly FS4 Airports
+  aeroflyAirports.delete(aeroflyCode);
+
+  const isMilitary =
+    airportsRecord[3].match(/\b(base|rnas|raf|naval|air\s?force|coast\s?guard|army|afs|mod|cgas)\b/i) !== null;
+  let type = airportsRecord[2];
+  if (isMilitary) {
+    type = type.replace(/port/, "base");
+  }
 
-  const ident = airportsRecord[1];
-  const icaoCode = airportsRecord[12];
-  const searchWords = getAirportSearchWords(ident, icaoCode, airportsRecord);
+  // Filter community airports and add regular airports to secondary lists
+  if (length > 0) {
+    icaoCodes.push(bestCode);
+    icaoCoordinatesObject.push({
+      code: bestCode,
+      name: airportsRecord[3],
+      lat: Number(airportsRecord[4]),
+      lon: Number(airportsRecord[5]),
+    });
+  }
 
-  if (icaoFilter && !ident.match(icaoFilter) && !icaoCode.match(icaoFilter)) {
-    continue;
+  const feature = new GeoJSON.Feature(
+    new GeoJSON.Point(Number(airportsRecord[5]), Number(airportsRecord[4]), Number(airportsRecord[6]) * 0.3048),
+    {
+      title: bestCode,
+      type: geoJsonType(type, isMilitary, length),
+      description: airportsRecord[3],
+      elevation: Number(airportsRecord[6]),
+      municipality: airportsRecord[10],
+      fileSize: Math.ceil(length),
+      "marker-symbol": airportsRecord[2].match(/heliport/)
+        ? "heliport"
+        : airportsRecord[2].match(/small/)
+          ? "airfield"
+          : "airport",
+      "marker-color": airportsRecord[2].match(/large/)
+        ? "#5e6eba"
+        : airportsRecord[2].match(/small/)
+          ? "#777777"
+          : "#555555",
+    },
+  );
+  if (isMilitary) {
+    feature.setProperty("isMilitary", true);
   }
 
-  airportsRecordsProcessed++;
+  aeroflyGeoJson.addFeature(feature);
+};
 
-  /**
-   *
-   * @param {string[]} searchWords
-   * @returns {[number, string]|[undefined, undefined]} Returns the length of the airport and the code if found, otherwise undefined.
-   */
-  const getAeroflyAirport = (searchWords) => {
-    for (const word of searchWords) {
-      if (aeroflyAirports.has(word)) {
-        return [aeroflyAirports.get(word) || 0, word];
-      }
-    }
-    return [undefined, undefined];
-  };
+// -----------------------------------------------------------------------------
+// PARSING
 
-  const [length, aeroflyCode] = getAeroflyAirport(searchWords);
+// 3685,"KMIA","large_airport","Miami International Airport",25.79319953918457,-80.29060363769531,8,"NA","US","US-FL","Miami","yes","KMIA","MIA","MIA","http://www.miami-airport.com/","https://en.wikipedia.org/wiki/
+// 19927,"KGBN","small_airport","Gila Bend Air Force Auxiliary Airport",32.887501,-112.720001,883,"NA","US","US-AZ","Gila Bend","no",,,"KGXF","GXF",,"https://en.wikipedia.org/wiki/Gila_Bend_Air_Force_Auxiliary_Field",
 
-  if (length !== undefined && aeroflyCode !== undefined) {
-    const bestCode = icaoCode || aeroflyCode || ident;
+process.stdout.write("ROUND 1: ICAO codes\n");
+for (const airportsRecord of airportsRecords) {
+  airportsRecordsProcessed++;
+  const icaoCode = airportsRecord[12];
+  const [length, aeroflyCode] = getAeroflyAirport([icaoCode]);
 
-    // Remove airport from list of Aerofly FS4 Airports
-    aeroflyAirports.delete(aeroflyCode);
+  if (length !== undefined && aeroflyCode !== undefined) {
+    addRecord(aeroflyCode, icaoCode, airportsRecord, length);
+  }
 
-    if (aeroflyCode !== bestCode) {
-      process.stdout
-        .write(`  > Mismatching codes for airport: Using \x1b[93m${bestCode}\x1b[0m, was \x1b[93m${aeroflyCode}\x1b[0m from Aerofly FS4 data
+  if (airportsRecordsProcessed % 5000 === 0) {
+    const index = aeroflyAirportsLength - aeroflyAirports.size;
+    process.stdout
+      .write(`  Processed \x1b[92m${String(airportsRecordsProcessed).padStart(5)}\x1b[0m airport records, found \x1b[92m${String(index).padStart(5)}\x1b[0m Aerofly FS Airports
 `);
-    }
+  }
+}
 
-    const isMilitary =
-      airportsRecord[3].match(/\b(base|rnas|raf|naval|air\s?force|coast\s?guard|army|afs|mod|cgas)\b/i) !== null;
-    let type = airportsRecord[2];
-    if (isMilitary) {
-      type = type.replace(/port/, "base");
-    }
+airportsRecords = parse(airportsSource, { bom: true });
+airportsRecordsProcessed = 0;
 
-    // Filter community airports and add regular airports to secondary lists
-    if (length > 0) {
-      icaoCodes.push(bestCode);
-      icaoCoordinatesObject.push({
-        code: bestCode,
-        name: airportsRecord[3],
-        lat: Number(airportsRecord[4]),
-        lon: Number(airportsRecord[5]),
-      });
-    }
+process.stdout.write("ROUND 2: Other codes\n");
+for (const airportsRecord of airportsRecords) {
+  airportsRecordsProcessed++;
+  const ident = airportsRecord[1];
+  const icaoCode = airportsRecord[12];
+  const searchWords = getAirportSearchWords(ident, icaoCode, airportsRecord);
 
-    const feature = new GeoJSON.Feature(
-      new GeoJSON.Point(Number(airportsRecord[5]), Number(airportsRecord[4]), Number(airportsRecord[6]) * 0.3048),
-      {
-        title: bestCode,
-        type: geoJsonType(type, isMilitary, length),
-        description: airportsRecord[3],
-        elevation: Number(airportsRecord[6]),
-        municipality: airportsRecord[10],
-        fileSize: Math.ceil(length),
-        "marker-symbol": airportsRecord[2].match(/heliport/)
-          ? "heliport"
-          : airportsRecord[2].match(/small/)
-            ? "airfield"
-            : "airport",
-        "marker-color": airportsRecord[2].match(/large/)
-          ? "#5e6eba"
-          : airportsRecord[2].match(/small/)
-            ? "#777777"
-            : "#555555",
-      },
-    );
-    if (isMilitary) {
-      feature.setProperty("isMilitary", true);
-    }
+  const [length, aeroflyCode] = getAeroflyAirport(searchWords);
 
-    aeroflyGeoJson.addFeature(feature);
+  if (length !== undefined && aeroflyCode !== undefined) {
+    const bestCode = icaoCode || aeroflyCode || ident;
+    addRecord(aeroflyCode, bestCode, airportsRecord, length);
   }
 
   if (airportsRecordsProcessed % 5000 === 0) {
@@ -138,6 +172,19 @@ for (const airportsRecord of airportsRecords) {
   }
 }
 
+icaoCoordinatesObject.sort((a, b) => {
+  if (a.code < b.code) {
+    return -1;
+  }
+  if (a.code > b.code) {
+    return 1;
+  }
+  return 0;
+});
+
+// -----------------------------------------------------------------------------
+// OUTPUT
+
 // Write the GeoJSON data to a file
 const outputFilePath = path.join(outputDirectory, "airports.geojson");
 fs.writeFileSync(outputFilePath, JSON.stringify(aeroflyGeoJson, null, 2), "utf-8");
@@ -184,7 +231,8 @@ process.stdout.write(`Unmatched airports file written to \x1b[92m${unmatchedFile
 
 if (aeroflyAirports.size > 0) {
   process.stdout.write(
-    `Missing airport matches for \x1b[92m${aeroflyAirports.size}\x1b[0m Aerofly FS4 Airports, \x1b[92m${(
+    `\
+Missing airport matches for \x1b[92m${aeroflyAirports.size}\x1b[0m Aerofly FS4 Airports, \x1b[92m${(
       (aeroflyAirports.size / aeroflyAirportsLength) *
       100
     ).toFixed(1)}%\x1b[0m

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fboes/aerofly-data",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "This project contains data sets for airports and aircraft present in Aerofly FS 4.",
   "main": "index.js",
   "scripts": {

package/src/aircraft-functions.js

@@ -14,6 +14,9 @@ import * as path from "path";
  *   cruiseAltitudeFt: number,
  *   cruiseSpeedKts: number,
  *   maximumRangeNm: number,
+ *   maximumLoadRangeNm: number,
+ *   maximumFuelRangeNm: number,
+ *   maximumFerryRangeNm: number,
  *   maximumFuelMassKg?: number,
  *   maximumPayloadKg?: number,
  *   maximumTakeoffMassKg?: number,
@@ -88,14 +91,16 @@ export const getAeroflyAircraft = (directory) => {
             requirements: parseRequirements(tmdFileContent),
           };
 
-          const liveryIcaoCode = getLiveryIcaoCode(livery.name);
-          if (liveryIcaoCode !== "") {
-            livery.icaoCode = liveryIcaoCode;
-          }
-
           return livery;
         }),
-    ];
+    ].map((livery) => {
+      const liveryIcaoCode = getLiveryIcaoCode(livery.name);
+      if (liveryIcaoCode !== "") {
+        livery.icaoCode = liveryIcaoCode;
+      }
+
+      return livery;
+    });
 
     return {
       aeroflyCode: dirent.name,
@@ -113,13 +118,15 @@ export const getAeroflyAircraft = (directory) => {
 const getLiveryIcaoCode = (airlineName) => {
   const name = airlineName.toLowerCase();
   switch (name) {
+    case "all nippon airlines":
+      return "ANA";
     case "american airlines":
     case "american":
       return "AAL";
     case "all nippon airways":
       return "ANA";
-    case "american airlines":
-      return "AAL";
+    case "china eastern":
+      return "CES";
     case "lufthansa":
       return "DLH";
     case "united airlines":
@@ -128,6 +135,12 @@ const getLiveryIcaoCode = (airlineName) => {
     case "delta air lines":
     case "delta":
       return "DAL";
+    case "emirates":
+      return "UAE";
+    case "singapore airlines":
+      return "SIA";
+    case "ethiopian":
+      return "ETH";
     case "air france":
       return "AFR";
     case "british airways":
@@ -224,6 +237,9 @@ export const parseAircraft = (tmdFileContent) => {
     ),
     MaximumSpeed: convertSpeed(parseTmdLine(tmdFileContent, "MaximumSpeed")),*/
     maximumRangeNm: convertDistance(parseTmdLine(tmdFileContent, "MaximumRange")),
+    maximumLoadRangeNm: convertDistance(parseTmdLine(tmdFileContent, "MaximumLoadRange")),
+    maximumFuelRangeNm: convertDistance(parseTmdLine(tmdFileContent, "MaximumFuelRange")),
+    maximumFerryRangeNm: convertDistance(parseTmdLine(tmdFileContent, "MaximumFerryRange")),
     /*FlapAirspeedRange: parseTmdLine(tmdFileContent, "FlapAirspeedRange")
       .trim()
       .split(" ")
@@ -293,7 +309,7 @@ export const convertAltitude = (altitude) => {
 /**
  *
  * @param {string} range in m
- * @returns {number} in kts
+ * @returns {number} in NM
  */
 export const convertDistance = (range) => {
   return Math.round(Number(range) / 1852);
@@ -437,3 +453,11 @@ ${html}\
 </select>
 `;
 };
+
+/**
+ * @param {AeroflyAircraft[]} sortedAircraft
+ * @returns {string[]}
+ */
+export const getTags = (sortedAircraft) => {
+  return [...new Set(sortedAircraft.flatMap((aircraft) => aircraft.tags))].sort();
+};

package/src/airport-functions.js

@@ -40,10 +40,9 @@ export const geoJsonType = (type, isMilitary, length) => {
 /**
  *
  * @param {string} directory
- * @param {RegExp?} icaoFilter
  * @returns {Map<string,number>}
  */
-export const getAeroflyAirports = (directory, icaoFilter) => {
+export const getAeroflyAirports = (directory) => {
   const aeroflyAirports = new Map();
   let maxLength = 0;
   let minLength = 10000;
@@ -55,12 +54,10 @@ export const getAeroflyAirports = (directory, icaoFilter) => {
 
   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);
-    }
+    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;