From 72ff40dbb259fb47c60977d21071ec23c8ad4cb9 Mon Sep 17 00:00:00 2001
From: Jogi Hofmüller <jogi@mur.at>
Date: Tue, 23 Aug 2011 20:00:22 +0000
Subject: - included satellite name into tracker telemetry table

git-svn-id: https://svn.spreadspace.org/mur.sat@149 7de4ea59-55d0-425e-a1af-a3118ea81d4c
---
 tools/mmd/orbtrak.js    | 32 +++++++++++++++++---------------
 tools/mmd/predictlib.js |  5 +++--
 tools/mmd/tracker.wsgi  |  3 +++
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/tools/mmd/orbtrak.js b/tools/mmd/orbtrak.js
index c2582bd..fc848b5 100644
--- a/tools/mmd/orbtrak.js
+++ b/tools/mmd/orbtrak.js
@@ -110,6 +110,7 @@ var Orb =
             satInfo = PLib.QuickFind (PLib.sat.name);
             var pos = new OpenLayers.LonLat (satInfo.longitude, satInfo.latitude).transform (Orb.from, Orb.to);
             Orb.satellitePoint = new OpenLayers.Geometry.Point (pos.lon, pos.lat);
+            Orb.printSatellite (satInfo);
         },
 
 		startTracking: function(map, homeLat, homeLng)
@@ -179,26 +180,27 @@ var Orb =
 				Orb.createOneMarker(i);
 		},
 
-		updateSatellites: function()
-		{
-			var satInfo;
-
-			for (var i = 0; i < PLib.sat.length; i++)
-			{
-				satInfo = PLib.QuickFind(PLib.sat[i].name);
-
-				Orb.satelliteMarkers[i].style.top = ((-satInfo.latitude + 90) * 1.5 - 12.0) + "px";
-				Orb.satelliteMarkers[i].style.left =  ((satInfo.longitude + 180) * 1.5 - 12.0) + "px";
-                Orb.printSatellite (satInfo);
-			}
-
-			setTimeout("Orb.updateSatellites()", 1000);
-		},
+//		updateSatellites: function()
+//		{
+//			var satInfo;
+//
+//			for (var i = 0; i < PLib.sat.length; i++)
+//			{
+//				satInfo = PLib.QuickFind(PLib.sat[i].name);
+//
+//				Orb.satelliteMarkers[i].style.top = ((-satInfo.latitude + 90) * 1.5 - 12.0) + "px";
+//				Orb.satelliteMarkers[i].style.left =  ((satInfo.longitude + 180) * 1.5 - 12.0) + "px";
+//                Orb.printSatellite (satInfo);
+//			}
+//
+//			setTimeout("Orb.updateSatellites()", 1000);
+//		},
 
         // added by Jogi
         // 2011-08-21
         printSatellite: function (satInfo)
         {
+            document.getElementById ("name").innerHTML = satInfo.satname;
             document.getElementById ("longitude").innerHTML = satInfo.longitude;
             document.getElementById ("latitude").innerHTML = satInfo.latitude;
             document.getElementById ("elevation").innerHTML = satInfo.elevation;
diff --git a/tools/mmd/predictlib.js b/tools/mmd/predictlib.js
index 574bd3f..a814fef 100644
--- a/tools/mmd/predictlib.js
+++ b/tools/mmd/predictlib.js
@@ -59,7 +59,7 @@ var PLib =
 			{
 				this.line1 = "";
 				this.line2 = "";
-				this.name = "";
+				this.satname = "";
 				this.catnum = 0;
 				this.setnum = 0;
 				this.designator = "";
@@ -1735,6 +1735,7 @@ var PLib =
 					satInfo.orbitalPhase = PLib.ma256;
 					satInfo.latitude = PLib.isplat;
           satInfo.altitude = Math.round (PLib.sat_alt);
+          satInfo.satname = PLib.sat.name;
 	
 					var lng = 360 - PLib.isplong;
 					if (lng > 180)
@@ -1817,7 +1818,7 @@ var PLib =
 						var satInfo = new Object();
 
 						satInfo.number = z + 1;
-						satInfo.name = PLib.sat.name;
+						satInfo.satname = PLib.sat.name;
 						satInfo.passNo = passNo++;
 						satInfo.dateTimeStart = PLib.Daynum2Date(PLib.daynum);
 						satInfo.peakElevation = PLib.iel;
diff --git a/tools/mmd/tracker.wsgi b/tools/mmd/tracker.wsgi
index cd64971..5f77fdd 100644
--- a/tools/mmd/tracker.wsgi
+++ b/tools/mmd/tracker.wsgi
@@ -40,6 +40,7 @@ def application (environ, response):
   <div id="osm"></div>
   <table class="current">
     <tr>
+      <th class="telemetry">Satellite</th>
       <th class="telemetry">Longitude</th>
       <th class="telemetry">Latitude</th>
       <th class="telemetry">Azimuth</th>
@@ -47,6 +48,8 @@ def application (environ, response):
       <th class="telemetry">Altitude</th>
     </tr>
     <tr>
+      <td class="telemetry"  id="name">
+      </td>
       <td class="telemetry"  id="longitude">
       </td>
       <td class="telemetry"  id="latitude">
-- 
cgit v1.2.3