new cty.dat, sh/425 and cosmetic changes to filter.pm

diff --git a/Changes b/Changes
index 00e5fb9c8dac74cedf1de26810b2772b773c8588..65df80a055b4022e1689e1f648549b0f4539ce1e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+03Nov06=======================================================================
+1. add CTY-1609 changes
+2. add back Geo::Taf code with submitted mods
+3. add new version of the sh/425 code using the new database location.
 09Oct06=======================================================================
 1. fix problems with bad filters pointed by Thomas DL3SBB.
 27Jul06=======================================================================

diff --git a/Geo/TAF/TAF.pm b/Geo/TAF/TAF.pm
index d394f5821f2b700ac3f580008845a8a08b0082da..155f29443fbb8124feee9fc35298ac369040b0c4 100644 (file)
--- a/Geo/TAF/TAF.pm
+++ b/Geo/TAF/TAF.pm
@@ -13,7 +13,7 @@ use 5.005;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.04';
+$VERSION = '1.04-1';
 
 
 my %err = (
@@ -136,11 +136,17 @@ sub decode
 
        $l =~ s/=$//;
        
+    # Fix dodgy TAFs.
+    # TAFs like this are non-standard, but I have seen these examples in
+    # real life, and that is, after all, what this code needs to cope with. [DW]
+    $l =~ s/\b(BECMG)(\d{4})\b/$1 $2/g;        # Some people can't use a space bar
+    $l =~ s/\bTEMP0\b/TEMPO/g;         # Some people use zero instead of a letter O
+    $l =~ s/\bBEC\b/BECMG/g;           # And some people can't spell BECMG
+    
        my @tok = split /\s+/, $l;
 
        $self->{line} = join ' ', @tok;
        
-       
        # do we explicitly have a METAR or a TAF
        my $t = shift @tok;
        if ($t eq 'TAF') {
@@ -153,6 +159,9 @@ sub decode
 
        # next token is the ICAO dseignator
        $t = shift @tok;
+    # ignore AMD (amendment) token if present.
+    $t = shift @tok if $t eq 'AMD';
+
        if ($t =~ /^[A-Z]{4}$/) {
                $self->{icao} = $t;
        } else {
@@ -161,6 +170,9 @@ sub decode
 
        # next token is an issue time
        $t = shift @tok;
+    # ignore AMD (amendment) token if present.
+    $t = shift @tok if $t eq 'AMD';
+
        if (my ($day, $time) = $t =~ /^(\d\d)(\d{4})Z?$/) {
                $self->{day} = $day;
                $self->{time} = _time($time);
@@ -230,16 +242,22 @@ sub decode
                        $self->{viz_units} ||= 'm';
                        push @chunk, $self->_chunk('CLOUD', 'CAVOK');
 
+        # AMD group (end for now)
+        } elsif ($t eq 'AMD') {
+            last;
+
         # RMK group (end for now)
                } elsif ($t eq 'RMK') {
                        last;
 
         # from
-        } elsif (my ($time) = $t =~ /^FM(\d\d\d\d)$/ ) {
+        } elsif (my ($time) = $t =~ /^FM(\d\d\d?\d?)Z?$/ ) {
+           $time .= '0' while length($time) < 4;
                        push @chunk, $self->_chunk('FROM', _time($time));
 
         # Until
-        } elsif (($time) = $t =~ /^TL(\d\d\d\d)$/ ) {
+        } elsif (($time) = $t =~ /^TI?LL?(\d\d\d?\d?)Z?$/ ) {
+           $time .= '0' while length($time) < 4;
                        push @chunk, $self->_chunk('TIL', _time($time));
 
         # probability
@@ -313,25 +331,28 @@ sub decode
                        $self->{viz_units} ||= 'Km';
                        push @chunk, $self->_chunk('VIZ', $viz, 'Km');
 
-               # viz group in miles and faction of a mile with space between
+        # viz group in miles and fraction of a mile with space between
                } elsif (my ($m) = $t =~ m!^(\d)$!) {
-                       my $viz;
-                       if (@tok && (($viz) = $tok[0] =~ m!^(\d/\d)SM$!)) {
+            my ($viz, $denom);
+            if (@tok && (($viz, $denom) = $tok[0] =~ m!^(\d)/(\d)SM$!)) {
                                shift @tok;
-                               $viz = "$m $viz";
+               $denom ||= 1;
+               $viz = $m + $viz / $denom;
                                $self->{viz_dist} ||= $viz;
-                               $self->{viz_units} ||= 'miles';
-                               push @chunk, $self->_chunk('VIZ', $viz, 'miles');
+                $self->{viz_units} ||= 'Miles';
+                push @chunk, $self->_chunk('VIZ', $viz, 'Miles');
                        }
                        
                # viz group in miles (either in miles or under a mile)
-               } elsif (my ($lt, $mviz) = $t =~ m!^(M)?(\d+(:?/\d)?)SM$!) {
-                       $mviz = '<' . $mviz if $lt;
+        } elsif (my ($lt, $mviz, $denom) = $t =~ m!^([MP])?(\d+)(?:/(\d))?SM$!) {
+           $denom ||= 1;
+           $mviz /= $denom;
+            $mviz = '<' . $mviz if $lt and $lt eq 'M';
+            $mviz = '>' . $mviz if $lt and $lt eq 'P';
                        $self->{viz_dist} ||= $mviz;
-                       $self->{viz_units} ||= 'Stat. Miles';
+            $self->{viz_units} ||= 'Miles';
                        push @chunk, $self->_chunk('VIZ', $mviz, 'Miles');
                        
-
                # runway visual range
                } elsif (my ($rw, $rlt, $range, $vlt, $var, $runit, $tend) = $t =~ m!^R(\d\d[LRC]?)/([MP])?(\d\d\d\d)(?:V([MP])(\d\d\d\d))?(?:(FT)/?)?([UND])?$!) {
                        $runit = 'm' unless $runit;
@@ -351,7 +372,7 @@ sub decode
                        push @chunk, $self->_chunk('CLOUD', $amt, $height eq '///' ? 0 : $height * 100, $cb) unless $amt eq '///' && $height eq '///';
 
                # temp / dew point
-               } elsif (my ($ms, $t, $n, $d) = $t =~ m!^(M)?(\d\d)/(M)?(\d\d)?$!) {
+        } elsif (my ($ms, $t, $n, $d) = $t =~ m!^T?(M)?(\d\d)/(M)?(\d\dZ?)?$!) {
                        $t = 0 + $t;
                        $d = 0 + $d;
                        $t = -$t if defined $ms;
@@ -720,7 +741,6 @@ sub as_string
     return "until $self->[0]";
 }
 
-
 # Autoload methods go after =cut, and are processed by the autosplit program.
 
 1;

diff --git a/cmd/show/425.pl b/cmd/show/425.pl
index a8558da9c184ac1eed18561d7363aaaa77284a20..44ad0a30b89f7eb6a2d8df12ec22c9e73b40fdd0 100644 (file)
--- a/cmd/show/425.pl
+++ b/cmd/show/425.pl
@@ -1,58 +1,59 @@
 #
 # Query the 425 Database server for a callsign
 #
-# from an idea by Leonardo Lastrucci IZ5FSA and information from Mauro I1JQJ
+# from an idea by Leo,IZ5FSA and 425DxNews Group
 #
 # $Id$
 #
 my ($self, $line) = @_;
-my @list = map {uc} split /\s+/, $line;                      # generate a list of callsigns
-my $l;
+my @list = map {uc} split /\s+/, $line;               # generate a list of callsigns
+my $op;
 my $call = $self->call;
 my @out;
 
 return (1, $self->msg('e24')) unless $Internet::allow;
-return (1, "SHOW/425 <callsign>, e.g. SH/425 3B9FR") unless @list;
-my $target = $Internet::http_proxy || $Internet::dx425_url || "www.ariscandicci.it";
-#my $target = $Internet::http_proxy || $Internet::dx425_url || "192.168.0.2";
-my $port = $Internet::http_proxy_port || 80;
-my $url = '';
-$url = 'http://' . ($Internet::dx425_url || 'www.ariscandicci.it'); #  if $Internet::http_proxy; 
-#$url = 'http://' . ($Internet::dx425_url || '192.168.0.2'); #  if $Internet::http_proxy; 
+return (1, "SHOW/425 <callsign>\nSHOW/425 CAL\nSHOW/425 BULL <bulletin number>\n e.g. SH/425 IQ5BL, SH/425 CAL, SH/425 BUL 779\n") unless @list;
 
-use Net::Telnet;
+my $target = "www.ari.it";
+my $port = 80;
+my $url = "http://www.ari.it";
 
+use Net::Telnet;
 my $t = new Net::Telnet;
+eval {$t->open( Host     => $target,
+                Port     => $port,
+                Timeout  => 30);
+};
 
-foreach $l (@list) {
-       eval {
-               $t->open(Host     =>  $target,
-                                Port     =>  $port,
-                                Timeout  =>  15);
-       };
-       if (!$t || $@) {
-               push @out, $self->msg('e18', 'Open(425.org)');
-       } else {
-               my $s = "GET $url/modules.php?name=425dxn&op=spider&query=$l HTTP/1.0\n"
-               ."User-Agent:DxSpider;$main::version;$main::build;$^O;$main::mycall;$call;$l\n\n";
-               dbg($s) if isdbg('425');
-               $t->print($s);
-               Log('call', "$call: show/425 \U$l");
-               my $state = "blank";
-               my $count = 1;
-#              push @out, $s;
-               while (my $result = eval { $t->getline(Timeout => 30) } || $@) {
-                       dbg($result) if isdbg('425') && $result;
-                               ++$count;
-                               if ($count > 10)
-                               {
-                                 #chomp $result;
-                               push @out, $result;
-               }
-               }
-               $t->close;
-               push @out, $self->msg('e3', 'Search(425.org)', uc $l) unless @out;
-       }
+if (!$t || $@) {
+        push @out, $self->msg('e18', 'Open(ARI.org)');
+} else {
+        dbg($list[0]."|".$list[1]) if isdbg('425');
+        if ($list[0] eq "CAL") {
+                $op="op=cal";
+        }
+        elsif ($list[0] eq "BULL") {
+                $op="op=bull&query=".$list[1];
+        }
+        else {
+                $op="op=search&query=".$list[0];
+        }
+        my $s = "GET $url/hf/dx-news/iz5fsa/spider.php?$op HTTP/1.0\n"
+        ."User-Agent:DxSpider;$main::version;$main::build;$^O;$main::mycall;$call;$list[0]\n\n";
+        dbg($s) if isdbg('425');
+        $t->print($s);
+        Log('call', "$call: show/425 \U$op");
+        my $state = "blank";
+        my $count = 1;
+        while (my $result = eval { $t->getline(Timeout => 30) } || $@) {
+                dbg($result) if isdbg('425') && $result;
+                ++$count;
+                if ($count > 9) {
+                        push @out, $result;
+                }
+        }
+        $t->close;
+        push @out, $self->msg('e3', 'Search(ARI.org)', uc $op) unless @out;
 }
 
 return (1, @out);

diff --git a/data/cty.dat b/data/cty.dat
index 76a7b5f75a22ab0c4c925f55ed6d5bdc7d8320ad..08fa2e14ba321e0a8de8fb9d25ddac9ff1a0914c 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -19,7 +19,7 @@ Fiji:                     32:  56:  OC:  -18.10:  -178.40:   -12.0:  3D2:
 Conway Reef:              32:  56:  OC:  -21.40:  -174.40:   -13.0:  3D2/c:\r
     3D2CI,3D2CY;\r
 Rotuma:                   32:  56:  OC:  -12.30:  -177.70:   -12.0:  3D2/r:\r
-    3D2BD,3D2RR,3D2RX;\r
+    3D2RR,3D2RX;\r
 Swaziland:                38:  57:  AF:  -26.30:   -31.10:    -2.0:  3DA:\r
     3DA;\r
 Tunisia:                  33:  37:  AF:   36.80:   -10.20:    -1.0:  3V:\r
@@ -149,14 +149,17 @@ China:                    24:  44:  AS:   40.00:  -116.40:    -8.0:  BY:
     BD9O(24)[33],BD9P(24)[33],BD9Q(24)[33],BD9R(24)[33],BD9S(24)[33],BG,\r
     BG3G(23)[33],BG3H(23)[33],BG3I(23)[33],BG3J(23)[33],BG3K(23)[33],\r
     BG3L(23)[33],BG9M(24)[33],BG9N(24)[33],BG9O(24)[33],BG9P(24)[33],BG9Q(24)[33],\r
-    BG9R(24)[33],BG9S(24)[33],BI,BT,BT3G(23)[33],BT3H(23)[33],BT3I(23)[33],\r
-    BT3J(23)[33],BT3K(23)[33],BT3L(23)[33],BT9M(24)[33],BT9N(24)[33],\r
-    BT9O(24)[33],BT9P(24)[33],BT9Q(24)[33],BT9R(24)[33],BT9S(24)[33],BY,\r
-    BY3G(23)[33],BY3H(23)[33],BY3I(23)[33],BY3J(23)[33],BY3K(23)[33],\r
-    BY3L(23)[33],BY9M(24)[33],BY9N(24)[33],BY9O(24)[33],BY9P(24)[33],BY9Q(24)[33],\r
-    BY9R(24)[33],BY9S(24)[33],BZ,BZ3G(23)[33],BZ3H(23)[33],BZ3I(23)[33],\r
-    BZ3J(23)[33],BZ3K(23)[33],BZ3L(23)[33],BZ9M(24)[33],BZ9N(24)[33],\r
-    BZ9O(24)[33],BZ9P(24)[33],BZ9Q(24)[33],BZ9R(24)[33],BZ9S(24)[33],XS;\r
+    BG9R(24)[33],BG9S(24)[33],BI,BL,BL3G(23)[33],BL3H(23)[33],BL3I(23)[33],\r
+    BL3J(23)[33],BL3K(23)[33],BL3L(23)[33],BL9M(24)[33],BL9N(24)[33],\r
+    BL9O(24)[33],BL9P(24)[33],BL9Q(24)[33],BL9R(24)[33],BL9S(24)[33],BT,\r
+    BT3G(23)[33],BT3H(23)[33],BT3I(23)[33],BT3J(23)[33],BT3K(23)[33],\r
+    BT3L(23)[33],BT9M(24)[33],BT9N(24)[33],BT9O(24)[33],BT9P(24)[33],BT9Q(24)[33],\r
+    BT9R(24)[33],BT9S(24)[33],BY,BY3G(23)[33],BY3H(23)[33],BY3I(23)[33],\r
+    BY3J(23)[33],BY3K(23)[33],BY3L(23)[33],BY9M(24)[33],BY9N(24)[33],\r
+    BY9O(24)[33],BY9P(24)[33],BY9Q(24)[33],BY9R(24)[33],BY9S(24)[33],BZ,\r
+    BZ3G(23)[33],BZ3H(23)[33],BZ3I(23)[33],BZ3J(23)[33],BZ3K(23)[33],\r
+    BZ3L(23)[33],BZ9M(24)[33],BZ9N(24)[33],BZ9O(24)[33],BZ9P(24)[33],BZ9Q(24)[33],\r
+    BZ9R(24)[33],BZ9S(24)[33],XS;\r
 Nauru:                    31:  65:  OC:   -0.50:  -166.90:   -11.5:  C2:\r
     C2;\r
 Andorra:                  14:  27:  EU:   42.50:    -1.50:    -1.0:  C3:\r
@@ -179,12 +182,13 @@ Antarctica:               13:  74:  SA:  -65.00:    64.00:    -4.0:  CE9:
     ANT,AX0,FT0Y(30)[70],FT2Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],\r
     LU1Z[73],R1AN,VH0(39)[69],VI0(39)[69],VJ0(39)[69],VK0(39)[69],VL0(39)[69],\r
     VM0(39)[69],VN0(39)[69],VZ0(39)[69],ZL0(30)[71],ZL5(30)[71],ZM5(30)[71],\r
-    ZS7(38)[67],8J1RF(39)[67],8J1RL(39)[67],9V0A,DP0GVN(38)[67],\r
+    ZS7(38)[67],8J1RF(39)[67],8J1RL(39)[67],9V0A,CE9/VK0LD[73],DP0GVN(38)[67],\r
     DP1POL(38)[67],EM1HO[73],EM1KGG[73],EM1U[73],EM1UC[73],IA0PS(30)[71],\r
-    II0AMZS(30)[71],IR0PS(30)[71],KC4AAA(39),KC4AAC[73],KC4AAF(30)[71],\r
-    KC4USB(12)[72],KC4USV(30)[71],KC4USX(30)[71],LU4ZS[73],R1ANB(29)[73],\r
-    R1ANC(29)[73],R1AND(38)[67],R1ANN(38)[67],R1ANT(29)[69],R1ANZ(29)[73],\r
-    VP8BF[73],VP8CTR,VP8PJ[73],VP8ROT[73],VU3BPZ(38)[67],W1MRQ/KC4(30)[71];\r
+    II0AMZS(30)[71],IR0PS(30)[71],K2ARB/KC4(30)[71],KC4/K2ARB(30)[71],\r
+    KC4AAA(39),KC4AAC[73],KC4AAF(30)[71],KC4USB(12)[72],KC4USV(30)[71],\r
+    KC4USX(30)[71],LU4ZS[73],R1ANB(29)[73],R1ANC(29)[73],R1AND(38)[67],\r
+    R1ANN(38)[67],R1ANT(29)[69],R1ANZ(29)[73],VP8BF[73],VP8CTR,VP8DJB[73],\r
+    VP8PJ[73],VP8ROT[73],VU3BPZ(38)[67],W1MRQ/KC4(30)[71];\r
 Cuba:                     08:  11:  NA:   23.10:    82.40:     5.0:  CM:\r
     CL,CM,CO,T4;\r
 Morocco:                  33:  37:  AF:   33.60:     7.50:     0.0:  CN:\r
@@ -248,12 +252,12 @@ Tajikistan:               17:  30:  AS:   39.70:   -66.80:    -5.0:  EY:
 Turkmenistan:             17:  30:  AS:   38.00:   -58.40:    -5.0:  EZ:\r
     EZ;\r
 France:                   14:  27:  EU:   48.80:    -2.30:    -1.0:  F:\r
-    F,HW,HX,HY,TH,TM,TP,TQ,TV,TW;\r
+    F,HW,HX,HY,TH,TM,TP,TQ,TV,TW,4U60UO;\r
 Guadeloupe:               08:  11:  NA:   16.00:    61.70:     4.0:  FG:\r
     FG,TO1T,TO2ANT,TO2FG,TO2OOO,TO4T,TO5BG,TO5C,TO5G,TO5GI,TO5ROM,TO5S,TO7ACR,\r
-    TO7AES,TO7DSR,TO7GAS,TO7T,TO8CW,TO9T;\r
+    TO7AES,TO7DSR,TO7GAS,TO7T,TO8CW,TO8RR,TO9T;\r
 Mayotte:                  39:  53:  AF:  -13.00:   -45.30:    -3.0:  FH:\r
-    FH,TO8MZ,TX0P,TX5M;\r
+    FH,TO8MZ,TX0P,TX5M,TX5NK,TX5T,TX6A;\r
 French St. Martin:        08:  11:  NA:   18.10:    63.10:     4.0:  FJ:\r
     FJ,FS,TO5D,TO9PL;\r
 New Caledonia:            32:  56:  OC:  -22.30:  -166.50:   -11.0:  FK:\r
@@ -261,8 +265,8 @@ New Caledonia:            32:  56:  OC:  -22.30:  -166.50:   -11.0:  FK:
 Chesterfield Is.:         30:  56:  OC:  -19.90:  -158.30:   -11.0:  FK/c:\r
     TX0AT,TX0C,TX0DX,TX9;\r
 Martinique:               08:  11:  NA:   14.60:    61.00:     4.0:  FM:\r
-    FM,TO0O,TO0P,TO1A,TO2DX,TO3M,TO3W,TO4A,TO5A,TO5AA,TO5MM,TO5T,TO6M,TO7HAM,\r
-    TO7X,TO8B,TO9A,TX4B;\r
+    FM,TO0O,TO0P,TO1A,TO2DX,TO3M,TO3W,TO4A,TO5A,TO5AA,TO5MM,TO5T,TO5X,TO6M,\r
+    TO7HAM,TO7X,TO8B,TO9A,TX4B;\r
 French Polynesia:         32:  63:  OC:  -17.60:   149.50:    10.0:  FO:\r
     FO;\r
 Austral Is.:              32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:\r
@@ -297,26 +301,26 @@ Isle of Man:              14:  27:  EU:   54.30:     4.50:     0.0:  GD:
     2D,GD,GT,MD,MT,GB0MST,GB0WCY,GB100MER,GB125SR,GB2IOM,GB2WB,GB3GD,GB4IOM,\r
     GB4WXM/P,GB50UN,GB5MOB,GB6SPC;\r
 Northern Ireland:         14:  27:  EU:   54.60:     5.90:     0.0:  GI:\r
-    2I,2N,GI,GN,MI,MN,GB0BTC,GB0BVC,GB0CI,GB0CSC,GB0DDF,GB0GPF,GB0PSM,GB0REL,\r
-    GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB2IL,GB2LL,GB2MRI,GB2NIC,GB2NTU,\r
-    GB2TCA,GB3MNI,GB4CSC,GB4ES,GB4SPD,GB5BL,GB5SPD,GB90SOM;\r
+    2I,2N,GI,GN,MI,MN,GB0BTC,GB0BVC,GB0CI,GB0CSC,GB0DDF,GB0GPF,GB0MFD,GB0PSM,\r
+    GB0REL,GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB2IL,GB2LL,GB2MRI,GB2NIC,\r
+    GB2NTU,GB2TCA,GB3MNI,GB4CSC,GB4ES,GB4SPD,GB5BIG,GB5BL,GB5SPD,GB90SOM;\r
 Jersey:                   14:  27:  EU:   49.30:     2.20:     0.0:  GJ:\r
     2H,2J,GH,GJ,MH,MJ,GB0CLR,GB0GUD,GB0JSA,GB0SHL,GB2BYL,GB2JSA,GB4BHF,\r
     GJ3DVC/L;\r
 Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:\r
-    2A,2M,2S,2T,GM,GS,MM,MS,GB0AC,GB0BNC,GB0DGL,GB0FLA,GB0GDS,GB0GEI,GB0GHD,\r
-    GB0GKR,GB0GNE,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,GB0OS,GB0OYT,GB0QWM,\r
-    GB0SHP,GB0SK,GB0SKY,GB0SS,GB0SSF,GB100MAS,GB125BRC,GB150NRL,GB1FVT,GB2AST,\r
-    GB2AYR,GB2CHG,GB2DHS,GB2ELH,GB2FBM,GB2FIO,GB2FSM,GB2GNL,GB2HI,GB2HRH,\r
-    GB2HST,GB2HSW,GB2IAS,GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,\r
-    GB2LAY,GB2LBN,GB2LCL,GB2LCP,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LT,GB2LTN,GB2MAS,\r
-    GB2MOD,GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,GB2NCL,GB2NEF,GB2NL,GB2NTS,\r
-    GB2OWM,GB2OYC,GB2PS,GB2RB,GB2RRL,GB2SSF,GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,\r
-    GB400CA,GB4AAS,GB4CGW,GB4DAS,GB4GM,GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,\r
-    GB4TSR,GB4ZBS,GB50ATC,GB50SWL,GB5AST,GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,\r
-    GB60BBC,GB60CRB,GB60NTS,GB6MI,GB6SA,GB6SM,GB6WW,GB700BSB,GB75SCP,GB75STT,\r
-    GB8AYR,GB8CA,GB8CC,GB8CF,GB8CI,GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,\r
-    GB93AM;\r
+    2A,2M,2S,2T,GM,GS,MM,MS,GB0AC,GB0BNC,GB0DGL,GB0FFS,GB0FLA,GB0GDS,GB0GEI,\r
+    GB0GHD,GB0GKR,GB0GNE,GB0HHW,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,GB0OS,\r
+    GB0OYT,GB0QWM,GB0SHP,GB0SK,GB0SKY,GB0SS,GB0SSF,GB100MAS,GB125BRC,GB150NRL,\r
+    GB1FVT,GB2AST,GB2AYR,GB2CHG,GB2DHS,GB2ELH,GB2FBM,GB2FIO,GB2FSM,GB2GNL,\r
+    GB2HI,GB2HRH,GB2HST,GB2HSW,GB2IAS,GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,\r
+    GB2KDS,GB2KHL,GB2LAY,GB2LBN,GB2LCL,GB2LCP,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LS,\r
+    GB2LSS,GB2LT,GB2LTN,GB2MAS,GB2MOD,GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,\r
+    GB2NCL,GB2NEF,GB2NL,GB2NTS,GB2OWM,GB2OYC,GB2PS,GB2RB,GB2RRL,GB2SLH,GB2SSF,\r
+    GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,GB400CA,GB4AAS,GB4CGW,GB4DAS,GB4GM,\r
+    GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,GB4TSR,GB4ZBS,GB50ATC,GB50SWL,GB5AST,\r
+    GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,GB60BBC,GB60CRB,GB60NTS,GB6MI,GB6SA,\r
+    GB6SM,GB6WW,GB700BSB,GB75GD,GB75SCP,GB75STT,GB8AYR,GB8CA,GB8CF,GB8CI,\r
+    GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,GB93AM,MM/DL6MHW;\r
 Shetlands:                14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:\r
     GZ,MZ,2M1ANT,2M1ASQ,2M1ODL,GM0DJI,GM0EKM,GM0ILB,GM0MZD,GM0VFA,GM1CBQ,\r
     GM1KKI,GM1ZNR,GM3KLA,GM3STU,GM3WCH,GM3WHT,GM3XPQ,GM3ZET,GM3ZNM,GM3ZXH,\r
@@ -326,13 +330,14 @@ Shetlands:                14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:
 Guernsey:                 14:  27:  EU:   49.50:     2.70:     0.0:  GU:\r
     2P,2U,GP,GU,MP,MU,GB0GUC,GB0JAG,GB0ON,GB2ECG,GB2GU,GB50LIB;\r
 Wales:                    14:  27:  EU:   51.50:     3.20:     0.0:  GW:\r
-    2C,2W,2X,2Y,GC,GW,MC,MW,GB0CCE,GB0CLC,GB0GCR,GB0GLV,GB0HMT,GB0ML,GB0MPA,\r
-    GB0MWL,GB0NEW,GB0PSG,GB0RPO,GB0RSC,GB0SDD,GB0SH,GB0SPS,GB0SRH,GB0TD,\r
-    GB0WRC,GB100BD,GB100FI,GB100LP,GB1CCC,GB1LSG,GB1SSL,GB1TDS,GB2000SET,\r
-    GB200HNT,GB2ANG,GB2CPC,GB2GGM,GB2GLS,GB2GOL,GB2GSS,GB2IMD,GB2LNP,GB2LSA,\r
-    GB2MIL,GB2MLM,GB2MOP,GB2RSC,GB2RTB,GB2SDD,GB2SIP,GB2TD,GB2VK,GB2WFF,\r
-    GB4BPL,GB4DPS,GB4HMD,GB4LSG,GB4MD,GB4MDI,GB4SA,GB4SMM,GB4SNF,GB4XXX,\r
-    GB5BS/J,GB5FI,GB5SIP,GB60VLY,GB6AR,GB750CC,GB8OQE;\r
+    2C,2W,2X,2Y,GC,GW,MC,MW,GB0CCE,GB0CLC,GB0GCR,GB0GLV,GB0HEL,GB0HMT,GB0ML,\r
+    GB0MPA,GB0MWL,GB0NEW,GB0PSG,GB0RPO,GB0RSC,GB0SDD,GB0SH,GB0SPS,GB0SRH,\r
+    GB0TD,GB0WRC,GB100BD,GB100FI,GB100LP,GB1CCC,GB1LSG,GB1SSL,GB1TDS,\r
+    GB2000SET,GB200HNT,GB2ANG,GB2CPC,GB2GGM,GB2GLS,GB2GOL,GB2GSG,GB2GSS,\r
+    GB2IMD,GB2LNP,GB2LSA,GB2MIL,GB2MLM,GB2MOP,GB2RFS,GB2RSC,GB2RTB,GB2SDD,\r
+    GB2SIP,GB2TD,GB2VK,GB2WFF,GB4BPL,GB4CI,GB4DPS,GB4HMD,GB4LSG,GB4MD,GB4MDI,\r
+    GB4SA,GB4SMM,GB4SNF,GB4XXX,GB5BS/J,GB5FI,GB5SIP,GB60VLY,GB6AR,GB750CC,\r
+    GB8OQE;\r
 Solomon Islands:          28:  51:  OC:   -9.40:  -160.00:   -11.0:  H4:\r
     H4;\r
 Temotu:                   32:  51:  OC:  -10.70:  -165.80:   -11.0:  H40:\r
@@ -479,7 +484,7 @@ Kure I.:                  31:  61:  OC:   28.40:   178.40:    11.0:  KH7K:
     AH7K,KH7K,NH7K,WH7K;\r
 American Samoa:           32:  62:  OC:  -14.30:   170.80:    11.0:  KH8:\r
     AH8,KH8,NH8,WH8;\r
-Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/S:\r
+Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:\r
     KH8SI;\r
 Wake I.:                  31:  65:  OC:   19.30:  -166.60:   -12.0:  KH9:\r
     AH9,KH9,NH9,WH9;\r
@@ -500,23 +505,25 @@ Argentina:                13:  14:  SA:  -34.60:    58.40:     3.0:  LU:
     AY4EJ/D,AY5E/D,AY7DSY/D,DJ4SN/LU/X,L20ARC/D,L21ESC/LH,L25E/D,L30EY/D,\r
     L30EY/V,L40E/D,L44D/D,L80AA/D,L8D/X,LO0D/D,LU/DH4PB/R,LU/DH4PB/S,LU1AEE/D,\r
     LU1AF/D,LU1CDP/D,LU1DK/D,LU1DMA/E,LU1DZ/P,LU1DZ/Q,LU1DZ/R,LU1DZ/S,LU1DZ/X,\r
-    LU1EJ/W,LU1EYW/D,LU1OFN/I,LU1VZ/V,LU1XAW/X,LU1XY/X,LU1YU/D,LU2DT/D,\r
-    LU2DT/LH,LU2DVI/H,LU2EE/D,LU2EJB/X,LU2VC/D,LU2WV/O,LU3CQ/D,LU3DJI/W,\r
-    LU3DOC/D,LU3DR/D,LU3DR/V,LU3ES/W,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,\r
-    LU4DRH/E,LU4EJ/D,LU4ETN/D,LU5BE/D,LU5DEM/D,LU5DIT/D,LU5DIT/V,LU5DRV/D,\r
-    LU5DRV/V,LU5DT/D,LU5DV/D,LU5EAO/D,LU5EFX/Y,LU5EWO/D,LU5XC/X,LU6DBL/D,\r
-    LU6DRD/D,LU6DRD/E,LU6DRR/D,LU6EC/W,LU6EJJ/D,LU6EPR/D,LU6EPR/E,LU6EYK/X,\r
-    LU6UO/P,LU6UO/Q,LU6UO/R,LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,LU7DID/V,\r
-    LU7DID/Y,LU7DIR/D,LU7DJJ/W,LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,LU7DSY/W,\r
-    LU7DW/D,LU7DZL/D,LU7DZL/E,LU7EGY/D,LU7EO/D,LU7EPC/W,LU7VCH/D,LU7WFM/W,\r
-    LU8ADX/D,LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,LU8DWR/V,LU8EBJ/D,LU8EBJ/E,\r
-    LU8EBK/D,LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,LU8EGS/D,LU8EHQ/D,LU8EHQ/E,\r
-    LU8EHQ/W,LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8ERH/D,LU8EXJ/D,LU8EXN/D,LU8FOZ/V,\r
-    LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,LU9DBK/X,LU9DKX/X,LU9EJS/E,LU9ESD/D,\r
-    LU9ESD/V,LU9EV/LH,LU9JMG/J,LW2DX/P,LW2DX/Q,LW2DX/R,LW2DX/S,LW3DKC/D,\r
-    LW3DKC/E,LW3DKO/D,LW3DKO/E,LW3HAQ/D,LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,\r
-    LW4EM/LH,LW5DR/LH,LW5EE/D,LW5EE/V,LW5EOL/D,LW7DAF/W,LW7DNS/E,LW8DMK/D,\r
-    LW8EU/D,LW8EXF/D,LW9EAG/D,LW9EAG/V,LW9EVA/D,LW9EVA/E;\r
+    LU1EJ/W,LU1EQ/D,LU1EYW/D,LU1OFN/I,LU1VZ/V,LU1XAW/X,LU1XY/X,LU1YU/D,\r
+    LU1YY/Y,LU2DT/D,LU2DT/LH,LU2DVI/H,LU2EE/D,LU2EJB/X,LU2VC/D,LU2WV/O,\r
+    LU2XX/X,LU3CQ/D,LU3DJI/D,LU3DJI/W,LU3DOC/D,LU3DR/D,LU3DR/V,LU3ES/W,\r
+    LU4AAO/D,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,LU4DRH/E,LU4EJ/D,LU4ETN/D,\r
+    LU4WG/W,LU5BE/D,LU5DEM/D,LU5DEM/V,LU5DIT/D,LU5DIT/V,LU5DRV/D,LU5DRV/V,\r
+    LU5DT/D,LU5DV/D,LU5DWS/D,LU5EAO/D,LU5EFX/Y,LU5EWO/D,LU5XC/X,LU6DBL/D,\r
+    LU6DKT/D,LU6DRD/D,LU6DRD/E,LU6DRR/D,LU6EC/W,LU6EJJ/D,LU6EPR/D,LU6EPR/E,\r
+    LU6EYK/X,LU6UO/D,LU6UO/P,LU6UO/Q,LU6UO/R,LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,\r
+    LU7DID/V,LU7DID/Y,LU7DIR/D,LU7DJJ/W,LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,\r
+    LU7DSY/W,LU7DW/D,LU7DZL/D,LU7DZL/E,LU7EGH/V,LU7EGY/D,LU7EO/D,LU7EPC/D,\r
+    LU7EPC/W,LU7VCH/D,LU7WFM/W,LU8ADX/D,LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,\r
+    LU8DWR/V,LU8EBJ/D,LU8EBJ/E,LU8EBK/D,LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,\r
+    LU8EGS/D,LU8EHQ/D,LU8EHQ/E,LU8EHQ/W,LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8EOT/Y,\r
+    LU8ERH/D,LU8EXJ/D,LU8EXN/D,LU8FOZ/V,LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,\r
+    LU9DBK/X,LU9DKX/X,LU9EJS/E,LU9ESD/D,LU9ESD/V,LU9ESD/Y,LU9EV/LH,LU9JMG/J,\r
+    LW2DX/P,LW2DX/Q,LW2DX/R,LW2DX/S,LW2ENB/D,LW3DKC/D,LW3DKC/E,LW3DKO/D,\r
+    LW3DKO/E,LW3HAQ/D,LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,LW4EM/LH,LW5DR/LH,\r
+    LW5DWX/D,LW5EE/D,LW5EE/V,LW5EOL/D,LW7DAF/W,LW7DNS/E,LW8DMK/D,LW8EU/D,\r
+    LW8EXF/D,LW9DCF/Y,LW9EAG/D,LW9EAG/V,LW9EVA/D,LW9EVA/E;\r
 Luxembourg:               14:  27:  EU:   49.60:    -6.20:    -1.0:  LX:\r
     LX;\r
 Lithuania:                15:  29:  EU:   54.50:   -25.50:    -2.0:  LY:\r
@@ -528,7 +535,7 @@ Peru:                     10:  12:  SA:  -12.10:    77.10:     5.0:  OA:
 Lebanon:                  20:  39:  AS:   33.90:   -35.50:    -2.0:  OD:\r
     OD;\r
 Austria:                  15:  28:  EU:   48.20:   -16.30:    -1.0:  OE:\r
-    OE,4U1VIC;\r
+    OE,4U1VIC,OE3XHA/VFW06;\r
 Finland:                  15:  18:  EU:   60.20:   -25.00:    -2.0:  OH:\r
     OF,OG,OH,OI,OJ;\r
 Aland Is.:                15:  18:  EU:   60.20:   -20.00:    -2.0:  OH0:\r
@@ -657,54 +664,53 @@ European Russia:          16:  29:  EU:   55.80:   -37.60:    -3.0:  UA:
 Kaliningrad:              15:  29:  EU:   55.00:   -20.50:    -2.0:  UA2:\r
     R2,R60F,R750,RA2,RB2,RC2,RD2,RE2,RF2,RG2,RH2,RI2,RJ2,RK2,RL2,RM2,RN2,RP2,\r
     RQ2,RR2,RS2,RT2,RU2,RV2,RW2,RX2,RY2,RZ2,U2,UA2,UB2,UC2,UD2,UE2,UF2,UG2,\r
-    UH2,UI2;\r
+    UH2,UI2,R60A;\r
 Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:\r
-    R0,R7,R8,R8T(18)[32],R8V(18)[33],R9,R9I(18)[31],R9M(17),R9S(16),R9T(16),\r
-    R9W(16),RA0,RA7,RA8,RA8T(18)[32],RA8V(18)[33],RA9,RA9I(18)[31],RA9M(17),\r
-    RA9S(16),RA9T(16),RA9W(16),RB0,RB7,RB8,RB8T(18)[32],RB8V(18)[33],RB9,\r
-    RB9I(18)[31],RB9M(17),RB9S(16),RB9T(16),RB9W(16),RC0,RC7,RC8,RC8T(18)[32],\r
-    RC8V(18)[33],RC9,RC9I(18)[31],RC9M(17),RC9S(16),RC9T(16),RC9W(16),RD0,RD7,RD8,\r
-    RD8T(18)[32],RD8V(18)[33],RD9,RD9I(18)[31],RD9M(17),RD9S(16),RD9T(16),\r
-    RD9W(16),RE0,RE7,RE8,RE8T(18)[32],RE8V(18)[33],RE9,RE9I(18)[31],RE9M(17),\r
-    RE9S(16),RE9T(16),RE9W(16),RF0,RF7,RF8,RF8T(18)[32],RF8V(18)[33],RF9,\r
-    RF9I(18)[31],RF9M(17),RF9S(16),RF9T(16),RF9W(16),RG0,RG7,RG8,RG8T(18)[32],\r
-    RG8V(18)[33],RG9,RG9I(18)[31],RG9M(17),RG9S(16),RG9T(16),RG9W(16),RH0,RH7,RH8,\r
-    RH8T(18)[32],RH8V(18)[33],RH9,RH9I(18)[31],RH9M(17),RH9S(16),RH9T(16),\r
-    RH9W(16),RI0,RI7,RI8,RI8T(18)[32],RI8V(18)[33],RI9,RI9I(18)[31],RI9M(17),\r
-    RI9S(16),RI9T(16),RI9W(16),RJ0,RJ7,RJ8,RJ8T(18)[32],RJ8V(18)[33],RJ9,\r
-    RJ9I(18)[31],RJ9M(17),RJ9S(16),RJ9T(16),RJ9W(16),RK0,RK7,RK8,RK8T(18)[32],\r
-    RK8V(18)[33],RK9,RK9I(18)[31],RK9M(17),RK9S(16),RK9T(16),RK9W(16),RL0,RL7,RL8,\r
-    RL8T(18)[32],RL8V(18)[33],RL9,RL9I(18)[31],RL9M(17),RL9S(16),RL9T(16),\r
-    RL9W(16),RM0,RM7,RM8,RM8T(18)[32],RM8V(18)[33],RM9,RM9I(18)[31],RM9M(17),\r
-    RM9S(16),RM9T(16),RM9W(16),RN0,RN7,RN8,RN8T(18)[32],RN8V(18)[33],RN9,\r
-    RN9I(18)[31],RN9M(17),RN9S(16),RN9T(16),RN9W(16),RP0,RP7,RP8,RP8T(18)[32],\r
-    RP8V(18)[33],RP9,RP9I(18)[31],RP9M(17),RP9S(16),RP9T(16),RP9W(16),RQ0,RQ7,RQ8,\r
-    RQ8T(18)[32],RQ8V(18)[33],RQ9,RQ9I(18)[31],RQ9M(17),RQ9S(16),RQ9T(16),\r
-    RQ9W(16),RR0,RR7,RR8,RR8T(18)[32],RR8V(18)[33],RR9,RR9I(18)[31],RR9M(17),\r
-    RR9S(16),RR9T(16),RR9W(16),RS0,RS7,RS8,RS8T(18)[32],RS8V(18)[33],RS9,\r
-    RS9I(18)[31],RS9M(17),RS9S(16),RS9T(16),RS9W(16),RT0,RT7,RT8,RT8T(18)[32],\r
-    RT8V(18)[33],RT9,RT9I(18)[31],RT9M(17),RT9S(16),RT9T(16),RT9W(16),RU0,RU7,RU8,\r
-    RU8T(18)[32],RU8V(18)[33],RU9,RU9I(18)[31],RU9M(17),RU9S(16),RU9T(16),\r
-    RU9W(16),RV0,RV7,RV8,RV8T(18)[32],RV8V(18)[33],RV9,RV9I(18)[31],RV9M(17),\r
-    RV9S(16),RV9T(16),RV9W(16),RW0,RW7,RW8,RW8T(18)[32],RW8V(18)[33],RW9,\r
-    RW9I(18)[31],RW9M(17),RW9S(16),RW9T(16),RW9W(16),RX0,RX7,RX8,RX8T(18)[32],\r
-    RX8V(18)[33],RX9,RX9I(18)[31],RX9M(17),RX9S(16),RX9T(16),RX9W(16),RY0,RY7,RY8,\r
-    RY8T(18)[32],RY8V(18)[33],RY9,RY9I(18)[31],RY9M(17),RY9S(16),RY9T(16),\r
-    RY9W(16),RZ0,RZ7,RZ8,RZ8T(18)[32],RZ8V(18)[33],RZ9,RZ9I(18)[31],RZ9M(17),\r
-    RZ9S(16),RZ9T(16),RZ9W(16),U0,U7,U8,U8T(18)[32],U8V(18)[33],U9,U9I(18)[31],\r
-    U9M(17),U9S(16),U9T(16),U9W(16),UA0,UA7,UA8,UA8T(18)[32],UA8V(18)[33],UA9,\r
-    UA9I(18)[31],UA9M(17),UA9S(16),UA9T(16),UA9W(16),UB0,UB7,UB8,UB8T(18)[32],\r
-    UB8V(18)[33],UB9,UB9I(18)[31],UB9M(17),UB9S(16),UB9T(16),UB9W(16),UC0,UC7,UC8,\r
-    UC8T(18)[32],UC8V(18)[33],UC9,UC9I(18)[31],UC9M(17),UC9S(16),UC9T(16),\r
-    UC9W(16),UD0,UD7,UD8,UD8T(18)[32],UD8V(18)[33],UD9,UD9I(18)[31],UD9M(17),\r
-    UD9S(16),UD9T(16),UD9W(16),UE0,UE7,UE8,UE8T(18)[32],UE8V(18)[33],UE9,\r
-    UE9I(18)[31],UE9M(17),UE9S(16),UE9T(16),UE9W(16),UF0,UF7,UF8,UF8T(18)[32],\r
-    UF8V(18)[33],UF9,UF9I(18)[31],UF9M(17),UF9S(16),UF9T(16),UF9W(16),UG0,UG7,UG8,\r
-    UG8T(18)[32],UG8V(18)[33],UG9,UG9I(18)[31],UG9M(17),UG9S(16),UG9T(16),\r
-    UG9W(16),UH0,UH7,UH8,UH8T(18)[32],UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),\r
-    UH9S(16),UH9T(16),UH9W(16),UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9,\r
-    UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R270A,R270E,R3F/9,R9HQ(17)[30],\r
-    UE105SBM(18)[32];\r
+    R0,R8,R8T(18)[32],R8V(18)[33],R9,R9I(18)[31],R9M(17),R9S(16),R9T(16),R9W(16),\r
+    RA0,RA8,RA8T(18)[32],RA8V(18)[33],RA9,RA9I(18)[31],RA9M(17),RA9S(16),\r
+    RA9T(16),RA9W(16),RB0,RB8,RB8T(18)[32],RB8V(18)[33],RB9,RB9I(18)[31],\r
+    RB9M(17),RB9S(16),RB9T(16),RB9W(16),RC0,RC8,RC8T(18)[32],RC8V(18)[33],RC9,\r
+    RC9I(18)[31],RC9M(17),RC9S(16),RC9T(16),RC9W(16),RD0,RD8,RD8T(18)[32],\r
+    RD8V(18)[33],RD9,RD9I(18)[31],RD9M(17),RD9S(16),RD9T(16),RD9W(16),RE0,RE8,\r
+    RE8T(18)[32],RE8V(18)[33],RE9,RE9I(18)[31],RE9M(17),RE9S(16),RE9T(16),\r
+    RE9W(16),RF0,RF8,RF8T(18)[32],RF8V(18)[33],RF9,RF9I(18)[31],RF9M(17),\r
+    RF9S(16),RF9T(16),RF9W(16),RG0,RG8,RG8T(18)[32],RG8V(18)[33],RG9,\r
+    RG9I(18)[31],RG9M(17),RG9S(16),RG9T(16),RG9W(16),RH0,RH8,RH8T(18)[32],\r
+    RH8V(18)[33],RH9,RH9I(18)[31],RH9M(17),RH9S(16),RH9T(16),RH9W(16),RI0,RI8,\r
+    RI8T(18)[32],RI8V(18)[33],RI9,RI9I(18)[31],RI9M(17),RI9S(16),RI9T(16),\r
+    RI9W(16),RJ0,RJ8,RJ8T(18)[32],RJ8V(18)[33],RJ9,RJ9I(18)[31],RJ9M(17),\r
+    RJ9S(16),RJ9T(16),RJ9W(16),RK0,RK8,RK8T(18)[32],RK8V(18)[33],RK9,\r
+    RK9I(18)[31],RK9M(17),RK9S(16),RK9T(16),RK9W(16),RL0,RL8,RL8T(18)[32],\r
+    RL8V(18)[33],RL9,RL9I(18)[31],RL9M(17),RL9S(16),RL9T(16),RL9W(16),RM0,RM8,\r
+    RM8T(18)[32],RM8V(18)[33],RM9,RM9I(18)[31],RM9M(17),RM9S(16),RM9T(16),\r
+    RM9W(16),RN0,RN8,RN8T(18)[32],RN8V(18)[33],RN9,RN9I(18)[31],RN9M(17),\r
+    RN9S(16),RN9T(16),RN9W(16),RP0,RP8,RP8T(18)[32],RP8V(18)[33],RP9,\r
+    RP9I(18)[31],RP9M(17),RP9S(16),RP9T(16),RP9W(16),RQ0,RQ8,RQ8T(18)[32],\r
+    RQ8V(18)[33],RQ9,RQ9I(18)[31],RQ9M(17),RQ9S(16),RQ9T(16),RQ9W(16),RR0,RR8,\r
+    RR8T(18)[32],RR8V(18)[33],RR9,RR9I(18)[31],RR9M(17),RR9S(16),RR9T(16),\r
+    RR9W(16),RS0,RS8,RS8T(18)[32],RS8V(18)[33],RS9,RS9I(18)[31],RS9M(17),\r
+    RS9S(16),RS9T(16),RS9W(16),RT0,RT8,RT8T(18)[32],RT8V(18)[33],RT9,\r
+    RT9I(18)[31],RT9M(17),RT9S(16),RT9T(16),RT9W(16),RU0,RU8,RU8T(18)[32],\r
+    RU8V(18)[33],RU9,RU9I(18)[31],RU9M(17),RU9S(16),RU9T(16),RU9W(16),RV0,RV8,\r
+    RV8T(18)[32],RV8V(18)[33],RV9,RV9I(18)[31],RV9M(17),RV9S(16),RV9T(16),\r
+    RV9W(16),RW0,RW8,RW8T(18)[32],RW8V(18)[33],RW9,RW9I(18)[31],RW9M(17),\r
+    RW9S(16),RW9T(16),RW9W(16),RX0,RX8,RX8T(18)[32],RX8V(18)[33],RX9,\r
+    RX9I(18)[31],RX9M(17),RX9S(16),RX9T(16),RX9W(16),RY0,RY8,RY8T(18)[32],\r
+    RY8V(18)[33],RY9,RY9I(18)[31],RY9M(17),RY9S(16),RY9T(16),RY9W(16),RZ0,RZ8,\r
+    RZ8T(18)[32],RZ8V(18)[33],RZ9,RZ9I(18)[31],RZ9M(17),RZ9S(16),RZ9T(16),\r
+    RZ9W(16),U0,U8,U8T(18)[32],U8V(18)[33],U9,U9I(18)[31],U9M(17),U9S(16),U9T(16),\r
+    U9W(16),UA0,UA8,UA8T(18)[32],UA8V(18)[33],UA9,UA9I(18)[31],UA9M(17),UA9S(16),\r
+    UA9T(16),UA9W(16),UB0,UB8,UB8T(18)[32],UB8V(18)[33],UB9,UB9I(18)[31],\r
+    UB9M(17),UB9S(16),UB9T(16),UB9W(16),UC0,UC8,UC8T(18)[32],UC8V(18)[33],UC9,\r
+    UC9I(18)[31],UC9M(17),UC9S(16),UC9T(16),UC9W(16),UD0,UD8,UD8T(18)[32],\r
+    UD8V(18)[33],UD9,UD9I(18)[31],UD9M(17),UD9S(16),UD9T(16),UD9W(16),UE0,UE8,\r
+    UE8T(18)[32],UE8V(18)[33],UE9,UE9I(18)[31],UE9M(17),UE9S(16),UE9T(16),\r
+    UE9W(16),UF0,UF8,UF8T(18)[32],UF8V(18)[33],UF9,UF9I(18)[31],UF9M(17),\r
+    UF9S(16),UF9T(16),UF9W(16),UG0,UG8,UG8T(18)[32],UG8V(18)[33],UG9,\r
+    UG9I(18)[31],UG9M(17),UG9S(16),UG9T(16),UG9W(16),UH0,UH8,UH8T(18)[32],\r
+    UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),UH9S(16),UH9T(16),UH9W(16),UI0,UI8,\r
+    UI8T(18)[32],UI8V(18)[33],UI9,UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),\r
+    UI9W(16),R270A,R270E,R375I,R3F/9,R9HQ(17)[30],UE105SBM(18)[32];\r
 Uzbekistan:               17:  30:  AS:   41.20:   -69.30:    -5.0:  UK:\r
     UJ,UK,UL,UM;\r
 Kazakhstan:               17:  30:  AS:   43.30:   -76.90:    -5.0:  UN:\r
@@ -720,27 +726,27 @@ St. Kitts & Nevis:        08:  11:  NA:   17.30:    62.60:     4.0:  V4:
 Namibia:                  38:  57:  AF:  -22.60:   -17.10:    -1.0:  V5:\r
     V5;\r
 Micronesia:               27:  65:  OC:    6.90:  -158.30:   -10.0:  V6:\r
-    V6;\r
+    V6,V63JQ/C,V63JQ/K,V63JY/C,V63JY/K,V63OP/C,V63OP/K,V63VE/C,V63VE/K;\r
 Marshall Is.:             31:  65:  OC:    9.10:  -167.30:   -12.0:  V7:\r
     V7;\r
 Brunei:                   28:  54:  OC:    4.90:  -114.90:    -8.0:  V8:\r
     V8;\r
 Canada:                   05:  09:  NA:   45.00:    80.00:     4.0:  VE:\r
     CF,CG,CH1(5)[9],CH2(2)[9],CI0(2)[4],CI1(1)[2],CI2(5)[9],CJ,CK,CY1(5)[9],\r
-    CY2(2)[9],CZ0(2)[4],CZ1(1)[2],CZ2(5)[9],VA,VA2ZM(2),VB,VC,VD1(5)[9],\r
-    VD2(2)[9],VE,VF0(2)[4],VF1(1)[2],VF2(5)[9],VG,VO1(5)[9],VO2(2)[9],VX,\r
-    VY0(2)[4],VY1(1)[2],VY2(5)[9],XJ1(5)[9],XJ2(2)[9],XK0(2)[4],XK1(1)[2],\r
-    XK2(5)[9],XL,XM,XN1(5)[9],XN2(2)[9],XO0(2)[4],XO1(1)[2],XO2(5)[9],\r
-    K3FMQ/VE2(2),KD3RF/VE2(2),KD3TB/VE2(2),VA2BY(2),VA2CT(2),VA2DO(2),\r
-    VA2DXE(2),VA2KCE(2),VA2RHJ(2),VA2UA(2),VA2VFT(2),VA3NA/2(2),VB2C(2),\r
-    VB2R(2),VB2V(2),VC2C(2),VE2/K3FMQ(2),VE2ACP(2),VE2AE(2),VE2AG(2),\r
-    VE2AOF(2),VE2AQS(2),VE2AS(2),VE2BQB(2),VE2CSI(2),VE2CVI(2),VE2DMG(2),\r
-    VE2DS(2),VE2DWU(2),VE2DYW(2),VE2DYX(2),VE2EAK(2),VE2EDL(2),VE2EDX(2),\r
-    VE2ELL(2),VE2ENB(2),VE2END(2),VE2ENR(2),VE2ERU(2),VE2FCV(2),VE2GSA(2),\r
-    VE2GSO(2),VE2III(2),VE2IM(2),VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),\r
-    VE2NRK(2),VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),\r
-    VE2WT(2),VE2XAA(2),VE2XY(2),VE2YM(2),VE3EY/2(2),VE3RHJ/2(2),VE8AJ(2),\r
-    VE8PW(2),VE8RCS(2),VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];\r
+    CY2(2)[9],CZ0(2)[4],CZ1(1)[2],CZ2(5)[9],VA,VB,VC,VD1(5)[9],VD2(2)[9],VE,\r
+    VF0(2)[4],VF1(1)[2],VF2(5)[9],VG,VO1(5)[9],VO2(2)[9],VX,VY0(2)[4],\r
+    VY1(1)[2],VY2(5)[9],XJ1(5)[9],XJ2(2)[9],XK0(2)[4],XK1(1)[2],XK2(5)[9],XL,\r
+    XM,XN1(5)[9],XN2(2)[9],XO0(2)[4],XO1(1)[2],XO2(5)[9],K3FMQ/VE2(2),\r
+    KD3RF/VE2(2),KD3TB/VE2(2),VA2BY(2),VA2CT(2),VA2DO(2),VA2DXE(2),VA2KCE(2),\r
+    VA2RHJ(2),VA2UA(2),VA2VFT(2),VA2ZM(2),VA3NA/2(2),VB2C(2),VB2R(2),VB2V(2),\r
+    VC2C(2),VE2/K3FMQ(2),VE2ACP(2),VE2AE(2),VE2AG(2),VE2AOF(2),VE2AQS(2),\r
+    VE2AS(2),VE2BQB(2),VE2CSI(2),VE2CVI(2),VE2DMG(2),VE2DS(2),VE2DWU(2),\r
+    VE2DXY(2),VE2DYW(2),VE2DYX(2),VE2EAK(2),VE2EDL(2),VE2EDX(2),VE2ELL(2),\r
+    VE2ENB(2),VE2END(2),VE2ENR(2),VE2ERU(2),VE2FCV(2),VE2GSA(2),VE2GSO(2),\r
+    VE2III(2),VE2IM(2),VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),VE2NRK(2),\r
+    VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WT(2),\r
+    VE2XAA/2(2),VE2XY(2),VE2YM(2),VE3EY/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),\r
+    VE8RCS(2),VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];\r
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:\r
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ,VI90ANZAC(29);\r
 Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:\r
@@ -748,19 +754,19 @@ Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:
 Macquarie I.:             30:  60:  OC:  -54.70:  -158.80:   -11.0:  VK0M:\r
     AX0M,VH0M,VI0M,VJ0M,VK0M,VL0M,VM0M,VN0M,VZ0M;\r
 Cocos-Keeling:            29:  54:  OC:  -12.20:   -96.80:    -6.5:  VK9C:\r
-    AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9KC,VK9KY,VK9Y,VL9C,VL9Y,\r
-    VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y,VK9AA;\r
+    AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9FC,VK9KC,VK9KY,VK9Y,VL9C,\r
+    VL9Y,VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y,VK9AA;\r
 Lord Howe I.:             30:  60:  OC:  -31.60:  -159.10:   -10.5:  VK9L:\r
-    AX9L,VH9L,VI9L,VJ9L,VK9KL,VK9L,VL9L,VM9L,VN9L,VZ9L,VK9AE,VK9NM,VK9PG,\r
-    VK9YQS;\r
+    AX9L,VH9L,VI9L,VJ9L,VK9FL,VK9KL,VK9L,VL9L,VM9L,VN9L,VZ9L,VK9AE,VK9NM,\r
+    VK9PG,VK9YQS;\r
 Mellish Reef:             30:  56:  OC:  -17.60:  -155.80:   -10.0:  VK9M:\r
-    AX9M,VH9M,VI9M,VJ9M,VK9KM,VK9M,VL9M,VM9M,VN9M,VZ9M;\r
+    AX9M,VH9M,VI9M,VJ9M,VK9FM,VK9KM,VK9M,VL9M,VM9M,VN9M,VZ9M;\r
 Norfolk I.:               32:  60:  OC:  -29.00:  -168.00:   -11.5:  VK9N:\r
     AX9,VH9,VI9,VJ9,VK9,VL9,VM9,VN9,VZ9;\r
 Willis I.:                30:  55:  OC:  -16.30:  -149.50:   -10.0:  VK9W:\r
-    AX9W,VH9W,VI9W,VJ9W,VK9KW,VK9W,VL9W,VM9W,VN9W,VZ9W;\r
+    AX9W,VH9W,VI9W,VJ9W,VK9FW,VK9KW,VK9W,VL9W,VM9W,VN9W,VZ9W;\r
 Christmas I.:             29:  54:  OC:  -10.50:  -105.70:    -7.0:  VK9X:\r
-    AX9X,VH9X,VI9X,VJ9X,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X;\r
+    AX9X,VH9X,VI9X,VJ9X,VK9FX,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X,VK3FY/9;\r
 Anguilla:                 08:  11:  NA:   18.30:    63.00:     4.0:  VP2E:\r
     VP2E;\r
 Montserrat:               08:  11:  NA:   16.80:    62.20:     4.0:  VP2M:\r
@@ -771,15 +777,15 @@ Turks & Caicos:           08:  11:  NA:   21.80:    72.40:     5.0:  VP5:
     VP5,VQ5;\r
 Pitcairn I.:              32:  63:  OC:  -25.10:   130.10:     8.5:  VP6:\r
     VP6;\r
-Ducie I.:                 32:  63:  OC:  -24.40:   124.48:     8.5:  VP6/d:\r
+Ducie I.:                 32:  63:  OC:  -24.67:   124.79:     8.5:  VP6/d:\r
     VP6DI;\r
 Falkland Is.:             13:  16:  SA:  -51.70:    57.90:     4.0:  VP8:\r
     VP8;\r
 South Georgia:            13:  73:  SA:  -54.30:    36.80:     2.0:  VP8/g:\r
     VP8GEO,VP8SGB,VP8SGK;\r
 South Shetland:           13:  73:  SA:  -62.00:    58.30:     4.0:  VP8/h:\r
-    CE9A,CE9R,CA8WCI/9,D88S,DT8A,HF0POL,HF0QF,HL0KSJ,HL5BDS,HL8KSJ,LU1ZC,LZ0A,\r
-    OL0ANT,R1ANF,VP8DJK,XR9A;\r
+    CE9A,CE9R,CA8WCI/9,D88S,DT8A,HF0POL,HF0QF,HL0KSJ,HL5BDS,HL8KSJ,LU/R1ANF,\r
+    LU1ZC,LZ0A,OL0ANT,R1ANF,VP8DJK,XR9A;\r
 South Orkney:             13:  73:  SA:  -60.00:    45.50:     3.0:  VP8/o:\r
     AY1ZA,LU1ZA;\r
 South Sandwich:           13:  73:  SA:  -57.00:    26.70:     2.0:  VP8/s:\r
@@ -833,8 +839,6 @@ El Salvador:              07:  11:  NA:   13.70:    89.20:     6.0:  YS:
     HU,YS;\r
 Serbia:                   15:  28:  EU:   44.90:   -20.50:    -1.0:  YU:\r
     4N,4O,YT,YU,YZ;\r
-Montenegro:               15:  28:  EU:   42.50:   -19.30:    -1.0:  YU6:\r
-    4N3,4N6,4O3,4O6,YT3,YT6,YU3,YU6,YZ3,YZ6;\r
 Venezuela:                09:  12:  SA:   10.50:    67.00:     4.0:  YV:\r
     4M,YV,YW,YX,YY;\r
 Aves I.:                  08:  11:  NA:   15.70:    63.70:     4.0:  YV0:\r
@@ -843,6 +847,8 @@ Zimbabwe:                 38:  53:  AF:  -17.80:   -31.00:    -2.0:  Z2:
     Z2;\r
 Macedonia:                15:  28:  EU:   41.80:   -21.40:    -1.0:  Z3:\r
     Z3;\r
+Montenegro:               15:  28:  EU:   42.50:   -19.30:    -1.0:  Z7:\r
+    4N3,4N6,4O3,4O6,YT3,YT6,YU3,YU6,YZ3,YZ6,Z7;\r
 Albania:                  15:  28:  EU:   41.30:   -19.80:    -1.0:  ZA:\r
     ZA;\r
 Gibraltar:                14:  37:  EU:   36.10:     5.40:    -1.0:  ZB:\r
@@ -858,15 +864,15 @@ Tristan da Cunha:         38:  66:  AF:  -37.10:    12.30:     0.0:  ZD9:
 Cayman Is.:               08:  11:  NA:   19.50:    81.20:     5.0:  ZF:\r
     ZF;\r
 North Cook Is.:           32:  62:  OC:  -10.40:   161.00:    10.0:  ZK1/n:\r
-    ZK1XMY;\r
+    E51NOU,E51QMA,E51TUG,E51YAQ;\r
 South Cook Is.:           32:  62:  OC:  -21.20:   159.80:    10.0:  ZK1/s:\r
-    E5,ZK1;\r
+    E5;\r
 Niue:                     32:  62:  OC:  -19.00:   169.90:    11.0:  ZK2:\r
     ZK2;\r
 Tokelau:                  31:  62:  OC:   -8.40:   172.70:    11.0:  ZK3:\r
     ZK3;\r
 New Zealand:              32:  60:  OC:  -36.90:  -174.80:   -12.0:  ZL:\r
-    ZL,ZM,ZL75;\r
+    ZK,ZL,ZM,ZL75;\r
 Chatham Is.:              32:  60:  OC:  -44.00:   176.50:  -12.75:  ZL7:\r
     ZL7,ZM7;\r
 Kermadec Is.:             32:  60:  OC:  -30.00:   177.90:   -12.0:  ZL8:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 0e8d89bb31b53b95b40346440cbb856e476aac1c..50b86d02e29f020f7585ac864b1b5b98a41d7616 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -36,7 +36,6 @@
   '3D2/C' => '311',
   '3D2/F' => '268',
   '3D2/R' => '314',
-  '3D2BD' => '314',
   '3D2CI' => '311',
   '3D2CY' => '311',
   '3D2RR' => '314',
@@ -121,6 +120,7 @@
   '4U5ITU' => '274',
   '4U5UN' => '275',
   '4U60UN' => '275',
+  '4U60UO' => '42',
   '4U61UN' => '275',
   '4U6ITU' => '274',
   '4U6UN' => '275',
@@ -574,6 +574,19 @@
   'BJ' => '10',
   'BK' => '10',
   'BL' => '10',
+  'BL3G' => '10,339,340,341',
+  'BL3H' => '10,339,340,341',
+  'BL3I' => '10,339,340,341',
+  'BL3J' => '10,339,340,341',
+  'BL3K' => '10,339,340,341',
+  'BL3L' => '10,339,340,341',
+  'BL9M' => '10,339,340,341',
+  'BL9N' => '10,339,340,341',
+  'BL9O' => '10,339,340,341',
+  'BL9P' => '10,339,340,341',
+  'BL9Q' => '10,339,340,341',
+  'BL9R' => '10,339,340,341',
+  'BL9S' => '10,339,340,341',
   'BM' => '9',
   'BM9P' => '319',
   'BN' => '9',
@@ -669,6 +682,7 @@
   'CE0Y' => '17',
   'CE0Z' => '19',
   'CE9' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
+  'CE9/VK0LD' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'CE9A' => '208',
   'CE9R' => '208',
   'CF' => '434',
@@ -762,6 +776,10 @@
   'E3' => '334',
   'E4' => '326,532',
   'E5' => '249,250',
+  'E51NOU' => '249',
+  'E51QMA' => '249',
+  'E51TUG' => '249',
+  'E51YAQ' => '249',
   'EA' => '34',
   'EA6' => '35',
   'EA8' => '36',
@@ -882,6 +900,7 @@
   'GB0CSC' => '62',
   'GB0DDF' => '62',
   'GB0DGL' => '64,351',
+  'GB0FFS' => '64,351',
   'GB0FLA' => '64,351',
   'GB0GCR' => '66',
   'GB0GDS' => '64,351',
@@ -893,12 +912,15 @@
   'GB0GPF' => '62',
   'GB0GUC' => '65',
   'GB0GUD' => '63',
+  'GB0HEL' => '66',
+  'GB0HHW' => '64,351',
   'GB0HMT' => '66',
   'GB0JAG' => '65',
   'GB0JSA' => '63',
   'GB0KGS' => '64,351',
   'GB0KTC' => '64,351',
   'GB0LCS' => '64,351',
+  'GB0MFD' => '62',
   'GB0ML' => '66',
   'GB0MLM' => '64,351',
   'GB0MPA' => '66',
@@ -964,6 +986,7 @@
   'GB2GLS' => '66',
   'GB2GNL' => '64,351',
   'GB2GOL' => '66',
+  'GB2GSG' => '66',
   'GB2GSS' => '66',
   'GB2GU' => '65',
   'GB2HI' => '64,351',
@@ -992,7 +1015,9 @@
   'GB2LNP' => '66',
   'GB2LO' => '64,351',
   'GB2LP' => '64,351',
+  'GB2LS' => '64,351',
   'GB2LSA' => '66',
+  'GB2LSS' => '64,351',
   'GB2LT' => '64,351',
   'GB2LTN' => '64,351',
   'GB2MAS' => '64,351',
@@ -1016,11 +1041,13 @@
   'GB2OYC' => '64,351',
   'GB2PS' => '64,351',
   'GB2RB' => '64,351',
+  'GB2RFS' => '66',
   'GB2RRL' => '64,351',
   'GB2RSC' => '66',
   'GB2RTB' => '66',
   'GB2SDD' => '66',
   'GB2SIP' => '66',
+  'GB2SLH' => '64,351',
   'GB2SSF' => '64,351',
   'GB2STB' => '64,351',
   'GB2TCA' => '62',
@@ -1039,6 +1066,7 @@
   'GB4BHF' => '63',
   'GB4BPL' => '66',
   'GB4CGW' => '64,351',
+  'GB4CI' => '66',
   'GB4CSC' => '62',
   'GB4DAS' => '64,351',
   'GB4DPS' => '66',
@@ -1067,6 +1095,7 @@
   'GB50SWL' => '64,351',
   'GB50UN' => '61',
   'GB5AST' => '64,351',
+  'GB5BIG' => '62',
   'GB5BL' => '62',
   'GB5BS/J' => '66',
   'GB5CO' => '64,351',
@@ -1091,11 +1120,11 @@
   'GB6WW' => '64,351',
   'GB700BSB' => '64,351',
   'GB750CC' => '66',
+  'GB75GD' => '64,351',
   'GB75SCP' => '64,351',
   'GB75STT' => '64,351',
   'GB8AYR' => '64,351',
   'GB8CA' => '64,351',
-  'GB8CC' => '64,351',
   'GB8CF' => '64,351',
   'GB8CI' => '64,351',
   'GB8CM' => '64,351',
@@ -1321,6 +1350,7 @@
   'K1TU' => '220',
   'K2' => '492,495',
   'K2AAW' => '220',
+  'K2ARB/KC4' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'K2BA' => '220',
   'K2HT' => '220',
   'K2HTO' => '220',
@@ -1430,6 +1460,7 @@
   'KC3' => '469,470,481,499',
   'KC3MR' => '220',
   'KC4' => '460,471,472,478,488,501,503,506,533,534,535',
+  'KC4/K2ARB' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'KC4AAA' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'KC4AAC' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'KC4AAF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
@@ -1745,6 +1776,7 @@
   'LU' => '119,396,397',
   'LU/DH4PB/R' => '119,396,397',
   'LU/DH4PB/S' => '119,396,397',
+  'LU/R1ANF' => '208',
   'LU1AEE/D' => '119,396,397',
   'LU1AF/D' => '119,396,397',
   'LU1CDP/D' => '119,396,397',
@@ -1756,12 +1788,14 @@
   'LU1DZ/S' => '119,396,397',
   'LU1DZ/X' => '119,396,397',
   'LU1EJ/W' => '119,396,397',
+  'LU1EQ/D' => '119,396,397',
   'LU1EYW/D' => '119,396,397',
   'LU1OFN/I' => '119,396,397',
   'LU1VZ/V' => '119,396,397',
   'LU1XAW/X' => '119,396,397',
   'LU1XY/X' => '119,396,397',
   'LU1YU/D' => '119,396,397',
+  'LU1YY/Y' => '119,396,397',
   'LU1Z' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'LU1ZA' => '206',
   'LU1ZC' => '208',
@@ -1772,12 +1806,15 @@
   'LU2EJB/X' => '119,396,397',
   'LU2VC/D' => '119,396,397',
   'LU2WV/O' => '119,396,397',
+  'LU2XX/X' => '119,396,397',
   'LU3CQ/D' => '119,396,397',
+  'LU3DJI/D' => '119,396,397',
   'LU3DJI/W' => '119,396,397',
   'LU3DOC/D' => '119,396,397',
   'LU3DR/D' => '119,396,397',
   'LU3DR/V' => '119,396,397',
   'LU3ES/W' => '119,396,397',
+  'LU4AAO/D' => '119,396,397',
   'LU4DA/D' => '119,396,397',
   'LU4DQ/D' => '119,396,397',
   'LU4DRC/Y' => '119,396,397',
@@ -1785,20 +1822,24 @@
   'LU4DRH/E' => '119,396,397',
   'LU4EJ/D' => '119,396,397',
   'LU4ETN/D' => '119,396,397',
+  'LU4WG/W' => '119,396,397',
   'LU4ZS' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'LU5BE/D' => '119,396,397',
   'LU5DEM/D' => '119,396,397',
+  'LU5DEM/V' => '119,396,397',
   'LU5DIT/D' => '119,396,397',
   'LU5DIT/V' => '119,396,397',
   'LU5DRV/D' => '119,396,397',
   'LU5DRV/V' => '119,396,397',
   'LU5DT/D' => '119,396,397',
   'LU5DV/D' => '119,396,397',
+  'LU5DWS/D' => '119,396,397',
   'LU5EAO/D' => '119,396,397',
   'LU5EFX/Y' => '119,396,397',
   'LU5EWO/D' => '119,396,397',
   'LU5XC/X' => '119,396,397',
   'LU6DBL/D' => '119,396,397',
+  'LU6DKT/D' => '119,396,397',
   'LU6DRD/D' => '119,396,397',
   'LU6DRD/E' => '119,396,397',
   'LU6DRR/D' => '119,396,397',
@@ -1807,6 +1848,7 @@
   'LU6EPR/D' => '119,396,397',
   'LU6EPR/E' => '119,396,397',
   'LU6EYK/X' => '119,396,397',
+  'LU6UO/D' => '119,396,397',
   'LU6UO/P' => '119,396,397',
   'LU6UO/Q' => '119,396,397',
   'LU6UO/R' => '119,396,397',
@@ -1826,8 +1868,10 @@
   'LU7DW/D' => '119,396,397',
   'LU7DZL/D' => '119,396,397',
   'LU7DZL/E' => '119,396,397',
+  'LU7EGH/V' => '119,396,397',
   'LU7EGY/D' => '119,396,397',
   'LU7EO/D' => '119,396,397',
+  'LU7EPC/D' => '119,396,397',
   'LU7EPC/W' => '119,396,397',
   'LU7VCH/D' => '119,396,397',
   'LU7WFM/W' => '119,396,397',
@@ -1851,6 +1895,7 @@
   'LU8EKB/W' => '119,396,397',
   'LU8EKC/D' => '119,396,397',
   'LU8EOT/X' => '119,396,397',
+  'LU8EOT/Y' => '119,396,397',
   'LU8ERH/D' => '119,396,397',
   'LU8EXJ/D' => '119,396,397',
   'LU8EXN/D' => '119,396,397',
@@ -1864,6 +1909,7 @@
   'LU9EJS/E' => '119,396,397',
   'LU9ESD/D' => '119,396,397',
   'LU9ESD/V' => '119,396,397',
+  'LU9ESD/Y' => '119,396,397',
   'LU9EV/LH' => '119,396,397',
   'LU9JMG/J' => '119,396,397',
   'LV' => '119',
@@ -1872,6 +1918,7 @@
   'LW2DX/Q' => '119,396,397',
   'LW2DX/R' => '119,396,397',
   'LW2DX/S' => '119,396,397',
+  'LW2ENB/D' => '119,396,397',
   'LW3DKC/D' => '119,396,397',
   'LW3DKC/E' => '119,396,397',
   'LW3DKO/D' => '119,396,397',
@@ -1883,6 +1930,7 @@
   'LW4EM/E' => '119,396,397',
   'LW4EM/LH' => '119,396,397',
   'LW5DR/LH' => '119,396,397',
+  'LW5DWX/D' => '119,396,397',
   'LW5EE/D' => '119,396,397',
   'LW5EE/V' => '119,396,397',
   'LW5EOL/D' => '119,396,397',
@@ -1891,6 +1939,7 @@
   'LW8DMK/D' => '119,396,397',
   'LW8EU/D' => '119,396,397',
   'LW8EXF/D' => '119,396,397',
+  'LW9DCF/Y' => '119,396,397',
   'LW9EAG/D' => '119,396,397',
   'LW9EAG/V' => '119,396,397',
   'LW9EVA/D' => '119,396,397',
@@ -1910,6 +1959,7 @@
   'MM/DL1CW/P' => '351',
   'MM/DL4BQE/P' => '351',
   'MM/DL5BUT/P' => '351',
+  'MM/DL6MHW' => '64,351',
   'MM/DM4VDE/P' => '351',
   'MM0XAU' => '351',
   'MN' => '62',
@@ -2256,6 +2306,7 @@
   'OC' => '122',
   'OD' => '123',
   'OE' => '124',
+  'OE3XHA/VFW06' => '124',
   'OF' => '125',
   'OF0' => '126',
   'OG' => '125',
@@ -2409,11 +2460,12 @@
   'R270A' => '176,425,430',
   'R270E' => '176,425,430',
   'R3' => '419',
+  'R375I' => '176,425,430',
   'R3F/9' => '176,425,430',
   'R4' => '420',
   'R6' => '421',
+  'R60A' => '175',
   'R60F' => '175',
-  'R7' => '176,425,430',
   'R750' => '175',
   'R8' => '431',
   'R8T' => '176,425,430',
@@ -2431,7 +2483,6 @@
   'RA3' => '419',
   'RA4' => '420',
   'RA6' => '421',
-  'RA7' => '176,425,430',
   'RA8' => '431',
   'RA8T' => '176,425,430',
   'RA8V' => '176,425,430',
@@ -2447,7 +2498,6 @@
   'RB3' => '419',
   'RB4' => '420',
   'RB6' => '421',
-  'RB7' => '176,425,430',
   'RB8' => '431',
   'RB8T' => '176,425,430',
   'RB8V' => '176,425,430',
@@ -2463,7 +2513,6 @@
   'RC3' => '419',
   'RC4' => '420',
   'RC6' => '421',
-  'RC7' => '176,425,430',
   'RC8' => '431',
   'RC8T' => '176,425,430',
   'RC8V' => '176,425,430',
@@ -2480,7 +2529,6 @@
   'RD4' => '420',
   'RD4W' => '173,418,419,420,421',
   'RD6' => '421',
-  'RD7' => '176,425,430',
   'RD8' => '431',
   'RD8T' => '176,425,430',
   'RD8V' => '176,425,430',
@@ -2496,7 +2544,6 @@
   'RE3' => '419',
   'RE4' => '420',
   'RE6' => '421',
-  'RE7' => '176,425,430',
   'RE8' => '431',
   'RE8T' => '176,425,430',
   'RE8V' => '176,425,430',
@@ -2512,7 +2559,6 @@
   'RF3' => '419',
   'RF4' => '420',
   'RF6' => '421',
-  'RF7' => '176,425,430',
   'RF8' => '431',
   'RF8T' => '176,425,430',
   'RF8V' => '176,425,430',
@@ -2528,7 +2574,6 @@
   'RG3' => '419',
   'RG4' => '420',
   'RG6' => '421',
-  'RG7' => '176,425,430',
   'RG8' => '431',
   'RG8T' => '176,425,430',
   'RG8V' => '176,425,430',
@@ -2544,7 +2589,6 @@
   'RH3' => '419',
   'RH4' => '420',
   'RH6' => '421',
-  'RH7' => '176,425,430',
   'RH8' => '431',
   'RH8T' => '176,425,430',
   'RH8V' => '176,425,430',
@@ -2560,7 +2604,6 @@
   'RI3' => '419',
   'RI4' => '420',
   'RI6' => '421',
-  'RI7' => '176,425,430',
   'RI8' => '431',
   'RI8T' => '176,425,430',
   'RI8V' => '176,425,430',
@@ -2576,7 +2619,6 @@
   'RJ3' => '419',
   'RJ4' => '420',
   'RJ6' => '421',
-  'RJ7' => '176,425,430',
   'RJ8' => '431',
   'RJ8T' => '176,425,430',
   'RJ8V' => '176,425,430',
@@ -2593,7 +2635,6 @@
   'RK4' => '420',
   'RK4W' => '173,418,419,420,421',
   'RK6' => '421',
-  'RK7' => '176,425,430',
   'RK8' => '431',
   'RK8T' => '176,425,430',
   'RK8V' => '176,425,430',
@@ -2609,7 +2650,6 @@
   'RL3' => '419',
   'RL4' => '420',
   'RL6' => '421',
-  'RL7' => '176,425,430',
   'RL8' => '431',
   'RL8T' => '176,425,430',
   'RL8V' => '176,425,430',
@@ -2626,7 +2666,6 @@
   'RM4' => '420',
   'RM4W' => '173,418,419,420,421',
   'RM6' => '421',
-  'RM7' => '176,425,430',
   'RM8' => '431',
   'RM8T' => '176,425,430',
   'RM8V' => '176,425,430',
@@ -2643,7 +2682,6 @@
   'RN4' => '420',
   'RN4W' => '173,418,419,420,421',
   'RN6' => '421',
-  'RN7' => '176,425,430',
   'RN8' => '431',
   'RN8T' => '176,425,430',
   'RN8V' => '176,425,430',
@@ -2667,7 +2705,6 @@
   'RP3' => '419',
   'RP4' => '420',
   'RP6' => '421',
-  'RP7' => '176,425,430',
   'RP8' => '431',
   'RP8T' => '176,425,430',
   'RP8V' => '176,425,430',
@@ -2683,7 +2720,6 @@
   'RQ3' => '419',
   'RQ4' => '420',
   'RQ6' => '421',
-  'RQ7' => '176,425,430',
   'RQ8' => '431',
   'RQ8T' => '176,425,430',
   'RQ8V' => '176,425,430',
@@ -2699,7 +2735,6 @@
   'RR3' => '419',
   'RR4' => '420',
   'RR6' => '421',
-  'RR7' => '176,425,430',
   'RR8' => '431',
   'RR8T' => '176,425,430',
   'RR8V' => '176,425,430',
@@ -2715,7 +2750,6 @@
   'RS3' => '419',
   'RS4' => '420',
   'RS6' => '421',
-  'RS7' => '176,425,430',
   'RS8' => '431',
   'RS8T' => '176,425,430',
   'RS8V' => '176,425,430',
@@ -2731,7 +2765,6 @@
   'RT3' => '419',
   'RT4' => '420',
   'RT6' => '421',
-  'RT7' => '176,425,430',
   'RT8' => '431',
   'RT8T' => '176,425,430',
   'RT8V' => '176,425,430',
@@ -2748,7 +2781,6 @@
   'RU4' => '420',
   'RU4W' => '173,418,419,420,421',
   'RU6' => '421',
-  'RU7' => '176,425,430',
   'RU8' => '431',
   'RU8T' => '176,425,430',
   'RU8V' => '176,425,430',
@@ -2765,7 +2797,6 @@
   'RV4' => '420',
   'RV4W' => '173,418,419,420,421',
   'RV6' => '421',
-  'RV7' => '176,425,430',
   'RV8' => '431',
   'RV8T' => '176,425,430',
   'RV8V' => '176,425,430',
@@ -2782,7 +2813,6 @@
   'RW4' => '420',
   'RW4W' => '173,418,419,420,421',
   'RW6' => '421',
-  'RW7' => '176,425,430',
   'RW8' => '431',
   'RW8T' => '176,425,430',
   'RW8V' => '176,425,430',
@@ -2798,7 +2828,6 @@
   'RX3' => '419',
   'RX4' => '420',
   'RX6' => '421',
-  'RX7' => '176,425,430',
   'RX8' => '431',
   'RX8T' => '176,425,430',
   'RX8V' => '176,425,430',
@@ -2814,7 +2843,6 @@
   'RY3' => '419',
   'RY4' => '420',
   'RY6' => '421',
-  'RY7' => '176,425,430',
   'RY8' => '431',
   'RY8T' => '176,425,430',
   'RY8V' => '176,425,430',
@@ -2830,7 +2858,6 @@
   'RZ3' => '419',
   'RZ4' => '420',
   'RZ6' => '421',
-  'RZ7' => '176,425,430',
   'RZ8' => '431',
   'RZ8T' => '176,425,430',
   'RZ8V' => '176,425,430',
@@ -2950,6 +2977,7 @@
   'TO5ROM' => '43',
   'TO5S' => '43',
   'TO5T' => '46',
+  'TO5X' => '46',
   'TO6M' => '46',
   'TO7ACR' => '43',
   'TO7AES' => '43',
@@ -2964,6 +2992,7 @@
   'TO8B' => '46',
   'TO8CW' => '43',
   'TO8MZ' => '44',
+  'TO8RR' => '43',
   'TO9A' => '46',
   'TO9IS' => '59',
   'TO9PL' => '54',
@@ -2986,6 +3015,9 @@
   'TX4B' => '46',
   'TX5CW' => '45,330',
   'TX5M' => '44',
+  'TX5NK' => '44',
+  'TX5T' => '44',
+  'TX6A' => '44',
   'TX8' => '45,330',
   'TX9' => '330',
   'TY' => '171',
@@ -2998,7 +3030,6 @@
   'U4' => '420',
   'U5' => '177',
   'U6' => '421',
-  'U7' => '176,425,430',
   'U8' => '431',
   'U8T' => '176,425,430',
   'U8V' => '176,425,430',
@@ -3017,7 +3048,6 @@
   'UA4' => '420',
   'UA4W' => '173,418,419,420,421',
   'UA6' => '421',
-  'UA7' => '176,425,430',
   'UA8' => '431',
   'UA8T' => '176,425,430',
   'UA8V' => '176,425,430',
@@ -3033,7 +3063,6 @@
   'UB3' => '419',
   'UB4' => '420',
   'UB6' => '421',
-  'UB7' => '176,425,430',
   'UB8' => '431',
   'UB8T' => '176,425,430',
   'UB8V' => '176,425,430',
@@ -3049,7 +3078,6 @@
   'UC3' => '419',
   'UC4' => '420',
   'UC6' => '421',
-  'UC7' => '176,425,430',
   'UC8' => '431',
   'UC8T' => '176,425,430',
   'UC8V' => '176,425,430',
@@ -3065,7 +3093,6 @@
   'UD3' => '419',
   'UD4' => '420',
   'UD6' => '421',
-  'UD7' => '176,425,430',
   'UD8' => '431',
   'UD8T' => '176,425,430',
   'UD8V' => '176,425,430',
@@ -3083,7 +3110,6 @@
   'UE3' => '419',
   'UE4' => '420',
   'UE6' => '421',
-  'UE7' => '176,425,430',
   'UE8' => '431',
   'UE8T' => '176,425,430',
   'UE8V' => '176,425,430',
@@ -3099,7 +3125,6 @@
   'UF3' => '419',
   'UF4' => '420',
   'UF6' => '421',
-  'UF7' => '176,425,430',
   'UF8' => '431',
   'UF8T' => '176,425,430',
   'UF8V' => '176,425,430',
@@ -3115,7 +3140,6 @@
   'UG3' => '419',
   'UG4' => '420',
   'UG6' => '421',
-  'UG7' => '176,425,430',
   'UG8' => '431',
   'UG8T' => '176,425,430',
   'UG8V' => '176,425,430',
@@ -3131,7 +3155,6 @@
   'UH3' => '419',
   'UH4' => '420',
   'UH6' => '421',
-  'UH7' => '176,425,430',
   'UH8' => '431',
   'UH8T' => '176,425,430',
   'UH8V' => '176,425,430',
@@ -3147,7 +3170,6 @@
   'UI3' => '419',
   'UI4' => '420',
   'UI6' => '421',
-  'UI7' => '176,425,430',
   'UI8' => '431',
   'UI8T' => '176,425,430',
   'UI8V' => '176,425,430',
@@ -3179,6 +3201,14 @@
   'V4' => '218',
   'V5' => '259',
   'V6' => '100,386',
+  'V63JQ/C' => '100,386',
+  'V63JQ/K' => '100,386',
+  'V63JY/C' => '100,386',
+  'V63JY/K' => '100,386',
+  'V63OP/C' => '100,386',
+  'V63OP/K' => '100,386',
+  'V63VE/C' => '100,386',
+  'V63VE/K' => '100,386',
   'V7' => '117',
   'V8' => '219',
   'V9' => '257,522,523,524,525',
@@ -3225,6 +3255,7 @@
   'VE2DMG' => '191',
   'VE2DS' => '191',
   'VE2DWU' => '191',
+  'VE2DXY' => '191',
   'VE2DYW' => '191',
   'VE2DYX' => '191',
   'VE2EAK' => '191',
@@ -3252,7 +3283,7 @@
   'VE2UA' => '191',
   'VE2VH' => '191',
   'VE2WT' => '191',
-  'VE2XAA' => '191',
+  'VE2XAA/2' => '191',
   'VE2XY' => '191',
   'VE2YM' => '191',
   'VE3' => '442',
@@ -3315,6 +3346,7 @@
   'VK1' => '447',
   'VK2' => '448',
   'VK3' => '449',
+  'VK3FY/9' => '194',
   'VK4' => '450',
   'VK5' => '451',
   'VK6' => '452',
@@ -3330,6 +3362,11 @@
   'VK9AA' => '195',
   'VK9AE' => '193',
   'VK9C' => '195',
+  'VK9FC' => '195',
+  'VK9FL' => '193',
+  'VK9FM' => '196',
+  'VK9FW' => '198',
+  'VK9FX' => '194',
   'VK9KC' => '195',
   'VK9KL' => '193',
   'VK9KM' => '196',
@@ -3406,6 +3443,7 @@
   'VP8/S' => '207',
   'VP8BF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8CTR' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
+  'VP8DJB' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8DJK' => '208',
   'VP8GEO' => '205',
   'VP8PJ' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
@@ -3926,10 +3964,10 @@
   'ZF' => '248',
   'ZG' => '242',
   'ZG2' => '242',
+  'ZK' => '253,518,519,520,521',
   'ZK1' => '249,250',
   'ZK1/N' => '249',
   'ZK1/S' => '250',
-  'ZK1XMY' => '249',
   'ZK2' => '251',
   'ZK3' => '252',
   'ZL' => '253,518,519,520,521',

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 3009883b66f3a967665b46cc09e4b8310f5ff354..b3c0dbfac04e2abb9e406e4599918b447390b033 100644 (file)
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -133,6 +133,7 @@ sub read_in
                        }
                } else {
                        # error on reading file, delete and exit
+                       dbg("empty or unreadable filter: $fn, deleted");
                        unlink($fn);
                        return undef;
                }