Revamp uplink service; add exploration overlay

rvanasa · Jul 24, 2020 · 7317897 · 7317897
1 parent 1122bc5
commit 7317897
Show file tree

Hide file tree

Showing 18 changed files with 1,975 additions and 1,445 deletions.
diff --git a/elite-navigator-stream/index.js b/elite-navigator-stream/index.js
@@ -31,33 +31,29 @@ async function run() {
     eddn.on('error', err => console.error(err));
     eddn.on('entry', entry => {
 
-        if(entry.SignalName_Localised === 'Notable stellar phenomena') {
-            console.log(entry);
-        }
+        if(entry.event === 'Scan' && entry.Rings) {
 
-        // if(entry.event === 'Scan' && entry.Rings) {
+        let systemName = entry.StarSystem;
+        if(!isPopulated(systemName)) {
+            return;
+        }
 
-            // let systemName = entry.StarSystem;
-            // if(!isPopulated(systemName)) {
-            //     return;
-            // }
-            //
-            // let bodyName = entry.BodyName.replace(systemName, '').trim();
-            // let rings = entry.Rings.map(ring => ({
-            //     name: ring.Name.replace(entry.BodyName, '').trim(),
-            //     type: ring.RingClass
-            //         .replace('eRingClass_', '')
-            //         .replace('MetalRich', 'Metal Rich')
-            //         .replace('Metal' + 'ic', 'Metallic'),
-            // }));
-            //
-            // console.log(systemName, bodyName, rings);
-            //
-            // (ringMap[entry.StarSystem] || (ringMap[entry.StarSystem] = {}))[bodyName] = {
-            //     distance: Math.round(entry.DistanceFromArrivalLS),
-            //     rings: rings,
-            // };
-        // }
+        let bodyName = entry.BodyName.replace(systemName, '').trim();
+        let rings = entry.Rings.map(ring => ({
+            name: ring.Name.replace(entry.BodyName, '').trim(),
+            type: ring.RingClass
+                .replace('eRingClass_', '')
+                .replace('MetalRich', 'Metal Rich')
+                .replace('Metal' + 'ic', 'Metallic'),
+        }));
+
+        console.log(systemName, bodyName, rings);
+
+        (ringMap[entry.StarSystem] || (ringMap[entry.StarSystem] = {}))[bodyName] = {
+            distance: Math.round(entry.DistanceFromArrivalLS),
+            rings: rings,
+        };
+        }
     });
 }
 

diff --git a/elite-navigator-uplink/icon.png b/elite-navigator-uplink/icon.png
diff --git a/elite-navigator-uplink/index.js b/elite-navigator-uplink/index.js
@@ -1,3 +1,7 @@
-'use strict';
+let {app} = require('electron');
+let {startMainWindow} = require('./src/main');
 
-module.exports = require('./src/app');
+let {socket} = require('./src/socket');
+
+startMainWindow()
+    .catch(err => console.error(err) & process.exit(1));