logger, config and selection handling

Author: ajmas

public/config.json

@@ -0,0 +1,108 @@
+{
+  "propergateInterval": 1000,
+  "pushHistory": false,
+  "logLevel": "info",
+  "satWorker": {
+    "runOnce": false
+  },
+  "satelliteGroups": [
+    {
+      "id": "GPSGroup",
+      "name": "GPS",
+      "groupType": "intlDes",
+      "data": [
+        "90103A",
+        "93068A",
+        "96041A",
+        "97035A",
+        "99055A",
+        "00025A",
+        "00040A",
+        "00071A",
+        "01004A",
+        "03005A",
+        "03010A",
+        "03058A",
+        "04009A",
+        "04023A",
+        "04045A",
+        "05038A",
+        "06042A",
+        "06052A",
+        "07047A",
+        "07062A",
+        "08012A",
+        "09043A",
+        "10022A",
+        "11036A",
+        "12053A",
+        "13023A",
+        "14008A",
+        "14026A",
+        "14045A",
+        "14068A",
+        "15013A"
+      ]
+    },
+    {
+      "id": "IridiumGroup",
+      "name": "Iridium Debris",
+      "groupType": "nameRegex",
+      "data": "IRIDIUM(?!.*DEB)"
+    },
+    {
+      "id": "Iridium33DebrisGroup",
+      "name": "Iridium 33 Debris",
+      "groupType": "nameRegex",
+      "data": "(COSMOS 2251|IRIDIUM 33) DEB"
+    },
+    {
+      "id": "GlonassGroup",
+      "name": "Glonass",
+      "groupType": "nameRegex",
+      "data": "GLONASS"
+    },
+    {
+      "id": "GalileoGroup",
+      "name": "Galileo",
+      "groupType": "nameRegex",
+      "data": "GALILEO"
+    },
+    {
+      "id": "FunGroup",
+      "name": "Fun",
+      "groupType": "nameRegex",
+      "data": "SYLDA"
+    },
+    {
+      "id": "WestfordNeedlesGroup",
+      "name": "Westford Needles",
+      "groupType": "nameRegex",
+      "data": "WESTFORD NEEDLES"
+    },
+    {
+      "id": "SpaceXGroup",
+      "name": "Space X",
+      "groupType": "nameRegex",
+      "data": "FALCON [19]"
+    },
+    {
+      "id": "DebrisGroup",
+      "name": "Debris",
+      "groupType": "objectType",
+      "data": "DEBRIS"
+    },
+    {
+      "id": "Starlink",
+      "name": "Starlink",
+      "groupType": "nameRegex",
+      "data": "STARLINK"
+    },
+    {
+      "id": "Unknown",
+      "name": "Unknown Objects",
+      "groupType": "objectType",
+      "data": "UNKNOWN"
+    }
+  ]
+}

src/constants.ts

@@ -4,7 +4,7 @@ const R2D = 80 / Math.PI;
 const Events = {
   satMovementChange: 'satMovementChange',
   selectedSatChange: 'selectedSatChange',
-  satHover: 'sathover',
+  satHover: 'sathoverChange',
   satDataLoaded: 'satdataloaded',
   closeWindow: 'closeWindow',
   cruncherReady: 'cruncherReady'

src/hud/SearchBox.ts

@@ -156,7 +156,6 @@ function doSearch (str: string) {
     }
 
     if (satData[i].intlDes && satData[i].intlDes.indexOf(str) !== -1) {
-      console.log(satData[i]);
       results.push({
         isIntlDes: true,
         strIndex: satData[i].intlDes.indexOf(str),

src/hud/index.ts

@@ -67,17 +67,16 @@ function setHtml (selector: string, html: string) {
   }
 }
 
-function onSelectedSatChange (event: any) {
-  const { satellite } = event;
+function onSelectedSatChange (satellite: Record<string, any>) {
   if (satellite) {
     document.querySelector('#sat-infobox')?.classList.add('visible');
     setHtml('#sat-info-title', satellite.OBJECT_NAME);
     setHtml('#sat-intl-des', satellite.intlDes);
     setHtml('#sat-type', satellite.OBJECT_TYPE);
-    setHtml('#sat-apogee', `${satellite.apogee.toFixed(0)} km`);
-    setHtml('#sat-perigee', `${satellite.perigee.toFixed(0)} km`);
+    setHtml('#sat-apogee', `${satellite.apogee?.toFixed(0)} km`);
+    setHtml('#sat-perigee', `${satellite.perigee?.toFixed(0)} km`);
     setHtml('#sat-inclination', `${(satellite.inclination * R2D).toFixed(2)}°`);
-    setHtml('#sat-period', `${satellite.period.toFixed(2)} min`);
+    setHtml('#sat-period', `${satellite.period?.toFixed(2)} min`);
   } else {
     document.querySelector('#sat-infobox')?.classList.remove('visible');
   }
@@ -218,7 +217,7 @@ function initEventListeners () {
 
   satelliteGroups?.reloadGroups();
 
-  // app.addEventListener(Events.selectedSatChange, onSelectedSatChange);
+  viewer.addEventListener(Events.selectedSatChange, onSelectedSatChange);
 
   // app.addEventListener(Events.satHover, onSatHover);
 

src/index.ts

@@ -1,9 +1,23 @@
+import axios from 'axios';
 import { createViewer } from './viewer/index';
-import config from './config';
+import defaultConfig from './config';
+import { setLogLevel } from './utils/logger';
 
 import hud from './hud';
 
+async function loadConfig () {
+  const response = await axios.get('config.json');
+  let config = defaultConfig;
+  if (response.data) {
+    config = { ...defaultConfig, ...response.data };
+  }
+  return config;
+}
+
 async function main () {
+  const config = await loadConfig();
+  setLogLevel(config.logLevel);
+
   const viewer = createViewer(config);
   await viewer.init();
   viewer.animate();

src/utils/logger.ts

@@ -1,9 +1,18 @@
 /* eslint-disable no-console */
-import constants from '../config';
 
+const defaultLogLevel = 'debug';
 const logLevels = ['error', 'warn', 'info', 'debug'];
-const enabledOutputs: Record<string, any>  = {};
+
 let allOutputs: Record<string, any> = {};
+let globalLogger = new Proxy({
+  logLevel: defaultLogLevel,
+  enabledOutputs: {} as Record<string, any>,
+  error: allOutputs.error,
+  warn: allOutputs.warn,
+  info: allOutputs.info,
+  debug: allOutputs.debug,
+  setLogLevel
+}, {});
 
 function log (scope: any, level: string, output: (level: string, ...args: any) => void, ...args: any) {
   if (scope.enabledOutputs[level]) {
@@ -19,34 +28,34 @@ function setLogLevel (level: string) {
   }
 
   for (let i = 0; i < logLevels.length; i++) {
-    enabledOutputs[logLevels[i]] = i <= levelIdx;
+    globalLogger.enabledOutputs[logLevels[i]] = i <= levelIdx;
   }
 }
 
 function getLogger () {
-  return {
-    error: allOutputs.error,
-    warn: allOutputs.warn,
-    info: allOutputs.info,
-    debug: allOutputs.debug,
-    setLogLevel
-  };
+  return globalLogger;
 }
 
-function init (this: any) {
-  allOutputs = {
-    error: log.bind(this, { enabledOutputs }, 'error', console.error),
-    warn: log.bind(this, { enabledOutputs }, 'warn', console.warn),
-    info: log.bind(this, { enabledOutputs }, 'info', console.info),
-    debug: log.bind(this, { enabledOutputs }, 'debug', console.debug)
-  };
+function init () {
+  const scope = globalLogger;
+
+  const enabledOutputs = scope.enabledOutputs;
 
   for (let i = 0; i < logLevels.length; i++) {
     enabledOutputs[logLevels[i]] = true;
   }
+
+  allOutputs = {
+    error: log.bind(scope, { enabledOutputs }, 'error', console.error),
+    warn: log.bind(scope, { enabledOutputs }, 'warn', console.warn),
+    info: log.bind(scope, { enabledOutputs }, 'info', console.info),
+    debug: log.bind(scope, { enabledOutputs }, 'debug', console.debug)
+  };
+
+  globalLogger = new Proxy({ ...globalLogger, ...allOutputs }, {});
 }
 
 init();
-setLogLevel(constants.logLevel);
 
 export default getLogger();
+export { setLogLevel };

src/viewer/Earth.ts

@@ -118,6 +118,9 @@ class Earth implements SceneComponent {
     }
 
     scene.add(this.group);
+
+    this.sphere.geometry.computeBoundingBox();
+    this.sphere.geometry.computeBoundingSphere();
   }
 
   update (): void {