flight-plan-converter - npm Package Compare versions

Comparing version 0.0.4 to 0.0.5

lib/parse/xplane_fms.js

@@ -13,5 +13,8 @@ 'use strict';
   11: types.FIX,
-  28: types.GPS
+  28: types.GPS,
+  9999: types.ERROR
 };
 
+var fmsVersion = 3;
+
 function waypointFromLine(line) {
@@ -22,10 +25,13 @@ var waypoint = {};
 
-  var type = typeMap[lineCode] || types.GPS;
+  var type = typeMap[lineCode] || types.ERROR;
   waypoint.type = type;
 
+  var addIdx = 0;
+
   switch(type) {
     case types.GPS:
-      waypoint.elevation = parseFloat(parts[1]);
-      waypoint.lat = parseFloat(parts[2]);
-      waypoint.lon = parseFloat(parts[3]);
+      (fmsVersion === '3'? addIdx=0: addIdx=2)
+      waypoint.elevation = parseFloat(parts[1+addIdx]);
+      waypoint.lat = parseFloat(parts[2+addIdx]);
+      waypoint.lon = parseFloat(parts[3+addIdx]);
       break;
@@ -36,6 +42,9 @@ case types.AIRPORT:
     case types.VOR:
-      waypoint.elevation = parseFloat(parts[2]);
-      waypoint.lat = parseFloat(parts[3]);
-      waypoint.lon = parseFloat(parts[4]);
+      (fmsVersion === '3'? addIdx=0: addIdx=1)
+      waypoint.elevation = parseFloat(parts[2+addIdx]);
+      waypoint.lat = parseFloat(parts[3+addIdx]);
+      waypoint.lon = parseFloat(parts[4+addIdx]);
       break;
+    case types.ERROR:
+      return null;
   }
@@ -77,7 +86,12 @@
   // and normalize line breaks to unix style
+
   input = normalizeLineBreaks(removeEmptyLines(input));
+  fmsVersion = input.split('\n')[1].split(' ')[0];
+
+  // If v1100 we need to locate the NUMER code
+  var offset = (fmsVersion === '1100' ? input.split('\n').findIndex(line => line.indexOf('NUMENR') != -1) +1 : 4 );
   input
     .split('\n')
      // skip first 4 lines, as they contain the header
-    .slice(4)
+    .slice(offset)
     .forEach(parseLine)
@@ -91,2 +105,4 @@
 
+    // Check V1100 includes more lines with information before NUMER
+
     try {
@@ -93,0 +109,0 @@ fpl.waypoints.push(waypointFromLine(line));

lib/parse/xplane_fms.test.js

@@ -50,2 +50,8 @@ 'use strict';
   });
+
+  it('should parse XPlane 11 V1100 complex.fms', () => {
+    expect(parser(getFms('version_v1100.fms')))
+      .to
+      .eql(getFlightPlan('version_v1100.json'));
+  });
 });

package.json

 {
   "name": "flight-plan-converter",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Converts Flight Plans from and to various file formats.",
@@ -5,0 +5,0 @@ "bin": "cli.js",

README.md

@@ -10,3 +10,4 @@ # Flight-Plan converter
 
-- [X-Planes](http://www.x-plane.com) `.fms`
+- [X-Planes](http://www.x-plane.com) `.fms` V3
+- [X-Planes](http://www.x-plane.com) `.fms` V1100
 - KML (export only)
@@ -13,0 +14,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

24124

increased by4.08%

Number of package files

37

increased by2.78%

Lines of code

724

increased by6.78%

Number of lines in readme file

92

increased by1.1%

No dependency changes