Improved handling of Garmin fpl files

fboes · Aug 28, 2024 · 2a9c42a · 2a9c42a
1 parent b9b1d95
commit 2a9c42a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/dist/Aerofly/Mission.js b/dist/Aerofly/Mission.js
@@ -793,6 +793,7 @@ export class Mission {
                 <[string8][description][${Quote.tmc(this.description)}]>
                 <[string8]   [flight_setting]     [${Quote.tmc(this.flight_setting)}]>
                 <[string8u]  [aircraft_name]      [${Quote.tmc(this.aircraft_name)}]>
+                //<[string8u][aircraft_livery]    []>
                 <[stringt8c] [aircraft_icao]      [${Quote.tmc(this.aircraft_icao)}]>
                 <[stringt8c] [callsign]           [${Quote.tmc(this.callsign)}]>
                 <[stringt8c] [origin_icao]        [${Quote.tmc(this.origin_icao)}]>

diff --git a/dist/Import/GarminFpl.js b/dist/Import/GarminFpl.js
@@ -12,7 +12,7 @@ export class GarminFpl {
         this.cruisingAlt = undefined;
         // Get waypoint definitions
         const waypointDefinitions = new Map();
-        const waypointTableXml = this.getXmlNode(configFileContent, "waypoint-table");
+        const waypointTableXml = this.getXmlNode(configFileContent, "waypoint-table") || this.getXmlNode(configFileContent, "waypoints");
         this.getXmlNodes(waypointTableXml, "waypoint").forEach((xml) => {
             const elevation = this.getXmlNode(xml, "elevation");
             waypointDefinitions.set(this.getXmlNode(xml, "identifier"), {

diff --git a/src/Aerofly/Mission.ts b/src/Aerofly/Mission.ts
@@ -905,6 +905,7 @@ export class Mission {
                 <[string8][description][${Quote.tmc(this.description)}]>
                 <[string8]   [flight_setting]     [${Quote.tmc(this.flight_setting)}]>
                 <[string8u]  [aircraft_name]      [${Quote.tmc(this.aircraft_name)}]>
+                //<[string8u][aircraft_livery]    []>
                 <[stringt8c] [aircraft_icao]      [${Quote.tmc(this.aircraft_icao)}]>
                 <[stringt8c] [callsign]           [${Quote.tmc(this.callsign)}]>
                 <[stringt8c] [origin_icao]        [${Quote.tmc(this.origin_icao)}]>

diff --git a/src/Import/GarminFpl.ts b/src/Import/GarminFpl.ts
@@ -32,7 +32,7 @@ export class GarminFpl {
 
     // Get waypoint definitions
     const waypointDefinitions: Map<string, GaminFplWaypoint> = new Map();
-    const waypointTableXml = this.getXmlNode(configFileContent, "waypoint-table");
+    const waypointTableXml = this.getXmlNode(configFileContent, "waypoint-table") || this.getXmlNode(configFileContent, "waypoints");
     this.getXmlNodes(waypointTableXml, "waypoint").forEach((xml) => {
       const elevation = this.getXmlNode(xml, "elevation");
       waypointDefinitions.set(this.getXmlNode(xml, "identifier"), {