fix: solve tcu and cb clouds issue

ivao-brasil · Feb 10, 2024 · 6e2abdd · 6e2abdd
1 parent acd1c2c
commit 6e2abdd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/helpers/metar-resolver/metar-resolver.ts b/src/helpers/metar-resolver/metar-resolver.ts
@@ -55,18 +55,11 @@ export class MetarResolver {
       rvr: +rvr.substring(3, 7),
       trend: rvr.substring(7) as 'D' | 'U' | 'N',
     })) || undefined;
-    const cloudLayers = clouds.trim().split(' ').map((cloudLayer: string): { type: 'NCD' | 'NSC' | 'VV' | 'FEW' | 'BKN' | 'SCT' | 'OVC', height: number } => {
-      const cloudType = cloudLayer.substring(0, 3);
-      return {
-        type: cloudType as 'NCD' | 'NSC' | 'VV' | 'FEW' | 'BKN' | 'SCT' | 'OVC',
-        height: cloudLayer.substring(3) === '///' ? 0 : +cloudLayer.substring(3),
-      };
-    });
     return {
       horizontalVisibility: visibilityGroup,
       rvr: rvrGroup,
       isCavok: isCavok,
-      cloudLayers: cloudLayers,
+      cloudLayers: this.processCloudsLayers(clouds),
     };
   }
 
@@ -146,4 +139,14 @@ export class MetarResolver {
     if(magWindDirection < 0) magWindDirection += 360;
     return magWindDirection;
   }
+
+  private static processCloudsLayers(clouds: string): { type: 'NCD' | 'NSC' | 'VV' | 'FEW' | 'BKN' | 'SCT' | 'OVC', height: string }[] {
+    return clouds.trim().split(' ').map((cloudLayer: string): { type: 'NCD' | 'NSC' | 'VV' | 'FEW' | 'BKN' | 'SCT' | 'OVC', height: string } => {
+      const cloudType = cloudLayer.substring(0, 3);
+      return {
+        type: cloudType as 'NCD' | 'NSC' | 'VV' | 'FEW' | 'BKN' | 'SCT' | 'OVC',
+        height: cloudLayer.substring(3) === '///' ? '000' : cloudLayer.substring(3, 6).padStart(3, '0').concat(cloudLayer.substring(6)),
+      };
+    });
+  }
 }
diff --git a/src/interfaces/splitted-metar.interface.ts b/src/interfaces/splitted-metar.interface.ts
@@ -48,7 +48,7 @@ export interface Visibility {
   isCavok: boolean,
   cloudLayers: {
     type: 'NCD' | 'NSC' | 'VV' | 'FEW' | 'BKN' | 'SCT' | 'OVC',
-    height: number
+    height: string
   }[]
 }