gpredict-svn Mailing List for Gpredict (Page 8)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn — Subversion commit archive for Gpredict.
You can subscribe to this list here.
| 2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
| 2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
| 2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
|
From: <aa...@us...> - 2011-03-24 23:39:00
|
Revision: 791
http://gpredict.svn.sourceforge.net/gpredict/?rev=791&view=rev
Author: aa1vs
Date: 2011-03-24 23:38:54 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Update Copyright
Modified Paths:
--------------
trunk/src/gtk-sat-module.c
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-03-23 00:53:02 UTC (rev 790)
+++ trunk/src/gtk-sat-module.c 2011-03-24 23:38:54 UTC (rev 791)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-23 00:53:08
|
Revision: 790
http://gpredict.svn.sourceforge.net/gpredict/?rev=790&view=rev
Author: aa1vs
Date: 2011-03-23 00:53:02 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Remove decayed satellites from map view.
Modified Paths:
--------------
trunk/src/gtk-sat-map.c
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2011-03-21 11:45:37 UTC (rev 789)
+++ trunk/src/gtk-sat-map.c 2011-03-23 00:53:02 UTC (rev 790)
@@ -56,6 +56,7 @@
#include "locator.h"
#include "sat-debugger.h"
#include "sat-info.h"
+#include "predict-tools.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
@@ -1708,7 +1709,10 @@
guint32 col,covcol,shadowcol;
gfloat x,y;
gchar *tooltip;
-
+
+ if (decayed(sat)) {
+ return;
+ }
/* get satellite and SSP */
catnum = g_new0 (gint, 1);
*catnum = sat->tle.catnr;
@@ -1883,14 +1887,41 @@
}
obj = SAT_MAP_OBJ (g_hash_table_lookup (satmap->obj, catnum));
+
+ /*get rid of a decayed satellite*/
+ if (decayed(sat) && obj!=NULL) {
+ SAT_MAP_OBJ (g_hash_table_remove (satmap->obj, catnum));
+ /*remove items*/
+ idx = goo_canvas_item_model_find_child (root,obj->marker);
+ if (idx !=-1)
+ goo_canvas_item_model_remove_child (root, idx);;
+ idx = goo_canvas_item_model_find_child (root,obj->shadowm);
+ if (idx !=-1)
+ goo_canvas_item_model_remove_child (root, idx);;
+ idx = goo_canvas_item_model_find_child (root,obj->label);
+ if (idx !=-1)
+ goo_canvas_item_model_remove_child (root, idx);
+ idx = goo_canvas_item_model_find_child (root,obj->shadowl);
+ if (idx !=-1)
+ goo_canvas_item_model_remove_child (root, idx);
+ idx = goo_canvas_item_model_find_child (root,obj->range1);
+ if (idx !=-1)
+ goo_canvas_item_model_remove_child (root, idx);
+ idx = goo_canvas_item_model_find_child (root,obj->range2);
+ if (idx !=-1)
+ goo_canvas_item_model_remove_child (root, idx);
+ return;
+ }
if (obj == NULL) {
- /* FIXME: protection against this should be implemented in the module. */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: NULL object for %d (yes, this is a bug)"),
- __FILE__, __LINE__, sat->tle.catnr);
-
- return;
+ if (decayed(sat)) {
+ return;
+ } else {
+ /*satellite was decayed now is visible*/
+ /*time controller backed up time*/
+ plot_sat(key,value,data);
+ return;
+ }
}
if (obj->selected) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-21 11:45:44
|
Revision: 789
http://gpredict.svn.sourceforge.net/gpredict/?rev=789&view=rev
Author: aa1vs
Date: 2011-03-21 11:45:37 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
Include geo and decayed orbits in has_aos and make dynamic calls to decayed instead of static orbit type check.
Modified Paths:
--------------
trunk/src/gtk-event-list-popup.c
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-sat-list-popup.c
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-map-ground-track.c
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-module.c
trunk/src/gtk-single-sat.c
trunk/src/orbit-tools.c
trunk/src/predict-tools.c
Modified: trunk/src/gtk-event-list-popup.c
===================================================================
--- trunk/src/gtk-event-list-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-event-list-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -149,8 +149,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
pass = get_next_pass (sat, qth,
@@ -216,8 +215,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-polar-view-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -388,8 +388,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
pass = get_next_pass (sat, qth,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
@@ -453,8 +452,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-list-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -151,8 +151,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
pass = get_next_pass (sat, qth,
@@ -219,8 +218,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-list.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -654,7 +654,7 @@
if (sat->otype == ORBIT_TYPE_GEO) {
buff = g_strdup ("G");
}
- else if (sat->otype == ORBIT_TYPE_DECAYED) {
+ else if (decayed(sat)) {
buff = g_strdup ("D");
}
else if (sat->range_rate > 0.001) {
Modified: trunk/src/gtk-sat-map-ground-track.c
===================================================================
--- trunk/src/gtk-sat-map-ground-track.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-map-ground-track.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -123,7 +123,7 @@
/* calculate (lat,lon) for the required orbits */
- while (sat->orbit <= max_orbit) {
+ while (sat->orbit <= max_orbit && !decayed(sat)) {
/* We use 30 sec time steps. If resolution is too fine, the
line drawing routine will filter out unnecessary points
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-map-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -282,8 +282,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
pass = get_next_pass (sat, qth,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
@@ -347,8 +346,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-module.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -964,8 +964,6 @@
and the other requirements are fulfilled
*/
if ((GTK_SAT_MODULE (module)->event_count == 0) &&
- (sat->otype != ORBIT_TYPE_GEO) &&
- (sat->otype != ORBIT_TYPE_DECAYED) &&
has_aos (sat, module->qth)) {
/* Note that has_aos may return TRUE for geostationary sats
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-single-sat.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -436,7 +436,7 @@
if (sat->otype == ORBIT_TYPE_GEO) {
buff = g_strdup ("Geostationary");
}
- else if (sat->otype == ORBIT_TYPE_DECAYED) {
+ else if (decayed(sat)) {
buff = g_strdup ("Decayed");
}
else if (sat->range_rate > 0.0) {
@@ -1026,8 +1026,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
pass = get_next_pass (sat, qth,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
@@ -1092,8 +1091,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/orbit-tools.c
===================================================================
--- trunk/src/orbit-tools.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/orbit-tools.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -94,13 +94,25 @@
gboolean
decayed (sat_t *sat)
{
+
+#if 0
+ /*this code was used for debugging basically it print out the
+ time of decay for comparison to other sources.
+ */
+ time_t t;
+ gdouble eol;
+ char something[100];
+ eol=sat->jul_epoch + ((16.666666 - sat->meanmo) /
+ (10.0 * fabs (sat->tle.xndt2o/(twopi/xmnpda/xmnpda))));
+ /* convert julian date to struct tm */
+ t = (eol - 2440587.5)*86400.;
+ strftime(something,100,"%F %R",gmtime(&t));
+ printf("%s Decayed at %s %f\n",sat->nickname,something,eol);
+#endif
- /* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
+ /* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
value matches up with the value in predict 2.2.3 */
- /*** FIXME decayed is treated as a static quantity.
- It is time dependent. Also sat->jul_utc is often zero
- when this function is called
- ***/
+
if (sat->jul_epoch + ((16.666666 - sat->meanmo) /
(10.0 * fabs (sat->tle.xndt2o/(twopi/xmnpda/xmnpda)))) < sat->jul_utc)
return TRUE;
@@ -124,27 +136,36 @@
double lin, sma, apogee;
gboolean retcode = FALSE;
-
/* FIXME */
- if (sat->meanmo == 0.0) {
- retcode = FALSE;
- }
- else {
+ /*the first condition takes care of geostationary satellites and
+ decayed satellites. The second deals with LEOS from the original
+ predict code. However, nothing correctly handles geos with poor
+ station keeping that are tracing a figure 8.
+ */
- /* xincl is already in RAD by select_ephemeris */
- lin = sat->tle.xincl;
- if (lin >= pio2)
- lin = pi - lin;
+ if ((sat->otype == ORBIT_TYPE_GEO) || (decayed(sat))) {
+ retcode = FALSE;
+ } else {
- sma = 331.25 * exp(log(1440.0/sat->meanmo) * (2.0/3.0));
- apogee = sma * (1.0 + sat->tle.eo) - xkmper;
-
- if ((acos(xkmper/(apogee+xkmper))+(lin)) > fabs(qth->lat*de2ra))
- retcode = TRUE;
- else
- retcode = FALSE;
-
+ if (sat->meanmo == 0.0) {
+ retcode = FALSE;
+ }
+ else {
+
+ /* xincl is already in RAD by select_ephemeris */
+ lin = sat->tle.xincl;
+ if (lin >= pio2)
+ lin = pi - lin;
+
+ sma = 331.25 * exp(log(1440.0/sat->meanmo) * (2.0/3.0));
+ apogee = sma * (1.0 + sat->tle.eo) - xkmper;
+
+ if ((acos(xkmper/(apogee+xkmper))+(lin)) > fabs(qth->lat*de2ra))
+ retcode = TRUE;
+ else
+ retcode = FALSE;
+
+ }
}
-
return retcode;
}
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/predict-tools.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -136,9 +136,7 @@
predict_calc (sat, qth, start);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return 0.0;
@@ -235,9 +233,7 @@
predict_calc (sat, qth, start);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return 0.0;
@@ -343,9 +339,7 @@
predict_calc (sat, qth, start);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return 0.0;
@@ -1078,9 +1072,7 @@
predict_calc (sat, qth, t);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-20 15:05:16
|
Revision: 788
http://gpredict.svn.sourceforge.net/gpredict/?rev=788&view=rev
Author: aa1vs
Date: 2011-03-20 15:05:07 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
Merged gpsd_testing branch into trunk.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/src/config-keys.h
trunk/src/gtk-polar-view.c
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
trunk/src/mod-mgr.c
trunk/src/predict-tools.c
trunk/src/predict-tools.h
trunk/src/qth-data.c
trunk/src/qth-data.h
trunk/src/qth-editor.c
trunk/src/sat-pref-qth-data.h
trunk/src/sat-pref-qth-editor.c
trunk/src/sat-pref-qth.c
Property Changed:
----------------
trunk/
trunk/data/satdata/scripts/convert.py
trunk/data/trsp/20439.trsp
trunk/data/trsp/20442.trsp
trunk/data/trsp/22825.trsp
trunk/data/trsp/22826.trsp
trunk/data/trsp/23439.trsp
trunk/data/trsp/24278.trsp
trunk/data/trsp/24786.trsp
trunk/data/trsp/25338.trsp
trunk/data/trsp/25397.trsp
trunk/data/trsp/25544.trsp
trunk/data/trsp/26352.trsp
trunk/data/trsp/26536.trsp
trunk/data/trsp/26871.trsp
trunk/data/trsp/26931.trsp
trunk/data/trsp/27453.trsp
trunk/data/trsp/27607.trsp
trunk/data/trsp/27844.trsp
trunk/data/trsp/27848.trsp
trunk/data/trsp/27939.trsp
trunk/data/trsp/28375.trsp
trunk/data/trsp/28650.trsp
trunk/data/trsp/28654.trsp
trunk/data/trsp/28895.trsp
trunk/data/trsp/32785.trsp
trunk/data/trsp/32787.trsp
trunk/data/trsp/32789.trsp
trunk/data/trsp/32791.trsp
trunk/data/trsp/33493.trsp
trunk/data/trsp/33498.trsp
trunk/data/trsp/33499.trsp
trunk/data/trsp/7530.trsp
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/gpsd_testing:728-787
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/ChangeLog 2011-03-20 15:05:07 UTC (rev 788)
@@ -1,3 +1,25 @@
+2011-03-20 Charles Suprin <hamaa1vs at gmail.com>
+
+ Merged gpsd_testing branch into trunk.
+
+2011-03-20 Charles Suprin <hamaa1vs at gmail.com>
+
+ * doc/man/gpredict.1.in
+ Update Copyright to 2011
+
+2011-03-13 Charles Suprin <hamaa1vs at gmail.com>
+
+ * data/locations.dat
+ Added more locations to locations.dat
+
+ * configure.ac
+ Changed version to 1.4svn
+
+2011-03-12 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/predict-tools.c
+ Added check for slope of elevation in find_los.
+
2011-03-01 Alexandru Csete <oz9aec at gmail.com>
* data/satdata:
@@ -2,6 +24,6 @@
Updated satellite data.
-
+
* po:
Synchronised with translations from launchpad.net
-
+
* configure.ac:
@@ -96,7 +118,115 @@
Fix bug where tle file suffix compare is case dependent.
<https://bugs.launchpad.net/bugs/706452>
+ * ChangeLog
+ * src/gtk-sat-map.c
+ * src/gtk-sat-module.c
+ * src/gtk-polar-view.c
+ Code cleanup and comments.
+ Update Changelog
+2011-01-21 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/predict-tools.c
+ Eliminate segfault if pass being returned is NULL in get_pass routines.
+
+2011-01-20 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-sat-module.c
+ Convert gps update time to seconds.
+
+2011-01-19 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-sat-module.c
+ * src/qth-data.c
+ * src/qth-data.h
+ * src/sat-pref-qth-editor.c
+ * src/sat-pref-qth.c
+ Added initial GPSD API version 5 support.
+ Added engineering gui support for GPSD.
+
+2011-01-16 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/qth-data.c
+ Added more QTH validation
+
+2011-01-14 Charles Suprin <hamaa1vs at gmail.com>
+
+ * NEWS
+ * src/config-keys.h
+ * src/gtk-polar-view.c
+ * src/gtk-rot-ctrl.c
+ * src/gtk-sat-map.c
+ * src/gtk-sat-module.c
+ * src/gtk-sat-module.h
+ * src/mod-mgr.c
+ * src/predict-tools.c
+ * src/predict-tools.h
+ * src/qth-data.c
+ * src/qth-data.h
+ * src/sat-pref-qth-data.h
+ * src/sat-pref-qth.c
+ Updated copyright information.
+ Added handling for new QTH fields into saving and loading routines.
+ Updated qth preference guis. (Still not complete)
+ Conditioned gpsd calls on GPSD_API_MAJOR_VERSION as requested in libgps man page.
+ Update NEWS and Changelog in anticipation of merge with trunk.
+ Corrected minor typos in comments.
+
+2011-01-11 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-rot-ctrl.c
+ Add support for changing qth to gtk-rot-ctrl.c to update pass in polar view
+
+2011-01-09 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-polar-view.c
+ * src/gtk-sat-module.c
+ * src/gtk-sat-module.h
+ Add position based updates for sky-at-a-glance.
+ Move qth updates so they occur all the time.
+
+2011-01-08 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-polar-view.c
+ * src/predict-tools.c
+ * src/predict-tools.h
+ * src/qth-data.c
+ * src/gtk-sat-map.c
+ * src/gtk-sat-module.c
+ * src/gtk-sat-module.h
+ * src/qth-data.h
+ Make gpsd code safer for multiple modules.
+ Add position comparison for event updates.
+ Fix segfault when gpsd not connected.
+ Make gtk-polar-view update pass if qth has moved significantly.
+ Add qth_small_t element to pass to check if pass data is old.
+
+2011-01-05 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-sat-module.c
+ * src/qth-data.c
+ * src/qth-data.h
+ Update AOS information when qth changes and make distinction between qth_data and qth_data_update in function names
+
+ 2011-01-02 Charles Suprin <hamaa1vs at gmail.com>
+ * configure.ac
+ * src/config-keys.h
+ * src/gtk-sat-module.c
+ * src/gtk-sat-module.h
+ * src/qth-data.c
+ * src/qth-data.h
+ * src/sat-pref-qth-editor.c
+ Second version of qpsd qth moved things into qth-data.c and started working on the qth editing gui to support these new interfaces
+
+2010-12-30 Charles Suprin <hamaa1vs at gmail.com>
+
+ * configure.ac
+ * src/gtk-sat-map.c
+ * src/gtk-sat-module.c
+ * src/gtk-sat-module.h
+ Initial GPSD hack.
+
2010-12-26 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-rot-ctrl.c
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/NEWS 2011-03-20 15:05:07 UTC (rev 788)
@@ -1,3 +1,7 @@
+Changes in version 1.4 (TBD)
+
+- Feature request 3141555: gpsd support.
+
Changes in version 1.3 (1 Mar 2011)
- Feature request 2873824: Flip Passes.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/configure.ac 2011-03-20 15:05:07 UTC (rev 788)
@@ -29,7 +29,18 @@
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
+dnl optional check for libgps
+PKG_CHECK_MODULES(LIBGPS, [ libgps >= 2.90 ], [
+ CFLAGS="$CFLAGS $LIBGPS_CFLAGS";
+ LIBS="$LIBS $LIBGPS_LIBS";
+ havelibgps=true;
+ AC_DEFINE(HAS_LIBGPS, 1, [Define if libgps is available])
+ ], [
+ havelibgps=false;
+ AC_DEFINE(HAS_LIBGPS, 0, [Define if libgps is unvailable])
+])
+
dnl Hamlib not needed if we go for the TCP based I/F
dnl check for hamlib
dnl PKG_CHECK_MODULES(HAMLIB, hamlib, [
@@ -75,6 +86,9 @@
GTK_V=`pkg-config --modversion gtk+-2.0`
GOOC_V=`pkg-config --modversion goocanvas`
CURL_V=`pkg-config --modversion libcurl`
+if test "$havelibgps" = true ; then
+ GPS_V=`pkg-config --modversion libgps`
+fi
dnl SQL_V=`pkg-config --modversion sqlite3`
dnl if test "$havehamlib" = true ; then
dnl HAML_V=`pkg-config --modversion hamlib`
@@ -113,7 +127,10 @@
echo Gdk version........ : $GDK_V
echo Gtk+ version....... : $GTK_V
echo GooCanvas version.. : $GOOC_V
-echo Liburl version..... : $CURL_V
+echo Libcurl version..... : $CURL_V
+if test "$havelibgps" = true ; then
+ echo Libgps version..... : $GPS_V
+fi
dnl echo SQLite version..... : $SQL_V
dnl if test "$havehamlib" = true ; then
dnl echo Hamlib version..... : $HAML_V
Property changes on: trunk/data/satdata/scripts/convert.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/20439.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/20442.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/22825.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/22826.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/23439.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/24278.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/24786.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/25338.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/25397.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/25544.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/26352.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/26536.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/26871.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/26931.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/27453.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/27607.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/27844.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/27848.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/27939.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/28375.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/28650.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/28654.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/28895.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/32785.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/32787.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/32789.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/32791.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/33493.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/33498.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/33499.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/data/trsp/7530.trsp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/src/config-keys.h
===================================================================
--- trunk/src/config-keys.h 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/config-keys.h 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -56,8 +57,10 @@
#define QTH_CFG_LAT_KEY "LAT"
#define QTH_CFG_LON_KEY "LON"
#define QTH_CFG_ALT_KEY "ALT"
+#define QTH_CFG_GPSD_SERVER_KEY "GPSDSERVER"
+#define QTH_CFG_GPSD_PORT_KEY "GPSDPORT"
+#define QTH_CFG_TYPE_KEY "QTH_TYPE"
-
/* Module files (.mod) */
/* global */
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/gtk-polar-view.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -685,6 +686,7 @@
}
/* check refresh rate and refresh sats if time */
+ /* FIXME need to add location based update*/
if (polv->counter < polv->refresh) {
polv->counter++;
}
@@ -846,6 +848,7 @@
/* free pass info */
free_pass (obj->pass);
+ obj->pass=NULL;
/* if this was the selected satellite we need to
clear the info text
@@ -914,8 +917,42 @@
g_free (text);
}
+ /*check if pass was computed near current qth otherwise update*/
+ if (obj->pass) {
+ /* FIXME once again threshold should be user configurable*/
+ if (qth_small_dist(polv->qth,(obj->pass->qth_comp))>1.0){
+
+ root = goo_canvas_get_root_item_model (GOO_CANVAS (polv->canvas));
+ /* remove sky track */
+ if (obj->showtrack) {
+ idx = goo_canvas_item_model_find_child (root, obj->track);
+ if (idx != -1)
+ goo_canvas_item_model_remove_child (root, idx);
+
+ for (i = 0; i < TRACK_TICK_NUM; i++) {
+ idx = goo_canvas_item_model_find_child (root, obj->trtick[i]);
+ if (idx != -1)
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ }
+
+ /* free pass info */
+ free_pass (obj->pass);
+ obj->pass=NULL;
+
+ /*compute new pass */
+ obj->pass = get_current_pass (sat, polv->qth, now);
+
+ /* Finally, create the sky track if necessary */
+ if (obj->showtrack)
+ create_track (polv, obj, sat);
+
+ }
+ }
g_free (losstr);
g_free (catnum); // FIXME: why free here, what about else?
+
+
}
else {
/* add sat to canvas */
Property changes on: trunk/src/gtk-rig-ctrl.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/continuous_network/src/gtk-rig-ctrl.c:655-689
+ /branches/continuous_network/src/gtk-rig-ctrl.c:655-689
/branches/gpsd_testing/src/gtk-rig-ctrl.c:728-787
Property changes on: trunk/src/gtk-rig-ctrl.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/continuous_network/src/gtk-rig-ctrl.h:655-689
+ /branches/continuous_network/src/gtk-rig-ctrl.h:655-689
/branches/gpsd_testing/src/gtk-rig-ctrl.h:728-787
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/gtk-rot-ctrl.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -303,8 +304,20 @@
g_free (buff);
update_count_down (ctrl, t);
+
+ /*if the current pass is too far away*/
+ if ((ctrl->pass!=NULL)&& (ctrl->qth!=NULL))
+ if (qth_small_dist(ctrl->qth,ctrl->pass->qth_comp)>1.0){
+ free_pass (ctrl->pass);
+ ctrl->pass=NULL;
+ ctrl->pass = get_pass (ctrl->target, ctrl->qth, t, 3.0);
+ if (ctrl->pass) {
+ set_flipped_pass(ctrl);
+ /* update polar plot */
+ gtk_polar_plot_set_pass (GTK_POLAR_PLOT (ctrl->plot), ctrl->pass);
+ }
+ }
-
/* update next pass if necessary */
if (ctrl->pass != NULL) {
/*if we are not in the current pass*/
@@ -977,14 +990,12 @@
/* otherwise look 20 minutes into the future*/
time_delta=1.0/72.0;
}
+
/* have a minimum time delta*/
- if (time_delta<(ctrl->delay/1000.0/secday)){
- time_delta=ctrl->delay/1000.0/secday;
+ step_size = time_delta / 2.0;
+ if (step_size<ctrl->delay/1000.0/(secday)){
+ step_size=ctrl->delay/1000.0/(secday);
}
-
-
- step_size = time_delta / 2.0;
-
/*
find a time when satellite is above horizon and at the
edge of tolerance. the final step size needs to be smaller
@@ -1024,6 +1035,7 @@
setaz = sat->az;
}
}
+
/* send controller values to rotator device */
/* this is the newly computed value which should be ahead of the current position */
if (!set_pos (ctrl, setaz, setel)) {
Property changes on: trunk/src/gtk-rot-ctrl.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/continuous_network/src/gtk-rot-ctrl.c:655-689
+ /branches/continuous_network/src/gtk-rot-ctrl.c:655-689
/branches/gpsd_testing/src/gtk-rot-ctrl.c:728-787
Property changes on: trunk/src/gtk-rot-ctrl.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/continuous_network/src/gtk-rot-ctrl.h:655-689
+ /branches/continuous_network/src/gtk-rot-ctrl.h:655-689
/branches/gpsd_testing/src/gtk-rot-ctrl.h:728-787
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/gtk-sat-map.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -4,9 +4,11 @@
Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
Copyright (C) 2006-2007 William J Beksi, KC2EXL.
+ Copyright (C) 2011 Charles Suprin, AA1VS.
Authors: Alexandru Csete <oz...@gm...>
William J Beksi <wj...@us...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -608,12 +610,44 @@
gint *catnr;
guint h, m, s;
gchar *ch, *cm, *cs;
+ gfloat x,y;
+ gdouble oldx,oldy;
+
/* check whether there are any pending resize requests */
if (satmap->resize)
update_map_size (satmap);
- /* check refresh rate and refresh sats if time */
+ /* check if qth has moved significantly if so move it*/
+ lonlat_to_xy (satmap, satmap->qth->lon, satmap->qth->lat, &x, &y);
+ g_object_get (satmap->qthmark,
+ "x", &oldx,
+ "y", &oldy,
+ NULL);
+
+ if ((fabs (oldx-x) >= 2*MARKER_SIZE_HALF) ||
+ (fabs (oldy-y) >= 2*MARKER_SIZE_HALF)) {
+
+ /* update qth mark */
+ g_object_set (satmap->qthmark,
+ "x", x - MARKER_SIZE_HALF,
+ "y", y - MARKER_SIZE_HALF,
+ NULL);
+ g_object_set (satmap->qthlabel,
+ "x", x,
+ "y", y+2,
+ NULL);
+
+ /* QTH info */
+ g_object_set (satmap->locnam,
+ "x", (gdouble) satmap->x0 + 2,
+ "y", (gdouble) satmap->y0 + 1,
+ NULL);
+ satmap->counter=satmap->refresh;
+ }
+
+ /* check refresh rate and refresh sats/qth if time */
+ /* FIXME add location check*/
if (satmap->counter < satmap->refresh) {
satmap->counter++;
}
@@ -622,6 +656,25 @@
satmap->counter = 1;
satmap->naos = 2458849.5;
+ /* QTH */
+ /*update for accuracy*/
+ lonlat_to_xy (satmap, satmap->qth->lon, satmap->qth->lat, &x, &y);
+ g_object_set (satmap->qthmark,
+ "x", x - MARKER_SIZE_HALF,
+ "y", y - MARKER_SIZE_HALF,
+ NULL);
+ g_object_set (satmap->qthlabel,
+ "x", x,
+ "y", y+2,
+ NULL);
+
+ /* QTH info */
+ g_object_set (satmap->locnam,
+ "x", (gdouble) satmap->x0 + 2,
+ "y", (gdouble) satmap->y0 + 1,
+ NULL);
+
+
/* update sats */
g_hash_table_foreach (satmap->sats, update_sat, satmap);
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/gtk-sat-module.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -4,7 +4,9 @@
Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
+
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -159,9 +161,7 @@
module->win = NULL;
module->qth = g_try_new0 (qth_t, 1);
- module->qth->lat = 0.0;
- module->qth->lon = 0.0;
- module->qth->alt = 0;
+ qth_init(module->qth);
module->satellites = g_hash_table_new_full (g_int_hash,
g_int_equal,
@@ -179,6 +179,10 @@
module->state = GTK_SAT_MOD_STATE_DOCKED;
module->busy = g_mutex_new();
+ /* open the gpsd device */
+ module->gps_data = NULL;
+
+
module->grid = NULL;
module->views = NULL;
module->nviews = 0;
@@ -282,16 +286,18 @@
/* load configuration; note that this will also set the module name */
gtk_sat_module_read_cfg_data (GTK_SAT_MODULE (widget), cfgfile);
-
- /*check that we loaded some reasonable data*/
- if (GTK_SAT_MODULE(widget)->cfgdata==NULL){
- sat_log_log (SAT_LOG_LEVEL_ERROR,
+
+ /*check that we loaded some reasonable data*/
+ if (GTK_SAT_MODULE(widget)->cfgdata==NULL){
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: Module %s has problems."),
__FUNCTION__, cfgfile);
-
+
return NULL;
- }
-
+ }
+ /*initialize the qth engine and get position*/
+ qth_data_update_init(GTK_SAT_MODULE(widget)->qth);
+
/* module state */
if ((g_key_file_has_key (GTK_SAT_MODULE (widget)->cfgdata,
MOD_CFG_GLOBAL_SECTION,
@@ -564,11 +570,7 @@
__FUNCTION__, buffer);
/* settings are really screwed up; we need some safe values here */
- module->qth->name = g_strdup (_("Error"));
- module->qth->loc = g_strdup (_("Error"));
- module->qth->lat = 0.0;
- module->qth->lon = 0.0;
- module->qth->alt = 0;
+ qth_safe(module->qth);
}
}
@@ -748,8 +750,9 @@
GdkWindowState state;
gdouble delta;
guint i;
+ /*update the qth position*/
+ qth_data_update(mod->qth,mod->tmgCdnum);
-
/* in docked state, update only if tab is visible */
switch (mod->state) {
@@ -773,19 +776,19 @@
}
if (needupdate) {
-
- if (g_mutex_trylock(mod->busy)==FALSE) {
-
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Previous cycle missed it's deadline."),
- __FUNCTION__);
-
- return TRUE;
-
- }
-
+
+ if (g_mutex_trylock(mod->busy)==FALSE) {
+
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Previous cycle missed it's deadline."),
+ __FUNCTION__);
+
+ return TRUE;
+
+ }
+
mod->rtNow = get_current_daynum ();
-
+
/* Update time if throttle != 0 */
if (mod->throttle) {
@@ -799,7 +802,7 @@
/* time to update header? */
mod->head_count++;
- if (mod->head_count == mod->head_timeout) {
+ if (mod->head_count >= mod->head_timeout) {
/* reset counter */
mod->head_count = 0;
@@ -815,7 +818,19 @@
*/
mod->event_count = 0;
}
-
+ /*only trigger an update if adequate movement has occurred*/
+ /*FIXME position threshhold should be configurable*/
+ if (qth_small_dist(mod->qth,mod->qth_event)>1.0) {
+ /* reset counter, this will make gtk_sat_module_update_sat
+ recalculate events
+ */
+ mod->event_count = 0;
+ }
+
+ /*if the events are going to be recalculated store the position*/
+ if (mod->event_count == 0){
+ qth_small_save(mod->qth,&(mod->qth_event));
+ }
/* update satellite data */
g_hash_table_foreach (mod->satellites,
gtk_sat_module_update_sat,
@@ -939,6 +954,7 @@
sat = SAT(val);
module = GTK_SAT_MODULE (data);
+
/* get current time (real or simulated */
@@ -965,7 +981,7 @@
}
- /*** FIXME: we don't need to do this every time! */
+ /*data may have been updated by gpsd*/
obs_geodetic.lon = module->qth->lon * de2ra;
obs_geodetic.lat = module->qth->lat * de2ra;
obs_geodetic.alt = module->qth->alt / 1000.0;
@@ -1029,7 +1045,7 @@
/** \brief Module options
*
* Invoke module-wide popup menu
- */
+ */
static void
gtk_sat_module_popup_cb (GtkWidget *button, gpointer data)
{
@@ -1334,9 +1350,9 @@
time_t t;
guint size;
gchar buff[TIME_FORMAT_MAX_LENGTH+1];
+ gchar *buff2;
-
t = (module->tmgCdnum - 2440587.5)*86400.;
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
@@ -1351,8 +1367,17 @@
buff[size]='\0';
else
buff[TIME_FORMAT_MAX_LENGTH]='\0';
+
+ if (module->qth->type==QTH_GPSD_TYPE) {
+ buff2=g_strdup_printf("%s GPS %0.3f seconds old", buff,fabs(module->tmgCdnum-module->qth->gpsd_update)*(24*3600));
+ gtk_label_set_text (GTK_LABEL (module->header), buff2);
+ g_free(buff2);
+ }
+ else
+ gtk_label_set_text (GTK_LABEL (module->header), buff);
+
- gtk_label_set_text (GTK_LABEL (module->header), buff);
+
g_free (fmtstr);
if (module->tmgActive)
@@ -1487,8 +1512,12 @@
/** \brief Update GtkSkyGlance view
* \param module Pointer to the GtkSatModule widget
*
- * This function checks how long ago the GtkSkyGlance widget has been updated
- * and performs an update if necessary. The current timeout is set to 60 sec.
+ * This function checks to see if the sky-at-a-glance display needs to be updated
+ * due to time or qth moving. It checks how long ago the GtkSkyGlance widget was
+ * updated and performs an update if necessary. The current timeout is set to 60 sec.
+ * It also checks how far away the qth is from where the GtkSkyGlance
+ * widget was last updated and triggers an update if necessary. The current
+ * distance is set to 1km.
*
* This is a cheap/lazy implementation of automatic update. Instead of
* performing a real update by "moving" the objects on the GtkSkyGlance canvas,
@@ -1501,9 +1530,18 @@
*/
static void update_skg (GtkSatModule *module)
{
-
+ gboolean update_needed=FALSE;
/* threshold is ~60 seconds */
- if G_UNLIKELY(fabs(module->tmgCdnum - module->lastSkgUpd) > 7.0e-4) {
+ if (G_UNLIKELY(fabs(module->tmgCdnum - module->lastSkgUpd) > 7.0e-4)) {
+ update_needed=TRUE;
+ }
+ /* threshold is 1km */
+ if (G_UNLIKELY(qth_small_dist(module->qth, module->lastSkgUpdqth) >1.0)) {
+ update_needed=TRUE;
+ }
+
+
+ if (G_UNLIKELY(update_needed==TRUE)) {
sat_log_log (SAT_LOG_LEVEL_MSG,
_("%s: Updating GtkSkyGlance for %s"),
@@ -1515,5 +1553,6 @@
gtk_widget_show_all (module->skg);
module->lastSkgUpd = module->tmgCdnum;
+ qth_small_save(module->qth,&(module->lastSkgUpdqth));
}
}
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/gtk-sat-module.h 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -103,6 +104,7 @@
GtkWidget *skgwin; /*!< Sky at glance window */
GtkWidget *skg; /*!< Sky at glance widget */
gdouble lastSkgUpd; /*!< Daynum of last GtkSkyGlance update */
+ qth_small_t lastSkgUpdqth; /*!< QTH information for last GtkSkyGlance update. */
GtkWidget *header;
guint head_count;
@@ -117,7 +119,7 @@
GKeyFile *cfgdata; /*!< Configuration data. */
qth_t *qth; /*!< QTH information. */
-
+ qth_small_t qth_event; /*!< QTH information for last AOS/LOS update. */
GHashTable *satellites; /*!< Satellites. */
guint32 timeout; /*!< Timeout value [msec] */
@@ -152,6 +154,9 @@
GtkWidget *tmgState; /*!< Status label indicating RT/SRT/MAN */
gboolean reset; /*!< Flag indicating whether time reset is in progress */
+
+ /* location structure */
+ struct gps_data_t* gps_data; /*!< GPSD data structure */
};
struct _GtkSatModuleClass
Modified: trunk/src/mod-mgr.c
===================================================================
--- trunk/src/mod-mgr.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/mod-mgr.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -82,7 +83,7 @@
static void create_module_window (GtkWidget *module);
-/** \brief Create and initialise module manger.
+/** \brief Create and initialise module manager.
* \return The main module container widget (GtkNotebook).
*
* This function creates and initialises the module manager widget, which
@@ -209,13 +210,13 @@
/* send message to logger */
sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Added %s to module manger (page %d)."),
+ _("%s: Added %s to module manager (page %d)."),
__FUNCTION__, GTK_SAT_MODULE (module)->name, page);
}
else {
/* send message to logger */
sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Added %s to module manger (NOT DOCKED)."),
+ _("%s: Added %s to module manager (NOT DOCKED)."),
__FUNCTION__, GTK_SAT_MODULE (module)->name);
}
retcode = 0;
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/predict-tools.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,11 +2,12 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Parts are Copyright John A. Magliacane, KD2BD 1991-2003 (indicated below)
Authors: Alexandru Csete <oz...@gm...>
John A. Magliacane, KD2BD.
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -524,6 +525,8 @@
pass->vis[3] = 0;
pass->satname = g_strdup (sat->nickname);
pass->details = NULL;
+ /*copy qth data into the pass for later comparisons*/
+ qth_small_save(qth,&(pass->qth_comp));
/* iterate over each time step */
for (t = pass->aos; t <= pass->los; t += step) {
@@ -617,7 +620,7 @@
iter++;
}
}
-
+
return pass;
}
@@ -954,6 +957,8 @@
pass->vis[3] = 0;
pass->satname = g_strdup (sat->nickname);
pass->details = NULL;
+ /*copy qth data into the pass for later comparisons*/
+ qth_small_save(qth,&(pass->qth_comp));
/* iterate over each time step */
for (t = pass->aos; t <= pass->los; t += step) {
@@ -1034,7 +1039,7 @@
pass->tca = tca;
}
-
+
return pass;
}
Modified: trunk/src/predict-tools.h
===================================================================
--- trunk/src/predict-tools.h 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/predict-tools.h 2011-03-20 15:05:07 UTC (rev 788)
@@ -5,6 +5,7 @@
Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -49,6 +50,7 @@
gdouble maxel_az; /*!< Azimuth at maximum elevation */
gchar vis[4]; /*!< Visibility string, e.g. VSE, -S-, V-- */
GSList *details; /*!< List of pass_detail_t entries */
+ qth_small_t qth_comp; /*!< Short version of qth at time computed */
} pass_t;
Modified: trunk/src/qth-data.c
===================================================================
--- trunk/src/qth-data.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/qth-data.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -28,17 +29,24 @@
#include <glib.h>
#include <glib/gi18n.h>
+#ifdef HAVE_CONFIG_H
+# include <build-config.h>
+#endif
+
#include "sgpsdp/sgp4sdp4.h"
#include "qth-data.h"
#include "sat-log.h"
#include "config-keys.h"
-#ifdef HAVE_CONFIG_H
-# include <build-config.h>
-#endif
#include "orbit-tools.h"
#include "time-tools.h"
+#include "locator.h"
+#if HAS_LIBGPS
+#include <gps.h>
+#endif
+void qth_validate(qth_t*qth);
+
/** \brief Read QTH data from file.
* \param filename The file to read from.
* \param qth Pointer to a qth_t data structure where the data will be stored.
@@ -202,6 +210,55 @@
else {
}
+
+ /* QTH Type */
+ qth->type = g_key_file_get_integer (qth->data,
+ QTH_CFG_MAIN_SECTION,
+ QTH_CFG_TYPE_KEY,
+ &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading QTH type (%s)."),
+ __FUNCTION__, error->message);
+
+ g_clear_error (&error);
+
+
+ qth->type = QTH_STATIC_TYPE;
+ }
+
+ /*GPSD Port*/
+ qth->gpsd_port = g_key_file_get_integer (qth->data,
+ QTH_CFG_MAIN_SECTION,
+ QTH_CFG_GPSD_PORT_KEY,
+ &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading QTH type (%s)."),
+ __FUNCTION__, error->message);
+
+ g_clear_error (&error);
+
+ /*if not set put it on the default port*/
+ qth->gpsd_port = 2947;
+ }
+
+ /* GPSD Server */
+ qth->gpsd_server = g_key_file_get_string (qth->data,
+ QTH_CFG_MAIN_SECTION,
+ QTH_CFG_GPSD_SERVER_KEY,
+ &error);
+ if ((qth->gpsd_server == NULL) || (error != NULL)) {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: QTH has no GPSD Server."),
+ __FUNCTION__);
+
+ qth->gpsd_server = g_strdup ("");
+ g_clear_error (&error);
+ }
+
+ qth_validate(qth);
+
/* Now, send debug message and return */
sat_log_log (SAT_LOG_LEVEL_MSG,
_("%s: QTH data: %s, %.4f, %.4f, %d"),
@@ -291,6 +348,25 @@
qth->wx);
}
+ /* qth type */
+ /* static, gpsd...*/
+ g_key_file_set_integer (qth->data,
+ QTH_CFG_MAIN_SECTION,
+ QTH_CFG_TYPE_KEY,
+ qth->type);
+ /* gpsd server */
+ if (qth->gpsd_server && (g_utf8_strlen (qth->gpsd_server, -1) > 0)) {
+ g_key_file_set_string (qth->data,
+ QTH_CFG_MAIN_SECTION,
+ QTH_CFG_GPSD_SERVER_KEY,
+ qth->gpsd_server);
+ }
+ /*gpsd port*/
+ g_key_file_set_integer (qth->data,
+ QTH_CFG_MAIN_SECTION,
+ QTH_CFG_GPSD_PORT_KEY,
+ qth->gpsd_port);
+
/* saving code */
/* convert configuration data struct to charachter string */
@@ -366,6 +442,9 @@
void
qth_data_free (qth_t *qth)
{
+ /*stop any updating*/
+ qth_data_update_stop(qth);
+
if (qth->name) {
g_free (qth->name);
qth->name = NULL;
@@ -399,3 +478,361 @@
g_free (qth);
}
+/** \brief Update the qth data by whatever method is appropriate.
+ * \param qth the qth data structure to update
+ * \param qth the time at which the qth is to be computed. this may be ignored by gps updates.
+ */
+gboolean qth_data_update(qth_t * qth, gdouble t) {
+ gboolean retval = FALSE;
+ guint num_loops=0;
+ switch (qth->type) {
+ case QTH_STATIC_TYPE:
+ /*never changes*/
+ break;
+ case QTH_GPSD_TYPE:
+ if (((t-qth->gpsd_update)>30.0/86400.0)&&(t-qth->gpsd_connected>30.0/86400.0)){
+ /*if needed restart the gpsd interface*/
+ qth_data_update_stop(qth);
+ qth_data_update_init(qth);
+ qth->gpsd_connected=t;
+
+ }
+
+ if (qth->gps_data!=NULL) {
+#if HAS_LIBGPS
+ switch (GPSD_API_MAJOR_VERSION){
+ case 4:
+#if GPSD_API_MAJOR_VERSION==4
+ while(gps_waiting(qth->gps_data) == TRUE) {
+ /* this is a watchdog in case there is a problem with the gpsd code.*/
+ /* if the server was up and has failed then gps_waiting in 2.92 confirmed */
+ /* will return 1 (supposedly fixed in later versions.)*/
+ /* if we do not do this as a while loop, the gpsd packets can backup */
+ /* and no longer be in sync with the gps receiver*/
+ num_loops++;
+ if (num_loops>1000){
+ retval=FALSE;
+ break;
+ }
+ if(gps_poll(qth->gps_data) == 0){
+ /*handling packet_set inline with
+ http://gpsd.berlios.de/client-howto.html
+ */
+ if (qth->gps_data->set&PACKET_SET) {
+ if (qth->gps_data->fix.mode >= MODE_2D) {
+ if (qth->lat != qth->gps_data->fix.latitude) {
+ qth->lat = qth->gps_data->fix.latitude;
+ retval = TRUE;
+ }
+ if (qth->lon!=qth->gps_data->fix.longitude) {
+ qth->lon = qth->gps_data->fix.longitude;
+ retval = TRUE;
+ }
+ }
+
+ if (qth->gps_data->fix.mode == MODE_3D) {
+ if (qth->alt != qth->gps_data->fix.altitude) {
+ qth->alt = qth->gps_data->fix.altitude;
+ retval = TRUE;
+ }
+ } else {
+ if (qth->alt != 0) {
+ qth->alt = 0;
+ retval = TRUE;
+ }
+ }
+ }
+ }
+ }
+#endif
+ break;
+ case 5:
+#if GPSD_API_MAJOR_VERSION==5
+ while(gps_waiting(qth->gps_data) == 1) {
+ /*see comment from above*/
+ /*hopefully not needed but does not hurt anything.*/
+ num_loops++;
+ if (num_loops>1000){
+ retval=FALSE;
+ break;
+ }
+ if(gps_read(qth->gps_data) == 0){
+ /*handling packet_set inline with
+ http://gpsd.berlios.de/client-howto.html
+ */
+ if (qth->gps_data->set&PACKET_SET) {
+ if (qth->gps_data->fix.mode >= MODE_2D) {
+ if (qth->lat != qth->gps_data->fix.latitude) {
+ qth->lat = qth->gps_data->fix.latitude;
+ retval = TRUE;
+ }
+ if (qth->lon!=qth->gps_data->fix.longitude) {
+ qth->lon = qth->gps_data->fix.longitude;
+ retval = TRUE;
+ }
+ }
+
+ if (qth->gps_data->fix.mode == MODE_3D) {
+ if (qth->alt != qth->gps_data->fix.altitude) {
+ qth->alt = qth->gps_data->fix.altitude;
+ retval = TRUE;
+ }
+ } else {
+ if (qth->alt != 0) {
+ qth->alt = 0;
+ retval = TRUE;
+ }
+ }
+ }
+ }
+ }
+#endif
+ break;
+ default:
+ break;
+ }
+#endif
+ if (retval == TRUE){
+ qth->gpsd_update = t;
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ /*check that data is valid*/
+ qth_validate(qth);
+ return retval;
+}
+
+/** \brief Initialize whatever structures inside the qth_t stucture for later updates.
+ * \param qth the qth data structure to update
+ *
+ *Initial intention of this is to open sockets and ports to gpsd
+ *and other like services to update the qth position.
+ */
+gboolean qth_data_update_init(qth_t * qth) {
+ char *port;
+ gboolean retval=FALSE;
+
+ switch (qth->type){
+
+ case QTH_STATIC_TYPE:
+ /*nothing to do. the data never updates*/
+ break;
+ case QTH_GPSD_TYPE:
+#if HAS_LIBGPS
+ switch (GPSD_API_MAJOR_VERSION) {
+ case 4:
+#if GPSD_API_MAJOR_VERSION==4
+ /* open the connection to gpsd and start the stream */
+ qth->gps_data = g_try_new0(struct gps_data_t,1);
+ port=g_strdup_printf("%d",qth->gpsd_port);
+ if (gps_open_r(qth->gpsd_server,port,qth->gps_data)==-1) {
+ free(qth->gps_data);
+ qth->gps_data = NULL;
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not open gpsd at %s:%d"),
+ __FUNCTION__, qth->gpsd_server, qth->gpsd_port);
+ retval = FALSE;
+ } else {
+ (void)gps_stream(qth->gps_data, WATCH_ENABLE, NULL);
+ retval = TRUE;
+ }
+ g_free(port);
+#endif
+ break;
+ case 5:
+#if GPSD_API_MAJOR_VERSION==5
+ /* open the connection to gpsd and start the stream */
+ qth->gps_data = g_try_new0(struct gps_data_t,1);
+ port=g_strdup_printf("%d",qth->gpsd_port);
+ if (gps_open(qth->gpsd_server,port,qth->gps_data)==-1) {
+ free(qth->gps_data);
+ qth->gps_data = NULL;
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not open gpsd at %s:%d"),
+ __FUNCTION__, qth->gpsd_server, qth->gpsd_port);
+ retval = FALSE;
+ } else {
+ (void)gps_stream(qth->gps_data, WATCH_ENABLE, NULL);
+ retval = TRUE;
+ }
+ g_free(port);
+#endif
+ break;
+ default:
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Unsupported gpsd api major version (%d)"),
+ __FUNCTION__, GPSD_API_MAJOR_VERSION);
+
+
+ return FALSE;
+ break;
+ }
+#else
+ return FALSE;
+#endif
+ break;
+
+ default:
+ break;
+ }
+ return retval;
+}
+
+/** \brief Shutdown and free structures inside the qth_t stucture were used for updates.
+ * \param qth the qth data structure to update
+ *
+ *Initial intention of this is to open sockets and ports to gpsd
+ *and other like services to update the qth position.
+ */
+void qth_data_update_stop (qth_t *qth) {
+ switch (qth->type) {
+ case QTH_STATIC_TYPE:
+ /*nothing to do. the data never updates*/
+ break;
+ case QTH_GPSD_TYPE:
+
+ /* close gpsd socket */
+ if (qth->gps_data !=NULL){
+#if HAS_LIBGPS
+ switch (GPSD_API_MAJOR_VERSION) {
+ case 4:
+ gps_close(qth->gps_data);
+ break;
+ case 5:
+ gps_close(qth->gps_data);
+ break;
+ default:
+ break;
+ }
+#endif
+ qth->gps_data = NULL;
+ }
+
+ break;
+ default:
+ break;
+ }
+}
+
+/** \brief Load initial values into the qth_t data structure
+ * \param qth the qth data structure to update
+ */
+void qth_init(qth_t* qth) {
+ qth->lat=0;
+ qth->lon=0;
+ qth->alt=0;
+ qth->type=QTH_STATIC_TYPE;
+ qth->gps_data=NULL;
+ qth->name=NULL;
+ qth->loc=NULL;
+ qth->gpsd_port=0;
+ qth->gpsd_server=NULL;
+ qth->gpsd_update=0.0;
+ qth->gpsd_connected=0.0;
+}
+
+/** \brief Load safe values into the qth_t data structure
+ * \param qth the qth data structure to update
+ * This can be used if some operation is suspected of corrupting the structure or entering invalid data. Originally it is based on code that reset values if a load/read of a .qth failed.
+ */
+void qth_safe(qth_t* qth) {
+ qth->name = g_strdup (_("Error"));
+ qth->loc = g_strdup (_("Error"));
+ qth->type=QTH_STATIC_TYPE;
+ qth->lat=0;
+ qth->lon=0;
+ qth->alt=0;
+ qth->gps_data=NULL;
+}
+
+/** \brief Copy values from qth structure to qth_small structure
+ * \param qth the qth data structure to backup
+ * \param qth_small the data structure to store values
+ * This is intended for copying only the minimal qth data to a structure for tagging and later comparison.
+ */
+void qth_small_save(qth_t*qth,qth_small_t *qth_small){
+ qth_small->lat=qth->lat;
+ qth_small->lon=qth->lon;
+ qth_small->alt=qth->alt;
+}
+
+/** \brief Validate the contents of a qth structure and correct if neccessary
+ * \param qth the qth data structure to cleanup
+ */
+void qth_validate(qth_t*qth){
+ /*check that the values are not set to nonsense such as nan or inf. if so error it and set to zero.*/
+ if (!isnormal(qth->lat)){
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: QTH data had bogus lat %f"),
+ __FUNCTION__,qth->lat);
+ qth->lat=0.0;
+
+ }
+ if (!isnormal(qth->lon)){
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: QTH data had bogus lon %f"),
+ __FUNCTION__,qth->lon);
+ qth->lon=0.0;
+ }
+ if (!isnormal(qth->alt)){
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: QTH data had bogus alt %f"),
+ __FUNCTION__,qth->alt);
+ qth->alt=0.0;
+ }
+
+ /*check that qth->lat and qth->lon are in a reasonable range and if not wrap them back*/
+ if (fabs(qth->lat)>90.0||fabs(qth->lon)>180.0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: File contained bogus QTH data. Correcting: %s, %.4f, %.4f, %d"),
+ __FUNCTION__,
+ qth->name,
+ qth->lat,
+ qth->lon,
+ qth->alt);
+
+ qth->lat=fmod(qth->lat,360.0);
+ while ((qth->lat)>180.0){
+ qth->lat=qth->lat-180.0;
+ qth->lon=qth->lon+180.0;
+ }
+
+ while ((qth->lat)<-180.0){
+ qth->lat=qth->lat+180.0;
+ qth->lon=qth->lon+180.0;
+ }
+ if (qth->lat>90.0){
+ qth->lat=180.0-qth->lat;
+ qth->lon=qth->lon+180.0;
+ }
+
+ if (qth->lat<-90.0){
+ qth->lat=-180.0-qth->lat;
+ qth->lon=qth->lon+180.0;
+ }
+
+ qth->lon=fmod(qth->lon+180.0,360.0)-180;
+ if (qth->lon<-180.0) {
+ qth->lon+=360.0;
+ } else if (qth->lon>180.0) {
+ qth->lon-=360.0;
+ }
+
+ }
+}
+
+/** \brief Compute the distance between a location in a qth_t structure and qth_small_t structure.
+ * \param qth the qth data structure
+ * \param qth_small the data structure
+ * This is intended for measuring distance between the current qth and the position that tagged some data in qth_small.
+ */
+double qth_small_dist(qth_t *qth,qth_small_t qth_small){
+ double distance,azimuth;
+ /* FIXME Is this the right coordinate system to use? */
+ /* a 3d coordinate system might make more sense long term */
+ qrb(qth->lon,qth->lat,qth_small.lon,qth_small.lat,&distance,&azimuth);
+ return(distance);
+}
Modified: trunk/src/qth-data.h
===================================================================
--- trunk/src/qth-data.h 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/qth-data.h 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -35,22 +36,46 @@
/** \brief QTH data structure in human readable form. */
typedef struct {
- gchar *name; /*!< Name, eg. callsign. */
- gchar *loc; /*!< Location, eg City, Country. */
- gchar *desc; /*!< Short description. */
+ gchar *name; /*!< Name, eg. callsign. */
+ gchar *loc; /*!< Location, eg City, Country. */
+ gchar *desc; /*!< Short description. */
+ gdouble lat; /*!< Latitude in dec. deg. North. */
+ gdouble lon; /*!< Longitude in dec. deg. East. */
+ gint alt; /*!< Altitude above sea level in meters. */
+ gchar *qra; /*!< QRA locator */
+ gchar *wx; /*!< Weather station code (4 chars). */
+ gint type; /*!< QTH type (static,gpsd). */
+ gchar *gpsd_server; /*!< GPSD Server name. */
+ gint gpsd_port; /*!< GPSD Server port. */
+ gdouble gpsd_update; /*!< Time last GPSD update was received. */
+ gdouble gpsd_connected; /*!< Time last GPSD update was last attempted to connect. */
+ struct gps_data_t *gps_data; /*!< gpsd data structure. */
+ GKeyFile *data; /*!< Raw data from cfg file. */
+} qth_t;
+
+/** \brief Compact QTH data structure for tagging data and comparing. */
+typedef struct {
gdouble lat; /*!< Latitude in dec. deg. North. */
gdouble lon; /*!< Longitude in dec. deg. East. */
gint alt; /*!< Altitude above sea level in meters. */
- gchar *qra; /*!< QRA locator */
- gchar *wx; /*!< Weather station code (4 chars). */
+} qth_small_t;
- GKeyFile *data; /*!< Raw data from cfg file. */
-} qth_t;
+enum {
+ QTH_STATIC_TYPE=0,
+ QTH_GPSD_TYPE
+} qth_data_type;
+
+
gint qth_data_read (const gchar *filename, qth_t *qth);
gint qth_data_save (const gchar *filename, qth_t *qth);
void qth_data_free (qth_t *qth);
-
-
+gboolean qth_data_update(qth_t *qth, gdouble t);
+gboolean qth_data_update_init(qth_t *qth);
+void qth_data_update_stop(qth_t *qth);
+double qth_small_dist(qth_t *qth,qth_small_t qth_small);
+void qth_small_save(qth_t *qth,qth_small_t *qth_small);
+void qth_init(qth_t* qth);
+void qth_safe(qth_t* qth);
#endif
Modified: trunk/src/qth-editor.c
===================================================================
--- trunk/src/qth-editor.c 2011-03-19 18:44:47 UTC (rev 787)
+++ trunk/src/qth-editor.c 2011-03-20 15:05:07 UTC (rev 788)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
@@ -73,6 +73,9 @@
static GtkWidget *location; /* QTH location */
static GtkWidget *desc; /* QTH description */
static GtkWidget *lat,*lon,*alt; /* LAT, LON and ALT */
+static GtkWidget *type; /* GPSD type */
+static GtkWidget *server; /* GPSD Server */
+static GtkWidget *port; /* GPSD Port */
static GtkWidget *ns,*ew;
static GtkWidget *qra; /* QRA locator */
@@ -373,7 +376,46 @@
GUINT_TO_POINTER (SELECTION_MODE_WX));
gtk_table_attach_defaults (GTK_TABLE (table), wxbut, 3, 4, 7, 8);
+ /* GPSD enabled*/
+ label = gtk_label_new (_("QTH Type"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 8, 9);
+ type = gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), "Static");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), "GPSD");
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), 0);
+ gtk_tooltips_set_tip (tooltips, type,
+ _("A qth can be static, ie. it does not change, or gpsd based for computers with gps attached."),
+ NULL);
+ gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 8, 9);
+ /* GPSD Server */
+ label = gtk_label_new (_("GPSD Server"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 9, 10);
+
+ server = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (server), 6000);
+ tooltips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tooltips, server,
+ _("GPSD Server."),
+ NULL);
+ gtk_table_attach_defaults (GTK_TABLE (table), server, 1, 2, 9, 10);
+
+ /* GPSD Port*/
+ label = gtk_label_new (_("GPSD Port"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 10, 11);
+
+ port = gtk_spin_button_new_with_range (0, 32768, 1);
+ gtk_spin_button_set_increments (GTK_SPIN_BUTTON (port), 1, 100);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (port), TRUE);
+ gtk_tooltips_set_tip (tooltips, port,
+ _("Set the port for GPSD to use. Default for gpsd is 2947."),
+ NULL);
+ gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 10, 11);
+
+
if (qth->name != NULL)
update_widgets (qth);
@@ -463,6 +505,9 @@
const gchar *qthdesc = NULL;
const gchar *qthwx = NULL;
const gchar *qthqra= NULL;
+ const gchar *gpsdserver= NULL;
+ guint gpsdport;
+ guint gpsdenabled;
gdouble qthlat;
gdouble qthlon;
guint qthalt;
@@ ...
[truncated message content] |
|
From: <aa...@us...> - 2011-03-19 18:44:54
|
Revision: 787
http://gpredict.svn.sourceforge.net/gpredict/?rev=787&view=rev
Author: aa1vs
Date: 2011-03-19 18:44:47 +0000 (Sat, 19 Mar 2011)
Log Message:
-----------
Update Copyright to 2011
Modified Paths:
--------------
trunk/doc/man/gpredict.1.in
Modified: trunk/doc/man/gpredict.1.in
===================================================================
--- trunk/doc/man/gpredict.1.in 2011-03-14 00:47:09 UTC (rev 786)
+++ trunk/doc/man/gpredict.1.in 2011-03-19 18:44:47 UTC (rev 787)
@@ -21,7 +21,7 @@
Report bugs to \fB<gpredict\-di...@li...>\fR.
.SH "COPYRIGHT"
-Copyright \(co 2001\-2009 Alexandru Csete.
+Copyright \(co 2001\-2011 Alexandru Csete.
.br
This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. If it breaks you can keep both pieces.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-14 00:47:17
|
Revision: 786
http://gpredict.svn.sourceforge.net/gpredict/?rev=786&view=rev
Author: aa1vs
Date: 2011-03-14 00:47:09 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Added more locations to locations.dat.
Modified Paths:
--------------
trunk/data/locations.dat
Modified: trunk/data/locations.dat
===================================================================
--- trunk/data/locations.dat 2011-03-13 16:03:15 UTC (rev 785)
+++ trunk/data/locations.dat 2011-03-14 00:47:09 UTC (rev 786)
@@ -1,13 +1,41 @@
Africa;Algeria;Annaba;DABB;36.8333;7.8167;4
+Africa;Algeria;Aoulef ;DAAF;26.967;1.083;309
+Africa;Algeria;Batna;DABT;35.550;6.183;1052
+Africa;Algeria;Bechar;DAOR;31.617;-2.233;773
+Africa;Algeria;Bejaia;DAAE;36.717;5.067;2
+Africa;Algeria;Biskra;DAUB;34.800;5.733;87
+Africa;Algeria;Bordj Mokhtar;DATM;21.375;0.924;396
+Africa;Algeria;Bou-Saada;DAAD;35.333;4.200;461
+Africa;Algeria;Chlef;DAOI;36.217;1.333;143
Africa;Algeria;Constantine;DABC;36.2833;6.6167;694
Africa;Algeria;Dar-El-Beida;DAAG;36.7167;3.25;25
+Africa;Algeria;Djanet;DAAJ;24.550;9.467;1054
+Africa;Algeria;Djelfa;DAFI;34.683;3.250;1144
+Africa;Algeria;El Golea;DAUE;30.567;2.867;397
+Africa;Algeria;El Oued;DAUO;33.500;6.117;63
Africa;Algeria;Ghardaia;DAUG;32.3833;3.8167;450
Africa;Algeria;Hassi-Messaoud;DAUH;31.6667;6.15;142
+Africa;Algeria;Illizi;DAAP;26.500;8.417;558
Africa;Algeria;In Amenas;DAUZ;28.05;9.6333;562
+Africa;Algeria;In Guezzam;DATG;19.567;5.750;399
+Africa;Algeria;In Salah North;DAUI;27.250;2.517;269
+Africa;Algeria;Jijel Achouat;DAAV;36.883;5.817;2
+Africa;Algeria;Laghouat;DAUL;33.767;2.933;765
+Africa;Algeria;Mascara-Ghriss;DAOV;35.200;0.133;514
+Africa;Algeria;Mecheria;DAAY;34.933;-0.433;1149
Africa;Algeria;Oran;DAOO;35.6333;-0.6;90
+Africa;Algeria;Oran/Tafaraoui;DAOL;35.542;-0.532;112
+Africa;Algeria;Ouargla;DAUU;31.917;5.400;141
+Africa;Algeria;Setif;DAAS;36.183;5.417;1038
+Africa;Algeria;Skikda;DABP;36.933;6.950;7
Africa;Algeria;Tamanrasset;DAAT;22.8167;5.4667;0
Africa;Algeria;Tebessa;DABS;35.4833;8.1333;813
+Africa;Algeria;Tiaret;DAOB;35.250;1.433;1127
+Africa;Algeria;Tilrempt/Hassi R'mel;DAFH;32.930;3.312;774
+Africa;Algeria;Timimoun;DAUT;29.250;0.283;312
+Africa;Algeria;Tindouf;DAOF;27.667;-8.133;431
Africa;Algeria;Tlemcen Zenata;DAON;35.0167;-1.4667;247
+Africa;Algeria;Touggourt;DAUK;33.117;6.133;85
Africa;Angola;Bie Silva Porto ;FNKU;-12.383;16.950;1701
Africa;Angola;Cabinda;FNCA;-5.550;12.183;25
Africa;Angola;Huambo Nova Lisboa ;FNHU;-12.800;15.750;1710
@@ -31,6 +59,7 @@
Africa;Botswana;Sua-Pan;FBSN;-20.467;25.983;903
Africa;Botswana;Tsabong;FBTS;-26.050;22.450;960
Africa;Botswana;Tshane;FBTE;-24.017;21.883;1118
+Africa;British Indian Ocean Territory;NSF DIEGO GARCIA;FJDG;-7.300;72.400;3
Africa;Burkina Faso;Bobo-Dioulasso;DFOO;11.167;-4.317;460
Africa;Burkina Faso;Boromo;DFCO;11.750;-2.933;270
Africa;Burkina Faso;Dedougou;DFOD;12.467;-3.483;300
@@ -90,13 +119,19 @@
Africa;Cote d'Ivoire;Yamoussoukro;DIYO;6.900;-5.350;196
Africa;Djibouti;Djibouti \ Ambouli;HDAM;11.550;43.167;49
Africa;Djibouti;Djibouti;HFFF;11.550;43.150;13
+Africa;Egypt;Alexandria Borg El Arab;HEBA;31.517;30.167;54
Africa;Egypt;Alexandria/Nouzha;HEAX;31.2;29.95;7
Africa;Egypt;Asswan;HESN;23.9667;32.7833;194
+Africa;Egypt;Asyut;HEAT;27.050;31.017;226
Africa;Egypt;Cairo;HECA;30.1333;31.4;74
+Africa;Egypt;El Arish;HEAR;31.083;33.817;31
+Africa;Egypt;El Tor;HETR;28.233;32.617;21
+Africa;Egypt;Hurguada;HEGN;27.150;33.717;16
Africa;Egypt;Luxor;HELX;25.6667;32.7;99
Africa;Egypt;Mersa Matruh;HEMM;31.3333;27.2167;30
Africa;Egypt;Port Said;HEPS;31.2667;32.3;6
Africa;Egypt;Sharm El Sheikhintl;HESH;27.9667;34.3833;0
+Africa;Egypt;Taba;HETB;29.599;34.777;749
Africa;Equatorial Guinea;Malabo/Fernando Poo;FGSL;3.750;8.767;56
Africa;Ethiopia;Addis Ababa;HAAB;8.983;38.800;2355
Africa;Ethiopia;Agordat ;HAAG;15.550;37.883;626
@@ -378,20 +413,75 @@
Africa;Somalia;Burao;HCMV;9.500;45.567;1032
Africa;Somalia;Hargeisa;HCMH;9.500;44.083;1326
Africa;Somalia;Mogadiscio;HCMM;2.033;45.350;9
+Africa;South Africa;Alexander Bay;FAAB;-28.567;16.533;21
+Africa;South Africa;Aliwal North;FAAN;-30.717;26.717;1348
+Africa;South Africa;Beaufort West;FABY;-32.350;22.583;842
Africa;South Africa;Bethlehem Airport;FABM;-28.25;28.3333;1700
Africa;South Africa;Bloemfontein J. B. M. Hertzog;FABL;-29.1;26.3;1400
+Africa;South Africa;Calvinia;FACV;-31.467;19.767;975
Africa;South Africa;Cape Town D. F. Malan;FACT;-33.9833;18.6;0
+Africa;South Africa;Carolina;FACL;-26.067;30.117;1693
+Africa;South Africa;De Aar;FADA;-30.650;24.017;1247
+Africa;South Africa;De Aar;FADY;-30.633;23.917;384
Africa;South Africa;Durban Louis Botha;FADN;-29.9667;30.95;0
+Africa;South Africa;Durban/Virginia;FAVG;-29.771;31.060;6
Africa;South Africa;East London;FAEL;-33.0333;27.8333;0
+Africa;South Africa;Ellisras;FAER;-23.726;27.688;851
+Africa;South Africa;Ermelo;FAEO;-26.500;29.983;1737
+Africa;South Africa;Frankfort;FAFF;-27.267;28.500;1499
+Africa;South Africa;Fraserburg;FAFR;-31.917;21.517;1264
Africa;South Africa;George Airport;FAGG;-34;22.3833;0
+Africa;South Africa;Gough Island;FAGE;-40.350;-9.883;54
+Africa;South Africa;Graaff Reinet;FAGR;-32.250;24.533;752
+Africa;South Africa;Greytown;FAGY;-29.117;30.567;1100
+Africa;South Africa;Hoedspruit;FAHS;-24.367;31.033;513
Africa;South Africa;Jan Smuts;FAJS;-26.1333;28.2333;1700
+Africa;South Africa;Kimberley, Kim-Apt;FAKM;-28.800;24.767;1198
+Africa;South Africa;Klerksdorp;FAKD;-26.867;26.717;1355
+Africa;South Africa;Ladysmith;FALY;-28.567;29.767;1078
Africa;South Africa;Langebaanweg;FALW;-32.9667;18.1667;0
+Africa;South Africa;Lanseria;FALA;-25.933;27.933;1377
Africa;South Africa;Lichtenburg;FALT;-26.1833;26.1833;0
+Africa;South Africa;Mafikeng Intl. Ad;FAMM;-25.783;25.533;1281
+Africa;South Africa;Margate;FAMG;-30.850;30.350;151
+Africa;South Africa;Marion Island;FAME;-46.883;37.867;22
+Africa;South Africa;Middelburg;FAMB;-31.483;25.033;1270
+Africa;South Africa;Mossel Bay Cape Saint Blaize ;FAMO;-34.183;22.150;59
+Africa;South Africa;Nelspruit;FANS;-25.433;30.983;671
+Africa;South Africa;Newcastle;FANC;-27.783;29.983;1251
+Africa;South Africa;Oudtshoorn;FAOH;-33.567;22.217;359
+Africa;South Africa;Overberg;FAOB;-34.600;20.283;75
+Africa;South Africa;Phalaborwa;FAPH;-23.933;31.150;427
+Africa;South Africa;Pietermaritzburg;FAPM;-29.650;30.400;739
Africa;South Africa;Pietersburg;FAPB;-23.8667;29.45;1200
+Africa;South Africa;Pietersburg Civil ;FAPI;-23.900;29.467;1327
+Africa;South Africa;Plettenberg Bay;FAPG;-34.088;23.329;139
Africa;South Africa;Port Elizabeth;FAPE;-33.9833;25.6;0
+Africa;South Africa;Port St Johns;FAPJ;-31.633;29.550;47
+Africa;South Africa;Potchefstroom;FAPS;-26.671;27.082;1378
Africa;South Africa;Pretoria;FAPR;-25.7333;28.1833;1300
+Africa;South Africa;Pretoria Irene ;FAIR;-25.917;28.217;1523
+Africa;South Africa;Queenstown;FAQT;-31.900;26.867;1094
+Africa;South Africa;Rand;FAGM;-26.250;28.000;1668
+Africa;South Africa;Richard Bay;FARB;-28.800;32.100;47
+Africa;South Africa;Rustenburg;FARG;-25.644;27.271;1128
+Africa;South Africa;Sishen;FASS;-27.650;23.000;1173
Africa;South Africa;Springbok;FASB;-29.6667;17.8667;1000
+Africa;South Africa;Springs;FASI;-26.248;28.398;1628
+Africa;South Africa;Standerton;FASR;-26.933;29.217;1581
+Africa;South Africa;Tristan Da Cunha;FATC;-37.050;-12.317;23
+Africa;South Africa;Tzaneen ;FATZ;-23.817;30.333;583
+Africa;South Africa;Ulundi;FAUL;-28.318;31.418;525
+Africa;South Africa;Umtata;FAUT;-31.533;28.667;742
Africa;South Africa;Upington;FAUP;-28.4;21.2667;800
+Africa;South Africa;Vereeniging;FAVV;-26.575;27.962;1483
+Africa;South Africa;Vredendal;FAVR;-31.667;18.500;34
+Africa;South Africa;Vryburg;FAVB;-26.950;24.633;1234
+Africa;South Africa;Vryheid;FAVY;-27.783;30.800;1158
+Africa;South Africa;Waterkloof (SAAF);FAWK;-25.833;28.217;1498
+Africa;South Africa;Welkom;FAWM;-28.000;26.667;1338
+Africa;South Africa;Witbank;FAWI;-25.831;29.192;1553
+Africa;South Africa;Wonderboom / Pretoria;FAWB;-25.650;28.217;1248
Africa;Spain;Fuerteventura / Aeropuerto;GCFV;28.450;-13.867;22
Africa;Spain;Gran Canaria - Canary Islands;GCLP;27.933;-15.383;23
Africa;Spain;Hierro / Aeropuerto;GCHI;27.817;-17.883;32
@@ -530,6 +620,10 @@
Asia;Afghanistan;Shindand;OASD;33.400;62.283;1150
Asia;Afghanistan;Zaranj;OAZG;31.000;61.850;478
Asia;Afghanistan;Zebak;OAZB;36.500;71.250;2600
+Asia;Bangladesh;Chittagong Patenga ;VGEG;22.267;91.817;4
+Asia;Bangladesh;Cox's Bazar;VGCB;21.433;91.967;2
+Asia;Bangladesh;Dhaka;VGTJ;23.767;90.383;8
+Asia;Bangladesh;Ishurdi;VGIS;24.133;89.050;13
Asia;Bangladesh;Jessore;VGJR;23.183;89.167;6
Asia;Bangladesh;Kurmitola, Dia;VGZR;23.850;90.400;9
Asia;Bangladesh;Rajshahi;VGRJ;24.367;88.700;17
@@ -538,18 +632,74 @@
Asia;Cambodia;Phnom-Penh / Pochentong;VDPP;11.550;104.850;10
Asia;Cambodia;Siemreap;VDSR;13.367;103.850;15
Asia;Hong Kong;Hong Kong;VHHH;22.3333;114.1833;24
+Asia;India;Agartala;VEAT;23.883;91.250;15
+Asia;India;Agra;VIAG;27.150;77.967;168
Asia;India;Ahmadabad;VAAH;23.0667;72.6333;55
+Asia;India;Akola;VAAK;20.700;77.067;305
+Asia;India;Allahabad / Bamhrauli;VIAL;25.450;81.733;97
Asia;India;Amritsar;VIAR;31.6333;74.8667;234
+Asia;India;Aurangabad Chikalthan Aerodrome;VAAU;19.850;75.400;582
+Asia;India;Bangalore / Hindustan;VOBG;12.950;77.667;888
+Asia;India;Bareilly;VIBY;28.367;79.400;167
+Asia;India;Belgaum / Sambra;VABM;15.850;74.617;758
+Asia;India;Bellary;VOBI;15.150;76.850;448
+Asia;India;Bhaunagar;VABV;21.750;72.200;5
+Asia;India;Bhopal / Bairagarh;VABP;23.283;77.350;523
+Asia;India;Bhubaneswar;VEBS;20.250;85.833;45
+Asia;India;Bhuj-Rudramata;VABJ;23.250;69.667;78
+Asia;India;Bilaspur;VABI;31.250;76.667;589
Asia;India;Bombay/Santacruz;VABB;19.1167;72.85;14
Asia;India;Calcutta/Dum Dum;VECC;22.65;88.45;6
+Asia;India;Car Nicobar;VECX;9.150;92.817;10
+Asia;India;Cochin / Willingdon;VOCC;9.950;76.267;1
+Asia;India;Coimbatore / Peelamedu;VOCB;11.033;77.050;396
+Asia;India;Cuddapah;VOCP;14.483;78.833;129
+Asia;India;Dibrugarh / Mohanbari;VEMN;27.483;95.017;110
+Asia;India;Gauhati;VEGT;26.100;91.583;47
+Asia;India;Gaya;VEGY;24.750;84.950;110
+Asia;India;Goa / Dabolim Airport;VAGO;15.383;73.817;42
+Asia;India;Gorakhpur;VEGK;26.750;83.367;76
+Asia;India;Gwalior;VIGR;26.233;78.250;205
+Asia;India;Hissar;VIHR;29.167;75.733;216
Asia;India;Hyderabad;VOHY;17.45;78.4667;545
+Asia;India;Imphal Tulihal;VEIM;24.767;93.900;780
+Asia;India;Indore;VAID;22.717;75.800;561
+Asia;India;Jabalpur;VAJB;23.200;79.950;391
+Asia;India;Jaipur / Sanganer;VIJP;26.817;75.800;385
+Asia;India;Jamshedpur;VEJS;22.817;86.183;140
+Asia;India;Jhansi;VIJN;25.450;78.583;250
+Asia;India;Jharsuguda;VEJH;21.917;84.083;228
+Asia;India;Jodhpur;VIJO;26.300;73.017;217
+Asia;India;Kanpur / Chakeri;VICX;26.400;80.400;123
+Asia;India;Khandwa;VAKD;21.833;76.367;317
+Asia;India;Kolhapur;VAKP;16.700;74.233;569
+Asia;India;Kota Aerodrome;VIKO;25.150;75.850;273
+Asia;India;Lucknow / Amausi;VILK;26.750;80.883;122
+Asia;India;M. O. Ranchi;VERC;23.317;85.317;652
Asia;India;Madras/Minambakkam;VOMM;13;80.1833;16
+Asia;India;Madurai;VOMD;9.833;78.083;139
+Asia;India;Mangalore / Bajpe;VOML;12.917;74.883;102
Asia;India;Nagpur Sonegaon;VANP;21.1;79.05;310
+Asia;India;New Delhi / Safdarjung;VIDD;28.583;77.200;211
Asia;India;New Delhi/Palam;VIDP;28.5667;77.1167;233
+Asia;India;North Lakhimpur;VELR;27.233;94.117;101
Asia;India;Patna;VEPT;25.6;85.1;60
+Asia;India;Port Blair;VEPB;11.667;92.717;73
+Asia;India;Rajkot;VARK;22.300;70.783;134
+Asia;India;Satna;VIST;24.567;80.833;315
+Asia;India;Sholapur;VASL;17.667;75.900;477
+Asia;India;Siliguri;VEBD;26.633;88.317;126
Asia;India;Thiruvananthapuram;VOTV;8.4667;76.95;8
Asia;India;Tiruchchirapalli;VOTR;10.7667;78.7167;88
+Asia;India;Udaipur Dabok;VIUD;24.617;73.883;509
Asia;India;Varanasi/Babatpur;VIBN;25.45;82.8667;85
+Asia;India;Vellore;VOVR;12.917;79.150;213
+Asia;India;Vijayawada / Gannavaram;VOBZ;16.533;80.800;21
+Asia;Iraq;Baghdad;ORBB;33.233;44.233;34
+Asia;Iraq;Mosul;ORBM;36.317;43.150;223
+Asia;Iraq;Saddam Irq-Afb / Civ ;ORBS;33.267;44.233;34
+Asia;Iraq;Shaibah / Basrah;ORMS;30.417;47.650;19
+Asia;Japan;Aguni Island;RORA;26.600;127.233;29
Asia;Japan;Akeno Ab;RJOE;34.5333;136.6833;9
Asia;Japan;Akita Airport;RJSK;39.6167;140.2167;96
Asia;Japan;Amami Airport;RJKA;28.4333;129.7167;7
@@ -559,53 +709,70 @@
Asia;Japan;Ashiya Ab;RJFA;33.8833;130.65;33
Asia;Japan;Atsugi US NAS;RJTA;35.45;139.45;65
Asia;Japan;Chichijima;RJAO;27.0833;142.1833;8
+Asia;Japan;Chitose ASDF;RJCJ;42.8167;141.6833;0
Asia;Japan;Chitose Ab;RJCC;42.8;141.6667;30
-Asia;Japan;Chitose ASDF;RJCJ;42.8167;141.6833;0
Asia;Japan;Chofu Airport;RJTF;35.6667;139.5333;44
Asia;Japan;Fuji Ab;RJAT;35.3167;138.8667;683
Asia;Japan;Fukue Airport;RJFE;32.6667;128.8333;80
Asia;Japan;Fukui Airport;RJNF;36.1333;136.2333;8
Asia;Japan;Fukuoka Airport;RJFF;33.5833;130.45;12
+Asia;Japan;Fukushima Airport;RJSF;37.233;140.433;372
+Asia;Japan;Futenma Marine Corps Air Facility;ROTM;26.267;127.750;75
Asia;Japan;Gifu Ab;RJNG;35.3833;136.8667;42
Asia;Japan;Hachijojima Airport;RJTH;33.1167;139.7833;95
Asia;Japan;Hachinohe Ab;RJSH;40.55;141.4667;49
Asia;Japan;Hakodate Airport;RJCH;41.7667;140.8167;36
Asia;Japan;Hamamatsu Ab;RJNH;34.75;137.7;48
+Asia;Japan;Hamby U. S. Army Airfield;ROHF;26.300;127.767;5
Asia;Japan;Hanamaki Airport;RJSI;39.4333;141.1333;93
+Asia;Japan;Hateruma;RORH;24.067;123.800;13
Asia;Japan;Hiroshima Airport;RJOA;34.4333;132.9167;334
+Asia;Japan;Hiroshimanishi;RJBH;34.367;132.433;5
Asia;Japan;Hofu Ab;RJOF;34.0333;131.55;5
Asia;Japan;Hyakuri Ab;RJAH;36.1833;140.4167;35
Asia;Japan;Ichikawa;RJAI;35.7333;139.9167;0
+Asia;Japan;Iejima Auxiliary Ab;RODE;26.717;127.783;70
Asia;Japan;Iki Airport;RJDB;33.75;129.7833;16
Asia;Japan;Iruma Ab;RJTJ;35.8333;139.4167;93
+Asia;Japan;Ishigakijima;ROIG;24.333;124.167;6
Asia;Japan;Iwakuni MCAS;RJOI;34.1333;132.2333;5
+Asia;Japan;Iwami Airport;RJOW;34.667;131.800;54
Asia;Japan;Iwojima;RJAW;24.7833;141.3167;116
Asia;Japan;Izumo Airport;RJOC;35.4167;132.9;5
Asia;Japan;Kadena Ab;RODN;26.35;127.7667;48
Asia;Japan;Kagoshima Airport;RJFK;31.8;130.7167;275
+Asia;Japan;Kamigoto;RJDK;33.017;129.183;20
Asia;Japan;Kanoya Ab;RJFY;31.3667;130.8333;68
Asia;Japan;Kansai International Airport;RJBB;34.4167;135.25;8
Asia;Japan;Kasumigaura Ab;RJAK;36.0333;140.2;29
Asia;Japan;Kasuminome Ab;RJSU;38.2333;140.9167;10
+Asia;Japan;Kikai Island;RJKI;28.317;129.933;6
Asia;Japan;Kisarazu Ab;RJTK;35.4;139.9167;6
+Asia;Japan;Kitadaito Island;RORK;25.917;131.333;22
Asia;Japan;Kitakyushu Airport;RJFR;33.8333;130.95;6
Asia;Japan;Kochi Airport;RJOK;33.5333;133.6667;10
Asia;Japan;Komatsu Ab;RJNK;36.3833;136.4167;9
Asia;Japan;Komatsujima Ab;RJOP;34;134.6333;6
Asia;Japan;Kumamoto Airport;RJFT;32.8333;130.85;196
+Asia;Japan;Kumejima;ROKJ;26.333;126.800;4
Asia;Japan;Kushiro Airport;RJCK;43.0333;144.2;98
+Asia;Japan;Kushiro;RJCS;42.983;144.400;32
Asia;Japan;Matsumoto Airport;RJAF;36.1667;137.9333;661
Asia;Japan;Matsushima Ab;RJST;38.4;141.2167;5
Asia;Japan;Matsuyama Airport;RJOM;33.8167;132.7;7
Asia;Japan;Memambetsu Airport;RJCM;43.8833;144.1667;36
Asia;Japan;Metabaru Ab;RJDM;33.3167;130.4167;19
Asia;Japan;Miho Ab;RJOH;35.4833;133.25;9
+Asia;Japan;Minamidaitojima;ROMD;25.833;131.233;16
Asia;Japan;Minamitorishima;RJAM;24.3;153.9667;9
Asia;Japan;Misawa Ab;RJSM;40.7;141.3833;39
Asia;Japan;Miyakejima Airport;RJTQ;34.0667;139.5667;23
+Asia;Japan;Miyakojima;ROMY;24.783;125.283;40
Asia;Japan;Miyazaki Airport;RJFM;31.8667;131.45;9
Asia;Japan;Mombetsu Airport;RJEB;44.25;143.5333;9
+Asia;Japan;Muroran;RJCY;42.317;140.983;40
Asia;Japan;Nagasaki Airport;RJFU;32.9167;129.9167;5
+Asia;Japan;Nagoya Airport;RJGG;35.250;136.933;14
Asia;Japan;Nagoya Airport;RJNN;35.25;136.9333;17
Asia;Japan;Naha Airport;ROAH;26.1833;127.65;6
Asia;Japan;Nakashibetsu Airport;RJCN;43.5667;144.9667;69
@@ -614,22 +781,34 @@
Asia;Japan;Niigata Airport;RJSN;37.95;139.1167;4
Asia;Japan;Nyutabaru Ab;RJFN;32.0833;131.45;82
Asia;Japan;Obihiro Airport;RJCB;42.7333;143.2167;152
+Asia;Japan;Odate-Noshiro Airport;RJSR;40.183;140.200;84
Asia;Japan;Oita Airport;RJFO;33.4833;131.7333;8
+Asia;Japan;Ojika Island ;RJDO;33.217;129.050;20
Asia;Japan;Okayama Airport;RJOB;34.75;133.85;244
Asia;Japan;Oki Airport;RJNO;36.1833;133.3333;95
Asia;Japan;Okinoerabu;RJKB;27.4333;128.7;29
+Asia;Japan;Okushiri Island;RJEO;42.067;139.450;36
Asia;Japan;Ominato Ab;RJSO;41.2333;141.1333;10
Asia;Japan;Osaka International Airport;RJOO;34.7833;135.45;15
Asia;Japan;Oshima Airport;RJTO;34.7833;139.3667;41
Asia;Japan;Ozuki Ab;RJOZ;34.05;131.05;7
+Asia;Japan;Rebun Island;RJCR;45.450;141.033;27
+Asia;Japan;Rishiri Island;RJER;45.250;141.183;30
+Asia;Japan;Sado Airport;RJSD;38.050;138.417;23
+Asia;Japan;Saga Airport;RJFS;33.150;130.300;2
Asia;Japan;Sapporo Ab;RJCO;43.1167;141.3833;11
+Asia;Japan;Sasebo Usn;RJFW;33.150;129.717;19
Asia;Japan;Sendai Airport;RJSS;38.1333;140.9167;4
Asia;Japan;Shimofusa Ab;RJTL;35.8;140.0167;33
+Asia;Japan;Shimoji-Shima Island;RORS;24.833;125.150;16
Asia;Japan;Shizuhama Ab;RJNY;34.8167;138.3;10
+Asia;Japan;Shonai;RJSY;38.817;139.783;22
Asia;Japan;Tachikawa Ab;RJTC;35.7;139.4;98
Asia;Japan;Tajima;RJBT;35.5167;134.8;0
Asia;Japan;Takamatsu Airport;RJOT;34.2167;134.0167;188
+Asia;Japan;Takao Radar Site;TAKA;35.567;133.233;15
Asia;Japan;Tanegashima Airport;RJFG;30.55;130.95;95
+Asia;Japan;Tarama Island;RORT;24.650;124.700;9
Asia;Japan;Tateyama Ab;RJTE;34.9833;139.8333;6
Asia;Japan;Tokachi GSDF;RJCT;42.9;143.1667;0
Asia;Japan;Tokunoshima Island;RJKN;27.8333;128.8833;0
@@ -637,6 +816,7 @@
Asia;Japan;Tokyo Heliport;RJTI;35.6333;139.85;8
Asia;Japan;Tokyo International Airport;RJTT;35.55;139.7833;8
Asia;Japan;Tokyo New International Airport;RJAA;35.7667;140.3833;44
+Asia;Japan;Tokyo;RJTD;35.683;139.767;5
Asia;Japan;Tottori Airport;RJOR;35.5333;134.1667;18
Asia;Japan;Toyama Airport;RJNT;36.65;137.1833;27
Asia;Japan;Tsuiki Ab;RJFZ;33.6833;131.05;20
@@ -649,7 +829,19 @@
Asia;Japan;Yao Airport;RJOY;34.6;135.6;13
Asia;Japan;Yokosuka Fwf;RJTX;35.2833;139.6667;53
Asia;Japan;Yokota Ab;RJTY;35.75;139.35;142
+Asia;Japan;Yonaguni Airport;ROYN;24.467;122.983;16
+Asia;Japan;Yoron Island;RORY;27.050;128.400;16
Asia;Japan;Zama Airfield;RJTR;35.5167;139.4;112
+Asia;Kazakhstan;Aktau;UATE;43.870;51.100;0
+Asia;Kazakhstan;Aktjubinsk;UATT;50.283;57.150;227
+Asia;Kazakhstan;Almaty;UAAA;43.233;76.933;847
+Asia;Kazakhstan;Aralskoe More;UATA;46.783;61.650;56
+Asia;Kazakhstan;Astana;UACC;51.200;71.450;0
+Asia;Kazakhstan;Karaganda;UAKK;49.800;73.150;553
+Asia;Kazakhstan;Kostanay;UAUU;53.206;63.551;182
+Asia;Kazakhstan;Kzyl-Orda;UAOO;44.850;65.500;129
+Asia;Kazakhstan;Shymkent;UAII;42.317;69.700;552
+Asia;Kazakhstan;Uralsk;UARR;51.250;51.283;36
Asia;Korea, Democratic People's Republic of;Pyongyang;ZKPY;39.0333;125.7833;38
Asia;Korea, Republic of;Camp Stanley/H-207;RKSX;37.7167;127.1;0
Asia;Korea, Republic of;Cheju;RKPC;33.5;126.5;28
@@ -675,6 +867,8 @@
Asia;Korea, Republic of;Yeoju Range;RKSU;37.4333;127.6333;43
Asia;Korea, Republic of;Yongsan/H-208 Hp;RKSY;37.5167;126.9833;0
Asia;Korea, Republic of;Yosu;RKJY;34.8333;127.6167;20
+Asia;Kyrgyzstan;Bishkek/Manas Airport;UAFM;42.850;74.583;0
+Asia;Laos;Attopeu;VLAP;14.800;106.833;105
Asia;Laos;Luang-Prabang;VLLB;19.883;102.133;305
Asia;Laos;Pakse;VLIP;15.117;105.167;102
Asia;Laos;Saravane;VLSV;15.683;106.433;168
@@ -694,10 +888,24 @@
Asia;Nepal;Simra Airport;VNSI;27.167;84.983;137
Asia;Nepal;Surkhet;VNSK;28.600;81.617;720
Asia;Nepal;Taplejung;VNTJ;27.350;87.667;1732
+Asia;Pakistan;Dera Ismail Khan;OPDI;31.817;70.917;172
+Asia;Pakistan;Hyderabad Airport;OPKD;25.383;68.417;40
Asia;Pakistan;Islamabad;OPRN;33.6167;73.1;508
+Asia;Pakistan;Jacobabad;OPJA;28.300;68.467;55
+Asia;Pakistan;Jiwani;OPJI;25.067;61.800;56
Asia;Pakistan;Karachi;OPKC;24.9;67.1333;22
+Asia;Pakistan;Lahore City;OPLH;31.550;74.333;214
Asia;Pakistan;Lahore;OPLA;31.5167;74.4;217
+Asia;Pakistan;Mianwali;OPMI;32.550;71.517;210
+Asia;Pakistan;Multan;OPMT;30.200;71.433;122
Asia;Pakistan;Nawabshah;OPNH;26.25;68.3667;38
+Asia;Pakistan;Panjgur;OPPG;26.967;64.100;980
+Asia;Pakistan;Peshawar;OPPS;34.017;71.583;359
+Asia;Pakistan;Quetta Airport;OPQT;30.250;66.883;1587
+Asia;Pakistan;Risalpur;OPRS;34.067;71.983;315
+Asia;Pakistan;Sargodha;OPSR;32.050;72.667;187
+Asia;Pakistan;Sibi;OPSB;29.550;67.883;133
+Asia;Pakistan;Sukkur;OPSK;27.722;68.792;60
Asia;People's Republic of China;Beijing;ZBAA;39.9333;116.2833;55
Asia;People's Republic of China;Chengdu;ZUUU;30.6667;104.0167;508
Asia;People's Republic of China;Dalian;ZYTL;38.9;121.6333;97
@@ -713,16 +921,39 @@
Asia;People's Republic of China;Urumqi;ZWWW;43.9;87.4667;0
Asia;People's Republic of China;Xiamen;ZSAM;24.4833;118.0833;139
Asia;Singapore;Singapore;WSSS;1.3667;103.9833;16
+Asia;Singapore;Singapore / Paya Lebar;WSAP;1.367;103.917;18
+Asia;Sri Lanka;Anuradhapura;VCCA;8.333;80.417;89
+Asia;Sri Lanka;Batticaloa;VCCB;7.717;81.700;5
+Asia;Sri Lanka;Katunayake;VCBI;7.167;79.883;8
+Asia;Sri Lanka;Ratmalana;VCCC;6.817;79.883;5
+Asia;Sri Lanka;Trincomalee;VCCT;8.583;81.250;3
Asia;Taiwan;Chiang Kai Shek;RCTP;25.0833;121.2167;0
Asia;Taiwan;Chia Tung;RCFS;22.4167;120.55;0
Asia;Taiwan;Chiayi;RCKU;23.4667;120.3833;25
Asia;Taiwan;Chihhang;RCQS;22.8;121.1833;0
Asia;Taiwan;Chinmem/Shatou;RCBS;24.4333;118.3667;12
+Asia;Taiwan;Donggang;RCMJ;22.467;120.433;8
+Asia;Taiwan;Dongsha;RCLM;20.667;116.717;6
+Asia;Taiwan;Dongshi;RCNO;23.267;119.667;45
+Asia;Taiwan;Feng Nin Tw-Afb ;RCFN;22.767;121.083;42
+Asia;Taiwan;Hengchun;RCKW;21.933;120.833;13
Asia;Taiwan;Hsinchu;RCPO;24.8167;120.9333;0
+Asia;Taiwan;Hulien Ab;RCYU;24.033;121.617;16
+Asia;Taiwan;Ilan;RCMS;24.750;121.767;9
+Asia;Taiwan;Kangshan Tw-Afb ;RCAY;22.783;120.267;10
Asia;Taiwan;Kaohsiung;RCKH;22.5833;120.35;0
+Asia;Taiwan;Lan Yu;RCLY;22.033;121.550;325
+Asia;Taiwan;Makung Ab;RCQC;23.583;119.617;31
+Asia;Taiwan;Mazu;RCFG;26.167;119.933;91
+Asia;Taiwan;Pa Kuei / Bakuai;RCUK;24.933;121.300;141
Asia;Taiwan;Pingtung North;RCSQ;22.7;120.4833;0
+Asia;Taiwan;Pingtung South Air Force Base ;RCDC;22.683;120.467;24
Asia;Taiwan;Sungshan/Taipei;RCSS;25.0667;121.55;0
+Asia;Taiwan;Taichung Tw-Afb ;RCLG;24.183;120.650;112
+Asia;Taiwan;Tainan Tw-Afb ;RCNN;22.950;120.200;19
+Asia;Taiwan;Taoyuan Ab = 589650;RCGM;25.067;121.233;45
Asia;Taiwan;Wuchia Observatory;RCMQ;24.2667;120.6167;203
+Asia;Tajikistan;Dushanbe;UTDD;38.550;68.783;803
Asia;Thailand;Chaiyaphum;VTUC;15.800;102.033;182
Asia;Thailand;Chanthaburi;VTBC;12.600;102.117;3
Asia;Thailand;Chiang Mai;VTCC;18.783;98.983;312
@@ -765,6 +996,7 @@
Asia;Thailand;Ubon Ratchathani;VTUU;15.250;104.867;123
Asia;Thailand;Udon Thani;VTUD;17.383;102.800;177
Asia;Thailand;Uttaradit;VTPU;17.617;100.100;63
+Asia;Turkmenistan;Ashgabat;UTAA;37.983;58.367;0
Asia;Uzbekistan;Dzizak;UTED;40.117;67.833;345
Asia;Uzbekistan;Nukus / Karakalpakstan;UTNN;42.480;59.630;0
Asia;Uzbekistan;Samarkand;UTSS;39.567;66.950;724
@@ -774,29 +1006,95 @@
Asia;Uzbekistan;Urgench;UTNU;41.583;60.645;98
Asia;Viet Nam;Da Nang;VVDN;16.0333;108.1833;7
Asia;Viet Nam;Ha Noi;VVNB;21.0167;105.8;6
+Asia;Viet Nam;Hanoi / Gialam;VVGL;21.033;105.850;12
Asia;Viet Nam;Ho Chi Minh;VVTS;10.8167;106.6667;19
+Asia;Viet Nam;Hue;VVPB;16.400;107.683;17
+Asia;Viet Nam;Nha Trang;VVNT;12.250;109.200;10
+Asia;Vietnam;Pleiku City;VVPK;13.983;108.000;801
+Asia;Vietnam;Quy Nhon;VVQN;13.767;109.217;6
+Asia;Vietnam;Vinh;VVVH;18.700;105.667;6
+Atlantic;Anguilla;Wallblake;TQPF;18.205;-63.055;31
+Atlantic;Antigua and Barbuda;Blackburne / Plymouth;TRPM;16.750;-62.167;12
+Atlantic;Antigua and Barbuda;Charlestown / Newcast;TKPN;17.200;-62.583;17
Atlantic;Antigua and Barbuda;Antigua;TAPA;17.1167;-61.7833;10
+Atlantic;Barbados;Bridgetown City ;TBPO;13.100;-59.617;50
+Atlantic;Barbados;Grantley Adams;TBPB;13.067;-59.483;50
+Atlantic;Bermuda;Bermuda;TXKF;32.367;-64.683;6
+Atlantic;British Virgin Islands;Beef Island, Tortola;TUPJ;18.450;-64.533;4
Atlantic;Puerto Rico;Aquadilla;TJBQ;18.5;-67.1333;69
Atlantic;Puerto Rico;Mayaguez;TJMZ;18.2667;-67.15;0
Atlantic;Puerto Rico;Ponce;TJPS;18.0167;-66.5667;0
Atlantic;Puerto Rico;San Juan;TJSJ;18.45;-66;0
Australasia;Australia;Adelaide;YPAD;-34.9333;138.5167;4
+Australasia;Australia;Albany Airport;YPAL;-34.933;117.800;71
+Australasia;Australia;Albury Airport;YMAY;-36.067;146.950;165
Australasia;Australia;Alice Springs;YBAS;-23.8;133.8833;547
+Australasia;Australia;Amberley Aerodrome;YBAM;-27.633;152.717;27
+Australasia;Australia;Archerfield Aerodrome;YBAF;-27.567;153.000;23
+Australasia;Australia;Avalon, Avalon Airport;YMAV;-38.033;144.483;8
+Australasia;Australia;Ayers Rock;YAYE;-25.183;130.967;496
+Australasia;Australia;Bankstown Airport Aws;YSBK;-33.917;150.983;9
Australasia;Australia;Brisbane;YBBN;-27.3833;153.1;5
+Australasia;Australia;Broken Hill Patton Street;YPBH;-31.967;141.467;315
Australasia;Australia;Broome;YBRM;-17.95;122.2167;9
+Australasia;Australia;Bullsbrook Pearce Amo;YPEA;-31.667;116.017;45
Australasia;Australia;Cairns;YBCS;-16.8833;145.75;7
+Australasia;Australia;Camden Airport;YSCN;-34.033;150.683;70
Australasia;Australia;Canberra;YSCB;-35.3;149.1833;580
+Australasia;Australia;Ceduna Airport;YPCD;-32.117;133.700;23
+Australasia;Australia;Charleville Airport;YBCV;-26.400;146.267;306
Australasia;Australia;Christmas Island;YPXM;-10.4333;105.6833;262
Australasia;Australia;Cocos Island;YPCC;-12.1833;96.8167;3
+Australasia;Australia;Coffs Harbour Mo;YSCH;-30.317;153.117;5
+Australasia;Australia;Coolangatta Airport Aws;YBCG;-28.167;153.500;6
+Australasia;Australia;Cooma;YSCM;-36.233;149.083;778
+Australasia;Australia;Darwin Airport;YPDN;-12.400;130.867;31
+Australasia;Australia;Derby;YPDB;-17.300;123.617;8
+Australasia;Australia;Devonport East;YMDV;-41.167;146.367;47
Australasia;Australia;Dubbo;YSDU;-32.2;148.5667;275
+Australasia;Australia;East Sale Aerodrome;YMES;-38.100;147.133;5
+Australasia;Australia;Edinburgh M. O.;YPED;-34.700;138.617;20
+Australasia;Australia;Forrest Airport;YPFT;-30.833;128.100;160
+Australasia;Australia;Geraldton Airport;YPGN;-28.783;114.700;37
+Australasia;Australia;Gladstone;YBGL;-23.850;151.250;75
+Australasia;Australia;Goldstream Aws;YMEN;-37.733;145.400;76
+Australasia;Australia;Gove Airport;YDGV;-12.267;136.817;52
Australasia;Australia;Hobart;YMHB;-42.8333;147.4833;27
+Australasia;Australia;Kalgoorlie Boulder Amo;YPKG;-30.783;121.450;367
+Australasia;Australia;Kununurra Kununurra Aws ;YPKU;-15.767;128.700;44
+Australasia;Australia;Launceston Airport;YMLT;-41.533;147.200;171
+Australasia;Australia;Laverton Aerodrome;YMLV;-37.850;144.733;18
Australasia;Australia;Learmouth;YPLM;-22.2333;114.0833;6
+Australasia;Australia;Leigh Creek Airport;YPLC;-30.583;138.417;261
+Australasia;Australia;Longreach Airport;YBLR;-23.433;144.267;192
+Australasia;Australia;Mackay Mo;YBMK;-21.117;149.200;30
+Australasia;Australia;Macquarie Island;YMMQ;-54.483;158.950;6
+Australasia;Australia;Meekatharra Airport;YPMR;-26.600;118.533;522
Australasia;Australia;Melbourne;YMML;-37.6667;144.8333;141
+Australasia;Australia;Mildura Airport;YMMI;-34.217;142.083;50
+Australasia;Australia;Moorabbin Airport Aws;YMMB;-37.967;145.100;13
+Australasia;Australia;Mount Gambier Aerodrome;YMMG;-37.733;140.783;65
+Australasia;Australia;Mount Isa Amo;YBMA;-20.667;139.467;342
Australasia;Australia;Norfolk Island;YSNF;-29.0333;167.9333;109
+Australasia;Australia;Nowra Ran Air Station;YSNW;-34.950;150.533;122
+Australasia;Australia;Oakey Aerodrome;YBOK;-27.417;151.733;407
+Australasia;Australia;Parafield Airport;YPPF;-34.783;138.633;17
Australasia;Australia;Perth;YPPH;-31.9333;115.95;29
Australasia;Australia;Port Hedland;YPPD;-20.1;119.5667;10
+Australasia;Australia;Proserpine Airport;YBPN;-20.483;148.533;25
+Australasia;Australia;Richmond Aus-Afb ;YSRI;-33.600;150.783;21
+Australasia;Australia;Rockhampton Airport;YBRK;-23.383;150.467;10
Australasia;Australia;Sydney;YSSY;-33.95;151.1833;3
+Australasia;Australia;Tamworth Airport;YSTW;-31.083;150.833;410
+Australasia;Australia;Tennant Creek Airport;YDTC;-19.633;134.167;375
+Australasia;Australia;Tindal / Katherine;YPTN;-14.433;132.267;108
Australasia;Australia;Townsville;YBTL;-19.25;146.75;9
+Australasia;Australia;Wagga Airport;YSWG;-35.150;147.450;221
+Australasia;Australia;Weipa City;YBWP;-12.633;141.883;12
+Australasia;Australia;Williamtown Aerodrome;YSWM;-32.783;151.817;9
+Australasia;Australia;Woomera Aerodrome;YPWR;-31.133;136.817;165
+Australasia;Australia;Wynyard West;YMWY;-40.983;145.717;11
+Australasia;Australia;Yulara Aws;YDYL;-25.183;130.967;493
Australasia;Brunei;Brunei Airport;WBSB;4.933;114.933;22
Australasia;Christmas Island;Christmas Island Aerodrome;YPXM;-10.433;105.683;279
Australasia;Christmas Island;Cocos Island Airport;YPCC;-12.183;96.817;3
@@ -952,7 +1250,22 @@
Australasia;New Caledonia;Ouanaham Ile Lifou ;NWWL;-20.767;167.233;28
Australasia;New Caledonia;Ouloup Ile Ouvea ;NWWV;-20.650;166.583;7
Australasia;New Zealand;Auckland;NZAA;-37.0167;174.8;6
+Australasia;New Zealand;Chatham Island;NZCI;-43.950;-176.567;44
Australasia;New Zealand;Christchurch;NZCH;-43.4833;172.55;30
+Australasia;New Zealand;Christmas / Cassidy;PLCH;1.983;-157.483;3
+Australasia;New Zealand;Dunedin Aerodrome;NZDN;-45.933;170.200;1
+Australasia;New Zealand;Fanning Island;PLFA;3.850;-159.367;5
+Australasia;New Zealand;Gisborne Aerodrome;NZGS;-38.667;177.983;5
+Australasia;New Zealand;Hokitika Aerodrome;NZHK;-42.717;170.983;45
+Australasia;New Zealand;Invercargill Aerodrome;NZNV;-46.700;168.550;0
+Australasia;New Zealand;Kaikoura ;NZKI;-42.417;173.700;101
+Australasia;New Zealand;New Plymouth Aerodrome;NZNP;-39.017;174.183;28
+Australasia;New Zealand;Ohakea;NZOH;-40.200;175.367;50
+Australasia;New Zealand;Paraparaumu Aerodrome;NZPP;-40.900;174.983;7
+Australasia;New Zealand;Raoul Island, Kermadec Island;NZRN;-29.250;-177.917;38
+Australasia;New Zealand;Rotorua Aerodrome;NZRO;-38.117;176.317;285
+Australasia;New Zealand;Tauranga Aerodrome Aws;NZTG;-37.667;176.200;4
+Australasia;New Zealand;Whenuapai;NZWP;-36.783;174.633;30
Australasia;New Zealand;Wellington;NZWN;-41.3333;174.8;8
Australasia;Palau;Babelthuap Island, Babelthuap/Koror Airport;PTRO;7.367;134.533;54
Australasia;Palau;Koror, Palau, NWS Office;PTKR;7.333;134.483;30
@@ -1010,6 +1323,22 @@
Australasia;Tonga;Haapai;NFTL;-19.800;-174.350;2
Australasia;Tuvalu;Funafuti;NGFU;-8.517;179.217;1
Australasia;Tuvalu;Nanumea;NGFO;-5.667;176.133;2
+Australasia;United States;Agana, Guam International Airport;PGUM;13.483;144.800;91
+Australasia;United States;Andersen, Mariana Is, Andersen Air Force Base;PGUA;13.583;144.933;187
+Australasia;United States;Guam, Mariana Island;PGAC;13.917;144.833;111
+Australasia;United States;Hana, Hana Airport;PHHN;20.796;-156.014;24
+Australasia;United States;Hickam Air Force Base / Oahu ;PHIK;21.317;-157.917;4
+Australasia;United States;KALAELOA AIRPORT;PHJR;21.317;-158.067;10
+Australasia;United States;Kamuela, Waimea-Kohala Airport;PHMU;20.000;-155.667;814
+Australasia;United States;Johnston Island, Johnston Atoll Airport;PJON;16.733;-169.533;2
+Australasia;United States;Pago Pago / Int. Airport;NSTU;-14.333;-170.717;3
+Australasia;United States;Rota Island, N. Mariana Is, Rota International Airport;PGRO;14.183;145.250;185
+Australasia;United States;Sabanettan / Tinian Island;PGNT;15.600;145.100;80
+Australasia;United States;Saipan Island, Saipan International Airport;PGSN;15.117;145.733;66
+Australasia;United States;Sand Island, Henderson Field Airport;PMDY;28.217;-177.367;4
+Australasia;United States;South Kona / Hawaii;PHWH;19.100;-155.750;808
+Australasia;United States;Tinian Island, N. Mariana Is, West Tinian Airport;PGWT;14.983;145.617;82
+Australasia;United States;Wake Island, Wake Island Army Airfield Airport;PWAK;19.283;166.650;4
Australasia;Vanuatu;Bauerfield Efate ;NVVV;-17.700;168.300;20
Australasia;Vanuatu;Lamap Malekula ;NVSL;-16.417;167.800;26
Australasia;Vanuatu;Pekoa Airport Santo ;NVSS;-15.517;167.217;41
@@ -1056,40 +1385,111 @@
Canada;Saskatchewan;Swift Current;CYYN;50.2833;-107.6833;818
Canada;Yukon;Shingle Point;CYUA;68.95;-137.2167;38
Central and South America;Argentina;Aeroparque;SABE;-34.5667;-58.4167;6
+Central and South America;Argentina;Azul Airport;SAZA;-36.750;-59.833;132
Central and South America;Argentina;Bahia Blanca;SAZB;-38.7333;-62.1667;83
Central and South America;Argentina;Bariloche;SAZS;-41.15;-71.1667;840
+Central and South America;Argentina;Buenos Aires Observatorio;SABA;-34.583;-58.483;25
+Central and South America;Argentina;Catamarca Aero.;SANC;-28.600;-65.767;454
+Central and South America;Argentina;Ceres Aerodrome;SANW;-29.883;-61.950;87
+Central and South America;Argentina;Chapelco;SAZY;-40.083;-71.133;779
+Central and South America;Argentina;Chepes;SACP;-31.333;-66.600;658
+Central and South America;Argentina;Chilecito;SANO;-29.217;-67.433;950
Central and South America;Argentina;Comodoro Rivadavia;SAVC;-45.7833;-67.5;46
Central and South America;Argentina;Concordia;SAAC;-31.3;-58.0167;38
Central and South America;Argentina;Cordoba;SACO;-31.3167;-64.2167;474
Central and South America;Argentina;Corrientes;SARC;-27.45;-58.7667;62
+Central and South America;Argentina;Curuzu Cuatia Aerodrome;SATU;-29.783;-57.983;80
+Central and South America;Argentina;Dolores Aerodrome;SAZD;-36.350;-57.733;10
Central and South America;Argentina;Don Torcuato;SADD;-34.4833;-58.6167;4
+Central and South America;Argentina;El Bolson Aerodrome;SAVB;-41.967;-71.517;337
+Central and South America;Argentina;El Palomar Aerodrome;SADP;-34.600;-58.600;18
+Central and South America;Argentina;Esquel Aerodrome;SAVE;-42.933;-71.150;789
Central and South America;Argentina;Ezeiza;SAEZ;-34.8167;-58.5333;20
Central and South America;Argentina;Formosa;SARF;-26.2;-58.2333;60
+Central and South America;Argentina;General Pico Aerodrome;SAZG;-35.700;-63.750;139
+Central and South America;Argentina;Gobernador Gordillo;SACT;-30.367;-66.300;457
+Central and South America;Argentina;Gobernador Gregores Aerodrome;SAWR;-48.783;-70.167;358
+Central and South America;Argentina;Gualeguaychu Aerodrome;SAAG;-33.000;-58.617;23
Central and South America;Argentina;Iguazu;SARI;-25.7333;-54.4667;270
+Central and South America;Argentina;Jachal;SAMJ;-30.250;-68.750;1165
Central and South America;Argentina;Jujuy;SASJ;-24.3833;-65.0833;905
+Central and South America;Argentina;Junin Aerodrome;SAAJ;-34.550;-60.917;82
+Central and South America;Argentina;La Plata Aerodrome;SADL;-34.967;-57.900;21
+Central and South America;Argentina;La Quiaca Observatorio;SASQ;-22.100;-65.600;3462
+Central and South America;Argentina;La Rioja Aero.;SANL;-29.383;-66.817;438
+Central and South America;Argentina;Laboulaye;SAOL;-34.133;-63.367;136
+Central and South America;Argentina;Lago Argentino Aerodrome;SAWA;-50.333;-72.300;223
+Central and South America;Argentina;Las Lomitas;SATK;-24.700;-60.583;130
+Central and South America;Argentina;Malargue Aerodrome;SAMM;-35.500;-69.583;1426
Central and South America;Argentina;Mar Del Plata;SAZM;-37.9333;-57.5833;21
+Central and South America;Argentina;Marcos Juarez Aerodrome;SAOM;-32.700;-62.150;110
Central and South America;Argentina;Mendoza;SAME;-32.8333;-68.7833;704
+Central and South America;Argentina;Monte Caseros Aerodrome;SARM;-30.267;-57.650;53
Central and South America;Argentina;Neuquen;SAZN;-38.95;-68.1333;271
+Central and South America;Argentina;Oran Aerodrome;SASO;-23.150;-64.317;357
+Central and South America;Argentina;Parana Aerodrome;SAAP;-31.783;-60.483;74
+Central and South America;Argentina;Paso De Indios;SAVP;-43.817;-68.883;460
Central and South America;Argentina;Paso De Los Libres;SARL;-29.6833;-57.15;70
+Central and South America;Argentina;Pehuajo Aerodrome;SAZP;-35.867;-61.900;87
+Central and South America;Argentina;Perito Moreno Aerodrome;SAWP;-46.517;-71.017;429
+Central and South America;Argentina;Pigue Aerodrome;SAZE;-37.600;-62.383;304
+Central and South America;Argentina;Pilar Observatorio;SACI;-31.667;-63.883;338
Central and South America;Argentina;Posadas;SARP;-27.3667;-55.9667;133
+Central and South America;Argentina;Presidencia Roque Saenz Pena Aerodrome;SARS;-26.817;-60.450;91
+Central and South America;Argentina;Puerto Deseado Aerodrome;SAWD;-47.733;-65.917;81
+Central and South America;Argentina;Puerto Madryn, CHT;SAVY;-42.759;-65.103;136
+Central and South America;Argentina;Reconquista, SF;SATR;-29.210;-59.691;49
Central and South America;Argentina;Resistencia;SARE;-27.45;-59.05;52
+Central and South America;Argentina;Rio Colorado;SAZQ;-39.017;-64.083;79
+Central and South America;Argentina;Rio Cuarto Aerodrome;SAOC;-33.117;-64.233;420
Central and South America;Argentina;Rio Gallegos;SAWG;-51.6167;-69.2833;19
Central and South America;Argentina;Rio Grande;SAWE;-53.8;-67.75;22
+Central and South America;Argentina;Rivadavia;SASR;-24.167;-62.900;205
Central and South America;Argentina;Rosario;SAAR;-32.9167;-60.7833;25
Central and South America;Argentina;Salta;SASA;-24.85;-65.4833;1221
+Central and South America;Argentina;San Antonio Oeste Aerodrome;SAVO;-40.783;-65.100;20
+Central and South America;Argentina;San Carlos;SAMS;-33.767;-69.033;940
+Central and South America;Argentina;San Fernando, BA;SADF;-34.453;-58.590;3
Central and South America;Argentina;San Juan;SANU;-31.5667;-68.8667;598
+Central and South America;Argentina;San Julian Aerodrome;SAWJ;-49.317;-67.750;58
+Central and South America;Argentina;San Luis Aerodrome;SAOU;-33.267;-66.350;710
+Central and South America;Argentina;San Martin;SAMI;-33.083;-68.417;653
+Central and South America;Argentina;San Rafael Aerodrome;SAMR;-34.583;-68.400;745
+Central and South America;Argentina;Santa Cruz Aerodrome;SAWU;-50.017;-68.567;113
+Central and South America;Argentina;Santa Rosa Aerodrome;SAZR;-36.567;-64.267;190
Central and South America;Argentina;Santiago Del Estero;SANE;-27.7667;-64.3;199
Central and South America;Argentina;Sauce Viejo;SAAV;-31.7;-60.8167;18
+Central and South America;Argentina;Tandil Aerodrome;SAZT;-37.233;-59.250;175
+Central and South America;Argentina;Tartagal Aerodrome;SAST;-22.650;-63.817;450
+Central and South America;Argentina;Tinogasta;SANI;-28.067;-67.567;1201
Central and South America;Argentina;Trelew;SAVT;-43.2;-65.2667;43
+Central and South America;Argentina;Tres Arroyos;SAZH;-38.333;-60.250;115
Central and South America;Argentina;Tucuman;SANT;-26.85;-65.1;450
+Central and South America;Argentina;Ushuaia Aerodrome;SAWH;-54.800;-68.317;16
+Central and South America;Argentina;Uspallata;SAMU;-32.600;-69.333;1844
+Central and South America;Argentina;Viedma Aerodrome;SAVV;-40.850;-63.017;6
+Central and South America;Argentina;Villa De Maria Del Rio Seco;SACV;-29.900;-63.683;341
+Central and South America;Argentina;Villa Dolores Aerodrome;SAOD;-31.950;-65.133;561
+Central and South America;Argentina;Villa Gesell;SAZV;-37.233;-57.033;7
Central and South America;Argentina;Villa Reynolds;SAOR;-33.7333;-65.3833;486
+Central and South America;Argentina;Villaguay Aerodrome;SAAU;-31.850;-59.083;40
+Central and South America;Bahamas;Alice Town, Bimini;MYBS;25.733;-79.300;2
+Central and South America;Bahamas;Cockburn Town, San Salvador;MYSM;24.050;-74.533;3
+Central and South America;Bahamas;Congo Town, Andros Island;MYAK;24.159;-77.590;5
Central and South America;Bahamas;Freeport;MYGF;26.55;-78.7;11
+Central and South America;Bahamas;Georgetown, Exuma;MYEG;23.475;-75.767;2
+Central and South America;Bahamas;Matthew Town, Inagua;MYIG;20.950;-73.683;2
Central and South America;Bahamas;Nassau;MYNN;25.05;-77.4667;7
+Central and South America;Bahamas;West End, Grand Bahama;MYGW;26.700;-78.967;2
Central and South America;Belize;Belize;MZBZ;17.5333;-88.3;5
+Central and South America;Bolivia;Apolo;SLAP;-14.733;-68.500;1415
+Central and South America;Bolivia;Ascencion De Guarayos;SLAS;-15.717;-63.100;247
Central and South America;Bolivia;Camiri;SLCA;-20;-63.5333;0
+Central and South America;Bolivia;Charana;SLCN;-17.583;-69.600;4054
Central and South America;Bolivia;Cobija;SLCO;-11.0333;-68.7833;260
Central and South America;Bolivia;Cochabamba;SLCB;-17.4167;-66.1833;2570
Central and South America;Bolivia;Concepcion;SLCP;-16.15;-62.0167;0
+Central and South America;Bolivia;Guayaramerin;SLGY;-10.817;-65.350;130
Central and South America;Bolivia;La Paz/Alto;SLLP;-16.5167;-68.1833;4038
Central and South America;Bolivia;Magdalena;SLMG;-13.3333;-64.1167;0
Central and South America;Bolivia;Oruro;SLOR;-17.9667;-67.0667;0
@@ -1099,10 +1499,14 @@
Central and South America;Bolivia;Riberalta;SLRI;-11;-66.1167;0
Central and South America;Bolivia;Robore;SLRB;-18.3167;-59.7667;0
Central and South America;Bolivia;Rurrenabaque;SLRQ;-14.4667;-67.5667;274
+Central and South America;Bolivia;San Borja;SLSB;-14.867;-66.867;194
+Central and South America;Bolivia;San Ignacio De Moxos;SLSM;-14.917;-65.600;160
Central and South America;Bolivia;San Ignacio De Velasco;SLSI;-16.3833;-60.9667;0
+Central and South America;Bolivia;San Javier;SLJV;-16.267;-62.467;534
Central and South America;Bolivia;San Joaquin;SLJO;-13.0667;-64.8167;0
Central and South America;Bolivia;San Jose De Chiquitos;SLJE;-17.8;-60.7333;0
Central and South America;Bolivia;Santa Ana;SLSA;-13.7667;-65.4333;0
+Central and South America;Bolivia;Santa Cruz / El Trompillo;SLET;-17.800;-63.183;418
Central and South America;Bolivia;Sucre;SLSU;-19.0167;-65.3;0
Central and South America;Bolivia;Tarija;SLTJ;-21.55;-64.7;0
Central and South America;Bolivia;Trinidad;SLTR;-14.8167;-64.9167;236
@@ -1110,67 +1514,110 @@
Central and South America;Bolivia;Viru-Viru;SLVR;-17.6333;-63.1333;0
Central and South America;Bolivia;Yacuiba;SLYA;-21.95;-63.65;0
Central and South America;Brazil;Afonsos;SBAF;-22.8667;-43.3667;0
+Central and South America;Brazil;Alta Floresta Aeroporto ;SBAT;-9.867;-56.100;288
Central and South America;Brazil;Altamira;SBHT;-3.2;-52.2;0
+Central and South America;Brazil;Anapolis Braz-Afb ;SBAN;-16.233;-48.967;1137
Central and South America;Brazil;Aracaju;SBAR;-10.9833;-37.0667;9
Central and South America;Brazil;Bage;SBBG;-31.35;-54.1167;180
+Central and South America;Brazil;Barbacena;SBBQ;-21.250;-43.767;1171
+Central and South America;Brazil;Barcelos;SWBC;-0.983;-62.583;40
+Central and South America;Brazil;Barra Do Garcas;SBBW;-15.867;-52.383;350
Central and South America;Brazil;Bauru;SBBU;-22.3167;-49.0667;0
Central and South America;Brazil;Belem;SBBE;-1.3833;-48.4833;16
+Central and South America;Brazil;Belo Horizonte Apt;SBBH;-19.85;-43.95;785
Central and South America;Brazil;Belo Horizonte;SBCF;-19.9333;-43.9333;0
-Central and South America;Brazil;Belo Horizonte Apt;SBBH;-19.85;-43.95;785
+Central and South America;Brazil;Benjamin Constant;SBBC;-4.383;-70.033;65
Central and South America;Brazil;Boa Vista;SBBV;2.8333;-60.7;140
+Central and South America;Brazil;Bom Jesus Da Lapa;SBLP;-13.267;-43.417;440
Central and South America;Brazil;Brasilia;SBBR;-15.8667;-47.9333;1061
+Central and South America;Brazil;Cachimbo;SBCC;-9.333;-54.950;536
+Central and South America;Brazil;Campina Grande;SBKG;-7.217;-35.883;548
Central and South America;Brazil;Campinas;SBKP;-23;-47.1333;661
Central and South America;Brazil;Campo Grande;SBCG;-20.4667;-54.6667;567
+Central and South America;Brazil;Campos;SBCP;-21.750;-41.333;11
+Central and South America;Brazil;Carajas / Maraba;SBCJ;-6.117;-50.000;621
Central and South America;Brazil;Caravelas;SBCV;-17.6333;-39.25;4
Central and South America;Brazil;Conceicao Do Araguaia;SBAA;-8.25;-49.2833;0
Central and South America;Brazil;Corumba;SBCR;-19.0833;-57.5;0
+Central and South America;Brazil;Cruzeiro Do Sul;SBCZ;-7.633;-72.667;170
Central and South America;Brazil;Cuiaba;SBCY;-15.65;-56.1;182
+Central and South America;Brazil;Curitiba Apt;SBCT;-25.5167;-49.1667;908
Central and South America;Brazil;Curitiba;SBBI;-25.4333;-49.2667;0
-Central and South America;Brazil;Curitiba Apt;SBCT;-25.5167;-49.1667;908
Central and South America;Brazil;Eduardo Gomes International;SBEG;-3.0333;-60.05;0
Central and South America;Brazil;Fernando De Noronha;SBFN;-3.85;-32.4167;45
Central and South America;Brazil;Florianopolis;SBFL;-27.6667;-48.55;5
Central and South America;Brazil;Fortaleza;SBFZ;-3.7833;-38.5333;25
Central and South America;Brazil;Foz Do Iguacu;SBFI;-25.5167;-54.5833;180
Central and South America;Brazil;Galeao;SBGL;-22.8167;-43.25;42
+Central and South America;Brazil;Gama;SBGA;-16.050;-48.050;700
Central and South America;Brazil;Goiania;SBGO;-16.6333;-49.2167;0
Central and South America;Brazil;Guaratingueta;SBGW;-22.7833;-45.2;537
Central and South America;Brazil;Guarulhos;SBGR;-23.4333;-46.4667;0
+Central and South America;Brazil;Iauarete;SBYA;0.617;-69.200;120
+Central and South America;Brazil;Ilheus Aeroporto ;SBIL;-14.817;-39.033;4
+Central and South America;Brazil;Imperatriz;SBIZ;-5.533;-47.500;123
Central and South America;Brazil;Itaituba;SBIH;-4.25;-56;0
+Central and South America;Brazil;Jacareacanga;SBEK;-6.267;-57.733;98
+Central and South America;Brazil;Joao Pessoa;SBJP;-7.100;-34.867;7
+Central and South America;Brazil;Juiz De Fora;SBJF;-21.767;-43.350;939
+Central and South America;Brazil;Leite Lopes / Ribeir ;SBRP;-21.133;-47.783;549
Central and South America;Brazil;Londrina;SBLO;-23.3333;-51.1333;570
Central and South America;Brazil;Macae;SBME;-22.35;-41.7667;0
Central and South America;Brazil;Macapa;SBMQ;0.0333;-50.05;0
Central and South America;Brazil;Maceio;SBMO;-9.5167;-35.7833;115
Central and South America;Brazil;Manaus;SBMN;-3.15;-59.9833;84
+Central and South America;Brazil;Manicore;SBMY;-5.817;-61.300;50
Central and South America;Brazil;Maraba;SBMA;-5.35;-49.15;0
+Central and South America;Brazil;Maranhao / Carolina Airport;SBCI;-7.317;-47.467;183
+Central and South America;Brazil;Maringa;SBMG;-23.417;-51.950;542
Central and South America;Brazil;Marte;SBMT;-23.5167;-46.6333;0
+Central and South America;Brazil;Mocoro / 17 Rosado;SBMS;-5.200;-37.367;23
+Central and South America;Brazil;Montes Claros;SBMK;-16.717;-43.867;646
Central and South America;Brazil;Natal;SBNT;-5.9167;-35.25;49
+Central and South America;Brazil;Oiapoque;SBOI;3.833;-51.833;39
+Central and South America;Brazil;Paranagua;SBPG;-25.517;-48.517;5
+Central and South America;Brazil;Parnaiba Aeroporto ;SBPB;-2.917;-41.750;5
+Central and South America;Brazil;Passo Fundo;SBPF;-28.250;-52.400;684
+Central and South America;Brazil;Paulo Afonso;SBUF;-9.400;-38.217;253
Central and South America;Brazil;Pelotas;SBPK;-31.8667;-52.35;13
+Central and South America;Brazil;Petrolina ;SBPL;-9.350;-40.550;385
Central and South America;Brazil;Pirassununga;SBYS;-21.9833;-47.3333;598
Central and South America;Brazil;Pocos De Caldas;SBPC;-21.85;-46.5667;0
Central and South America;Brazil;Ponta Pora;SBPP;-22.55;-55.7;0
+Central and South America;Brazil;Porto Alegre Apt;SBPA;-30;-51.1833;3
Central and South America;Brazil;Porto Alegre;SBCO;-30.0167;-51.2167;0
-Central and South America;Brazil;Porto Alegre Apt;SBPA;-30;-51.1833;3
+Central and South America;Brazil;Porto Nacional Aeroporto ;SBPN;-10.700;-48.400;261
+Central and South America;Brazil;Porto Seguro;SBPS;-16.433;-39.067;51
Central and South America;Brazil;Porto Velho;SBPV;-8.7667;-63.9167;102
Central and South America;Brazil;Presidente Prudente;SBDN;-22.1167;-51.3833;0
Central and South America;Brazil;Recife;SBRF;-8.0667;-34.85;0
+Central and South America;Brazil;Resende;SBRS;-22.483;-44.467;440
+Central and South America;Brazil;Rio / Jacarepagua;SBJR;-22.9833;-43.3667;0
+Central and South America;Brazil;Rio Branco;SBRB;-10.000;-67.800;142
Central and South America;Brazil;Rio De Janeiro;SBRJ;-22.9;-43.1667;0
-Central and South America;Brazil;Rio / Jacarepagua;SBJR;-22.9833;-43.3667;0
+Central and South America;Brazil;S. P. Aldeia Aerodrome ;SBES;-22.817;-42.100;10
Central and South America;Brazil;Salvador;SBSV;-12.9;-38.3333;13
Central and South America;Brazil;Santa Cruz;SBSC;-22.9333;-43.7167;3
Central and South America;Brazil;Santa Maria;SBSM;-29.7167;-53.7;0
Central and South America;Brazil;Santarem;SBSN;-2.4333;-54.7167;72
Central and South America;Brazil;Santos;SBST;-23.9333;-46.3;3
+Central and South America;Brazil;Sao Carlos;SBSA;-22.017;-47.883;856
+Central and South America;Brazil;Sao Gabriel Da Cachoeira;SBUA;-0.133;-67.083;90
Central and South America;Brazil;Sao Jose Dos Campo;SBSJ;-23.2333;-45.8667;0
Central and South America;Brazil;Sao Luiz;SBSL;-2.6;-44.2333;53
Central and South America;Brazil;Sao Paulo;SBSP;-23.6167;-46.65;802
Central and South America;Brazil;Tabatinga;SBTT;-3.6667;-69.6667;0
+Central and South America;Brazil;Tarauaca;SBTK;-8.167;-70.767;190
+Central and South America;Brazil;Tefe;SBTF;-3.367;-64.683;47
Central and South America;Brazil;Teresina;SBTE;-5.05;-42.8167;69
Central and South America;Brazil;Tucurui;SBTU;-3.7167;-49.7167;0
Central and South America;Brazil;Uberaba;SBUR;-19.7833;-47.9667;809
+Central and South America;Brazil;Uberlandia ;SBUL;-18.883;-48.233;943
Central and South America;Brazil;Uruguaiana;SBUG;-29.7833;-57.0333;74
Central and South America;Brazil;Vilhena;SBVH;-12.7;-60.1;652
+Central and South America;Brazil;Vitoria Da Conquista;SBQV;-14.950;-40.883;840
Central and South America;Brazil;Vitoria;SBVT;-20.2667;-40.2833;4
+Central and South America;Brazil;Xavantina ;SBXV;-14.700;-52.350;315
Central and South America;Cayman Islands;Grand Cayman;MWCR;19.2833;-81.35;3
Central and South America;Chile;Antofagasta;SCFA;-23.4333;-70.4333;137
Central and South America;Chile;Arica;SCAR;-18.3333;-70.3333;58
@@ -1192,6 +1639,8 @@
Central and South America;Costa Rica;Chacarita;MRCH;9.9833;-84.7833;0
Central and South America;Costa Rica;Juan Santamaria;MROC;10;-84.2167;939
Central and South America;Costa Rica;Liberia;MRLB;10.6167;-85.4333;80
+Central and South America;Costa Rica;Nicoya;MRNC;10.150;-85.450;120
+Central and South America;Costa Rica;Palmar Sur;MRPM;8.950;-83.467;15
Central and South America;Costa Rica;Puerto Limon;MRLM;10;-83.05;3
Central and South America;Costa Rica;Tobias Bolanos;MRPV;9.95;-84.15;0
Central and South America;Cuba;Baracoa;MUBA;20.35;-74.5;9
@@ -1221,11 +1670,16 @@
Central and South America;El Salvador;San Miguel;MSSM;13.45;-88.1167;0
Central and South America;El Salvador;San Salvador;MSSS;13.7;-89.1167;621
Central and South America;El Salvador;Santa Ana;MSSA;13.9833;-89.5667;0
+Central and South America;Falkland Islands;Mount Pleasant Airport;EGYP;-51.817;-58.450;74
+Central and South America;Falkland Islands;Stanley Airport;SFAL;-51.683;-57.767;23
Central and South America;Guatemala;Flores;MGFL;16.9167;-89.8833;115
Central and South America;Guatemala;Guatemala;MGGT;14.5833;-90.5167;1489
Central and South America;Guatemala;Huehuetenango;MGHT;15.3167;-91.4667;1901
Central and South America;Guatemala;Puerto Barrios;MGPB;15.7167;-88.6;1
Central and South America;Guatemala;San Jose;MGSJ;13.9167;-90.8167;2
+Central and South America;Haiti;Camp Canargus;CTPP;18.567;-72.317;38
+Central and South America;Haiti;Cap-Haitien;MTCH;19.750;-72.183;2
+Central and South America;Haiti;FOB Mandrian;KQHA;19.667;-73.033;17
Central and South America;Haiti;Port-Au-Prince;MTPP;18.5667;-72.3;34
Central and South America;Honduras;Amapala;MHAM;13.2667;-87.65;0
Central and South America;Honduras;Catacamas;MHCA;14.9;-85.9333;442
@@ -1241,6 +1695,7 @@
Central and South America;Honduras;Tela;MHTE;15.7167;-87.4833;3
Central and South America;Honduras;Yoro;MHYR;15.1667;-87.1167;670
Central and South America;Jamaica;Kingston;MKJP;17.9333;-76.7833;14
+Central and South America;Jamaica;Montego Bay / Sangster;MKJS;18.500;-77.917;1
Central and South America;Nicaragua;Bluefields;MNBL;12;-86.7667;5
Central and South America;Nicaragua;Chinandega;MNCH;12.6333;-87.1333;60
Central and South America;Nicaragua;Jinotega;MNJG;13.0833;-85.9833;1032
@@ -1254,9 +1709,15 @@
Central and South America;Panama;Santiago;MPSA;8.0833;-80.95;88
Central and South America;Panama;Tocumen;MPTO;9.05;-79.3667;0
Central and South America;Paraguay;Asuncion;SGAS;-25.2667;-57.6333;101
+Central and South America;Paraguay;Concepcion;SGCO;-23.417;-57.300;74
+Central and South America;Paraguay;Encarnacion;SGEN;-27.317;-55.833;91
Central and South America;Paraguay;Guarany;SGES;-25.45;-54.85;0
+Central and South America;Paraguay;Mariscal Estigarribia;SGME;-22.017;-60.600;172
+Central and South America;Paraguay;Nueva Asuncion;SGNA;-20.717;-61.917;318
Central and South America;Peru;Andahuayla;SPHY;-13.7167;-73.35;0
+Central and South America;Peru;Anta Huaraz ;SPHZ;-9.350;-77.600;2750
Central and South America;Peru;Arequipa;SPQU;-16.3167;-71.55;2539
+Central and South America;Peru;Atalaya;SPAY;-10.733;-73.783;450
Central and South America;Peru;Ayacucho;SPHO;-13.1333;-74.2167;2749
Central and South America;Peru;Chiclayo;SPHI;-6.7833;-79.8333;34
Central and South America;Peru;Cuzco;SPZO;-13.55;-71.9833;3249
@@ -1273,47 +1734,85 @@
Central and South America;Peru;Talara;SPYL;-4.5667;-81.25;90
Central and South America;Peru;Yurimaguas;SPMS;-5.9;-76.0833;184
Central and South America;Suriname;Johan A. Pengel;SMJP;5.45;-55.1833;0
+Central and South America;Suriname;Zanderij;SMZY;5.450;-55.200;15
Central and South America;Uruguay;Artigas;SUAG;-30.3833;-56.5;120
Central and South America;Uruguay;Capitan Corbeta;SULS;-34.8667;-55.1;0
Central and South America;Uruguay;Colonia;SUCA;-34.45;-57.8333;22
Central and South America;Uruguay;Durazno;SUDU;-33.35;-56.5;92
Central and South America;Uruguay;Maldonado/Punta Est;SUPE;-34.9167;-54.9167;0
Central and South America;Uruguay;Melilla;SUAA;-34.7833;-56.25;48
+Central and South America;Uruguay;Melo;SUMO;-32.367;-54.217;100
+Central and South America;Uruguay;Mercedes;SUME;-33.250;-58.067;22
Central and South America;Uruguay;Montevideo/Carrasco;SUMU;-34.8333;-56;32
Central and South America;Uruguay;Paysandu;SUPU;-32.3333;-58.0333;61
Central and South America;Uruguay;Rivera;SURV;-30.8833;-55.5333;241
Central and South America;Uruguay;Salto;SUSO;-31.3833;-57.95;33
Central and South America;Uruguay;Tacuarembo;SUTB;-31.7;-55.9833;134
+Central and South America;Uruguay;Treinta Y Tres;SUTR;-33.217;-54.383;46
Central and South America;Venezuela;Acarigua;SVAC;9.55;-69.2333;225
Central and South America;Venezuela;Barcelona;SVBC;10.1167;-64.6833;7
Central and South America;Venezuela;Barinas;SVBI;8.6167;-70.2167;204
Central and South America;Venezuela;Barquisimeto;SVBM;10.0667;-69.3167;614
Central and South America;Venezuela;Calabozo;SVCL;8.9333;-67.4167;101
+Central and South America;Venezuela;Caracas / Oscar Macha;SVCS;10.300;-66.817;654
Central and South America;Venezuela;Caracas La Carlota;SVFM;10.5;-66.8833;835
Central and South America;Venezuela;Caracas Maiquetia;SVMI;10.6;-66.9833;48
+Central and South America;Venezuela;Carupano / Gen. Jose;SVCP;10.667;-63.267;10
Central and South America;Venezuela;Ciudad Bolivar;SVCB;8.15;-63.55;48
Central and South America;Venezuela;Coro;SVCR;11.4167;-69.6833;17
Central and South America;Venezuela;Cumana;SVCU;10.45;-64.1833;4
+Central and South America;Venezuela;El Vigia / Perez Alph;SVVG;8.633;-71.667;100
Central and South America;Venezuela;Guanare;SVGU;9.0167;-69.7333;163
+Central and South America;Venezuela;Guasdualito;SVGD;7.233;-70.800;130
+Central and South America;Venezuela;Guayana / Manuel Car ;SVPR;8.300;-62.733;144
+Central and South America;Venezuela;Guiria;SVGI;10.583;-62.317;13
+Central and South America;Venezuela;Higuerote;SVHG;10.467;-66.100;4
+Central and South America;Venezuela;La Fria;SVLF;8.250;-72.267;98
+Central and South America;Venezuela;La Orchila;SVLO;11.800;-66.183;3
Central and South America;Venezuela;Maracaibo-La Chinita;SVMC;10.5667;-71.7333;65
Central and South America;Venezuela;Maracay-B.A.Sucre;SVBS;10.25;-67.65;437
Central and South America;Venezuela;Margarita;SVMG;10.9167;-63.9833;0
+Central and South America;Venezuela;Maturin;SVMT;9.750;-63.183;65
Central and South America;Venezuela;Mene Grande;SVMN;9.8167;-70.9333;28
Central and South America;Venezuela;Merida;SVMD;8.6;-71.1833;1498
+Central and South America;Venezuela;Metropolitano Private ;SVMP;10.133;-66.783;175
+Central and South America;Venezuela;Paraguana / Josefa;SVJC;11.783;-70.150;23
+Central and South America;Venezuela;Paramillo Private ;SVPM;7.800;-72.200;1000
+Central and South America;Venezuela;Pto. Cabello;SVPC;10.500;-68.000;2
+Central and South America;Venezuela;Puerto Ayacucho;SVPA;5.600;-67.500;73
Central and South America;Venezuela;San Antonio Del Tachira;SVSA;7.85;-72.45;378
+Central and South America;Venezuela;San Felipe;SVSP;10.283;-68.750;232
Central and South America;Venezuela;San Fernando De Apure;SVSR;7.9;-67.4167;48
+Central and South America;Venezuela;San Juan De Los Morros;SVJM;9.917;-67.333;429
+Central and South America;Venezuela;San Tome Private ;SVST;8.950;-64.150;262
+Central and South America;Venezuela;Santa Barbara Zulia;SVSZ;8.983;-71.950;10
+Central and South America;Venezuela;Santa Elena De Uairen;SVSE;4.600;-61.117;907
+Central and South America;Venezuela;Sto. Domingo;SVSO;7.583;-72.067;327
+Central and South America;Venezuela;Temblador;SVTR;9.017;-62.617;30
+Central and South America;Venezuela;Tumeremo;SVTM;7.300;-61.450;180
+Central and South America;Venezuela;Valencia;SVVA;10.167;-67.933;430
Central and South America;Venezuela;Valera*;SVVL;9.35;-70.6167;582
+Central and South America;Venezuela;Valle De La Pascua;SVVP;9.217;-66.017;125
Europe;Albania;Tirana;LATI;41.3333;19.7833;90
Europe;Armenia;Yerevan;UGEE;40.133;44.467;890
+Europe;Austria;Aigen Im Ennstal;LOXA;47.533;14.133;638
Europe;Austria;Graz;LOWG;47;15.4333;347
Europe;Austria;Hohenems;LOIH;47.3833;9.7006;0
+Europe;Austria;Horsching Aus-Afb ;LOXL;48.233;14.183;313
Europe;Austria;Innsbruck;LOWI;47.2667;11.35;593
Europe;Austria;Klagenfurt;LOWK;46.65;14.3333;476
+Europe;Austria;Krems-Langenlois;LOAG;48.446;15.634;312
Europe;Austria;Linz;LOWL;48.2333;14.1833;313
+Europe;Austria;Niederosterreich / Wiener Neustadt-Ost Flugplatz;LOAN;47.843;16.258;272
+Europe;Austria;Oberosterreich / Freistadt Flugplatz;LOLF;48.515;14.409;685
+Europe;Austria;Punitz-Gussing;LOGG;47.148;16.318;290
Europe;Austria;Salzburg;LOWS;47.8;13;450
+Europe;Austria;Tulln;LOXT;48.317;16.117;175
Europe;Austria;Voslau;LOAV;47.95;16.2594;0
Europe;Austria;Wien;LOWW;48.1167;16.5667;190
+Europe;Austria;Wels;LOLW;48.167;14.033;0
Europe;Austria;Zell Am See;LOWZ;47.2833;12.7875;0
+Europe;Austria;Zeltweg;LOXZ;47.200;14.750;677
Europe;Belarus;Brest;UMBB;52.108;23.897;143
Europe;Belarus;Gomel';UMGG;52.527;31.018;144
Europe;Belarus;Grodno;UMMG;53.602;24.055;135
@@ -1322,51 +1821,85 @@
Europe;Belarus;Vitebsk;UMII;55.167;30.217;176
Europe;Belgium;Antwerpen/Deurne;EBAW;51.2;4.4667;14
Europe;Belgium;Beauvechain;EBBE;50.75;4.7667;127
+Europe;Belgium;Bertrix Bel-Afb ;EBBX;49.900;5.217;461
Europe;Belgium;Brasschaat;EBBT;51.3333;4.5;23
Europe;Belgium;Brussels-National Airport;EBBR;50.9;4.5333;58
Europe;Belgium;Charleroi-Brussels South;EBCI;50.4667;4.45;192
Europe;Belgium;Chievres;EBCV;50.5667;3.8333;63
Europe;Belgium;Elsenborn;EBLB;50.4667;6.1833;570
Europe;Belgium;Florennes;EBFS;50.2333;4.65;299
+Europe;Belgium;Genk;EBZW;50.933;5.500;61
+Europe;Belgium;Gent / Industrie-Zone;EBGT;51.183;3.817;10
+Europe;Belgium;Goetsenhoven;EBTN;50.783;4.950;71
Europe;Belgium;Kleine Brogel;EBBL;51.1667;5.4667;64
Europe;Belgium;Koksijde;EBFN;51.0833;2.65;9
Europe;Belgium;Liege;EBLG;50.65;5.45;178
+Europe;Belgium;Melsbroek Bel-Afb ;EBMB;50.900;4.500;55
+Europe;Belgium;Munte;EBMT;50.933;3.733;55
Europe;Belgium;Oostende;EBOS;51.2;2.8667;5
Europe;Belgium;Schaffen;EBDT;51;5.0667;54
+Europe;Belgium;Sint-Truiden;EBST;50.800;5.200;74
+Europe;Belgium;Spa / La Sauveniere;EBSP;50.483;5.917;470
+Europe;Belgium;St-Hubert;EBSU;50.033;5.400;563
+Europe;Belgium;Weelde Military ;EBWE;51.417;5.000;60
+Europe;Bosnia-Herzegovina;Banja Luka;LQBK;44.783;17.217;156
+Europe;Bosnia-Herzegovina;Livno;LQLV;43.833;17.017;724
+Europe;Bosnia-Herzegovina;Mostar;LQMO;43.350;17.800;108
Europe;Bosnia-Herzegovina;Sarajevo;LQSA;43.8167;18.3333;510
+Europe;Bosnia and Herzegovina;Tuzla;LQTZ;44.550;18.700;306
Europe;Bulgaria;Burgas;LBBG;42.4833;27.4833;28
+Europe;Bulgaria;Gorna Orechovista;LBGO;43.150;25.600;0
Europe;Bulgaria;Plovdiv;LBPD;42.1333;24.75;185
+Europe;Bulgaria;Rousse;LBRS;43.850;25.950;37
Europe;Bulgaria;Sofia;LBSF;42.65;23.3833;595
Europe;Bulgaria;Varna;LBWN;43.2;27.9167;43
+Europe;Croatia;Brac;LDSB;43.286;16.680;541
+Europe;Croatia;Cepin;LDOC;45.517;18.550;72
Europe;Croatia;Dubrovnik;LDDU;42.5667;18.2667;165
+Europe;Croatia;Hvar;LDSH;43.167;16.450;20
+Europe;Croatia;Losinj Island;LDLO;44.566;14.393;45
+Europe;Croatia;Osijek / Cepin;LDOS;45.450;18.800;88
Europe;Croatia;Pula;LDPL;45.9;13.9167;63
Europe;Croatia;Rijeka;LDRI;45.2167;14.5833...
[truncated message content] |
|
From: <aa...@us...> - 2011-03-13 16:03:21
|
Revision: 785
http://gpredict.svn.sourceforge.net/gpredict/?rev=785&view=rev
Author: aa1vs
Date: 2011-03-13 16:03:15 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
Change version to 1.4svn
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-03-13 03:10:32 UTC (rev 784)
+++ trunk/configure.ac 2011-03-13 16:03:15 UTC (rev 785)
@@ -2,7 +2,7 @@
AM_CONFIG_HEADER(build-config.h)
-AM_INIT_AUTOMAKE(gpredict, 1.3)
+AM_INIT_AUTOMAKE(gpredict, 1.4svn)
AM_MAINTAINER_MODE
AC_PROG_INTLTOOL([0.21])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-13 03:10:38
|
Revision: 784
http://gpredict.svn.sourceforge.net/gpredict/?rev=784&view=rev
Author: aa1vs
Date: 2011-03-13 03:10:32 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
Add check for slope of elevation in find_los.
Modified Paths:
--------------
trunk/src/predict-tools.c
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2011-03-06 13:18:03 UTC (rev 783)
+++ trunk/src/predict-tools.c 2011-03-13 03:10:32 UTC (rev 784)
@@ -32,7 +32,7 @@
#include <glib/gi18n.h>
#include "sgpsdp/sgp4sdp4.h"
#ifdef HAVE_CONFIG_H
-# include <build-config.h>
+#include <build-config.h>
#endif
#include "gtk-sat-data.h"
#include "time-tools.h"
@@ -229,8 +229,8 @@
{
gdouble t = start;
gdouble lostime = 0.0;
+ gdouble eltemp;
-
predict_calc (sat, qth, start);
/* check whether satellite has aos */
@@ -269,8 +269,19 @@
t += sat->el * sqrt(sat->alt)/502500.0;
predict_calc (sat, qth, t);
- if (fabs(sat->el) < 0.005)
- lostime = t;
+ if (fabs (sat->el) < 0.005) {
+ /* two things are true at LOS time
+ The elevation is a zero and descending.
+ This checks that those two are true.
+ */
+ eltemp = sat->el;
+
+ /*check elevation 1 second earlier*/
+ predict_calc (sat, qth, t-1.0/86400.0);
+
+ if (sat->el > eltemp)
+ lostime = t;
+ }
}
}
@@ -289,8 +300,19 @@
t += sat->el * sqrt(sat->alt)/502500.0;
predict_calc (sat, qth, t);
- if (fabs(sat->el) < 0.005)
- lostime = t;
+ if (fabs(sat->el) < 0.005){
+ /* two things are true at LOS time
+ The elevation is a zero and descending.
+ This checks that those two are true.
+ */
+ eltemp = sat->el;
+
+ /*check elevation 1 second earlier*/
+ predict_calc (sat,qth,t-1.0/86400.0);
+
+ if (sat->el > eltemp)
+ lostime = t;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-06 13:18:09
|
Revision: 783
http://gpredict.svn.sourceforge.net/gpredict/?rev=783&view=rev
Author: aa1vs
Date: 2011-03-06 13:18:03 +0000 (Sun, 06 Mar 2011)
Log Message:
-----------
Deleting continuous_network branch since it is in trunk now.
Removed Paths:
-------------
branches/continuous_network/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-06 02:58:14
|
Revision: 782
http://gpredict.svn.sourceforge.net/gpredict/?rev=782&view=rev
Author: aa1vs
Date: 2011-03-06 02:58:08 +0000 (Sun, 06 Mar 2011)
Log Message:
-----------
Reduce number of loops for GPSD data.
Modified Paths:
--------------
branches/gpsd_testing/src/qth-data.c
Modified: branches/gpsd_testing/src/qth-data.c
===================================================================
--- branches/gpsd_testing/src/qth-data.c 2011-03-06 02:54:10 UTC (rev 781)
+++ branches/gpsd_testing/src/qth-data.c 2011-03-06 02:58:08 UTC (rev 782)
@@ -510,7 +510,7 @@
/* if we do not do this as a while loop, the gpsd packets can backup */
/* and no longer be in sync with the gps receiver*/
num_loops++;
- if (num_loops>10000){
+ if (num_loops>1000){
retval=FALSE;
break;
}
@@ -549,8 +549,10 @@
case 5:
#if GPSD_API_MAJOR_VERSION==5
while(gps_waiting(qth->gps_data) == 1) {
+ /*see comment from above*/
+ /*hopefully not needed but does not hurt anything.*/
num_loops++;
- if (num_loops>10000){
+ if (num_loops>1000){
retval=FALSE;
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-06 02:54:16
|
Revision: 781
http://gpredict.svn.sourceforge.net/gpredict/?rev=781&view=rev
Author: aa1vs
Date: 2011-03-06 02:54:10 +0000 (Sun, 06 Mar 2011)
Log Message:
-----------
Change GPSD selection to combo_box
Modified Paths:
--------------
branches/gpsd_testing/src/qth-editor.c
branches/gpsd_testing/src/sat-pref-qth-editor.c
Modified: branches/gpsd_testing/src/qth-editor.c
===================================================================
--- branches/gpsd_testing/src/qth-editor.c 2011-03-02 11:14:35 UTC (rev 780)
+++ branches/gpsd_testing/src/qth-editor.c 2011-03-06 02:54:10 UTC (rev 781)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
@@ -377,21 +377,22 @@
gtk_table_attach_defaults (GTK_TABLE (table), wxbut, 3, 4, 7, 8);
/* GPSD enabled*/
- label = gtk_label_new (_("QTHtype"));
+ label = gtk_label_new (_("QTH Type"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 10, 11);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 8, 9);
- type = gtk_spin_button_new_with_range (0, 1, 1);
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON (type), 1, 1);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (type), TRUE);
+ type = gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), "Static");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), "GPSD");
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), 0);
gtk_tooltips_set_tip (tooltips, type,
- _("zero for old, 1 for gpsd"),
+ _("A qth can be static, ie. it does not change, or gpsd based for computers with gps attached."),
NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 10, 11);
+ gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 8, 9);
/* GPSD Server */
label = gtk_label_new (_("GPSD Server"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 8, 9);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 9, 10);
server = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (server), 6000);
@@ -399,20 +400,20 @@
gtk_tooltips_set_tip (tooltips, server,
_("GPSD Server."),
NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), server, 1, 2, 8, 9);
+ gtk_table_attach_defaults (GTK_TABLE (table), server, 1, 2, 9, 10);
/* GPSD Port*/
label = gtk_label_new (_("GPSD Port"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 9, 10);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 10, 11);
port = gtk_spin_button_new_with_range (0, 32768, 1);
gtk_spin_button_set_increments (GTK_SPIN_BUTTON (port), 1, 100);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (port), TRUE);
gtk_tooltips_set_tip (tooltips, port,
- _("Set the port for GPSD to use"),
+ _("Set the port for GPSD to use. Default for gpsd is 2947."),
NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 9, 10);
+ gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 10, 11);
if (qth->name != NULL)
@@ -531,9 +532,10 @@
qthalt = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (alt));
qthqra = gtk_entry_get_text (GTK_ENTRY (qra));
- gpsdenabled = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (type));
+ gpsdenabled = gtk_combo_box_get_active ( GTK_COMBO_BOX (type) );
gpsdserver = gtk_entry_get_text (GTK_ENTRY (server));
gpsdport = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
+
/* clear qth struct if not empty */
/* if (qth->name != NULL) */
/* g_free (qth->name); */
Modified: branches/gpsd_testing/src/sat-pref-qth-editor.c
===================================================================
--- branches/gpsd_testing/src/sat-pref-qth-editor.c 2011-03-02 11:14:35 UTC (rev 780)
+++ branches/gpsd_testing/src/sat-pref-qth-editor.c 2011-03-06 02:54:10 UTC (rev 781)
@@ -360,21 +360,22 @@
GUINT_TO_POINTER (SELECTION_MODE_WX));
gtk_table_attach_defaults (GTK_TABLE (table), wxbut, 3, 4, 7, 8);
/* GPSD enabled*/
- label = gtk_label_new (_("QTHtype"));
+ label = gtk_label_new (_("QTH Type"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 10, 11);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 8, 9);
- type = gtk_spin_button_new_with_range (0, 1, 1);
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON (type), 1, 1);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (type), TRUE);
+ type = gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), "Static");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), "GPSD");
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), 0);
gtk_tooltips_set_tip (tooltips, type,
- _("zero for old, 1 for gpsd"),
+ _("A qth can be static, ie. it does not change, or gpsd based for computers with gps attached."),
NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 10, 11);
+ gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 8, 9);
/* GPSD Server */
label = gtk_label_new (_("GPSD Server"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 8, 9);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 9, 10);
server = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (server), 6000);
@@ -382,20 +383,20 @@
gtk_tooltips_set_tip (tooltips, server,
_("GPSD Server."),
NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), server, 1, 2, 8, 9);
+ gtk_table_attach_defaults (GTK_TABLE (table), server, 1, 2, 9, 10);
/* GPSD Port*/
label = gtk_label_new (_("GPSD Port"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 9, 10);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 10, 11);
port = gtk_spin_button_new_with_range (0, 32768, 1);
gtk_spin_button_set_increments (GTK_SPIN_BUTTON (port), 1, 100);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (port), TRUE);
gtk_tooltips_set_tip (tooltips, port,
- _("Set the port for GPSD to use"),
+ _("Set the port for GPSD to use. Default for gpsd is 2947."),
NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 9, 10);
+ gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 10, 11);
if (!new)
@@ -485,7 +486,7 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (alt), qthalt);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), qthgpsdport);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (type), qthtype);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), qthtype);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
_("%s:%d: Loaded %s for editing:\n"\
@@ -568,7 +569,7 @@
qthalt = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (alt));
qthgpsdport = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
- qthtype = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (type));
+ qthtype = gtk_combo_box_get_active ( GTK_COMBO_BOX (type));
/* get liststore */
liststore = GTK_LIST_STORE (gtk_tree_view_get_model (treeview));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2011-03-02 11:14:41
|
Revision: 780
http://gpredict.svn.sourceforge.net/gpredict/?rev=780&view=rev
Author: csete
Date: 2011-03-02 11:14:35 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Updated date for 1.3
Modified Paths:
--------------
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/doc/um/gpredict-user-manual.odt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2011-03-01 16:21:30
|
Revision: 779
http://gpredict.svn.sourceforge.net/gpredict/?rev=779&view=rev
Author: csete
Date: 2011-03-01 16:21:24 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Tagging version 1.3
Added Paths:
-----------
tags/release-1.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2011-03-01 15:48:19
|
Revision: 778
http://gpredict.svn.sourceforge.net/gpredict/?rev=778&view=rev
Author: csete
Date: 2011-03-01 15:48:13 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Update version number.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-03-01 15:47:33 UTC (rev 777)
+++ trunk/configure.ac 2011-03-01 15:48:13 UTC (rev 778)
@@ -2,7 +2,7 @@
AM_CONFIG_HEADER(build-config.h)
-AM_INIT_AUTOMAKE(gpredict, 1.3svn)
+AM_INIT_AUTOMAKE(gpredict, 1.3)
AM_MAINTAINER_MODE
AC_PROG_INTLTOOL([0.21])
@@ -45,7 +45,7 @@
dnl Add the languages which your application supports here.
dnl Note that other progs only have ALL_LINGUAS and AM_GLIB_GNU_GETTEXT
-ALL_LINGUAS="cs de en_GB en_US es fi fr it lt ru th"
+ALL_LINGUAS="cs da de en_GB en_US es fi fr it lt ru th"
GETTEXT_PACKAGE=gpredict
AC_SUBST(GETTEXT_PACKAGE)
AM_GLIB_GNU_GETTEXT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2011-03-01 15:47:39
|
Revision: 777
http://gpredict.svn.sourceforge.net/gpredict/?rev=777&view=rev
Author: csete
Date: 2011-03-01 15:47:33 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-03-01 15:37:36 UTC (rev 776)
+++ trunk/ChangeLog 2011-03-01 15:47:33 UTC (rev 777)
@@ -1,3 +1,22 @@
+2011-03-01 Alexandru Csete <oz9aec at gmail.com>
+
+ * data/satdata:
+ Updated satellite data.
+
+ * po:
+ Synchronised with translations from launchpad.net
+
+ * configure.ac:
+ Updated version number to 1.3.
+ Include da.po
+
+
+2011-02-28 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/tle-update.c:
+ Fixed spelling error.
+
+
2011-02-20 Charles Suprin <hamaa1vs at gmail.com>
* data/desktop/gpredict.desktop.in
@@ -3,4 +22,5 @@
Change categories in .desktop to fix issues w/ fedora and ubuntu packaging.
+
2011-02-19 Charles Suprin <hamaa1vs at gmail.com>
@@ -10,6 +30,7 @@
* src/gtk-polar-view.c
Do not polar plot pass points below the horizon.
+
2011-02-16 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-rot-ctrl.c
@@ -18,6 +39,7 @@
* src/gtk-rot-knob.c
Eliminate printf when bounds exceeded.
+
2011-02-14 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-selector.c
@@ -31,6 +53,7 @@
* src/Makefile.am
Remove reference to defaults.h.
+
2011-02-08 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-selector.c
@@ -45,6 +68,7 @@
* src/about.c
Update copyright dates to 2011 from 2009.
+
2011-02-02 Charles Suprin <hamaa1vs at gmail.com>
* src/mod-cfg.c
@@ -56,6 +80,7 @@
* src/gtk-single-sat.c
List satellites in single sat view alphabetically instead of hash order.
+
2011-02-01 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-03-01 15:37:36 UTC (rev 776)
+++ trunk/NEWS 2011-03-01 15:47:33 UTC (rev 777)
@@ -1,4 +1,4 @@
-Changes in version 1.3 (TBD)
+Changes in version 1.3 (1 Mar 2011)
- Feature request 2873824: Flip Passes.
- Feature Request 3022617: Malaysia's location.
@@ -8,11 +8,12 @@
- Fixed bug 2116691: Leave network connection open.
- Fixed bug 3099314: Rotator Thrashing.
- Fixed bug 2167508: problems in rotator controller.
-- Fixed bug from Ubuntu #706452:Update from local files won't work with files in UPPER case
+- Fixed bug from Ubuntu #706452: Update from local files won't work with files in UPPER case
- Fixed bug 3171615: Searching for satellites in the satellite selector
- Fixed bug 3113190: .desktop file error
- Address bug 2945538: Pass in polar display going outside the circle (Improve the graphical portion.)
+
Changes in version 1.2 (12 Oct 2010)
- New layout engine that allows any combination of views to be created in a NxM grid.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2011-03-01 15:37:45
|
Revision: 776
http://gpredict.svn.sourceforge.net/gpredict/?rev=776&view=rev
Author: csete
Date: 2011-03-01 15:37:36 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Synchronise with Launchpad.
Modified Paths:
--------------
trunk/po/cs.po
trunk/po/de.po
trunk/po/en_GB.po
trunk/po/es.po
trunk/po/fi.po
trunk/po/fr.po
trunk/po/gpredict.pot
trunk/po/it.po
trunk/po/lt.po
trunk/po/ru.po
trunk/po/th.po
Added Paths:
-----------
trunk/po/da.po
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2011-03-01 15:30:05 UTC (rev 775)
+++ trunk/po/cs.po 2011-03-01 15:37:36 UTC (rev 776)
@@ -7,15 +7,15 @@
msgstr ""
"Project-Id-Version: gpredict\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-10 03:21+0000\n"
-"PO-Revision-Date: 2009-10-31 10:33+0000\n"
-"Last-Translator: Kuvaly [LCT] <ku...@se...>\n"
+"POT-Creation-Date: 2010-11-26 03:42+0000\n"
+"PO-Revision-Date: 2010-10-15 00:15+0000\n"
+"Last-Translator: Gpredict Team <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-10 12:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-01 15:24+0000\n"
+"X-Generator: Launchpad (build 12460)\n"
#: ../src/about.c:65
msgid ""
@@ -63,6 +63,7 @@
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
+" Gpredict Team https://launchpad.net/~gpredict-team\n"
" Kuvaly [LCT] https://launchpad.net/~kuvaly"
#: ../src/first-time.c:190 ../src/first-time.c:837
@@ -252,7 +253,7 @@
msgid "Local Time"
msgstr ""
-#: ../src/gtk-azel-plot.c:383 ../src/gtk-sky-glance.c:362
+#: ../src/gtk-azel-plot.c:383 ../src/gtk-sky-glance.c:374
#: ../src/pass-to-txt.c:158
msgid "UTC"
msgstr ""
@@ -324,34 +325,39 @@
"Always in range"
msgstr ""
-#: ../src/gtk-polar-view.c:1001 ../src/gtk-polar-view.c:1137
+#: ../src/gtk-polar-view.c:1001 ../src/gtk-polar-view.c:1143
#, c-format
msgid "%s:%d: Failed to get satellite pass."
msgstr ""
-#: ../src/gtk-polar-view.c:1130 ../src/gtk-polar-view-popup.c:197
-#: ../src/gtk-polar-view-popup.c:304 ../src/gtk-sat-map-popup.c:195
+#: ../src/gtk-polar-view.c:1010 ../src/gtk-polar-view.c:1156
+#, c-format
+msgid "%s:%d: Pass had no points in it."
+msgstr ""
+
+#: ../src/gtk-polar-view.c:1136 ../src/gtk-polar-view-popup.c:197
+#: ../src/gtk-polar-view-popup.c:310 ../src/gtk-sat-map-popup.c:195
#: ../src/gtk-sat-map-popup.c:248 ../src/gtk-sat-map-popup.c:425
#, c-format
msgid "%s:%d: Failed to get satellite object."
msgstr ""
-#: ../src/gtk-polar-view.c:1414
+#: ../src/gtk-polar-view.c:1428
#, c-format
msgid "%s:%d: Could not find satellite (%d) in hash table"
msgstr ""
-#: ../src/gtk-polar-view.c:1462 ../src/gtk-sat-map.c:926
+#: ../src/gtk-polar-view.c:1476 ../src/gtk-sat-map.c:926
#, c-format
msgid "%s:%d: Can not find clicked object (%d) in hash table"
msgstr ""
-#: ../src/gtk-polar-view.c:1638
+#: ../src/gtk-polar-view.c:1652
#, c-format
msgid "LOS in %s%d:%s%d%s%d"
msgstr ""
-#: ../src/gtk-polar-view.c:1641
+#: ../src/gtk-polar-view.c:1655
#, c-format
msgid "LOS in %s%d%s%d"
msgstr ""
@@ -374,7 +380,12 @@
msgid "Sky track"
msgstr ""
-#: ../src/gtk-polar-view-popup.c:404 ../src/gtk-polar-view-popup.c:474
+#: ../src/gtk-polar-view-popup.c:215
+#, c-format
+msgid "%s:%d: Pass has no details."
+msgstr ""
+
+#: ../src/gtk-polar-view-popup.c:410 ../src/gtk-polar-view-popup.c:480
#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246
#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376
#: ../src/gtk-single-sat.c:1049 ../src/gtk-single-sat.c:1120
@@ -384,7 +395,7 @@
"within the next %d days"
msgstr ""
-#: ../src/gtk-polar-view-popup.c:420 ../src/gtk-sat-list-popup.c:192
+#: ../src/gtk-polar-view-popup.c:426 ../src/gtk-sat-list-popup.c:192
#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1065
#, c-format
msgid ""
@@ -396,7 +407,7 @@
"never comes above the horizon"
msgstr ""
-#: ../src/gtk-polar-view-popup.c:493 ../src/gtk-sat-list-popup.c:265
+#: ../src/gtk-polar-view-popup.c:499 ../src/gtk-sat-list-popup.c:265
#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1139
#, c-format
msgid ""
@@ -404,67 +415,67 @@
"the current ground station!"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:399
+#: ../src/gtk-rig-ctrl.c:414
msgid "<b> Downlink </b>"
msgstr ""
#. Downlink doppler
#. Uplink doppler
-#: ../src/gtk-rig-ctrl.c:414 ../src/gtk-rig-ctrl.c:478
+#: ../src/gtk-rig-ctrl.c:429 ../src/gtk-rig-ctrl.c:493
msgid "Doppler:"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:416 ../src/gtk-rig-ctrl.c:480
+#: ../src/gtk-rig-ctrl.c:431 ../src/gtk-rig-ctrl.c:495
msgid ""
"The Doppler shift according to the range rate and the currently selected "
"downlink frequency"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:428 ../src/gtk-rig-ctrl.c:492
+#: ../src/gtk-rig-ctrl.c:443 ../src/gtk-rig-ctrl.c:507
msgid "LO:"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:463
+#: ../src/gtk-rig-ctrl.c:478
msgid "<b> Uplink </b>"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:542 ../src/gtk-rot-ctrl.c:425
+#: ../src/gtk-rig-ctrl.c:557 ../src/gtk-rot-ctrl.c:471
msgid "Select target object"
msgstr ""
#. tracking button
-#: ../src/gtk-rig-ctrl.c:547 ../src/gtk-rot-ctrl.c:430
+#: ../src/gtk-rig-ctrl.c:562 ../src/gtk-rot-ctrl.c:476
msgid "Track"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:548
+#: ../src/gtk-rig-ctrl.c:563
msgid ""
"Track the satellite transponder.\n"
"Enabling this button will apply Dopper correction to the frequency of the "
"radio."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:556
+#: ../src/gtk-rig-ctrl.c:571
msgid "Select a transponder"
msgstr ""
#. buttons
-#: ../src/gtk-rig-ctrl.c:563
+#: ../src/gtk-rig-ctrl.c:578
msgid "T"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:565
+#: ../src/gtk-rig-ctrl.c:580
msgid ""
"Tune the radio to this transponder. The uplink and downlink will be set to "
"the center of the transponder passband. In case of beacons, only the "
"downlink will be tuned to the beacon frequency."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:571
+#: ../src/gtk-rig-ctrl.c:586
msgid "L"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:573
+#: ../src/gtk-rig-ctrl.c:588
msgid ""
"Lock the uplink and the downlink to each other. Whenever you change the "
"downlink (in the controller or on the dial, the uplink will track it "
@@ -477,52 +488,52 @@
msgstr ""
#. Azimuth
-#: ../src/gtk-rig-ctrl.c:592 ../src/gtk-rot-ctrl.c:436
+#: ../src/gtk-rig-ctrl.c:607 ../src/gtk-rot-ctrl.c:482
msgid "Az:"
msgstr ""
#. Elevation
-#: ../src/gtk-rig-ctrl.c:600 ../src/gtk-rot-ctrl.c:446
+#: ../src/gtk-rig-ctrl.c:615 ../src/gtk-rot-ctrl.c:492
msgid "El:"
msgstr ""
#. Range
-#: ../src/gtk-rig-ctrl.c:608
+#: ../src/gtk-rig-ctrl.c:623
msgid " Range:"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:616 ../src/gtk-rig-ctrl.c:619
+#: ../src/gtk-rig-ctrl.c:631 ../src/gtk-rig-ctrl.c:634
msgid "This is the current distance between the satellite and the observer."
msgstr ""
#. Range rate
-#: ../src/gtk-rig-ctrl.c:623
+#: ../src/gtk-rig-ctrl.c:638
msgid " Rate:"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:631 ../src/gtk-rig-ctrl.c:634
+#: ../src/gtk-rig-ctrl.c:646 ../src/gtk-rig-ctrl.c:649
msgid ""
"The rate of change for the distance between the satellite and the observer."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:637 ../src/gtk-rot-ctrl.c:462
+#: ../src/gtk-rig-ctrl.c:652 ../src/gtk-rot-ctrl.c:508
msgid "Target"
msgstr ""
#. Primary device
-#: ../src/gtk-rig-ctrl.c:664
+#: ../src/gtk-rig-ctrl.c:679
msgid "1. Device:"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:669
+#: ../src/gtk-rig-ctrl.c:684
msgid ""
"Select primary radio device.This device will be used for downlink and uplink "
"unless you select a secondary device for uplink"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:691 ../src/gtk-rig-ctrl.c:734
-#: ../src/gtk-rig-ctrl.c:2939 ../src/gtk-rot-ctrl.c:514
-#: ../src/gtk-rot-ctrl.c:1242 ../src/sat-pref-rig.c:306
+#: ../src/gtk-rig-ctrl.c:717 ../src/gtk-rig-ctrl.c:760
+#: ../src/gtk-rig-ctrl.c:2401 ../src/gtk-rot-ctrl.c:572
+#: ../src/gtk-rot-ctrl.c:1222 ../src/sat-pref-rig.c:306
#: ../src/sat-pref-rot.c:272
#, c-format
msgid "%s:%d: Failed to open hwconf dir (%s)"
@@ -530,348 +541,304 @@
#. config will be force-loaded after LO spin is created
#. Secondary device
-#: ../src/gtk-rig-ctrl.c:704
+#: ../src/gtk-rig-ctrl.c:730
msgid "2. Device:"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:709
+#: ../src/gtk-rig-ctrl.c:735
msgid ""
"Select secondary radio device\n"
"This device will be used for uplink"
msgstr ""
#. load config
-#: ../src/gtk-rig-ctrl.c:713 ../src/sat-pref-rig.c:769
+#: ../src/gtk-rig-ctrl.c:739 ../src/sat-pref-rig.c:769
#: ../src/sat-pref-rig.c:778 ../src/sat-pref-rig-editor.c:246
msgid "None"
msgstr ""
#. Engage button
-#: ../src/gtk-rig-ctrl.c:749 ../src/gtk-rot-ctrl.c:527
+#: ../src/gtk-rig-ctrl.c:775 ../src/gtk-rot-ctrl.c:585
msgid "Engage"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:750
+#: ../src/gtk-rig-ctrl.c:776
msgid "Engage the selected radio device"
msgstr ""
#. Timeout
-#: ../src/gtk-rig-ctrl.c:758 ../src/gtk-rot-ctrl.c:533
+#: ../src/gtk-rig-ctrl.c:784 ../src/gtk-rot-ctrl.c:591
msgid "Cycle:"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:765
+#: ../src/gtk-rig-ctrl.c:791
msgid "This parameter controls the delay between commands sent to the rig."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:772 ../src/gtk-rot-ctrl.c:547
+#: ../src/gtk-rig-ctrl.c:798 ../src/gtk-rot-ctrl.c:605
msgid "msec"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:776 ../src/gtk-rot-ctrl.c:576
+#: ../src/gtk-rig-ctrl.c:802 ../src/gtk-rot-ctrl.c:634
msgid "Settings"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:792
+#: ../src/gtk-rig-ctrl.c:818
msgid "<span size='large'><b>ΔT: 00:00:00</b></span>"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:794
+#: ../src/gtk-rig-ctrl.c:820
msgid ""
"The time remaining until the next AOS or LOS event, depending on which one "
"comes first."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:841 ../src/gtk-rot-ctrl.c:639
+#: ../src/gtk-rig-ctrl.c:868 ../src/gtk-rot-ctrl.c:701
#, c-format
msgid "%s:%s: Invalid satellite selection: %d"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:878
+#: ../src/gtk-rig-ctrl.c:905
#, c-format
msgid "%s: Inconsistency detected in internal transponder data (%d,%d)"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1007
+#: ../src/gtk-rig-ctrl.c:1034
#, c-format
msgid "%s:%s: Primary device selected: %d"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1021 ../src/gtk-rig-ctrl.c:3027
+#: ../src/gtk-rig-ctrl.c:1048 ../src/gtk-rig-ctrl.c:2489
#, c-format
msgid "%s:%d: Failed to allocate memory for radio config"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1030 ../src/gtk-rig-ctrl.c:1130
+#: ../src/gtk-rig-ctrl.c:1057 ../src/gtk-rig-ctrl.c:1157
#, c-format
msgid "%s:%s: Loaded new radio configuration %s"
msgstr ""
#. update LO widgets
-#: ../src/gtk-rig-ctrl.c:1033 ../src/gtk-rig-ctrl.c:1038
-#: ../src/gtk-rig-ctrl.c:1089 ../src/gtk-rig-ctrl.c:1105
-#: ../src/gtk-rig-ctrl.c:1133
+#: ../src/gtk-rig-ctrl.c:1060 ../src/gtk-rig-ctrl.c:1065
+#: ../src/gtk-rig-ctrl.c:1116 ../src/gtk-rig-ctrl.c:1132
+#: ../src/gtk-rig-ctrl.c:1160
#, c-format
msgid "%.0f MHz"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1045 ../src/gtk-rig-ctrl.c:1139
+#: ../src/gtk-rig-ctrl.c:1072 ../src/gtk-rig-ctrl.c:1166
#, c-format
msgid "%s:%s: Failed to load radio configuration %s"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1073
+#: ../src/gtk-rig-ctrl.c:1100
#, c-format
msgid "%s:%s: Secondary device selected: %d"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1121
+#: ../src/gtk-rig-ctrl.c:1148
#, c-format
msgid "%s:%s: Failed to allocate memory for radio config"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1166 ../src/gtk-rig-ctrl.c:1284
-#: ../src/gtk-rot-ctrl.c:781
+#: ../src/gtk-rig-ctrl.c:1193 ../src/gtk-rig-ctrl.c:1315
+#: ../src/gtk-rot-ctrl.c:848
#, c-format
msgid "%s: Controller does not have a valid configuration"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1292 ../src/gtk-rot-ctrl.c:809
+#: ../src/gtk-rig-ctrl.c:1323 ../src/gtk-rot-ctrl.c:878
#, c-format
msgid "%s missed the deadline"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1327
+#: ../src/gtk-rig-ctrl.c:1358
#, c-format
msgid "%s: Invalid radio type %d. Setting type to RIG_TYPE_RX"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1341 ../src/gtk-rot-ctrl.c:896
+#: ../src/gtk-rig-ctrl.c:1372 ../src/gtk-rot-ctrl.c:978
#, c-format
msgid "%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1938 ../src/gtk-rig-ctrl.c:2459
-#: ../src/gtk-rig-ctrl.c:2579 ../src/gtk-rot-ctrl.c:965
-#: ../src/gtk-rot-ctrl.c:1086
+#: ../src/gtk-rig-ctrl.c:2165 ../src/gtk-rot-ctrl.c:1034
#, c-format
-msgid "%s:%d: Failed to create socket"
+msgid "%s:%d: NULL storage."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1944 ../src/gtk-rig-ctrl.c:2465
-#: ../src/gtk-rig-ctrl.c:2585 ../src/gtk-rot-ctrl.c:971
-#: ../src/gtk-rot-ctrl.c:1092
+#: ../src/gtk-rig-ctrl.c:2220
#, c-format
-msgid "%s:%d Network socket created successfully"
+msgid "%s: Invalid VFO argument. Using VFOA."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1958 ../src/gtk-rig-ctrl.c:2479
-#: ../src/gtk-rig-ctrl.c:2599 ../src/gtk-rot-ctrl.c:985
-#: ../src/gtk-rot-ctrl.c:1106
+#: ../src/gtk-rig-ctrl.c:2254
#, c-format
-msgid "%s:%d: Failed to connect to %s:%d"
+msgid "AOS in"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1964 ../src/gtk-rig-ctrl.c:2485
-#: ../src/gtk-rig-ctrl.c:2605 ../src/gtk-rot-ctrl.c:991
-#: ../src/gtk-rot-ctrl.c:1112
+#: ../src/gtk-rig-ctrl.c:2258
#, c-format
-msgid "%s:%d: Connection opened to %s:%d"
+msgid "LOS in"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1982 ../src/gtk-rig-ctrl.c:2496
-#: ../src/gtk-rig-ctrl.c:2616 ../src/gtk-rot-ctrl.c:1002
-#: ../src/gtk-rot-ctrl.c:1125
+#: ../src/gtk-rig-ctrl.c:2341
#, c-format
-msgid "%s:%d: SIZE ERROR %d / %d"
+msgid "%s:%s: GtkSatModule has no target satellite."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:1992 ../src/gtk-rig-ctrl.c:2506
-#: ../src/gtk-rig-ctrl.c:2626 ../src/gtk-rot-ctrl.c:1012
+#: ../src/gtk-rig-ctrl.c:2353
#, c-format
-msgid "%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"
+msgid "%s:%s: Satellite %d has %d transponder modes."
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2008 ../src/gtk-rig-ctrl.c:2522
-#: ../src/gtk-rig-ctrl.c:2642
+#: ../src/gtk-rig-ctrl.c:2364
#, c-format
-msgid "%s:%s: Got 0 bytes from rigctld"
+msgid "%s:&s: Read transponder '%s' for satellite %d"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2013 ../src/gtk-rig-ctrl.c:2527
-#: ../src/gtk-rig-ctrl.c:2647
+#: ../src/gtk-rig-ctrl.c:2501
#, c-format
-msgid "%s:%s: Read %d bytes from rigctld"
+msgid "%s:%d: Error reading radio configuration %s"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2058 ../src/gtk-rig-ctrl.c:2143
-#: ../src/gtk-rig-ctrl.c:2223 ../src/gtk-rig-ctrl.c:2298
-#: ../src/gtk-rig-ctrl.c:2373 ../src/gtk-rig-ctrl.c:2690
-#: ../src/gtk-rig-ctrl.c:3068
+#: ../src/gtk-rig-ctrl.c:2527
#, c-format
-msgid "%s: Failed to create socket"
+msgid "%s:%s: sending %d bytes to rigctld as \"%s\""
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2064 ../src/gtk-rig-ctrl.c:2149
-#: ../src/gtk-rig-ctrl.c:2229 ../src/gtk-rig-ctrl.c:2304
-#: ../src/gtk-rig-ctrl.c:2379 ../src/gtk-rig-ctrl.c:2696
-#: ../src/gtk-rig-ctrl.c:3074
+#: ../src/gtk-rig-ctrl.c:2533 ../src/gtk-rot-ctrl.c:1318
#, c-format
-msgid "%s: Network socket created successfully"
-msgstr ""
-
-#: ../src/gtk-rig-ctrl.c:2078 ../src/gtk-rig-ctrl.c:2163
-#: ../src/gtk-rig-ctrl.c:2243 ../src/gtk-rig-ctrl.c:2318
-#: ../src/gtk-rig-ctrl.c:2393 ../src/gtk-rig-ctrl.c:2710
-#: ../src/gtk-rig-ctrl.c:3088
-#, c-format
-msgid "%s: Failed to connect to %s:%d"
-msgstr ""
-
-#: ../src/gtk-rig-ctrl.c:2084 ../src/gtk-rig-ctrl.c:2169
-#: ../src/gtk-rig-ctrl.c:2249 ../src/gtk-rig-ctrl.c:2324
-#: ../src/gtk-rig-ctrl.c:2399 ../src/gtk-rig-ctrl.c:2716
-#: ../src/gtk-rig-ctrl.c:3094
-#, c-format
-msgid "%s: Connection opened to %s:%d"
-msgstr ""
-
-#: ../src/gtk-rig-ctrl.c:2100 ../src/gtk-rig-ctrl.c:2180
-#: ../src/gtk-rig-ctrl.c:2260 ../src/gtk-rig-ctrl.c:2335
-#: ../src/gtk-rig-ctrl.c:2410 ../src/gtk-rig-ctrl.c:2755
-#: ../src/gtk-rig-ctrl.c:3102
-#, c-format
msgid "%s: SIZE ERROR %d / %d"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2450 ../src/gtk-rig-ctrl.c:2570
-#: ../src/gtk-rot-ctrl.c:956
+#: ../src/gtk-rig-ctrl.c:2538 ../src/gtk-rig-ctrl.c:2546
#, c-format
-msgid "%s:%d: NULL storage."
+msgid "%s: rigctld port closed"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2744
+#: ../src/gtk-rig-ctrl.c:2554
#, c-format
-msgid "%s: Invalid VFO argument. Using VFOA."
+msgid "%s:%s: Got 0 bytes from rigctld"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2794
+#: ../src/gtk-rig-ctrl.c:2559
#, c-format
-msgid "AOS in"
+msgid "%s:%s: Read %d bytes from rigctld"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2798
+#: ../src/gtk-rig-ctrl.c:2592
#, c-format
-msgid "LOS in"
+msgid "%s: Detected SPACEBAR pressed event"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2881
+#: ../src/gtk-rig-ctrl.c:2603
#, c-format
-msgid "%s:%s: GtkSatModule has no target satellite."
+msgid "%s:%s: Keypress value %i not managed by this function"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2893
+#: ../src/gtk-rig-ctrl.c:2649
#, c-format
-msgid "%s:%s: Satellite %d has %d transponder modes."
+msgid "%s: Acquired controller lock"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:2904
+#: ../src/gtk-rig-ctrl.c:2654
#, c-format
-msgid "%s:&s: Read transponder '%s' for satellite %d"
+msgid ""
+"%s: Controller not engaged; PTT event ignored (Hint: Enable the Engage "
+"button)"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3039
+#: ../src/gtk-rig-ctrl.c:2664
#, c-format
-msgid "%s:%d: Error reading radio configuration %s"
+msgid "%s: PTT is OFF => Set TX freq and PTT=ON"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3143
+#: ../src/gtk-rig-ctrl.c:2673
#, c-format
-msgid "%s: Detected SPACEBAR pressed event"
+msgid "%s: PTT is ON = Set PTT=OFF"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3154
+#: ../src/gtk-rig-ctrl.c:2685
#, c-format
-msgid "%s:%s: Keypress value %i not managed by this function"
+msgid "%s: Failed to acquire controller lock; PTT event not handled"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3200
+#: ../src/gtk-rig-ctrl.c:2700 ../src/gtk-rot-ctrl.c:1243
#, c-format
-msgid "%s: Acquired controller lock"
+msgid "%s: Failed to create socket"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3205
+#: ../src/gtk-rig-ctrl.c:2707 ../src/gtk-rot-ctrl.c:1250
#, c-format
-msgid ""
-"%s: Controller not engaged; PTT event ignored (Hint: Enable the Engage "
-"button)"
+msgid "%s: Network socket created successfully"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3215
+#: ../src/gtk-rig-ctrl.c:2721 ../src/gtk-rot-ctrl.c:1264
#, c-format
-msgid "%s: PTT is OFF => Set TX freq and PTT=ON"
+msgid "%s: Failed to connect to %s:%d"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3224
+#: ../src/gtk-rig-ctrl.c:2728 ../src/gtk-rot-ctrl.c:1271
#, c-format
-msgid "%s: PTT is ON = Set PTT=OFF"
+msgid "%s: Connection opened to %s:%d"
msgstr ""
-#: ../src/gtk-rig-ctrl.c:3236
+#: ../src/gtk-rig-ctrl.c:2766 ../src/gtk-rig-ctrl.c:2778
#, c-format
-msgid "%s: Failed to acquire controller lock; PTT event not handled"
+msgid "%s: %s rigctld returned error (%s)"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:333 ../src/gtk-sat-list.c:86
+#: ../src/gtk-rot-ctrl.c:379 ../src/gtk-sat-list.c:86
#: ../src/gtk-single-sat.c:56 ../src/sat-pass-dialogs.c:126
msgid "Azimuth"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:345
+#: ../src/gtk-rot-ctrl.c:391
msgid "Read:"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:372 ../src/gtk-sat-list.c:87
+#: ../src/gtk-rot-ctrl.c:418 ../src/gtk-sat-list.c:87
#: ../src/gtk-single-sat.c:57 ../src/sat-pass-dialogs.c:127
msgid "Elevation"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:384
+#: ../src/gtk-rot-ctrl.c:430
msgid "Read: "
msgstr ""
-#: ../src/gtk-rot-ctrl.c:431
+#: ../src/gtk-rot-ctrl.c:477
msgid "Track the satellite when it is within range"
msgstr ""
#. count down
-#: ../src/gtk-rot-ctrl.c:455
+#: ../src/gtk-rot-ctrl.c:501
msgid "ΔT:"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:489
+#: ../src/gtk-rot-ctrl.c:535
msgid "Device:"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:494
+#: ../src/gtk-rot-ctrl.c:540
msgid "Select antenna rotator device"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:528
+#: ../src/gtk-rot-ctrl.c:586
msgid "Engage the selected rotor device"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:540
+#: ../src/gtk-rot-ctrl.c:598
msgid ""
"This parameter controls the delay between commands sent to the rotator."
msgstr ""
#. Tolerance
-#: ../src/gtk-rot-ctrl.c:552
+#: ../src/gtk-rot-ctrl.c:610
msgid "Tolerance:"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:559
+#: ../src/gtk-rot-ctrl.c:617
msgid ""
"This parameter controls the tolerance between the target and rotator values "
"for the rotator.\n"
@@ -879,41 +846,56 @@
"tolerance, no new commands are sent"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:569
+#: ../src/gtk-rot-ctrl.c:627
msgid "deg"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:730
+#: ../src/gtk-rot-ctrl.c:792
#, c-format
msgid "%s:%d: Failed to allocate memory for rotator config"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:739
+#: ../src/gtk-rot-ctrl.c:801
#, c-format
msgid "Loaded new rotator configuration %s"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:748
+#: ../src/gtk-rot-ctrl.c:813
#, c-format
msgid "%s:%d: Failed to load rotator configuration %s"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:867 ../src/gtk-rot-ctrl.c:868
-#: ../src/gtk-sat-module-popup.c:833 ../src/gtk-sat-module-popup.c:904
+#: ../src/gtk-rot-ctrl.c:948 ../src/gtk-rot-ctrl.c:949
+#: ../src/gtk-sat-module-popup.c:848 ../src/gtk-sat-module-popup.c:919
#: ../src/qth-data.c:95 ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:740
msgid "ERROR"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:1028
+#: ../src/gtk-rot-ctrl.c:1049
#, c-format
-msgid "%s:%s: Got 0 bytes from rotctld"
+msgid "%s:%d: rotctld returned error (%s)"
msgstr ""
-#: ../src/gtk-rot-ctrl.c:1033
+#: ../src/gtk-rot-ctrl.c:1059
#, c-format
-msgid "%s:%s: Read %d bytes from rotctld"
+msgid "%s:%d: rotctld returned bad response (%s)"
msgstr ""
+#: ../src/gtk-rot-ctrl.c:1113
+#, c-format
+msgid "%s:%d: rotctld returned error %d (%s)"
+msgstr ""
+
+#: ../src/gtk-rot-ctrl.c:1323 ../src/gtk-rot-ctrl.c:1333
+#, c-format
+msgid "%s: rotctld Socket Down"
+msgstr ""
+
+#: ../src/gtk-rot-ctrl.c:1341
+#, c-format
+msgid "%s:%s: Got 0 bytes from rotctld"
+msgstr ""
+
#: ../src/gtk-sat-data.c:85
#, c-format
msgid "%s: Error reading NAME from %s (%s)"
@@ -933,7 +915,7 @@
msgid "Satellite"
msgstr ""
-#: ../src/gtk-sat-list.c:55 ../src/gtk-sat-selector.c:278
+#: ../src/gtk-sat-list.c:55 ../src/gtk-sat-selector.c:274
#: ../src/gtk-sat-tree.c:222 ../src/mod-cfg.c:622
msgid "Catnum"
msgstr ""
@@ -1281,222 +1263,227 @@
msgid "Set Target"
msgstr ""
-#: ../src/gtk-sat-module.c:258
+#: ../src/gtk-sat-module.c:271
#, c-format
msgid "%s: Module %s is not valid."
msgstr ""
-#: ../src/gtk-sat-module.c:276
+#: ../src/gtk-sat-module.c:289
#, c-format
msgid "%s: Module %s has problems."
msgstr ""
-#: ../src/gtk-sat-module.c:310
+#: ../src/gtk-sat-module.c:323
msgid "Module options / shortcuts"
msgstr ""
-#: ../src/gtk-sat-module.c:316
+#: ../src/gtk-sat-module.c:329
msgid "Close this module."
msgstr ""
-#: ../src/gtk-sat-module.c:385
+#: ../src/gtk-sat-module.c:398
#, c-format
msgid "%s: Layout has %d columns and %d rows."
msgstr ""
-#: ../src/gtk-sat-module.c:457
+#: ../src/gtk-sat-module.c:470
#, c-format
msgid "%s:%d: Invalid child type (%d). Using GtkSatList."
msgstr ""
-#: ../src/gtk-sat-module.c:498
+#: ../src/gtk-sat-module.c:511
#, c-format
msgid "%s: Could not load config data from %s (%s)."
msgstr ""
-#: ../src/gtk-sat-module.c:508
+#: ../src/gtk-sat-module.c:521
#, c-format
msgid "%s: Reading configuration from %s"
msgstr ""
-#: ../src/gtk-sat-module.c:550
+#: ../src/gtk-sat-module.c:563
#, c-format
msgid "%s: Can not load default QTH file %s; using built-in defaults"
msgstr ""
#. settings are really screwed up; we need some safe values here
-#: ../src/gtk-sat-module.c:554 ../src/gtk-sat-module.c:555
+#: ../src/gtk-sat-module.c:567 ../src/gtk-sat-module.c:568
msgid "Error"
msgstr ""
-#: ../src/gtk-sat-module.c:585
+#: ../src/gtk-sat-module.c:598
#, c-format
msgid "%s: Module layout is invalid: %s. Using default."
msgstr ""
-#: ../src/gtk-sat-module.c:597
+#: ../src/gtk-sat-module.c:610
#, c-format
msgid "%s: GRID(%d): %s"
msgstr ""
-#: ../src/gtk-sat-module.c:642 ../src/mod-cfg.c:673
+#: ../src/gtk-sat-module.c:655 ../src/mod-cfg.c:673
#, c-format
msgid "%s: Failed to get list of satellites (%s)"
msgstr ""
-#: ../src/gtk-sat-module.c:664
+#: ../src/gtk-sat-module.c:677
#, c-format
msgid "%s: Error reading data for #%d"
msgstr ""
-#: ../src/gtk-sat-module.c:688
+#: ../src/gtk-sat-module.c:701
#, c-format
msgid "%s: Read data for #%d"
msgstr ""
-#: ../src/gtk-sat-module.c:695
+#: ../src/gtk-sat-module.c:708
#, c-format
msgid "%s: Sat #%d already in list"
msgstr ""
-#: ../src/gtk-sat-module.c:706
+#: ../src/gtk-sat-module.c:719
#, c-format
msgid "%s: Read %d out of %d satellites"
msgstr ""
-#: ../src/gtk-sat-module.c:767
+#: ../src/gtk-sat-module.c:780
#, c-format
msgid "%s: Previous cycle missed it's deadline."
msgstr ""
-#: ../src/gtk-sat-module.c:883 ../src/gtk-sat-module.c:1416
+#: ../src/gtk-sat-module.c:912 ../src/gtk-sat-module.c:1445
#, c-format
msgid "%f:%d: Unknown child type"
msgstr ""
-#: ../src/gtk-sat-module.c:1035
+#: ../src/gtk-sat-module.c:1064
#, c-format
msgid "%s: Module %s recevied CLOSE signal."
msgstr ""
-#: ../src/gtk-sat-module.c:1045
+#: ../src/gtk-sat-module.c:1074
#, c-format
msgid "%s: Module %s is in DOCKED state."
msgstr ""
-#: ../src/gtk-sat-module.c:1052 ../src/gtk-sat-module.c:1068
-#: ../src/gtk-sat-module.c:1096
+#: ../src/gtk-sat-module.c:1081 ../src/gtk-sat-module.c:1097
+#: ../src/gtk-sat-module.c:1125
#, c-format
msgid ""
"%s: Module %s was not found in mod-mgr (%d)\n"
"Internal state is corrupt?"
msgstr ""
-#: ../src/gtk-sat-module.c:1061
+#: ../src/gtk-sat-module.c:1090
#, c-format
msgid "%s: Module %s is in WINDOW state."
msgstr ""
-#: ../src/gtk-sat-module.c:1089
+#: ../src/gtk-sat-module.c:1118
#, c-format
msgid "%s: Module %s is in FULLSCREEN state."
msgstr ""
-#: ../src/gtk-sat-module.c:1118 ../src/gtk-sat-module.c:1277
+#: ../src/gtk-sat-module.c:1147 ../src/gtk-sat-module.c:1306
#, c-format
msgid "%s: Module %s has unknown state: %d"
msgstr ""
-#: ../src/gtk-sat-module.c:1127
+#: ../src/gtk-sat-module.c:1156
#, c-format
msgid "%s: Module %s closed."
msgstr ""
-#: ../src/gtk-sat-module.c:1167
+#: ../src/gtk-sat-module.c:1196
#, c-format
msgid "%s: Module %s recevied CONFIG signal."
msgstr ""
-#: ../src/gtk-sat-module.c:1176
+#: ../src/gtk-sat-module.c:1205
#, c-format
msgid ""
"%s: Could not stop timeout callback\n"
"%s: Source ID %d seems invalid."
msgstr ""
-#: ../src/gtk-sat-module.c:1194
+#: ../src/gtk-sat-module.c:1223
#, c-format
msgid "%s: Module configuration failed for some reason."
msgstr ""
-#: ../src/gtk-sat-module.c:1367
+#: ../src/gtk-sat-module.c:1396
#, c-format
msgid "%s: Reloading satellites for module %s"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:89
+#: ../src/gtk-sat-module.c:1509
#, c-format
+msgid "%s: Updating GtkSkyGlance for %s"
+msgstr ""
+
+#: ../src/gtk-sat-module-popup.c:90
+#, c-format
msgid "%s:%d: %s called with NULL parameter!"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:99
+#: ../src/gtk-sat-module-popup.c:100
msgid "Detach module"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:110
+#: ../src/gtk-sat-module-popup.c:111
msgid "Attach module"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:123
+#: ../src/gtk-sat-module-popup.c:124
msgid "Exit full screen"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:132
+#: ../src/gtk-sat-module-popup.c:133
msgid "Full screen"
msgstr ""
#. sky at a glance
-#: ../src/gtk-sat-module-popup.c:146
+#: ../src/gtk-sat-module-popup.c:147
msgid "Sky at a glance"
msgstr ""
#. time manager
-#: ../src/gtk-sat-module-popup.c:156 ../src/gtk-sat-module-tmg.c:289
+#: ../src/gtk-sat-module-popup.c:157 ../src/gtk-sat-module-tmg.c:289
msgid "Time Controller"
msgstr ""
#. Radio Control
-#: ../src/gtk-sat-module-popup.c:169
+#: ../src/gtk-sat-module-popup.c:170
msgid "Radio Control"
msgstr ""
#. Antenna Control
-#: ../src/gtk-sat-module-popup.c:178
+#: ../src/gtk-sat-module-popup.c:179
msgid "Antenna Control"
msgstr ""
#. configure
-#: ../src/gtk-sat-module-popup.c:191
+#: ../src/gtk-sat-module-popup.c:192
msgid "Configure"
msgstr ""
#. clone
-#: ../src/gtk-sat-module-popup.c:200
+#: ../src/gtk-sat-module-popup.c:201
msgid "Clone..."
msgstr ""
#. delete module
-#: ../src/gtk-sat-module-popup.c:213 ../src/sat-pref-qth.c:496
+#: ../src/gtk-sat-module-popup.c:214 ../src/sat-pref-qth.c:496
#: ../src/sat-pref-rig.c:344 ../src/sat-pref-rot.c:309
msgid "Delete"
msgstr ""
#. close
-#: ../src/gtk-sat-module-popup.c:222
+#: ../src/gtk-sat-module-popup.c:223
msgid "Close"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:255
+#: ../src/gtk-sat-module-popup.c:256
msgid ""
"A module can not be configured while the radio or rotator controller is "
"active.\n"
@@ -1506,94 +1493,94 @@
#. icon file name
#. window title
-#: ../src/gtk-sat-module-popup.c:295
+#: ../src/gtk-sat-module-popup.c:296
msgid "Clone Module"
msgstr ""
#. label
-#: ../src/gtk-sat-module-popup.c:307
+#: ../src/gtk-sat-module-popup.c:308
msgid "Name of new module:"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:316 ../src/mod-cfg.c:501
+#: ../src/gtk-sat-module-popup.c:317 ../src/mod-cfg.c:501
msgid ""
"Enter a short name for this module.\n"
"Allowed characters: 0..9, a..z, A..Z, - and _"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:318 ../src/mod-cfg.c:503
+#: ../src/gtk-sat-module-popup.c:319 ../src/mod-cfg.c:503
msgid ""
"The name will be used to identify the module and it is also used a file name "
"for saving the data.Max length is 25 characters."
msgstr ""
#. check button
-#: ../src/gtk-sat-module-popup.c:335
+#: ../src/gtk-sat-module-popup.c:336
msgid "Open module when created"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:339
+#: ../src/gtk-sat-module-popup.c:340
msgid "If checked, the new module will be opened after it has been created"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:355
+#: ../src/gtk-sat-module-popup.c:356
#, c-format
msgid "%s:%d: Cloning %s => %s"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:370
+#: ../src/gtk-sat-module-popup.c:371
#, c-format
msgid "%s:%d: Failed to clone %s."
msgstr ""
-#: ../src/gtk-sat-module-popup.c:375
+#: ../src/gtk-sat-module-popup.c:376
#, c-format
msgid "%s:%d: Successfully cloned %s."
msgstr ""
-#: ../src/gtk-sat-module-popup.c:439
+#: ../src/gtk-sat-module-popup.c:440
#, c-format
msgid "%s:%d: Cloning cancelled by user."
msgstr ""
-#: ../src/gtk-sat-module-popup.c:445
+#: ../src/gtk-sat-module-popup.c:446
#, c-format
msgid "%s:%d: Cloning interrupted."
msgstr ""
-#: ../src/gtk-sat-module-popup.c:620 ../src/gtk-sat-module-popup.c:741
+#: ../src/gtk-sat-module-popup.c:621 ../src/gtk-sat-module-popup.c:742
#, c-format
msgid "%s:%d: Unknown module state: %d"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:766
+#: ../src/gtk-sat-module-popup.c:780
#, c-format
msgid "The sky at a glance (%s)"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:828
+#: ../src/gtk-sat-module-popup.c:843
msgid ""
"You have no radio configuration!\n"
"Please configure a radio first."
msgstr ""
-#: ../src/gtk-sat-module-popup.c:841
+#: ../src/gtk-sat-module-popup.c:856
#, c-format
msgid "Gpredict Radio Control: %s"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:899
+#: ../src/gtk-sat-module-popup.c:914
msgid ""
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
msgstr ""
-#: ../src/gtk-sat-module-popup.c:912
+#: ../src/gtk-sat-module-popup.c:927
#, c-format
msgid "Gpredict Rotator Control: %s"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:993
+#: ../src/gtk-sat-module-popup.c:1024
#, c-format
msgid ""
"This operation will permanently delete\n"
@@ -1602,12 +1589,12 @@
"Do you you want to proceed?"
msgstr ""
-#: ../src/gtk-sat-module-popup.c:1003
+#: ../src/gtk-sat-module-popup.c:1034
#, c-format
msgid "%s:%d: Failed to delete %s."
msgstr ""
-#: ../src/gtk-sat-module-popup.c:1008
+#: ../src/gtk-sat-module-popup.c:1039
#, c-format
msgid "%s:%d: %s deleted permanently."
msgstr ""
@@ -1723,68 +1710,68 @@
msgid "<b>Manual Control</b>"
msgstr ""
-#: ../src/gtk-sat-selector.c:237
+#: ../src/gtk-sat-selector.c:233
msgid "Select a satellite group or category to narrow your search."
msgstr ""
-#: ../src/gtk-sat-selector.c:269
+#: ../src/gtk-sat-selector.c:265
msgid "Available Satellites"
msgstr ""
-#: ../src/gtk-sat-selector.c:287
+#: ../src/gtk-sat-selector.c:283
msgid "Updated"
msgstr ""
#. Search
-#: ../src/gtk-sat-selector.c:317
+#: ../src/gtk-sat-selector.c:313
msgid "Search"
msgstr ""
-#: ../src/gtk-sat-selector.c:321
+#: ../src/gtk-sat-selector.c:317
msgid ""
"Start typing in this field to search for a satellite in the selected group."
msgstr ""
#. Group selector
-#: ../src/gtk-sat-selector.c:335
+#: ../src/gtk-sat-selector.c:331
msgid "Group"
msgstr ""
-#: ../src/gtk-sat-selector.c:399
+#: ../src/gtk-sat-selector.c:395
msgid "All satellites"
msgstr ""
-#: ../src/gtk-sat-selector.c:406
+#: ../src/gtk-sat-selector.c:402
#, c-format
msgid "%s:%s: Failed to open satdata directory %s."
msgstr ""
-#: ../src/gtk-sat-selector.c:447
+#: ../src/gtk-sat-selector.c:443
#, c-format
msgid "%s:%s: Read %d satellites into MAIN group."
msgstr ""
-#: ../src/gtk-sat-selector.c:494
+#: ../src/gtk-sat-selector.c:490
#, c-format
msgid "%s:%s: Failed to open %s: %s"
msgstr ""
-#: ../src/gtk-sat-selector.c:531 ../src/mod-cfg.c:746
+#: ../src/gtk-sat-selector.c:527 ../src/mod-cfg.c:746
#, c-format
msgid "%s:%s: Error reading satellite %d."
msgstr ""
-#: ../src/gtk-sat-selector.c:550
+#: ../src/gtk-sat-selector.c:546
#, c-format
msgid "%s:%s: Read %d satellites from %s"
msgstr ""
-#: ../src/gtk-sat-selector.c:555
+#: ../src/gtk-sat-selector.c:551
#, c-format
msgid "%s:%s: Failed to read %s"
msgstr ""
-#: ../src/gtk-sat-selector.c:807
+#: ../src/gtk-sat-selector.c:803
#, c-format
msgid "%s: Error getting %dth satellite"
msgstr ""
@@ -2002,40 +1989,40 @@
msgstr ""
#. no satellites
-#: ../src/gtk-sky-glance.c:249
+#: ../src/gtk-sky-glance.c:258
msgid "This module has no satellites!"
msgstr ""
-#: ../src/gtk-sky-glance.c:355
+#: ../src/gtk-sky-glance.c:367
msgid "TIME"
msgstr ""
-#: ../src/gtk-sky-glance.c:729 ../src/gtk-sky-glance.c:790
+#: ../src/gtk-sky-glance.c:741 ../src/gtk-sky-glance.c:802
#, c-format
msgid "%s::%s: Button %d has no function..."
msgstr ""
-#: ../src/gtk-sky-glance.c:768 ../src/gtk-sky-glance.c:821
+#: ../src/gtk-sky-glance.c:780 ../src/gtk-sky-glance.c:833
#, c-format
msgid "%s::%s: Could not retrieve pass_t object"
msgstr ""
-#: ../src/gtk-sky-glance.c:780
+#: ../src/gtk-sky-glance.c:792
#, c-format
msgid "%s::%s: Showing pass details for %s - we may have a memory leak here"
msgstr ""
-#: ../src/gtk-sky-glance.c:946
+#: ../src/gtk-sky-glance.c:958
#, c-format
msgid "%s:%d: Colour index out of valid range (%d)"
msgstr ""
-#: ../src/gtk-sky-glance.c:1010
+#: ../src/gtk-sky-glance.c:1022
#, c-format
msgid "%s:%d: %s has %d passes within %.4f days\n"
msgstr ""
-#: ../src/gtk-sky-glance.c:1066
+#: ../src/gtk-sky-glance.c:1078
#, c-format
msgid "%s:%d: Could not allocate memory for pass object"
msgstr ""
@@ -2870,7 +2857,7 @@
"LAT:%.2f LON:%.2f\n"
msgstr ""
-#: ../src/predict-tools.c:659
+#: ../src/predict-tools.c:664
#, c-format
msgid "%s: Found %d passes for %s in time window [%f;%f]"
msgstr ""
Added: trunk/po/da.po
===================================================================
--- trunk/po/da.po (rev 0)
+++ trunk/po/da.po 2011-03-01 15:37:36 UTC (rev 776)
@@ -0,0 +1,5433 @@
+# Danish translation for gpredict
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the gpredict package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gpredict\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-11-26 03:42+0000\n"
+"PO-Revision-Date: 2010-11-21 22:32+0000\n"
+"Last-Translator: Alex Csete <oz...@gm...>\n"
+"Language-Team: Danish <da...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-01 15:24+0000\n"
+"X-Generator: Launchpad (build 12460)\n"
+
+#: ../src/about.c:65
+msgid ""
+"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC and contributors.\n"
+"Contact: oz9aec at googlemail.com\n"
+"\n"
+"Gpredict is free software; you can redistribute it and mofdify 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.\n"
+"\n"
+"This program is distributed free of charge 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 Library "
+"General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program (see Help->License). Otherwise you can find a copy on the FSF "
+"website http://www.fsf.org/licensing/licenses/gpl.html or you can write to "
+"the\n"
+"\n"
+"Free Software Foundation, Inc.\n"
+"59 Temple Place - Suite 330\n"
+"Boston\n"
+"MA 02111-1307\n"
+"USA.\n"
+msgstr ""
+
+#. window title
+#. icon file name
+#. create window title and file name for window icon
+#: ../src/about.c:97 ../src/main.c:249 ../src/sat-log-browser.c:462
+#: ../src/sat-log.c:58
+msgid "GPREDICT"
+msgstr "GPREDICT"
+
+#: ../src/about.c:100
+msgid ""
+"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
+"\n"
+"Gpredict is available free of charge from:"
+msgstr ""
+"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
+"\n"
+"Gpredict kan hentes gratis fra:"
+
+#: ../src/about.c:117
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Alex Csete https://launchpad.net/~alexc"
+
+#: ../src/first-time.c:190 ../src/first-time.c:837
+#, c-format
+msgid "%s: Could not open %s."
+msgstr "%s: Kunne ikke åbne %s."
+
+#: ../src/first-time.c:214
+#, c-format
+msgid "%s: Found at least one .qth file."
+msgstr "%s: Fandt mindst en .qth fil."
+
+#: ../src/first-time.c:256
+#, c-format
+msgid "%s: Failed to copy sample.qth"
+msgstr "%s: Kunne ikke kopiere sample.qth"
+
+#: ../src/first-time.c:263
+#, c-format
+msgid "%s: Copied sample.qth to %s/"
+msgstr "%s: sample.qth kopieret til %s/"
+
+#: ../src/first-time.c:304 ../src/first-time.c:409 ../src/first-time.c:659
+#: ../src/first-time.c:710 ../src/first-time.c:786
+#, c-format
+msgid "%s: Check successful."
+msgstr "%s: Check successfuld."
+
+#: ../src/first-time.c:310 ../src/first-time.c:414 ../src/first-time.c:664
+#: ../src/first-time.c:716 ../src/first-time.c:791
+#, c-format
+msgid "%s: Check failed. Creating %s"
+msgstr "%s: Check mislykkedes. Opretter %s"
+
+#: ../src/first-time.c:321 ../src/first-time.c:423 ../src/first-time.c:673
+#: ../src/first-time.c:727 ../src/first-time.c:800
+#, c-format
+msgid "%s: Failed to create %s"
+msgstr "%s: Kunne ikke oprette %s"
+
+#: ../src/first-time.c:326 ../src/first-time.c:428 ../src/first-time.c:678
+#: ../src/first-time.c:732 ../src/first-time.c:805
+#, c-format
+msgid "%s: Created %s."
+msgstr "%s: Oprettede %s."
+
+#: ../src/first-time.c:370
+#, c-format
+msgid "%s: Failed to copy Amateur.mod"
+msgstr "%s: Kunne ikke kopiere Amateur.mod"
+
+#: ../src/first-time.c:377
+#, c-format
+msgid "%s: Copied amateur.mod to %s/"
+msgstr "%s: amateur.mod kipoeret til %s/"
+
+#: ../src/first-time.c:480 ../src/gtk-sat-data.c:73
+#, c-format
+msgid "%s: Failed to load data from %s (%s)"
+msgstr "%s: Kunne ikke indlæse data fra %s (%s)"
+
+#: ../src/first-time.c:489
+#, c-format
+msgid "%s: Found %d satellites in %s"
+msgstr "%s: Fandt %d satellitter i %s"
+
+#: ../src/first-time.c:497
+#, c-format
+msgid "%s: %s.sat already exists. Skipped."
+msgstr "%s: %s.sat findes allerede."
+
+#: ../src/first-time.c:529 ../src/tle-update.c:406
+#, c-format
+msgid "%s: Could not create satellite file (%s)."
+msgstr "%s: -kunne ikke oprette satellitfil (%s)."
+
+#: ../src/first-time.c:546 ../src/tle-update.c:1036
+#, c-format
+msgid "%s: Error writing satellite data (%s)."
+msgstr "%s: Der opstod en fejl under skrivning af satellit data (%s)."
+
+#: ../src/first-time.c:553 ../src/tle-update.c:1043
+#, c-format
+msgid "%s: Wrote only %d out of %d chars for satellite data."
+msgstr "%s: Skrev kun %d ud af %d tegn for satellit data."
+
+#: ../src/first-time.c:558
+#, c-format
+msgid "%s: Satellite data written for %s."
+msgstr "%s: Satellite data gemt for %s."
+
+#: ../src/first-time.c:577
+#, c-format
+msgid "%s: Written %d new satellite to user config"
+msgstr "%s: Gemt %d nye satellitter under bruger konfiguration"
+
+#: ../src/first-time.c:594
+#, c-format
+msgid "%s: Could not open %s (%s)."
+msgstr "%s: Kunne ikke åbne %s (%s)."
+
+#: ../src/first-time.c:619 ../src/first-time.c:870
+#, c-format
+msgid "%s: Failed to copy %s"
+msgstr "%s: Kunne ikke kopiere %s"
+
+#: ../src/first-time.c:624
+#, c-format
+msgid "%s: Successfully copied %s"
+msgstr ""
+
+#: ../src/first-time.c:863
+#, c-format
+msgid "%s: %s does not appear to be in user conf dir; adding."
+msgstr ""
+"%s: %s lader ikke til at være i brugerens konfigurationsfolder; tilføjer."
+
+#: ../src/first-time.c:879
+#, c-format
+msgid "%s: %s already in user conf dir."
+msgstr "%s: %s findes allerede i konfigurationsforlder."
+
+#: ../src/first-time.c:889
+#, c-format
+msgid "%s: %s directory does not exist. Incomplete installation."
+msgstr "%s: %s folder findes ikke. Mangelfuld installation."
+
+#: ../src/gpredict-help.c:66
+#, c-format
+msgid "%s: Help browser is not set up yet."
+msgstr "%s: Hjælp funktion er endnu ikke konfigureret."
+
+#: ../src/gpredict-help.c:73
+#, c-format
+msgid "%s: Configure help browser cancelled."
+msgstr "%s: Konfiguration af hjælp funktion er afbrudt."
+
+#: ../src/gpredict-help.c:89
+#, c-format
+msgid "%s: Launching help browser %s."
+msgstr "%s: Starter hjælp funktion %s."
+
+#: ../src/gpredict-help.c:114
+msgid "Configure Help Browser"
+msgstr "Konfigurer hjælp funktion"
+
+#: ../src/gpredict-help.c:124
+msgid "Please select a HTML browser to be used to view the help."
+msgstr "Vælg en HTML browser."
+
+#: ../src/gpredict-help.c:191
+#, c-format
+msgid "%s: Failed to load %s (%s)"
+msgstr "%s: Kunne ikke indlæse %s (%s)"
+
+#: ../src/gpredict-help.c:202
+#, c-format
+msgid "%s: Error reading %s (%s)"
+msgstr "%s: Fejl under indlæsning af %s (%s)"
+
+#. create and show dialogue with textbuffer
+#: ../src/gpredict-help.c:234
+msgid "Gpredict Info"
+msgstr "Gpredict Info"
+
+#: ../src/gpredict-utils.c:293 ../src/gpredict-utils.c:332
+#: ../src/gpredict-utils.c:379 ../src/gpredict-utils.c:421
+#, c-format
+msgid "%s:%s: %s called with color = NULL"
+msgstr "%s:%s: %s kaldt med color = NULL"
+
+#: ../src/gpredict-utils.c:338
+#, c-format
+msgid "%s:%s: %s called with alpha = NULL"
+msgstr "%s:%s: %s kaldt med alpha = NULL"
+
+#: ../src/gpredict-utils.c:385
+#, c-format
+msgid "%s:%s: %s called with rgb = NULL"
+msgstr "%s:%s: %s kaldt med rgb = NULL"
+
+#: ../src/gpredict-utils.c:427
+#, c-format
+msgid "%s:%s: %s called with rgba = NULL"
+msgstr "%s:%s: %skaldt med rgba = NULL"
+
+#: ../src/gtk-azel-plot.c:373
+msgid "Local Time"
+msgstr "Lokaltid"
+
+#: ../src/gtk-azel-plot.c:383 ../src/gtk-sky-glance.c:374
+#: ../src/pass-to-txt.c:158
+msgid "UTC"
+msgstr "UTC"
+
+#. Az legend
+#: ../src/gtk-azel-plot.c:404 ../src/gtk-sat-list.c:56
+#: ../src/sat-pass-dialogs.c:102
+msgid "Az"
+msgstr "Az"
+
+#. El legend
+#: ../src/gtk-azel-plot.c:414 ../src/gtk-sat-list.c:57
+#: ../src/sat-pass-dialogs.c:103
+msgid "El"
+msgstr "El"
+
+#: ../src/gtk-polar-plot.c:616 ../src/gtk-polar-view.c:343
+msgid "N"
+msgstr "N"
+
+#: ../src/gtk-polar-plot.c:627 ../src/gtk-polar-view.c:354
+msgid "S"
+msgstr "S"
+
+#: ../src/gtk-polar-plot.c:638 ../src/gtk-polar-view.c:365
+msgid "E"
+msgstr "Ø"
+
+#: ../src/gtk-polar-plot.c:649 ../src/gtk-polar-view.c:376
+msgid "W"
+msgstr "V"
+
+#: ../src/gtk-polar-plot.c:752
+#, c-format
+msgid "%s:%d: Incorrect polar plot orientation."
+msgstr "%s:%d: Ukorrektorientering af den polære graf."
+
+#: ../src/gtk-polar-view.c:744
+#, c-format
+msgid ""
+"Next: %s\n"
+"in %s%d:%s%d%s%d"
+msgstr ""
+"Næste: %s\n"
+"om %s%d:%s%d%s%d"
+
+#: ../src/gtk-polar-view.c:747
+#, c-format
+msgid ""
+"Next: %s\n"
+"in %s%d%s%d"
+msgstr ""
+"Næste: %s\n"
+"om %s%d%s%d"
+
+#: ../src/gtk-polar-view.c:762 ../src/gtk-sat-map.c:697
+#, c-format
+msgid "%s: Can not find NEXT satellite."
+msgstr "%s: Kan ikke finde næste satellit."
+
+#: ../src/gtk-polar-view.c:765 ../src/gtk-sat-map.c:700
+msgid "Next: ERR"
+msgstr "Næste: FEJL"
+
+#: ../src/gtk-polar-view.c:771 ../src/gtk-sat-map.c:706
+msgid "Next: N/A"
+msgstr "Næste: N/A"
+
+#: ../src/gtk-polar-view.c:883
+#, c-format
+msgid ""
+"%s\n"
+"Always in range"
+msgstr ""
+"%s\n"
+"Altid indenfor rækkevidde"
+
+#: ../src/gtk-polar-view.c:1001 ../src/gtk-polar-view.c:1143
+#, c-format
+msgid "%s:%d: Failed to get satellite pass."
+msgstr "%s:%d: Kunne ikke finde satellitpassage."
+
+#: ../src/gtk-polar-view.c:1010 ../src/gtk-polar-view.c:1156
+#, c-format
+msgid "%s:%d: Pass had no points in it."
+msgstr "%s:%d: Passagen hadve ingen punkter."
+
+#: ../src/gtk-polar-view.c:1136 ../src/gtk-polar-view-popup.c:197
+#: ../src/gtk-polar-view-popup.c:310 ../src/gtk-sat-map-popup.c:195
+#: ../src/gtk-sat-map-popup.c:248 ../src/gtk-sat-map-popup.c:425
+#, c-format
+msgid "%s:%d: Failed to get satellite object."
+msgstr "%s:%d: Kunne ikke finde satellit."
+
+#: ../src/gtk-polar-view.c:1428
+#, c-format
+msgid "%s:%d: Could not find satellite (%d) in hash table"
+msgstr "%s:%d: Kunne ikke finde satellit (%d) in hashtabel"
+
+#: ../src/gtk-polar-view.c:1476 ../src/gtk-sat-map.c:926
+#, c-format
+msgid "%s:%d: Can not find clicked object (%d) in hash table"
+msgstr "%s:%d: Kan ikke finde det valgte objekt (%d) i hashtabel"
+
+#: ../src/gtk-polar-view.c:1652
+#, c-format
+msgid "LOS in %s%d:%s%d%s%d"
+msgstr "LOS om %s%d:%s%d%s%d"
+
+#: ../src/gtk-polar-view.c:1655
+#, c-format
+msgid "LOS in %s%d%s%d"
+msgstr "LOS om %s%d%s%d"
+
+#. next pass and predict passes
+#. Show next pass
+#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97
+#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:836
+msgid "Show next pass"
+msgstr "Vis næste passage"
+
+#. Show future passes
+#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108
+#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:851
+msgid "Future passes"
+msgstr "Kommende passager"
+
+#. show track
+#: ../src/gtk-polar-view-popup.c:134
+msgid "Sky track"
+msgstr "Sky track"
+
+#: ../src/gtk-polar-view-popup.c:215
+#, c-format
+msgid "%s:%d: Pass has no details."
+msgstr "%s:%d: Passage har ingen dtaljer."
+
+#: ../src/gtk-polar-view-popup.c:410 ../src/gtk-polar-view-popup.c:480
+#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246
+#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376
+#: ../src/gtk-single-sat.c:1049 ../src/gtk-single-sat.c:1120
+#, c-format
+msgid ""
+"Satellite %s has no passes\n"
+"within the next %d days"
+msgstr ""
+"Satellitten %s har ingen passager\n"
+"indenfor de næste %d dage"
+
+#: ../src/gtk-polar-view-popup.c:426 ../src/gtk-sat-list-popup.c:192
+#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1065
+#, c-format
+msgid ""
+"Satellite %s has no passes for\n"
+"the current ground station!\n"
+"\n"
+"This can be because the satellite\n"
+"is geostationary, decayed or simply\n"
+"never comes above the horizon"
+msgstr ""
+"Satellitten %s har ingen passager\n"
+"for den aktualle jordstation.\n"
+"\n"
+"Dette kan skyldes, at satellitten\n"
+"er geostationær, faldet ned,\n"
+"eller at den aldrig kommer over\n"
+"horisonten."
+
+#: ../src/gtk-polar-view-popup.c:499 ../src/gtk-sat-list-popup.c:265
+#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1139
+#, c-format
+msgid ""
+"Satellite %s has no passes for\n"
+"the current ground station!"
+msgstr ""
+"Satellitten %s har ingen passager\n"
+"for den aktuelle jordstation!"
+
+#: ../src/gtk-rig-ctrl.c:414
+msgid "<b> Downlink </b>"
+msgstr "<b> Downlink </b>"
+
+#. Downlink doppler
+#. Uplink doppler
+#: ../src/gtk-rig-ctrl.c:429 ../src/gtk-rig-ctrl.c:493
+msgid "Doppler:"
+msgstr "Doppler:"
+
+#: ../src/gtk-rig-ctrl.c:431 ../src/gtk-rig-ctrl.c:495
+msgid ""
+"The Doppler shift according to the range rate and the currently selected "
+"downlink frequency"
+msgstr ""
+"Doppler skift i henhold til satellittens hastighed og den aktuelle dowlink "
+"frekvens"
+
+#: ../src/gtk-rig-ctrl.c:443 ../src/gtk-rig-ctrl.c:507
+msgid "LO:"
+msgstr "LO:"
+
+#: ../src/gtk-rig-ctrl.c:478
+msgid "<b> Uplink </b>"
+msgstr "<b> Uplink </b>"
+
+#: ../src/gtk-rig-ctrl.c:557 ../src/gtk-rot-ctrl.c:471
+msgid "Select target object"
+msgstr "Vælg objekt"
+
+#. tracking button
+#: ../src/gtk-rig-ctrl.c:562 ../src/gtk-rot-ctrl.c:476
+msgid "Track"
+msgstr "Følg"
+
+#: ../src/gtk-rig-ctrl.c:563
+msgid ""
+"Track the satellite transponder.\n"
+"Enabling this button will apply Dopper correction to the frequency of the "
+"radio."
+msgstr ""
+"Følg satellit transponder.\n"
+"Hvis tændt, vil radioens frekvens blive korrigeret for Dopplerskift."
+
+#: ../src/gtk-rig-ctrl.c:571
+msgid "Select a transponder"
+msgstr "Vælg transponder"
+
+#. buttons
+#: ../src/gtk-rig-ctrl.c:578
+msgid "T"
+msgstr "T"
+
+#: ../src/gtk-rig-ctrl.c:580
+msgid ""
+"Tune the radio to this transponder. The uplink and downlink will be set to "
+"the center of the transponder passband. In case of beacons, only the "
+"downlink will be tuned to the beacon frequency."
+msgstr ""
+"Indstil radioen til denne transponder. Uplink of downlink vil blive sat til "
+"transponderens center. I tilfælde af beacons vil kun downlink frekvens blive "
+"indstillet til beaconfrekvensen."
+
+#: ../src/gtk-rig-ctrl.c:586
+msgid "L"
+msgstr "L"
+
+#: ../src/gtk-rig-ctrl.c:588
+msgid ""
+"Lock the uplink and the downlink to each other. Whenever you change the "
+"downlink (in the controller or on the dial, the uplink will track it "
+"according to whether the transponder is inverting or not. Similarly, if you "
+"change the uplink the downlink will track it automatically.\n"
+"\n"
+"If the downlink and uplink are initially out of sync when you enable this "
+"function, the current downlink frequency will be used as baseline for "
+"setting the new uplink frequency."
+msgstr ""
+"Lås uplink og downlink til hinanden. Når du ændrer downlinkfrekvens (i "
+"kontrolleren eller på radioen), uplinkfrekvensen vil tracke den svarende til "
+"om transponderen er inverterende eller ej. Tilsvarende vil "
+"downlinkfrekvensen tracke uplinkfrekvensen når denne ændres.\n"
+"\n"
+"Hvis uplink og downlink er ude af sync når man aktiverer denne funktion vil "
+"algoritmen tage udgangspunkt i downlinkfrekvensen."
+
+#. Azimuth
+#: ../src/gtk-rig-ctrl.c:607 ../src/gtk-rot-ctrl.c:482
+msgid "Az:"
+msgstr "Az:"
+
+#. Elevation
+#: ../src/gtk-rig-ctrl.c:615 ../src/gtk-rot-ctrl.c:492
+msgid "El:"
+msgstr "El:"
+
+#. Range
+#: ../src/gtk-rig-ctrl.c:623
+msgid " Range:"
+msgstr " Afstand:"
+
+#: ../src/gtk-rig-ctrl.c:631 ../src/gtk-rig-ctrl.c:634
+msgid "This is the current distance between the satellite and the observer."
+msgstr "Den aktuelle afstand imellem satellit og observatør."
+
+#. Range rate
+#: ../src/gtk-rig-ctrl.c:638
+msgid " Rate:"
+msgstr " Hastighed:"
+
+#: ../src/gtk-rig-ctrl.c:646 ../src/gtk-rig-ctrl.c:649
+msgid ""
+"The rate of change for the distance between the satellite and the observer."
+msgstr "Hastighed hvormed afstanden imellem satellit og observatør ændres."
+
+#: ../src/gtk-rig-ctrl.c:652 ../src/gtk-rot-ctrl.c:508
+msgid "Target"
+msgstr "Destination"
+
+#. Primary device
+#: ../src/gtk-rig-ctrl.c:679
+msgid "1. Device:"
+msgstr "1. Enhed:"
+
+#: ../src/gtk-rig-ctrl.c:684
+msgid ""
+"Select primary radio device.This device will be used for downlink and uplink "
+"unless you select a secondary device for uplink"
+msgstr ""
+"Vælg den primære radio. Denne enhed vil blive brugt til både downlink og "
+"uplink med mindre du vælger en sekundær enhed til uplink."
+
+#: ../src/gtk-rig-ctrl.c:717 ../src/gtk-rig-ctrl.c:760
+#: ../src/gtk-rig-ctrl.c:2401 ../src/gtk-rot-ctrl.c:572
+#: ../src/gtk-rot-ctrl.c:1222 ../src/sat-pref-rig.c:306
+#: ../src/sat-pref-rot.c:272
+#, c-format
+msgid "%s:%d: Failed to open hwconf dir (%s)"
+msgstr "%s:%d: Kunne ikke åbne hwconf folder (%s)"
+
+#. config will be force-loaded after LO spin is created
+#. Secondary device
+#: ../src/gtk-rig-ctrl.c:730
+msgid "2. Device:"
+msgstr "2. Enhed:"
+
+#: ../src/gtk-rig-ctrl.c:735
+msgid ""
+"Select secondary radio device\n"
+"This device will be used for uplink"
+msgstr ""
+"Vælg den dekundære radio.\n"
+"Denne enhed vil blive brugt til uplink."
+
+#. load config
+#: ../src/gtk-rig-ctrl.c:739 ../src/sat-pref-rig.c:769
+#: ../src/sat-pref-rig.c:778 ../src/sat-pref-rig-editor.c:246
+msgid "None"
+msgstr "Ingen"
+
+#. Engage button
+#: ../src/gtk-rig-ctrl.c:775 ../src/gtk-rot-ctrl.c:585
+msgid "Engage"
+msgstr "Aktiver"
+
+#: ../src/gtk-rig-ctrl.c:776
+msgid "Engage the selected radio device"
+msgstr "Aktiver forbindelse til den valgte radio enhed."
+
+#. Timeout
+#: ../src/gtk-rig-ctrl.c:784 ../src/gtk-rot-ctrl.c:591
+msgid "Cycle:"
+msgstr "Cyklus:"
+
+#: ../src/gtk-rig-ctrl.c:791
+msgid "This parameter controls the delay between commands sent to the rig."
+msgstr ""
+"Denne parameter bestemmer forsinkelsen imellem kommandoer sendt til radioen."
+
+#: ../src/gtk-rig-ctrl.c:798 ../src/gtk-rot-ctrl.c:605
+msgid "msec"
+msgstr "msek"
+
+#: ../src/gtk-rig-ctrl.c:802 ../src/gtk-rot-ctrl.c:634
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: ../src/gtk-rig-ctrl.c:818
+msgid "<span size='large'><b>ΔT: 00:00:00</b></span>"
+msgstr "<span size='large'><b>ΔT: 00:00:00</b></span>"
+
+#: ../src/gtk-rig-ctrl.c:820
+msgid ""
+"The time remaining until the next AOS or LOS event, depending on which one "
+"comes first."
+msgstr "Tid til den næste AOS eller LOS afhængigt af hvad der kommer først."
+
+#: ../src/gtk-rig-ctrl.c:868 ../src/gtk-rot-ctrl.c:701
+#, c-format
+msgid "%s:%s: Invalid satellite selection: %d"
+msgstr "%s:%s: Ugyldig satellit: %d"
+
+#: ../src/gtk-rig-ctrl.c:905
+#, c-format
+msgid "%s: Inconsistency detected in internal transponder data (%d,%d)"
+msgstr "%s: Inkonsistens i den interne transponder data (%d,%d)"
+
+#: ../src/gtk-rig-ctrl.c:1034
+#, c-format
+msgid "%s:%s: Primary device selected: %d"
+msgstr "%s:%s: Primær enhed valgt: %d"
+
+#: ../src/gtk-rig-ctrl.c:1048 ../src/gtk-rig-ctrl.c:2489
+#, c-format
+msgid "%s:%d: Failed to allocate memory for radio config"
+msgstr "%s:%d: Kunne ikke allokere hukommelse til radiokonfiguration"
+
+#: ../src/gtk-rig-ctrl.c:1057 ../src/gtk-rig-ctrl.c:1157
+#, c-format
+msgid "%s:%s: Loaded new radio configuration %s"
+msgstr "%s:%s: Ny radio konfiguration indlæst %s"
+
+#. update LO widgets
+#: ../src/gtk-rig-ctrl.c:1060 ../src/gtk-rig-ctrl.c:1065
+#: ../src/gtk-rig-ctrl.c:1116 ../src/gtk-rig-ctrl.c:1132
+#: ../src/gtk-rig-ctrl.c:1160
+#, c-format
+msgid "%.0f MHz"
+msgstr "%.0f MHz"
+
+#: ../src/gtk-rig-ctrl.c:1072 ../src/gtk-rig-ctrl.c:1166
+#, c-format
+msgid "%s:%s: Failed to load radio configuration %s"
+msgstr "%s:%s: Kunne ikke indlæse radio konfiguration %s"
+
+#: ../src/gtk-rig-ctrl.c:1100
+#, c-format
+msgid "%s:%s: Secondary device selected: %d"
+msgstr "%s:%s: Sekundær enhed valgt: %d"
+
+#: ../src/gtk-rig-ctrl.c:1148
+#, c-format
+msgid "%s:%s: Failed to allocate memory for radio config"
+msgstr "%s:%s: Kunne ikke allokere hukommelse til radio konfiguration"
+
+#: ../src/gtk-rig-ctrl.c:1193 ../src/gtk-rig-ctrl.c:1315
+#: ../src/gtk-rot-ctrl.c:848
+#, c-format
+msgid "%s: Controller does not have a valid configuration"
+msgstr "%s: Kontrolleren har ikke nogen gyldig konfiguration"
+
+#: ../src/gtk-rig-ctrl.c:1323 ../src/gtk-rot-ctrl.c:878
+#, c-format
+msgid "%s missed the deadline"
+msgstr "%s missede deadline"
+
+#: ../src/gtk-rig-ctrl.c:1358
+#, c-format
+msgid "%s: Invalid radio type %d. Setting type to RIG_TYPE_RX"
+msgstr "%s: Ugyldig radio type %d. Anvender RIG_TYPE_RX istedet"
+
+#: ../src/gtk-rig-ctrl.c:1372 ../src/gtk-rot-ctrl.c:978
+#, c-format
+msgid "%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"
+msgstr "%s: MAX_ERROR_COUNT (%d) er nået. Afbryder forbindelse!"
+
+#: ../src/gtk-rig-ctrl.c:2165 ../src/gtk-rot-ctrl.c:1034
+#, c-format
+msgid "%s:%d: NULL storage."
+msgstr "%s:%d: NULL lager."
+
+#: ../src/gtk-rig-ctrl.c:2220
+#, c-format
+msgid "%s: Invalid VFO argument. Using VFOA."
+msgstr "%s: Ugyldig VFO parameter. Vælger VFOA."
+
+#: ../src/gtk-rig-ctrl.c:2254
+#, c-format
+msgid "AOS in"
+msgstr "AOS om"
+
+#: ../src/gtk-rig-ctrl.c:2258
+#, c-format
+msgid "LOS in"
+msgstr "LOS om"
+
+#: ../src/gtk-rig-ctrl.c:2341
+#, c-format
+msgid "%s:%s: GtkSatModule has no target satellite."
+msgstr "%s:%s: GtkSatModule har ingen satelliter i sigte."
+
+#: ../src/gtk-rig-ctrl.c:2353
+#, c-format
+msgid "%s:%s: Satellite %d has %d transponder modes."
+msgstr "%s:%s: Satellitten %d har %d transponder modes."
+
+#: ../src/gtk-rig-ctrl.c:2364
+#, c-format
+msgid "%s:&s: Read transponder '%s' for satellite %d"
+msgstr "%s:&s: Indlæst transponder '%s' for satellit %d"
+
+#: ../src/gtk-rig-ctrl.c:2501
+#, c-format
+msgid "%s:%d: Error reading radio configuration %s"
+msgstr "%s:%d: Fejl under indlæsning af radio konfiguration %s"
+
+#: ../src/gtk-rig-ctrl.c:2527
+#, c-format
+msgid "%s:%s: sending %d bytes to rigctld as \"%s\""
+msgstr "%s:%s: sender %d bytes til rigctld som \"%s\""
+
+#: ../src/gtk-rig-ctrl.c:2533 ../src/gtk-rot-ctrl.c:1318
+#, c-format
+msgid "%s: SIZE ERROR %d / %d"
+msgstr "%s: SIZE ERROR %d / %d"
+
+#: ../src/gtk-rig-ctrl.c:2538 ../src/gtk-rig-ctrl.c:2546
+#, c-format
+msgid "%s: rigctld port closed"
+msgstr "%s: rigctld port lukket"
+
+#: ../src/gtk-rig-ctrl.c:2554
+#, c-format
+msgid "%s:%s: Got 0 bytes from rigctld"
+msgstr "%s:%s: Fik 0 bytes fra rigctld"
+
+#: ../src/gtk-rig-ctrl.c:2559
+#, c-format
+msgid "%s:%s: Read %d bytes from rigctld"
+msgstr "%s:%s: Fik %d bytes fra rigctld"
+
+#: ../src/gtk-rig-ctrl.c:2592
+#, c-format
+msgid "%s: Detected SPACEBAR pressed event"
+msgstr "%s: Detected SPACEBAR pressed event"
+
+#: ../src/gtk-rig-ctrl.c:2603
+#, c-format
+msgid "%s:%s: Keypress value %i not managed by this function"
+msgstr "%s:%s: Keypress value %i not managed by this function"
+
+#: ../src/gtk-rig-ctrl.c:2649
+#, c-format
+msgid "%s: Acquired controller lock"
+msgstr "%s: Acquired controller lock"
+
+#: ../src/gtk-rig-ctrl.c:2654
+#, c-format
+msgid ""
+"%s: Controller not engaged; PTT event ignored (Hint: Enable the Engage "
+"button)"
+msgstr ""
+
+#: ../src/gtk-rig-ctrl.c:2664
+#, c-format
+msgid "%s: PTT is OFF => Set TX freq and PTT=ON"
+msgstr "%s: PTT is OFF => Set TX freq and PTT=ON"
+
+#: ../src/gtk-rig-ctrl.c:2673
+#, c-format
+msgid "%s: PTT is ON = Set PTT=OFF"
+msgstr "%s: PTT is ON = Set PTT=OFF"
+
+#: ../src/gtk-rig-ctrl.c:2685
+#, c-format
+msgid "%s: Failed to acquire controller lock; PTT event not handled"
+msgstr ""
+
+#: ../src/gtk-rig-ctrl.c:2700 ../src/gtk-rot-ctrl.c:1243
+#, c-format
+msgid "%s: Failed to create socket"
+msgstr ""
+
+#: ../src/gtk-rig-ctrl.c:2707 ../src/gtk-rot-ctrl.c:1250
+#, c-format
+msgid "%s: Network socket created successfully"
+msgstr ""
+
+#: ../src/gtk-rig-ctrl.c:2721 ../src/gtk-rot-ctrl.c:1264
+#, c-format
+msgid "%s: Failed to connect to %s:%d"
+msgstr "%s: Kunne ikke opette forbindelse til %s:%d"
+
+#: ../src/gtk-rig-ctrl.c:2728 ../src/gtk-rot-ctrl.c:1271
+#, c-format
+msgid "%s: Connection opened to %s:%d"
+msgstr "%s: Forbindelse til %s:%d er åbnet"
+
+#: ../src/gtk-rig-ctrl.c:2766 ../src/gtk-rig-ctrl.c:2778
+#, c-format
+msgid "%s: %s rigctld returned error (%s)"
+msgstr "%s: %s rigctld returnerede en fejl...
[truncated message content] |
|
From: <cs...@us...> - 2011-03-01 15:30:15
|
Revision: 775
http://gpredict.svn.sourceforge.net/gpredict/?rev=775&view=rev
Author: csete
Date: 2011-03-01 15:30:05 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Updated satellite data.
Modified Paths:
--------------
trunk/data/satdata/cubesat.cat
trunk/data/satdata/engineering.cat
trunk/data/satdata/geo.cat
trunk/data/satdata/glo-ops.cat
trunk/data/satdata/globalstar.cat
trunk/data/satdata/military.cat
trunk/data/satdata/resource.cat
trunk/data/satdata/satellites.dat
trunk/data/satdata/sbas.cat
trunk/data/satdata/science.cat
trunk/data/satdata/tle-new.cat
trunk/data/satdata/visual.cat
trunk/data/satdata/weather.cat
Modified: trunk/data/satdata/cubesat.cat
===================================================================
--- trunk/data/satdata/cubesat.cat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/cubesat.cat 2011-03-01 15:30:05 UTC (rev 775)
@@ -23,7 +23,6 @@
32791
35003
35004
-35005
35932
35933
35934
Modified: trunk/data/satdata/engineering.cat
===================================================================
--- trunk/data/satdata/engineering.cat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/engineering.cat 2011-03-01 15:30:05 UTC (rev 775)
@@ -14,7 +14,6 @@
26093
26094
26386
-26405
26930
26958
27844
Modified: trunk/data/satdata/geo.cat
===================================================================
--- trunk/data/satdata/geo.cat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/geo.cat 2011-03-01 15:30:05 UTC (rev 775)
@@ -32,7 +32,6 @@
21906
21940
22028
-22117
22175
22245
22269
@@ -55,7 +54,6 @@
23227
23305
23313
-23314
23319
23331
23448
@@ -101,7 +99,6 @@
24812
24819
24834
-24846
24880
24901
24916
@@ -142,7 +139,6 @@
25638
25639
25657
-25666
25673
25740
25785
@@ -329,7 +325,6 @@
32294
32299
32373
-32387
32388
32404
32478
@@ -403,3 +398,18 @@
36745
36792
36828
+36830
+36831
+37150
+37185
+37207
+37210
+37218
+37234
+37237
+37238
+37256
+37258
+37264
+37265
+37344
Modified: trunk/data/satdata/glo-ops.cat
===================================================================
--- trunk/data/satdata/glo-ops.cat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/glo-ops.cat 2011-03-01 15:30:05 UTC (rev 775)
@@ -22,3 +22,6 @@
36400
36401
36402
+37137
+37138
+37139
Modified: trunk/data/satdata/globalstar.cat
===================================================================
--- trunk/data/satdata/globalstar.cat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/globalstar.cat 2011-03-01 15:30:05 UTC (rev 775)
@@ -59,3 +59,9 @@
32264
32265
32266
+37188
+37189
+37190
+37191
+37192
+37193
Modified: trunk/data/satdata/military.cat
===================================================================
--- trunk/data/satdata/military.cat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/military.cat 2011-03-01 15:30:05 UTC (rev 775)
@@ -8,16 +8,9 @@
25977
26102
26610
-27434
-29658
30773
30777
31140
-31601
-31797
-32283
-32750
-33244
33751
33752
35001
Modified: trunk/data/satdata/resource.cat
===================================================================
--- trunk/data/satdata/resource.cat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/resource.cat 2011-03-01 15:30:05 UTC (rev 775)
@@ -83,3 +83,4 @@
36036
36110
36834
+37216
Modified: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat 2011-02-28 03:30:30 UTC (rev 774)
+++ trunk/data/satdata/satellites.dat 2011-03-01 15:30:05 UTC (rev 775)
@@ -1,8764 +1,8820 @@
-[26608]
+[31125]
VERSION=1.1
-NAME=INTELSAT 1R (IS-1R)
-NICKNAME=INTELSAT 1R (IS-1R)
-TLE1=1 26608U 00072A 10283.35273049 -.00000297 00000-0 00000+0 0 2416
-TLE2=2 26608 0.0423 21.8896 0001078 359.6852 74.3010 1.00273676 36311
+NAME=SAUDICOMSAT 3
+NICKNAME=SAUDICOMSAT 3
+TLE1=1 31125U 07012J 11059.56124595 .00000412 00000-0 88749-4 0 1893
+TLE2=2 31125 97.9147 113.9185 0046388 89.0728 271.5789 14.62701486206570
-[29670]
+[25478]
VERSION=1.1
-NAME=COSMOS 2425 (716)
-NICKNAME=COSMOS 2425 (716)
-TLE1=1 29670U 06062A 10283.99835035 -.00000060 00000-0 10000-3 0 480
-TLE2=2 29670 65.6471 26.7202 0020408 349.4554 59.7547 2.13100971 29510
+NAME=ORBCOMM FM24 [+]
+NICKNAME=ORBCOMM FM24 [+]
+TLE1=1 25478U 98053D 11059.17864777 -.00000022 00000-0 45762-4 0 897
+TLE2=2 25478 45.0125 331.2768 0001402 333.5994 26.4785 14.29207776648788
-[35684]
+[25982]
VERSION=1.1
-NAME=APRIZESAT 4
-NICKNAME=APRIZESAT 4
-TLE1=1 35684U 09041D 10284.76114639 .00000145 00000-0 28334-4 0 3866
-TLE2=2 35684 98.0896 185.7074 0050556 31.1370 329.2851 14.76112158 64765
+NAME=ORBCOMM FM32 [P]
+NICKNAME=ORBCOMM FM32 [P]
+TLE1=1 25982U 99065C 11060.00685704 .00000115 00000-0 98959-4 0 647
+TLE2=2 25982 45.0220 128.1965 0004661 0.3590 359.7258 14.29430155586245
-[26620]
+[28894]
VERSION=1.1
-NAME=SAC C
-NICKNAME=SAC C
-TLE1=1 26620U 00075B 10284.67014782 .00000132 00000-0 39059-4 0 1187
-TLE2=2 26620 97.8759 296.8536 0000847 71.0700 289.0586 14.56576593525760
+NAME=SSETI EXPRESS (XO-53)
+NICKNAME=XO-53
+TLE1=1 28894U 05043E 11060.13039953 .00000042 00000-0 18120-4 0 76
+TLE2=2 28894 97.9763 299.7713 0016934 199.2953 160.7616 14.59790216284581
-[36499]
+[33595]
VERSION=1.1
-NAME=ECHOSTAR 14
-NICKNAME=ECHOSTAR 14
-TLE1=1 36499U 10010A 10284.10914120 -.00000016 00000-0 00000+0 0 1872
-TLE2=2 36499 0.0071 170.3064 0002104 14.5122 115.1784 1.00272200 2096
+NAME=EXPRESS-AM 44
+NICKNAME=EXPRESS-AM 44
+TLE1=1 33595U 09007A 11060.15023779 -.00000109 00000-0 10000-3 0 5578
+TLE2=2 33595 0.0052 34.3328 0001660 28.6007 138.7220 1.00272142 7541
-[25874]
+[25291]
VERSION=1.1
-NAME=GLOBALSTAR M043
-NICKNAME=GLOBALSTAR M043
-TLE1=1 25874U 99041C 10284.49794572 -.00000086 00000-0 10000-3 0 3422
-TLE2=2 25874 52.0016 86.7388 0000804 164.7029 195.3861 12.62283350517292
+NAME=IRIDIUM 68 [+]
+NICKNAME=IRIDIUM 68 [+]
+TLE1=1 25291U 98021G 11059.21627786 .00000062 00000-0 15001-4 0 3335
+TLE2=2 25291 86.3931 105.7613 0002497 83.5809 276.5646 14.34218791675193
-[33331]
+[13923]
VERSION=1.1
-NAME=GEOEYE 1
-NICKNAME=GEOEYE 1
-TLE1=1 33331U 08042A 10284.73115827 -.00000021 00000-0 49750-5 0 3321
-TLE2=2 33331 98.1124 356.6634 0011082 10.2868 349.8548 14.64444738111953
+NAME=NOAA 8 [-]
+NICKNAME=NOAA 8 [-]
+TLE1=1 13923U 83022A 11059.55086532 .00000003 00000-0 18534-4 0 6190
+TLE2=2 13923 98.5047 84.9129 0016539 85.9942 274.3126 14.27766982453512
-[26874]
+[32062]
VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 26874U 01032B 10284.42017767 .00001051 00000-0 28900-4 0 5763
-TLE2=2 26874 82.4768 289.3112 0021487 217.7709 142.2013 15.35752548514104
+NAME=CBERS 2B
+NICKNAME=CBERS 2B
+TLE1=1 32062U 07042A 11060.11328021 .00000044 00000-0 28555-4 0 5119
+TLE2=2 32062 98.4278 137.1737 0031491 258.7204 101.0446 14.38611729180825
-[21111]
+[6212]
VERSION=1.1
-NAME=COSMOS 2133
-NICKNAME=COSMOS 2133
-TLE1=1 21111U 91010A 10282.85814170 -.00000059 00000-0 10000-3 0 3054
-TLE2=2 21111 12.1686 36.9627 0005736 351.9615 8.0050 1.00270314 71993
+NAME=OPS 8180 (RADCAT)
+NICKNAME=OPS 8180 (RADCAT)
+TLE1=1 06212U 72076A 11059.31107791 .00006554 00000-0 20359-3 0 2320
+TLE2=2 06212 98.5457 172.8431 0003058 23.4323 336.7058 15.33792220217893
-[32951]
+[27715]
VERSION=1.1
-NAME=GALAXY 18 (G-18)
-NICKNAME=GALAXY 18 (G-18)
-TLE1=1 32951U 08024A 10281.35849500 .00000010 00000-0 10000-3 0 3652
-TLE2=2 32951 0.0082 208.6479 0002728 359.8996 174.4141 1.00273479 8751
+NAME=GALAXY 12 (G-12)
+NICKNAME=GALAXY 12 (G-12)
+TLE1=1 27715U 03013B 11059.34989375 .00000058 00000-0 10000-3 0 3994
+TLE2=2 27715 0.0531 278.5074 0000924 83.3512 148.8968 1.00271559 28973
-[23606]
+[27830]
VERSION=1.1
-NAME=CERISE
-NICKNAME=CERISE
-TLE1=1 23606U 95033B 10284.65423285 .00000640 00000-0 81572-4 0 2278
-TLE2=2 23606 98.3031 68.4191 0006256 0.2091 359.9109 14.85211457823325
+NAME=BSAT-2C
+NICKNAME=BSAT-2C
+TLE1=1 27830U 03028A 11054.81498443 -.00000366 00000-0 10000-3 0 2291
+TLE2=2 27830 0.1047 266.2466 0004130 109.0836 181.2137 1.00269352 28259
-[19223]
+[25170]
VERSION=1.1
-NAME=NOVA 11
-NICKNAME=NOVA 11
-TLE1=1 19223U 88052A 10283.70801699 .00000051 00000-0 10000-3 0 7295
-TLE2=2 19223 90.0042 91.4682 0030798 158.3805 201.8630 13.22432992 77158
+NAME=IRIDIUM 56 [+]
+NICKNAME=IRIDIUM 56 [+]
+TLE1=1 25170U 98010B 11059.16009535 -.00000038 00000-0 -20801-4 0 5947
+TLE2=2 25170 86.3924 232.0561 0002321 85.8944 274.2517 14.34216251681950
-[25994]
+[35681]
VERSION=1.1
-NAME=TERRA
-NICKNAME=TERRA
-TLE1=1 25994U 99068A 10284.89553500 .00000066 00000-0 24669-4 0 2368
-TLE2=2 25994 98.1955 357.7317 0001296 72.0343 288.0986 14.57120037575309
+NAME=DEIMOS-1
+NICKNAME=DEIMOS-1
+TLE1=1 35681U 09041A 11060.06780646 .00000048 00000-0 16341-4 0 7654
+TLE2=2 35681 98.0773 320.4070 0001471 105.2335 254.9034 14.69426307 85100
-[37180]
+[28059]
VERSION=1.1
-NAME=SJ-6H
-NICKNAME=SJ-6H
-TLE1=1 37180U 10051B 10284.91913051 .00000241 00000-0 30375-4 0 226
-TLE2=2 37180 97.7542 319.1004 0011554 312.8720 47.1535 14.90494533 874
+NAME=CZ-4B R/B
+NICKNAME=CZ-4B R/B
+TLE1=1 28059U 03049C 11060.02164684 .00000037 00000-0 21139-4 0 1069
+TLE2=2 28059 98.6054 203.9316 0051808 40.3975 320.1048 14.51501094389875
-[6236]
+[37139]
VERSION=1.1
-NAME=OSCAR 6 (AO-6)
-NICKNAME=AO-6
-TLE1=1 06236U 72082B 10283.54132616 -.00000027 00000-0 10000-3 0 3716
-TLE2=2 06236 101.3972 282.4599 0004331 29.5721 330.5596 12.53082855737577
+NAME=COSMOS 2464 (736)
+NICKNAME=COSMOS 2464 (736)
+TLE1=1 37139U 10041C 11059.86196215 -.00000057 00000-0 00000+0 0 1470
+TLE2=2 37139 64.9231 23.3531 0021120 5.9576 19.5764 2.13102913 3833
-[23027]
+[15362]
VERSION=1.1
-NAME=GPS BIIA-24 (PRN 06)
-NICKNAME=GPS BIIA-24 (PRN 06)
-TLE1=1 23027U 94016A 10282.99075318 .00000028 00000-0 10000-3 0 3223
-TLE2=2 23027 53.5665 135.7492 0063370 304.3813 55.1074 2.00565329121556
+NAME=NOVA 3
+NICKNAME=NOVA 3
+TLE1=1 15362U 84110A 11058.94758777 .00000051 00000-0 10000-3 0 2432
+TLE2=2 15362 89.9923 50.0564 0033576 92.9074 267.5900 13.22510595273154
-[24846]
+[27948]
VERSION=1.1
-NAME=INTELSAT 802 (IS-802)
-NICKNAME=INTELSAT 802 (IS-802)
-TLE1=1 24846U 97031A 10284.21408416 -.00000026 00000-0 10000-3 0 1057
-TLE2=2 24846 0.1656 283.7748 0027279 308.9975 126.9953 0.98107653 48748
+NAME=EUROBIRD 3
+NICKNAME=EUROBIRD 3
+TLE1=1 27948U 03043A 11059.76271973 .00000135 00000-0 10000-3 0 3973
+TLE2=2 27948 0.0465 330.3858 0000335 53.6864 81.8249 1.00274382 27301
-[28132]
+[24931]
VERSION=1.1
-NAME=AMOS 2
-NICKNAME=AMOS 2
-TLE1=1 28132U 03059A 10280.63478465 .00000000 00000-0 10000-3 0 9698
-TLE2=2 28132 0.0650 254.9893 0001706 275.1545 70.5093 1.00265942 24911
+NAME=EUTELSAT W75
+NICKNAME=EUTELSAT W75
+TLE1=1 24931U 97049A 11059.74954116 -.00000110 00000-0 10000-3 0 3217
+TLE2=2 24931 1.8590 75.3418 0003022 317.6429 110.3070 1.00272323 49488
-[32404]
+[34779]
VERSION=1.1
-NAME=THURAYA-3
-NICKNAME=THURAYA-3
-TLE1=1 32404U 08001A 10284.57451413 -.00000322 00000-0 10000-3 0 5186
-TLE2=2 32404 5.2333 334.1711 0004629 214.8672 136.4746 1.00271040 10098
+NAME=BEIDOU G2
+NICKNAME=BEIDOU G2
+TLE1=1 34779U 09018A 11059.73546986 -.00000382 00000-0 10000-3 0 4928
+TLE2=2 34779 0.6911 71.6117 0046978 157.9084 313.9228 1.00305961 7066
-[25126]
+[24798]
VERSION=1.1
-NAME=HGS-1 (ASIASAT 3)
-NICKNAME=HGS-1 (ASIASAT 3)
-TLE1=1 25126U 97086A 10283.68850507 .00000102 00000-0 10000-3 0 4182
-TLE2=2 25126 2.7703 98.8434 0043298 230.5213 129.5299 1.00286050 47702
+NAME=DFH 3-2
+NICKNAME=DFH 3-2
+TLE1=1 24798U 97021A 11058.68247220 .00000102 00000-0 10000-3 0 8991
+TLE2=2 24798 6.5439 63.1742 0010169 321.3178 38.7571 1.00279103 50553
-[877]
+[28638]
VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 00877U 64053B 10284.82833196 -.00000049 00000-0 15163-4 0 5153
-TLE2=2 00877 65.0785 216.4624 0072111 335.5850 24.1840 14.58135915445566
+NAME=APSTAR 6
+NICKNAME=APSTAR 6
+TLE1=1 28638U 05012A 11059.58807331 -.00000339 00000-0 10000-3 0 9345
+TLE2=2 28638 0.0228 97.9416 0002294 271.6706 134.1163 1.00273246 46399
-[27651]
+[28891]
VERSION=1.1
-NAME=SORCE
-NICKNAME=SORCE
-TLE1=1 27651U 03004A 10284.73962094 .00000275 00000-0 49449-4 0 3186
-TLE2=2 27651 39.9959 176.8536 0024202 97.7857 262.5703 14.82406094417764
+NAME=TOPSAT
+NICKNAME=TOPSAT
+TLE1=1 28891U 05043B 11060.12809938 -.00000007 00000-0 78015-5 0 9666
+TLE2=2 28891 97.9714 298.9562 0016705 196.0532 164.0147 14.59867032284601
-[28373]
+[24278]
VERSION=1.1
-NAME=UNISAT 3
-NICKNAME=UNISAT 3
-TLE1=1 28373U 04025H 10284.65550578 .00000031 00000-0 20712-4 0 7662
-TLE2=2 28373 98.0412 279.8134 0072134 76.2729 284.6474 14.43417118331593
+NAME=JAS-2 (FO-29)
+NICKNAME=FO-29
+TLE1=1 24278U 96046B 11059.86480293 .00000045 00000-0 81097-4 0 5178
+TLE2=2 24278 98.5284 218.6779 0350766 177.9206 182.3501 13.52958410717812
-[26985]
+[28982]
VERSION=1.1
-NAME=DIRECTV 4S
-NICKNAME=DIRECTV 4S
-TLE1=1 26985U 01052A 10281.50757571 -.00000128 00000-0 10000-3 0 5821
-TLE2=2 26985 0.0096 157.0879 0001213 138.7552 162.7525 1.00270018 32532
+NAME=ST5-C
+NICKNAME=ST5-C
+TLE1=1 28982U 06008C 11059.45044819 .00012642 16411-5 46750-3 0 6304
+TLE2=2 28982 105.6172 99.0186 2294177 172.5791 191.6367 10.80861803192279
-[32768]
+[27718]
VERSION=1.1
-NAME=STAR ONE C2
-NICKNAME=STAR ONE C2
-TLE1=1 32768U 08018B 10282.44781740 -.00000279 00000-0 10000-3 0 3976
-TLE2=2 32768 0.0392 138.1702 0003535 14.3520 316.6467 1.00268317 9195
+NAME=ASIASAT 4
+NICKNAME=ASIASAT 4
+TLE1=1 27718U 03014A 11058.36427328 -.00000381 00000-0 10000-3 0 6650
+TLE2=2 27718 0.0265 243.5581 0000480 211.9592 314.5375 1.00275017 28909
-[27403]
+[36287]
VERSION=1.1
-NAME=INTELSAT 903 (IS-903)
-NICKNAME=INTELSAT 903 (IS-903)
-TLE1=1 27403U 02016A 10284.15956095 -.00000254 00000-0 10000-3 0 4003
-TLE2=2 27403 0.0220 311.1099 0003758 136.0079 315.4936 1.00269021 31326
+NAME=BEIDOU G1
+NICKNAME=BEIDOU G1
+TLE1=1 36287U 10001A 11058.56105076 -.00000271 00000-0 10000-3 0 3363
+TLE2=2 36287 1.4758 342.2532 0003748 12.8552 148.3544 1.00267212 4160
-[29045]
+[27818]
VERSION=1.1
-NAME=JCSAT-5A
-NICKNAME=JCSAT-5A
-TLE1=1 29045U 06010A 10280.69245035 .00000000 00000-0 10000-3 0 6623
-TLE2=2 29045 0.0064 320.4154 0001032 235.3325 201.7873 1.00264618 16485
+NAME=COSMOS 2398
+NICKNAME=COSMOS 2398
+TLE1=1 27818U 03023A 11059.00055749 .00000031 00000-0 17919-4 0 1830
+TLE2=2 27818 82.9468 291.7090 0031584 353.9577 6.1177 13.71975827387373
-[26621]
+[25546]
VERSION=1.1
-NAME=MUNIN
-NICKNAME=MUNIN
-TLE1=1 26621U 00075C 10283.95878085 -.00000657 00000-0 -58223-3 0 9457
-TLE2=2 26621 95.4125 67.3118 0715693 239.1239 113.7614 13.03740186470356
+NAME=BONUM 1
+NICKNAME=BONUM 1
+TLE1=1 25546U 98068A 11059.61758361 .00000058 00000-0 10000-3 0 8048
+TLE2=2 25546 0.0822 250.1012 0001858 56.9719 129.2418 1.00273660 45029
-[29163]
+[20873]
VERSION=1.1
-NAME=THAICOM 5
-NICKNAME=THAICOM 5
-TLE1=1 29163U 06020B 10281.57800404 -.00000135 00000-0 10000-3 0 8846
-TLE2=2 29163 0.0543 262.6566 0002597 313.6959 87.3119 1.00270535 16073
+NAME=GALAXY 6
+NICKNAME=GALAXY 6
+TLE1=1 20873U 90091B 11059.08082696 .00000064 00000-0 10000-3 0 4959
+TLE2=2 20873 7.6418 60.8049 0001366 351.6561 8.4747 0.99757470 69045
-[26626]
+[15935]
VERSION=1.1
-NAME=SIRIUS-3
-NICKNAME=SIRIUS-3
-TLE1=1 26626U 00077A 10282.16677871 -.00000165 00000-0 00000+0 0 6610
-TLE2=2 26626 63.9105 11.1873 2673784 270.4628 59.4647 1.00279177 36115
+NAME=OSCAR 30
+NICKNAME=OSCAR 30
+TLE1=1 15935U 85066A 11059.41428833 .00000050 00000-0 74427-4 0 7426
+TLE2=2 15935 90.0703 26.6335 0168405 194.2366 165.3999 13.35301636243602
-[23816]
+[28629]
VERSION=1.1
-NAME=INTELSAT 707 (IS-707)
-NICKNAME=INTELSAT 707 (IS-707)
-TLE1=1 23816U 96015A 10279.99225396 -.00000299 00000-0 10000-3 0 788
-TLE2=2 23816 0.0025 245.5139 0002906 316.6263 117.6019 1.00269013 53355
+NAME=EXPRESS-AM 2
+NICKNAME=EXPRESS-AM 2
+TLE1=1 28629U 05010A 11059.02787758 -.00000157 00000-0 10000-3 0 6336
+TLE2=2 28629 0.0506 295.9385 0001658 117.4880 194.0818 1.00271336 21670
-[18362]
+[28361]
VERSION=1.1
-NAME=OSCAR 29
-NICKNAME=OSCAR 29
-TLE1=1 18362U 87080B 10283.67106758 .00000067 00000-0 10000-3 0 9613
-TLE2=2 18362 90.3485 249.9058 0105381 257.8029 101.1292 13.43727448130923
+NAME=GPS BIIR-12 (DASS)
+NICKNAME=GPS BIIR-12 (DASS)
+TLE1=1 28361U 04023A 11058.93172836 -.00000074 00000-0 10000-3 0 6985
+TLE2=2 28361 55.3103 313.5975 0069865 181.7027 178.3202 2.00573502 48988
-[25883]
+[26032]
VERSION=1.1
-NAME=GLOBALSTAR M024
-NICKNAME=GLOBALSTAR M024
-TLE1=1 25883U 99043A 10284.09403486 -.00000086 00000-0 10000-3 0 3353
-TLE2=2 25883 52.0027 133.8321 0000053 111.0028 249.0649 12.62320806514369
+NAME=ARIRANG 1 (KOMPSAT-1)
+NICKNAME=ARIRANG 1 (KOMPSAT-1)
+TLE1=1 26032U 99070A 11060.07998494 .00000082 00000-0 23246-4 0 7366
+TLE2=2 26032 97.8373 285.3717 0006256 66.9818 293.2050 14.65809710598589
-[25528]
+[37362]
VERSION=1.1
-NAME=IRIDIUM 86 [+]
-NICKNAME=IRIDIUM 86 [+]
-TLE1=1 25528U 98066B 10284.47086128 -.00000041 00000-0 -21571-4 0 3319
-TLE2=2 25528 86.3895 290.0859 0003082 75.6954 284.4597 14.34217009629530
+NAME=GEO-IK 2
+NICKNAME=GEO-IK 2
+TLE1=1 37362U 11005A 11060.08078562 .00036147 00000-0 71237-3 0 830
+TLE2=2 37362 99.4604 73.3885 0538519 26.9108 335.8847 14.62928044 4020
-[26243]
+[31307]
VERSION=1.1
-NAME=SESAT 1
-NICKNAME=SESAT 1
-TLE1=1 26243U 00019A 10281.08307777 .00000090 00000-0 00000+0 0 7972
-TLE2=2 26243 0.0789 342.1632 0005330 248.7773 191.5968 1.00275090 38366
+NAME=GALAXY 17 (G-17)
+NICKNAME=GALAXY 17 (G-17)
+TLE1=1 31307U 07016B 11055.01089593 .00000000 00000-0 10000-3 0 6413
+TLE2=2 31307 0.0200 8.6816 0003262 322.8008 94.9414 1.00266895 14006
-[23331]
+[33064]
VERSION=1.1
-NAME=ASTRA 1D
-NICKNAME=ASTRA 1D
-TLE1=1 23331U 94070A 10270.18173410 .00000000 00000-0 10000-3 0 565
-TLE2=2 23331 2.7904 72.6796 0004521 103.2852 257.1675 1.00267783 58725
+NAME=ORBCOMM FM37 [-]
+NICKNAME=ORBCOMM FM37 [-]
+TLE1=1 33064U 08031E 11060.05627225 -.00000009 00000-0 31582-4 0 8245
+TLE2=2 33064 48.4449 50.0738 0007400 154.9283 205.1981 14.68660971144730
-[22178]
+[27838]
VERSION=1.1
-NAME=MOLNIYA 3-42
-NICKNAME=MOLNIYA 3-42
-TLE1=1 22178U 92067A 10283.60548346 .00000173 00000-0 -17589-2 0 8650
-TLE2=2 22178 61.9304 124.0674 7329511 268.6438 14.7875 2.00599219131817
+NAME=ORBVIEW 3
+NICKNAME=ORBVIEW 3
+TLE1=1 27838U 03030A 11060.13954383 .00056994 00000-0 26675-3 0 3680
+TLE2=2 27838 96.9722 108.3446 0016060 145.5272 297.6906 15.82894711431452
-[27298]
+[7004]
VERSION=1.1
-NAME=INSAT-3C
-NICKNAME=INSAT-3C
-TLE1=1 27298U 02002A 10281.71451965 -.00000091 00000-0 10000-3 0 7243
-TLE2=2 27298 0.0543 60.7130 0002634 178.5758 109.1628 1.00270751 31908
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 07004U 73107B 11059.49945928 .00005410 00000-0 20999-3 0 5757
+TLE2=2 07004 73.9607 116.3516 0415795 192.7567 166.2829 14.72019785891574
-[25478]
+[35865]
VERSION=1.1
-NAME=ORBCOMM FM24 [+]
-NICKNAME=ORBCOMM FM24 [+]
-TLE1=1 25478U 98053D 10284.37212873 -.00000057 00000-0 32058-4 0 9781
-TLE2=2 25478 45.0120 264.5650 0003515 271.1570 88.8866 14.29136294628781
+NAME=METEOR-M 1
+NICKNAME=METEOR-M 1
+TLE1=1 35865U 09049A 11060.13127120 .00000176 00000-0 10000-3 0 1444
+TLE2=2 35865 98.7216 116.5930 0002561 3.8556 356.2616 14.21834730 75237
-[25791]
+[694]
VERSION=1.1
-NAME=FUSE 1
-NICKNAME=FUSE 1
-TLE1=1 25791U 99035A 10284.08086430 .00000275 00000-0 28477-4 0 8146
-TLE2=2 25791 24.9853 259.7820 0010116 285.3191 74.6195 14.41837836595879
+NAME=ATLAS CENTAUR 2
+NICKNAME=ATLAS CENTAUR 2
+TLE1=1 00694U 63047A 11059.79942558 .00000467 00000-0 50155-4 0 5166
+TLE2=2 00694 30.3626 161.7225 0615236 327.4277 28.9752 13.95460061360322
-[25290]
+[1361]
VERSION=1.1
-NAME=IRIDIUM 67 [+]
-NICKNAME=IRIDIUM 67 [+]
-TLE1=1 25290U 98021F 10284.18446985 .00000128 00000-0 38480-4 0 9378
-TLE2=2 25290 86.3996 164.1615 0002350 86.0425 274.1055 14.34218802655159
+NAME=LCS 1
+NICKNAME=LCS 1
+TLE1=1 01361U 65034C 11058.56878459 .00000009 00000-0 10000-3 0 2868
+TLE2=2 01361 32.1391 126.1247 0013174 43.7700 316.3841 9.89280461656798
-[13969]
+[23343]
VERSION=1.1
-NAME=TDRS 1
-NICKNAME=TDRS 1
-TLE1=1 13969U 83026B 10281.93566249 -.00000155 00000-0 10000-3 0 1801
-TLE2=2 13969 13.4236 7.4865 0020350 110.2442 249.9598 0.98745861 73782
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 23343U 94074B 11060.12573786 .00000122 00000-0 25762-4 0 257
+TLE2=2 23343 98.1149 34.0815 0006274 228.0493 132.0145 14.75084045877542
-[22014]
+[26998]
VERSION=1.1
-NAME=GPS BIIA-14 (PRN 26)
-NICKNAME=GPS BIIA-14 (PRN 26)
-TLE1=1 22014U 92039A 10284.01915282 -.00000076 00000-0 10000-3 0 7665
-TLE2=2 22014 56.6927 322.6600 0196500 63.3499 298.6910 2.00567785127285
+NAME=TIMED
+NICKNAME=TIMED
+TLE1=1 26998U 01055B 11059.42300931 .00000154 00000-0 22620-4 0 8123
+TLE2=2 26998 74.0725 201.2358 0001225 166.3700 193.7531 14.84283223499687
-[32478]
+[24786]
VERSION=1.1
-NAME=EXPRESS-AM 33
-NICKNAME=EXPRESS-AM 33
-TLE1=1 32478U 08003A 10283.67370432 -.00000296 00000-0 10000-3 0 7339
-TLE2=2 32478 0.0382 338.6744 0002066 302.9711 76.5399 1.00269186 10194
+NAME=GOES 10
+NICKNAME=GOES 10
+TLE1=1 24786U 97019A 11058.34765203 -.00000310 00000-0 10000-3 0 8031
+TLE2=2 24786 5.0251 65.8234 0006004 6.3182 353.8860 0.99074236 50671
-[27391]
+[6073]
VERSION=1.1
-NAME=GRACE-1
-NICKNAME=GRACE-1
-TLE1=1 27391U 02012A 10284.72320686 .00001075 00000-0 30510-4 0 6102
-TLE2=2 27391 89.0061 298.6394 0018267 40.9763 319.2826 15.34986593479152
+NAME=COSMOS 482 DESCENT CRAFT
+NICKNAME=COSMOS 482 DESCENT CRAFT
+TLE1=1 06073U 72023E 11059.99267402 .00020672 34017-5 14868-3 0 7271
+TLE2=2 06073 52.0949 258.3840 2127584 182.0778 176.9906 11.34484854 85327
-[25531]
+[25732]
VERSION=1.1
-NAME=IRIDIUM 83 [+]
-NICKNAME=IRIDIUM 83 [+]
-TLE1=1 25531U 98066E 10284.46451489 -.00000011 00000-0 -11116-4 0 1160
-TLE2=2 25531 86.3902 290.2380 0002443 84.8123 275.3360 14.34217378624524
+NAME=CZ-4B R/B
+NICKNAME=CZ-4B R/B
+TLE1=1 25732U 99025C 11059.89783637 -.00000001 00000-0 20845-4 0 6207
+TLE2=2 25732 98.7300 31.1871 0037234 175.9874 184.1618 14.17227398610762
-[26639]
+[27399]
VERSION=1.1
-NAME=AMC-8 (GE-8)
-NICKNAME=AMC-8 (GE-8)
-TLE1=1 26639U 00081B 10284.47468168 .00000088 00000-0 10000-3 0 6586
-TLE2=2 26639 0.0224 127.9428 0002422 86.8455 197.0644 1.00273362 35985
+NAME=JCSAT-2A
+NICKNAME=JCSAT-2A
+TLE1=1 27399U 02015A 11059.62927428 -.00000187 00000-0 10000-3 0 5597
+TLE2=2 27399 0.0166 134.3056 0001840 219.5701 184.7043 1.00270879 32731
-[23775]
+[25287]
VERSION=1.1
-NAME=GORIZONT 31
-NICKNAME=GORIZONT 31
-TLE1=1 23775U 96005A 10281.86009669 -.00000096 00000-0 10000-3 0 69
-TLE2=2 23775 10.6197 49.8287 0017716 82.9859 277.2003 0.99881317 53815
+NAME=IRIDIUM 64 [+]
+NICKNAME=IRIDIUM 64 [+]
+TLE1=1 25287U 98021C 11059.26067406 .00000170 00000-0 53794-4 0 2983
+TLE2=2 25287 86.3935 105.6986 0002424 85.9919 274.1569 14.34219380675207
-[25736]
+[25558]
VERSION=1.1
-NAME=MUBLCOM
-NICKNAME=MUBLCOM
-TLE1=1 25736U 99026B 10284.12656544 .00000252 00000-0 83672-4 0 1459
-TLE2=2 25736 97.7563 179.3389 0006242 28.1925 331.9619 14.44757987600232
+NAME=SATMEX 5
+NICKNAME=SATMEX 5
+TLE1=1 25558U 98070A 11057.43002127 -.00000033 00000-0 10000-3 0 7575
+TLE2=2 25558 0.0151 170.5084 0002689 192.8720 190.5007 1.00271951 44997
-[33436]
+[33313]
VERSION=1.1
-NAME=ASTRA 1M
-NICKNAME=ASTRA 1M
-TLE1=1 33436U 08057A 10260.00000000 .00000099 00000-0 00000+0 0 1762
-TLE2=2 33436 0.0730 193.6310 0005298 336.1450 205.2290 1.00274035 6862
+NAME=RAPIDEYE 5
+NICKNAME=RAPIDEYE 5
+TLE1=1 33313U 08040B 11060.04713307 .00000092 00000-0 19149-4 0 7917
+TLE2=2 33313 97.9372 148.9065 0019269 124.3233 235.9787 14.79918819135120
-[11849]
+[10953]
VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 11849U 80051B 10284.13323171 .00001481 00000-0 59627-4 0 2667
-TLE2=2 11849 97.7657 77.1434 0011109 17.0640 343.0934 15.26545766661019
+NAME=GOES 3 [P]
+NICKNAME=GOES 3 [P]
+TLE1=1 10953U 78062A 11054.84594510 -.00000139 00000-0 10000-3 0 3204
+TLE2=2 10953 14.5285 354.8651 0005439 14.9041 345.1135 1.00278987 72853
-[23779]
+[26352]
VERSION=1.1
-NAME=PAKSAT 1 (ANATOLIA 1)
-NICKNAME=PAKSAT 1 (ANATOLIA 1)
-TLE1=1 23779U 96006A 10284.82097205 .00000137 00000-0 00000+0 0 4644
-TLE2=2 23779 0.0597 72.0171 0002561 301.2427 340.6364 1.00273986 53754
+NAME=GOES 11
+NICKNAME=GOES 11
+TLE1=1 26352U 00022A 11059.30960142 .00000068 00000-0 10000-3 0 2310
+TLE2=2 26352 0.1314 85.0013 0000579 181.2470 228.0244 1.00261173 39634
-[20608]
+[14050]
VERSION=1.1
-NAME=MACSAT 2 (M 2)
-NICKNAME=MACSAT 2 (M 2)
-TLE1=1 20608U 90043B 10284.47258361 .00000138 00000-0 17843-4 0 1400
-TLE2=2 20608 89.7318 66.2320 0095411 6.6867 353.5584 14.72094243 94154
+NAME=GOES 6 [-]
+NICKNAME=GOES 6 [-]
+TLE1=1 14050U 83041A 11058.95068138 -.00000002 00000-0 10000-3 0 8324
+TLE2=2 14050 14.0221 13.8253 0003750 351.0892 8.9186 1.00311275160039
-[20480]
+[28626]
VERSION=1.1
-NAME=JAS-1B (FO-20)
-NICKNAME=FO-20
-TLE1=1 20480U 90013C 10284.10907882 -.00000012 00000-0 41444-4 0 5864
-TLE2=2 20480 99.0186 119.5607 0540568 161.1278 201.0750 12.83365899968598
+NAME=XM-3 (RHYTHM)
+NICKNAME=XM-3 (RHYTHM)
+TLE1=1 28626U 05008A 11058.11557782 -.00000226 00000-0 10000-3 0 9117
+TLE2=2 28626 0.0424 274.7966 0000216 308.8650 249.4059 1.00269808 22029
-[26102]
+[33051]
VERSION=1.1
-NAME=MTI
-NICKNAME=MTI
-TLE1=1 26102U 00014A 10284.88378184 .00001323 00000-0 79605-4 0 1518
-TLE2=2 26102 97.2796 69.5965 0018367 240.4536 267.1267 15.12352493582182
+NAME=CHINASAT 9
+NICKNAME=CHINASAT 9
+TLE1=1 33051U 08028A 11059.02874115 -.00000268 00000-0 10000-3 0 8073
+TLE2=2 33051 0.0247 115.6161 0005524 235.1226 269.2622 1.00270764 9998
-[10861]
+[33749]
VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 10861U 78045B 10284.35270360 .00003307 00000-0 80731-4 0 4510
-TLE2=2 10861 81.2026 221.7071 0021400 113.8388 246.5106 15.40275626779337
+NAME=NSS-9
+NICKNAME=NSS-9
+TLE1=1 33749U 09008A 11059.67530598 .00000050 00000-0 00000+0 0 3822
+TLE2=2 33749 0.0326 294.3190 0002015 72.8623 217.0038 1.00273234 7531
-[28893]
+[33596]
VERSION=1.1
-NAME=SINAH 1
-NICKNAME=SINAH 1
-TLE1=1 28893U 05043D 10284.08318249 .00000153 00000-0 41159-4 0 8882
-TLE2=2 28893 97.9885 164.6052 0014487 281.9598 78.0005 14.60131461264085
+NAME=EXPRESS-MD1
+NICKNAME=EXPRESS-MD1
+TLE1=1 33596U 09007B 11059.79896205 -.00000157 00000-0 10000-3 0 5910
+TLE2=2 33596 0.0373 261.7218 0003101 69.3193 194.9033 1.00271031 7577
-[30323]
+[26382]
VERSION=1.1
-NAME=BEIDOU 1D
-NICKNAME=BEIDOU 1D
-TLE1=1 30323U 07003A 10280.76047747 -.00000255 00000-0 10000-3 0 9160
-TLE2=2 30323 3.0903 270.3707 0059333 321.5103 37.6077 0.99153412 13875
+NAME=FENGYUN 2B
+NICKNAME=FENGYUN 2B
+TLE1=1 26382U 00032A 11059.50323411 -.00000166 00000-0 10000-3 0 3612
+TLE2=2 26382 5.8221 64.7934 0003638 234.5196 125.6308 1.00066682 39088
-[28738]
+[27499]
VERSION=1.1
-NAME=CZ-2D R/B
-NICKNAME=CZ-2D R/B
-TLE1=1 28738U 05024B 10284.51067724 .00000023 00000-0 65906-5 0 7541
-TLE2=2 28738 97.7789 305.1275 0011282 9.6809 350.4635 15.01177325288451
+NAME=HOT BIRD 6
+NICKNAME=HOT BIRD 6
+TLE1=1 27499U 02038A 11058.90897296 .00000065 00000-0 10000-3 0 8027
+TLE2=2 27499 0.0875 274.1410 0004926 57.5857 165.8228 1.00271486 31229
-[25039]
+[26609]
VERSION=1.1
-NAME=IRIDIUM 43 [+]
-NICKNAME=IRIDIUM 43 [+]
-TLE1=1 25039U 97069A 10284.26499482 .00000108 00000-0 31463-4 0 1968
-TLE2=2 25039 86.3960 322.1981 0002291 85.2567 274.8869 14.34219205676459
+NAME=PHASE 3D (AO-40)
+NICKNAME=AO-40
+TLE1=1 26609U 00072B 11058.63441189 -.00000455 00000-0 10000-3 0 4863
+TLE2=2 26609 7.8102 285.0619 7945596 44.8093 356.5363 1.25587305 47421
-[32018]
+[25152]
VERSION=1.1
-NAME=SPACEWAY 3
-NICKNAME=SPACEWAY 3
-TLE1=1 32018U 07036A 10284.08361332 -.00000167 00000-0 10000-3 0 5008
-TLE2=2 32018 0.0239 351.9130 0001324 277.8566 44.9341 1.00270370 11684
+NAME=BRASILSAT B3
+NICKNAME=BRASILSAT B3
+TLE1=1 25152U 98006A 11059.39095801 -.00000270 00000-0 10000-3 0 3414
+TLE2=2 25152 0.0576 215.8898 0003172 70.0430 297.6153 1.00274632 47934
-[29252]
+[25986]
VERSION=1.1
-NAME=GENESIS 1
-NICKNAME=GENESIS 1
-TLE1=1 29252U 06029A 10284.88255803 .00000582 00000-0 54954-4 0 1674
-TLE2=2 29252 64.5074 254.0422 0030812 328.6121 31.3156 15.03748299233335
+NAME=ORBCOMM FM34 [+]
+NICKNAME=ORBCOMM FM34 [+]
+TLE1=1 25986U 99065G 11059.25238048 .00000330 00000-0 18361-3 0 446
+TLE2=2 25986 45.0408 138.5962 0003420 286.0803 73.9657 14.29107909586113
-[27830]
+[26719]
VERSION=1.1
-NAME=BSAT-2C
-NICKNAME=BSAT-2C
-TLE1=1 27830U 03028A 10280.72609147 -.00000365 00000-0 10000-3 0 1889
-TLE2=2 27830 0.0829 94.4085 0001194 58.9693 234.1277 1.00270282 26866
+NAME=EUROBIRD 1
+NICKNAME=EUROBIRD 1
+TLE1=1 26719U 01011A 11058.84700042 .00000129 00000-0 10000-3 0 8814
+TLE2=2 26719 0.0739 7.4457 0003768 330.4782 152.7680 1.00274302 36551
-[34602]
+[12458]
VERSION=1.1
-NAME=GOCE
-NICKNAME=GOCE
-TLE1=1 34602U 09013A 10284.59098838 .00001547 19167-5 29727-5 0 4468
-TLE2=2 34602 96.6335 298.4877 0005726 135.1230 225.0503 16.06023658 91867
+NAME=NOVA I
+NICKNAME=NOVA I
+TLE1=1 12458U 81044A 11059.70272405 .00000050 00000-0 10000-3 0 2598
+TLE2=2 12458 90.0569 120.4205 0012711 225.3740 134.6332 13.22732435438009
-[27441]
+[10457]
VERSION=1.1
-NAME=EXPRESS 4A
-NICKNAME=EXPRESS 4A
-TLE1=1 27441U 02029A 10284.87328196 -.00000127 00000-0 10000-3 0 5924
-TLE2=2 27441 1.1250 78.0473 0001774 110.5918 132.0927 1.00269995 30549
+NAME=TRANSAT
+NICKNAME=TRANSAT
+TLE1=1 10457U 77106A 11059.54114672 .00000072 00000-0 10000-3 0 1562
+TLE2=2 10457 89.7009 229.5290 0023794 282.9727 76.8757 13.48296628639695
-[25071]
+[24819]
VERSION=1.1
-NAME=ASTRA 1G
-NICKNAME=ASTRA 1G
-TLE1=1 25071U 97076A 10280.11943277 .00000000 00000-0 10000-3 0 9072
-TLE2=2 25071 0.0593 65.1016 0003256 75.2558 309.8173 1.00268885 47090
+NAME=INMARSAT 3-F4
+NICKNAME=INMARSAT 3-F4
+TLE1=1 24819U 97027A 11058.33789948 -.00000307 00000-0 10000-3 0 5266
+TLE2=2 24819 1.1419 74.2106 0005334 259.1853 251.0704 1.00272306 50386
-[33153]
+[34839]
VERSION=1.1
-NAME=INTELSAT 25 (IS-25)
-NICKNAME=INTELSAT 25 (IS-25)
-TLE1=1 33153U 08034A 10279.94253711 -.00000239 00000-0 10000-3 0 4412
-TLE2=2 33153 0.0405 5.7639 0002867 192.5009 125.0300 1.00269724 8263
+NAME=YAOGAN 6
+NICKNAME=YAOGAN 6
+TLE1=1 34839U 09021A 11060.11054942 .00001248 00000-0 62600-4 0 953
+TLE2=2 34839 97.5700 142.2071 0003147 86.6157 359.1919 15.19205493102887
-[20323]
+[27825]
VERSION=1.1
-NAME=DELTA 1 R/B
-NICKNAME=DELTA 1 R/B
-TLE1=1 20323U 89089B 10284.41151525 .00000078 00000-0 30158-4 0 8842
-TLE2=2 20323 97.1076 225.0530 0073130 190.1683 169.8051 14.46823192101632
+NAME=THURAYA-2
+NICKNAME=THURAYA-2
+TLE1=1 27825U 03026A 11059.79291897 .00000115 00000-0 10000-3 0 9400
+TLE2=2 27825 2.8868 2.0625 0005027 336.2857 149.3540 1.00273653 28330
-[28931]
+[33379]
VERSION=1.1
-NAME=ALOS (DAICHI)
-NICKNAME=ALOS (DAICHI)
-TLE1=1 28931U 06002A 10284.73785572 -.00000186 00000-0 -29624-4 0 2728
-TLE2=2 28931 98.1453 357.4278 0001274 101.8731 258.2609 14.59576555251143
+NAME=COSMOS 2443 (725)
+NICKNAME=COSMOS 2443 (725)
+TLE1=1 33379U 08046B 11058.83479586 -.00000035 00000-0 10000-3 0 6741
+TLE2=2 33379 64.8041 142.5928 0020741 183.6831 329.0594 2.13102434 18871
-[25963]
+[32253]
VERSION=1.1
-NAME=GLOBALSTAR M029
-NICKNAME=GLOBALSTAR M029
-TLE1=1 25963U 99062C 10284.16637017 -.00000086 00000-0 10000-3 0 6241
-TLE2=2 25963 51.9931 174.8851 0000789 95.3758 264.7197 12.62272016512687
+NAME=INTELSAT 11 (IS-11)
+NICKNAME=INTELSAT 11 (IS-11)
+TLE1=1 32253U 07044B 11057.19310660 -.00000289 00000-0 10000-3 0 4955
+TLE2=2 32253 0.0340 273.5387 0002506 67.6138 201.0207 1.00271859 12472
-[11964]
+[20776]
VERSION=1.1
-NAME=GOES 4 [-]
-NICKNAME=GOES 4 [-]
-TLE1=1 11964U 80074A 10281.46120519 -.00000194 00000-0 10000-3 0 6963
-TLE2=2 11964 14.9322 359.7524 0034595 308.5717 51.1156 0.99233391 70775
+NAME=SKYNET 4C
+NICKNAME=SKYNET 4C
+TLE1=1 20776U 90079A 11058.83487912 -.00000041 00000-0 10000-3 0 2368
+TLE2=2 20776 11.0952 40.8971 0003174 297.0321 118.7378 1.00270979 74911
-[6212]
+[26038]
VERSION=1.1
-NAME=OPS 8180 (RADCAT)
-NICKNAME=OPS 8180 (RADCAT)
-TLE1=1 06212U 72076A 10284.74688608 .00005210 00000-0 17208-3 0 1244
-TLE2=2 06212 98.5511 11.6776 0004026 129.7376 230.4211 15.31949417196516
+NAME=GALAXY 11 (G-11)
+NICKNAME=GALAXY 11 (G-11)
+TLE1=1 26038U 99071A 11059.76271833 .00000135 00000-0 10000-3 0 509
+TLE2=2 26038 0.0067 263.9942 0000106 321.5223 240.0482 1.00273583 41086
-[30773]
+[28654]
VERSION=1.1
-NAME=MIDSTAR-1
-NICKNAME=MIDSTAR-1
-TLE1=1 30773U 07006B 10284.52143260 -.00000305 00000-0 00000+0 0 237
-TLE2=2 30773 46.0253 312.1052 0009496 261.8141 98.1683 15.24302411200164
+NAME=NOAA 18
+NICKNAME=NOAA 18
+TLE1=1 28654U 05018A 11059.35823194 .00000092 00000-0 75619-4 0 6855
+TLE2=2 28654 98.9837 10.3087 0015099 53.3562 306.9004 14.11439935297570
-[20479]
+[26631]
VERSION=1.1
-NAME=ORIZURU (DEBUT)
-NICKNAME=ORIZURU (DEBUT)
-TLE1=1 20479U 90013B 10284.10328840 -.00000013 00000-0 36610-4 0 7078
-TLE2=2 20479 99.0190 121.5043 0539565 155.4931 207.2872 12.83697802968736
+NAME=EROS A1
+NICKNAME=EROS A1
+TLE1=1 26631U 00079A 11060.29267045 .00003723 00000-0 20908-3 0 7969
+TLE2=2 26631 97.5571 127.1922 0012778 7.8397 76.7985 15.13878937568954
-[27414]
+[14780]
VERSION=1.1
-NAME=NSS-7
-NICKNAME=NSS-7
-TLE1=1 27414U 02019A 10284.15391502 -.00000184 00000-0 00000+0 0 5754
-TLE2=2 27414 0.0468 72.0140 0002858 130.3031 210.7281 1.00270235 31157
+NAME=LANDSAT 5
+NICKNAME=LANDSAT 5
+TLE1=1 14780U 84021A 11060.13419344 .00000037 00000-0 18342-4 0 6586
+TLE2=2 14780 98.2025 129.1601 0002561 344.0967 16.0156 14.57114730435953
-[25634]
+[11574]
VERSION=1.1
-NAME=ARGOS
-NICKNAME=ARGOS
-TLE1=1 25634U 99008A 10284.09449564 .00000131 00000-0 84555-4 0 1293
-TLE2=2 25634 98.9481 332.4388 0010640 19.3399 340.8156 14.18936819602248
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 11574U 79089B 11059.78522407 .00000066 00000-0 29506-4 0 8067
+TLE2=2 11574 74.0672 142.0619 0016905 271.7043 88.2175 14.39674888645996
-[28474]
+[26610]
VERSION=1.1
-NAME=GPS BIIR-13 (DASS)
-NICKNAME=GPS BIIR-13 (DASS)
-TLE1=1 28474U 04045A 10283.82792572 -.00000000 00000-0 10000-3 0 4219
-TLE2=2 28474 53.8306 197.7424 0094184 180.8996 179.1137 2.00566905 43530
+NAME=STRV 1C
+NICKNAME=STRV 1C
+TLE1=1 26610U 00072C 11059.22222502 .00000014 00000-0 00000+0 0 1746
+TLE2=2 26610 6.5018 70.0409 7336867 120.9512 330.1085 2.03456985 76462
-[25285]
+[36499]
VERSION=1.1
-NAME=IRIDIUM 62 [+]
-NICKNAME=IRIDIUM 62 [+]
-TLE1=1 25285U 98021A 10284.43182969 .00000183 00000-0 58368-4 0 1593
-TLE2=2 25285 86.4002 164.0660 0002263 83.4507 276.6947 14.34219157655180
+NAME=ECHOSTAR 14
+NICKNAME=ECHOSTAR 14
+TLE1=1 36499U 10010A 11059.49366481 -.00000021 00000-0 00000+0 0 2907
+TLE2=2 36499 0.0024 186.5060 0002954 148.8597 241.3826 1.00272770 3507
-[25237]
+[23757]
VERSION=1.1
-NAME=EUROBIRD 16
-NICKNAME=EUROBIRD 16
-TLE1=1 25237U 98013A 10281.08307015 .00000088 00000-0 00000+0 0 1814
-TLE2=2 25237 0.0783 37.1038 0004457 147.5927 237.6119 1.00272457 46508
+NAME=RXTE (XTE)
+NICKNAME=RXTE (XTE)
+TLE1=1 23757U 95074A 11058.98813220 .00002539 00000-0 71174-4 0 3309
+TLE2=2 23757 22.9841 286.8488 0008077 210.2655 149.7400 15.28988803840840
-[28629]
+[25040]
VERSION=1.1
-NAME=EXPRESS-AM 2
-NICKNAME=EXPRESS-AM 2
-TLE1=1 28629U 05010A 10283.71533883 -.00000151 00000-0 10000-3 0 5139
-TLE2=2 28629 0.0832 15.9492 0001147 183.1247 157.6566 1.00270685 20266
+NAME=IRIDIUM 41 [+]
+NICKNAME=IRIDIUM 41 [+]
+TLE1=1 25040U 97069B 11059.21427742 -.00000060 00000-0 -28601-4 0 3563
+TLE2=2 25040 86.3907 263.5766 0001973 78.2732 281.8684 14.34220123696516
-[25773]
+[32394]
VERSION=1.1
-NAME=GLOBALSTAR M052
-NICKNAME=GLOBALSTAR M052
-TLE1=1 25773U 99031D 10283.46365654 -.00000086 00000-0 10000-3 0 9998
-TLE2=2 25773 51.9944 356.0795 0001291 176.6792 183.4073 12.62257477522822
+NAME=COSMOS 2435 (722)
+NICKNAME=COSMOS 2435 (722)
+TLE1=1 32394U 07065B 11059.13033356 -.00000054 00000-0 10000-3 0 6495
+TLE2=2 32394 65.3383 22.2335 0020914 353.0795 326.2943 2.13103352 24652
-[27566]
+[4507]
VERSION=1.1
-NAME=TDRS 10
-NICKNAME=TDRS 10
-TLE1=1 27566U 02055A 10280.97763544 -.00000277 00000-0 10000-3 0 3269
-TLE2=2 27566 0.3130 7.8257 0004738 194.9364 124.8874 1.00268728 28796
+NAME=NNSS 19
+NICKNAME=NNSS 19
+TLE1=1 04507U 70067A 11060.20815792 .00000086 00000-0 10644-3 0 4715
+TLE2=2 04507 89.8476 302.6320 0174556 84.9756 277.1291 13.50193576993610
-[20322]
+[26624]
VERSION=1.1
-NAME=COBE
-NICKNAME=COBE
-TLE1=1 20322U 89089A 10284.03485594 -.00000243 00000-0 -12467-3 0 3084
-TLE2=2 20322 99.0009 286.7890 0007840 221.3640 138.6953 14.04402645 70669
+NAME=ANIK F1
+NICKNAME=ANIK F1
+TLE1=1 26624U 00076A 11055.20245663 .00000000 00000-0 10000-3 0 6657
+TLE2=2 26624 0.0374 113.5394 0002795 244.7911 120.9386 1.00267995 37663
-[28982]
+[21088]
VERSION=1.1
-NAME=ST5-C
-NICKNAME=ST5-C
-TLE1=1 28982U 06008C 10284.51519217 .00010931 17155-5 41134-3 0 5012
-TLE2=2 28982 105.6396 314.7805 2307547 343.1544 10.3742 10.78019388177176
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 21088U 91006B 11059.71406012 .00000060 00000-0 45753-4 0 9525
+TLE2=2 21088 82.9400 289.9897 0021252 280.4898 79.3855 13.76765602 9028
-[36411]
+[31124]
VERSION=1.1
-NAME=GOES 15
-NICKNAME=GOES 15
-TLE1=1 36411U 10008A 10283.37055336 -.00000199 00000-0 10000-3 0 2931
-TLE2=2 36411 0.3267 258.9181 0004915 289.8595 234.2242 1.00270280 2241
+NAME=SAUDICOMSAT 5
+NICKNAME=SAUDICOMSAT 5
+TLE1=1 31124U 07012H 11059.68430488 .00000402 00000-0 89121-4 0 1799
+TLE2=2 31124 97.9097 110.3324 0054497 97.7053 263.0305 14.61168898206377
-[35756]
+[33499]
VERSION=1.1
-NAME=OPTUS D3
-NICKNAME=OPTUS D3
-TLE1=1 35756U 09044B 10280.33649505 -.00000162 00000-0 10000-3 0 1973
-TLE2=2 35756 0.0516 2.7684 0002245 185.4849 104.7685 1.00268864 4166
+NAME=KKS-1
+NICKNAME=KKS-1
+TLE1=1 33499U 09002H 11059.18809659 .00000256 00000-0 49866-4 0 3568
+TLE2=2 33499 98.0722 171.9222 0010772 140.5297 219.6695 14.70928339112588
-[32253]
+[32294]
VERSION=1.1
-NAME=INTELSAT 11 (IS-11)
-NICKNAME=INTELSAT 11 (IS-11)
-TLE1=1 32253U 07044B 10282.07125185 -.00000283 00000-0 10000-3 0 4388
-TLE2=2 32253 0.0093 210.5600 0001674 320.4215 189.2768 1.00270771 11073
+NAME=SKYNET 5B
+NICKNAME=SKYNET 5B
+TLE1=1 32294U 07056B 11059.82459921 .00000079 00000-0 10000-3 0 6238
+TLE2=2 32294 0.0739 3.2137 0004240 341.2405 163.3599 1.00273112 12215
-[23448]
+[25114]
VERSION=1.1
-NAME=RADUGA 32
-NICKNAME=RADUGA 32
-TLE1=1 23448U 94087A 10280.88958568 -.00000059 00000-0 10000-3 0 3114
-TLE2=2 23448 11.2477 46.9122 0004644 106.0672 253.9898 1.00268217 75473
+NAME=ORBCOMM FM11 [+]
+NICKNAME=ORBCOMM FM11 [+]
+TLE1=1 25114U 97084C 11059.60533937 .00000018 00000-0 55807-4 0 4154
+TLE2=2 25114 45.0199 309.6576 0007354 297.2749 62.7347 14.34551919689473
-[26549]
+[35868]
VERSION=1.1
-NAME=SAUDISAT 1B
-NICKNAME=SO-42
-TLE1=1 26549U 00057E 10283.97409926 .00000029 00000-0 23134-4 0 7400
-TLE2=2 26549 64.5548 95.2430 0035428 200.2716 159.6998 14.79591306541993
+NAME=TATIANA 2
+NICKNAME=TATIANA 2
+TLE1=1 35868U 09049D 11060.09734619 .00000178 00000-0 10000-3 0 1575
+TLE2=2 35868 98.7210 116.7780 0003989 341.3162 18.7852 14.22140201 75244
-[25164]
+[23765]
VERSION=1.1
-NAME=GLOBALSTAR M002
-NICKNAME=GLOBALSTAR M002
-TLE1=1 25164U 98008C 10284.20519219 -.00000071 00000-0 10000-3 0 6289
-TLE2=2 25164 52.0042 5.9018 0001523 106.1688 253.9298 11.61427165560976
+NAME=AFRICASAT-1 (MEASAT-1)
+NICKNAME=AFRICASAT-1 (MEASAT-1)
+TLE1=1 23765U 96002B 11058.80671321 .00000111 00000-0 10000-3 0 1475
+TLE2=2 23765 3.1130 71.6238 0001410 332.8257 89.1939 1.00270788 55390
-[24786]
+[32260]
VERSION=1.1
-NAME=GOES 10
-NICKNAME=GOES 10
-TLE1=1 24786U 97019A 10284.06132210 -.00000039 00000-0 10000-3 0 6324
-TLE2=2 24786 4.6932 67.3640 0007336 50.8581 309.2963 0.99072006 49294
+NAME=GPS IIR-17M (DASS)
+NICKNAME=GPS IIR-17M (DASS)
+TLE1=1 32260U 07047A 11058.65956860 -.00000073 00000-0 00000+0 0 9519
+TLE2=2 32260 54.4849 311.9463 0033630 349.9379 10.0382 2.00575815 24761
-[23305]
+[10967]
VERSION=1.1
-NAME=NSS-703
-NICKNAME=NSS-703
-TLE1=1 23305U 94064A 10284.82126727 .00000122 00000-0 10000-3 0 2572
-TLE2=2 23305 1.0647 77.7049 0004687 74.0624 212.4783 1.00066386 58757
+NAME=SEASAT 1
+NICKNAME=SEASAT 1
+TLE1=1 10967U 78064A 11060.15950969 -.00000013 00000-0 37320-4 0 3516
+TLE2=2 10967 108.0065 180.5756 0002965 269.0576 91.0224 14.42257410714846
-[26605]
+[25479]
VERSION=1.1
-NAME=GPS BIIR-06 (PRN 14)
-NICKNAME=GPS BIIR-06 (PRN 14)
-TLE1=1 26605U 00071A 10284.18898078 -.00000076 00000-0 10000-3 0 9809
-TLE2=2 26605 56.4381 321.5825 0058453 239.9974 119.4702 2.00575651 72668
+NAME=ORBCOMM FM25 [+]
+NICKNAME=ORBCOMM FM25 [+]
+TLE1=1 25479U 98053E 11059.07475008 .00000323 00000-0 18058-3 0 3806
+TLE2=2 25479 45.0121 331.1126 0001417 240.0831 119.9889 14.29196735648763
-[25309]
+[26549]
VERSION=1.1
-NAME=GLOBALSTAR M008
-NICKNAME=GLOBALSTAR M008
-TLE1=1 25309U 98023D 10284.49947460 -.00000085 00000-0 10000-3 0 4352
-TLE2=2 25309 51.9960 279.2594 0001425 337.7701 22.3098 12.49966428574741
+NAME=SAUDISAT 1B
+NICKNAME=SO-42
+TLE1=1 26549U 00057E 11059.89557563 .00000109 00000-0 33344-4 0 8600
+TLE2=2 26549 64.5586 21.6936 0017740 162.6174 197.5561 14.79657657562841
-[28393]
+[36112]
VERSION=1.1
-NAME=AMAZONAS
-NICKNAME=AMAZONAS
-TLE1=1 28393U 04031A 10280.36386795 -.00000297 00000-0 10000-3 0 8173
-TLE2=2 28393 0.0308 23.3182 0001051 114.8444 307.7318 1.00267906 22655
+NAME=COSMOS 2457 (733)
+NICKNAME=COSMOS 2457 (733)
+TLE1=1 36112U 09070B 11058.92858743 .00000055 00000-0 00000-0 0 3523
+TLE2=2 36112 64.5656 262.7167 0007148 137.8356 11.2859 2.13101626 9389
-[26931]
+[28892]
VERSION=1.1
-NAME=PCSAT (NO-44)
-NICKNAME=NO-44
-TLE1=1 26931U 01043C 10284.40789874 -.00000122 00000-0 -15345-4 0 5794
-TLE2=2 26931 67.0517 264.5329 0005540 272.8789 87.1700 14.29613508471360
+NAME=UWE-1
+NICKNAME=UWE-1
+TLE1=1 28892U 05043C 11059.22145214 .00000193 00000-0 49461-4 0 8684
+TLE2=2 28892 97.9780 298.8389 0016659 199.8636 160.1916 14.59993694284453
-[33453]
+[25884]
VERSION=1.1
-NAME=CIEL-2
-NICKNAME=CIEL-2
-TLE1=1 33453U 08063A 10283.22390338 .00000043 00000-0 10000-3 0 3455
-TLE2=2 33453 0.0158 220.2034 0003083 337.7026 132.5704 1.00270301 6720
+NAME=GLOBALSTAR M027
+NICKNAME=GLOBALSTAR M027
+TLE1=1 25884U 99043B 11060.08247463 -.00000086 00000-0 10000-3 0 4291
+TLE2=2 25884 52.0083 64.4492 0001185 118.0541 242.0435 12.62266006532170
-[5118]
+[28903]
VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 05118U 71028B 10284.77973568 .00001185 00000-0 84819-4 0 5467
-TLE2=2 05118 81.2382 52.3703 0049688 74.4811 286.1888 15.02644903136433
+NAME=SPACEWAY 2
+NICKNAME=SPACEWAY 2
+TLE1=1 28903U 05046B 11057.39786965 -.00000147 00000-0 10000-3 0 9474
+TLE2=2 28903 0.0050 339.7428 0000299 284.9689 295.2683 1.00271078 19440
-[26720]
+[28509]
VERSION=1.1
-NAME=BSAT-2A
-NICKNAME=BSAT-2A
-TLE1=1 26720U 01011B 10280.72609074 -.00000365 00000-0 10000-3 0 5104
-TLE2=2 26720 0.0500 38.3025 0005927 75.8376 273.4699 1.00271240 35100
+NAME=COSMOS 2413 (712)
+NICKNAME=COSMOS 2413 (712)
+TLE1=1 28509U 04053B 11059.43063976 .00000053 00000-0 10000-3 0 7091
+TLE2=2 28509 63.5072 259.2867 0005488 132.2300 353.1112 2.13097848 48059
-[23833]
+[4793]
VERSION=1.1
-NAME=GPS BIIA-25 (PRN 03)
-NICKNAME=GPS BIIA-25 (PRN 03)
-TLE1=1 23833U 96019A 10282.50967716 .00000033 00000-0 10000-3 0 5130
-TLE2=2 23833 53.1565 131.6614 0134838 59.5117 301.8989 2.00570817106525
+NAME=NOAA 1 [-]
+NICKNAME=NOAA 1 [-]
+TLE1=1 04793U 70106A 11059.43443450 -.00000031 00000-0 10000-3 0 8145
+TLE2=2 04793 102.0960 71.9824 0031828 336.1822 23.7777 12.53944302840784
-[17567]
+[25158]
VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 17567U 87024B 10284.46650749 .00000086 00000-0 77501-5 0 2085
-TLE2=2 17567 82.5291 320.8559 0021231 106.3057 254.0489 14.82232227274747
+NAME=ORBCOMM FM03 [-]
+NICKNAME=ORBCOMM FM03 [-]
+TLE1=1 25158U 98007B 11059.38227530 .00000130 00000-0 10827-3 0 4069
+TLE2=2 25158 107.9621 292.4405 0053287 296.5398 63.0274 14.25717270678045
-[27374]
+[25477]
VERSION=1.1
-NAME=IRIDIUM 94 [S]
-NICKNAME=IRIDIUM 94 [S]
-TLE1=1 27374U 02005C 10284.46301557 .00000179 00000-0 28250-4 0 7802
-TLE2=2 27374 86.5772 226.9967 0002584 82.8287 277.3220 14.66248434463687
+NAME=ORBCOMM FM23 [+]
+NICKNAME=ORBCOMM FM23 [+]
+TLE1=1 25477U 98053C 11059.88934955 .00000099 00000-0 93048-4 0 5089
+TLE2=2 25477 45.0123 327.6890 0000619 32.9586 327.1263 14.29204638648906
-[31862]
+[32791]
VERSION=1.1
-NAME=DIRECTV 10
-NICKNAME=DIRECTV 10
-TLE1=1 31862U 07032A 10283.23494293 -.00000119 00000-0 10000-3 0 5769
-TLE2=2 31862 0.0490 31.0416 0000332 59.0901 270.3990 1.00271874 11969
+NAME=SEEDS II (CO-66)
+NICKNAME=SEEDS II (CO-66)
+TLE1=1 32791U 08021J 11059.72848737 .00000010 00000-0 78561-5 0 9123
+TLE2=2 32791 97.8612 125.4942 0016019 165.3515 194.8179 14.81896071153448
-[36101]
+[20638]
VERSION=1.1
-NAME=EUTELSAT W7
-NICKNAME=EUTELSAT W7
-TLE1=1 36101U 09065A 10284.85848450 .00000139 00000-0 10000-3 0 1784
-TLE2=2 36101 0.0693 359.1479 0003582 198.0149 168.1276 1.00273790 3383
+NAME=ROSAT
+NICKNAME=ROSAT
+TLE1=1 20638U 90049A 11059.84694413 .00020069 00000-0 14989-3 0 2316
+TLE2=2 20638 52.9900 263.0456 0002679 170.8640 189.2427 15.72744669157122
-[25636]
+[28981]
VERSION=1.1
-NAME=SUNSAT (SO-35)
-NICKNAME=SO-35
-TLE1=1 25636U 99008C 10284.12703126 .00000064 00000-0 24171-4 0 7307
-TLE2=2 25636 96.4824 358.4203 0148668 138.8186 222.4342 14.43518595612485
+NAME=ST5-B
+NICKNAME=ST5-B
+TLE1=1 28981U 06008B 11060.00183343 .00016415 16352-5 51936-3 0 6344
+TLE2=2 28981 105.5784 109.5312 2270446 155.3566 217.5621 10.87706339192939
-[19420]
+[27707]
VERSION=1.1
-NAME=OSCAR 31
-NICKNAME=OSCAR 31
-TLE1=1 19420U 88074B 10283.79144135 .00000067 00000-0 10000-3 0 6243
-TLE2=2 19420 89.9366 27.7609 0093663 200.3335 159.4072 13.41885016 83380
+NAME=MOLNIYA 1-92
+NICKNAME=MOLNIYA 1-92
+TLE1=1 27707U 03011A 11059.29424777 -.00000321 00000-0 10000-3 0 8187
+TLE2=2 27707 64.7555 137.2219 7123131 252.9339 64.5468 2.00598536 57961
-[18958]
+[22724]
VERSION=1.1
-NAME=COSMOS 1933
-NICKNAME=COSMOS 1933
-TLE1=1 18958U 88020A 10284.47458672 -.00000096 00000-0 -10716-4 0 1108
-TLE2=2 18958 82.5271 287.2851 0011405 267.5372 92.4554 14.96939910225621
+NAME=INSAT-2B
+NICKNAME=INSAT-2B
+TLE1=1 22724U 93048B 11059.25664610 -.00000140 00000-0 10000-3 0 9661
+TLE2=2 22724 9.3489 55.8150 0012720 52.1097 308.1092 0.99985149 64728
-[16882]
+[24971]
VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 16882U 86055B 10284.27553289 .00000109 00000-0 10843-4 0 3090
-TLE2=2 16882 82.5234 355.9680 0020657 157.0240 203.1888 14.81667498306267
+NAME=IRS-1D
+NICKNAME=IRS-1D
+TLE1=1 24971U 97057A 11060.07612647 .00000057 00000-0 35206-4 0 2661
+TLE2=2 24971 98.1896 73.9301 0053031 237.8232 121.7818 14.33034092701890
-[22245]
+[25173]
VERSION=1.1
-NAME=GORIZONT 27
-NICKNAME=GORIZONT 27
-TLE1=1 22245U 92082A 10284.08588298 -.00000122 00000-0 10000-3 0 5850
-TLE2=2 22245 12.2089 39.6915 0013562 240.0900 119.7553 1.00213824 69764
+NAME=IRIDIUM 53 [+]
+NICKNAME=IRIDIUM 53 [+]
+TLE1=1 25173U 98010E 11059.38209154 .00000000 00000-0 -68926-5 0 3399
+TLE2=2 25173 86.3914 231.8866 0002304 81.3223 278.8235 14.34216808681998
-[25772]
+[25961]
VERSION=1.1
-NAME=GLOBALSTAR M047
-NICKNAME=GLOBALSTAR M047
-TLE1=1 25772U 99031C 10284.43340323 -.00000086 00000-0 10000-3 0 4109
-TLE2=2 25772 51.9981 354.4268 0001091 139.9793 220.0885 12.62255995522945
+NAME=GLOBALSTAR M039
+NICKNAME=GLOBALSTAR M039
+TLE1=1 25961U 99062A 11059.24560035 -.00000086 00000-0 10000-3 0 7177
+TLE2=2 25961 51.9973 333.2914 0000667 87.2743 272.8203 12.62254846520667
-[26298]
+[27605]
VERSION=1.1
-NAME=GALAXY 4R (G-4R)
-NICKNAME=GALAXY 4R (G-4R)
-TLE1=1 26298U 00020A 10282.75981267 -.00000342 00000-0 10000-3 0 8833
-TLE2=2 26298 3.8559 70.6776 0003751 104.3278 255.8764 0.99842315 38462
+NAME=RUBIN-2 & SAFIR-M
+NICKNAME=RUBIN-2 & SAFIR-M
+TLE1=1 27605U 02058A 11059.37601854 -.00000151 00000-0 -13382-5 0 4126
+TLE2=2 27605 64.5581 282.5823 0059535 346.6020 13.3507 14.72541594440402
-[32487]
+[27438]
VERSION=1.1
-NAME=THOR 5
-NICKNAME=THOR 5
-TLE1=1 32487U 08006A 10284.10505635 -.00000025 00000-0 10000-3 0 4254
-TLE2=2 32487 0.0036 201.9850 0002250 357.1486 217.5242 1.00271790 9754
+NAME=INTELSAT 905 (IS-905)
+NICKNAME=INTELSAT 905 (IS-905)
+TLE1=1 27438U 02027A 11059.11339115 -.00000206 00000-0 10000-3 0 2968
+TLE2=2 27438 0.0318 260.7347 0003194 88.2800 184.8518 1.00270921 32046
-[28649]
+[26619]
VERSION=1.1
-NAME=IRS-P5 (CARTOSAT-1)
-NICKNAME=IRS-P5 (CARTOSAT-1)
-TLE1=1 28649U 05017A 10284.74003201 .00000224 00000-0 34378-4 0 1285
-TLE2=2 28649 97.9079 356.5747 0001025 65.0944 295.0367 14.82640500294215
+NAME=EO-1
+NICKNAME=EO-1
+TLE1=1 26619U 00075A 11060.10698838 .00000472 00000-0 10298-3 0 208
+TLE2=2 26619 98.1372 128.5525 0010841 153.7167 206.4619 14.62199563547143
-[25169]
+[25413]
VERSION=1.1
-NAME=IRIDIUM 52 [+]
-NICKNAME=IRIDIUM 52 [+]
-TLE1=1 25169U 98010A 10284.48988405 -.00000059 00000-0 -28023-4 0 9324
-TLE2=2 25169 86.3908 290.4050 0002398 85.6851 274.4625 14.34217350661951
+NAME=ORBCOMM FM17 [-]
+NICKNAME=ORBCOMM FM17 [-]
+TLE1=1 25413U 98046A 11059.52490342 .00000242 00000-0 15293-3 0 5354
+TLE2=2 25413 44.9961 245.3605 0001683 174.5310 185.5549 14.27747441655480
-[23757]
+[31577]
VERSION=1.1
-NAME=RXTE (XTE)
-NICKNAME=RXTE (XTE)
-TLE1=1 23757U 95074A 10283.86196354 .00002405 00000-0 67891-4 0 2321
-TLE2=2 23757 22.9821 207.6013 0007946 250.7749 109.1874 15.28405337819375
+NAME=CHINASAT 5C (ZX 5C)
+NICKNAME=CHINASAT 5C (ZX 5C)
+TLE1=1 31577U 07021A 11059.91587235 -.00000024 00000-0 10000-3 0 823
+TLE2=2 31577 0.0718 253.9812 0002932 21.8406 287.1585 0.99873943 13752
-[25345]
+[28790]
VERSION=1.1
-NAME=IRIDIUM 74 [S]
-NICKNAME=IRIDIUM 74 [S]
-TLE1=1 25345U 98032D 10284.27562978 .00000132 00000-0 33326-4 0 1878
-TLE2=2 25345 86.4512 164.2854 0002424 84.4221 275.7250 14.42967390650767
+NAME=GALAXY 14 (G-14)
+NICKNAME=GALAXY 14 (G-14)
+TLE1=1 28790U 05030A 11057.74398221 .00000016 00000-0 10000-3 0 693
+TLE2=2 28790 0.0345 286.0767 0002296 56.8921 316.0610 1.00273151 20263
-[28463]
+[35635]
VERSION=1.1
-NAME=EXPRESS-AM 1
-NICKNAME=EXPRESS-AM 1
-TLE1=1 28463U 04043A 10284.83711882 .00000134 00000-0 10000-3 0 8606
-TLE2=2 28463 0.3966 76.3729 0003649 147.9981 137.3287 1.00273608 21791
+NAME=COSMOS 2454
+NICKNAME=COSMOS 2454
+TLE1=1 35635U 09039A 11060.08322377 .00000138 00000-0 10000-3 0 2419
+TLE2=2 35635 82.9558 301.2529 0020706 42.2366 318.0384 13.89404116 81633
-[25115]
+[18187]
VERSION=1.1
-NAME=ORBCOMM FM12 [+]
-NICKNAME=ORBCOMM FM12 [+]
-TLE1=1 25115U 97084D 10283.42154965 .00000223 00000-0 12792-3 0 3010
-TLE2=2 25115 45.0185 254.8054 0007841 303.4047 56.6052 14.34467427669207
+NAME=COSMOS 1867
+NICKNAME=COSMOS 1867
+TLE1=1 18187U 87060A 11059.78965743 -.00000078 00000-0 83810-5 0 1129
+TLE2=2 18187 65.0108 185.7724 0019749 261.3991 98.4851 14.30876848234847
-[25414]
+[28912]
VERSION=1.1
-NAME=ORBCOMM FM18 [+]
-NICKNAME=ORBCOMM FM18 [+]
-TLE1=1 25414U 98046B 10284.70862270 .00000676 00000-0 32453-3 0 3892
-TLE2=2 25414 44.9958 176.2173 0002893 273.5456 86.5048 14.28193009635516
+NAME=METEOSAT-9 (MSG-2)
+NICKNAME=METEOSAT-9 (MSG-2)
+TLE1=1 28912U 05049B 11059.89120503 -.00000017 00000-0 10000-3 0 8402
+TLE2=2 28912 0.2754 5.1486 0001121 298.6679 176.0650 1.00282094 19087
-[25291]
+[26243]
VERSION=1.1
-NAME=IRIDIUM 68 [+]
-NICKNAME=IRIDIUM 68 [+]
-TLE1=1 25291U 98021G 10284.19081273 .00000184 00000-0 58464-4 0 1508
-TLE2=2 25291 86.3997 164.2323 0002434 85.1507 274.9978 14.34218959655124
+NAME=SESAT 1
+NICKNAME=SESAT 1
+TLE1=1 26243U 00019A 11058.79780447 .00000083 00000-0 00000+0 0 8313
+TLE2=2 26243 0.0776 9.7612 0002643 256.5728 194.1507 1.00272896 39794
-[28220]
+[27844]
VERSION=1.1
-NAME=TANSUO 1
-NICKNAME=TANSUO 1
-TLE1=1 28220U 04012A 10284.68490071 .00000326 00000-0 40116-4 0 6625
-TLE2=2 28220 97.4535 300.0680 0012934 36.4546 323.7585 14.88941612352055
+NAME=CUTE-1 (CO-55)
+NICKNAME=CO-55
+TLE1=1 27844U 03031E 11059.58492179 .00000050 00000-0 43307-4 0 552
+TLE2=2 27844 98.7084 69.8581 0009969 147.5970 212.5813 14.20771589397494
-[28980]
+[16909]
VERSION=1.1
-NAME=ST5-A
-NICKNAME=ST5-A
-TLE1=1 28980U 06008A 10284.73378555 .00009474 00000-0 53015-3 0 4210
-TLE2=2 28980 105.7085 291.3207 2336754 7.5961 355.4781 10.65695407176164
+NAME=JAS-1 (FO-12)
+NICKNAME=FO-12
+TLE1=1 16909U 86061B 11060.01213486 -.00000083 00000-0 10000-3 0 8567
+TLE2=2 16909 50.0161 50.2490 0010895 350.0767 9.9848 12.44454812116406
-[29709]
+[32277]
VERSION=1.1
-NAME=LAPAN-TUBSAT
-NICKNAME=LAPAN-TUBSAT
-TLE1=1 29709U 07001A 10284.75384775 .00000032 00000-0 10752-4 0 1699
-TLE2=2 29709 97.7463 330.6013 0013812 150.2448 209.9544 14.80325476202726
+NAME=COSMOS 2431 (718)
+NICKNAME=COSMOS 2431 (718)
+TLE1=1 32277U 07052C 11059.82562441 -.00000027 00000-0 00000+0 0 9060
+TLE2=2 32277 64.8998 142.9721 0019191 193.2404 204.7412 2.13202516 26119
-[27434]
+[28890]
VERSION=1.1
-NAME=OFEQ 5
-NICKNAME=OFEQ 5
-TLE1=1 27434U 02025A 10284.89302730 .00002004 00000-0 10167-3 0 6458
-TLE2=2 27434 143.4646 300.7772 0023712 72.1896 9.7943 15.06256781465945
+NAME=BEIJING 1
+NICKNAME=BEIJING 1
+TLE1=1 28890U 05043A 11060.12648960 -.00000014 00000-0 64877-5 0 1257
+TLE2=2 28890 97.9725 300.0480 0015272 191.9539 168.1305 14.60136868284660
-[22921]
+[21576]
VERSION=1.1
-NAME=NATO 4B
-NICKNAME=NATO 4B
-TLE1=1 22921U 93076A 10283.81497339 .00000133 00000-0 10000-3 0 3949
-TLE2=2 22921 8.8079 48.0239 0002479 153.6975 145.6877 1.00269191 61705
+NAME=ORBCOMM-X [-]
+NICKNAME=ORBCOMM-X [-]
+TLE1=1 21576U 91050C 11059.93567630 .00000082 00000-0 40271-4 0 5513
+TLE2=2 21576 98.5539 18.3537 0003689 349.5542 10.5568 14.40071026 30033
-[25315]
+[25106]
VERSION=1.1
-NAME=COSMOS 2350
-NICKNAME=COSMOS 2350
-TLE1=1 25315U 98025A 10281.89205836 -.00000130 00000-0 10000-3 0 5145
-TLE2=2 25315 8.4738 56.6626 0008023 18.8492 341.2064 1.00260244 45596
+NAME=IRIDIUM 47 [+]
+NICKNAME=IRIDIUM 47 [+]
+TLE1=1 25106U 97082C 11059.26407682 .00000142 00000-0 43723-4 0 3074
+TLE2=2 25106 86.3991 137.1513 0002388 86.3610 273.7871 14.34220834690571
-[35873]
+[23915]
VERSION=1.1
-NAME=NIMIQ 5
-NICKNAME=NIMIQ 5
-TLE1=1 35873U 09050A 10283.70265278 -.00000272 00000-0 10000-3 0 1797
-TLE2=2 35873 0.0529 76.8809 0001972 129.1331 353.4375 1.00270864 3923
+NAME=INTELSAT 709 (IS-709)
+NICKNAME=INTELSAT 709 (IS-709)
+TLE1=1 23915U 96035A 11058.90346279 .00000065 00000-0 10000-3 0 2873
+TLE2=2 23915 0.0125 234.6669 0002902 102.3490 200.4175 1.00273004 53888
-[27372]
+[24969]
VERSION=1.1
-NAME=IRIDIUM 91 [+]
-NICKNAME=IRIDIUM 91 [+]
-TLE1=1 27372U 02005A 10284.30546783 .00000100 00000-0 28562-4 0 6994
-TLE2=2 27372 86.3972 227.5506 0002210 339.3211 20.7914 14.34218287461770
+NAME=IRIDIUM 34 [+]
+NICKNAME=IRIDIUM 34 [+]
+TLE1=1 24969U 97056E 11059.30261702 .00000169 00000-0 53383-4 0 3608
+TLE2=2 24969 86.3976 200.3651 0002258 84.4040 275.7423 14.34217455702741
-[25172]
+[21111]
VERSION=1.1
-NAME=IRIDIUM 50 [+]
-NICKNAME=IRIDIUM 50 [+]
-TLE1=1 25172U 98010D 10284.33766312 -.00000053 00000-0 -25959-4 0 1829
-TLE2=2 25172 86.3906 290.4443 0002435 81.5346 278.6130 14.34217184661913
+NAME=COSMOS 2133
+NICKNAME=COSMOS 2133
+TLE1=1 21111U 91010A 11058.46253364 -.00000091 00000-0 10000-3 0 3523
+TLE2=2 21111 12.4172 35.4822 0008872 356.4729 3.5621 1.00283183 73407
-[21701]
+[17590]
VERSION=1.1
-NAME=UARS
-NICKNAME=UARS
-TLE1=1 21701U 91063B 10284.18486319 .00018864 00000-0 17826-3 0 956
-TLE2=2 21701 56.9677 43.1212 0061683 42.5093 318.0724 15.64689108 54230
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 17590U 87027B 11059.05466112 -.00000226 00000-0 -89351-4 0 7661
+TLE2=2 17590 71.0053 314.7007 0006689 223.9157 136.1406 14.16496343238241
-[22827]
+[25395]
VERSION=1.1
-NAME=HEALTHSAT 1
-NICKNAME=HEALTHSAT 1
-TLE1=1 22827U 93061E 10284.86190874 -.00000018 00000-0 94407-5 0 6613
-TLE2=2 22827 98.4909 231.8832 0008032 253.2108 106.8194 14.30222819889076
+NAME=FASAT B
+NICKNAME=FASAT B
+TLE1=1 25395U 98043B 11060.01018683 -.00000015 00000-0 10938-4 0 9771
+TLE2=2 25395 98.3000 67.7562 0002685 162.8773 197.2506 14.24422604656965
-[28154]
+[32373]
VERSION=1.1
-NAME=AMC-10 (GE-10)
-NICKNAME=AMC-10 (GE-10)
-TLE1=1 28154U 04003A 10284.18934516 .00000072 00000-0 10000-3 0 2995
-TLE2=2 28154 0.0569 75.5377 0002741 126.1037 111.1952 1.00272691 24497
+NAME=RADUGA-1M 1
+NICKNAME=RADUGA-1M 1
+TLE1=1 32373U 07058A 11059.89810826 -.00000059 00000-0 10000-3 0 9300
+TLE2=2 32373 0.0200 233.6790 0001647 107.5076 210.4614 1.00272611 12704
-[25078]
+[25112]
VERSION=1.1
-NAME=IRIDIUM 44 [-]
-NICKNAME=IRIDIUM 44 [-]
-TLE1=1 25078U 97077B 10284.36963553 .00000181 00000-0 54899-4 0 6869
-TLE2=2 25078 86.3981 316.8377 0003037 38.1297 322.0113 14.36654799673010
+NAME=ORBCOMM FM08 [+]
+NICKNAME=ORBCOMM FM08 [+]
+TLE1=1 25112U 97084A 11059.16086884 .00000161 00000-0 10626-3 0 7541
+TLE2=2 25112 45.0205 311.2901 0009804 317.8368 42.1737 14.34538955689412
-[32266]
+[32478]
VERSION=1.1
-NAME=GLOBALSTAR M068
-NICKNAME=GLOBALSTAR M068
-TLE1=1 32266U 07048D 10283.92396296 -.00000086 00000-0 10000-3 0 55
-TLE2=2 32266 51.9826 86.5148 0002159 105.4822 254.6283 12.62260642140324
+NAME=EXPRESS-AM 33
+NICKNAME=EXPRESS-AM 33
+TLE1=1 32478U 08003A 11058.64111898 -.00000301 00000-0 10000-3 0 8547
+TLE2=2 32478 0.0429 296.2083 0001755 168.6702 19.4897 1.00270018 11604
-[28899]
+[33278]
VERSION=1.1
-NAME=INMARSAT 4-F2
-NICKNAME=INMARSAT 4-F2
-TLE1=1 28899U 05044A 10281.65001435 .00000120 00000-0 10000-3 0 4009
-TLE2=2 28899 2.2169 325.7329 0002682 246.8821 63.6649 1.00273483 18054
+NAME=INMARSAT 4-F3
+NICKNAME=INMARSAT 4-F3
+TLE1=1 33278U 08039A 11059.49731669 -.00000159 00000-0 10000-3 0 850
+TLE2=2 33278 3.0122 338.6679 0002855 354.4466 266.2057 1.00271175 9301
-[35004]
+[10703]
VERSION=1.1
-NAME=HAWKSAT 1
-NICKNAME=HAWKSAT 1
-TLE1=1 35004U 09028D 10283.93671575 .00017960 00000-0 32230-3 0 4102
-TLE2=2 35004 40.4602 224.7130 0021084 185.4399 174.6178 15.49178555 78653
+NAME=OSCAR 8 (AO-8)
+NICKNAME=AO-8
+TLE1=1 10703U 78026B 11060.12055364 -.00000267 00000-0 -15599-3 0 909
+TLE2=2 10703 98.7485 89.7280 0006284 243.7582 116.2935 13.98880871682971
-[27942]
+[27600]
VERSION=1.1
-NAME=UK-DMC
-NICKNAME=UK-DMC
-TLE1=1 27942U 03042D 10284.83119946 .00007040 00000-0 10000-2 0 9881
-TLE2=2 27942 97.8829 144.8965 0067700 68.1601 292.6757 14.75639946375982
+NAME=MICRO LABSAT
+NICKNAME=MICRO LABSAT
+TLE1=1 27600U 02056D 11...
[truncated message content] |
|
From: <cs...@us...> - 2011-02-28 03:30:38
|
Revision: 774
http://gpredict.svn.sourceforge.net/gpredict/?rev=774&view=rev
Author: csete
Date: 2011-02-28 03:30:30 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
Fixed spelling error.
Modified Paths:
--------------
trunk/src/tle-update.c
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2011-02-22 16:02:56 UTC (rev 773)
+++ trunk/src/tle-update.c 2011-02-28 03:30:30 UTC (rev 774)
@@ -815,7 +815,7 @@
else {
catsync = FALSE;
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Could not reopne .cat file while reading TLE from %s"),
+ _("%s:%s: Could not reopen .cat file while reading TLE from %s"),
__FILE__, __FUNCTION__, fnam);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-22 16:03:03
|
Revision: 773
http://gpredict.svn.sourceforge.net/gpredict/?rev=773&view=rev
Author: aa1vs
Date: 2011-02-22 16:02:56 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Added more locations in Ukraine after user request.
Modified Paths:
--------------
trunk/data/locations.dat
Modified: trunk/data/locations.dat
===================================================================
--- trunk/data/locations.dat 2011-02-22 14:54:52 UTC (rev 772)
+++ trunk/data/locations.dat 2011-02-22 16:02:56 UTC (rev 773)
@@ -1821,15 +1821,23 @@
Europe;Turkey;Mugla/Dalaman;LTBS;36.7;28.7833;2
Europe;Turkey;Trabzon;LTCG;41;39.7167;30
Europe;Turkey;Van;LTCI;38.45;43.3167;1661
+Europe;Ukraine;Cherkasy;UKKE;49.416;31.996;114
+Europe;Ukraine;Chernovsty;UKLN;48.260;25.982;252
Europe;Ukraine;Dnipropetrovsk;UKDD;48.5333;34.6667;0
Europe;Ukraine;Donetsk;UKCC;48.0833;37.75;0
+Europe;Ukraine;Hostomel;UKKM;50.600;30.194;157
+Europe;Ukraine;Ivano-Frankivsk;UKLI;48.884;24.686;280
Europe;Ukraine;Kharkiv;UKHH;49.9667;36.1333;155
Europe;Ukraine;Kryviy Rig/Lozovatka;UKDR;48.05;33.22;0
Europe;Ukraine;Kyiv/Boryspil;UKBB;50.3333;30.9667;122
Europe;Ukraine;Kyiv/Zhulyany;UKKK;50.4;30.5667;167
Europe;Ukraine;Lviv;UKLL;49.8167;23.95;323
+Europe;Ukraine;Mykolaiv;UKON;47.058;31.921;56
Europe;Ukraine;Odesa;UKOO;46.4333;30.7667;42
+Europe;Ukraine;Rivne;UKLR;50.583;26.133;231
Europe;Ukraine;Sympheropol;UKFF;44.6833;34.1333;181
+Europe;Ukraine;Uzhhorod;UKLU;48.635;22.265;117
+Europe;Ukraine;Zaporizhzhia / Mokraya;UKDE;47.867;35.316;114
Europe;United Kingdom;Aberdeen;EGPD;57.2;-2.2167;0
Europe;United Kingdom;Alderney;EGJA;49.7167;-2.2;0
Europe;United Kingdom;Belfast/Aldergrove;EGAA;54.65;-6.2167;0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-22 14:54:58
|
Revision: 772
http://gpredict.svn.sourceforge.net/gpredict/?rev=772&view=rev
Author: aa1vs
Date: 2011-02-22 14:54:52 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Eliminate compiler warning for unused variable.
Modified Paths:
--------------
trunk/src/main.c
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2011-02-22 14:51:20 UTC (rev 771)
+++ trunk/src/main.c 2011-02-22 14:54:52 UTC (rev 772)
@@ -446,7 +446,7 @@
static gboolean
tle_mon_task (gpointer data)
{
- GtkWidget *selector;
+ /*GtkWidget *selector;*/
glong last,now,thrld;
GTimeVal tval;
GtkWidget *dialog;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-22 14:51:26
|
Revision: 771
http://gpredict.svn.sourceforge.net/gpredict/?rev=771&view=rev
Author: aa1vs
Date: 2011-02-22 14:51:20 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Eliminate compiler warning in gtk-single-sat.c
Modified Paths:
--------------
trunk/src/gtk-single-sat.c
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-02-20 21:33:14 UTC (rev 770)
+++ trunk/src/gtk-single-sat.c 2011-02-22 14:51:20 UTC (rev 771)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -724,7 +725,7 @@
GtkSingleSat *single_sat = GTK_SINGLE_SAT (user_data);
sat_t *sat = SAT (value);
- single_sat->sats = g_slist_insert_sorted (single_sat->sats,sat, sat_name_compare);
+ single_sat->sats = g_slist_insert_sorted (single_sat->sats,sat, (GCompareFunc) sat_name_compare);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-20 21:33:20
|
Revision: 770
http://gpredict.svn.sourceforge.net/gpredict/?rev=770&view=rev
Author: aa1vs
Date: 2011-02-20 21:33:14 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
Update ChangeLog and NEWS
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-02-20 20:34:54 UTC (rev 769)
+++ trunk/ChangeLog 2011-02-20 21:33:14 UTC (rev 770)
@@ -1,3 +1,23 @@
+2011-02-20 Charles Suprin <hamaa1vs at gmail.com>
+
+ * data/desktop/gpredict.desktop.in
+ Change categories in .desktop to fix issues w/ fedora and ubuntu packaging.
+
+2011-02-19 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-polar-plot.c
+ * src/gtk-polar-view-popup.c
+ * src/gtk-polar-view.c
+ Do not polar plot pass points below the horizon.
+
+2011-02-16 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-rot-ctrl.c
+ Remove Hamlib error checking from rotator to allow ST-1 to work.
+
+ * src/gtk-rot-knob.c
+ Eliminate printf when bounds exceeded.
+
2011-02-14 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-selector.c
@@ -5,6 +25,12 @@
* src/mod-cfg.c
List a satellite under the available column or the selected column but not both.
+ * src/gtk-polar-view-popup.c
+ Prevent potential buffer overflow in track_toggled by limiting ttidx.
+
+ * src/Makefile.am
+ Remove reference to defaults.h.
+
2011-02-08 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-selector.c
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-02-20 20:34:54 UTC (rev 769)
+++ trunk/NEWS 2011-02-20 21:33:14 UTC (rev 770)
@@ -10,6 +10,8 @@
- Fixed bug 2167508: problems in rotator controller.
- Fixed bug from Ubuntu #706452:Update from local files won't work with files in UPPER case
- Fixed bug 3171615: Searching for satellites in the satellite selector
+- Fixed bug 3113190: .desktop file error
+- Address bug 2945538: Pass in polar display going outside the circle (Improve the graphical portion.)
Changes in version 1.2 (12 Oct 2010)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-20 20:35:00
|
Revision: 769
http://gpredict.svn.sourceforge.net/gpredict/?rev=769&view=rev
Author: aa1vs
Date: 2011-02-20 20:34:54 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
Change categories in .desktop to fix issues with fedora and ubuntu packaging.
Modified Paths:
--------------
trunk/data/desktop/gpredict.desktop.in
Modified: trunk/data/desktop/gpredict.desktop.in
===================================================================
--- trunk/data/desktop/gpredict.desktop.in 2011-02-19 23:27:37 UTC (rev 768)
+++ trunk/data/desktop/gpredict.desktop.in 2011-02-20 20:34:54 UTC (rev 769)
@@ -5,4 +5,4 @@
Icon=gpredict-icon
Terminal=false
Type=Application
-Categories=HamRadio;
+Categories=HamRadio;Science;Astronomy;Education;Network;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-19 23:27:43
|
Revision: 768
http://gpredict.svn.sourceforge.net/gpredict/?rev=768&view=rev
Author: aa1vs
Date: 2011-02-19 23:27:37 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
Do not polar plot pass points below the horizon.
Modified Paths:
--------------
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view.c
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2011-02-16 12:39:58 UTC (rev 767)
+++ trunk/src/gtk-polar-plot.c 2011-02-19 23:27:37 UTC (rev 768)
@@ -932,7 +932,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ if (detail->el >= 0.0)
+ azel_to_xy (pv, detail->az, detail->el, &x, &y);
points->coords[2*i] = (double) x;
points->coords[2*i+1] = (double) y;
@@ -1042,7 +1043,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ if (detail->el>=0.0)
+ azel_to_xy (pv, detail->az, detail->el, &x, &y);
points->coords[2*i] = (double) x;
points->coords[2*i+1] = (double) y;
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-02-16 12:39:58 UTC (rev 767)
+++ trunk/src/gtk-polar-view-popup.c 2011-02-19 23:27:37 UTC (rev 768)
@@ -234,7 +234,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ if (detail->el >=0.0)
+ azel_to_xy (pv, detail->az, detail->el, &x, &y);
points->coords[2*i] = (double) x;
points->coords[2*i+1] = (double) y;
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-02-16 12:39:58 UTC (rev 767)
+++ trunk/src/gtk-polar-view.c 2011-02-19 23:27:37 UTC (rev 768)
@@ -1030,7 +1030,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ if (detail->el>=0)
+ azel_to_xy (pv, detail->az, detail->el, &x, &y);
points->coords[2*i] = (double) x;
points->coords[2*i+1] = (double) y;
@@ -1175,10 +1176,11 @@
obj->trtick[0] = create_time_tick (pv, obj->pass->aos, x, y);
ttidx = 1;
-
+
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ if (detail->el >= 0.0 )
+ azel_to_xy (pv, detail->az, detail->el, &x, &y);
points->coords[2*i] = (double) x;
points->coords[2*i+1] = (double) y;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-16 12:40:04
|
Revision: 767
http://gpredict.svn.sourceforge.net/gpredict/?rev=767&view=rev
Author: aa1vs
Date: 2011-02-16 12:39:58 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
Eliminate printf when bounds exceeded
Modified Paths:
--------------
trunk/src/gtk-rot-knob.c
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2011-02-16 12:31:41 UTC (rev 766)
+++ trunk/src/gtk-rot-knob.c 2011-02-16 12:39:58 UTC (rev 767)
@@ -465,7 +465,7 @@
knob->value=knob->min;
}
} else {
- g_print("Val: %.2f %.2f %.10f\n",knob->value,delta,knob->value+delta);
+ //g_print("Val: %.2f %.2f %.10f\n",knob->value,delta,knob->value+delta);
}
gtk_rot_knob_update (knob);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
