fix: implement course for dfdv2

Navigraph · Feb 1, 2025 · f242a95 · f242a95
1 parent c6ec99b
commit f242a95
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 40 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -39,24 +39,24 @@ jobs:
           generate_release_notes: true
 
   # Enable in future to automate publishing of NPM package
-  # release-js:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-
-  #     - uses: actions/setup-node@v4
-  #       with:
-  #         node-version: "18"
-  #         registry-url: 'https://registry.npmjs.org'
-  #         cache: "npm"
-
-  #     - name: Install node modules
-  #       run: npm ci
-
-  #     - name: Build JS Interface
-  #       run: cd src/js && npm run build
-
-  #     - name: Publish to NPM
-  #       env:
-  #         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-  #       run: cd src/js && npm publish --tag next
+  release-js:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+          registry-url: 'https://registry.npmjs.org'
+          cache: "npm"
+
+      - name: Install node modules
+        run: npm ci
+
+      - name: Build JS Interface
+        run: cd src/js && npm run build
+
+      - name: Publish to NPM
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: cd src/js && npm publish --tag next
diff --git a/src/database/src/output/procedure_leg.rs b/src/database/src/output/procedure_leg.rs
@@ -74,9 +74,9 @@ pub struct ProcedureLeg {
     /// The distance in nautical miles from the `recommended_navaid` to the `fix`
     rho: Option<NauticalMiles>,
 
-    /// The magnetic course to be flown for legs which are defined by a course or heading to a termination, or the
+    /// The course to be flown for legs which are defined by a course or heading to a termination, or the
     /// radial from the `recomended_navaid` to the expected start location on an `AF` leg
-    magnetic_course: Option<Degrees>,
+    course: Option<Degrees>,
 
     /// The length of the leg in nautical miles
     length: Option<NauticalMiles>,
@@ -149,7 +149,7 @@ impl From<sql_structs::Procedures> for ProcedureLeg {
             },
             theta: leg.theta,
             rho: leg.rho,
-            magnetic_course: None,
+            course: leg.course,
             length: if leg.route_distance_holding_distance_time == Some("D".to_string()) {
                 leg.distance_time
             } else {

diff --git a/src/js/types/ProcedureLeg/AFLeg.ts b/src/js/types/ProcedureLeg/AFLeg.ts
@@ -15,5 +15,5 @@ export interface AFLegData extends ProcedureLegBase {
 
   rho: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 }
diff --git a/src/js/types/ProcedureLeg/CALeg.ts b/src/js/types/ProcedureLeg/CALeg.ts
@@ -6,7 +6,7 @@ export interface CALegData extends ProcedureLegBase {
 
   turn_direction?: TurnDirection
 
-  magnetic_course: Degrees
+  course: Degrees
 
   altitude: {
     altitude1: Feet

diff --git a/src/js/types/ProcedureLeg/CFLeg.ts b/src/js/types/ProcedureLeg/CFLeg.ts
@@ -15,7 +15,7 @@ export interface CFLegData extends ProcedureLegBase {
 
   rho: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 
   length: NauticalMiles
 }
diff --git a/src/js/types/ProcedureLeg/FALeg.ts b/src/js/types/ProcedureLeg/FALeg.ts
@@ -15,7 +15,7 @@ export interface FALegData extends ProcedureLegBase {
 
   rho: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 
   altitude: {
     altitude1: Feet

diff --git a/src/js/types/ProcedureLeg/FDLeg.ts b/src/js/types/ProcedureLeg/FDLeg.ts
@@ -15,7 +15,7 @@ export interface FDLegData extends ProcedureLegBase {
 
   rho: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 
   length: NauticalMiles
 }
diff --git a/src/js/types/ProcedureLeg/FMLeg.ts b/src/js/types/ProcedureLeg/FMLeg.ts
@@ -15,5 +15,5 @@ export interface FMLegData extends ProcedureLegBase {
 
   rho: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 }
diff --git a/src/js/types/ProcedureLeg/HALeg.ts b/src/js/types/ProcedureLeg/HALeg.ts
@@ -13,7 +13,7 @@ export interface HALegData extends ProcedureLegBase {
 
   rho?: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 
   length?: NauticalMiles
 

diff --git a/src/js/types/ProcedureLeg/HFLeg.ts b/src/js/types/ProcedureLeg/HFLeg.ts
@@ -13,7 +13,7 @@ export interface HFLegData extends ProcedureLegBase {
 
   rho?: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 
   length?: NauticalMiles
 

diff --git a/src/js/types/ProcedureLeg/HMLeg.ts b/src/js/types/ProcedureLeg/HMLeg.ts
@@ -13,7 +13,7 @@ export interface HMLegData extends ProcedureLegBase {
 
   rho?: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 
   length?: NauticalMiles
 

diff --git a/src/js/types/ProcedureLeg/RFLeg.ts b/src/js/types/ProcedureLeg/RFLeg.ts
@@ -13,7 +13,7 @@ export interface RFLegData extends ProcedureLegBase {
 
   theta?: Degrees
 
-  magnetic_course?: Degrees
+  course?: Degrees
 
   length: NauticalMiles
 

diff --git a/src/js/types/ProcedureLeg/TFLeg.ts b/src/js/types/ProcedureLeg/TFLeg.ts
@@ -15,7 +15,7 @@ export interface TFLegData extends ProcedureLegBase {
 
   rho?: NauticalMiles
 
-  magnetic_course?: Degrees
+  course?: Degrees
 
   length?: NauticalMiles
 

diff --git a/src/js/types/ProcedureLeg/VALeg.ts b/src/js/types/ProcedureLeg/VALeg.ts
@@ -6,7 +6,7 @@ export interface VALegData extends ProcedureLegBase {
 
   turn_direction?: TurnDirection
 
-  magnetic_course: Degrees
+  course: Degrees
 
   altitude: {
     altitude1: Feet

diff --git a/src/js/types/ProcedureLeg/VMLeg.ts b/src/js/types/ProcedureLeg/VMLeg.ts
@@ -6,5 +6,5 @@ export interface VMLegData extends ProcedureLegBase {
 
   turn_direction?: TurnDirection
 
-  magnetic_course: Degrees
+  course: Degrees
 }
diff --git a/src/js/types/ProcedureLeg/XDLeg.ts b/src/js/types/ProcedureLeg/XDLeg.ts
@@ -9,7 +9,7 @@ export interface XDLegData extends ProcedureLegBase {
 
   recommended_navaid: Fix
 
-  magnetic_course: Degrees
+  course: Degrees
 
   length: NauticalMiles
 }
diff --git a/src/js/types/ProcedureLeg/XILeg.ts b/src/js/types/ProcedureLeg/XILeg.ts
@@ -9,5 +9,5 @@ export interface XILegData extends ProcedureLegBase {
 
   recommended_navaid?: Fix
 
-  magnetic_course: Degrees
+  course: Degrees
 }
diff --git a/src/js/types/ProcedureLeg/XRLeg.ts b/src/js/types/ProcedureLeg/XRLeg.ts
@@ -13,5 +13,5 @@ export interface XRLegData extends ProcedureLegBase {
 
   rho: NauticalMiles
 
-  magnetic_course: Degrees
+  course: Degrees
 }