feat: integrate Eclipse Solar Analysis Plugin and update related calculations

Author: thkruz

src/app/analysis/sat-math.ts

@@ -21,6 +21,7 @@
  * /////////////////////////////////////////////////////////////////////////////
  */
 
+import { ServiceLocator } from '@app/engine/core/service-locator';
 import { CelestialBody } from '@app/engine/rendering/draw-manager/celestial-bodies/celestial-body';
 import { Earth } from '@app/engine/rendering/draw-manager/earth';
 import {
@@ -59,7 +60,6 @@ import { DISTANCE_TO_SUN, RADIUS_OF_EARTH, RADIUS_OF_SUN } from '../../engine/ut
 import { errorManagerInstance } from '../../engine/utils/errorManager';
 import { jday, lon2yaw } from '../../engine/utils/transforms';
 import { CoordinateTransforms } from './coordinate-transforms';
-import { ServiceLocator } from '@app/engine/core/service-locator';
 
 if (!global) {
   window._numeric = numeric; // numeric will break if it is not available globally
@@ -190,7 +190,7 @@ export abstract class SatMath {
     }
 
 
-    if (obj instanceof BaseObject) {
+    if (obj instanceof BaseObject || !(obj.position instanceof Boolean)) {
       if (!obj?.position) {
         return SunStatus.UNKNOWN;
       }
@@ -215,9 +215,9 @@ export abstract class SatMath {
         typeof obj.velocity.z === 'number'
       )) && typeof obj.position !== 'boolean') {
 
-      x = obj.position.x as Kilometers;
-      y = obj.position.y as Kilometers;
-      z = obj.position.z as Kilometers;
+      x = obj.position.x;
+      y = obj.position.y;
+      z = obj.position.z;
     } else {
       return SunStatus.UNKNOWN;
     }

src/plugins/eclipse-solar-analysis/eclipse-calculations.ts

@@ -22,7 +22,7 @@
 
 import { SatMath, SunStatus } from '@app/app/analysis/sat-math';
 import { ServiceLocator } from '@app/engine/core/service-locator';
-import { Degrees, DetailedSatellite, EciVec3, Kilometers, Milliseconds, RAD2DEG, Sgp4 } from '@ootk/src/main';
+import { Degrees, DetailedSatellite, EciVec3, Kilometers, Milliseconds, RAD2DEG, StateVectorSgp4 } from '@ootk/src/main';
 import { vec3 } from 'gl-matrix';
 import {
   BetaAngleDataPoint,
@@ -69,7 +69,7 @@ export class EclipseCalculations {
       // Get satellite position at this time
       const posvel = SatMath.getEci(satellite, currentTime);
 
-      if (!posvel || !posvel.position) {
+      if (!posvel?.position) {
         continue;
       }
 
@@ -82,7 +82,7 @@ export class EclipseCalculations {
       };
 
       // Check eclipse status
-      const status = SatMath.calculateIsInSun({ position: posvel.position }, sunEciVec);
+      const status = SatMath.calculateIsInSun({ position: posvel.position } as StateVectorSgp4, sunEciVec);
 
       // Detect transitions
       if (previousStatus !== SunStatus.UNKNOWN && status !== previousStatus) {
@@ -137,7 +137,7 @@ export class EclipseCalculations {
             time: currentTime,
             orbitNumber,
           });
-          if (currentPeriod && currentPeriod.isUmbral) {
+          if (currentPeriod?.isUmbral) {
             periods.push({
               startTime: currentPeriod.startTime!,
               endTime: currentTime,
@@ -173,7 +173,7 @@ export class EclipseCalculations {
             time: currentTime,
             orbitNumber,
           });
-          if (currentPeriod && currentPeriod.isUmbral) {
+          if (currentPeriod?.isUmbral) {
             periods.push({
               startTime: currentPeriod.startTime!,
               endTime: currentTime,
@@ -191,10 +191,10 @@ export class EclipseCalculations {
     }
 
     // Close any open period at the end
-    if (currentPeriod && currentPeriod.startTime) {
+    if (currentPeriod?.startTime) {
       periods.push({
         startTime: currentPeriod.startTime,
-        endTime: endTime,
+        endTime,
         duration: (endTime.getTime() - currentPeriod.startTime.getTime()) as Milliseconds,
         orbitNumber: currentPeriod.orbitNumber!,
         isUmbral: currentPeriod.isUmbral!,
@@ -212,7 +212,7 @@ export class EclipseCalculations {
     // Get satellite position and velocity
     const posvel = SatMath.getEci(satellite, time);
 
-    if (!posvel || !posvel.position || !posvel.velocity) {
+    if (!posvel?.position || !posvel.velocity) {
       return 0 as Degrees;
     }
 
@@ -272,7 +272,7 @@ export class EclipseCalculations {
     // Get satellite position
     const posvel = SatMath.getEci(satellite, time);
 
-    if (!posvel || !posvel.position) {
+    if (!posvel?.position) {
       return {
         phaseAngle: 0 as Degrees,
         sunElevation: 0 as Degrees,
@@ -331,8 +331,8 @@ export class EclipseCalculations {
       z: sunEci[2] as Kilometers,
     };
 
-    const isSatelliteIlluminated = SatMath.calculateIsInSun({ position: posvel.position }, sunEciVec) === SunStatus.SUN;
-    const isTargetIlluminated = SatMath.calculateIsInSun({ position: targetPosition }, sunEciVec) === SunStatus.SUN;
+    const isSatelliteIlluminated = SatMath.calculateIsInSun({ position: posvel.position } as StateVectorSgp4, sunEciVec) === SunStatus.SUN;
+    const isTargetIlluminated = SatMath.calculateIsInSun({ position: targetPosition } as StateVectorSgp4, sunEciVec) === SunStatus.SUN;
 
     return {
       phaseAngle,
@@ -418,7 +418,7 @@ export class EclipseCalculations {
   static getCurrentEclipseStatus(satellite: DetailedSatellite, time: Date): SunStatus {
     const posvel = SatMath.getEci(satellite, time);
 
-    if (!posvel || !posvel.position) {
+    if (!posvel?.position) {
       return SunStatus.UNKNOWN;
     }
 
@@ -429,7 +429,7 @@ export class EclipseCalculations {
       z: sunEci[2] as Kilometers,
     };
 
-    return SatMath.calculateIsInSun({ position: posvel.position }, sunEciVec);
+    return SatMath.calculateIsInSun({ position: posvel.position } as StateVectorSgp4, sunEciVec);
   }
 
   /**

src/plugins/eclipse-solar-analysis/eclipse-solar-analysis.ts

@@ -21,24 +21,22 @@
  */
 
 import { SunStatus } from '@app/app/analysis/sat-math';
-import { PluginRegistry } from '@app/engine/core/plugin-registry';
+import { MenuMode } from '@app/engine/core/interfaces';
 import { ServiceLocator } from '@app/engine/core/service-locator';
 import { EventBus } from '@app/engine/events/event-bus';
 import { EventBusEvent } from '@app/engine/events/event-bus-events';
-import { MenuMode } from '@app/engine/core/interfaces';
 import { html } from '@app/engine/utils/development/formatter';
 import { getEl } from '@app/engine/utils/get-el';
 import { BaseObject, DetailedSatellite, Milliseconds } from '@ootk/src/main';
 import dayNightPng from '@public/img/icons/day-night.png';
 import { KeepTrackPlugin } from '../../engine/plugins/base-plugin';
 import { SelectSatManager } from '../select-sat-manager/select-sat-manager';
 import { EclipseCalculations } from './eclipse-calculations';
-import { EclipseEventType, EclipsePeriod, EclipsePredictionConfig } from './eclipse-types';
+import { EclipseEvent, EclipseEventType, EclipsePeriod, EclipsePredictionConfig } from './eclipse-types';
 
 export class EclipseSolarAnalysis extends KeepTrackPlugin {
   readonly id = 'EclipseSolarAnalysis';
   dependencies_: string[] = [SelectSatManager.name];
-  private readonly selectSatManager_: SelectSatManager;
 
   isRequireSatelliteSelected = true;
   isIconDisabled = true;
@@ -151,14 +149,9 @@ export class EclipseSolarAnalysis extends KeepTrackPlugin {
   private currentSatellite_: DetailedSatellite | null = null;
   private currentEclipsePeriods_: EclipsePeriod[] = [];
   private updateInterval_: NodeJS.Timeout | null = null;
-  private stateStartTime_: Date | null = null;
+  private stateStartTime_: number | null = null;
   private currentStatus_: SunStatus = SunStatus.UNKNOWN;
 
-  constructor() {
-    super();
-    this.selectSatManager_ = PluginRegistry.getPlugin(SelectSatManager) as unknown as SelectSatManager;
-  }
-
   bottomIconCallback = () => {
     if (this.isMenuButtonActive) {
       // Menu opened - start updates
@@ -188,7 +181,7 @@ export class EclipseSolarAnalysis extends KeepTrackPlugin {
     });
 
     // Listen for time changes
-    EventBus.getInstance().on(EventBusEvent.timeManagerTick, () => {
+    EventBus.getInstance().on(EventBusEvent.update, () => {
       if (this.isMenuButtonActive && this.currentSatellite_) {
         this.updateRealTimeStatus_();
       }
@@ -251,12 +244,12 @@ export class EclipseSolarAnalysis extends KeepTrackPlugin {
           break;
         case SunStatus.PENUMBRAL:
           statusText = 'Penumbral Shadow';
-          statusColor = '#888';
           break;
         case SunStatus.UMBRAL:
           statusText = 'Umbral Shadow (Full Eclipse)';
           statusColor = '#444';
           break;
+        default:
       }
 
       (<HTMLInputElement>statusEl).value = statusText;
@@ -266,13 +259,13 @@ export class EclipseSolarAnalysis extends KeepTrackPlugin {
 
     // Track state changes to calculate time in current state
     if (status !== this.currentStatus_) {
-      this.stateStartTime_ = currentTime;
+      this.stateStartTime_ = currentTime.getTime();
       this.currentStatus_ = status;
     }
 
     // Update time in current state
     if (this.stateStartTime_) {
-      const timeInState = currentTime.getTime() - this.stateStartTime_.getTime();
+      const timeInState = currentTime.getTime() - this.stateStartTime_;
       const hours = Math.floor(timeInState / 3600000);
       const minutes = Math.floor((timeInState % 3600000) / 60000);
       const seconds = Math.floor((timeInState % 60000) / 1000);
@@ -344,7 +337,7 @@ export class EclipseSolarAnalysis extends KeepTrackPlugin {
 
     // Display results
     this.displayEclipseEvents_(events);
-    this.displayEclipseStatistics_(periods, config.predictionDurationHours * 3600 * 1000);
+    this.displayEclipseStatistics_(periods, config.predictionDurationHours * 3600 * 1000 as Milliseconds);
 
     // Enable export button
     const exportBtn = getEl('export-eclipse-data-btn');
@@ -357,7 +350,7 @@ export class EclipseSolarAnalysis extends KeepTrackPlugin {
   /**
    * Display eclipse events in the UI
    */
-  private displayEclipseEvents_(events: any[]): void {
+  private displayEclipseEvents_(events: EclipseEvent[]): void {
     const container = getEl('eclipse-events-container');
 
     if (!container) {
@@ -392,6 +385,8 @@ export class EclipseSolarAnalysis extends KeepTrackPlugin {
         case EclipseEventType.EXIT_PENUMBRA:
           eventStr = '← Exit Penumbra';
           break;
+        default:
+          eventStr = 'Unknown Event';
       }
 
       html += `<tr><td>${timeStr}</td><td>${eventStr}</td><td>${event.orbitNumber}</td></tr>`;

src/settings/default-plugins.ts

@@ -120,6 +120,10 @@ export const defaultPlugins = <KeepTrackPluginsConfiguration>{
     enabled: true,
     order: 92,
   },
+  EclipseSolarAnalysis: {
+    enabled: true,
+    order: 93,
+  },
   StereoMap: {
     enabled: true,
     order: 150,