From f7badceb3d15d388aa7ba7e635d9ee4644dcc962 Mon Sep 17 00:00:00 2001
From: wgaylord <chibill110@gmail.com>
Date: Thu, 10 Jan 2019 17:26:34 -0600
Subject: [PATCH] Update

---
 satnogs.py             |   2 +-
 satnogs_api_client.pyc | Bin 5049 -> 0 bytes
 static/Worker.js       |  28 ++++++++++++++++++++++------
 templates/map.html     |  18 +++++++++++++++++-
 4 files changed, 40 insertions(+), 8 deletions(-)
 delete mode 100644 satnogs_api_client.pyc

diff --git a/satnogs.py b/satnogs.py
index a35d1b0..97c8adc 100644
--- a/satnogs.py
+++ b/satnogs.py
@@ -114,7 +114,7 @@ def updateTransmitters():
             Transmitters[str(x["norad_cat_id"])][x["uuid"]] = [x["description"],"#"+str("%06x" % random.randint(0, 0xFFFFFF))]
     #print Transmitters
         
-@scheduler.scheduled_job('interval',minutes=3)        
+@scheduler.scheduled_job('interval',minutes=2)        
 def updatePasses():
     global Passes
     global Occuring_sats
diff --git a/satnogs_api_client.pyc b/satnogs_api_client.pyc
deleted file mode 100644
index 91a2e0bcb2f30ce869fb71493d419f57f5680b25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5049
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

diff --git a/static/Worker.js b/static/Worker.js
index 72c91e0..72639f5 100644
--- a/static/Worker.js
+++ b/static/Worker.js
@@ -3,11 +3,13 @@ self.importScripts("satellite.js");
 norad = ""
 groundStations = []
 TLE = []
+Orbits = []
 
 onmessage = function(e) {
     norad = e.data[0]
     TLE = e.data[1]
     getStations()
+    getOrbit()
 }
 
 setInterval(function(){ 
@@ -20,17 +22,16 @@ setInterval(function(){
     var positionAndVelocity = self.satellite_js.propagate(satrec, new Date());
     var positionEci = positionAndVelocity.position
     var positionGd    = self.satellite_js.eciToGeodetic(positionEci, gmst)
-    var longitude = positionGd.longitude
-    var latitude  = positionGd.latitude
-    
+    var curLat = degress(positionGd.latitude)
+    var curLng = degress(positionGd.longitude)
     if (groundStations[1] == undefined){
         groundStations.push([])
     }
     
-    postMessage([norad,TLE[0],[degress(latitude),degress(longitude)],groundStations[0],groundStations[1]])
+    postMessage([norad,TLE[0],[curLat,curLng],groundStations[0],groundStations[1],Orbits])
     
     
-}, 500);
+}, 1000);
 
 function getStations(){
 var xhttp = new XMLHttpRequest();
@@ -45,4 +46,19 @@ var xhttp = new XMLHttpRequest();
 
 function degress (radians) {
   return radians * 180 / Math.PI;
-};
\ No newline at end of file
+};
+
+function getOrbit(){
+    var satrec = self.satellite_js.twoline2satrec(TLE[1],TLE[2]); 
+    gmst = self.satellite_js.gstime(new Date());
+    while(Orbits.length < 300){
+    gmst = gmst+0.00833333333
+    if (gmst > 6.28318530718){
+        return
+    }
+    positionAndVelocity = self.satellite_js.propagate(satrec, (new Date() / 1000/60));
+    positionEci = positionAndVelocity.position
+    positionGd    = self.satellite_js.eciToGeodetic(positionEci, gmst)
+    Orbits.push([degress(positionGd.latitude),degress(positionGd.longitude)])
+    }
+}
\ No newline at end of file
diff --git a/templates/map.html b/templates/map.html
index 3b9b0ab..87deac0 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -86,6 +86,8 @@ Stations = {}
 Workers = {}
 Lines = {}
 Sats = {}
+Orbits = {}
+CurrentOrbit = null
 
 dataS = null
 function UpdateMap(e) {
@@ -96,8 +98,11 @@ function UpdateMap(e) {
         Sats[norad]._latlng = {"lat":satPos[0],"lng":satPos[1]}  
         Sats[norad].update()
     }else{
-        Sats[norad] = L.marker(satPos,{icon: dark_sat,zIndexOffset:1000}).addTo(mymap);
+        Sats[norad] = L.marker(satPos,{icon: dark_sat,zIndexOffset:1000,title:norad}).addTo(mymap);
+        Sats[norad].norad = norad
+        Sats[norad].on('click',SatClick)
         Lines[norad] = {}
+        Orbits[String(norad)] = e.data[5]
         
         
         
@@ -188,6 +193,17 @@ $.get("/occuring_sats", function(data, status){
 
 }, 20000);
 
+function SatClick(e){
+    if (CurrentOrbit == null){
+    }else{
+        CurrentOrbit.removeFrom(mymap)
+    }
+
+    CurrentOrbit = L.polyline(Orbits[Number(e.target.norad)], {color: 'red'});
+    CurrentOrbit.addTo(mymap)
+    
+}
+
     
 </script>