refactor: ♻️ move freqBand from RfSensor to DetailedSensor

thkruz · Mar 11, 2024 · 185cc50 · 185cc50
1 parent 035c7e2
commit 185cc50
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/objects/DetailedSensor.ts b/src/objects/DetailedSensor.ts
@@ -26,11 +26,12 @@ export class DetailedSensor extends Sensor {
   uiName?: string;
   country?: string;
   dwellTime?: Milliseconds;
+  freqBand?: string;
   commLinks: CommLink[];
   /** Is this sensor volumetric? */
   isVolumetric?: boolean;
   /** The ideal zoom to see the sensor's full FOV */
-  zoom: ZoomValue | number;
+  zoom?: ZoomValue | number;
   system?: string;
   operator?: string;
   url?: string;
@@ -40,6 +41,7 @@ export class DetailedSensor extends Sensor {
     this.commLinks = info.commLinks ?? [];
     this.country = info.country;
     this.dwellTime = info.changeObjectInterval;
+    this.freqBand = info.freqBand;
     this.isVolumetric = info.volume;
     this.objName = info.objName;
     this.operator = info.operator;

diff --git a/src/objects/RfSensor.ts b/src/objects/RfSensor.ts
@@ -29,7 +29,6 @@ export class RfSensor extends DetailedSensor {
   boresightAz: Degrees[];
   boresightEl: Degrees[];
   faces: number;
-  freqBand?: string;
   beamwidth: Degrees;
 
   constructor(info: RfSensorParams) {
@@ -51,7 +50,6 @@ export class RfSensor extends DetailedSensor {
     }
     this.faces = info.boresightAz.length;
     this.beamwidth = info.beamwidth;
-    this.freqBand = info.freqBand;
   }
 
   /**

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -64,13 +64,14 @@ export interface DetailedSensorParams extends SensorParams {
   shortName?: string;
   changeObjectInterval?: Milliseconds;
   commLinks?: CommLink[];
+  freqBand?: string;
   static?: boolean;
   sensorId?: number;
   url?: string;
   /** Does this sensor use a volumetric search pattern? */
   volume?: boolean;
   /** How far away should we zoom when selecting this sensor? */
-  zoom: ZoomValue;
+  zoom?: ZoomValue;
   /** This is the name of the object in the array */
   objName?: string;
   /** This is the name of the object in the UI */

diff --git a/test/transforms/transforms.test.ts b/test/transforms/transforms.test.ts
@@ -31,12 +31,12 @@ it('should convert valid RAE coordinates to RAE Off Boresight', () => {
     maxEl: 0 as Degrees,
     minRng: 0 as Kilometers,
     maxRng: 0 as Kilometers,
-    boresightAz: 0 as Degrees,
-    boresightEl: 0 as Degrees,
-    coneHalfAngle: 0 as Degrees,
+    boresightAz: [0 as Degrees],
+    boresightEl: [0 as Degrees],
+    beamwidth: 0 as Degrees,
   });
 
-  const raeOffBoresightCoordinates = rae2raeOffBoresight(rae, senor, 10 as Degrees);
+  const raeOffBoresightCoordinates = rae2raeOffBoresight(rae, senor, 0, 10 as Degrees);
 
   expect(raeOffBoresightCoordinates).toMatchSnapshot();
 });