From 6a510dc82f3050640dfe6b8d499995348075fe7a Mon Sep 17 00:00:00 2001 From: minima Date: Fri, 14 Dec 2001 17:30:59 +0000 Subject: [PATCH] 1. make Spanish in set/lang & Messages 'es' instead of 'sp' 2. added prototype WCY and WWV commands (for qualified users only) --- Changes | 3 + cmd/set/language.pl | 2 +- cmd/show/var.pl | 4 +- cmd/wcy.pl | 69 ++ cmd/wwv.pl | 71 ++ perl/DXProt.pm | 4 +- perl/Geomag.pm | 5 +- perl/Keps.pm | 1579 ++++++++++++++++++++++--------------------- perl/Messages | 4 +- perl/WCY.pm | 9 +- 10 files changed, 964 insertions(+), 786 deletions(-) create mode 100644 cmd/wcy.pl create mode 100644 cmd/wwv.pl diff --git a/Changes b/Changes index 18056418..4ddfdd07 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +14Dec01======================================================================= +1. make Spanish in set/lang & Messages 'es' instead of 'sp' +2. added prototype WCY and WWV commands (for qualified users only) 12Dec01======================================================================= 1. added Commands_de.hlp contributed (in record time) by Stephan DK8LV. 2. fixed help command so it uses it! diff --git a/cmd/set/language.pl b/cmd/set/language.pl index 663e9426..2072f4fd 100644 --- a/cmd/set/language.pl +++ b/cmd/set/language.pl @@ -11,7 +11,7 @@ my $call = $self->call; my $user; # modify this next line if you add a language to Messages -my @lang = qw( en nl sp de ); +my @lang = qw( en nl es de ); # remove leading and trailing spaces $line =~ s/^\s+//; diff --git a/cmd/show/var.pl b/cmd/show/var.pl index de35e55f..eee2432f 100644 --- a/cmd/show/var.pl +++ b/cmd/show/var.pl @@ -19,8 +19,8 @@ foreach $f (@f) { # print "\$f = $f\n"; my @in; push @in, (eval $f); - if (defined @in) { - my $dd = Data::Dumper->new([ @in ], [ "$f" ]); + if (@in) { + my $dd = Data::Dumper->new([ \@in ], [ "$f" ]); $dd->Indent(1); $dd->Quotekeys(0); my $s = $dd->Dumpxs; diff --git a/cmd/wcy.pl b/cmd/wcy.pl new file mode 100644 index 00000000..c874b2e2 --- /dev/null +++ b/cmd/wcy.pl @@ -0,0 +1,69 @@ +# +# WCY command +# +# This can only be used if the appropriate flag is enabled. +# +# I would STRONGLY recommend that, unless your callsign is DK8LV, you +# DO NOT ENABLE THIS COMMAND - YES THAT MEANS YOU!!! +# +# The command line sent from DK0WCY (the only known valid source of data +# for this command [and its only legitimate user BTW]):- +# +# WCY k=6,expk=5,a=25,r=220,sf=202,sa=act,gmf=act,au=strong +# +# k: Kiel k-Index (0..9) +# expK: expected Kiel k-index for the current 3-h-measuring period +# A: Kiel A-Index (0..400) +# R: Sunspot Number, SSN (0..300) +# SF: Solar Flux Index (65..300) +# SA: Sun Activity (qui,eru,act,maj,pro,war,nil) +# GMF: Geomagnetic Field (qui,act,min,maj,sev,mag,war,nil) +# AU: Aurora Status (no,aurora,strong) +# +# Copyright (c) 2001 Dirk Koopman G1TLH +# +# $Id$ +# +my ($self, $line) = @_; +my $call = $self->call; +$call =~ s/-\d+$//; +return (1, $self->msg('e5')) unless grep $call eq $_, @WCY::allowed; +my @out; + +# calc 18 minutes past the hour in time_t seconds +my $hour = (gmtime $main::systime)[2]; +my $d = int ($main::systime / 3600) * 3600 + 18 * 60; + +# make a hash out of the args +my %args = map {split /\s*=\s*/} split /\s*,\s*/, lc $line; + +# check the ranges of each one +push @out, $self->msg('wcy1', 'k') unless $args{k} && $args{k} >= 0 && $args{k} <= 9; +push @out, $self->msg('wcy1', 'espk') unless $args{expk} && $args{expk} >= 0 && $args{expk} <= 9; +push @out, $self->msg('wcy1', 'a') unless $args{a} && $args{a} >= 0 && $args{a} <= 400; +push @out, $self->msg('wcy1', 'r') unless $args{r} && $args{r} >= 0 && $args{r} <= 300; +push @out, $self->msg('wcy1', 'sf') unless $args{sf} && $args{sf} >= 65 && $args{sf} <= 300; +push @out, $self->msg('wcy1', 'sa') unless $args{sa} && grep $args{sa} eq $_, qw(qui eru act maj pro war nil); +push @out, $self->msg('wcy1', 'gmf') unless $args{gmf} && grep $args{gmf} eq $_, qw(qui act min maj sev mag war nil); +push @out, $self->msg('wcy1', 'au') unless $args{au} && grep $args{au} eq $_, qw(no aurora strong); + +push @out, $self->msg('wcy2') if WCY::dup($d); +#$DB::single=1; + +return (1, @out) if @out; + +# now this is all subject to change, but it will do for now, I think. +my $today = cldate($main::systime); + +# PC73^14-Dec-2001^15^220^ 3^1^0^212^act^qui^no^DK0WCY-3^DB0SUE-7^H96^ +# Date Hour SFI A K Exp.K R SA GMF Aurora Logger +# 14-Dec-2001 15 220 3 1 0 212 act qui no +my @field = ('PC73',$today,$hour,$args{sf},$args{a},$args{k},$args{expk},$args{r},$args{sa},$args{gmf},$args{au}, $self->call ,$main::mycall, 'H99'); + +my $s = join('^', @field) . '^'; +WCY::update($d, @field[2..12]); +DXProt::send_wcy_spot($self, $s, $d, @field[2..12]); +$self->wcy($s, 0, @field[1..12]); +return (1, @out); + + diff --git a/cmd/wwv.pl b/cmd/wwv.pl new file mode 100644 index 00000000..dd7a6de5 --- /dev/null +++ b/cmd/wwv.pl @@ -0,0 +1,71 @@ +# +# WWV command +# +# This can only be used if the appropriate flag is enabled. +# +# I would STRONGLY recommend that you +# DO NOT ENABLE THIS COMMAND - YES THAT MEANS YOU!!! +# +# There are enough internet sources of WWV, you should really +# only enable a callsign for posting WWV spots if it is some +# RELIABLE automatic feed from somewhere. +# +# If you want to allow this command then you need to know that +# you must set/var @Geomag::allowed = qw(call call call) for EVERY +# callsign that issues wwv not just on your node but from outside +# AS WELL. +# +# I am making this deliberately hard because I believe that you are +# either a RELIABLE (probably machine generated) source of WWV or +# you shouldn't be doing it (and will have consequent problems). +# +# Copyright (c) 2001 Dirk Koopman G1TLH +# +# $Id$ +# +my ($self, $line) = @_; +my $call = $self->call; +$call =~ s/-\d+$//; +return (1, $self->msg('e5')) unless grep $call eq $_, @Geomag::allowed; + +my @out; + +#$DB::single = 1; + +# calc 18 minutes past the hour in time_t seconds +my $hour = (gmtime $main::systime)[2]; +my $d = int ($main::systime / 3600) * 3600 + 18 * 60; + +my @l = split /\s*,\s*/, $line; +my $forecast = pop @l; +$forecast = unpad($forecast); + +# make a hash out of the args +my %args = map {split /\s*=\s*/, lc $_} @l; + +# check the ranges of each one +push @out, $self->msg('wwv1', 'k') unless $args{k} && $args{k} >= 0 && $args{k} <= 9; +push @out, $self->msg('wwv1', 'a') unless $args{a} && $args{a} >= 0 && $args{a} <= 400; +push @out, $self->msg('wwv1', 'sf') unless $args{sf} && $args{sf} >= 65 && $args{sf} <= 300; +push @out, $self->msg('wwv1', 'forecast') unless $forecast; + +return (1, @out) if @out; + +# now this is all subject to change, but it will do for now, I think. +my $today = cldate($main::systime); + + +# PC23^14-Dec-2001^15^220^ 4^ 1^R=212 SA:mo=>mo-hi GF:qu=>qu-un^KH2D^KH2D^H48^~ +# Date Hour SFI A K Forecast Logger +# 14-Dec-2001 15 220 4 1 R=212 SA:mo=>mo-hi GF:qu=>qu-un + +my @field = ('PC23',$today,$hour,$args{sf},$args{a},$args{k},$forecast, $self->call ,$main::mycall, 'H99'); + +my $s = join('^', @field) . '^'; +my ($r) = $forecast =~ /R=(\d+)/; +Geomag::update($d, @field[2..8], $r); +DXProt::send_wwv_spot($self, $s, $d, @field[2..8]); +#$self->wwv($s, 0, @field[1..8]); +return (1, @out); + + diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 4d716ce7..3681bfbf 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -1155,7 +1155,7 @@ sub normal return; } @field = map { unpad($_) } @field; - if (WCY::dup($d,@field[3..7])) { + if (WCY::dup($d)) { dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr'); return; } @@ -1164,7 +1164,7 @@ sub normal my $rep; eval { - $rep = Local::wwv($self, @field[1..12]); + $rep = Local::wcy($self, @field[1..12]); }; # dbg("Local::wcy error $@") if isdbg('local') if $@; return if $rep; diff --git a/perl/Geomag.pm b/perl/Geomag.pm index 8f17eaf3..e1ab6dd1 100644 --- a/perl/Geomag.pm +++ b/perl/Geomag.pm @@ -92,8 +92,9 @@ sub store sub update { my ($mydate, $mytime, $mysfi, $mya, $myk, $myforecast, $myfrom, $mynode, $myr) = @_; - if ((@allowed && grep {$_ eq $from} @allowed) || - (@denied && !grep {$_ eq $from} @denied) || + $myfrom =~ s/-\d+$//; + if ((@allowed && grep {$_ eq $myfrom} @allowed) || + (@denied && !grep {$_ eq $myfrom} @denied) || (@allowed == 0 && @denied == 0)) { # my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime)); diff --git a/perl/Keps.pm b/perl/Keps.pm index 937c272f..24d46667 100644 --- a/perl/Keps.pm +++ b/perl/Keps.pm @@ -1,924 +1,955 @@ # # this file is automatically produced by convkeps.pl # -# Last update: Sat Dec 30 18:26:33 2000 +# Last update: Thu Dec 13 15:02:36 2001 # package Sun; - %keps = ( - 'AO-21' => { - orbit => '49639', - raan => '182.0433', - meananomaly => '65.8001', - eccentricity => '0.0034401', - meanmotion => '13.74747564', - inclination => '82.9406', - number => '91006', - argperigee => '293.9553', - mm1 => '8.8e-07', - mm2 => '0', - bstar => '7.6761e-05', - id => '21087', - elset => '239', - epoch => '356.00400679' - }, - 'AO-40' => { - orbit => '61', - raan => '237.0656', - meananomaly => '97.8405', - eccentricity => '0.8128421', - meanmotion => '1.2686657', - inclination => '6.2479', - number => '72', - argperigee => '195.4843', - mm1 => '-2.92e-06', + 'SAUDISAT-1B' => { + orbit => '6427', + elset => '331', + argperigee => '312.8153', + epoch => '1340.34540793', + bstar => '0.00067944', + number => '57', + raan => '301.6962', + mm1 => '4.61e-05', + meanmotion => '14.75538783', mm2 => '0', - bstar => '0', - id => '26609', - elset => '16', - epoch => '354.78150683' + id => '26549', + meananomaly => '46.8545', + eccentricity => '0.0052929', + inclination => '64.5519' }, - RESURS => { - orbit => '12725', - raan => '70.0001', - meananomaly => '164.8459', - eccentricity => '0.0001016', - meanmotion => '14.22980936', - inclination => '98.7071', - number => '98043', - argperigee => '195.2682', - mm1 => '1.95e-06', + 'SO-33' => { + orbit => '16258', + elset => '458', + argperigee => '73.5752', + epoch => '1340.71321591', + bstar => '0.0003126', + number => '98061', + raan => '109.5296', + mm1 => '1.579e-05', + meanmotion => '14.26126721', mm2 => '0', - bstar => '0.0001062', - id => '25394', - elset => '923', - epoch => '356.31938128' + id => '25509', + meananomaly => '290.4419', + eccentricity => '0.0362087', + inclination => '31.4272' }, - 'FO-20' => { - orbit => '50922', - raan => '91.5094', - meananomaly => '6.5126', - eccentricity => '0.0541213', - meanmotion => '12.83284554', - inclination => '99.0749', - number => '90013', - argperigee => '352.8465', - mm1 => '5e-08', + 'SO-35' => { + elset => '281', + orbit => '9604', + epoch => '356.30570266', + argperigee => '310.331', + bstar => '0.00020263', + number => '99008', + raan => '155.0303', + meanmotion => '14.41615958', + mm1 => '7.23e-06', mm2 => '0', - bstar => '8.7952e-05', - id => '20480', - elset => '277', - epoch => '355.86959518' + id => '25636', + meananomaly => '48.4786', + eccentricity => '0.0151034', + inclination => '96.4508' }, 'RS-10/11' => { - orbit => '67613', - raan => '10.7535', - meananomaly => '96.9477', - eccentricity => '0.0010175', - meanmotion => '13.72537204', - inclination => '82.9253', + orbit => '72419', + elset => '14', + argperigee => '13.168', + epoch => '1339.89901183', + bstar => '0.00015402', number => '87054', - argperigee => '263.0521', - mm1 => '7.7e-07', + raan => '111.7069', + mm1 => '1.56e-06', + meanmotion => '13.7260793', mm2 => '0', - bstar => '6.825e-05', id => '18129', - elset => '912', - epoch => '355.55560787' + meananomaly => '346.9808', + eccentricity => '0.0012859', + inclination => '82.9222' }, - OCS => { - orbit => '4779', - raan => '263.5965', - meananomaly => '12.499', - eccentricity => '0.0022433', - meanmotion => '14.81378842', - inclination => '100.2182', - number => '4', - argperigee => '347.6221', - mm1 => '0.00237336', + 'AO-21' => { + orbit => '54460', + elset => '149', + argperigee => '36.0381', + epoch => '1340.87549553', + bstar => '0.00015256', + number => '91006', + raan => '282.2521', + mm1 => '1.61e-06', + meanmotion => '13.74825162', mm2 => '0', - bstar => '0.030241', - id => '26062', - elset => '405', - epoch => '356.70018964' + id => '21087', + meananomaly => '324.3228', + eccentricity => '0.0036312', + inclination => '82.941' }, - 'AO-27' => { - orbit => '37718', - raan => '46.1342', - meananomaly => '289.1197', - eccentricity => '0.0009513', - meanmotion => '14.28305935', - inclination => '98.3809', - number => '93061', - argperigee => '71.1015', - mm1 => '2.17e-06', + 'TO-31' => { + orbit => '17697', + elset => '613', + argperigee => '356.1752', + epoch => '1339.84158331', + bstar => '0', + number => '98043', + raan => '54.5327', + mm1 => '-4.4e-07', + meanmotion => '14.231758', mm2 => '0', - bstar => '0.00010348', - id => '22825', - elset => '866', - epoch => '356.29511818' + id => '25396', + meananomaly => '3.9412', + eccentricity => '0.0002107', + inclination => '98.6719' }, - POSAT => { - orbit => '37728', - raan => '47.1902', - meananomaly => '304.3857', - eccentricity => '0.0011013', - meanmotion => '14.28924172', - inclination => '98.3776', - number => '93061', - argperigee => '55.8388', - mm1 => '3.2e-06', + 'GO-32' => { + orbit => '17683', + elset => '412', + argperigee => '22.0323', + epoch => '1338.92897019', + bstar => '0.00014849', + number => '98043', + raan => '53.0185', + mm1 => '2.89e-06', + meanmotion => '14.22708204', mm2 => '0', - bstar => '0.00014301', - id => '22829', - elset => '860', - epoch => '356.15351165' + id => '25397', + meananomaly => '338.0919', + eccentricity => '0.0001479', + inclination => '98.6695' }, - MIR => { - orbit => '84870', - raan => '14.9528', - meananomaly => '231.2527', - eccentricity => '0.0016068', - meanmotion => '15.84741655', - inclination => '51.6493', - number => '86017', - argperigee => '138.854', - mm1 => '0.00102535', + 'UO-11' => { + orbit => '95149', + elset => '686', + argperigee => '171.4677', + epoch => '1340.91846271', + bstar => '0.00071265', + number => '84021', + raan => '303.8855', + mm1 => '4.77e-05', + meanmotion => '14.75200964', mm2 => '0', - bstar => '0.00042632', - id => '16609', - elset => '341', - epoch => '356.86032407' + id => '14781', + meananomaly => '188.6706', + eccentricity => '0.0010032', + inclination => '98.0572' }, - 'RS-12/13' => { - orbit => '49529', - raan => '47.4247', - meananomaly => '30.7599', - eccentricity => '0.0029011', - meanmotion => '13.74240041', - inclination => '82.9233', - number => '91007', - argperigee => '329.1853', - mm1 => '8.9e-07', + 'AO-40' => { + orbit => '506', + elset => '177', + argperigee => '357.6245', + epoch => '1340.01516426', + bstar => '0.0001', + number => '72', + raan => '140.0806', + mm1 => '0', + meanmotion => '1.25594343', mm2 => '0', - bstar => '7.8558e-05', - id => '21089', - elset => '301', - epoch => '355.6903423' + id => '26609', + meananomaly => '359.9624', + eccentricity => '0.7950567', + inclination => '6.5626' }, 'MET-3/5' => { - orbit => '44954', - raan => '236.6517', - meananomaly => '345.545', - eccentricity => '0.0014', - meanmotion => '13.16918542', - inclination => '82.5583', + orbit => '49556', + elset => '390', + argperigee => '215.6391', + epoch => '1339.56717222', + bstar => '0.0001', number => '91056', - argperigee => '14.6075', + raan => '349.6954', mm1 => '5.1e-07', + meanmotion => '13.16946694', mm2 => '0', - bstar => '0.0001', id => '21655', - elset => '388', - epoch => '355.93379193' + meananomaly => '144.3879', + eccentricity => '0.0012768', + inclination => '82.5558' }, - JAWSAT => { - orbit => '693', - meananomaly => '304.7691', - raan => '280.8828', - eccentricity => '0.003852', - meanmotion => '14.34110882', - inclination => '100.2316', - number => '4', - mm1 => '7.8e-06', - argperigee => '55.7126', - bstar => '0.00029735', - mm2 => '0', - elset => '32', - id => '26065', - epoch => '75.52219673' - }, - 'KO-23' => { - orbit => '39273', - raan => '339.3634', - meananomaly => '84.2854', - eccentricity => '0.0015832', - meanmotion => '12.86356675', - inclination => '66.0865', - number => '92052', - argperigee => '275.6359', - mm1 => '-3.7e-07', - mm2 => '0', - bstar => '0.0001', - id => '22077', - elset => '3', - epoch => '355.91042934' - }, - 'TIUNGSAT-1' => { - orbit => '1265', - raan => '289.4226', - meananomaly => '346.3645', - eccentricity => '0.0010825', - meanmotion => '14.75965315', - inclination => '64.5588', - number => '57', - argperigee => '13.7759', - mm1 => '2.531e-05', + 'UO-14' => { + orbit => '61958', + elset => '839', + argperigee => '66.5805', + epoch => '1339.7237766', + bstar => '0.00021826', + number => '90005', + raan => '32.8558', + mm1 => '5.32e-06', + meanmotion => '14.30883081', mm2 => '0', - bstar => '0.00038607', - id => '26548', - elset => '45', - epoch => '356.20758273' + id => '20437', + meananomaly => '293.6618', + eccentricity => '0.0011803', + inclination => '98.3366' }, 'NOAA-10' => { - orbit => '74145', - raan => '340.0358', - meananomaly => '135.684', - eccentricity => '0.001173', - meanmotion => '14.26064655', - inclination => '98.659', + orbit => '79135', + elset => '133', + argperigee => '286.8456', + epoch => '1340.93349425', + bstar => '0.00039976', number => '86073', - argperigee => '224.3401', - mm1 => '4.73e-06', + raan => '326.9048', + mm1 => '9.21e-06', + meanmotion => '14.26579965', mm2 => '0', - bstar => '0.00021629', id => '16969', - elset => '688', - epoch => '356.87579151' + meananomaly => '73.1449', + eccentricity => '0.0011679', + inclination => '98.6928' }, - 'IO-26' => { - orbit => '37719', - raan => '46.7107', - meananomaly => '290.0889', - eccentricity => '0.0009833', - meanmotion => '14.2846651', - inclination => '98.3839', - number => '93061', - argperigee => '70.1347', - mm1 => '3.16e-06', - mm2 => '0', - bstar => '0.0001429', - id => '22826', - elset => '858', - epoch => '356.15154824' - }, - 'FO-29' => { - orbit => '21451', - raan => '238.9168', - meananomaly => '259.9342', - eccentricity => '0.035203', - meanmotion => '13.52751936', - inclination => '98.5692', - number => '96046', - argperigee => '104.1176', - mm1 => '1.4e-07', + FENGYUN1 => { + orbit => '13265', + elset => '423', + argperigee => '170.7304', + epoch => '1340.13134563', + bstar => '0.00020482', + number => '99025', + raan => '10.4947', + mm1 => '3.22e-06', + meanmotion => '14.10426439', mm2 => '0', - bstar => '4.7831e-05', - id => '24278', - elset => '421', - epoch => '355.73011057' + id => '25730', + meananomaly => '189.4125', + eccentricity => '0.0014166', + inclination => '98.6745' }, 'NOAA-11' => { - orbit => '63132', - raan => '61.9563', - meananomaly => '80.5628', - eccentricity => '0.0011183', - meanmotion => '14.13802023', - inclination => '98.9843', + orbit => '68079', + elset => '962', + argperigee => '9.8759', + epoch => '1340.91026523', + bstar => '0.00031934', number => '88089', - argperigee => '279.428', - mm1 => '2.84e-06', + raan => '52.8713', + mm1 => '5.63e-06', + meanmotion => '14.14124306', mm2 => '0', - bstar => '0.00017398', id => '19531', - elset => '530', - epoch => '356.84275291' + meananomaly => '350.2649', + eccentricity => '0.0012088', + inclination => '98.944' }, - 'KO-25' => { - orbit => '34537', - raan => '46.9567', - meananomaly => '307.3895', - eccentricity => '0.0011067', - meanmotion => '14.28882912', - inclination => '98.3797', + 'AO-27' => { + orbit => '42716', + elset => '143', + argperigee => '115.6225', + epoch => '1340.39150897', + bstar => '0.00025389', number => '93061', - argperigee => '52.8296', - mm1 => '3.18e-06', + raan => '21.2779', + mm1 => '5.96e-06', + meanmotion => '14.28586034', mm2 => '0', - bstar => '0.00014246', - id => '22828', - elset => '840', - epoch => '356.20510253' + id => '22825', + meananomaly => '244.5934', + eccentricity => '0.0009376', + inclination => '98.3282' }, - ISS => { - orbit => '11933', - raan => '266.4563', - meananomaly => '179.3763', - eccentricity => '0.0007428', - meanmotion => '15.65810622', - inclination => '51.5764', - number => '98067', - argperigee => '255.2593', - mm1 => '0.00039742', + 'RS-15' => { + orbit => '28605', + elset => '586', + argperigee => '196.9334', + epoch => '1340.17823988', + bstar => '0.00044822', + number => '94085', + raan => '32.031', + mm1 => '-2.7e-07', + meanmotion => '11.2754358', mm2 => '0', - bstar => '0.00038706', - id => '25544', - elset => '412', - epoch => '356.8598863' + id => '23439', + meananomaly => '162.6201', + eccentricity => '0.0160354', + inclination => '64.8203' }, 'NOAA-12' => { - orbit => '49893', - raan => '347.6317', - meananomaly => '205.6445', - eccentricity => '0.0012697', - meanmotion => '14.23794435', - inclination => '98.5607', + orbit => '54875', + elset => '419', + argperigee => '216.2813', + epoch => '1340.92767586', + bstar => '0.00055873', number => '91032', - argperigee => '154.5362', - mm1 => '4.82e-06', + raan => '329.1329', + mm1 => '1.249e-05', + meanmotion => '14.24352405', mm2 => '0', - bstar => '0.00022917', id => '21263', - elset => '976', - epoch => '356.87719958' + meananomaly => '143.754', + eccentricity => '0.0012253', + inclination => '98.5869' + }, + 'TIUNGSAT-1' => { + orbit => '6407', + elset => '217', + argperigee => '300.8879', + epoch => '1338.3927079', + bstar => '0.00089075', + number => '57', + raan => '302.9226', + mm1 => '6.445e-05', + meanmotion => '14.78110386', + mm2 => '0', + id => '26548', + meananomaly => '58.7821', + eccentricity => '0.0046692', + inclination => '64.5637' + }, + OCS => { + elset => '405', + orbit => '4779', + epoch => '356.70018964', + argperigee => '347.6221', + bstar => '0.030241', + number => '4', + raan => '263.5965', + meanmotion => '14.81378842', + mm1 => '0.00237336', + mm2 => '0', + id => '26062', + meananomaly => '12.499', + eccentricity => '0.0022433', + inclination => '100.2182' }, 'NOAA-14' => { - orbit => '30810', - raan => '339.195', - meananomaly => '71.8822', - eccentricity => '0.0008907', - meanmotion => '14.12534684', - inclination => '99.1625', + orbit => '35752', + elset => '987', + argperigee => '24.9687', + epoch => '1340.91837252', + bstar => '0.00031888', number => '94089', - argperigee => '288.138', - mm1 => '3.23e-06', + raan => '337.7949', + mm1 => '5.47e-06', + meanmotion => '14.12889898', mm2 => '0', - bstar => '0.0001998', id => '23455', - elset => '565', - epoch => '356.8977532' + meananomaly => '335.1957', + eccentricity => '0.0009786', + inclination => '99.188' }, 'NOAA-15' => { - orbit => '13556', - raan => '21.9716', - meananomaly => '270.0382', - eccentricity => '0.0011661', - meanmotion => '14.23433527', - inclination => '98.6192', + orbit => '18536', + elset => '453', + argperigee => '150.1696', + epoch => '1340.88567599', + bstar => '0.00027994', number => '98030', - argperigee => '90.2132', - mm1 => '2.68e-06', + raan => '4.2086', + mm1 => '5.98e-06', + meanmotion => '14.2378757', mm2 => '0', - bstar => '0.00013675', id => '25338', - elset => '19', - epoch => '356.86665965' + meananomaly => '210.0108', + eccentricity => '0.0010933', + inclination => '98.5835' }, - 'NOAA-16' => { - orbit => '1255', - raan => '297.4165', - meananomaly => '333.5519', - eccentricity => '0.001136', - meanmotion => '14.10998417', - inclination => '98.8052', - number => '55', - argperigee => '26.6749', - mm1 => '2.79e-06', + 'RS-12/13' => { + orbit => '54326', + elset => '388', + argperigee => '73.0938', + epoch => '1338.94476571', + bstar => '0.0001613', + number => '91007', + raan => '148.3251', + mm1 => '1.68e-06', + meanmotion => '13.74311368', mm2 => '0', - bstar => '0.00017924', - id => '26536', - elset => '115', - epoch => '354.47458394' + id => '21089', + meananomaly => '287.3576', + eccentricity => '0.0030611', + inclination => '82.9169' }, - 'UO-22' => { - orbit => '49479', - raan => '13.9514', - meananomaly => '356.2423', - eccentricity => '0.0007902', - meanmotion => '14.37959666', - inclination => '98.1366', - number => '91050', - argperigee => '3.8825', - mm1 => '4.2e-06', + 'UO-36' => { + orbit => '14154', + elset => '433', + argperigee => '225.985', + epoch => '1340.88498922', + bstar => '0.00035282', + number => '99021', + raan => '271.0209', + mm1 => '2.238e-05', + meanmotion => '14.74536764', mm2 => '0', - bstar => '0.00015233', - id => '21575', - elset => '91', - epoch => '356.20595701' + id => '25693', + meananomaly => '133.8524', + eccentricity => '0.0033099', + inclination => '64.5612' }, - UARS => { - orbit => '50718', - raan => '338.2738', - meananomaly => '268.6314', - eccentricity => '0.0004704', - meanmotion => '14.99167138', - inclination => '56.9823', - number => '91063', - argperigee => '91.5262', - mm1 => '1.561e-05', + HUBBLE => { + orbit => '43682', + elset => '787', + argperigee => '325.4716', + epoch => '1340.6999801', + bstar => '0.00077524', + number => '90037', + raan => '4.1666', + mm1 => '9.036e-05', + meanmotion => '14.95822848', mm2 => '0', - bstar => '0.00014729', - id => '21701', - elset => '193', - epoch => '356.20471018' + id => '20580', + meananomaly => '34.5082', + eccentricity => '0.0012225', + inclination => '28.4625' }, - 'SAUDISAT-1A' => { - orbit => '1252', - raan => '292.3793', - meananomaly => '322.1842', - eccentricity => '0.0012197', - meanmotion => '14.74766703', - inclination => '64.5607', - number => '57', - argperigee => '38.0148', - mm1 => '2.838e-05', + 'NOAA-16' => { + orbit => '6225', + elset => '603', + argperigee => '105.4346', + epoch => '1340.85985025', + bstar => '0.00042479', + number => '55', + raan => '283.8578', + mm1 => '7.69e-06', + meanmotion => '14.11397049', mm2 => '0', - bstar => '0.00044224', - id => '26545', - elset => '49', - epoch => '355.39271839' + id => '26536', + meananomaly => '254.8577', + eccentricity => '0.0011451', + inclination => '98.848' }, - 'SAUDISAT-1B' => { - orbit => '1260', - raan => '291.1301', - meananomaly => '301.4281', - eccentricity => '0.0014693', - meanmotion => '14.73856425', - inclination => '64.5515', - number => '57', - argperigee => '58.8262', - mm1 => '1.988e-05', + MIR => { + elset => '341', + orbit => '84870', + epoch => '356.86032407', + argperigee => '138.854', + bstar => '0.00042632', + number => '86017', + raan => '14.9528', + meanmotion => '15.84741655', + mm1 => '0.00102535', mm2 => '0', - bstar => '0.00032237', - id => '26549', - elset => '46', - epoch => '355.91949131' + id => '16609', + meananomaly => '231.2527', + eccentricity => '0.0016068', + inclination => '51.6493' }, - 'AO-10' => { - orbit => '13175', - raan => '295.692', - meananomaly => '321.0331', - eccentricity => '0.6002376', - meanmotion => '2.05865208', - inclination => '26.6859', - number => '83058', - argperigee => '110.7094', - mm1 => '5e-07', + 'WO-18' => { + orbit => '61983', + elset => '668', + argperigee => '70.0909', + epoch => '1340.92791113', + bstar => '0.00025661', + number => '90005', + raan => '45.5322', + mm1 => '6.35e-06', + meanmotion => '14.31134691', mm2 => '0', - bstar => '0.0001', - id => '14129', - elset => '727', - epoch => '355.03296873' + id => '20441', + meananomaly => '290.1644', + eccentricity => '0.0012692', + inclination => '98.3948' }, - UNK1 => { - orbit => '446', - meananomaly => '305.6315', - raan => '280.3591', - eccentricity => '0.0036379', - meanmotion => '14.34222766', - inclination => '100.2243', - number => '4', - mm1 => '3.697e-05', - argperigee => '54.8262', - bstar => '0.0013283', + 'SICH-1' => { + orbit => '33729', + elset => '854', + argperigee => '32.133', + epoch => '1340.2176448', + bstar => '0.00028809', + number => '95046', + raan => '157.8008', + mm1 => '2.093e-05', + meanmotion => '14.77608277', mm2 => '0', - elset => '34', - id => '26091', - epoch => '75.10152136' + id => '23657', + meananomaly => '328.1537', + eccentricity => '0.0027033', + inclination => '82.529' }, - UNK2 => { - orbit => '449', - meananomaly => '302.7904', - raan => '280.4286', - eccentricity => '0.0038886', - meanmotion => '14.34558971', - inclination => '100.2173', - number => '4', - mm1 => '2.348e-05', - argperigee => '57.7071', - bstar => '0.0008449', + ISS => { + orbit => '17403', + elset => '804', + argperigee => '64.8789', + epoch => '1340.87581517', + bstar => '0.00068419', + number => '98067', + raan => '299.8562', + mm1 => '0.00064719', + meanmotion => '15.63499635', mm2 => '0', - elset => '38', - id => '26092', - epoch => '75.16312311' + id => '25544', + meananomaly => '27.0755', + eccentricity => '0.0010188', + inclination => '51.6408' }, - UNK3 => { - orbit => '470', - meananomaly => '301.4011', - raan => '280.3768', - eccentricity => '0.0038328', - meanmotion => '14.34403542', - inclination => '100.2214', - number => '4', - mm1 => '3.914e-05', - argperigee => '59.0925', - bstar => '0.0013991', + 'MET-2/21' => { + orbit => '41743', + elset => '146', + argperigee => '134.3754', + epoch => '1340.90413669', + bstar => '0.0002268', + number => '93055', + raan => '202.8103', + mm1 => '2.65e-06', + meanmotion => '13.8342039', mm2 => '0', - elset => '41', - id => '26093', - epoch => '75.09738477' + id => '22782', + meananomaly => '225.9264', + eccentricity => '0.0023036', + inclination => '82.5489' }, - UNK4 => { - orbit => '417', - meananomaly => '302.9942', - raan => '280.2847', - eccentricity => '0.003787', - meanmotion => '14.34342323', - inclination => '100.2222', + 'WO-39' => { + orbit => '9737', + elset => '418', + argperigee => '80.5213', + epoch => '1339.90665695', + bstar => '0.00088792', number => '4', - mm1 => '2.202e-05', - argperigee => '57.489', - bstar => '0.00079759', + raan => '304.9535', + mm1 => '2.56e-05', + meanmotion => '14.36344851', mm2 => '0', - elset => '22', - id => '26094', - epoch => '75.02817116' + id => '26061', + meananomaly => '280.0101', + eccentricity => '0.0036597', + inclination => '100.2095' }, - 'AO-16' => { - orbit => '56956', - raan => '63.616', - meananomaly => '331.2294', - eccentricity => '0.0012139', - meanmotion => '14.30701553', - inclination => '98.4279', - number => '90005', - argperigee => '28.9563', - mm1 => '3.04e-06', + 'FO-20' => { + orbit => '55396', + elset => '382', + argperigee => '283.1892', + epoch => '1338.67361656', + bstar => '0.00015471', + number => '90013', + raan => '15.0687', + mm1 => '3.3e-07', + meanmotion => '12.8330348', mm2 => '0', - bstar => '0.00013246', - id => '20439', - elset => '380', - epoch => '355.73880671' + id => '20480', + meananomaly => '70.952', + eccentricity => '0.0540003', + inclination => '99.0359' }, - 'SICH-1' => { - orbit => '28563', - raan => '121.8246', - meananomaly => '268.7688', - eccentricity => '0.0027495', - meanmotion => '14.76242061', - inclination => '82.5293', - number => '95046', - argperigee => '91.6673', - mm1 => '2.168e-05', + 'AO-10' => { + orbit => '13896', + elset => '853', + argperigee => '204.9066', + epoch => '1338.97255464', + bstar => '0.0001', + number => '83058', + raan => '239.6495', + mm1 => '1.82e-06', + meanmotion => '2.05866128', mm2 => '0', - bstar => '0.00030807', - id => '23657', - elset => '544', - epoch => '356.21351992' + id => '14129', + meananomaly => '106.4043', + eccentricity => '0.6048198', + inclination => '26.1163' }, - 'AO-37' => { - orbit => '4712', - raan => '251.5794', - meananomaly => '11.1216', - eccentricity => '0.0037995', - meanmotion => '14.34432024', - inclination => '100.1939', + 'LO-19' => { + orbit => '61978', + elset => '639', + argperigee => '68.8642', + epoch => '1340.25579677', + bstar => '0.00027987', + number => '90005', + raan => '47.1647', + mm1 => '6.99e-06', + meanmotion => '14.31285615', + mm2 => '0', + id => '20442', + meananomaly => '291.3926', + eccentricity => '0.0012983', + inclination => '98.4068' + }, + OPAL => { + elset => '46', + orbit => '688', + epoch => '75.10024777', + argperigee => '55.7964', + bstar => '0.00026939', number => '4', - argperigee => '348.9123', - mm1 => '4.79e-06', + raan => '280.3797', + meanmotion => '14.34200204', + mm1 => '7.03e-06', mm2 => '0', - bstar => '0.00018945', - id => '26065', - elset => '108', - epoch => '355.88636773' + id => '26063', + meananomaly => '304.6814', + eccentricity => '0.0038081', + inclination => '100.2291' + }, + 'SO-43' => { + orbit => '1034', + elset => '93', + argperigee => '308.3542', + epoch => '1340.64350867', + bstar => '0.0011192', + number => '1043', + raan => '273.7573', + mm1 => '0.00040004', + meanmotion => '15.36452171', + mm2 => '0', + id => '26929', + meananomaly => '51.7328', + eccentricity => '0.0003166', + inclination => '67.0531' }, - GRO => { - orbit => '37903', - meananomaly => '297.6646', - raan => '259.3084', - eccentricity => '0.0005035', - meanmotion => '15.25595337', - inclination => '28.4577', - number => '91027', - mm1 => '0.00011373', - argperigee => '62.445', - bstar => '0.0004263', + POSAT => { + orbit => '42721', + elset => '120', + argperigee => '97.8644', + epoch => '1339.73934535', + bstar => '0.00030993', + number => '93061', + raan => '22.1864', + mm1 => '7.48e-06', + meanmotion => '14.29290299', mm2 => '0', - elset => '788', - id => '21225', - epoch => '75.14126322' + id => '22829', + meananomaly => '262.3756', + eccentricity => '0.0010728', + inclination => '98.3293' }, - 'DO-17' => { - orbit => '56969', - raan => '66.4224', - meananomaly => '333.4138', - eccentricity => '0.0011998', - meanmotion => '14.30904201', - inclination => '98.4399', - number => '90005', - argperigee => '26.7663', - mm1 => '3.53e-06', + 'FO-29' => { + orbit => '26175', + elset => '461', + argperigee => '278.7565', + epoch => '1339.12287347', + bstar => '0.00013924', + number => '96046', + raan => '180.947', + mm1 => '9.8e-07', + meanmotion => '13.52800908', mm2 => '0', - bstar => '0.00015034', - id => '20440', - elset => '373', - epoch => '356.2805867' + id => '24278', + meananomaly => '77.4077', + eccentricity => '0.0350089', + inclination => '98.5152' }, - 'GO-32' => { - orbit => '12721', - raan => '69.047', - meananomaly => '132.3934', - eccentricity => '6.19e-05', - meanmotion => '14.22516809', - inclination => '98.7023', - number => '98043', - argperigee => '227.7192', - mm1 => '1.45e-06', + 'AO-16' => { + orbit => '61976', + elset => '643', + argperigee => '69.2548', + epoch => '1340.78120496', + bstar => '0.00026505', + number => '90005', + raan => '42.9958', + mm1 => '6.57e-06', + meanmotion => '14.31045594', mm2 => '0', - bstar => '8.4445e-05', - id => '25397', - elset => '382', - epoch => '355.93318352' + id => '20439', + meananomaly => '290.9917', + eccentricity => '0.0012036', + inclination => '98.3815' }, 'OKEAN-0' => { - orbit => '7684', - raan => '48.941', - meananomaly => '287.4656', - eccentricity => '0.0001989', - meanmotion => '14.70719789', - inclination => '97.978', + orbit => '12837', + elset => '504', + argperigee => '57.8299', + epoch => '1340.73634106', + bstar => '0.00022887', number => '99039', - argperigee => '72.6754', - mm1 => '9.96e-06', + raan => '31.0909', + mm1 => '1.368e-05', + meanmotion => '14.71367041', mm2 => '0', - bstar => '0.00017139', id => '25860', - elset => '520', - epoch => '356.22103923' + meananomaly => '302.3084', + eccentricity => '0.0001852', + inclination => '97.9287' }, - OPAL => { - orbit => '688', - meananomaly => '304.6814', - raan => '280.3797', - eccentricity => '0.0038081', - meanmotion => '14.34200204', - inclination => '100.2291', - number => '4', - mm1 => '7.03e-06', - argperigee => '55.7964', - bstar => '0.00026939', + 'UO-22' => { + orbit => '54513', + elset => '373', + argperigee => '28.1897', + epoch => '1340.4379542', + bstar => '0.00032752', + number => '91050', + raan => '345.4792', + mm1 => '9.59e-06', + meanmotion => '14.38453857', mm2 => '0', - elset => '46', - id => '26063', - epoch => '75.10024777' + id => '21575', + meananomaly => '331.9726', + eccentricity => '0.0008036', + inclination => '98.1238' }, - FENGYUN1 => { - orbit => '8332', - raan => '32.0527', - meananomaly => '273.8974', - eccentricity => '0.0015123', - meanmotion => '14.1034603', - inclination => '98.7179', - number => '99025', - argperigee => '86.3925', - mm1 => '-1.3e-07', + UNK1 => { + elset => '34', + orbit => '446', + epoch => '75.10152136', + argperigee => '54.8262', + bstar => '0.0013283', + number => '4', + raan => '280.3591', + meanmotion => '14.34222766', + mm1 => '3.697e-05', mm2 => '0', - bstar => '1.6603e-05', - id => '25730', - elset => '154', - epoch => '356.17178905' + id => '26091', + meananomaly => '305.6315', + eccentricity => '0.0036379', + inclination => '100.2243' }, 'OKEAN-4' => { - orbit => '33343', - raan => '341.0426', - meananomaly => '244.8266', - eccentricity => '0.0025943', - meanmotion => '14.76905457', - inclination => '82.54', + orbit => '38514', + elset => '943', + argperigee => '54.9415', + epoch => '1340.38897389', + bstar => '0.00044906', number => '94066', - argperigee => '115.5636', - mm1 => '1.461e-05', + raan => '16.9644', + mm1 => '3.327e-05', + meanmotion => '14.78639484', mm2 => '0', - bstar => '0.00020351', id => '23317', - elset => '622', - epoch => '356.22595065' + meananomaly => '305.4123', + eccentricity => '0.0024826', + inclination => '82.5432' }, - HUBBLE => { - orbit => '38429', - raan => '110.0727', - meananomaly => '123.4224', - eccentricity => '0.0011982', - meanmotion => '14.92422378', - inclination => '28.4649', - number => '90037', - argperigee => '236.5223', - mm1 => '4.045e-05', + 'AO-37' => { + orbit => '9738', + elset => '388', + argperigee => '83.2647', + epoch => '1340.41090341', + bstar => '0.00040417', + number => '4', + raan => '304.707', + mm1 => '1.1e-05', + meanmotion => '14.34911677', mm2 => '0', - bstar => '0.00037074', - id => '20580', - elset => '442', - epoch => '355.75257627' + id => '26065', + meananomaly => '277.2892', + eccentricity => '0.003833', + inclination => '100.2121' }, - 'LO-19' => { - orbit => '56965', - raan => '67.3242', - meananomaly => '332.3029', - eccentricity => '0.0012865', - meanmotion => '14.30939851', - inclination => '98.4469', - number => '90005', - argperigee => '27.8842', - mm1 => '3.67e-06', + GRO => { + elset => '788', + orbit => '37903', + epoch => '75.14126322', + argperigee => '62.445', + bstar => '0.0004263', + number => '91027', + raan => '259.3084', + meanmotion => '15.25595337', + mm1 => '0.00011373', mm2 => '0', - bstar => '0.00015561', - id => '20442', - elset => '381', - epoch => '355.76152385' + id => '21225', + meananomaly => '297.6646', + eccentricity => '0.0005035', + inclination => '28.4577' }, - 'PO-34' => { - orbit => '11811', - raan => '54.2589', - meananomaly => '243.4949', - eccentricity => '0.0007024', - meanmotion => '15.07203828', - inclination => '28.4619', - number => '98064', - argperigee => '116.6456', - mm1 => '3.687e-05', + UNK2 => { + elset => '38', + orbit => '449', + epoch => '75.16312311', + argperigee => '57.7071', + bstar => '0.0008449', + number => '4', + raan => '280.4286', + meanmotion => '14.34558971', + mm1 => '2.348e-05', mm2 => '0', - bstar => '0.00022723', - id => '25520', - elset => '258', - epoch => '356.19862206' + id => '26092', + meananomaly => '302.7904', + eccentricity => '0.0038886', + inclination => '100.2173' }, - 'UO-11' => { - orbit => '89985', - raan => '316.4833', - meananomaly => '140.2927', - eccentricity => '0.0009626', - meanmotion => '14.73171613', - inclination => '98.0095', - number => '84021', - argperigee => '219.7579', - mm1 => '2.212e-05', + UNK3 => { + elset => '41', + orbit => '470', + epoch => '75.09738477', + argperigee => '59.0925', + bstar => '0.0013991', + number => '4', + raan => '280.3768', + meanmotion => '14.34403542', + mm1 => '3.914e-05', mm2 => '0', - bstar => '0.00035051', - id => '14781', - elset => '372', - epoch => '356.37758863' + id => '26093', + meananomaly => '301.4011', + eccentricity => '0.0038328', + inclination => '100.2214' }, - 'TO-31' => { - orbit => '12725', - raan => '69.6851', - meananomaly => '98.32', - eccentricity => '0.0001859', - meanmotion => '14.22857867', - inclination => '98.7055', - number => '98043', - argperigee => '261.7769', - mm1 => '-4.4e-07', + UNK4 => { + elset => '22', + orbit => '417', + epoch => '75.02817116', + argperigee => '57.489', + bstar => '0.00079759', + number => '4', + raan => '280.2847', + meanmotion => '14.34342323', + mm1 => '2.202e-05', mm2 => '0', - bstar => '0', - id => '25396', - elset => '429', - epoch => '356.24283672' + id => '26094', + meananomaly => '302.9942', + eccentricity => '0.003787', + inclination => '100.2222' }, - 'SO-33' => { - orbit => '11247', - raan => '285.5101', - meananomaly => '97.8335', - eccentricity => '0.0363662', - meanmotion => '14.25298546', - inclination => '31.4474', - number => '98061', - argperigee => '258.1301', - mm1 => '9.26e-06', + 'IO-26' => { + orbit => '42716', + elset => '117', + argperigee => '114.6136', + epoch => '1340.13589301', + bstar => '0.00023858', + number => '93061', + raan => '21.9239', + mm1 => '5.6e-06', + meanmotion => '14.28772789', mm2 => '0', - bstar => '0.00017756', - id => '25509', - elset => '200', - epoch => '355.83394601' + id => '22826', + meananomaly => '245.6055', + eccentricity => '0.0009673', + inclination => '98.3302' }, 'OO-38' => { - orbit => '4710', - raan => '251.3784', - meananomaly => '11.9124', - eccentricity => '0.0037337', - meanmotion => '14.34494007', - inclination => '100.1944', + orbit => '9732', + elset => '383', + argperigee => '83.4991', + epoch => '1339.96292327', + bstar => '0.00033551', number => '4', - argperigee => '348.1181', - mm1 => '4.06e-06', + raan => '304.1171', + mm1 => '9.04e-06', + meanmotion => '14.34934621', mm2 => '0', - bstar => '0.00016358', id => '26063', - elset => '109', - epoch => '355.72869646' + meananomaly => '277.0485', + eccentricity => '0.0037748', + inclination => '100.2104' + }, + PCSAT => { + orbit => '955', + elset => '57', + argperigee => '260.5656', + epoch => '1340.02488719', + bstar => '0.00037533', + number => '1043', + raan => '306.7473', + mm1 => '8.6e-06', + meanmotion => '14.28523529', + mm2 => '0', + id => '26931', + meananomaly => '99.4874', + eccentricity => '0.0005038', + inclination => '67.051' }, - 'UO-14' => { - orbit => '56953', - raan => '56.2846', - meananomaly => '333.5711', - eccentricity => '0.0011737', - meanmotion => '14.30600844', - inclination => '98.3869', - number => '90005', - argperigee => '26.6071', - mm1 => '2.89e-06', + 'PO-34' => { + orbit => '17100', + elset => '503', + argperigee => '277.0873', + epoch => '1340.14416068', + bstar => '0.00036273', + number => '98064', + raan => '263.0959', + mm1 => '6.217e-05', + meanmotion => '15.09911118', mm2 => '0', - bstar => '0.00012663', - id => '20437', - elset => '585', - epoch => '355.69910166' + id => '25520', + meananomaly => '82.9004', + eccentricity => '0.0006323', + inclination => '28.4623' }, - 'SO-35' => { - orbit => '9604', - raan => '155.0303', - meananomaly => '48.4786', - eccentricity => '0.0151034', - meanmotion => '14.41615958', - inclination => '96.4508', - number => '99008', - argperigee => '310.331', - mm1 => '7.23e-06', + RESURS => { + orbit => '17711', + elset => '34', + argperigee => '343.5986', + epoch => '1340.87149034', + bstar => '0.00081871', + number => '98043', + raan => '55.9693', + mm1 => '1.813e-05', + meanmotion => '14.2335119', mm2 => '0', - bstar => '0.00020263', - id => '25636', - elset => '281', - epoch => '356.30570266' + id => '25394', + meananomaly => '16.517', + eccentricity => '7.05e-05', + inclination => '98.6734' }, - 'MET-2/21' => { - orbit => '36897', - raan => '120.7384', - meananomaly => '320.3361', - eccentricity => '0.0023052', - meanmotion => '13.83303338', - inclination => '82.548', - number => '93055', - argperigee => '39.9487', - mm1 => '1.68e-06', + UARS => { + orbit => '55977', + elset => '487', + argperigee => '113.0972', + epoch => '1340.7171317', + bstar => '0.00021809', + number => '91063', + raan => '6.155', + mm1 => '2.555e-05', + meanmotion => '15.00965994', mm2 => '0', - bstar => '0.0001392', - id => '22782', - elset => '871', - epoch => '356.39902465' + id => '21701', + meananomaly => '247.0725', + eccentricity => '0.0005714', + inclination => '56.9842' }, - 'RS-15' => { - orbit => '24654', - raan => '238.7573', - meananomaly => '100.9053', - eccentricity => '0.0167381', - meanmotion => '11.27539112', - inclination => '64.8173', - number => '94085', - argperigee => '257.3112', - mm1 => '-3.9e-07', + 'DO-17' => { + orbit => '61968', + elset => '626', + argperigee => '70.2429', + epoch => '1339.80181885', + bstar => '0.00027334', + number => '90005', + raan => '44.9758', + mm1 => '6.82e-06', + meanmotion => '14.31278646', mm2 => '0', - bstar => '0.00010617', - id => '23439', - elset => '516', - epoch => '355.7537703' + id => '20440', + meananomaly => '290.0065', + eccentricity => '0.0012179', + inclination => '98.3984' }, - 'UO-36' => { - orbit => '8995', - raan => '258.2341', - meananomaly => '89.6801', - eccentricity => '0.0050681', - meanmotion => '14.73545715', - inclination => '64.5618', - number => '99021', - argperigee => '269.8485', - mm1 => '8.9e-07', + 'KO-23' => { + orbit => '43788', + elset => '50', + argperigee => '194.255', + epoch => '1340.93414147', + bstar => '0.0001', + number => '92052', + raan => '324.2955', + mm1 => '-3.7e-07', + meanmotion => '12.86379619', mm2 => '0', - bstar => '3.4593e-05', - id => '25693', - elset => '398', - epoch => '356.84250827' + id => '22077', + meananomaly => '165.832', + eccentricity => '0.0005283', + inclination => '66.0875' }, - 'WO-18' => { - orbit => '56967', - raan => '65.9534', - meananomaly => '330.3211', - eccentricity => '0.0012246', - meanmotion => '14.30797273', - inclination => '98.4381', - number => '90005', - argperigee => '29.8671', - mm1 => '3.24e-06', + JAWSAT => { + elset => '32', + orbit => '693', + epoch => '75.52219673', + argperigee => '55.7126', + bstar => '0.00029735', + number => '4', + raan => '280.8828', + meanmotion => '14.34110882', + mm1 => '7.8e-06', mm2 => '0', - bstar => '0.00013985', - id => '20441', - elset => '387', - epoch => '356.18802006' + id => '26065', + meananomaly => '304.7691', + eccentricity => '0.003852', + inclination => '100.2316' }, - 'WO-39' => { - orbit => '4719', - raan => '252.1593', - meananomaly => '14.1222', - eccentricity => '0.0036569', - meanmotion => '14.35183626', - inclination => '100.1921', - number => '4', - argperigee => '345.8934', - mm1 => '1.112e-05', + 'KO-25' => { + orbit => '39542', + elset => '94', + argperigee => '93.1129', + epoch => '1340.64776191', + bstar => '0.00023096', + number => '93061', + raan => '22.6569', + mm1 => '5.45e-06', + meanmotion => '14.2916941', mm2 => '0', - bstar => '0.00040642', - id => '26061', - elset => '138', - epoch => '356.1922237' + id => '22828', + meananomaly => '267.1286', + eccentricity => '0.0010779', + inclination => '98.3275' + }, + 'SAUDISAT-1A' => { + orbit => '6438', + elset => '215', + argperigee => '307.7891', + epoch => '1340.88452985', + bstar => '0.00079986', + number => '57', + raan => '298.092', + mm1 => '5.575e-05', + meanmotion => '14.76521761', + mm2 => '0', + id => '26545', + meananomaly => '51.8606', + eccentricity => '0.0051077', + inclination => '64.5616' } ); 1; diff --git a/perl/Messages b/perl/Messages index e5a123fc..39a2292d 100644 --- a/perl/Messages +++ b/perl/Messages @@ -267,6 +267,8 @@ package DXM; unsethop1 => 'usage: unset/hops ann|spots|wwv|wcy', unsethop2 => 'hops unset on $_[1] for $_[0]', usernf => '*** User record for $_[0] not found ***', + wcy1 => '$_[0] is missing or out of range', + wcy2 => 'Duplicate WCY', wwvs => 'WWV flag set on $_[0]', wwvu => 'WWV flag unset on $_[0]', wxs => 'WX flag set on $_[0]', @@ -372,7 +374,7 @@ package DXM; }, fr => { }, - sp => { + es => { addr => 'Dirección es ahora: $_[0]', already => '$_[0] ya esta conectado', anns => 'Anuncios activados $_[0]', diff --git a/perl/WCY.pm b/perl/WCY.pm index 85f2b817..4974d939 100644 --- a/perl/WCY.pm +++ b/perl/WCY.pm @@ -90,8 +90,9 @@ sub store sub update { my ($mydate, $mytime, $mysfi, $mya, $myk, $myexpk, $myr, $mysa, $mygmf, $myau, $myfrom, $mynode) = @_; - if ((@allowed && grep {$_ eq $from} @allowed) || - (@denied && !grep {$_ eq $from} @denied) || + $myfrom =~ s/-\d+$//; + if ((@allowed && grep {$_ eq $myfrom} @allowed) || + (@denied && !grep {$_ eq $myfrom} @denied) || (@allowed == 0 && @denied == 0)) { # my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime)); @@ -242,12 +243,12 @@ sub readfile # enter the spot for dup checking and return true if it is already a dup sub dup { - my ($d, $sfi, $a, $k, $r) = @_; + my ($d) = @_; # dump if too old return 2 if $d < $main::systime - $dupage; - my $dupkey = "C$d|$sfi|$k|$a|$r"; + my $dupkey = "C$d"; return DXDupe::check($dupkey, $main::systime+$dupage); } -- 2.43.0