Merge lp:~jlcanales-gasco/stellarium/satellite-plugin into lp:stellarium

[J.L. Canales]

SGP4/SDP4 core refactored to use the revised Spacetrack report N#3 (including Spacetrack report N#6). There is an inform about all the improvements in the next URL: http://www.celestrak.com/publications/AIAA/2006-6753

Main advantages of this code are:
       - Better performance. The main computation process and the Kepler Equation resolution has been optimized.
       - More precision. Some instabilities in the kepler equation and the integrals problems has been resolved too.
       - Easy to use. I have wrapped the new SGP4/SDP4 code with an object oriented interface that aisle the Satellite class methods from the complexity of the SGP4/SDP4 functions.

Satellite sky-path drawing
  This is a functionality asked by some friends that take CCD Astronomical photographs and needs to predict if a satellite cross the photographed field. This feature can be activated changing a flag (draworb) in the satellites.json file (similar as the visible flag).

This code has been tested in Ubuntu 10.04 LTS

[Bogdan Marinov (daggerstab)]

I skimmed the code and I immediately saw a problem that needs to be fixed before proceeding with a merge.

It seems that you've used an old version of the source as the base for your modifications. As a result, they overwrite the changes I made to fix bug #616627:
https://bugs.launchpad.net/stellarium/+bug/616627

Here are the relevant revisions:
http://bazaar.launchpad.net/~stellarium/stellarium/trunk/revision/4756
http://bazaar.launchpad.net/~stellarium/stellarium/trunk/revision/4757 (this is just an update of the TLEs)
http://bazaar.launchpad.net/~stellarium/stellarium/trunk/revision/4758

The links are for information only, just use the most recent code.

After you merge, you can update the TLEs again, just make sure that no satellites have been dropped off the lists at celestrak.com or renamed (again :(). My patch provides a log message that reports how many satellites have been updated out of the total number.

review: Needs Fixing

[lp:~jlcanales-gasco/stellarium/satellite-plugin]

4766. By J.L. Canales on 2010-10-10

Bogdan Marinov review notes fixed. Code base actualized to Rev. N 4766

4767. By J.L. Canales on 2010-10-17

Fixed. Draw satellite skypath configuration desapear after TLE update

4768. By J.L. Canales on 2010-10-18

Satellite plugin: TLE data actualized

[J.L. Canales (jlcanales-gasco)]

Hi Bodgan,
   I have fixed the problems with the base version. Now the source code is based in the Rev. No. 4766.
   Additionaly, I have updated the satellite TLE data.

Regards,

review: Needs Resubmitting

[Matthew Gates (matthew-porpoisehead)]

I did a local merge of your code. It built and ran fine. Thank you
very much for your work - it looks very interesting.

Some comments:

1. Apart from the effort required, is there is good reason not recode
to use Stellarium's existing matrix classes instead of having another
set of matrix code?

2. The code formatting should be brought into conformity with the rest
of Stellarium's code. This includes indentation, variable names,
header #ifndef flags. The recode.pl script and astyle program make
this pretty quick to do.

3a. I would like to see the orbit lines fading in and out rather than
abruptly ending (progressively drop the alpha for the segments towards
the ends of the orbit lines).

3b. Orbit lines should be taken from the color in the satellites.json
file (I think they are all the same blue color at the moment?)

4. You wouldn't happen to have a method to determine the brightness of
a satellite would you (shadow & apparent magnitude when not is
shadow)? I imagine this would require some sort of size and/or albedo
data to be added to the satellites.json. If you have some code for
predicting Iridium flares that would be really amazing!

Matthew

On 9 October 2010 14:39, J.L. Canales <email address hidden> wrote:
> J.L. Canales has proposed merging lp:~jlcanales-gasco/stellarium/satellite-plugin into lp:stellarium.
>
> Requested reviews:
>  Stellarium (stellarium)
>
>
> SGP4/SDP4 core refactored to use the revised Spacetrack report N#3 (including Spacetrack report N#6). There is an inform about all the improvements in the next URL: http://www.celestrak.com/publications/AIAA/2006-6753
>
> Main advantages of this code are:
>       - Better performance. The main computation process and the Kepler Equation resolution has been optimized.
>       - More precision. Some instabilities in the kepler equation and the integrals problems has been resolved too.
>       - Easy to use. I have wrapped the new SGP4/SDP4 code with an object oriented interface that aisle the Satellite class methods from the complexity of the SGP4/SDP4 functions.
>
> Satellite sky-path drawing
>  This is a functionality asked by some friends that take CCD Astronomical photographs and needs to predict if a satellite cross the photographed field. This feature can be activated changing a flag (draworb) in the satellites.json file (similar as the visible flag).
>
> This code has been tested in Ubuntu 10.04 LTS
> --
> https://code.launchpad.net/~jlcanales-gasco/stellarium/satellite-plugin/+merge/38067
> Your team Stellarium is requested to review the proposed merge of lp:~jlcanales-gasco/stellarium/satellite-plugin into lp:stellarium.

[J.L. Canales (jlcanales-gasco)]

Hi Matthew,
   Thank you for your comments, I will answer your questions.
>
> 1. Apart from the effort required, is there is good reason not recode
> to use Stellarium's existing matrix classes instead of having another
> set of matrix code?

   I use this classes because I am reusing code from other of my projects originally based on
stl library. There aren't any technical reason, so it can be refactored using Stellarium's and QT's classes.

>
> 2. The code formatting should be brought into conformity with the rest
> of Stellarium's code. This includes indentation, variable names,
> header #ifndef flags. The recode.pl script and astyle program make
> this pretty quick to do.

OK, I'll do it.

>
> 3a. I would like to see the orbit lines fading in and out rather than
> abruptly ending (progressively drop the alpha for the segments towards
> the ends of the orbit lines).
Nice visual effect, I'll try to get it..

>
> 3b. Orbit lines should be taken from the color in the satellites.json
> file (I think they are all the same blue color at the moment?)
Ok, I'll do it..

>
> 4. You wouldn't happen to have a method to determine the brightness of
> a satellite would you (shadow & apparent magnitude when not is
> shadow)? I imagine this would require some sort of size and/or albedo
> data to be added to the satellites.json. If you have some code for
> predicting Iridium flares that would be really amazing!

I started to study how to model Iridium flares some time ago. It's not easy to find equations to predict it. Nevertheless, I found a java open source code (iridiumflares.sourceforge.com) that implements that feature. I am studying this code in order to port it to C++ but I have not finished yet.

Regards,

[Matthew Gates (matthew-porpoisehead)]

I look forward to seeing your changes.

[Matthew Gates (matthew-porpoisehead)]

I've made a change to the default satellites.json, and to Satellites.cpp. This should fix the missing group values. You'll need to merge this into your branch.

P.S. I changed the draorb key in the json file to draw_orbit, which I feel is easier to understand. You should change your code accordingly. Thanks.

[Matthew Gates (matthew-porpoisehead)]

Actually... I created my own branch which is trunk with your changes merged and a few extras from me. http://bazaar.launchpad.net/~matthew-porpoisehead/stellarium/satellites

[lp:~jlcanales-gasco/stellarium/satellite-plugin]

4769. By J.L. Canales on 2010-10-24

Sat. Plugin: Satellite skypath line color setup available in sattelites.json

4770. By J.L. Canales on 2010-10-26

Sat. Plugin: Satellite skypath line fading in and out at the end of the orbit lines

[J.L. Canales (jlcanales-gasco)]

> Actually... I created my own branch which is trunk with your changes merged
> and a few extras from me. http://bazaar.launchpad.net/~matthew-
> porpoisehead/stellarium/satellites

Thanks, I'm merging your improvements to be synchronized.

[lp:~jlcanales-gasco/stellarium/satellite-plugin]

4771. By J.L. Canales on 2010-10-27

merge: Matthew Gates Orbit lines fading solution

[J.L. Canales (jlcanales-gasco)]

I believe your solution to implement orbit lines fading in and out is better than mine, so I merged it in my branch.

   We have developed the 3a and 3b points of your previous comment. Now, I'm dealing with points 2 and 1.

[Matthew Gates (matthew-porpoisehead)]

I made it a bit more efficient by making only a single call to drawFromArray for the center segments of the line which are all the same color.

I also reformatted some of the gSatellite code to match the Stellarium coding standards better.

Please pull the changes from my branch and if you're happy with it make another merge proposal thing for lp:stellarium. I can do it myself from my branch, but I would prefer for you to get the commit credit :-)

[J.L. Canales (jlcanales-gasco)]

Many thanks,
  I'll execute my unit tests to validate the changes and I'll propose another merge...

> I made it a bit more efficient by making only a single call to drawFromArray
> for the center segments of the line which are all the same color.
>
> I also reformatted some of the gSatellite code to match the Stellarium coding
> standards better.
>
> Please pull the changes from my branch and if you're happy with it make
> another merge proposal thing for lp:stellarium. I can do it myself from my
> branch, but I would prefer for you to get the commit credit :-)

[lp:~jlcanales-gasco/stellarium/satellite-plugin]

4772. By J.L. Canales on 2010-10-29

gSatellite code style adapted to stellarium rules

4773. By J.L. Canales on 2010-10-30

optimise satellite orbit drawing by making only a single call to drawFromArray for middle segments which are all the same color

4774. By J.L. Canales on 2010-10-30

Actualiced code base from trunk Rev. No 4776

4775. By J.L. Canales on 2010-10-30

FIX: Use Orbit Color seting up in satelites.json. Before this fix, orbit color was always equal to hint color

4776. By J.L. Canales on 2010-11-03

merge Matthew stylesheet and satellite dialog changes

4777. By J.L. Canales on 2010-11-06

Optimized use of setVertexArray in Satellite::drawOrbit method

4778. By J.L. Canales on 2010-11-09

Rendering of the orbits goes funny with non-stereo projection modes

4779. By J.L. Canales on 2010-11-09

[merge] Updated Author list; my e-mail included

4780. By J.L. Canales on 2010-11-10

merge Matthew Gates drawo orbit lines optimization and night style available

4781. By J.L. Canales on 2010-11-16

merge trunk changes rev. 4797

4782. By J.L. Canales on 2010-11-18

merge trunk rev 4806

4783. By J.L. Canales on 2010-11-18

Fix: Orbit line little bit off satellite icon

4784. By J.L. Canales on 2010-11-18

rebase trunk changes rev 4808

4785. By J.L. Canales on 2010-11-23

Rebase code from trunk Rev. 4821

4786. By J.L. Canales on 2010-11-23

Fix: First point of orbit line bad sited when time jumps more than orbitLineSegments*orbitLineSegmentDuration

4787. By J.L. Canales on 2010-11-23

Fix: breaking the smooth fade at the leading edge of the orbit line.

4788. By J.L. Canales on 2010-12-25

Rebase trunk code Rev 4856. Unuseless gSatellite code removed. gSatStelWrapper declared

4789. By J.L. Canales on 2010-12-25

SubPoint calculation gSatTEME inteface change to make easier wrapper implementation

4790. By J.L. Canales on 2010-12-28

gSatStelWrapper methods getTEMEPos, getTEMEVel, getSubPoint methods implemented

4791. By J.L. Canales on 2010-12-28

gSatStelWrapper getAltAz method implemented

4792. By J.L. Canales on 2010-12-28

Satellite class working with gSatStelWrapper. Orbit lines disabled, not refactored yet

4793. By J.L. Canales on 2010-12-29

Orbit lines code refactored. Using gTime classto time management

4794. By J.L. Canales on 2010-12-30

Clean unused files. gObserver class

4795. By J.L. Canales on 2010-12-30

Code standars application

4796. By J.L. Canales on 2011-02-08

gSatStelWrapper name changed to adapt to naming structure of other wrappers in stellarium. (starWraper)

4797. By J.L. Canales on 2011-02-10

Implemented Visibility prediction method in gSatWrapper class

4798. By J.L. Canales on 2011-02-11

Rebase trunk code Rev. 4875

4799. By J.L. Canales on 2011-02-11

Fix: redraw orbit lines after load new TLE data

4800. By J.L. Canales on 2011-02-11

Fix: Bug updating tle data in satelites.json

4801. By J.L. Canales on 2011-02-13

clean useless code

4802. By J.L. Canales on 2011-02-13

Fix: Problem detecting when the site is in dark earth side. Code formated folowing standarts

4803. By J.L. Canales on 2011-02-27

Fix: Satellite AlAz pos calculation bug.

4804. By J.L. Canales on 2011-03-16

merge with trunk rev. 4878

4805. By J.L. Canales on 2011-03-16

Update satellites and TLE in satellite.json

4806. By J.L. Canales on 2011-03-16

Updated GPS frecuencies with Lennert Buytenhek information

4807. By J.L. Canales on 2011-05-28

Set variables name accord to stellarium standarts

4808. By J.L. Canales on 2011-05-28

foreach clauses optimization

4809. By J.L. Canales on 2011-05-28

rebase trunk ver.4886

4810. By J.L. Canales on 2011-05-28

TLE data in satelites.json actualized

Unmerged revisions

=== added file 'doc/builtinScriptFunctions.doxygen'
--- doc/builtinScriptFunctions.doxygen	1970-01-01 00:00:00 +0000
+++ doc/builtinScriptFunctions.doxygen	2010-10-30 00:49:41 +0000
@@ -0,0 +1,37 @@
+/*
+ * Stellarium
+ * Copyright (C) 2010 Matthew Gates
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*!
+
+@page builtinScriptFunctions Built in Script Functions
+
+<B>waitFor(dt, spec="utc")</B>
+
+Waits until a specified simulation date/time.
+
+This function will take into account the rate (and direction) in which simulation 
+time is passing. e.g. if a future date is specified and the time is moving backwards, 
+the function will return immediately. If the time rate is 0, the function will not 
+wait. This is to prevent infinite wait time.
+
+Parameters:
+ - dt : the date string to use
+ - spec : "local" or "utc".
+
+*/

=== modified file 'doc/scripting.doxygen'
--- doc/scripting.doxygen	2010-05-19 06:40:34 +0000
+++ doc/scripting.doxygen	2010-10-30 00:49:41 +0000
@@ -1,6 +1,6 @@
 /*
  * Stellarium
- * Copyright (C) 2009 Matthew Gates
+ * Copyright (C) 2010 Matthew Gates
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -75,6 +75,13 @@
   - StelSkyDrawer
   - StelSkyLayerMgr
 
+@section built_in_script_functions Built in Script Functions
+
+In addition to the public slots of the classes described above, some functionality
+is provided by functions implemented within the scripting language.  These are
+made available from the core object, and are similar in operation to the
+public slots of StelMainScriptAPI.  See @ref builtinScriptFunctions for details.
+
 @section script_console Script Console
 
 Note:  The Script Console has been enabled by default since version 0.10.5.  

=== modified file 'plugins/Satellites/satellites.json'
--- plugins/Satellites/satellites.json	2010-10-27 15:28:33 +0000
+++ plugins/Satellites/satellites.json	2010-10-30 00:49:41 +0000
@@ -1,187 +1,39 @@
 {
 	"creator": "Satellites plugin (update)",
 	"hintColor": [0, 0.5, 0.5],
+	"orbitColor": [0, 0.5, 0.5],
 	"satellites": 
 	{
 		"AAU CUBESAT": 
 		{
 			"comms": [],
-			"tle1": "1 27846U 03031G   10010.54313843  .00000017  00000-0  28199-4 0  6580",
-			"tle2": "2 27846  98.7035  22.6880 0008761 245.5711 114.4553 14.21010978338790",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"PHASE 3B (AO-10)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 14129U 83058B   09080.32998673 -.00000327  00000-0  10000-3 0  6360",
-			"tle2": "2 14129  25.9652 165.8235 5982871 207.6161 100.7646  2.05871463165845",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"PACSAT (AO-16)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 20439U 90005D   09080.85236265  .00000014  00000-0  20602-4 0  5632",
-			"tle2": "2 20439  98.2700  53.2702 0011918  71.1776 289.0705 14.31818920   653",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27846U 03031G   10300.91786855  .00000087  00000-0  60137-4 0  8600",
+			"tle2": "2 27846  98.7017 308.8055 0009783 122.9220 237.2907 14.21060728380030",
 			"visible": false
 		},
 		"ARSENE (AO-24)": 
 		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 22654U 93031B   09078.43825483 -.00000132  00000-0  10000-3 0  2462",
-			"tle2": "2 22654   5.1398 339.1447 2877460 155.4874 221.3758  1.42205192 77846",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"EYESAT-1 (AO-27)": 
-		{
-			"comms": [
-			{
-				"description": "uplink",
-				"frequency": 145.85
-			}, 
-			{
-				"description": "downlink",
-				"frequency": 145.2
-			}],
-			"description": "Amateur satellite",
-			"groups": ["amateur"],
-			"tle1": "1 22825U 93061C   09080.84794649  .00000017  00000-0  23242-4 0  2051",
-			"tle2": "2 22825  98.4253  37.0634 0008629 156.2036 203.9551 14.29261103807439",
-			"draw_orbit": false,
-			"visible": true
-		},
-		"PHASE 3D (AO-40)": 
-		{
-			"comms": [
-			{
-				"description": "Beacon",
-				"frequency": 145.898
-			}],
-			"description": "AMSAT-OSCAR 40 (Phase 3D)",
-			"groups": ["amateur"],
-			"tle1": "1 26609U 00072B   09080.26545799 -.00000301  00000-0  10000-3 0  2044",
-			"tle2": "2 26609   8.9892  27.3596 7956558 186.7198 145.1448  1.25584591 38523",
-			"draw_orbit": false,
-			"visible": true
-		},
-		"OSCAR 5 (AO-5)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 04321U 70008B   09080.96250683 -.00000031  00000-0  10000-3 0  1420",
-			"tle2": "2 04321 102.1329  90.4257 0027646 145.0891 215.1997 12.52156131789847",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"ECHO (AO-51)": 
-		{
-			"comms": [
-			{
-				"description": "uplink",
-				"frequency": 145.92,
-				"modulation": "FM/Voice"
-			}, 
-			{
-				"description": "downlink",
-				"frequency": 435.15,
-				"modulation": "FM/Voice"
-			}],
-			"description": "Amateur satellite",
-			"groups": ["amateur"],
-			"tle1": "1 28375U 04025K   09080.66057599  .00000001  00000-0  12813-4 0  3455",
-			"tle2": "2 28375  98.0561  95.3557 0085140  31.1071 329.5121 14.40636066248352",
-			"draw_orbit": false,
-			"visible": true
-		},
-		"OSCAR 6 (AO-6)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 06236U 72082B   09080.97286453 -.00000027  00000-0  10000-3 0  1476",
-			"tle2": "2 06236 101.4018  97.8648 0004124  61.3429 298.8059 12.53076701666485",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"OSCAR 7 (AO-7)": 
-		{
-			"comms": [
-			{
-				"description": "200mW Beacon used with Modes B & C",
-				"frequency": 145.972
-			}, 
-			{
-				"description": "downlink",
-				"frequency": 145.95,
-				"modulation": "Modes B & C"
-			}, 
-			{
-				"description": "uplink",
-				"frequency": 145.9,
-				"modulation": "Mode A"
-			}, 
-			{
-				"description": "downlink",
-				"frequency": 29.45,
-				"modulation": "Mode A"
-			}, 
-			{
-				"description": "200mW Beacon used with Mode A",
-				"frequency": 29.502
-			}, 
-			{
-				"frequency": 2304.1,
-				"modulation": "40 mW Beacon - only when commanded"
-			}, 
-			{
-				"description": "uplink",
-				"frequency": 432.15,
-				"modulation": "Modes B & C"
-			}],
-			"description": "AMSAT-OSCAR 7 (Phase-IIB)",
-			"groups": ["amateur"],
-			"tle1": "1 07530U 74089B   09081.09982174 -.00000027  00000-0  10000-3 0  4327",
-			"tle2": "2 07530 101.4356 108.9488 0012080  79.3798 280.8632 12.53575454571800",
-			"draw_orbit": false,
-			"visible": true
-		},
-		"OSCAR 8 (AO-8)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 10703U 78026B   09081.15228109  .00000030  00000-0  50534-4 0  4427",
-			"tle2": "2 10703  98.8443 129.5050 0007638  50.2967 309.8869 13.98840358583855",
-			"draw_orbit": false,
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22654U 93031B   10296.29188703 -.00000103  00000-0  10000-3 0  4131",
+			"tle2": "2 22654   4.6448 327.4414 2846429 190.3502 161.8369  1.42205681 86138",
 			"visible": false
 		},
 		"CANX-1": 
 		{
 			"comms": [],
-			"tle1": "1 27847U 03031H   10010.55450479  .00000005  00000-0  22661-4 0  6786",
-			"tle2": "2 27847  98.7031  22.6860 0008813 243.1062 116.9211 14.20990414338740",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27847U 03031H   10301.49689319  .00000073  00000-0  53616-4 0  8814",
+			"tle2": "2 27847  98.7006 309.3586 0009858 121.5158 238.6993 14.21038584380060",
 			"visible": false
 		},
-		"CUTE-1 (CO-55)": 
-		{
-			"comms": [
-			{
-				"description": "downlink",
-				"frequency": 437.4,
-				"modulation": "AFSK 1200 bps"
-			}],
-			"description": "Amateur satellite",
-			"groups": ["amateur"],
-			"tle1": "1 27844U 03031E   09080.51717845  .00000023  00000-0  31209-4 0  5380",
-			"tle2": "2 27844  98.7159  90.9149 0010677  40.0025 320.1937 14.20627455296817",
-			"draw_orbit": false,
-			"visible": true
-		},
 		"CUBESAT XI-IV (CO-57)": 
 		{
 			"comms": [
@@ -190,11 +42,11 @@
 				"frequency": 437.49,
 				"modulation": "AFSK 1200 bps"
 			}],
-			"description": "Amateur satellite",
 			"groups": ["amateur"],
-			"tle1": "1 27848U 03031J   09080.55297394  .00000015  00000-0  27156-4 0  4858",
-			"tle2": "2 27848  98.7176  90.0128 0010577  41.9374 318.2624 14.20430987296783",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27848U 03031J   10300.75686843  .00000118  00000-0  75342-4 0  9138",
+			"tle2": "2 27848  98.7155 306.9596 0009645 148.6384 211.5372 14.20530353379862",
 			"visible": true
 		},
 		"CUBESAT XI-V (CO-58)": 
@@ -205,21 +57,27 @@
 				"frequency": 437.345,
 				"modulation": "AFSK 1200 bps"
 			}],
-			"description": "Amateur satellite",
 			"groups": ["amateur"],
-			"tle1": "1 28895U 05043F   09080.73753781  .00000170  00000-0  45254-4 0  2627",
-			"tle2": "2 28895  98.0694 333.7523 0016860 260.8704  99.0653 14.59751404180971",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28895U 05043F   10301.90384514  .00000118  00000-0  33891-4 0  7168",
+			"tle2": "2 28895  97.9923 181.8026 0017166 223.3057 136.6785 14.59954295266498",
 			"visible": true
 		},
-		"DOVE (DO-17)": 
+		"CUTE-1 (CO-55)": 
 		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 20440U 90005E   09080.52227667  .00000009  00000-0  18438-4 0  2752",
-			"tle2": "2 20440  98.2451  57.8863 0011973  67.7463 292.4996 14.32122011   741",
-			"draw_orbit": false,
-			"visible": false
+			"comms": [
+			{
+				"description": "downlink",
+				"frequency": 437.4,
+				"modulation": "AFSK 1200 bps"
+			}],
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27844U 03031E   10301.55293538  .00000112  00000-0  72257-4 0  9662",
+			"tle2": "2 27844  98.7101 308.6233 0009948 142.0283 218.1605 14.20740927380020",
+			"visible": true
 		},
 		"DELFI-C3 (DO-64)": 
 		{
@@ -229,1152 +87,1315 @@
 				"frequency": 145.87,
 				"modulation": "BPSK 1200 bps"
 			}],
-			"description": "Amateur satellite",
 			"groups": ["amateur"],
-			"tle1": "1 32789U 08021G   09080.84012653  .00000106  00000-0  20301-4 0  3267",
-			"tle2": "2 32789  97.9568 145.5256 0014665 318.8670  41.1422 14.81641404 48513",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 32789U 08021G   10301.97603882  .00001122  00000-0  14653-3 0  8232",
+			"tle2": "2 32789  97.8873   5.5871 0015021 205.9532 154.0924 14.82393546135328",
 			"visible": true
 		},
+		"DOVE (DO-17)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20440U 90005E   10301.41284784  .00000048  00000-0  33180-4 0  7479",
+			"tle2": "2 20440  98.3259 257.6780 0011703 121.3158 238.9186 14.32187224 84605",
+			"visible": false
+		},
 		"DTUSAT": 
 		{
 			"comms": [],
-			"tle1": "1 27842U 03031C   10010.89561892  .00000007  00000-0  23258-4 0  7359",
-			"tle2": "2 27842  98.7047  23.0441 0008526 245.7454 114.2832 14.21010898338847",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27842U 03031C   10302.04462644  .00000081  00000-0  57327-4 0  9601",
+			"tle2": "2 27842  98.7019 309.9250 0009996 120.0473 240.1690 14.21063113380192",
 			"visible": false
 		},
+		"ECHO (AO-51)": 
+		{
+			"comms": [
+			{
+				"description": "uplink",
+				"frequency": 145.92,
+				"modulation": "FM/Voice"
+			}, 
+			{
+				"description": "downlink",
+				"frequency": 435.15,
+				"modulation": "FM/Voice"
+			}],
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28375U 04025K   10301.07913539  .00000051  00000-0  27765-4 0  8107",
+			"tle2": "2 28375  98.0736 287.0941 0085114  54.0307 306.8742 14.40705651332640",
+			"visible": true
+		},
 		"ENVISAT": 
 		{
 			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0.400000005960464, 0.800000011920929, 1],
-			"tle1": "1 27386U 02009A   10011.73639675  .00000071  00000-0  42510-4 0  6762",
-			"tle2": "2 27386  98.5484  81.1001 0001030  91.3585  61.9740 14.32248909411344",
-			"draw_orbit": true,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": true,
+			"tle1": "1 27386U 02009A   10302.30705345  .00000433  00000-0  15968-3 0  5695",
+			"tle2": "2 27386  98.5363   7.4906 0001057 108.6868 251.4502 14.37440949452946",
 			"visible": true
 		},
-		"JAS-1 (FO-12)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 16909U 86061B   09080.94650626 -.00000083  00000-0  10000-3 0  5465",
-			"tle2": "2 16909  50.0155  70.0871 0010887 345.8622  14.1906 12.44452849 28116",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"JAS-1B (FO-20)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 20480U 90013C   09080.79147234 -.00000010  00000-0  50788-4 0   941",
-			"tle2": "2 20480  99.0681  17.7100 0540652   8.2393 352.7149 12.83361326895695",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"JAS-2 (FO-29)": 
+		"EYESAT-1 (AO-27)": 
 		{
 			"comms": [
 			{
 				"description": "uplink",
-				"frequency": 145.95,
-				"modulation": "SSB/CW"
+				"frequency": 145.85
 			}, 
 			{
 				"description": "downlink",
-				"frequency": 435.85,
-				"modulation": "SSB/CW"
+				"frequency": 145.2
 			}],
-			"description": "Amateur satellite",
 			"groups": ["amateur"],
-			"tle1": "1 24278U 96046B   09080.73870134 -.00000063  00000-0 -26229-4 0    41",
-			"tle2": "2 24278  98.5666 326.4736 0350089 216.8408 140.8210 13.52942306621921",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22825U 93061C   10301.86090994  .00000033  00000-0  29665-4 0  6612",
+			"tle2": "2 22825  98.5013 246.4466 0007545 234.1411 125.9055 14.29313405891148",
 			"visible": true
 		},
 		"GENESIS 1": 
 		{
 			"comms": [],
-			"tle1": "1 29252U 06029A   10011.52793667  .00000091  00000-0  19479-4 0  9551",
-			"tle2": "2 29252  64.5138  48.6502 0005838 166.2231 193.9045 15.03489848192237",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 29252U 06029A   10301.24236459  .00000810  00000-0  71150-4 0  1806",
+			"tle2": "2 29252  64.5138 201.6869 0033064 326.9862  32.9190 15.03780124235794",
 			"visible": true
 		},
 		"GENESIS 2": 
 		{
 			"comms": [],
-			"tle1": "1 31789U 07028A   10011.52925320  .00000135  00000-0  23184-4 0  7041",
-			"tle2": "2 31789  64.5059  80.0205 0048307 232.0058 127.6690 15.03160429139449",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 31789U 07028A   10301.30602734  .00000668  00000-0  61695-4 0  9244",
+			"tle2": "2 31789  64.5057 233.2725 0015456 185.0663 175.0302 15.03452344183002",
 			"visible": true
 		},
-		"TECHSAT 1B (GO-32)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 25397U 98043D   09080.75202847 -.00000043  00000-0 -91654-6 0  8508",
-			"tle2": "2 25397  98.3353 107.7463 0001898 121.8466 238.2885 14.23155927555696",
-			"draw_orbit": false,
-			"visible": false
-		},
 		"GPS BIIA-10 (PRN 32)": 
 		{
 			"comms": [],
-			"tle1": "1 20959U 90103A   10010.99755647 -.00000036  00000-0  10000-3 0  5262",
-			"tle2": "2 20959  55.0535 274.6290 0132765 299.3343  59.4131  2.00568641140074",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20959U 90103A   10301.17033650  .00000001  00000-0  10000-3 0  8981",
+			"tle2": "2 20959  54.8508 262.9106 0128049 307.5619  51.2764  2.00571453145897",
 			"visible": false
 		},
 		"GPS BIIA-11 (PRN 24)": 
 		{
 			"comms": [],
-			"tle1": "1 21552U 91047A   10009.70414824  .00000092  00000-0  10000-3 0  5313",
-			"tle2": "2 21552  54.4144 212.6800 0062160 326.3598  33.2642  2.00563397135632",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 21552U 91047A   10301.06970066  .00000018  00000-0  10000-3 0  8874",
+			"tle2": "2 21552  54.3571 200.9750 0057951 338.3118  21.5157  2.00436716141476",
 			"visible": false
 		},
 		"GPS BIIA-14 (PRN 26)": 
 		{
 			"comms": [],
-			"tle1": "1 22014U 92039A   10010.93278189 -.00000105  00000-0  10000-3 0  4649",
-			"tle2": "2 22014  56.8181 333.2692 0195319  59.8919 302.0021  2.00570105121807",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22014U 92039A   10299.97348574 -.00000038  00000-0  10000-3 0  7848",
+			"tle2": "2 22014  56.6867 322.0414 0196227  63.7900 298.2637  2.00568038127602",
 			"visible": false
 		},
 		"GPS BIIA-15 (PRN 27)": 
 		{
 			"comms": [],
-			"tle1": "1 22108U 92058A   10010.90400221 -.00000067  00000-0  10000-3 0  3539",
-			"tle2": "2 22108  55.9801  26.5719 0219290 274.8295  82.7079  2.00561618126981",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22108U 92058A   10301.07012426 -.00000061  00000-0  10000-3 0  6825",
+			"tle2": "2 22108  56.1265  15.1080 0219146 282.0449  75.5558  2.00576285132801",
 			"visible": false
 		},
 		"GPS BIIA-21 (PRN 09)": 
 		{
 			"comms": [],
-			"tle1": "1 22700U 93042A   10010.42349068 -.00000067  00000-0  10000-3 0  7005",
-			"tle2": "2 22700  56.0930  27.9954 0203907  87.3193 275.0601  2.00570795121138",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22700U 93042A   10300.60063047 -.00000060  00000-0  10000-3 0   227",
+			"tle2": "2 22700  56.2590  16.5804 0168032  88.8279 273.1456  2.00561025126958",
 			"visible": false
 		},
 		"GPS BIIA-23 (PRN 04)": 
 		{
 			"comms": [],
-			"tle1": "1 22877U 93068A   10010.06604071  .00000093  00000-0  10000-3 0   197",
-			"tle2": "2 22877  53.8346 209.9413 0090336  32.3870 328.2140  2.00570796118779",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22877U 93068A   10300.74029013  .00000022  00000-0  10000-3 0  3691",
+			"tle2": "2 22877  53.7782 198.0703 0092885  37.1146 323.5923  2.00552150124602",
 			"visible": false
 		},
 		"GPS BIIA-24 (PRN 06)": 
 		{
 			"comms": [],
-			"tle1": "1 23027U 94016A   10010.76960448  .00000006  00000-0  10000-3 0   283",
-			"tle2": "2 23027  53.5254 146.9361 0060541 291.8296  67.4883  2.00564113116098",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 23027U 94016A   10301.43787208  .00000072  00000-0  10000-3 0  3399",
+			"tle2": "2 23027  53.5644 134.9878 0063098 304.7648  54.7027  2.00565234121928",
 			"visible": false
 		},
 		"GPS BIIA-25 (PRN 03)": 
 		{
 			"comms": [],
-			"tle1": "1 23833U 96019A   10011.28117265 -.00000009  00000-0  10000-3 0  2176",
-			"tle2": "2 23833  53.1057 142.9368 0125981  55.7020 305.4397  2.00562273101088",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 23833U 96019A   10300.45786614  .00000069  00000-0  10000-3 0  5332",
+			"tle2": "2 23833  53.1598 130.9064 0142163  56.9894 304.4139  2.00570127106884",
 			"visible": false
 		},
 		"GPS BIIA-26 (PRN 10)": 
 		{
 			"comms": [],
-			"tle1": "1 23953U 96041A   10011.18603747 -.00000025  00000-0  10000-3 0  6866",
-			"tle2": "2 23953  54.7294 271.0433 0088058  35.3384 325.3007  2.00592554 98874",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 23953U 96041A   10300.83095470  .00000001  00000-0  10000-3 0   280",
+			"tle2": "2 23953  54.5206 259.2542 0093347  37.3286 323.3054  2.00580557104681",
 			"visible": false
 		},
 		"GPS BIIA-27 (PRN 30)": 
 		{
 			"comms": [],
-			"tle1": "1 24320U 96056A   10010.55267325 -.00000068  00000-0  10000-3 0  4257",
-			"tle2": "2 24320  54.6846  87.2451 0117066  83.4925 277.8682  2.00567811 97528",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24320U 96056A   10300.76073036  .00000024  00000-0  00000+0 0  7570",
+			"tle2": "2 24320  54.8841  75.4974 0129153  89.1011 272.3637  2.00368467103347",
 			"visible": false
 		},
 		"GPS BIIA-28 (PRN 08)": 
 		{
 			"comms": [],
-			"tle1": "1 25030U 97067A   10010.28331492 -.00000064  00000-0  10000-3 0  1002",
-			"tle2": "2 25030  56.8069  33.5854 0109830 177.7126 182.3861  2.00557057 89283",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25030U 97067A   10300.46082717 -.00000055  00000-0  10000-3 0  4280",
+			"tle2": "2 25030  56.9800  22.3810 0114857 181.8340 178.1709  2.00565936 95101",
 			"visible": false
 		},
 		"GPS BIIR-02 (PRN 13)": 
 		{
 			"comms": [],
-			"tle1": "1 24876U 97035A   10011.15261365 -.00000105  00000-0  10000-3 0  1907",
-			"tle2": "2 24876  56.9425 333.4309 0037352  94.7690 265.6519  2.00571727 91409",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24876U 97035A   10300.82746512 -.00000037  00000-0  10000-3 0  5014",
+			"tle2": "2 24876  56.8190 322.2355 0040820 104.7722 255.7262  2.00561646 97215",
 			"visible": false
 		},
 		"GPS BIIR-03 (PRN 11)": 
 		{
 			"comms": [],
-			"tle1": "1 25933U 99055A   10010.92537465  .00000081  00000-0  10000-3 0  6410",
-			"tle2": "2 25933  50.9220 196.7469 0102582  44.1197 316.7153  2.00557696 75219",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25933U 99055A   10301.10513055  .00000027  00000-0  10000-3 0  9482",
+			"tle2": "2 25933  50.8872 184.0730 0111220  49.1827 311.8654  2.00586073 81036",
 			"visible": false
 		},
 		"GPS BIIR-04 (PRN 20)": 
 		{
 			"comms": [],
-			"tle1": "1 26360U 00025A   10011.52706440 -.00000016  00000-0  10000-3 0  7344",
-			"tle2": "2 26360  53.7974 268.0575 0039769  72.6509 287.8497  2.00559568 70923",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26360U 00025A   10300.69570086  .00000000  00000-0  10000-3 0   398",
+			"tle2": "2 26360  53.6003 256.0337 0040795  71.7443 288.6921  2.00547813 76721",
 			"visible": false
 		},
 		"GPS BIIR-05 (PRN 28)": 
 		{
 			"comms": [],
-			"tle1": "1 26407U 00040A   10010.36440597 -.00000066  00000-0  10000-3 0  6829",
-			"tle2": "2 26407  55.5104  91.6427 0157978 246.2508 112.1090  2.00565206 69571",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26407U 00040A   10301.53469852  .00000000  00000-0  10000-3 0  9882",
+			"tle2": "2 26407  55.6937  80.1082 0165329 248.9835 109.2466  2.00562548 75417",
 			"visible": false
 		},
 		"GPS BIIR-06 (PRN 14)": 
 		{
 			"comms": [],
-			"tle1": "1 26605U 00071A   10010.96064742 -.00000106  00000-0  10000-3 0  6884",
-			"tle2": "2 26605  56.5635 332.2378 0052732 241.2746 118.1865  2.00562276 67186",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26605U 00071A   10301.13987066 -.00000036  00000-0  10000-3 0  9985",
+			"tle2": "2 26605  56.4295 320.9194 0059068 240.4602 118.9895  2.00574824 73009",
 			"visible": false
 		},
 		"GPS BIIR-07 (PRN 18)": 
 		{
 			"comms": [],
-			"tle1": "1 26690U 01004A   10011.32818609 -.00000026  00000-0  10000-3 0  5740",
-			"tle2": "2 26690  53.8131 271.1512 0110582 226.2030 132.9381  2.00565198 65607",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26690U 01004A   10301.00551877 -.00000001  00000-0  10000-3 0  8777",
+			"tle2": "2 26690  53.6003 259.1082 0120363 229.8105 129.1216  2.00556043 71411",
 			"visible": false
 		},
 		"GPS BIIR-08 (PRN 16)": 
 		{
 			"comms": [],
-			"tle1": "1 27663U 03005A   10010.18241212 -.00000066  00000-0  10000-3 0  9453",
-			"tle2": "2 27663  55.6126  91.1957 0054149 342.9474  16.8941  2.00562319 50933",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27663U 03005A   10301.36090832  .00000036  00000-0  10000-3 0  2860",
+			"tle2": "2 27663  55.7967  79.6869 0058044 349.2639  10.6053  2.00563683 56770",
 			"visible": false
 		},
 		"GPS BIIR-09 (PRN 21)": 
 		{
 			"comms": [],
-			"tle1": "1 27704U 03010A   10010.75198163  .00000090  00000-0  10000-3 0  8437",
-			"tle2": "2 27704  53.4558 210.5815 0154862 213.4823 145.5286  2.00557110 49738",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27704U 03010A   10299.92552095  .00000026  00000-0  10000-3 0  1671",
+			"tle2": "2 27704  53.4076 198.6608 0172053 221.0136 137.7605  2.00568532 55536",
 			"visible": false
 		},
 		"GPS BIIR-10 (PRN 22)": 
 		{
 			"comms": [],
-			"tle1": "1 28129U 03058A   10010.87364204 -.00000030  00000-0  10000-3 0  4548",
-			"tle2": "2 28129  53.6784 271.4646 0053797 253.0522 106.4165  2.00564472 44446",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28129U 03058A   10301.04872722 -.00000002  00000-0  10000-3 0  7642",
+			"tle2": "2 28129  53.4689 259.3656 0057247 250.7828 108.5881  2.00557705 50267",
 			"visible": false
 		},
 		"GPS BIIR-11 (PRN 19)": 
 		{
 			"comms": [],
-			"tle1": "1 28190U 04009A   10011.32018064  .00000015  00000-0  10000-3 0  4007",
-			"tle2": "2 28190  54.8708 154.0770 0060512 347.4292  12.3771  2.00562181 42623",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28190U 04009A   10301.50046097  .00000072  00000-0  10000-3 0  7406",
+			"tle2": "2 28190  54.9000 142.5675 0066538 355.8704   4.1637  2.00574577 48448",
 			"visible": false
 		},
 		"GPS BIIR-12 (PRN 23)": 
 		{
 			"comms": [],
-			"tle1": "1 28361U 04023A   10011.11001436 -.00000108  00000-0  10000-3 0  2210",
-			"tle2": "2 28361  55.5233 330.1407 0063091 175.1654 184.8914  2.00555994 40706",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28361U 04023A   10301.28559030 -.00000036  00000-0  10000-3 0  5604",
+			"tle2": "2 28361  55.3810 318.5203 0072448 180.5016 179.5309  2.00568475 46520",
 			"visible": false
 		},
 		"GPS BIIR-13 (PRN 02)": 
 		{
 			"comms": [],
-			"tle1": "1 28474U 04045A   10010.60958177  .00000092  00000-0  10000-3 0  1103",
-			"tle2": "2 28474  53.8831 208.8835 0092214 169.6917 190.5412  2.00553740 38050",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28474U 04045A   10300.77942241  .00000022  00000-0  10000-3 0  4407",
+			"tle2": "2 28474  53.8254 197.0502 0092613 180.6485 179.4129  2.00565881 43871",
 			"visible": false
 		},
 		"GPS BIIRM-1 (PRN 17)": 
 		{
 			"comms": [],
-			"tle1": "1 28874U 05038A   10010.46611155  .00000020  00000-0  10000-3 0  3749",
-			"tle2": "2 28874  55.0076 150.9355 0050579 211.6273 148.0313  2.00552416 31470",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28874U 05038A   10300.63167212  .00000072  00000-0  10000-3 0  7178",
+			"tle2": "2 28874  55.0369 139.4663 0058105 217.5165 142.1443  2.00563988 37298",
 			"visible": false
 		},
 		"GPS BIIRM-2 (PRN 31)": 
 		{
 			"comms": [],
-			"tle1": "1 29486U 06042A   10011.06942763 -.00000065  00000-0  10000-3 0  6815",
-			"tle2": "2 29486  55.8943  29.7669 0076878 294.8151  64.4195  2.00574313 24189",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 29486U 06042A   10300.25051077 -.00000059  00000-0  10000-3 0   318",
+			"tle2": "2 29486  56.0510  18.3338 0076580 298.9210  60.3604  2.00551737 29988",
 			"visible": false
 		},
 		"GPS BIIRM-3 (PRN 12)": 
 		{
 			"comms": [],
-			"tle1": "1 29601U 06052A   10010.51493068 -.00000066  00000-0  10000-3 0  7387",
-			"tle2": "2 29601  55.5346  90.1935 0034161 324.4761  35.3273  2.00550794 23085",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 29601U 06052A   10300.68949439  .00000031  00000-0  10000-3 0   952",
+			"tle2": "2 29601  55.7140  78.7061 0033602 337.9762  21.8540  2.00573430 28905",
 			"visible": false
 		},
 		"GPS BIIRM-4 (PRN 15)": 
 		{
 			"comms": [],
-			"tle1": "1 32260U 07047A   10010.31555820 -.00000108  00000-0  00000+0 0  4705",
-			"tle2": "2 32260  54.7160 328.8448 0023063 332.4507  27.4199  2.00560044 16474",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 32260U 07047A   10301.00379408 -.00000037  00000-0  00000+0 0  8086",
+			"tle2": "2 32260  54.5620 316.9717 0026605 346.0435  13.9162  2.00545550 22300",
 			"visible": false
 		},
 		"GPS BIIRM-5 (PRN 29)": 
 		{
 			"comms": [],
-			"tle1": "1 32384U 07062A   10010.63802324  .00000019  00000-0  10000-3 0  4994",
-			"tle2": "2 32384  55.0131 151.4032 0032068 287.1304  72.4854  2.00578110 15209",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 32384U 07062A   10300.82009883  .00000072  00000-0  10000-3 0  8359",
+			"tle2": "2 32384  55.0523 139.9388 0024871 291.4893  68.2676  2.00565959 21022",
 			"visible": false
 		},
 		"GPS BIIRM-6 (PRN 07)": 
 		{
 			"comms": [],
-			"tle1": "1 32711U 08012A   10010.73574093 -.00000067  00000-0  10000-3 0  3661",
-			"tle2": "2 32711  55.5876  29.8416 0032333 179.9404 180.1045  2.00557495 13415",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 32711U 08012A   10300.91601166 -.00000060  00000-0  10000-3 0  6672",
+			"tle2": "2 32711  55.7503  18.2909 0041268 182.2061 177.8254  2.00562157 19238",
 			"visible": false
 		},
+		"HAMSAT (VO-52)": 
+		{
+			"comms": [
+			{
+				"description": "Beacon",
+				"frequency": 145.86,
+				"modulation": "CW"
+			}],
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28650U 05017B   10301.70204233  .00000454  00000-0  63624-4 0  6322",
+			"tle2": "2 28650  97.6762 349.8118 0026562 197.3803 162.6532 14.81837321296466",
+			"visible": true
+		},
 		"HST": 
 		{
 			"comms": [],
-			"tle1": "1 20580U 90037B   10009.85735511  .00000291  00000-0  94489-5 0  5019",
-			"tle2": "2 20580  28.4685 193.3983 0003260 317.8077  42.2266 15.00875675880934",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": true,
+			"tle1": "1 20580U 90037B   10300.09759300  .00000718  00000-0  41998-4 0  6685",
+			"tle2": "2 20580  28.4686  98.6536 0003467 162.6448 197.4276 15.01074509924596",
 			"visible": true
 		},
-		"ITAMSAT (IO-26)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 22826U 93061D   09080.85350470 -.00000006  00000-0  14293-4 0  9268",
-			"tle2": "2 22826  98.4204  37.8560 0009197 152.3361 207.8319 14.29512039807534",
-			"draw_orbit": false,
-			"visible": false
-		},
 		"IRIDIUM 10": 
 		{
-			"description": "Iridium 10",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24839U 97030D   09080.75603299  .00000198  00000-0  63641-4 0  5665",
-			"tle2": "2 24839  86.4032 167.9110 0002345  85.8737 274.2720 14.34216304615619",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24839U 97030D   10301.46267144  .00000007  00000-0 -45497-5 0  2584",
+			"tle2": "2 24839  86.3911 283.1128 0002489  80.1516 279.9963 14.34216097699562",
 			"visible": false
 		},
 		"IRIDIUM 11": 
 		{
-			"description": "Iridium 11",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25578U 98074B   09080.96418723  .00000021  00000-0 -64075-8 0  5598",
-			"tle2": "2 25578  86.5093  73.3425 0002585  79.6314 280.5189 14.54937843544862",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25578U 98074B   10301.24589116  .00000272  00000-0  58203-4 0  2734",
+			"tle2": "2 25578  86.5181 188.7611 0002357  77.8060 282.3396 14.54951368629966",
 			"visible": false
 		},
 		"IRIDIUM 12": 
 		{
-			"description": "Iridium 12",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24837U 97030B   09080.76871839  .00000162  00000-0  50797-4 0  5682",
-			"tle2": "2 24837  86.4018 167.9072 0002316  83.3237 276.8222 14.34216073615601",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24837U 97030B   10301.40558675 -.00000010  00000-0 -10565-4 0  2579",
+			"tle2": "2 24837  86.3903 283.1426 0002512  84.4387 275.7108 14.34216340699546",
 			"visible": false
 		},
 		"IRIDIUM 13": 
 		{
-			"description": "Iridium 13",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24840U 97030E   09080.77506041  .00000178  00000-0  56458-4 0  5246",
-			"tle2": "2 24840  86.4035 167.9756 0002404  88.5081 271.6386 14.34216342615608",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24840U 97030E   10301.48170248  .00000002  00000-0 -63744-5 0  2148",
+			"tle2": "2 24840  86.3913 283.1911 0002538  78.9591 281.1904 14.34216190699552",
 			"visible": false
 		},
 		"IRIDIUM 14": 
 		{
-			"description": "Iridium 14",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25777U 99032A   09080.96055310  .00000130  00000-0  25188-4 0  5243",
-			"tle2": "2 25777  86.5126  41.6339 0001855  82.9817 277.1596 14.54935495519245",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25777U 99032A   10301.51723412  .00000154  00000-0  30756-4 0  2427",
+			"tle2": "2 25777  86.5153 156.9718 0002312  77.7386 282.4084 14.54947031604388",
 			"visible": false
 		},
 		"IRIDIUM 15": 
 		{
-			"description": "Iridium 15",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24869U 97034A   09080.83555834  .00000127  00000-0  38404-4 0  5876",
-			"tle2": "2 24869  86.3996 199.4843 0002242  82.3271 277.8172 14.34217422612589",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24869U 97034A   10301.47242563 -.00000024  00000-0 -15465-4 0  2873",
+			"tle2": "2 24869  86.3926 314.8201 0002445  86.9290 273.2200 14.34219000696521",
 			"visible": false
 		},
 		"IRIDIUM 16": 
 		{
-			"description": "Iridium 16",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24841U 97030F   09080.74756006  .00000103  00000-0  28979-4 0  5472",
-			"tle2": "2 24841  86.4115 168.5066 0004087  67.5298 292.6324 14.35274480615732",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24841U 97030F   10301.49343822  .00000157  00000-0  47706-4 0  2532",
+			"tle2": "2 24841  86.3990 283.8057 0001109  29.5848 330.5421 14.35369815699755",
 			"visible": false
 		},
 		"IRIDIUM 17": 
 		{
-			"description": "Iridium 17",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24870U 97034B   09080.86574228  .00000094  00000-0  26348-4 0  5551",
-			"tle2": "2 24870  86.3997 199.3860 0002450  74.3578 285.7893 14.34424293612609",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24870U 97034B   10301.40154518  .00000156  00000-0  48296-4 0  2490",
+			"tle2": "2 24870  86.3935 314.6658 0002199  76.6525 283.4917 14.34512721696546",
 			"visible": false
 		},
 		"IRIDIUM 18": 
 		{
-			"description": "Iridium 18",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24872U 97034D   09080.86727066  .00000184  00000-0  58625-4 0  5567",
-			"tle2": "2 24872  86.4003 199.6099 0002454  81.7604 278.3867 14.34217527612589",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24872U 97034D   10301.50413725  .00000004  00000-0 -56993-5 0  2443",
+			"tle2": "2 24872  86.3931 314.9668 0002380  81.5831 278.5648 14.34219073696523",
 			"visible": false
 		},
 		"IRIDIUM 19": 
 		{
-			"description": "Iridium 19",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24965U 97056A   09080.72718535  .00000100  00000-0  28631-4 0  5236",
-			"tle2": "2 24965  86.3996 136.4806 0002460  90.2603 269.8873 14.34219384601200",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24965U 97056A   10301.50366897  .00000088  00000-0  24442-4 0  2104",
+			"tle2": "2 24965  86.3935 251.5975 0002482  84.1741 275.9721 14.34218772685165",
 			"visible": false
 		},
 		"IRIDIUM 2": 
 		{
-			"description": "Iridium 2",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25527U 98066A   09080.75555857  .00000044  00000-0  94123-6 0  8457",
-			"tle2": "2 25527  85.5654 330.3309 0011200 129.4966 230.7244 14.97948645565148",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25527U 98066A   10301.18691019  .00001380  00000-0  11268-3 0  6125",
+			"tle2": "2 25527  85.5646 356.9509 0008409 198.8268 161.2649 14.98527668652791",
 			"visible": false
 		},
 		"IRIDIUM 20": 
 		{
-			"description": "Iridium 20",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25577U 98074A   09080.98033202 -.00000021  00000-0 -14422-4 0  3714",
-			"tle2": "2 25577  86.3904  73.1381 0002452  79.1409 281.0061 14.34214985537121",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25577U 98074A   10301.40802733 -.00001014  00000-0 -36937-3 0   503",
+			"tle2": "2 25577  86.3993 188.4413 0002307  83.6228 276.5230 14.34213135621030",
 			"visible": false
 		},
 		"IRIDIUM 21": 
 		{
-			"description": "Iridium 21",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25778U 99032B   09080.93260961  .00000088  00000-0  24407-4 0  4289",
-			"tle2": "2 25778  86.3940  41.6568 0001858 135.0959 225.0387 14.34213303516794",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25778U 99032B   10301.36016290  .00000109  00000-0  32005-4 0  1215",
+			"tle2": "2 25778  86.3966 157.0456 0004285  90.1310 270.0372 14.34223335600704",
 			"visible": false
 		},
 		"IRIDIUM 22": 
 		{
-			"description": "Iridium 22",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24907U 97043E   09080.93593228  .00000038  00000-0  64008-5 0  5443",
-			"tle2": "2 24907  86.3913  73.5164 0002428  76.7490 283.3976 14.34215296606512",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24907U 97043E   10301.36362755  .00000137  00000-0  41923-4 0  2275",
+			"tle2": "2 24907  86.4005 188.8880 0002341  81.1379 279.0079 14.34216367690429",
 			"visible": false
 		},
 		"IRIDIUM 23": 
 		{
-			"description": "Iridium 23",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24906U 97043D   09080.94227688  .00000036  00000-0  58894-5 0  5744",
-			"tle2": "2 24906  86.3894  73.1318 0002472  82.1303 278.0178 14.34215338606511",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24906U 97043D   10301.43972938  .00000175  00000-0  55359-4 0  2597",
+			"tle2": "2 24906  86.3999 188.3968 0002284  78.4691 281.6760 14.34218288690434",
 			"visible": false
 		},
 		"IRIDIUM 24": 
 		{
-			"description": "Iridium 24",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25105U 97082B   09080.88485856  .00000094  00000-0  24467-4 0  1226",
-			"tle2": "2 25105  86.3868  64.1686 0012063 143.9347 216.2672 14.38254916590102",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25105U 97082B   10301.18083982  .00000179  00000-0  52087-4 0  7624",
+			"tle2": "2 25105  86.3964 177.7006 0013578  41.4370 318.7856 14.38367245674235",
 			"visible": false
 		},
 		"IRIDIUM 25": 
 		{
-			"description": "Iridium 25",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24904U 97043B   09080.95495998  .00000045  00000-0  90546-5 0  5564",
-			"tle2": "2 24904  86.3902  73.1904 0002447  79.4878 280.6605 14.34215301606501",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24904U 97043B   10301.31288895 -.00000306  00000-0 -11639-3 0  2415",
+			"tle2": "2 24904  86.3986 188.5237 0002349  81.6978 278.4538 14.34214579690408",
 			"visible": false
 		},
 		"IRIDIUM 26": 
 		{
-			"description": "Iridium 26",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24903U 97043A   09080.92325319  .00000061  00000-0  14603-4 0  6635",
-			"tle2": "2 24903  86.3905  73.2530 0002433  79.3191 280.8286 14.34215067606530",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24903U 97043A   10301.28117716 -.00000455  00000-0 -16970-3 0  3502",
+			"tle2": "2 24903  86.3991 188.5961 0002453  79.9332 280.2207 14.34214020690435",
 			"visible": false
 		},
 		"IRIDIUM 28": 
 		{
-			"description": "Iridium 28",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24948U 97051E   09080.72766345 -.00000012  00000-0 -11441-4 0  3800",
-			"tle2": "2 24948  86.3924 105.0922 0002660  74.1790 285.9694 14.34248276603049",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24948U 97051E   10301.33479639  .00000180  00000-0  57176-4 0   864",
+			"tle2": "2 24948  86.3985 220.2483 0001878  79.3904 280.7492 14.34341723686986",
 			"visible": false
 		},
 		"IRIDIUM 29": 
 		{
-			"description": "Iridium 29",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24944U 97051A   09080.73641357 -.00000048  00000-0 -24213-4 0  5196",
-			"tle2": "2 24944  86.3928 104.9291 0002412  84.1606 275.9868 14.34217590603056",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24944U 97051A   10301.30362042 -.00000646  00000-0 -23779-3 0  1935",
+			"tle2": "2 24944  86.3978 220.1102 0002370  78.2191 281.9265 14.34214060686989",
 			"visible": false
 		},
 		"IRIDIUM 3": 
 		{
-			"description": "Iridium 3",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25431U 98048A   09080.92959394  .00000063  00000-0  15480-4 0  4481",
-			"tle2": "2 25431  86.3903  73.3431 0002965  84.2311 275.9229 14.34215319554292",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25431U 98048A   10301.28751827 -.00001140  00000-0 -41424-3 0  1335",
+			"tle2": "2 25431  86.3996 188.7028 0002503  69.5365 290.6101 14.34213818638197",
 			"visible": false
 		},
 		"IRIDIUM 30": 
 		{
-			"description": "Iridium 30",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24949U 97051F   09080.60956429 -.00000118  00000-0 -49226-4 0  5599",
-			"tle2": "2 24949  86.3918 105.0480 0002502  87.1679 272.9801 14.34216956603032",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24949U 97051F   10301.31630586 -.00000935  00000-0 -34102-3 0  2521",
+			"tle2": "2 24949  86.3982 220.1828 0002394  80.5741 279.5722 14.34212081686989",
 			"visible": false
 		},
 		"IRIDIUM 31": 
 		{
-			"description": "Iridium 31",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24950U 97051G   09080.95206580  .00000006  00000-0 -50967-5 0  5472",
-			"tle2": "2 24950  86.3926 104.8960 0002452  82.6436 277.5040 14.34217229603094",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24950U 97051G   10301.44950136 -.00001083  00000-0 -39397-3 0  2226",
+			"tle2": "2 24950  86.3981 220.1240 0002426  81.3268 278.8198 14.34210867687011",
 			"visible": false
 		},
 		"IRIDIUM 32": 
 		{
-			"description": "Iridium 32",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24945U 97051B   09080.82521335 -.00000034  00000-0 -19243-4 0  5260",
-			"tle2": "2 24945  86.3920 104.9062 0002420  86.0555 274.0934 14.34217114603087",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24945U 97051B   10301.39241707 -.00000905  00000-0 -33044-3 0  2114",
+			"tle2": "2 24945  86.3976 220.0911 0002352  78.3319 281.8123 14.34212503687015",
 			"visible": false
 		},
 		"IRIDIUM 33": 
 		{
-			"description": "Iridium 33",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24946U 97051C   09079.48224177  .00000050  00000-0  11256-4 0  5548",
-			"tle2": "2 24946  86.3829 105.5030 0007498 339.0307  21.0569 14.32470536602871",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24946U 97051C   10301.30780396  .00000103  00000-0  30874-4 0  3307",
+			"tle2": "2 24946  86.3895 220.2555 0006786 199.2047 160.8908 14.32545186686906",
 			"visible": false
 		},
 		"IRIDIUM 34": 
 		{
-			"description": "Iridium 34",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24969U 97056E   09080.66375773  .00000143  00000-0  44096-4 0  5214",
-			"tle2": "2 24969  86.3985 136.5744 0002407  86.3781 273.7691 14.34219875601171",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24969U 97056E   10301.37047500  .00000133  00000-0  40499-4 0  2044",
+			"tle2": "2 24969  86.3933 251.7300 0002471  80.8760 279.2726 14.34219098685123",
 			"visible": false
 		},
 		"IRIDIUM 35": 
 		{
-			"description": "Iridium 35",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24966U 97056B   09080.73987018  .00000085  00000-0  23358-4 0  5695",
-			"tle2": "2 24966  86.3976 136.5004 0002426  88.2177 271.9296 14.34219553601183",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24966U 97056B   10301.51635596 -.00000385  00000-0 -14474-3 0  2533",
+			"tle2": "2 24966  86.3937 251.6122 0002532  80.6792 279.4757 14.34211428685143",
 			"visible": false
 		},
 		"IRIDIUM 36": 
 		{
-			"description": "Iridium 36",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24967U 97056C   09080.65710171 -.00000019  00000-0 -13689-4 0  4998",
-			"tle2": "2 24967  86.3983 136.6024 0002458  82.4670 277.6800 14.34287200601317",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24967U 97056C   10301.39302625  .00000131  00000-0  39626-4 0  1997",
+			"tle2": "2 24967  86.3966 251.7390 0002309  86.5090 273.6383 14.34359852685271",
 			"visible": false
 		},
 		"IRIDIUM 37": 
 		{
-			"description": "Iridium 37",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24968U 97056D   09080.71450005  .00000098  00000-0  28096-4 0  5346",
-			"tle2": "2 24968  86.3999 136.6077 0002361  87.7484 272.3982 14.34219477601186",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24968U 97056D   10301.35144457  .00000056  00000-0  12992-4 0  2210",
+			"tle2": "2 24968  86.3939 251.7957 0002427  84.6546 275.4959 14.34213228685126",
 			"visible": false
 		},
 		"IRIDIUM 38": 
 		{
-			"description": "Iridium 38",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25043U 97069E   09080.84584675  .00000189  00000-0  59905-4 0  5412",
-			"tle2": "2 25043  86.3999 198.9627 0003100  65.2494 294.9020 14.34689502595081",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25043U 97069E   10301.48572705  .00000131  00000-0  39291-4 0  2310",
+			"tle2": "2 25043  86.3930 314.0819 0001612  70.0722 290.0660 14.34770701679053",
 			"visible": false
 		},
 		"IRIDIUM 39": 
 		{
-			"description": "Iridium 39",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25042U 97069D   09080.81653387  .00000186  00000-0  59194-4 0  5120",
-			"tle2": "2 25042  86.4012 199.6847 0002432  78.6189 281.5268 14.34217041594973",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25042U 97069D   10301.38362828  .00000037  00000-0  61418-5 0  2065",
+			"tle2": "2 25042  86.3939 315.1128 0002183  83.4944 276.6508 14.34218237678909",
 			"visible": false
 		},
 		"IRIDIUM 4": 
 		{
-			"description": "Iridium 4",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24796U 97020E   09080.70815717  .00000117  00000-0  34873-4 0  5689",
-			"tle2": "2 24796  86.3992 136.4182 0002479  84.7507 275.3970 14.34219551621866",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24796U 97020E   10301.48464559  .00000171  00000-0  53914-4 0  2512",
+			"tle2": "2 24796  86.3930 251.5109 0002496  78.1753 281.9709 14.34218964705824",
 			"visible": false
 		},
 		"IRIDIUM 40": 
 		{
-			"description": "Iridium 40",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25041U 97069C   09080.87997502  .00000177  00000-0  56017-4 0  5384",
-			"tle2": "2 25041  86.4003 199.5053 0002277  80.7998 279.3453 14.34217086595004",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25041U 97069C   10301.51682757  .00000049  00000-0  10364-4 0  2285",
+			"tle2": "2 25041  86.3934 314.8434 0002403  85.3762 274.7711 14.34219119678942",
 			"visible": false
 		},
 		"IRIDIUM 41": 
 		{
-			"description": "Iridium 41",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25040U 97069B   09080.85461500  .00000190  00000-0  60760-4 0  5122",
-			"tle2": "2 25040  86.4003 199.5463 0002248  80.0849 280.0599 14.34216855594983",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25040U 97069B   10301.49145091  .00000021  00000-0  37710-6 0  2024",
+			"tle2": "2 25040  86.3928 314.8920 0002308  74.9331 285.2131 14.34219357678929",
 			"visible": false
 		},
 		"IRIDIUM 42": 
 		{
-			"description": "Iridium 42",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25077U 97077A   09080.94340195  .00000110  00000-0  32067-4 0  5274",
-			"tle2": "2 25077  86.3994 199.5528 0002240  84.0668 276.0780 14.34216755590856",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25077U 97077A   10301.51048518  .00000012  00000-0 -27886-5 0  2238",
+			"tle2": "2 25077  86.3933 314.9318 0002374  85.5992 274.5489 14.34219003674786",
 			"visible": false
 		},
 		"IRIDIUM 43": 
 		{
-			"description": "Iridium 43",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25039U 97069A   09080.86094029  .00000205  00000-0  66131-4 0  5236",
-			"tle2": "2 25039  86.4004 199.6307 0002233  83.8211 276.3235 14.34217273594988",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25039U 97069A   10301.49779840  .00000009  00000-0 -39060-5 0  2135",
+			"tle2": "2 25039  86.3934 314.9917 0002408  81.0220 279.1261 14.34219096678924",
 			"visible": false
 		},
 		"IRIDIUM 44": 
 		{
-			"description": "Iridium 44",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25078U 97077B   09080.71935762  .00000118  00000-0  33304-4 0   717",
-			"tle2": "2 25078  86.4006 195.3112 0003942  66.7305 293.4317 14.36538090591378",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25078U 97077B   10301.43391839  .00000158  00000-0  46896-4 0  7053",
+			"tle2": "2 25078  86.3948 309.6718 0001443  21.3821 338.7429 14.36659332675461",
 			"visible": false
 		},
 		"IRIDIUM 45": 
 		{
-			"description": "Iridium 45",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25104U 97082A   09080.96130432 -.00000044  00000-0 -22820-4 0  4750",
-			"tle2": "2 25104  86.3894  73.2144 0002470  84.6910 275.4577 14.34215008589056",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25104U 97082A   10301.24946346 -.00001076  00000-0 -39134-3 0  1554",
+			"tle2": "2 25104  86.3988 188.5603 0002315  82.0799 278.0695 14.34212715672948",
 			"visible": false
 		},
 		"IRIDIUM 46": 
 		{
-			"description": "Iridium 46",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24905U 97043C   09080.96764942  .00000030  00000-0  35050-5 0  5691",
-			"tle2": "2 24905  86.3912  73.4590 0002447  80.6193 279.5279 14.34215070606519",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24905U 97043C   10301.25580518 -.00000150  00000-0 -60680-4 0  2649",
+			"tle2": "2 24905  86.4001 188.8750 0002431  82.1446 278.0076 14.34215312690408",
 			"visible": false
 		},
 		"IRIDIUM 47": 
 		{
-			"description": "Iridium 47",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25106U 97082C   09080.97398853  .00000111  00000-0  32561-4 0  4695",
-			"tle2": "2 25106  86.3898  73.1510 0002484  79.6182 280.5287 14.34215564589050",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25106U 97082C   10301.54122237 -.00000281  00000-0 -10746-3 0  1504",
+			"tle2": "2 25106  86.4001 188.3780 0002427  77.6559 282.4918 14.34214589672981",
 			"visible": false
 		},
 		"IRIDIUM 49": 
 		{
-			"description": "Iridium 49",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25108U 97082E   09080.98667654  .00000065  00000-0  16281-4 0  4875",
-			"tle2": "2 25108  86.3903  73.1642 0002478  78.6020 281.5453 14.34215226589060",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25108U 97082E   10301.27483287 -.00001099  00000-0 -39961-3 0  1699",
+			"tle2": "2 25108  86.3989 188.5250 0002347  83.1310 277.0152 14.34214115672951",
 			"visible": false
 		},
 		"IRIDIUM 5": 
 		{
-			"description": "Iridium 5",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24795U 97020D   09080.75255433  .00000063  00000-0  15294-4 0  6795",
-			"tle2": "2 24795  86.3980 136.7732 0002993  61.1224 299.0272 14.34219542621938",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24795U 97020D   10301.38957589  .00000124  00000-0  37398-4 0  3955",
+			"tle2": "2 24795  86.3931 251.9381 0001043  80.5962 279.5368 14.34217681705870",
 			"visible": false
 		},
 		"IRIDIUM 50": 
 		{
-			"description": "Iridium 50",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25172U 98010D   09080.79408766  .00000199  00000-0  63929-4 0  5098",
-			"tle2": "2 25172  86.4035 168.0271 0002291  84.7609 275.3846 14.34216501580429",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25172U 98010D   10301.50072644  .00000034  00000-0  52070-5 0  2010",
+			"tle2": "2 25172  86.3915 283.2603 0002516  84.0356 276.1131 14.34216379664372",
 			"visible": false
 		},
 		"IRIDIUM 51": 
 		{
-			"description": "Iridium 51",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25262U 98018A   09080.96019622  .00000083  00000-0  18843-4 0  6047",
-			"tle2": "2 25262  86.4521 136.5459 0002506  88.2627 271.8861 14.42963543578794",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25262U 98018A   10301.38405275  .00000217  00000-0  58884-4 0  2981",
+			"tle2": "2 25262  86.4450 251.8827 0002519  77.4188 282.7311 14.42949049663219",
 			"visible": false
 		},
 		"IRIDIUM 52": 
 		{
-			"description": "Iridium 52",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25169U 98010A   09080.73700209  .00000123  00000-0  36961-4 0  2624",
-			"tle2": "2 25169  86.4038 168.0762 0002354  85.6372 274.5081 14.34216423580436",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25169U 98010A   10301.51340845 -.00000026  00000-0 -16458-4 0  9512",
+			"tle2": "2 25169  86.3919 283.2800 0002428  86.1036 274.0443 14.34216393664392",
 			"visible": false
 		},
 		"IRIDIUM 53": 
 		{
-			"description": "Iridium 53",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25173U 98010E   09080.74334661  .00000213  00000-0  68921-4 0  4965",
-			"tle2": "2 25173  86.4038 168.0584 0002328  85.4274 274.7179 14.34216418580426",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25173U 98010E   10301.38021403 -.00000015  00000-0 -12587-4 0  1854",
+			"tle2": "2 25173  86.3913 283.3189 0002495  82.8733 277.2753 14.34216408664366",
 			"visible": false
 		},
 		"IRIDIUM 54": 
 		{
-			"description": "Iridium 54",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25171U 98010C   09080.83214435  .00000162  00000-0  50776-4 0  4950",
-			"tle2": "2 25171  86.4034 168.0396 0002357  83.7922 276.3539 14.34216177580592",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25171U 98010C   10301.39924441 -.00000011  00000-0 -11061-4 0  1769",
+			"tle2": "2 25171  86.3919 283.3345 0002424  83.5338 276.6130 14.34216421664520",
 			"visible": false
 		},
 		"IRIDIUM 55": 
 		{
-			"description": "Iridium 55",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25272U 98019A   09080.65396145 -.00000055  00000-0 -26585-4 0  4460",
-			"tle2": "2 25272  86.3929 104.9099 0002443  82.6744 277.4726 14.34217346574706",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25272U 98019A   10301.29093539 -.00000972  00000-0 -35442-3 0  1320",
+			"tle2": "2 25272  86.3977 220.0601 0002338  82.5159 277.6284 14.34211332658646",
 			"visible": false
 		},
 		"IRIDIUM 56": 
 		{
-			"description": "Iridium 56",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25170U 98010B   09080.93996768  .00000090  00000-0  25013-4 0  4042",
-			"tle2": "2 25170  86.4019 168.0354 0002303  83.3803 276.7656 14.34215986580448",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25170U 98010B   10301.43729637 -.00000028  00000-0 -17004-4 0  5746",
+			"tle2": "2 25170  86.3908 283.3687 0002487  85.4859 274.6628 14.34216414664368",
 			"visible": false
 		},
 		"IRIDIUM 57": 
 		{
-			"description": "Iridium 57",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25273U 98019B   09080.97743384  .00000010  00000-0 -34515-5 0  4842",
-			"tle2": "2 25273  86.3938 104.9487 0002488  81.4053 278.7428 14.34217528574757",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25273U 98019B   10301.33533499 -.00001235  00000-0 -44805-3 0  1775",
+			"tle2": "2 25273  86.3978 220.2411 0002411  79.3416 280.8052 14.34209304658657",
 			"visible": false
 		},
 		"IRIDIUM 58": 
 		{
-			"description": "Iridium 58",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25274U 98019C   09080.56516741 -.00000072  00000-0 -32690-4 0  2919",
-			"tle2": "2 25274  86.3927 105.2286 0002529  81.2320 278.9159 14.34216858574699",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25274U 98019C   10301.34167667 -.00001005  00000-0 -36595-3 0  9834",
+			"tle2": "2 25274  86.3983 220.3638 0002407  77.7622 282.3841 14.34211663658656",
 			"visible": false
 		},
 		"IRIDIUM 59": 
 		{
-			"description": "Iridium 59",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25275U 98019D   09080.92035227 -.00000093  00000-0 -40264-4 0  1373",
-			"tle2": "2 25275  86.3948 105.0965 0002450  63.6517 296.4931 14.34216674574745",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25275U 98019D   10301.48755396 -.00000215  00000-0 -83874-4 0  8195",
+			"tle2": "2 25275  86.3977 220.2862 0002621  62.6138 297.5324 14.34212109658673",
 			"visible": false
 		},
 		"IRIDIUM 6": 
 		{
-			"description": "Iridium 6",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24794U 97020C   09080.68913056  .00000120  00000-0  35767-4 0  3460",
-			"tle2": "2 24794  86.4005 136.6398 0002655  84.7222 275.4275 14.34219576621845",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24794U 97020C   10301.32607453  .00000055  00000-0  12715-4 0   338",
+			"tle2": "2 24794  86.3937 251.8254 0002324  72.0200 288.1255 14.34218653705788",
 			"visible": false
 		},
 		"IRIDIUM 60": 
 		{
-			"description": "Iridium 60",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25276U 98019E   09080.57785244 -.00000075  00000-0 -33997-4 0  5140",
-			"tle2": "2 25276  86.3925 104.9765 0002456  85.4836 274.6635 14.34216941574699",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25276U 98019E   10301.28459325 -.00000994  00000-0 -36204-3 0  2144",
+			"tle2": "2 25276  86.3968 220.0866 0002365  82.9570 277.1859 14.34211540658648",
 			"visible": false
 		},
 		"IRIDIUM 61": 
 		{
-			"description": "Iridium 61",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25263U 98018B   09080.65107557  .00000022  00000-0  88117-6 0  4504",
-			"tle2": "2 25263  86.4005 136.6114 0002427  83.6921 276.4543 14.34219094575509",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25263U 98018B   10301.35780410  .00000113  00000-0  33114-4 0  1428",
+			"tle2": "2 25263  86.3928 251.7666 0002448  80.9880 279.1602 14.34218616659452",
 			"visible": false
 		},
 		"IRIDIUM 62": 
 		{
-			"description": "Iridium 62",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25285U 98021A   09080.95798294  .00000157  00000-0  49153-4 0  4806",
-			"tle2": "2 25285  86.3937  41.6021 0002403  80.9094 279.2370 14.34213398573703",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25285U 98021A   10301.17622834  .00000069  00000-0  17456-4 0  1792",
+			"tle2": "2 25285  86.3970 157.0768 0002305  82.5068 277.6381 14.34223177657589",
 			"visible": false
 		},
 		"IRIDIUM 63": 
 		{
-			"description": "Iridium 63",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25286U 98021B   09080.96432934  .00000129  00000-0  39109-4 0  4926",
-			"tle2": "2 25286  86.3940  41.6827 0002432  80.3005 279.8464 14.34213273573702",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25286U 98021B   10301.53141413  .00000143  00000-0  44086-4 0  1918",
+			"tle2": "2 25286  86.3968 157.0252 0002277  82.8855 277.2605 14.34223540657635",
 			"visible": false
 		},
 		"IRIDIUM 64": 
 		{
-			"description": "Iridium 64",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25287U 98021C   09080.97067364  .00000097  00000-0  27550-4 0  4403",
-			"tle2": "2 25287  86.3941  41.6185 0002444  79.6780 280.4691 14.34213124573687",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25287U 98021C   10301.53775312  .00000146  00000-0  45003-4 0  1384",
+			"tle2": "2 25287  86.3969 156.9492 0002225  78.7498 281.3965 14.34223729657613",
 			"visible": false
 		},
 		"IRIDIUM 65": 
 		{
-			"description": "Iridium 65",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25288U 98021D   09080.97701561  .00000123  00000-0  36733-4 0  4883",
-			"tle2": "2 25288  86.3937  41.5700 0002779  77.2145 282.9359 14.34213117573708",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25288U 98021D   10301.54410206  .00000118  00000-0  35048-4 0  1741",
+			"tle2": "2 25288  86.3961 156.8925 0002160  70.7095 289.4345 14.34223186657639",
 			"visible": false
 		},
 		"IRIDIUM 66": 
 		{
-			"description": "Iridium 66",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25289U 98021E   09080.91358909  .00000122  00000-0  36428-4 0  4444",
-			"tle2": "2 25289  86.3935  41.5254 0002463  80.4519 279.6944 14.34213230573699",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25289U 98021E   10301.55043804  .00000160  00000-0  49961-4 0  1262",
+			"tle2": "2 25289  86.3966 156.8141 0002326  77.3563 282.7910 14.34223829657630",
 			"visible": false
 		},
 		"IRIDIUM 67": 
 		{
-			"description": "Iridium 67",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25290U 98021F   09080.91993107  .00000097  00000-0  27599-4 0  2674",
-			"tle2": "2 25290  86.3939  41.6124 0002412  79.5456 280.6007 14.34213091573704",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25290U 98021F   10301.55678822  .00000157  00000-0  49065-4 0  9571",
+			"tle2": "2 25290  86.3966 156.9105 0002292  81.8706 278.2758 14.34222482657649",
 			"visible": false
 		},
 		"IRIDIUM 68": 
 		{
-			"description": "Iridium 68",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25291U 98021G   09080.92627825  .00000159  00000-0  49798-4 0  4808",
-			"tle2": "2 25291  86.3939  41.6734 0002409  78.9035 281.2421 14.34213167573671",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25291U 98021G   10301.21428558  .00000022  00000-0  93324-6 0  1701",
+			"tle2": "2 25291  86.3975 157.1273 0002379  80.9438 279.2019 14.34222910657565",
 			"visible": false
 		},
 		"IRIDIUM 69": 
 		{
-			"description": "Iridium 69",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25319U 98026A   09080.49486789  .00000092  00000-0  24359-4 0  3146",
-			"tle2": "2 25319  86.3922  69.9726 0004196  68.2945 291.8696 14.37077443570581",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25319U 98026A   10301.20092608  .00000175  00000-0  52209-4 0  9992",
+			"tle2": "2 25319  86.4028 184.2023 0001667  27.0848 333.0433 14.37186299654700",
 			"visible": false
 		},
 		"IRIDIUM 7": 
 		{
-			"description": "Iridium 7",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24793U 97020B   09080.69547303  .00000099  00000-0  28351-4 0  5488",
-			"tle2": "2 24793  86.4007 136.6478 0002405  86.1825 273.9642 14.34219478621845",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24793U 97020B   10301.40220610  .00000141  00000-0  43379-4 0  2318",
+			"tle2": "2 24793  86.3940 251.8136 0002461  78.4314 281.7157 14.34218416705796",
 			"visible": false
 		},
 		"IRIDIUM 70": 
 		{
-			"description": "Iridium 70",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25342U 98032A   09080.95163750  .00000131  00000-0  39568-4 0  5009",
-			"tle2": "2 25342  86.3942  41.7657 0002391  79.7340 280.4119 14.34213490567784",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25342U 98032A   10301.51872847  .00000058  00000-0  13786-4 0  1900",
+			"tle2": "2 25342  86.3972 157.1287 0002384  75.3883 284.7578 14.34223132651711",
 			"visible": false
 		},
 		"IRIDIUM 71": 
 		{
-			"description": "Iridium 71",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25320U 98026B   09080.50288721  .00000073  00000-0  17612-4 0   528",
-			"tle2": "2 25320  86.3912  67.4298 0003490 107.5106 252.6473 14.37667721570864",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25320U 98026B   10301.38830995  .00000167  00000-0  48786-4 0  7008",
+			"tle2": "2 25320  86.4015 181.2578 0003918  53.2779 306.8772 14.37762656655044",
 			"visible": false
 		},
 		"IRIDIUM 72": 
 		{
-			"description": "Iridium 72",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25343U 98032B   09080.93895920  .00000118  00000-0  35034-4 0  4894",
-			"tle2": "2 25343  86.3940  41.5784 0002432  76.1741 283.9715 14.34213267567786",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25343U 98032B   10301.36650689  .00000036  00000-0  57202-5 0  1786",
+			"tle2": "2 25343  86.3968 156.9630 0002284  83.2424 276.9033 14.34222857651693",
 			"visible": false
 		},
 		"IRIDIUM 73": 
 		{
-			"description": "Iridium 73",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25344U 98032C   09080.78187609  .00000124  00000-0  28464-4 0  3655",
-			"tle2": "2 25344  86.4423  32.4179 0003011  59.8565 300.2935 14.47114841572085",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25344U 98032C   10301.50767954  .00000224  00000-0  55764-4 0   684",
+			"tle2": "2 25344  86.4424 145.7382 0001667  87.6700 272.4703 14.47231315656795",
 			"visible": false
 		},
 		"IRIDIUM 74": 
 		{
-			"description": "Iridium 74",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25345U 98032D   09080.98077926  .00000138  00000-0  35328-4 0  5135",
-			"tle2": "2 25345  86.4451  41.7016 0002432  79.4303 280.7170 14.42945639568815",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25345U 98032D   10301.19597976  .00000138  00000-0  35333-4 0  2063",
+			"tle2": "2 25345  86.4476 157.2241 0002407  81.1807 278.9657 14.42972666653203",
 			"visible": false
 		},
 		"IRIDIUM 75": 
 		{
-			"description": "Iridium 75",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25346U 98032E   09080.94529799  .00000116  00000-0  34491-4 0  5150",
-			"tle2": "2 25346  86.3944  41.7207 0002402  79.7335 280.4124 14.34213264568357",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25346U 98032E   10301.16354397  .00000141  00000-0  43140-4 0  2068",
+			"tle2": "2 25346  86.3971 157.2134 0002294  79.7958 280.3486 14.34223438652234",
 			"visible": false
 		},
 		"IRIDIUM 76": 
 		{
-			"description": "Iridium 76",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25432U 98048B   09080.94861862  .00000054  00000-0  12145-4 0  3738",
-			"tle2": "2 25432  86.3906  73.1863 0002300  98.0699 262.0767 14.34215369554286",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25432U 98048B   10301.44608460 -.00000329  00000-0 -12444-3 0   616",
+			"tle2": "2 25432  86.3996 188.4685 0003065  78.4615 281.6922 14.34214482638206",
 			"visible": false
 		},
 		"IRIDIUM 77": 
 		{
-			"description": "Iridium 77",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25471U 98051E   09080.82923891  .00000100  00000-0  28744-4 0  6088",
-			"tle2": "2 25471  86.3997 199.4609 0003163  99.7025 260.4521 14.34216514556700",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25471U 98051E   10301.53585330 -.00000042  00000-0 -22019-4 0  2987",
+			"tle2": "2 25471  86.3933 314.7363 0003080  66.1707 293.9816 14.34218805640653",
 			"visible": false
 		},
 		"IRIDIUM 8": 
 		{
-			"description": "Iridium 8",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24792U 97020A   09080.70181317  .00000069  00000-0  17647-4 0  5504",
-			"tle2": "2 24792  86.3985 136.5160 0002379  81.7440 278.4023 14.34219493621849",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24792U 97020A   10301.33878008  .00000175  00000-0  55255-4 0  2367",
+			"tle2": "2 24792  86.3929 251.6847 0002468  83.0522 277.0969 14.34218759705787",
 			"visible": false
 		},
 		"IRIDIUM 80": 
 		{
-			"description": "Iridium 80",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25469U 98051C   09080.96243436  .00000071  00000-0  18286-4 0  4399",
-			"tle2": "2 25469  86.4008 199.5241 0002317  83.5362 276.6098 14.34216358551528",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25469U 98051C   10301.45974671  .00000026  00000-0  23231-5 0  1296",
+			"tle2": "2 25469  86.3934 314.9459 0002420  84.6040 275.5434 14.34218863635448",
 			"visible": false
 		},
 		"IRIDIUM 81": 
 		{
-			"description": "Iridium 81",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25468U 98051B   09080.84189280  .00000175  00000-0  55498-4 0  4370",
-			"tle2": "2 25468  86.4000 199.4552 0002193  77.7791 282.3646 14.34217895551504",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25468U 98051B   10301.33921626  .00000059  00000-0  14111-4 0  1229",
+			"tle2": "2 25468  86.3933 314.8350 0002397  90.0757 270.0723 14.34221465635425",
 			"visible": false
 		},
 		"IRIDIUM 82": 
 		{
-			"description": "Iridium 82",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25467U 98051A   09080.84826518  .00000139  00000-0  42421-4 0  6061",
-			"tle2": "2 25467  86.3999 199.5966 0003026  75.7695 284.3832 14.34216930555283",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25467U 98051A   10301.48511420  .00000014  00000-0 -21688-5 0  2996",
+			"tle2": "2 25467  86.3932 314.9807 0001788  65.6330 294.5064 14.34218947639221",
 			"visible": false
 		},
 		"IRIDIUM 83": 
 		{
-			"description": "Iridium 83",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25531U 98066E   09080.92094038  .00000145  00000-0  44885-4 0  4298",
-			"tle2": "2 25531  86.4034 167.8505 0002327  86.2880 273.8578 14.34216119543038",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25531U 98066E   10301.48804132  .00000035  00000-0  56045-5 0  1344",
+			"tle2": "2 25531  86.3909 283.1112 0002508  84.1587 275.9902 14.34216451626963",
 			"visible": false
 		},
 		"IRIDIUM 84": 
 		{
-			"description": "Iridium 84",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25530U 98066D   09080.74968891  .00000167  00000-0  52727-4 0  3189",
-			"tle2": "2 25530  86.4031 167.9111 0002365  84.5906 275.5553 14.34216529545657",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25530U 98066D   10301.38654792 -.00000022  00000-0 -15073-4 0    35",
+			"tle2": "2 25530  86.3904 283.1224 0002478  80.5376 279.6109 14.34216504629594",
 			"visible": false
 		},
 		"IRIDIUM 86": 
 		{
-			"description": "Iridium 86",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 25528U 98066B   09080.78774334  .00000154  00000-0  47880-4 0  6551",
-			"tle2": "2 25528  86.4010 167.7890 0003121  91.2601 268.8949 14.34216774548021",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25528U 98066B   10301.49439995 -.00000076  00000-0 -34290-4 0  3494",
+			"tle2": "2 25528  86.3905 282.9585 0002584  64.3260 295.8203 14.34214517631971",
 			"visible": false
 		},
 		"IRIDIUM 90": 
 		{
-			"description": "Iridium 90",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 27373U 02005B   09080.75759552  .00000204  00000-0  54978-4 0  9905",
-			"tle2": "2 27373  86.4545 167.7383 0002768 294.7036  65.3870 14.42961102377382",
-			"draw_orbit": false,
+			"orbitColor": [1.33587057158802e-32, 1.33611037243559e-32, 1.33635017328316e-32],
+			"orbitVisible": false,
+			"tle1": "1 27373U 02005B   10301.38944945  .00000018  00000-0 -61500-6 0  6928",
+			"tle2": "2 27373  86.4418 283.0115 0006587 122.1221 238.0642 14.42944996461831",
 			"visible": false
 		},
 		"IRIDIUM 91": 
 		{
-			"description": "Iridium 91",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 27372U 02005A   09080.97109062 -.00000020  00000-0 -14335-4 0   297",
-			"tle2": "2 27372  86.3944 105.0683 0004458  24.2179 335.9227 14.34217272380315",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27372U 02005A   10301.32898421 -.00000869  00000-0 -31743-3 0  7196",
+			"tle2": "2 27372  86.3994 220.4433 0001622 210.6079 149.5009 14.34212504464217",
 			"visible": false
 		},
 		"IRIDIUM 911": 
 		{
-			"description": "Iridium 911",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24842U 97030G   09080.72568503  .00000103  00000-0  24569-4 0  2539",
-			"tle2": "2 24842  86.4523 170.7526 0015237 358.4789   1.6370 14.43158132618677",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24842U 97030G   10301.39019954  .00000179  00000-0  47092-4 0  9100",
+			"tle2": "2 24842  86.4409 285.8639 0013360 202.2380 157.8254 14.43279006703147",
 			"visible": false
 		},
 		"IRIDIUM 914": 
 		{
-			"description": "Iridium 914",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24836U 97030A   09080.76183671  .00000072  00000-0  17532-4 0  1698",
-			"tle2": "2 24836  86.3996 160.9874 0000845  77.3318 282.7979 14.37427546616467",
-			"draw_orbit": false,
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24836U 97030A   10301.47064822  .00000123  00000-0  34337-4 0  8180",
+			"tle2": "2 24836  86.3878 274.7253 0003518  99.8978 260.2622 14.37508507700605",
 			"visible": false
 		},
 		"IRIDIUM 920": 
 		{
-			"description": "Iridium 920",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24871U 97034C   09080.95778183 -.00000024  00000-0 -14712-4 0  1999",
-			"tle2": "2 24871  86.4029 192.6800 0013043 137.8990 222.3210 14.38055586613699",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24871U 97034C   10301.47784503  .00000156  00000-0  44992-4 0  8654",
+			"tle2": "2 24871  86.3924 306.5829 0013278  34.5535 325.6538 14.38145628697843",
 			"visible": false
 		},
 		"IRIDIUM 921": 
 		{
-			"description": "Iridium 921",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 24873U 97034E   09080.91559410  .00000320  00000-0  24960-4 0  5208",
-			"tle2": "2 24873  86.3865  31.4638 0010185 126.4679 233.7489 14.97110247636150",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24873U 97034E   10301.42548635  .00000748  00000-0  61428-4 0  2503",
+			"tle2": "2 24873  86.3825 120.3525 0007896 173.3973 186.7336 14.97579698723763",
 			"visible": false
 		},
 		"IRIDIUM 94": 
 		{
-			"description": "Iridium 94",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 27374U 02005C   09080.75273894 -.00000019  00000-0 -75926-5 0   618",
-			"tle2": "2 27374  86.5746 104.7593 0002666  84.3214 275.8306 14.66608250380349",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27374U 02005C   10301.52437384  .00000386  00000-0  65943-4 0  7997",
+			"tle2": "2 27374  86.5797 219.8733 0002532  81.5994 278.5499 14.66262166466187",
 			"visible": false
 		},
 		"IRIDIUM 95": 
 		{
-			"description": "Iridium 95",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 27375U 02005D   09080.66030253 -.00000059  00000-0 -28000-4 0    84",
-			"tle2": "2 27375  86.3944 105.0032 0002427  89.9724 270.1749 14.34217381379558",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27375U 02005D   10301.36704777 -.00001097  00000-0 -39903-3 0  6945",
+			"tle2": "2 27375  86.3990 220.2275 0002513  83.6665 276.4819 14.34210058463509",
 			"visible": false
 		},
 		"IRIDIUM 96": 
 		{
-			"description": "Iridium 96",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 27376U 02005E   09080.56026923 -.00000015  00000-0 -69572-5 0   546",
-			"tle2": "2 27376  86.5756 104.7982 0002697  80.6016 279.5497 14.66608347380313",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27376U 02005E   10301.32586491  .00000427  00000-0  73309-4 0  7868",
+			"tle2": "2 27376  86.5797 219.8961 0002513  78.1701 281.9792 14.66261825466151",
 			"visible": false
 		},
 		"IRIDIUM 97": 
 		{
-			"description": "Iridium 97",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 27450U 02031A   09080.67644149  .00000069  00000-0  17482-4 0  9207",
-			"tle2": "2 27450  86.4000 136.7814 0003464  21.9907 338.1435 14.34219520358872",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27450U 02031A   10301.52269454  .00000150  00000-0  46368-4 0  6013",
+			"tle2": "2 27450  86.3936 251.8511 0001794 177.8890 182.2321 14.34219456442849",
 			"visible": false
 		},
 		"IRIDIUM 98": 
 		{
-			"description": "Iridium 98",
+			"comms": [],
 			"groups": ["iridium", "communications"],
-			"tle1": "1 27451U 02031B   09080.85265633  .00000211  00000-0  57105-4 0  9389",
-			"tle2": "2 27451  86.4540 199.6827 0005377  49.1145 311.0517 14.42947974358258",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27451U 02031B   10301.48412638  .00000083  00000-0  18806-4 0  6496",
+			"tle2": "2 27451  86.4467 315.2431 0001379 229.4044 130.7062 14.42954671442709",
 			"visible": false
 		},
 		"ISS (ZARYA)": 
@@ -1408,81 +1429,117 @@
 				"description": "ARISS packet uplink",
 				"frequency": 145.825
 			}],
+			"groups": [],
 			"hintColor": [0.899999976158142, 0.899999976158142, 0.899999976158142],
-			"tle1": "1 25544U 98067A   10011.92371058  .00012181  00000-0  76107-4 0  3541",
-			"tle2": "2 25544  51.6465 313.4924 0007635 171.1951 233.5729 15.77327898638859",
-			"draw_orbit": true,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": true,
+			"tle1": "1 25544U 98067A   10302.36561338  .00017353  00000-0  13399-3 0  1686",
+			"tle2": "2 25544  51.6470 264.0662 0008627 133.4449  11.1436 15.72003660684578",
+			"visible": true
+		},
+		"ITAMSAT (IO-26)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22826U 93061D   10301.97235919  .00000031  00000-0  28853-4 0  3997",
+			"tle2": "2 22826  98.4957 247.1079 0008234 226.7778 133.2713 14.29571240891272",
+			"visible": false
+		},
+		"JAS-1 (FO-12)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 16909U 86061B   10301.81520572 -.00000083  00000-0  10000-3 0  8008",
+			"tle2": "2 16909  50.0140  68.9849 0011238  37.6411 322.5189 12.44454413101068",
+			"visible": false
+		},
+		"JAS-1B (FO-20)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20480U 90013C   10301.57246602 -.00000016  00000-0  26752-4 0  6029",
+			"tle2": "2 20480  99.0171 133.7011 0540746 121.5591 243.9482 12.83366127970837",
+			"visible": false
+		},
+		"JAS-2 (FO-29)": 
+		{
+			"comms": [
+			{
+				"description": "uplink",
+				"frequency": 145.95,
+				"modulation": "SSB/CW"
+			}, 
+			{
+				"description": "downlink",
+				"frequency": 435.85,
+				"modulation": "SSB/CW"
+			}],
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24278U 96046B   10301.66195490  .00000024  00000-0  57446-4 0  4253",
+			"tle2": "2 24278  98.5182 112.3778 0351102 137.5077 225.3818 13.52953723701152",
 			"visible": true
 		},
 		"KITSAT 1 (KO-23)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 22077U 92052B   09080.68175229 -.00000037  00000-0  10000-3 0  6995",
-			"tle2": "2 22077  66.0847 149.9211 0013023 300.4010  59.5723 12.86447618780266",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22077U 92052B   10301.69375558 -.00000037  00000-0  10000-3 0   805",
+			"tle2": "2 22077  66.0880   2.5985 0003219 352.4177   7.6789 12.86454782855643",
 			"visible": false
 		},
 		"KITSAT 2 (KO-25)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 22828U 93061F   09080.83613139 -.00000007  00000-0  13561-4 0  1385",
-			"tle2": "2 22828  98.4126  37.7648 0010637 129.0987 231.1150 14.29813121775804",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22828U 93061F   10301.06364579  .00000062  00000-0  40708-4 0  5982",
+			"tle2": "2 22828  98.4900 246.0066 0009608 201.4547 158.6238 14.29863591859434",
 			"visible": false
 		},
 		"LUSAT (LO-19)": 
 		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 20442U 90005G   09080.85379851  .00000101  00000-0  52762-4 0  4846",
-			"tle2": "2 20442  98.2328  60.8676 0012920  67.8229 292.4325 14.32055802   813",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"UNAMSAT-2 (MO-30)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 24305U 96052B   09080.47219106  .00000009  00000-0 -65784-5 0   696",
-			"tle2": "2 24305  82.9323  58.9099 0030942 136.0160 224.3468 13.73567811628634",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"TIUNGSAT-1 (MO-46)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 26548U 00057D   09080.87169003 -.00000081  00000-0  87572-5 0  3491",
-			"tle2": "2 26548  64.5595 350.9689 0050062 285.2131  74.3419 14.83347625459005",
-			"draw_orbit": false,
-			"visible": false
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20442U 90005G   10301.84364414  .00000038  00000-0  29355-4 0  9398",
+			"tle2": "2 20442  98.3130 259.8718 0012739 121.7305 238.5120 14.32109553 84689",
+			"visible": false
+		},
+		"MOZHAYETS 4 (RS-22)": 
+		{
+			"comms": [
+			{
+				"description": "downlink",
+				"frequency": 435.352,
+				"modulation": "CW"
+			}],
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27939U 03042A   10302.06642910  .00000227  00000-0  52443-4 0  6735",
+			"tle2": "2 27939  97.8700 161.7284 0013634   1.4874 358.6385 14.63469503378538",
+			"visible": true
 		},
 		"NCUBE-2": 
 		{
 			"comms": [],
-			"tle1": "1 28897U 05043H   10010.64548338  .00000118  00000-0  34050-4 0   457",
-			"tle2": "2 28897  98.0343 260.0372 0018237  60.5035 299.7985 14.60015933216294",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"PCSAT (NO-44)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 26931U 01043C   09080.69111513 -.00000245  00000-0 -63501-4 0  1278",
-			"tle2": "2 26931  67.0529 289.7584 0005178 260.4427  99.6072 14.29549665390074",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"SAPPHIRE (NO-45)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 26932U 01043D   09080.93767055 -.00000067  00000-0  60390-5 0  1347",
-			"tle2": "2 26932  67.0506 289.0527 0006019 240.4193 119.6306 14.29604170390158",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28897U 05043H   10301.21380730  .00000281  00000-0  67563-4 0  2822",
+			"tle2": "2 28897  97.9915 181.0256 0016236 227.0454 132.9375 14.60143919258699",
 			"visible": false
 		},
 		"NOAA 15": 
@@ -1493,11 +1550,11 @@
 				"frequency": 137.5,
 				"modulation": "AM/APT"
 			}],
-			"description": "NOAA Weather Satellite 15",
 			"groups": ["scientific", "weather"],
-			"tle1": "1 25338U 98030A   09080.90089393 -.00000044  00000-0 -26503-6 0  8619",
-			"tle2": "2 25338  98.5808  72.0445 0009840 316.2506  43.7883 14.24749834564348",
-			"draw_orbit": true,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": true,
+			"tle1": "1 25338U 98030A   10301.29622088  .00000039  00000-0  35343-4 0  5746",
+			"tle2": "2 25338  98.6330 285.9285 0011477  50.6187 309.6026 14.24862396647703",
 			"visible": true
 		},
 		"NOAA 17": 
@@ -1508,11 +1565,11 @@
 				"frequency": 137.62,
 				"modulation": "AM/APT"
 			}],
-			"description": "NOAA Weather Satellite 17",
 			"groups": ["scientific", "weather"],
-			"tle1": "1 27453U 02032A   09080.80573152 -.00000085  00000-0 -18637-4 0  3444",
-			"tle2": "2 27453  98.4939 142.8491 0011919  24.2008 335.9717 14.24048587350311",
-			"draw_orbit": true,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": true,
+			"tle1": "1 27453U 02032A   10301.34155174  .00000013  00000-0  23508-4 0   406",
+			"tle2": "2 27453  98.4151 346.3131 0012727 107.3453 252.9128 14.24202947433659",
 			"visible": true
 		},
 		"NOAA 18": 
@@ -1523,55 +1580,177 @@
 				"frequency": 137.1,
 				"modulation": "AM/APT"
 			}],
-			"description": "NOAA Weather Satellite 18",
 			"groups": ["scientific", "weather"],
-			"tle1": "1 28654U 05018A   09080.77119997  .00000000  00000-0  24577-4 0  8343",
-			"tle2": "2 28654  98.8994  24.7197 0013458 248.9605 111.0150 14.11241530197625",
-			"draw_orbit": true,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": true,
+			"tle1": "1 28654U 05018A   10301.36432412 -.00000103  00000-0 -31919-4 0  5303",
+			"tle2": "2 28654  98.9662 247.3312 0015092  40.2479 319.9812 14.11400503280228",
 			"visible": true
 		},
 		"OPAL (OO-38)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 26063U 00004C   09080.77017786 -.00000011  00000-0  16522-4 0  4630",
-			"tle2": "2 26063 100.1939 211.4200 0036983 147.0349 213.3150 14.35858482479406",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26063U 00004C   10301.79139841  .00000023  00000-0  28053-4 0  9388",
+			"tle2": "2 26063 100.1955 184.9222 0036493 298.1072  61.6434 14.35911320563504",
 			"visible": false
 		},
 		"OSCAR 3 (OSCAR III)": 
 		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 01293U 65016F   09080.92578501  .00000079  00000-0  82795-4 0  4881",
-			"tle2": "2 01293  70.0694 359.9998 0020227 281.6686  78.2153 14.04694421247559",
-			"draw_orbit": false,
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 01293U 65016F   10301.16504886  .00000182  00000-0  14627-3 0  9293",
+			"tle2": "2 01293  70.0742 175.0957 0020293 230.4062 129.5239 14.04822768329742",
+			"visible": false
+		},
+		"OSCAR 5 (AO-5)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 04321U 70008B   10301.91710438 -.00000031  00000-0  10000-3 0  3895",
+			"tle2": "2 04321 102.1008 327.0014 0027516 116.1671 244.2233 12.52160958863180",
+			"visible": false
+		},
+		"OSCAR 6 (AO-6)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 06236U 72082B   10300.62660884 -.00000027  00000-0  10000-3 0  3796",
+			"tle2": "2 06236 101.3975 298.8583 0004330 359.0525   1.0536 12.53083162739710",
+			"visible": false
+		},
+		"OSCAR 7 (AO-7)": 
+		{
+			"comms": [
+			{
+				"description": "200mW Beacon used with Modes B & C",
+				"frequency": 145.972
+			}, 
+			{
+				"description": "downlink",
+				"frequency": 145.95,
+				"modulation": "Modes B & C"
+			}, 
+			{
+				"description": "uplink",
+				"frequency": 145.9,
+				"modulation": "Mode A"
+			}, 
+			{
+				"description": "downlink",
+				"frequency": 29.45,
+				"modulation": "Mode A"
+			}, 
+			{
+				"description": "200mW Beacon used with Mode A",
+				"frequency": 29.502
+			}, 
+			{
+				"frequency": 2304.1,
+				"modulation": "40 mW Beacon - only when commanded"
+			}, 
+			{
+				"description": "uplink",
+				"frequency": 432.15,
+				"modulation": "Modes B & C"
+			}],
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 07530U 74089B   10301.95788337 -.00000027  00000-0  10000-3 0  9149",
+			"tle2": "2 07530 101.3995 312.6222 0012265  12.5206 347.6162 12.53580065645217",
+			"visible": true
+		},
+		"OSCAR 8 (AO-8)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 10703U 78026B   10302.09716984  .00000360  00000-0  27885-3 0  9772",
+			"tle2": "2 10703  98.7639 332.1837 0005434 220.9322 139.1432 13.98878843665771",
+			"visible": false
+		},
+		"PACSAT (AO-16)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20439U 90005D   10301.79742930  .00000042  00000-0  31108-4 0   295",
+			"tle2": "2 20439  98.3505 254.5613 0011591 126.5263 233.6991 14.31880226 84503",
+			"visible": false
+		},
+		"PAN SAT (PO-34)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25520U 98064B   10301.70201388  .00000947  00000-0  36144-4 0  6084",
+			"tle2": "2 25520  28.4585 155.8089 0005085 340.3000  19.7375 15.17716130664451",
+			"visible": false
+		},
+		"PCSAT (NO-44)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26931U 01043C   10302.17766215 -.00000115  00000-0 -12460-4 0  5936",
+			"tle2": "2 26931  67.0531 218.7490 0005616 271.5946  88.4492 14.29617215473904",
 			"visible": false
 		},
 		"PEHUENSAT 1 (PO-63)": 
 		{
 			"comms": [],
-			"tle1": "1 29712U 07001D   09129.76442331  .00000438  00000-0  63872-4 0  4664",
-			"tle2": "2 29712  97.8314 187.0851 0015285  43.5600 316.6810 14.80531783125782",
-			"draw_orbit": false,
-			"visible": false
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 29712U 07001D   10301.18895127  .00001391  00000-0  18424-3 0  3692",
+			"tle2": "2 29712  97.7673 349.0635 0015087  91.9833 268.3076 14.81366235205172",
+			"visible": false
+		},
+		"PHASE 3B (AO-10)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 14129U 83058B   10301.48429116 -.00000086  00000-0  10000-3 0  7774",
+			"tle2": "2 14129  26.7917  67.8588 6039053   9.7099 357.9616  2.05867874177912",
+			"visible": false
+		},
+		"PHASE 3D (AO-40)": 
+		{
+			"comms": [
+			{
+				"description": "Beacon",
+				"frequency": 145.898
+			}],
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26609U 00072B   10299.42141595 -.00000068  00000-0  10000-3 0  4325",
+			"tle2": "2 26609   8.7380 307.8723 7952988   1.7527 359.9938  1.25586613 45867",
+			"visible": true
 		},
 		"POSAT (PO-28)": 
 		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 22829U 93061G   09080.84418226 -.00000012  00000-0  11647-4 0  1746",
-			"tle2": "2 22829  98.4087  38.9001 0010531 125.5741 234.6455 14.30211190807812",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"PAN SAT (PO-34)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 25520U 98064B   09080.51367299  .00000409  00000-0  10351-4 0  2091",
-			"tle2": "2 25520  28.4596 121.9419 0005186  71.4910 288.6250 15.17311364575324",
-			"draw_orbit": false,
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 22829U 93061G   10302.02792415  .00000101  00000-0  55301-4 0  6131",
+			"tle2": "2 22829  98.4857 248.1374 0009510 193.5771 166.5159 14.30264274891603",
 			"visible": false
 		},
 		"RADIO ROSTO (RS-15)": 
@@ -1595,70 +1774,41 @@
 				"frequency": 145.878,
 				"modulation": "Mode A"
 			}],
-			"description": "Radio Sputnik (RS) 15",
-			"groups": ["amateur"],
-			"tle1": "1 23439U 94085A   09080.97335086 -.00000039  00000-0  10000-3 0  2029",
-			"tle2": "2 23439  64.8130  45.8464 0146514  68.4113 293.2342 11.27553256586281",
-			"draw_orbit": false,
-			"visible": true
-		},
-		"MOZHAYETS 4 (RS-22)": 
-		{
-			"comms": [
-			{
-				"description": "downlink",
-				"frequency": 435.352,
-				"modulation": "CW"
-			}],
-			"description": "Amateur satellite",
-			"groups": ["amateur"],
-			"tle1": "1 27939U 03042A   09080.74176473  .00000091  00000-0  26556-4 0  7452",
-			"tle2": "2 27939  97.9578 318.7317 0014519  50.9541 309.2958 14.63301923292787",
-			"draw_orbit": false,
-			"visible": true
-		},
-		"SEASAT 1": 
+			"groups": ["amateur"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 23439U 94085A   10300.89335058 -.00000039  00000-0  10000-3 0  3454",
+			"tle2": "2 23439  64.8172 179.9334 0163415 320.8699  38.0499 11.27554569652230",
+			"visible": true
+		},
+		"SAPPHIRE (NO-45)": 
 		{
 			"comms": [],
-			"tle1": "1 10967U 78064A   10011.48877880 -.00000066  00000-0  21494-4 0   146",
-			"tle2": "2 10967 108.0202  37.9154 0003096 275.7432  84.3363 14.42175802655204",
-			"draw_orbit": false,
-			"visible": true
-		},
-		"SEDSAT 1 (SO-33)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 25509U 98061B   09080.68393431  .00000028  00000-0 -80808-5 0  4141",
-			"tle2": "2 25509  31.4336 187.2850 0354956 293.3308  63.0343 14.28246349543312",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"SUNSAT (SO-35)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 25636U 99008C   09080.57259666 -.00000022  00000-0  18215-5 0  2632",
-			"tle2": "2 25636  96.4526 285.7652 0148832 138.9281 222.3233 14.43457619530468",
-			"draw_orbit": false,
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26932U 01043D   10300.93680270  .00000207  00000-0  11303-3 0  6008",
+			"tle2": "2 26932  67.0569 222.0623 0003987 282.5276  77.5383 14.29652157473776",
 			"visible": false
 		},
 		"SAUDISAT 1A (SO-41)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 26545U 00057A   09081.15361688  .00000047  00000-0  25135-4 0  2129",
-			"tle2": "2 26545  64.5602  25.7522 0053775 291.6905  67.8477 14.80571352458315",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26545U 00057A   10302.21213510  .00000238  00000-0  49391-4 0  6636",
+			"tle2": "2 26545  64.5593  19.7278 0028002 198.2244 161.7864 14.80754992545086",
 			"visible": false
 		},
 		"SAUDISAT 1B (SO-42)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 26549U 00057E   09080.84595995 -.00000003  00000-0  19202-4 0  2905",
-			"tle2": "2 26549  64.5580  42.8624 0056981 296.2253  63.3012 14.79427179457945",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26549U 00057E   10301.27703190  .00000252  00000-0  52462-4 0  7554",
+			"tle2": "2 26549  64.5588  42.0123 0033543 196.2105 163.7950 14.79603796544554",
 			"visible": false
 		},
 		"SAUDISAT 1C (SO-50)": 
@@ -1674,73 +1824,151 @@
 				"frequency": 436.795,
 				"modulation": "FM"
 			}],
-			"description": "Amateur satellite",
 			"groups": ["amateur"],
-			"tle1": "1 27607U 02058C   09080.71748238 -.00000074  00000-0  10658-4 0  8438",
-			"tle2": "2 27607  64.5592 290.7496 0076162 224.5615 134.9353 14.71420878335808",
-			"draw_orbit": false,
-			"visible": true
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 27607U 02058C   10301.61448115  .00000083  00000-0  34786-4 0  3045",
+			"tle2": "2 27607  64.5581 311.2303 0045303  21.9147 338.3881 14.71594408422011",
+			"visible": true
+		},
+		"SEASAT 1": 
+		{
+			"comms": [],
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 10967U 78064A   10301.42156452  .00000021  00000-0  47716-4 0  2504",
+			"tle2": "2 10967 108.0170 282.5360 0003008 244.5472 115.5366 14.42233989697001",
+			"visible": true
+		},
+		"SEDSAT 1 (SO-33)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25509U 98061B   10301.54597441  .00000218  00000-0  32855-4 0  8244",
+			"tle2": "2 25509  31.4315 114.3559 0352948  15.8890 345.2447 14.28335354627136",
+			"visible": false
+		},
+		"SSETI EXPRESS (XO-53)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28894U 05043E   10302.16153439  .00000121  00000-0  34690-4 0  9025",
+			"tle2": "2 28894  97.9880 181.3536 0016597 225.9524 134.0317 14.59762730266645",
+			"visible": false
+		},
+		"SUNSAT (SO-35)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25636U 99008C   10301.17920158  .00000094  00000-0  31863-4 0  7442",
+			"tle2": "2 25636  96.4810  11.4219 0149458  85.2411 276.5846 14.43522153614944",
+			"visible": false
+		},
+		"TECHSAT 1B (GO-32)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25397U 98043D   10301.04803974  .00000064  00000-0  46175-4 0  3171",
+			"tle2": "2 25397  98.3171 301.2061 0000536 187.5333 172.5857 14.23188315638945",
+			"visible": false
+		},
+		"TIUNGSAT-1 (MO-46)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 26548U 00057D   10301.43415163  .00000269  00000-0  50374-4 0  8347",
+			"tle2": "2 26548  64.5572 338.3968 0020896 204.3629 155.6463 14.83575119545869",
+			"visible": false
 		},
 		"TMSAT-1 (TO-31)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 25396U 98043C   09080.64556542 -.00000075  00000-0 -14722-4 0  3609",
-			"tle2": "2 25396  98.3414 113.1366 0003330 117.6494 242.5017 14.23773358555849",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25396U 98043C   10301.66959165  .00000015  00000-0  24496-4 0  8311",
+			"tle2": "2 25396  98.3083 307.8110 0001932 195.3696 164.7419 14.23816641639233",
 			"visible": false
 		},
 		"UARS": 
 		{
 			"comms": [],
-			"tle1": "1 21701U 91063B   10011.56517379  .00007948  00000-0  10185-3 0  8632",
-			"tle2": "2 21701  56.9701 169.1612 0067526 215.9750 143.6756 15.57588661 11660",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 21701U 91063B   10302.26036846  .00018353  00000-0  16692-3 0  1147",
+			"tle2": "2 21701  56.9712 322.6612 0063129  75.5188 285.2865 15.65524459 57060",
 			"visible": true
 		},
+		"UNAMSAT-2 (MO-30)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 24305U 96052B   10301.64417402  .00000050  00000-0  37693-4 0  5644",
+			"tle2": "2 24305  82.9375 345.3896 0029043 310.0764  49.7849 13.73589184709104",
+			"visible": false
+		},
+		"UOSAT 12 (UO-36)": 
+		{
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 25693U 99021A   10301.41097796 -.00000043  00000-0  13897-4 0  3404",
+			"tle2": "2 25693  64.5608  25.1028 0045010 293.3862  66.2479 14.78829481621518",
+			"visible": false
+		},
 		"UOSAT 2 (UO-11)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 14781U 84021B   09080.64423839  .00000051  00000-0  14037-4 0  9177",
-			"tle2": "2 14781  98.1180 124.2766 0008009 259.6956 100.3325 14.79700400344880",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 14781U 84021B   10301.36196208 -.00000161  00000-0 -14259-4 0  3760",
+			"tle2": "2 14781  98.0387 353.3855 0009139 161.9114 198.2405 14.79849098431506",
 			"visible": false
 		},
 		"UOSAT 3 (UO-14)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 20437U 90005B   09080.89917087 -.00000002  00000-0  14954-4 0  8782",
-			"tle2": "2 20437  98.3297  42.5381 0011721  66.3877 293.8534 14.31539355   562",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20437U 90005B   10300.91152494 -.00000056  00000-0 -51411-5 0  3454",
+			"tle2": "2 20437  98.4072 246.6446 0011266 129.9527 230.2667 14.31589070 84265",
 			"visible": false
 		},
 		"UOSAT 4 (UO-15)": 
 		{
-			"description": "Amateur satellite",
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
-			"tle1": "1 20438U 90005C   09080.90778475 -.00000010  00000-0  12128-4 0  3731",
-			"tle2": "2 20438  98.3890  35.1941 0010802  94.4649 265.7767 14.30441006999994",
-			"draw_orbit": false,
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20438U 90005C   10301.79041733  .00000022  00000-0  24893-4 0  8454",
+			"tle2": "2 20438  98.4607 242.8951 0010217 160.3752 199.7827 14.30479448 83759",
 			"visible": false
 		},
 		"UOSAT 5 (UO-22)": 
 		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 21575U 91050B   09080.89099734  .00000050  00000-0  29842-4 0  5115",
-			"tle2": "2 21575  98.4357  31.0711 0006470 282.9876  77.0586 14.39667965928143",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"UOSAT 12 (UO-36)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 25693U 99021A   09080.89685166 -.00000052  00000-0  12065-4 0  8740",
-			"tle2": "2 25693  64.5601  24.0115 0014988 205.2445 154.7951 14.78742116534931",
-			"draw_orbit": false,
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 21575U 91050B   10301.83741544  .00000072  00000-0  37052-4 0  9705",
+			"tle2": "2 21575  98.5098 250.6008 0007023 332.9581  27.1235 14.39741581 12450",
 			"visible": false
 		},
 		"UWE-1": 
@@ -1751,42 +1979,21 @@
 				"frequency": 437.505,
 				"modulation": "AFSK, 9600 baud"
 			}],
-			"tle1": "1 28892U 05043C   10011.41208966  .00000105  00000-0  31411-4 0  5277",
-			"tle2": "2 28892  98.0328 260.2408 0018374  58.0630 302.2350 14.59806760224221",
-			"draw_orbit": false,
+			"groups": [],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 28892U 05043C   10302.15932038  .00000277  00000-0  67049-4 0  7666",
+			"tle2": "2 28892  97.9897 181.2370 0016475 223.3607 136.6293 14.59933347266640",
 			"visible": false
 		},
-		"HAMSAT (VO-52)": 
-		{
-			"comms": [
-			{
-				"description": "Beacon",
-				"frequency": 145.86,
-				"modulation": "CW"
-			}],
-			"description": "Amateur satellite",
-			"groups": ["amateur"],
-			"tle1": "1 28650U 05017B   09080.72416803 -.00000248  00000-0 -24823-4 0  1847",
-			"tle2": "2 28650  97.7510 145.1610 0026425 317.3448  42.5717 14.81561809209694",
-			"draw_orbit": false,
-			"visible": true
-		},
 		"WEBERSAT (WO-18)": 
 		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 20441U 90005F   09080.86048996  .00000029  00000-0  26273-4 0  7816",
-			"tle2": "2 20441  98.2526  56.8316 0012586  69.9267 290.3272 14.31886901   720",
-			"draw_orbit": false,
-			"visible": false
-		},
-		"SSETI EXPRESS (XO-53)": 
-		{
-			"description": "Amateur satellite",
-			"groups": ["amateur", "non-operational"],
-			"tle1": "1 28894U 05043E   09080.73492122  .00000020  00000-0  13815-4 0  4180",
-			"tle2": "2 28894  98.0668 333.5116 0016556 264.1886  95.7421 14.59659039181098",
-			"draw_orbit": false,
+			"comms": [],
+			"groups": ["amateur", "non-operational"],
+			"orbitColor": [0, 0, 0],
+			"orbitVisible": false,
+			"tle1": "1 20441U 90005F   10301.84779390  .00000035  00000-0  28489-4 0  2555",
+			"tle2": "2 20441  98.3319 257.0049 0012093 124.2979 235.9352 14.31947554 84589",
 			"visible": false
 		}
 	},

=== modified file 'plugins/Satellites/src/CMakeLists.txt'
--- plugins/Satellites/src/CMakeLists.txt	2010-05-10 08:59:49 +0000
+++ plugins/Satellites/src/CMakeLists.txt	2010-10-30 00:49:41 +0000
@@ -1,15 +1,33 @@
-INCLUDE_DIRECTORIES(. sgp4sdp4 gui ${CMAKE_BINARY_DIR}/plugins/Satellites/src ${CMAKE_BINARY_DIR}/plugins/Satellites/src/gui)
+INCLUDE_DIRECTORIES(. gsatellite gui ${CMAKE_BINARY_DIR}/plugins/Satellites/src ${CMAKE_BINARY_DIR}/plugins/Satellites/src/gui)
 
 LINK_DIRECTORIES(/src)
 
 SET(Satellites_SRCS
-  sgp4sdp4/sgp4sdp4.c
-  sgp4sdp4/sgp4sdp4.h
-  sgp4sdp4/sgp_in.c
-  sgp4sdp4/sgp_math.c
-  sgp4sdp4/sgp_obs.c
-  sgp4sdp4/sgp_time.c
-  sgp4sdp4/solar.c
+  gsatellite/gException.hpp
+  gsatellite/gMatrix.cpp
+  gsatellite/gMatrix.hpp
+  gsatellite/gMatrixTempl.hpp
+  gsatellite/gObserver.cpp
+  gsatellite/gObserver.hpp
+  gsatellite/gSatTEME.cpp
+  gsatellite/gSatTEME.hpp
+  gsatellite/mathUtils.cpp
+  gsatellite/mathUtils.hpp
+  gsatellite/gTime.cpp
+  gsatellite/gTime.hpp
+  gsatellite/gTimeSpan.cpp
+  gsatellite/gVector.cpp
+  gsatellite/gVector.hpp
+  gsatellite/gVectorTempl.hpp
+  gsatellite/sgp4ext.cpp
+  gsatellite/sgp4ext.h
+  gsatellite/sgp4io.cpp
+  gsatellite/sgp4io.h
+  gsatellite/sgp4unit.cpp
+  gsatellite/sgp4unit.h
+  gsatellite/stdsat.h
+
+  
   Satellite.hpp
   Satellite.cpp
   Satellites.hpp

=== modified file 'plugins/Satellites/src/Satellite.cpp'
--- plugins/Satellites/src/Satellite.cpp	2010-10-27 15:20:46 +0000
+++ plugins/Satellites/src/Satellite.cpp	2010-10-30 00:49:41 +0000
@@ -27,12 +27,22 @@
 #include "StelTexture.hpp"
 #include "VecMath.hpp"
 #include "StelUtils.hpp"
-#include "sgp4sdp4/sgp4sdp4.h"
+
+
+#include "gsatellite/gSatTEME.hpp"
+#include "gsatellite/gObserver.hpp"
+#include "gsatellite/gTime.hpp"
+#include "gsatellite/gVector.hpp"
 
 #include <QTextStream>
 #include <QRegExp>
 #include <QDebug>
 #include <QVariant>
+#include <QtOpenGL>
+#include <QSettings>
+
+#include <cmath>
+#include <cstdlib>
 
 // static data members - will be initialised in the Satallites class (the StelObjectMgr)
 StelTextureSP Satellite::hintTexture;
@@ -47,13 +57,15 @@
 	if (!map.contains("designation") || !map.contains("tle1") || !map.contains("tle2"))
 		return;
 	
-		
+	font.setPixelSize(16);
+
 	designation  = map.value("designation").toString();
 	strncpy(elements[0], "DUMMY", 5);
 	strncpy(elements[1], qPrintable(map.value("tle1").toString()), 80);
 	strncpy(elements[2], qPrintable(map.value("tle2").toString()), 80);
 	if (map.contains("description")) description = map.value("description").toString();
 	if (map.contains("visible")) visible = map.value("visible").toBool();
+	if (map.contains("orbitVisible")) orbitVisible = map.value("orbitVisible").toBool();
 
 	if (map.contains("hintColor"))
 	{
@@ -87,12 +99,16 @@
 		}
 	}
 
+	pSatellite = new gSatTEME( designation.toAscii().data(), elements[1], elements[2]);
+
 	setObserverLocation();
 	initialized = true;
 }
 
 Satellite::~Satellite()
 {
+	if(pSatellite != NULL)
+		delete pSatellite;
 }
 
 QVariantMap Satellite::getMap(void)
@@ -100,11 +116,14 @@
 	QVariantMap map;
 	map["designation"] = designation;
 	map["visible"] = visible;
+	map["orbitVisible"] = orbitVisible;
 	map["tle1"] = QString(elements[1]);
 	map["tle2"] = QString(elements[2]);
-	QVariantList col;
+	QVariantList col, orbitCol;;
 	col << (double)hintColor[0] << (double)hintColor[1] << (double)hintColor[2];
+	orbitCol << (double)orbitColor[0] << (double)orbitColor[1] << (double)orbitColor[2];
 	map["hintColor"] = col;
+	map["orbitColor"] = orbitCol;
 	QVariantList commList;
 	foreach(commLink c, comms)
 	{
@@ -146,9 +165,23 @@
 
 	if (flags&Extra1)
 	{
+		oss << "<p>";
 		oss << QString("Range (km): <b>%1</b>").arg(range, 5, 'f', 2) << "<br>";
 		oss << QString("Range rate (km/s): <b>%1</b>").arg(rangeRate, 5, 'f', 3) << "<br>";
 		oss << QString("Altitude (km): <b>%1</b>").arg(height, 5, 'f', 2) << "<br>";
+		oss << QString("SubPoint Lat/Long(Deg): <b>%1</b>").arg(LatLong[0], 5, 'f', 2) << "/";
+		oss << QString("<b>%1</b>").arg(LatLong[1], 5, 'f', 3);
+		oss << "</p>";
+
+		oss << "TEME Coordinates(km):  ";
+		oss << QString("<b>X:</b> %1 ").arg(Position[0], 5, 'f', 2);
+		oss << QString("<b>Y:</b> %1 ").arg(Position[1], 5, 'f', 2);
+		oss << QString("<b>Z:</b> %1 ").arg(Position[2], 5, 'f', 2) << "<br>";
+		oss << "TEME Vel(km/s):  ";
+		oss << QString("<b>X:</b> %1 ").arg(Vel[0], 5, 'f', 2);
+		oss << QString("<b>Y:</b> %1 ").arg(Vel[1], 5, 'f', 2);
+		oss << QString("<b>Z:</b> %1 ").arg(Vel[2], 5, 'f', 2) << "<br>";
+
 	}
 
 	if (flags&Extra2 && comms.size() > 0)
@@ -191,9 +224,10 @@
 	{
 		l = *loc;
 	}
-	obs_geodetic.lon = l.longitude * de2ra;
-	obs_geodetic.lat = l.latitude * de2ra;
-	obs_geodetic.alt = l.altitude / 1000.0;
+
+
+	observer.setPosition( l.latitude, l.longitude, l.altitude / 1000.0);
+
 }
 
 Vec3f Satellite::getInfoColor(void) const {
@@ -212,36 +246,26 @@
 
 void Satellite::update(double)
 {
-	ClearFlag(ALL_FLAGS);
-	Get_Next_Tle_Set(elements, &tle);
-	memcpy(&localtle, &tle, sizeof(tle_t));
-	select_ephemeris(&tle);
-	double jul_epoch, jul_utc, tsince, phase;
-	vector_t vel = {0,0,0,0};
-	vector_t pos = {0,0,0,0};
-	vector_t obs_set;
-	geodetic_t sat_geodetic;
-	jul_utc = StelApp::getInstance().getCore()->getNavigator()->getJDay();
-	jul_epoch = Julian_Date_of_Epoch(tle.epoch);
-	tsince = (jul_utc - jul_epoch) * xmnpda;
-
-	if (isFlagSet(DEEP_SPACE_EPHEM_FLAG))
-		SDP4(tsince, &tle, &pos, &vel, &phase);
-	else
-		SGP4(tsince, &tle, &pos, &vel, &phase);
-
-	Convert_Sat_State(&pos, &vel);
-	SgpMagnitude(&vel); // scalar magnitude, not brightness...
-	velocity=vel.w;
-
-	Calculate_Obs(jul_utc, &pos, &vel, &obs_geodetic, &obs_set);
-	Calculate_LatLonAlt(jul_utc, &pos, &sat_geodetic);
-
-	azimuth=Degrees(obs_set.x);
-	elevation=Degrees(obs_set.y);
-	range=obs_set.z;
-	rangeRate=obs_set.w;
-	height=sat_geodetic.alt;
+	double jul_utc = StelApp::getInstance().getCore()->getNavigator()->getJDay();
+
+	epochTime = jul_utc;
+
+	pSatellite->setEpoch( epochTime);
+	Position = pSatellite->getPos();
+	Vel      = pSatellite->getVel();
+	LatLong  = pSatellite->getSubPoint( epochTime);
+	azElPos  = observer.calculateLook( *pSatellite, epochTime);
+
+
+	azimuth   = azElPos[ AZIMUTH]/KDEG2RAD;
+	elevation = azElPos[ ELEVATION]/KDEG2RAD;
+	range     = azElPos[ RANGE];
+	rangeRate = azElPos[ RANGERATE];
+	height    = LatLong[2];
+
+	// Compute orbit points to draw orbit line.
+	if(orbitVisible) computeOrbitPoints();
+
 }
 
 double Satellite::getDoppler(double freq) const
@@ -259,16 +283,164 @@
 	XYZ = core->getNavigator()->j2000ToEquinoxEqu(core->getNavigator()->altAzToEquinoxEqu(pos));
 	StelApp::getInstance().getVisionModeNight() ? glColor4f(0.6,0.0,0.0,1.0) : glColor4f(hintColor[0],hintColor[1],hintColor[2], Satellite::hintBrightness);
 
+
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
 	Vec3d xy;
 	if (prj->project(XYZ,xy))
 	{
+
 		if (Satellite::showLabels)
 		{
 			painter.drawText(xy[0], xy[1], designation, 0, 10, 10, false);
 			Satellite::hintTexture->bind();
 		}
 		painter.drawSprite2dMode(xy[0], xy[1], 11);
+
+		if(orbitVisible) drawOrbit(core, prj, painter);
+	}
+}
+
+void Satellite::drawOrbit(const StelCore* core, StelProjectorP& prj, StelPainter& painter){
+	Vec3d XYZPos, xy1;
+	float a, azimth, elev;
+	QVarLengthArray<float, 1024> vertexArray;
+
+
+	glDisable(GL_TEXTURE_2D);
+	glEnable(GL_LINE_SMOOTH);
+	glEnable(GL_BLEND);
+	painter.enableClientStates(true, false, false);
+
+	QList<gVector>::iterator it= orbitPoints.begin();
+
+	for(int i=0; i<orbitPoints.size();i++)
+	{
+		azimth = it->at( AZIMUTH);
+		elev   = it->at( ELEVATION);
+		a      = ( (azimth/KDEG2RAD)-90)*M_PI/180;
+		Vec3d pos(sin(a),cos(a), tan( (elev/KDEG2RAD) * M_PI / 180.));
+		XYZPos = core->getNavigator()->j2000ToEquinoxEqu(core->getNavigator()->altAzToEquinoxEqu(pos));
+
+		if (prj->project(XYZPos,xy1))
+		{
+			vertexArray.append(xy1[0]);
+			vertexArray.append(xy1[1]);
+		}
+		it++;
+
+		// draw the end parts of the orbit only, since they have non-standard color
+		// We'll draw the middle segment (with all the same color) with a single
+		// call to drawFromArray after this loop closes.
+		if (i>0 && ((DRAWORBIT_SLOTS_NUMBER/2) - abs(i - (DRAWORBIT_SLOTS_NUMBER/2) % DRAWORBIT_SLOTS_NUMBER)) < DRAWORBIT_FADE_NUMBER)
+		{
+			painter.setColor(hintColor[0], hintColor[1], hintColor[2], hintBrightness * calculateOrbitSegmentIntensity(i));
+			painter.setVertexPointer(2, GL_FLOAT, vertexArray.constData());
+			painter.drawFromArray(StelPainter::LineStrip, 2, i-1, false);
+		}
+	}
+
+	// draw the middle segments of the orbit which are all the same color
+	if(!vertexArray.isEmpty())
+	{
+		if (vertexArray.count() > (2*DRAWORBIT_FADE_NUMBER))
+		{
+			painter.setColor(hintColor[0], hintColor[1], hintColor[2], hintBrightness);
+			painter.setVertexPointer(2, GL_FLOAT, vertexArray.constData());
+			painter.drawFromArray(StelPainter::LineStrip, DRAWORBIT_SLOTS_NUMBER + 1 - (2*DRAWORBIT_FADE_NUMBER), DRAWORBIT_FADE_NUMBER - 1, false);
+		}
+		vertexArray.clear();
+	}
+
+	painter.enableClientStates(false);
+	glEnable(GL_TEXTURE_2D);
+}
+
+float Satellite::calculateOrbitSegmentIntensity(int segNum)
+{
+	int endDist = (DRAWORBIT_SLOTS_NUMBER/2) - abs(segNum - (DRAWORBIT_SLOTS_NUMBER/2) % DRAWORBIT_SLOTS_NUMBER);
+	if (endDist > DRAWORBIT_FADE_NUMBER) { return 1.0; }
+	else { return (endDist  + 1) / (DRAWORBIT_FADE_NUMBER + 1.0); }
+}
+
+void Satellite::computeOrbitPoints(){
+
+	gTimeSpan computeInterval(0,0,0,DRAWORBIT_SLOT_SECNUMBER);  //1/2 minute
+	gTimeSpan orbitSpan(0,0,0, DRAWORBIT_SLOTS_NUMBER*DRAWORBIT_SLOT_SECNUMBER/2);       //+- 15 minutes range.
+	gTime	  epochTm;
+	gVector   azElVector;
+	int	  diffSlots;
+
+
+	if( orbitPoints.isEmpty())//Setup orbitPoins
+	{
+		epochTm  = epochTime - orbitSpan;
+
+		for(int i=0; i< DRAWORBIT_SLOTS_NUMBER; i++)
+		{
+			pSatellite->setEpoch( epochTm);
+			azElVector  = observer.calculateLook( *pSatellite, epochTm);
+			orbitPoints.append(azElVector);
+			epochTm += computeInterval;
+		}
+		lastEpochCompForOrbit = epochTime;
+	}
+	else if( epochTime > lastEpochCompForOrbit)
+	{ // compute next orbit point when clock runs forward
+
+		gTimeSpan diffTime = epochTime - lastEpochCompForOrbit;
+		diffSlots          = (int)(diffTime.getDblSeconds()/DRAWORBIT_SLOT_SECNUMBER);
+
+		if(diffSlots > 0)
+		{
+			if( diffSlots > DRAWORBIT_SLOTS_NUMBER)
+			{
+				diffSlots = DRAWORBIT_SLOTS_NUMBER;
+				epochTm   = epochTime - orbitSpan;
+			}
+			else
+			{
+				epochTm   = lastEpochCompForOrbit + orbitSpan + computeInterval;
+			}
+
+			for( int i=0; i<diffSlots;i++)
+			{  //remove points at beginning of list and add points at end.
+				orbitPoints.removeFirst();
+				pSatellite->setEpoch( epochTm);
+				azElVector  = observer.calculateLook( *pSatellite, epochTm);
+				orbitPoints.append(azElVector);
+				epochTm += computeInterval;
+			}
+
+			lastEpochCompForOrbit = epochTime;
+		}
+	}
+	else if(epochTime < lastEpochCompForOrbit)
+	{ // compute next orbit point when clock runs backward
+		gTimeSpan diffTime =  lastEpochCompForOrbit - epochTime;
+		diffSlots          = (int)(diffTime.getDblSeconds()/DRAWORBIT_SLOT_SECNUMBER);
+
+		if(diffSlots > 0)
+		{
+			if( diffSlots > DRAWORBIT_SLOTS_NUMBER)
+			{
+				diffSlots = DRAWORBIT_SLOTS_NUMBER;
+				epochTm   = epochTime + orbitSpan;
+			}
+			else
+			{
+				epochTm   = epochTime - orbitSpan - computeInterval;
+			}
+			for( int i=0; i<diffSlots;i++)
+			{ //remove points at end of list and add points at beginning.
+				orbitPoints.removeLast();
+				pSatellite->setEpoch( epochTm);
+				azElVector  = observer.calculateLook( *pSatellite, epochTm);
+				orbitPoints.push_front(azElVector);
+				epochTm -= computeInterval;
+
+			}
+			lastEpochCompForOrbit = epochTime;
+		}
 	}
 }
 

=== modified file 'plugins/Satellites/src/Satellite.hpp'
--- plugins/Satellites/src/Satellite.hpp	2010-05-17 19:24:14 +0000
+++ plugins/Satellites/src/Satellite.hpp	2010-10-30 00:49:41 +0000
@@ -23,10 +23,23 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
+#include <QFont>
+#include <QList>
 
 #include "StelObject.hpp"
 #include "StelTextureTypes.hpp"
-#include "sgp4sdp4/sgp4sdp4.h"
+
+#include "StelPainter.hpp"
+#include "gsatellite/gSatTEME.hpp"
+#include "gsatellite/gObserver.hpp"
+#include "gsatellite/gTime.hpp"
+#include "gsatellite/gVector.hpp"
+
+
+#define DRAWORBIT_SLOTS_NUMBER    131
+#define DRAWORBIT_FADE_NUMBER     10
+#define DRAWORBIT_SLOT_SECNUMBER  10
+
 
 class StelPainter;
 class StelLocation;
@@ -82,14 +95,26 @@
 	double getDoppler(double freq) const;
 	static float showLabels;
 
+public:
+    void enableDrawOrbit(bool b);
+
+private:
+	//draw orbits methods
+	void computeOrbitPoints();
+	void drawOrbit(const StelCore* core, StelProjectorP& prj, StelPainter& painter);
+	//! returns 0 - 1.0 for the DRAWORBIT_FADE_NUMBER segments at
+	//! each end of an orbit, with 1 in the middle.
+	float calculateOrbitSegmentIntensity(int segNum);
+
 private:
 	bool initialized;
 	bool visible;
+	bool orbitVisible;  //draw orbit enabled/disabled
+
 	QString designation;               // The ID of the satllite
 	QString description;               // longer description of spacecraft
 	Vec3d XYZ;                         // holds J2000 position
 	char elements[3][80];              // TLE elements as char* for passing to sgp lib
-	tle_t tle, localtle;
 	double height, velocity, azimuth, elevation, range, rangeRate;
 	QList<commLink> comms;
 	Vec3f hintColor;
@@ -98,10 +123,25 @@
 	static StelTextureSP hintTexture;
 	static float hintBrightness;
 	static float hintScale;
-	geodetic_t obs_geodetic;           // observer location
 
 	void draw(const StelCore* core, StelPainter& painter, float maxMagHints);
 	void setObserverLocation(StelLocation* loc=NULL);
+
+	//gsatellite objects
+	gSatTEME *pSatellite;
+	gObserver observer;
+	gTime     epochTime;
+	gVector   Position;
+	gVector   Vel;
+	gVector   LatLong;
+	gVector   azElPos;
+
+	//Satellite Orbit Draw
+	QFont     font;
+	Vec3f     orbitColor;
+	gTime     lastEpochCompForOrbit;
+	QList<gVector> orbitPoints; //orbit points represented by azElPos vectors
+
 };
 
 #endif // _SATELLITE_HPP_ 

=== modified file 'plugins/Satellites/src/Satellites.hpp'
--- plugins/Satellites/src/Satellites.hpp	2010-04-18 17:48:49 +0000
+++ plugins/Satellites/src/Satellites.hpp	2010-10-30 00:49:41 +0000
@@ -42,7 +42,7 @@
 typedef QSharedPointer<Satellite> SatelliteP;
 
 //! @class Satellites
-//! Satellites in low Earth orbith require different orbital calculations from planets, the moon
+//! Satellites in low Earth orbit require different orbital calculations from planets, the moon
 //! and so on.  This plugin implements the SGP4/SDP4 algorithms in Stellarium, allowing accurate
 //! prediction of the position of artificial satellites.
 class Satellites : public StelObjectModule

=== added directory 'plugins/Satellites/src/gsatellite'
=== added file 'plugins/Satellites/src/gsatellite/gException.hpp'
--- plugins/Satellites/src/gsatellite/gException.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gException.hpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by j. l. Canales                                   *
+ *   [e-mail]                                       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _GEXCEPTION_HPP_
+#define _GEXCEPTION_HPP_ 1
+
+#include <stdexcept>
+
+//Exception Codes
+#define EXCP_UNKNOWN             1
+#define EXCP_INCORRECTPARAM      2
+#define EXCP_OPERATIONOVERFLOW   3
+#define EXCP_MEMORYALLOCATION    4
+#define EXCP_COMPUTEOVERFLOW     5
+
+typedef unsigned int GEXCEPTIONTYPE;
+
+// Exception messages for GMatrix
+
+#define OPERATOR_X_INCOMPATIBLE_ORDER         "The matrix have incompatible order to calculate its verctorial product"
+#define OPERATOR_ADD_INCOMPATIBLE_ORDER       "The matrix have incompatible order to calculate the addition"
+#define OPERATOR_ADDEQUAL_INCOMPATIBLE_ORDER  "The matrix have incompatible order to calculate the addition"
+#define OPERATOR_DIFF_INCOMPATIBLE_ORDER      "The matrix have incompatible order to calculate the substraction"
+#define OPERATOR_DIFFEQUAL_INCOMPATIBLE_ORDER "The matrix have incompatible order to calculate the substraction"
+#define DET_INCOMPATIBLE_ORDER                "The matrix is not square, the determinant can't be calculate."
+
+#endif // _GEXCEPTION_HPP_

=== added file 'plugins/Satellites/src/gsatellite/gMatrix.cpp'
--- plugins/Satellites/src/gsatellite/gMatrix.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gMatrix.cpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,290 @@
+/***************************************************************************
+ * Name: GMatrix.cpp
+ *
+ * Date: 2009-12-31 16:34:55 +0100 (jue, 31 dic 2009)
+ * Revision: 17
+ * HeadURL: https://gsat.svn.sourceforge.net/svnroot/gsat/trunk/src/GMatrix.cpp
+ *
+ * Description: GMatrix Definition.
+ *              GMatrix class define a bidimensional GDOUBLE elements matrix
+ *              and the basic matrix operations.
+ *
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2004 by JL Canales                                      *
+ *   ph03696@homeserver                                                    *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+// CMatrix
+#include "gMatrix.hpp"
+#include "gException.hpp"
+
+#include <cassert>
+
+// Class gMatrix
+gMatrix::gMatrix() : gMatrixTempl<double>()
+{
+}
+
+gMatrix::gMatrix(unsigned int ai_uiRowNumber, unsigned int ai_uiColumNumber)
+	: gMatrixTempl<double>(ai_uiRowNumber, ai_uiColumNumber)
+{
+
+}
+
+
+bool gMatrix::operator!=(const gMatrix &right) const
+{
+	if((*this)==(right))
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+
+
+//## Other Operations (implementation)
+
+gMatrix gMatrix::operator *(const gMatrix &ai_RightMatrix)
+{
+
+	unsigned int iRow;
+	unsigned int iColumn;
+	unsigned int uiRightColumn = ai_RightMatrix.Columns();
+	unsigned int uiRightRow    = ai_RightMatrix.Rows();
+
+	unsigned int Iterator;
+	double dAuxValue = 0;
+	gMatrix ReturnedMatrix(Rows(), uiRightColumn);
+
+
+	if(Columns() != uiRightRow)
+	{
+		throw std::out_of_range(OPERATOR_X_INCOMPATIBLE_ORDER);
+	}
+	else
+	{
+		for(iRow = 0; iRow < Rows(); iRow++)
+			for(iColumn = 0; iColumn < uiRightColumn; iColumn++)
+			{
+				// Product and addition of implied elements
+				for(Iterator = 0; Iterator < uiRightRow; Iterator++)
+				{
+					dAuxValue += (operator[](iRow)[ Iterator] *
+					              ai_RightMatrix[ Iterator][ iColumn]);
+				}
+
+				ReturnedMatrix[ iRow][ iColumn] = dAuxValue;
+				dAuxValue = 0;
+			}
+	}
+
+	return ReturnedMatrix;
+}
+
+
+gVector gMatrix::operator *(const gVector &ai_RightVector)
+{
+
+	unsigned int iRow;
+	unsigned int iColumn;
+
+	double dAuxValue = 0;
+	gVector ReturnedVector(Rows());
+
+	assert(Columns() == ai_RightVector.size());
+
+
+	if(Columns() != ai_RightVector.size())
+	{
+		throw std::out_of_range(OPERATOR_X_INCOMPATIBLE_ORDER);
+	}
+	else
+	{
+		for(iRow = 0; iRow < Rows(); iRow++)
+		{
+			for(iColumn = 0; iColumn < Columns(); iColumn++)
+			{
+				// Product and addition of implied elements
+				dAuxValue += (operator[](iRow)[ iColumn] *
+				              ai_RightVector[ iColumn]);
+			}
+
+			ReturnedVector[ iRow] = dAuxValue;
+			dAuxValue = 0;
+
+		}
+	}
+	return ReturnedVector;
+}
+
+
+gMatrix gMatrix::operator *(double ai_dRight)
+{
+	unsigned int iRow;
+	unsigned int iColumn;
+	gMatrix ReturnedMatrix(Rows(), Columns());
+
+	try
+	{
+		for(iRow = 0; iRow < Rows(); iRow++)
+			for(iColumn = 0; iColumn < Columns(); iColumn ++)
+				ReturnedMatrix[ iRow][ iColumn] = ((*this)[ iRow][ iColumn] * ai_dRight);
+	}
+	catch(...)
+	{
+		for(iRow = 0; iRow < Rows(); iRow++)
+			for(iColumn = 0; iColumn < Columns(); iColumn ++)
+				ReturnedMatrix[ iRow][ iColumn] = 0;
+
+		throw;
+	}
+
+	return ReturnedMatrix;
+}
+
+gMatrix gMatrix::operator+(gMatrix &ai_RightMatrix) const
+{
+
+	gMatrix ReturnedMatrix(Rows(), Columns());
+
+#ifdef ENABLE_DEBUG
+	assert(Rows()==ai_RightMatrix.Rows() && Columns()==ai_RightMatrix.Columns());
+#endif
+
+	if(Rows()!=ai_RightMatrix.Rows() || Columns()!=ai_RightMatrix.Columns())
+	{
+		throw std::out_of_range(OPERATOR_ADD_INCOMPATIBLE_ORDER);
+	}
+
+
+	for(unsigned int i = 0; i<Rows(); i++)
+		for(unsigned int j = 0; j<Columns(); j++)
+			ReturnedMatrix[ i][ j] = operator[](i)[ j] + ai_RightMatrix[ i][ j];
+
+
+	return ReturnedMatrix;
+
+}
+
+const gMatrix& gMatrix::operator+=(gMatrix &ai_RightMatrix)
+{
+
+#ifdef ENABLE_DEBUG
+	assert(Rows()==ai_RightMatrix.Rows() && Columns()==ai_RightMatrix.Columns());
+#endif
+
+	if(Rows()!=ai_RightMatrix.Rows() || Columns()!=ai_RightMatrix.Columns())
+	{
+		throw std::out_of_range(OPERATOR_ADDEQUAL_INCOMPATIBLE_ORDER);
+	}
+	for(unsigned int i = 0; i<Rows(); i++)
+		for(unsigned int j = 0; j<Columns(); j++)
+			operator[](i)[ j] = operator[](i)[ j] + ai_RightMatrix[ i][ j];
+
+
+	return *this;
+
+}
+
+gMatrix gMatrix::operator-(gMatrix &ai_RightMatrix) const
+{
+
+	gMatrix ReturnedMatrix(Rows(), Columns());
+
+#ifdef ENABLE_DEBUG
+	assert(Rows()==ai_RightMatrix.Rows() && Columns()==ai_RightMatrix.Columns());
+#endif
+
+	if(Rows()!=ai_RightMatrix.Rows() || Columns()!=ai_RightMatrix.Columns())
+	{
+		throw std::out_of_range(OPERATOR_DIFF_INCOMPATIBLE_ORDER);
+	}
+	for(unsigned int i = 0; i<Rows(); i++)
+		for(unsigned int j = 0; j<Columns(); j++)
+			ReturnedMatrix[ i][ j] = operator[](i)[ j] - ai_RightMatrix[ i][ j];
+
+
+	return ReturnedMatrix;
+
+}
+
+const gMatrix& gMatrix::operator-=(gMatrix &ai_RightMatrix)
+{
+
+#ifdef ENABLE_DEBUG
+	assert(Rows()==ai_RightMatrix.Rows() && Columns()==ai_RightMatrix.Columns());
+#endif
+
+	if(Rows()!=ai_RightMatrix.Rows() || Columns()!=ai_RightMatrix.Columns())
+	{
+		throw std::out_of_range(OPERATOR_DIFFEQUAL_INCOMPATIBLE_ORDER);
+	}
+	for(unsigned int i = 0; i<Rows(); i++)
+		for(unsigned int j = 0; j<Columns(); j++)
+			operator[](i)[ j] = operator[](i)[ j] - ai_RightMatrix[ i][ j];
+
+
+	return *this;
+
+}
+
+double gMatrix::det()
+{
+
+	gMatrix aux=*this;
+	double dDet;
+	int k,l,i,j;
+	int n = Rows();
+	int m = n-1;
+
+
+	try
+	{
+		if(Columns() != Rows())
+		{
+			throw std::invalid_argument(DET_INCOMPATIBLE_ORDER);
+		}
+
+		dDet=aux[0][0];
+		for(k=0; k<m; k++)
+		{
+			l=k+1;
+			for(i=l; i<n; i++)
+			{
+				for(j=l; j<n; j++)
+				{
+					aux[i][j] = (aux[k][k]*aux[i][j]-aux[k][j]*aux[i][k])/aux[k][k];
+				}
+			}
+			dDet=dDet*aux[k+1][k+1];
+		}
+
+		return dDet;
+	}
+	catch(...)
+	{
+		throw;
+	}
+}
+

=== added file 'plugins/Satellites/src/gsatellite/gMatrix.hpp'
--- plugins/Satellites/src/gsatellite/gMatrix.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gMatrix.hpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,86 @@
+/***************************************************************************
+ * Name: gMatrix.h
+ *
+ * Date: 2007-03-29 17:01:15 +0200 (jue, 29 mar 2007)
+ * Revision: 16
+ * HeadURL: https://gsat.svn.sourceforge.net/svnroot/gsat/trunk/src/GMatrix.h
+ *
+ * Description:  Fichero de descripci� de la clase GMatrix.
+ *               Esta clase tiene como cometido la encapsulaci� de objetos
+ *               tipo matriz bidimensional de elementos GDOUBLE junto con
+ *               las operaciones de matrices realizables.
+ *
+ *
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2004 by JL Canales                                      *
+ *   ph03696@homeserver                                                    *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _GMATRIX_HPP_
+#define _GMATRIX_HPP_ 1
+
+// MatrixContainer
+#include "gMatrixTempl.hpp"
+#include "gVector.hpp"
+
+//! @class: gMatrix
+//! This class implement the needed code to make matrix calculations.
+//! The GMatrix class inherit from MatrixContainer class that is created
+//! from the vector STL class givingt all the STL vector funcionality.
+//! This class has not overlapped the = operator and the copy constructor
+//! because this methods are given by the vector STL class.
+class gMatrix : public gMatrixTempl<double>
+{
+public:
+	//## Constructors (generated)
+	gMatrix();
+
+	//## Constructors (specified)
+	//## Operation:gMatrix%950961952
+	//	Constructor whit row and column dimensions.
+	gMatrix ( unsigned int ai_uiRowNumber, unsigned int ai_uiColumNumber);
+
+	//## Equality Operations (generated)
+	bool operator!=( const gMatrix &right) const;
+
+	//## Other Operations (specified)
+	//## Operation: operator*%949869240
+	//	This operators make the vectorial product calculation
+	gMatrix operator* ( const gMatrix &ai_RightMatrix);
+
+	//## Operation: operator*%949869240
+	//	This operators make the vectorial product calculation
+	gVector operator* ( const gVector &ai_RightVector);
+
+	//## Operation: operator*%949869241
+	//	This operator make the scalar product calculation.
+	gMatrix operator* ( double ai_dRight);
+
+	gMatrix operator+ ( gMatrix &ai_RightMatrix) const;
+	const gMatrix& operator+=( gMatrix &ai_RightMatrix);
+
+	gMatrix operator- ( gMatrix &ai_RightMatrix) const;
+	const gMatrix& operator-=( gMatrix &ai_RightMatrix);
+
+	// Determinant
+	double det();
+};
+
+#endif //_GMATRIX_HPP_

=== added file 'plugins/Satellites/src/gsatellite/gMatrixTempl.hpp'
--- plugins/Satellites/src/gsatellite/gMatrixTempl.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gMatrixTempl.hpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,117 @@
+/***************************************************************************
+ * Name: gMatrixTempl.h
+ *
+ * Description: MatrixContainer is a template to build
+ *   			 bidimensional objects arrays.
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2006 by j. l. Canales   *
+ *   [e-mail]   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _GMATRIXTEMPL_HPP_
+#define _GMATRIXTEMPL_HPP_ 1
+
+#include "gVectorTempl.hpp"  // checked vector
+#include <iostream>          // for operator<<(), see below
+
+// matrix as vector of vectors
+template<class T>
+class gMatrixTempl : public br_stl::gVectorTempl<
+	br_stl::gVectorTempl<T> >
+{
+public:
+	typedef typename std::vector<T>::size_type size_type;
+
+	gMatrixTempl(size_type x = 0, size_type y = 0)
+		: br_stl::gVectorTempl< br_stl::gVectorTempl<T> >(x, br_stl::gVectorTempl<T>(y)), rows(x), columns(y)
+	{
+	}
+
+	gMatrixTempl(const gMatrixTempl<T> &right)
+		: br_stl::gVectorTempl< br_stl::gVectorTempl<T> >(right.rows, br_stl::gVectorTempl<T>(right.columns)), rows(right.rows), columns(right.columns)
+	{
+
+		for(size_type i = 0; i < rows; ++i)
+			for(size_type j = 0; j < columns ; ++j)
+				operator[](i)[j] = right[ i][ j];
+	}
+
+	size_type Rows() const
+	{
+		return rows;
+	}
+
+	size_type Columns() const
+	{
+		return columns;
+	}
+
+	void SetSize(size_type x, size_type y)
+	{
+
+		br_stl::gVectorTempl< br_stl::gVectorTempl<T> >::resize(x);
+		for(size_type index = 0; index < x; index++)
+			operator[](index).resize(y);
+
+		rows    = x;
+		columns = y;
+	}
+
+
+	void init(const T& Value)
+	{
+		for(size_type i = 0; i < rows; ++i)
+			for(size_type j = 0; j < columns ; ++j)
+				operator[](i)[j] = Value; // that is, (*this)[i][j]
+	}
+
+	// create identity matrix
+	gMatrixTempl<T>& I()
+	{
+		for(size_type i = 0; i < rows; ++i)
+			for(size_type j = 0; j < columns ; ++j)
+				operator[](i)[j] = (i==j) ? T(1) : T(0);
+		return *this;
+	}
+
+protected:
+	size_type rows;
+	size_type columns;
+
+
+}; // class Matrix
+
+
+template<class T>
+inline std::ostream& operator<<(std::ostream& s, const gMatrixTempl<T>& m)
+{
+	typedef typename gMatrixTempl<T>::size_type size_type;
+
+	for(size_type i = 0; i < m.Rows(); ++i)
+	{
+		s << std::endl << i <<" : ";
+		for(size_type j = 0; j < m.Columns(); ++j)
+			s << m[i][j] <<" ";
+	}
+	s << std::endl;
+	return s;
+}
+
+#endif // _GMATRIXTEMPL_HPP_

=== added file 'plugins/Satellites/src/gsatellite/gObserver.cpp'
--- plugins/Satellites/src/gsatellite/gObserver.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gObserver.cpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,88 @@
+/*
+ * gObserver.cpp
+ *
+ *  Created on: 05/08/2010
+ *      Author: cdeveloper
+ */
+
+#include "stdsat.h"
+#include "gVector.hpp"
+#include "gObserver.hpp"
+#include "gTime.hpp"
+#include "mathUtils.hpp"
+#include <math.h>
+
+//! Definition: This operation compute the observer ECI coordinates for the ai_epoch time
+void gObserver::getECIPosition(gTime ai_epoch, gVector& ao_position, gVector& ao_vel)
+{
+	ao_position.resize(3);
+	ao_vel.resize(3);
+	double radLatitude = m_latitude * KDEG2RAD;
+	double theta = ai_epoch.toThetaLMST(m_longitude * KDEG2RAD);
+	double r;
+	double c,sq;
+
+	/* Reference:  The 1992 Astronomical Almanac, page K11. */
+	c = 1/sqrt(1 + __f*(__f - 2)*Sqr(sin(radLatitude)));
+	sq = Sqr(1 - __f)*c;
+
+	r = (KEARTHRADIUS*c + m_attitude)*cos(radLatitude);
+	ao_position[0] = r * cos(theta);/*kilometers*/
+	ao_position[1] = r * sin(theta);
+	ao_position[2] = (KEARTHRADIUS*sq + m_attitude)*sin(radLatitude);
+	ao_vel[0] = -KMFACTOR*ao_position[1];/*kilometers/second*/
+	ao_vel[1] =  KMFACTOR*ao_position[0];
+	ao_vel[2] =  0;
+}
+
+gVector gObserver::calculateLook(gSatTEME ai_Sat, gTime ai_epoch)
+{
+
+	gVector returnVector(4);
+	gVector topoSatPos(3);
+	gVector observerECIPos;
+	gVector observerECIVel;
+
+
+	double  radLatitude    = m_latitude * KDEG2RAD;
+	double  theta          = ai_epoch.toThetaLMST(m_longitude * KDEG2RAD);
+
+	getECIPosition(ai_epoch, observerECIPos, observerECIVel);
+	ai_Sat.setEpoch(ai_epoch);
+
+	gVector satECIPos = ai_Sat.getPos();
+	gVector satECIVel = ai_Sat.getVel();
+	gVector slantRange = satECIPos - observerECIPos;
+	gVector rangeVel   = satECIVel - observerECIVel;
+
+	//top_s
+	topoSatPos[0] = sin(radLatitude) * cos(theta)*slantRange[0]
+	                + sin(radLatitude)* sin(theta)*slantRange[1]
+	                - cos(radLatitude)* slantRange[2];
+	//top_e
+	topoSatPos[1] = (-1.0)* sin(theta)*slantRange[0]
+	                + cos(theta)*slantRange[1];
+
+	//top_z
+	topoSatPos[2] = cos(radLatitude) * cos(theta)*slantRange[0]
+	                + cos(radLatitude) * sin(theta)*slantRange[1]
+	                + sin(radLatitude) *slantRange[2];
+
+	returnVector[ AZIMUTH] = atan((-1.0)*topoSatPos[1]/topoSatPos[0]);
+	if(topoSatPos[0] > 0)
+		returnVector[ AZIMUTH] += KPI;
+	if(returnVector[ AZIMUTH] < 0)
+		returnVector[ AZIMUTH] += K2PI;
+
+	returnVector[ RANGE]     = slantRange.Magnitude();
+	returnVector[ ELEVATION] = asin(topoSatPos[2]/returnVector[ RANGE]);
+	returnVector[ RANGERATE] = slantRange.Dot(rangeVel)/returnVector[ RANGE];
+	return returnVector;
+
+
+	// Corrections for atmospheric refraction
+	// Reference:  Astronomical Algorithms by Jean Meeus, pp. 101-104
+	// Correction is meaningless when apparent elevation is below horizon
+	// obs_set->y = obs_set->y + Radians((1.02/tan(Radians(Degrees(el)+
+	//              10.3/(Degrees(el)+5.11))))/60);
+}

=== added file 'plugins/Satellites/src/gsatellite/gObserver.hpp'
--- plugins/Satellites/src/gsatellite/gObserver.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gObserver.hpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,114 @@
+/***************************************************************************
+ * Name: gObserver.hpp
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2006 by J. L. Canales                                   *
+ *   [e-mail]                                       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef _GOBSERVER_HPP_
+#define _GOBSERVER_HPP_ 1
+
+// stdsat
+#include "stdsat.h"
+#include "gVector.hpp"
+#include "gTime.hpp"
+#include "gSatTEME.hpp"
+
+#define AZIMUTH   0
+#define ELEVATION 1
+#define RANGE     2
+#define RANGERATE 3
+
+//! @class gObserver
+//! This class implements the need functionality to change
+//! coordinates from Geographic Reference System to Observer Reference System
+class gObserver
+{
+public:
+	//## Constructors (generated)
+	//! @brief Default class gObserver constructor
+	//! @param[in] 	ai_latitude Observer Geographic latitude
+	//! @param[in] 	ai_longitude Observer Geographic longitude
+	//! @param[in] 	ai_attitude Observer Geographic attitude
+	gObserver(double ai_latitude=0, double ai_longitude=0 , double ai_attitude=0):
+		m_latitude(ai_latitude),m_longitude(ai_longitude), m_attitude(ai_attitude)
+	{
+		;
+	}
+
+	//!	Method used to get observer latitude.
+	//!
+	double getLatitude()
+	{
+		return m_latitude;
+	}
+
+	//!	Method used to get observer object longitude.
+	//!
+	double getLongitude()
+	{
+		return m_longitude;
+	}
+
+	//!	Method used to set Observer geographic position.
+	//!
+	void setPosition(double ai_latitude, double ai_longitude, double ai_attitude)
+	{
+		m_latitude  = ai_latitude;
+		m_longitude = ai_longitude;
+		m_attitude  = ai_attitude;
+	}
+
+
+
+	// Operation getECIPosition
+	//! @brief This operation compute the observer ECI coordinates for the
+	//! ai_epoch time
+	//! @details
+	//! References:
+	//!  Orbital Coordinate Systems, Part II
+	//!   Dr. T.S. Kelso
+	//!   http://www.celestrak.com/columns/v02n02/
+	//! @param[in] ai_epoch  Epoch for the ECI reference system calculation
+	//! @param[out] ao_position Observer position vector
+	//! @param[out] ao_vel Observer velocity vector
+	//!   gVector  Vector including X,Y,Z ECI Coordinates
+	void getECIPosition(gTime ai_epoch, gVector& ao_position, gVector& ao_vel);
+
+	// Operation calculateLook
+	//! @brief This operation compute the Azimuth, Elevation and Range of
+	//! a satellite from the observer site.
+	//! @param[in] ai_Sat   Sat TEME object to be looked.
+	//! @param[in] ai_epoch  Epoch for the ECI reference system calculation
+	//! @return gVector Vector including Az, El, Range coordinates
+	//! References:
+	//!  Orbital Coordinate Systems, Part II
+	//!   Dr. T.S. Kelso
+	//!   http://www.celestrak.com/columns/v02n02/
+	gVector calculateLook(gSatTEME ai_Sat, gTime ai_epoch);
+
+private: //## implementation
+
+	double m_latitude;  //meassured in degrees
+	double m_longitude; //meassured in degrees
+	double m_attitude;
+
+};
+
+#endif // _GOBSERVER_HPP_

=== added file 'plugins/Satellites/src/gsatellite/gSatTEME.cpp'
--- plugins/Satellites/src/gsatellite/gSatTEME.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gSatTEME.cpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,156 @@
+/***************************************************************************
+ * Name: gSatTEME.cpp
+ *
+ * Description: gSatTEME class implementation.
+ *              This class abstract all the SGP4 complexity. It uses the
+ *              David. A. Vallado code for SGP4 Calculation.
+ *
+ * Reference:
+ *              Revisiting Spacetrack Report #3 AIAA 2006-6753
+ *              Vallado, David A., Paul Crawford, Richard Hujsak, and T.S.
+ *              Kelso, "Revisiting Spacetrack Report #3,"
+ *              presented at the AIAA/AAS Astrodynamics Specialist
+ *              Conference, Keystone, CO, 2006 August 21–24.
+ *              http://celestrak.com/publications/AIAA/2006-6753/
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2004 by J.L. Canales                                    *
+ *   ph03696@homeserver                                                    *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+// GKepFile
+#include "gSatTEME.hpp"
+#include <iostream>
+#include <iomanip>
+
+#include "stdsat.h"
+#include "mathUtils.hpp"
+
+#include "sgp4io.h"
+
+#define CONSTANTS_SET wgs72
+#define TYPERUN_SET   'c'
+#define OPSMODE_SET   'i'
+#define TYPEINPUT_SET 'm'
+
+#define LATITUDE  0
+#define LONGITUDE 1
+#define ALTITUDE  2
+
+// Constructors
+gSatTEME::gSatTEME(const char *pstrName, char *pstrTleLine1, char *pstrTleLine2)
+{
+
+	double startmfe, stopmfe, deltamin;
+	double ro[3];
+	double vo[3];
+
+	m_Position.resize(3);
+	m_Vel.resize(3);
+
+	m_SatName = pstrName;
+
+	//set gravitational constants
+	getgravconst(CONSTANTS_SET, tumin, mu, radiusearthkm, xke, j2, j3, j4, j3oj2);
+
+	//Parsing TLE_Files and sat variables setting
+	twoline2rv(pstrTleLine1, pstrTleLine2, TYPERUN_SET, TYPEINPUT_SET, OPSMODE_SET, CONSTANTS_SET,
+	           startmfe, stopmfe, deltamin, satrec);
+
+	// call the propagator to get the initial state vector value
+	sgp4(CONSTANTS_SET, satrec,  0.0, ro,  vo);
+
+	m_Position[ 0]= ro[ 0];
+	m_Position[ 1]= ro[ 1];
+	m_Position[ 2]= ro[ 2];
+	m_Vel[ 0]     = vo[ 0];
+	m_Vel[ 1]     = vo[ 1];
+	m_Vel[ 2]     = vo[ 2];
+}
+
+void gSatTEME::setEpoch(gTime ai_time)
+{
+
+	gTime     kepEpoch(satrec.jdsatepoch);
+	gTimeSpan tSince = ai_time - kepEpoch;
+
+	double ro[3];
+	double vo[3];
+	double dtsince = tSince.getDblSeconds()/KSEC_PER_MIN;
+	// call the propagator to get the initial state vector value
+	sgp4(CONSTANTS_SET, satrec,  dtsince, ro,  vo);
+
+	m_Position[ 0]= ro[ 0];
+	m_Position[ 1]= ro[ 1];
+	m_Position[ 2]= ro[ 2];
+	m_Vel[ 0]     = vo[ 0];
+	m_Vel[ 1]     = vo[ 1];
+	m_Vel[ 2]     = vo[ 2];
+}
+
+void gSatTEME::setEpoch(double ai_minSinceKepEpoch)
+{
+
+	double ro[3];
+	double vo[3];
+	// call the propagator to get the initial state vector value
+	sgp4(CONSTANTS_SET, satrec,  ai_minSinceKepEpoch, ro,  vo);
+
+	m_Position[ 0]= ro[ 0];
+	m_Position[ 1]= ro[ 1];
+	m_Position[ 2]= ro[ 2];
+	m_Vel[ 0]     = vo[ 0];
+	m_Vel[ 1]     = vo[ 1];
+	m_Vel[ 2]     = vo[ 2];
+}
+
+gVector gSatTEME::getSubPoint(gTime ai_Time)
+{
+
+	gVector resultVector(3); // (0) Latitude, (1) Longitude, (2) altitude
+	double theta, r, e2, phi, c;
+
+	theta = AcTan(m_Position[1], m_Position[0]); // radians
+	resultVector[ LONGITUDE] = fmod((theta - ai_Time.toThetaGMST()), K2PI);  //radians
+
+
+	r = sqrt(Sqr(m_Position[0]) + Sqr(m_Position[1]));
+	e2 = __f*(2 - __f);
+	resultVector[ LATITUDE] = AcTan(m_Position[2],r); /*radians*/
+
+	do
+	{
+		phi = resultVector[ LATITUDE];
+		c = 1/sqrt(1 - e2*Sqr(sin(phi)));
+		resultVector[ LATITUDE] = AcTan(m_Position[2] + KEARTHRADIUS*c*e2*sin(phi),r);
+	}
+	while(fabs(resultVector[ LATITUDE] - phi) >= 1E-10);
+
+	resultVector[ ALTITUDE] = r/cos(resultVector[ LATITUDE]) - KEARTHRADIUS*c;/*kilometers*/
+
+	if(resultVector[ LATITUDE] > (KPI/2.0)) resultVector[ LATITUDE] -= K2PI;
+
+	resultVector[LATITUDE]  = resultVector[LATITUDE]/KDEG2RAD;
+	resultVector[LONGITUDE] = resultVector[LONGITUDE]/KDEG2RAD;
+	if(resultVector[LONGITUDE] < -180.0) resultVector[LONGITUDE] +=360;
+	else if(resultVector[LONGITUDE] > 180.0) resultVector[LONGITUDE] -= 360;
+
+
+	return resultVector;
+}

=== added file 'plugins/Satellites/src/gsatellite/gSatTEME.hpp'
--- plugins/Satellites/src/gsatellite/gSatTEME.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gSatTEME.hpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,128 @@
+/***************************************************************************
+ * Name: gSatTeme.hpp
+ *
+ * Description: gSatTEME classes declaration.
+ *              This class abstract all the SGP4 complexity. It uses the
+ *              revised David. A. Vallado code for SGP4 Calculation.
+ *
+ * Reference:
+ *              Revisiting Spacetrack Report #3 AIAA 2006-6753
+ *              Vallado, David A., Paul Crawford, Richard Hujsak, and T.S.
+ *              Kelso, "Revisiting Spacetrack Report #3,"
+ *              presented at the AIAA/AAS Astrodynamics Specialist
+ *              Conference, Keystone, CO, 2006 August 21–24.
+ *              http://celestrak.com/publications/AIAA/2006-6753/
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2006 by J.L. Canales                                    *
+ *   [e-mail]                                       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _GSATTEME_HPP_
+#define _GSATTEME_HPP_ 1
+
+#include "gTime.hpp"
+#include "gVector.hpp"
+
+#include "sgp4unit.h"
+#include "sgp4ext.h"
+
+
+//! @class gSatTEME
+//! @brief Sat position and velocity predictions over TEME reference system.
+//! @details
+//! Class to abstract all the SGP4 complexity.
+//! It implementation wrap whit an object oriented class the revised David. A. Vallado
+//! code for SGP4 Calculation. (Spacetrack report #6 revised AIAA-2006-6753-rev1)
+class gSatTEME
+{
+public:
+
+	// Operation: gSatTEME(const char *pstrName, char *pstrTleLine1, char *pstrTleLine2)
+	//! @brief Default class gSatTEME constructor
+	//! @param[in] 	pstrName Pointer to a null end string with the Sat. Name
+	//! @param[in] 	pstrTleLine1 Pointer to a null end string with the
+	//!             first TLE Kep. data line
+	//! @param[in] 	pstrTleLine2 Pointer to a null end string with the
+	//!             second TLE Kep. data line
+	gSatTEME(const char *pstrName, char *pstrTleLine1, char *pstrTleLine2);
+
+	// Operation: setEpoch( gTime ai_time)
+	//! @brief Set compute epoch for prediction
+	//! @param[in] 	ai_time gTime object storing the compute epoch time.
+	void setEpoch(gTime ai_time);
+
+	// Operation: setEpoch( double ai_minSinceKepEpoch)
+	//! @brief Set compute epoch for prediction in minutes since Keplerian data Epoch
+	//! @param[in] 	ai_minSinceKepEpoch Time since Keplerian Epoch measured in minutes
+	//! and fraction of minutes.
+	void setEpoch(double ai_minSinceKepEpoch);
+
+	// Operation: getPos()
+	//! @brief Get the TEME satellite position Vector
+	//! @return gVector
+	//!   Satellite position vector.
+	//!    x: position[0]
+	//!    y: position[1]
+	//!    z: position[2]
+	gVector getPos()
+	{
+		return m_Position;
+	}
+
+	// Operation: getVel()
+	//! @brief Get the TEME satellite Velocity Vector
+	//! @return gVector Satellite Velocity Vector\n
+	//!    x: Vel[0]\n
+	//!    y: Vel[1]\n
+	//!    z: Vel[2]\n
+	gVector getVel()
+	{
+		return m_Vel;
+	}
+
+	// Operation:  getSubPoint
+	//! @brief Get the Geographic satellite subpoint Vector
+	//! @details To implement this operation, next references has been used:
+	//!	   Orbital Coordinate Systems, Part III  By Dr. T.S. Kelso
+	//!	   http://www.celestrak.com/columns/v02n03/
+	//! @param[in] ai_Time Epoch time for subpoint calculation. (of course, this must be
+	//!    refactorized to be computed in the setEpoch function)
+	//! @return gVector Geographical coordinates\n
+	//!    Latitude:  Coord[0]  measured in degrees\n
+	//!    Longitude: Coord[1]  measured in degrees\n
+	//!	   Altitude:  Coord[2]  measured in Km.\n
+	gVector getSubPoint(gTime ai_Time);
+
+	int getErrorCode()
+	{
+		return satrec.error;
+	}
+
+private:
+	// sgp4 proceses variables
+	double tumin, mu, radiusearthkm, xke, j2, j3, j4, j3oj2;
+	elsetrec satrec;
+
+	std::string  m_SatName;
+	gVector 	 m_Position;
+	gVector 	 m_Vel;
+};
+
+#endif // _GSATTEME_HPP_

=== added file 'plugins/Satellites/src/gsatellite/gTime.cpp'
--- plugins/Satellites/src/gsatellite/gTime.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gTime.cpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,347 @@
+/***************************************************************************
+ * Name: gTime.cpp
+ *
+ * Description:
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2004 by JL Trabajo                                      *
+ *   ph03696@homeserver                                                    *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+
+#include <cassert>
+// gtime
+#include "gTime.hpp"
+// GExcpt
+#include "gException.hpp"
+#include "stdsat.h"
+#include <math.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+// Class GTimeSpan
+
+//////////////////////////////////////////////////////////////////////////////
+// Referencies:
+// Astronomical Formulae for Calculators.
+//	Jean Meeus
+//	Chapter 3: Julian Day and Calendar Date. PG's 23, 24, 25
+//
+void gTime::setTime(int year, double day)
+{
+	assert((day >= 0.0) && (day < 367.0));
+
+	// Now calculate Julian date
+
+	year--;
+
+	int A = (year / 100);
+	int B = 2 - A + (A / 4);
+
+	double JDforYear = (int)(365.25 * year) +
+	                   (int)(30.6001 * 14)  +  //MM = 1 then MM=12 + 1 for the expresion (30.6001 * (mm +1))
+	                   1720994.5 + B;
+
+	m_time = JDforYear + day;
+}
+
+
+// Constructors
+
+gTime gTime::getCurrentTime()
+{
+
+	time_t rawtime;
+	struct tm * timeinfo;
+
+	time(&rawtime);
+	timeinfo = gmtime(&rawtime);
+
+	return gTime(*timeinfo);
+}
+
+
+
+gTime::gTime(int year, double day)
+{
+	setTime(year, day);
+}
+
+gTime::gTime(double ai_jDays)
+{
+	m_time= ai_jDays;
+}
+
+gTime::gTime(int nYear, int nMonth, int nDay, int nHour, int nMin, double nSec)
+{
+	// Calculate N, the day of the year (1..366)
+	int N;
+	int F1 = (int)((275.0 * nMonth) / 9.0);
+	int F2 = (int)((nMonth + 9.0) / 12.0);
+
+	if(isLeapYear(nYear))
+	{
+		// Leap year
+		N = F1 - F2 + nDay - 30;
+	}
+	else
+	{
+		// Common year
+		N = F1 - (2 * F2) + nDay - 30;
+	}
+
+	double dDay = N + (nHour + (nMin + (nSec / 60.0)) / 60.0) / 24.0;
+
+
+	setTime(nYear, dDay);
+
+}
+
+
+gTime::gTime(const gTime& timeSrc):m_time(timeSrc.m_time)
+{
+
+}
+
+gTime::gTime(struct tm ai_timestruct)
+{
+
+	int    year = ai_timestruct.tm_year + 1900;
+
+	double day  = ai_timestruct.tm_yday + 1;
+	day += (ai_timestruct.tm_hour + (ai_timestruct.tm_min + (ai_timestruct.tm_sec / 60.0)) / 60.0) / 24.0;
+
+	setTime(year, day);
+}
+
+gTimeSpan gTime::getTimeToUTC()
+{
+
+	//Time to utc calculation.
+	time_t when   = time(NULL);
+	struct tm utc = *gmtime(&when);
+	struct tm lcl = *localtime(&when);
+	gTimeSpan tUTCDiff;
+
+
+	int delta_h = lcl.tm_hour - utc.tm_hour;
+	tUTCDiff = (time_t) delta_h*3600;
+
+	return(tUTCDiff);
+}
+
+
+const gTime& gTime::operator=(const gTime& timeSrc)
+{
+	m_time = timeSrc.m_time;
+	return (*this);
+}
+
+const gTime& gTime::operator=(time_t t)
+{
+	struct tm *ptm = gmtime(&t);
+	assert(ptm);
+
+	int    year = ptm->tm_year + 1900;
+
+	double day  = ptm->tm_yday + 1;
+	day += (ptm->tm_hour + (ptm->tm_min + (ptm->tm_sec / 60.0)) / 60.0) / 24.0;
+
+	setTime(year, day);
+
+	return (*this);
+
+}
+
+
+// Attributes
+double gTime::getGmtTm() const
+{
+	return m_time;
+}
+
+double gTime::getLocalTm() const
+{
+	return (m_time + getTimeToUTC().getDblSeconds());
+}
+
+
+time_t gTime::toTime() const
+{
+	return ((m_time - JDAY_JAN1_00H_1970)*KSEC_PER_DAY);
+
+
+}
+
+void gTime::toCalendarDate(int *pYear, int *pMonth , double *pDom) const
+{
+
+	assert(pYear != NULL);
+	assert(pMonth != NULL);
+	assert(pDom != NULL);
+
+	double jdAdj, F, alpha, A, B, DOM;
+	int Z, C, D, E, month, year;
+
+	jdAdj = m_time + 0.5;
+	Z     = (int)jdAdj;  // integer part
+	F     = jdAdj - Z;   // fractional part
+
+	if(Z < 2299161)
+	{
+		A = Z;
+	}
+	else
+	{
+		alpha = (int)((Z - 1867216.25) / 36524.25);
+		A     = Z + 1 + alpha - (int)(alpha / 4.0);
+	}
+
+	B     = A + 1524.0;
+	C     = (int)((B - 122.1) / 365.25);
+	D     = (int)(C * 365.25);
+	E     = (int)((B - D) / 30.6001);
+
+	DOM   = B - D - (int)(E * 30.6001) + F;
+	month = (E < 13.5) ? (E - 1) : (E - 13);
+	year  = (month > 2.5) ? (C - 4716) : (C - 4715);
+
+	*pYear = year;
+	*pMonth = month;
+	*pDom = DOM;
+}
+
+
+// @method  toThetaGMST();
+// Definition: Calculate Theta Angle at Greenwich Mean Time for the Julian date. The return value
+// is the angle, in radians, measuring eastward from the Vernal Equinox to the
+// prime meridian.
+double gTime::toThetaGMST() const
+{
+
+	double jd, Theta_JD;
+	double UT = fmod((m_time + 0.5), 1.0);
+	jd = m_time - UT;
+	double TU = (jd- JDAY_JAN1_12H_2000) / 36525.0;
+
+	double GMST = 24110.54841 + TU *
+	              (8640184.812866 + TU * (0.093104 - TU * 6.2e-06));
+
+	GMST = fmod((GMST + KSEC_PER_DAY * OMEGA_E * UT),KSEC_PER_DAY);
+	Theta_JD=(K2PI * (GMST / KSEC_PER_DAY));
+
+	if(Theta_JD <0.0)
+		Theta_JD+=K2PI;
+
+	return Theta_JD;
+}
+
+// @method  toThetaLMST();
+// Definition: Calculate Theta Angle at Local Mean Time for the Julian date.
+double gTime::toThetaLMST(double longitude) const
+{
+	return fmod(toThetaGMST() + longitude,  K2PI);
+}
+
+
+
+// Operations
+// time math
+gTimeSpan gTime::operator-(gTime ai_time) const
+{
+	return (gTimeSpan((m_time - ai_time.m_time)));
+}
+
+gTime gTime::operator-(gTimeSpan ai_timeSpan) const
+{
+	return (gTime((m_time - ai_timeSpan.getDblDays())));
+}
+
+gTime gTime::operator+(gTimeSpan ai_timeSpan) const
+{
+	return (gTime((m_time + ai_timeSpan.getDblDays())));
+}
+
+const gTime& gTime::operator+=(gTimeSpan ai_timeSpan)
+{
+	m_time += ai_timeSpan.getDblDays();
+	return (*this);
+
+}
+
+const gTime& gTime::operator-=(gTimeSpan ai_timeSpan)
+{
+	m_time -= ai_timeSpan.getDblDays();
+	return (*this);
+}
+
+bool gTime::operator==(gTime ai_time) const
+{
+
+	if(m_time == ai_time.m_time)
+		return true;
+	else
+		return false;
+}
+
+bool gTime::operator!=(gTime ai_time) const
+{
+
+	if(m_time != ai_time.m_time)
+		return true;
+	else
+		return false;
+}
+
+bool gTime::operator<(gTime ai_time) const
+{
+
+	if(m_time < ai_time.m_time)
+		return true;
+	else
+		return false;
+}
+
+bool gTime::operator>(gTime ai_time) const
+{
+
+	if(m_time > ai_time.m_time)
+		return true;
+	else
+		return false;
+}
+
+bool gTime::operator<=(gTime ai_time) const
+{
+
+	if(m_time <= ai_time.m_time)
+		return true;
+	else
+		return false;
+}
+
+bool gTime::operator>=(gTime ai_time) const
+{
+
+	if(m_time >= ai_time.m_time)
+		return true;
+	else
+		return false;
+}

=== added file 'plugins/Satellites/src/gsatellite/gTime.hpp'
--- plugins/Satellites/src/gsatellite/gTime.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gsatellite/gTime.hpp	2010-10-30 00:49:41 +0000
@@ -0,0 +1,329 @@
+/****************************************************************************
+ * Name: gTime.hpp
+ *
+ * Description: gTime y gTimeSpan classes declaration.
+ *		 This classes implement the method and operators to manage
+ *		 calculation over dates and timestamps.
+ *
+ *
+ ***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2006 by J. L. Canales                                   *
+ *   [e-mail]                                       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+/////////////////////////////////////////////////////////////////////////////
+// gTimeSpan and gTime
+#ifndef _GTIME_HPP_
+#define _GTIME_HPP_ 1
+
+#include <time.h>
+#include <iostream> // for operator<<(), see below
+
+static const double JDAY_JAN1_00H_1900 = 2415019.5; // Jan 1.0 1900 = Jan 1 1900 00h UTC
+static const double JDAY_JAN1_12H_1900 = 2415020.0; // Jan 1.5 1900 = Jan 1 1900 12h UTC
+static const double JDAY_JAN1_12H_2000 = 2451545.0; // Jan 1.5 2000 = Jan 1 2000 12h UTC
+static const double JDAY_JAN1_00H_1970 = 2440587.5;
+
+static const double OMEGA_E = 1.002737909350795; // earth rotation per sideral day
+
+static const int KSEC_PER_MIN = 60;
+static const int KSEC_PER_HR  = 3600;
+static const int KSEC_PER_DAY = 86400;
+static const int KMIN_PER_HR  = 60;
+static const int KMIN_PER_DAY = 1440;
+static const int KHR_PER_DAY  = 60;
+
+class gTimeSpan
+{
+public:
+	// Constructors
+	gTimeSpan(double timeSpanSrc = 0); // timeSpanSrc is mesured in days and fraction of day
+	gTimeSpan(long lDays, int nHours, int nMins, double nSecs);
+
+	gTimeSpan(const gTimeSpan& timeSpanSrc);
+	const gTimeSpan& operator=(const gTimeSpan& timeSpanSrc);
+
+	// Equal to time in Julian Days
+	const gTimeSpan& operator=(const double& timeSpanSrc)
+	{
+		m_timeSpan=timeSpanSrc*KSEC_PER_DAY;
+		return *this;
+	}
+
+	// Attributes
+	// extract parts
+
+	//! Operation: getDays()
+	//!	This method returns the integer days number stored in the gTimeSpan object.
+	//! @return
+	//!    long  Total number of days
+	long  getDays() const;
+
+	//! Operation: getHours()
+	//!	This method returns the integer hours number stored in the gTimeSpan object.
+	//! @return
+	//!    int This is a value between 0 and 23 hours
+	int   getHours() const;
+
+	//! Operation: getMinutes()
+	//! This method returns the integer Minutes number stored in the gTimeSpan object.
+	//! @return
+	//!	int This is a value between 0 and 59 minutes.
+	int   getMinutes() const;
+
+	//! Operation: getSeconds()
+	//!  	This method returns the integer seconds number stored in the gTimeSpan object.
+	//! @return
+	//!	int This is a value between 0 and 59 seconds
+	int   getSeconds() const;
+
+	//! Operation: getDblSeconds()
+	//!	This method returns the total seconds number stored in the gTimeSpan
+	//!	object.
+	//! @return
+	//!	double Total number of seconds in seconds and fraction of second.
+	double getDblSeconds() const;
+
+
+	//! Operation: getDblDays()
+	//!	This method returns the total days number stored in the gTimeSpan
+	//!	object.
+	//! @return
+	//!	double Total number of days in days and fraction of day.
+	double getDblDays() const;
+	// Operations
+
+	//////////////////////////////////////
+	// TimeSpan Object Math operations
+	//////////////////////////////////////
+	gTimeSpan operator-(gTimeSpan timeSpan) const;
+	gTimeSpan operator+(gTimeSpan timeSpan) const;
+	const gTimeSpan& operator+=(gTimeSpan timeSpan);
+	const gTimeSpan& operator-=(gTimeSpan timeSpan);
+	bool operator==(gTimeSpan timeSpan) const;
+	bool operator!=(gTimeSpan timeSpan) const;
+	bool operator<(gTimeSpan timeSpan) const;
+	bool operator>(gTimeSpan timeSpan) const;
+	bool operator<=(gTimeSpan timeSpan) const;
+	bool operator>=(gTimeSpan timeSpan) const;
+
+private:
+	double m_timeSpan; //time span in julian days
+
+};
+
+
+
+
+
+//! @class gTime
+//! This class implements time calculations.
+//! Time is stored in julian days
+//! - Time getting in GMT, Local and Sidereal (earth rotational angle)
+//! - Time Math operations.
+
+class gTime
+{
+public:
+
+	// Constructors
+	gTime(double ai_jDays = 0);
+	gTime(int year, double day);
+	gTime(int nYear, int nMonth, int nDay, int nHour, int nMin, double nSec);
+	gTime(struct tm ai_timestruct);
+
+	// copy constructor
+	gTime(const gTime& timeSrc);
+
+	//////////////////////////////////////
+	// Time Object setting operations
+	//////////////////////////////////////
+
+	// Operation setTime
+	//! @brief Set the time value of the time object to the julian day of
+	//!      year,  day.
+	//! @details
+	//!    References:\n
+	//!      Astronomical Formulae for Calculators.\n
+	//!	     Jean Meeus\n
+	//!	     Chapter 3: Julian Day and Calendar Date. PG's 23, 24, 25\n
+	//! @param[in] year date year
+	//!	@param[in] day  date day and day fraction. Notice: 1 Jan is day=0 (not 1)
+	void setTime(int year, double day);
+
+	// Operation operator=
+	//! @brief overload de = operator to assign time values to he object.
+	//! @param timeSrc Time to be assigned
+	//!	@return const gTime&  Reference to *this object modified after operation
+	const gTime& operator=(const gTime& timeSrc);
+
+	// Operation operator=
+	//! @brief overload de = operator to assign time values to he object in
+	//!   time_t (operating system) format.
+	//! @param[in] t Time to be assigned
+	//! @return
+	//!   const gTime&  Reference to *this object modified after operation
+	const gTime& operator=(time_t t);
+
+
+	// Operation operator=