fix sh/contest and add CTY2308 prefixes

diff --git a/Changes b/Changes
index 81f2f0ca74511b8e4ec0b92931934b044d24ae99..0b98606ed9547bdf7b3bc0b629d7df76a8cbbcda 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,10 @@
+06Sep13=======================================================================
+1. Fixed sh/contest so that it works again. How it ever worked at all is
+   a bit of a mystery. Now possible to type sh/cont dec or sh/cont dec 2013
+   (with month and year in any order). Please comment out any $contest_host
+   or $contest_url variables you may have in /spider/local/Internet.pm (if
+   you have one, that is). It will not work with the previous values.
+2. Added CTY2308 prefix changes.
 24Jul13=======================================================================
 1. Alter default node address in client.c from "localhost" to "127.0.0.1".
 21Jul13=======================================================================

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 8d8ba775189be6b650a1e0dce029b211d6ebe5a5..85143b493e3ce64a516f89b1f0a550b5528808d4 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -2038,13 +2038,20 @@ Show all the nodes connected to this node.
 This command shows information on all the active connections known to
 the node. This command gives slightly more information than WHO.
 
-=== 0^SHOW/CONTEST <year and month>^Show all the contests for a month
+=== 0^SHOW/CONTEST [<year>] [<month>]^Show all the contests for a month
 Show all known contests which are maintained at http://www.sk3bg.se/contest/
 for a particular month or year. The format is reasonably flexible.
 For example:-
   
-  SH/CONTEST sep2003
-  SH/CONTEST 03 march
+  SH/CONTEST 
+  SH/CONTEST mar
+  SH/CONTEST mar 13
+  SH/CONTEST 13 march
+
+If there is no month/year then the current month's contests are shown.
+
+Note that it expects ENGLISH (jan/feb/mar/apr/may/jun/jul/aug/sep/oct/nov/dec)
+month names.
 
 === 0^SHOW/DATE [<prefix>|<callsign>]^Show the local time 
 This is very nearly the same as SHOW/TIME, the only difference the format

diff --git a/cmd/show/contest.pl b/cmd/show/contest.pl
index 4b3e68ba813e0b5b3004a9dd07db520de385fd12..33b98903b32c49e9f7f2a9eab1f9323aa9971bb8 100644 (file)
--- a/cmd/show/contest.pl
+++ b/cmd/show/contest.pl
@@ -9,22 +9,30 @@
 
 my ($self, $line) = @_;
 
-#return (1, "usage: sh/contest  <year_and_month>, e g sh/contest 2002sep ") unless $line;
+#return (1, "usage: sh/contest [<month>] [<year>], e g sh/contest sep 2012") unless $line;
 
 my @out;
 
 my $mon;;
 
+#$DB::single = 1;
+
+
 # trying to make the syntax abit more user friendly...
 # and yes, I have been here and it *is* all my fault (dirk)
 $line = lc $line;
-my ($m,$y) = $line =~ /^([a-z]+)\s*(\d+)/;
-($y,$m) = $line =~ /^(\d+)\s*([a-z]+)/ unless $y && $m;
-unless ($y && $m) {
-       ($m,$y) = (gmtime)[4,5];
-       $m = lc $DXUtil::month[$m];
+my ($m,$y);
+($y) = $line =~ /(\d+)/;
+($m) = $line =~ /([a-z]{3})/;
+
+unless ($y) {
+       ($y) = (gmtime)[5];
        $y += 1900;
 }
+unless ($m) {
+       ($m) = (gmtime)[4];
+       $m = lc $DXUtil::month[$m];
+}
 $y += 2000 if $y <= 50;
 $y += 1900 if $y > 50 && $y <= 99;
 $m = substr $m, 0, 3 if length $m > 3;
@@ -32,38 +40,45 @@ $m = 'oct' if $m eq 'okt';
 $m = 'may' if $m eq 'mai' || $m eq 'maj';
 $mon = "$y$m";
 
-dbg($mon) if isdbg('contest');
+dbg("sh/contest: month=$mon") if isdbg('contest');
 
 my $filename = "c" . $mon . ".txt";
 my $host = $Internet::contest_host || 'www.sk3bg.se';
 my $port = 80;
-my $url = $Internet::contest_url || "http://www.sk3bg.se/contest/text";
+
+dbg("sh/contest: host=$host:$port") if isdbg('contest');
+
+my $url = $Internet::contest_url || "/contest/text";
 $url .= "/$filename";
 
+dbg("sh/contest: url=$url") if isdbg("contest");
+
 my $t = new Net::Telnet (Telnetmode => 0);
-eval {
-    $t->open(Host => $host, Port => $port, Timeout => 15);
-    };
+eval { $t->open(Host => $host, Port => $port, Timeout => 15); };
 
 if (!$t || $@) {
     push @out, $self->msg('e18','sk3bg.se');
 } else {
-    my $s = "GET $url";
+    my $s = "GET $url HTTP/1.0";
+       dbg("sh/contest: get='$s'") if isdbg('contest');
+       
     $t->print($s);
+       $t->print("Host: $host\n");
+       $t->print("\n\n");
+
     my $notfound = $t->getline(Timeout => 10);
-    if ($notfound =~ /404 Object Not Found/) {
-           return (1, "there is no contest info for $mon")
+    if (!$notfound || $notfound =~ /404 Object Not Found/) {
+           push @out, "there is no contest info for $mon at $host/$url";
+               return (1, @out);
        } else {
            push @out, $notfound;
        }
     while (!$t->eof) {
-       eval { 
-           push @out, $t->getline(Timeout => 10);
-       };
-       if ($@) {
-           push @out, $self->msg('e18', 'sk3bg.se');
-           last;    
-       }
+               eval { push @out, $t->getline(Timeout => 10); };
+               if ($@) {
+                       push @out, $self->msg('e18', 'sk3bg.se');
+                       last;
+               }
     }
 }
 $t->close;

diff --git a/data/cty.dat b/data/cty.dat
index 40aad51bd1687d9a84b26c6feb4100d7d60aeea3..8fefdb920526b282d646f4fd9cc41590459c8aaa 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -43,7 +43,7 @@ Sri Lanka:                22:  41:  AS:    7.60:   -80.70:    -5.5:  4S:
 ITU HQ:                   14:  28:  EU:   46.17:    -6.05:    -1.0:  4U1I:
     4U0I,4U1I,4U2I,4U3I,4U4I,4U5I,4U6I,4U7I,4U8I,4U9I,=4U1WRC;
 United Nations HQ:        05:  08:  NA:   40.75:    73.97:     5.0:  4U1U:
-    4U1U,=VERSION;
+    4U1U;
 Vienna Intl Ctr:          15:  28:  EU:   48.20:   -16.30:    -1.0:  *4U1V:
     4U1V;
 Timor - Leste:            28:  54:  OC:   -8.80:  -126.05:    -9.0:  4W:
@@ -105,7 +105,7 @@ Sierra Leone:             35:  46:  AF:    8.50:    13.25:     0.0:  9L:
 West Malaysia:            28:  54:  AS:    3.95:  -102.23:    -8.0:  9M2:
     9M2,9M4,9W2,9W4,=9M8DX/2;
 East Malaysia:            28:  54:  OC:    2.68:  -113.32:    -8.0:  9M6:
-    9M6,9M8,9M9,9W6,9W8,=9M4SAB;
+    9M6,9M8,9M9,9W6,9W8,=9M4SAB,=VERSION;
 Nepal:                    22:  42:  AS:   27.70:   -85.33:   -5.75:  9N:
     9N;
 Dem. Rep. of the Congo:   36:  52:  AF:   -3.12:   -23.03:    -1.0:  9Q:
@@ -353,7 +353,7 @@ Spain:                    14:  37:  EU:   40.37:     4.88:    -1.0:  EA:
 Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
     AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6;
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
-    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=EA5RKL/8;
+    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=EA4BQ/8;
 Ceuta & Melilla:          33:  37:  AF:   35.90:     5.27:    -1.0:  EA9:
     AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9;
 Ireland:                  14:  27:  EU:   53.13:     8.02:     0.0:  EI:
@@ -380,7 +380,7 @@ Tajikistan:               17:  30:  AS:   38.82:   -71.22:    -5.0:  EY:
 Turkmenistan:             17:  30:  AS:   38.00:   -58.00:    -5.0:  EZ:
     EZ;
 France:                   14:  27:  EU:   46.00:    -2.00:    -1.0:  F:
-    F,HW,HX,HY,TH,TM,TP,TQ,TV,=F6KBG/MSW;
+    F,HW,HX,HY,TH,TM,TP,TQ,TV;
 Guadeloupe:               08:  11:  NA:   16.13:    61.67:     4.0:  FG:
     FG;
 Mayotte:                  39:  53:  AF:  -12.88:   -45.15:    -3.0:  FH:
@@ -396,11 +396,11 @@ Martinique:               08:  11:  NA:   14.70:    61.03:     4.0:  FM:
 French Polynesia:         32:  63:  OC:  -17.65:   149.40:    10.0:  FO:
     FO;
 Austral Islands:          32:  63:  OC:  -23.37:   149.48:    10.0:  FO/a:
-    =FO/KH0PR;
+    =FO/UT6UD;
 Clipperton Island:        07:  10:  NA:   10.28:   109.22:     8.0:  FO/c:
     =TX5K;
 Marquesas Islands:        31:  63:  OC:   -8.92:   140.07:     9.5:  FO/m:
-    =FO/UT6UD;
+    =K7ST/FO;
 St. Pierre & Miquelon:    05:  09:  NA:   46.77:    56.20:     3.0:  FP:
     FP;
 Reunion Island:           39:  53:  AF:  -21.12:   -55.48:    -4.0:  FR:
@@ -424,44 +424,53 @@ Wallis & Futuna Islands:  32:  62:  OC:  -13.30:   176.20:   -12.0:  FW:
 French Guiana:            09:  12:  SA:    4.00:    53.00:     3.0:  FY:
     FY;
 England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
-    2,G,M,ZH,ZI,ZJ,=GB2SNM/MILL,=GB6MW/MILL;
+    2,G,M,ZH,ZI,ZJ;
 Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
-    2D,2T,GD,GT,MD,MT,=2V0IOM,=2V0YLX,=GB4JDF,=GV6AFB;
+    2D,2T,GD,GT,MD,MT,=2V0IOM,=2V0YLX,=GV0OUD,=GV3YEO,=GV6AFB,=GV7HTG,=MV3YLX;
 Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
     2I,2N,GI,GN,MI,MN,=2V0CSB,=2V0IVG,=GB0GPF,=GB0REL,=GB1SPD,=GB2DMR,=GB2LOL,
-    =GB2MAC,=GB2UAS,=GB4SPD,=GB5SPD,=GV3KVD,=GV3SG,=GV4FUE,=GV4GUH,=GV4JTF,
-    =GV4SRQ,=GV7THH,=MV0ALS,=MV0GGB,=MV0JFC,=MV0JLC,=MV0MOD,=MV0MSR,=MV0VAX,
-    =MV0WGM,=MV1VOX,=MV6DTE,=MV6NIR,=MV6TLG;
+    =GB2UAS,=GB4SPD,=GB5SPD,=GV1BZT,=GV3KVD,=GV3SG,=GV4FUE,=GV4GUH,=GV4JTF,
+    =GV4LXL,=GV4SRQ,=GV4WVN,=GV7AXB,=GV7THH,=MV0ALS,=MV0GGB,=MV0IOU,=MV0JFC,
+    =MV0JLC,=MV0MOD,=MV0MSR,=MV0MVP,=MV0TGO,=MV0VAX,=MV0WGM,=MV0ZAO,=MV1VOX,
+    =MV6DTE,=MV6GTY,=MV6NIR,=MV6TLG;
 Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
     2H,2J,GH,GJ,MH,MJ,=MV0ASP;
 Scotland:                 14:  27:  EU:   56.82:     4.18:     0.0:  GM:
-    2A,2M,2S,GA,GM,GS,MA,MM,MS,=2V0JCH,=2V0KAU,=GB0BSS,=GB0GDS,=GB0GGR,
-    =GB0NHL,=GB0POS,=GB1AJ,=GB1FHS,=GB1OL,=GB1RB,=GB2ATC,=GB2BHM,=GB2CHC,
-    =GB2EPC,=GB2GKR,=GB2GNL,=GB2LBN,=GB2LT,=GB2MOF,=GB2OL,=GB2OWM,=GB2SQN,
-    =GB2SR,=GB2VCB,=GB3ANG,=GB4GS,=GB5AG,=GM4WSB/P,=GV0DBW,=GV0GMN,=GV0GRD,
-    =GV0OBX,=GV0OGN,=GV1BAN,=GV3NNZ,=GV4BLO,=GV4EMX,=GV4HRJ,=GV4JOJ,=GV4XQJ,
-    =GV7DHA,=GV7GMC,=GV8AVM,=GV8DPV,=MV0FMF,=MV0GHM,=MV0LGS,=MV0NFC,=MV0NJS,
-    =MV0XXW,=MV3BRR,=MV3YHA,=MV5PSL,=MV6BJJ,=MV6KSJ;
+    2A,2M,2S,GA,GM,GS,MA,MM,MS,=2V0GUL,=2V0JCH,=2V0KAU,=2V0TAX,=2V1HFE,
+    =2V1MIC,=2V1SJB,=GB0BOL,=GB0BSS,=GB0GDS,=GB0GGR,=GB0NHL,=GB0POS,=GB0SSB,
+    =GB0TH,=GB1AJ,=GB1FHS,=GB1LAY,=GB1OL,=GB1RB,=GB2ATC,=GB2BHM,=GB2CHC,
+    =GB2GKR,=GB2GNL,=GB2LBN,=GB2LT,=GB2MOF,=GB2OL,=GB2OWM,=GB2SQN,=GB2SR,
+    =GB2VCB,=GB3ANG,=GB4GS,=GB4JPJ,=GB5AG,=GV0DBW,=GV0GMN,=GV0GRD,=GV0LZE,
+    =GV0OBX,=GV0OGN,=GV0SYV,=GV0VRP,=GV1BAN,=GV3JIJ,=GV3NIG,=GV3NNZ,=GV3ULP,
+    =GV3VTB,=GV4BLO,=GV4EMX,=GV4HRJ,=GV4ILS,=GV4JOJ,=GV4KLN,=GV4LVW,=GV4VTB,
+    =GV4XQJ,=GV6KON,=GV7DHA,=GV7GDE,=GV7GMC,=GV8AVM,=GV8DPV,=GV8LYS,=MV0DXH,
+    =MV0FME,=MV0FMF,=MV0GHM,=MV0HAR,=MV0LGS,=MV0NFC,=MV0NJS,=MV0SGQ,=MV0SJT,
+    =MV0XXW,=MV1VTB,=MV3BRR,=MV3CVB,=MV3YHA,=MV3YMU,=MV5PSL,=MV6BJJ,=MV6KSJ,
+    =MV6NRQ;
 Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
-    2Z,GZ,MZ,=2M0ZET,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB2ELH,=GB2QM,=GB2SB,
-    =GB2ZET,=GB3LER,=GB3LER/B,=GB4LER,=GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,
-    =GM0ILB,=GM0JDB,=GM0MZD,=GM0OMV,=GM0VFA,=GM1BYL,=GM1CBQ,=GM1KKI,=GM1MXN,
-    =GM1ZNR,=GM3KLA,=GM3KZH,=GM3RFR,=GM3SJA,=GM3STU,=GM3UPU,=GM3WCH,=GM3WHT,
-    =GM3XPQ,=GM3ZET,=GM3ZNM,=GM3ZXH,=GM4AGX,=GM4CAQ,=GM4DQD,=GM4ENK,=GM4FNA,
-    =GM4FNE,=GM4GPN,=GM4GPP,=GM4GQD,=GM4GQM,=GM4IPK,=GM4JPI,=GM4KJQ,=GM4LBE,
-    =GM4LER,=GM4PXG,=GM4SLV,=GM4SRU,=GM4SSA,=GM4SWU,=GM4WXQ,=GM4YEL,=GM4ZHL,
-    =GM6RTO,=GM6VZB,=GM6WVI,=GM6YQA,=GM7AFE,=GM7GWW,=GM7RKD,=GM8LNH,=GM8MMA,
-    =GM8YEC,=GS3ZET,=MA1FJM,=MM0LSM,=MM0XAU,=MM0ZAL,=MM0ZCG,=MM1FJM,=MM3ZET,
-    =MM5PSL,=MM6ACW,=MM6BDU,=MM6SJK,=MS0ZCG,=MS0ZET;
+    2Z,GZ,MZ,=2M0ZET,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB2ELH,=GB2SB,=GB2ZET,
+    =GB3LER,=GB3LER/B,=GB4LER,=GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,=GM0ILB,
+    =GM0JDB,=GM0MZD,=GM0OMV,=GM0VFA,=GM1BYL,=GM1CBQ,=GM1KKI,=GM1MXN,=GM1ZNR,
+    =GM3KLA,=GM3KZH,=GM3RFR,=GM3SJA,=GM3STU,=GM3UPU,=GM3WCH,=GM3WHT,=GM3XPQ,
+    =GM3ZET,=GM3ZNM,=GM3ZXH,=GM4AGX,=GM4CAQ,=GM4DQD,=GM4ENK,=GM4FNA,=GM4FNE,
+    =GM4GPN,=GM4GPP,=GM4GQD,=GM4GQM,=GM4IPK,=GM4JPI,=GM4KJQ,=GM4LBE,=GM4LER,
+    =GM4PXG,=GM4SLV,=GM4SRU,=GM4SSA,=GM4SWU,=GM4WXQ,=GM4YEL,=GM4ZHL,=GM6RTO,
+    =GM6VZB,=GM6WVI,=GM6YQA,=GM7AFE,=GM7GWW,=GM7RKD,=GM8LNH,=GM8MMA,=GM8YEC,
+    =GS3ZET,=MA1FJM,=MM0LSM,=MM0XAU,=MM0ZAL,=MM0ZCG,=MM1FJM,=MM3ZET,=MM5PSL,
+    =MM6ACW,=MM6BDU,=MM6SJK,=MS0ZCG,=MS0ZET;
 Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2P,2U,GP,GU,MP,MU,=GB2JTA;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
-    2C,2W,2X,2Y,GC,GW,MC,MW,=2V0CDY,=2V0CGM,=2V0KED,=2V0WDS,=GB0APS,=GB0AWS,
-    =GB0CFD,=GB0MPA,=GB0TS,=GB1BW,=GB1PD,=GB2FLB,=GB2GGM,=GB2IMD,=GB2LSA,
-    =GB4MBC,=GB4MDI,=GB4OST,=GB4PAT,=GB4SDD,=GB5GEO,=GB6BLB,=GB8CCC,=GV0ANA,
-    =GV0DIV,=GV0FRE,=GV0MNP,=GV0NPL,=GV1IOT,=GV1JFV,=GV1YQM,=GV3ATZ,=GV3UOF,
-    =GV3XQJ,=GV4BKG,=GV4NQJ,=GV7UNV,=GV8IQC,=MV0EDX,=MV0GWT,=MV0TDQ,=MV0UAA,
-    =MV0USK,=MV0WYN,=MV1CFN,=MV3RNI,=MV6GWR,=MV6URC,=MV6ZOL;
+    2C,2W,2X,2Y,GC,GW,MC,MW,=2V0CDY,=2V0CGM,=2V0CLJ,=2V0CVL,=2V0DAA,=2V0DUN,
+    =2V0GME,=2V0GNG,=2V0KED,=2V0WDS,=2V1EPO,=GB0APS,=GB0MPA,=GB0TS,=GB1BW,
+    =GB1PD,=GB2FLB,=GB2GGM,=GB2IMD,=GB2LSA,=GB2LSH,=GB4CTC,=GB4MBC,=GB4MDI,
+    =GB4OST,=GB4PAT,=GB4SDD,=GB5GEO,=GB6BLB,=GV0ANA,=GV0DCK,=GV0DIV,=GV0EME,
+    =GV0FRE,=GV0MNP,=GV0NPL,=GV1FKY,=GV1IOT,=GV1JFV,=GV1NBW,=GV1YQM,=GV3ATZ,
+    =GV3UOF,=GV3WEZ,=GV3XJQ,=GV3XQJ,=GV4BKG,=GV4BRS,=GV4CQZ,=GV4JKR,=GV4JQP,
+    =GV4NQJ,=GV4PUC,=GV6BRC,=GV6JPC,=GV6NKG,=GV7UNV,=GV7VJK,=GV8IQC,=MV0AEL,
+    =MV0BLM,=MV0EDX,=MV0GWT,=MV0GXE,=MV0IML,=MV0LLK,=MV0PJJ,=MV0PJJ/P,=MV0RRD,
+    =MV0SGD,=MV0SGR,=MV0TBB,=MV0TDQ,=MV0UAA,=MV0USK,=MV0VRQ,=MV0WYN,=MV1CFA,
+    =MV1CFN,=MV3RNI,=MV6CQN,=MV6GWR,=MV6GWR/P,=MV6URC,=MV6ZOL;
 Solomon Islands:          28:  51:  OC:   -9.00:  -160.00:   -11.0:  H4:
     H4;
 Temotu Province:          32:  51:  OC:  -10.72:  -165.80:   -11.0:  H40:
@@ -475,7 +484,7 @@ Liechtenstein:            14:  28:  EU:   47.13:    -9.57:    -1.0:  HB0:
 Ecuador:                  10:  12:  SA:   -1.40:    78.40:     6.0:  HC:
     HC,HD;
 Galapagos Islands:        10:  12:  SA:   -0.78:    91.03:     6.0:  HC8:
-    HC8,HD8,=HC2AO/8,=HC2IWM/8;
+    HC8,HD8;
 Haiti:                    08:  11:  NA:   19.02:    72.18:     5.0:  HH:
     4V,HH;
 Dominican Republic:       08:  11:  NA:   19.13:    70.68:     4.0:  HI:
@@ -573,38 +582,38 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
     =KO7X(4)[7],=KP4MM(5)[8],=KR2E(3)[6],=KR4F(4)[8],=KR7C(4)[7],=KS4L(4)[8],
     =KS4X(4)[8],=KS5A(3)[6],=KS7T(4)[6],=KT0P(5)[8],=KT4TX(4)[8],=KU1CW(4)[7],
     =KU1YL(4)[7],=KU4A(4)[8],=KU8E(5)[8],=KV1E(4)[7],=KX2P(4)[7],=KX9X(5)[8],
-    =KY0W(3)[6],=KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],=N0RZT(4)[8],=N1CC(4)[7],
-    =N1JM(3)[6],=N1WQ(4)[7],=N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],=N2OPW(4)[8],
-    =N2WN(4)[8],=N3BUO(4)[7],=N3PV(3)[6],=N3RC(4)[6],=N3ZZ(3)[6],=N4AAI(4)[8],
+    =KY0W(3)[6],=KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],=N1CC(4)[7],=N1JM(3)[6],
+    =N1WQ(4)[7],=N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],=N2OPW(4)[8],=N2WN(4)[8],
+    =N3BUO(4)[7],=N3PV(3)[6],=N3RC(4)[6],=N3ZZ(3)[6],=N4AAI(4)[8],
     =N4ARO(4)[8],=N4ART(4)[8],=N4AU(4)[8],=N4BCB(4)[8],=N4BCD(4)[8],
-    =N4DW(4)[8],=N4FZ(4)[8],=N4HAI(4)[8],=N4IJ(4)[7],=N4IR(4)[8],=N4JF(4)[8],
-    =N4KG(4)[8],=N4KH(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],=N4QS(4)[8],
-    =N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VV(4)[8],=N4ZI(4)[8],=N4ZZ(4)[8],
-    =N5IE(5)[8],=N5KO(3)[6],=N5LZ(3)[6],=N5ZO(3)[6],=N6AR(5)[8],=N7DR(4)[7],
-    =N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],=N7IP(4)[6],=N7IV(4)[7],=N7IX(4)[7],
-    =N7KA(4)[7],=N7MB(4)[8],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],=N8CL(5)[8],
-    =N8DEZ(3)[6],=N8HM(5)[8],=N8II(5)[8],=N8NA(5)[8],=N8PR(5)[8],=N8RA(5)[8],
-    =N9ADG(3)[6],=N9CM(5)[8],=N9DFD(5)[8],=N9HDE(4)[7],=N9MM(4)[7],
-    =N9NB(5)[8],=N9NC(5)[8],=N9TX(4)[7],=N9UY(5)[8],=NA2U(3)[6],=NA4C(4)[8],
-    =NA4K(4)[8],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],=NE4M(4)[8],=NG7A(5)[8],
-    =NH6Z(3)[6],=NH7RO(4)[7],=NI5O(4)[8],=NJ4I(4)[8],=NJ8J(5)[8],=NK4P(4)[8],
-    =NL7CO(4)[7],=NL7CQ(4)[7],=NL7XM(5)[8],=NN3V(3)[6],=NN4MM(4)[8],
-    =NN7A(4)[7],=NO9E(5)[8],=NP2B(5)[8],=NP2MR(5)[8],=NP3D(5)[8],=NP3ST(5)[8],
-    =NQ6N(5)[8],=NR7DX(4)[6],=NS2X(4)[8],=NS4X(4)[8],=NU4B(4)[8],=NV4B(4)[8],
-    =NW8U(5)[8],=NX1P(3)[6],=NY4N(4)[8],=NY6DX(5)[8],=W0BR(5)[8],=W0IZ(4)[8],
-    =W0PAN(3)[6],=W0PV(5)[8],=W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],
-    =W0YR(5)[8],=W1NN(4)[8],=W1RH(3)[6],=W1SRD(3)[6],=W1ZD(3)[6],=W2OO(4)[8],
-    =W2UP(4)[7],=W2VJN(3)[6],=W2VKT(3)[6],=W3HDH(4)[8],=W3IQ(4)[8],
-    =W3TUA(4)[7],=W4BCG(4)[8],=W4BCU(4)[8],=W4BK(4)[8],=W4DAN(4)[8],
-    =W4DVG(4)[8],=W4EEH(4)[8],=W4EF(3)[6],=W4GHD(4)[8],=W4GKM(4)[8],
-    =W4HK(4)[8],=W4HOD(4)[8],=W4JHC(4)[7],=W4JSI(4)[8],=W4KW(4)[8],
-    =W4LC(4)[8],=W4NBS(4)[8],=W4NZ(4)[8],=W4PV(4)[8],=W4RK(4)[7],=W4RYW(4)[8],
-    =W4TTM(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],=W4UT(4)[8],=W5DQ(3)[6],
+    =N4CC(3)[6],=N4DW(4)[8],=N4FZ(4)[8],=N4HAI(4)[8],=N4IJ(4)[7],=N4IR(4)[8],
+    =N4JF(4)[8],=N4KG(4)[8],=N4KH(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],
+    =N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VV(4)[8],=N4ZI(4)[8],
+    =N4ZZ(4)[8],=N5IE(5)[8],=N5KO(3)[6],=N5LZ(3)[6],=N5ZO(3)[6],=N6AR(5)[8],
+    =N7DR(4)[7],=N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],=N7IP(4)[6],=N7IV(4)[7],
+    =N7IX(4)[7],=N7KA(4)[7],=N7MB(4)[8],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],
+    =N8CL(5)[8],=N8DEZ(3)[6],=N8HM(5)[8],=N8II(5)[8],=N8NA(5)[8],=N8PR(5)[8],
+    =N8RA(5)[8],=N9ADG(3)[6],=N9CM(5)[8],=N9DFD(5)[8],=N9HDE(4)[7],
+    =N9MM(4)[7],=N9NB(5)[8],=N9NC(5)[8],=N9TX(4)[7],=N9UY(5)[8],=NA2U(3)[6],
+    =NA4C(4)[8],=NA4K(4)[8],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],=NE4M(4)[8],
+    =NG7A(5)[8],=NH6Z(3)[6],=NH7RO(4)[7],=NI5O(4)[8],=NJ4I(4)[8],=NJ8J(5)[8],
+    =NK4P(4)[8],=NL7CO(4)[7],=NL7CQ(4)[7],=NL7XM(5)[8],=NN3V(3)[6],
+    =NN4MM(4)[8],=NN7A(4)[7],=NO9E(5)[8],=NP2B(5)[8],=NP2MR(5)[8],=NP3D(5)[8],
+    =NP3ST(5)[8],=NQ6N(5)[8],=NR7DX(4)[6],=NS2X(4)[8],=NS4X(4)[8],=NU4B(4)[8],
+    =NV4B(4)[8],=NW8U(5)[8],=NX1P(3)[6],=NY4N(4)[8],=NY6DX(5)[8],=W0BR(5)[8],
+    =W0IZ(4)[8],=W0PAN(3)[6],=W0PV(5)[8],=W0QQG(5)[8],=W0UCE(5)[8],
+    =W0YK(3)[6],=W0YR(5)[8],=W1NN(4)[8],=W1RH(3)[6],=W1SRD(3)[6],=W1ZD(3)[6],
+    =W2OO(4)[8],=W2UP(4)[7],=W2VJN(3)[6],=W2VKT(3)[6],=W3HDH(4)[8],
+    =W3IQ(4)[8],=W3TUA(4)[7],=W4BCG(4)[8],=W4BCU(4)[8],=W4BK(4)[8],
+    =W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],=W4EF(3)[6],=W4GHD(4)[8],
+    =W4GKM(4)[8],=W4HK(4)[8],=W4HOD(4)[8],=W4JHC(4)[7],=W4JSI(4)[8],
+    =W4KW(4)[8],=W4LC(4)[8],=W4NBS(4)[8],=W4NZ(4)[8],=W4PV(4)[8],=W4RK(4)[7],
+    =W4RYW(4)[8],=W4TTM(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],=W4UT(4)[8],
     =W5JR(5)[8],=W5MX(4)[8],=W5NZ(4)[8],=W5XB(5)[8],=W6AAN(5)[8],=W6DVS(5)[8],
     =W6GMT(4)[7],=W6HGF(5)[8],=W6IHG(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],
-    =W6NWS(5)[8],=W6UB(4)[8],=W7DO(5)[8],=W7HJ(5)[8],=W7IY(5)[8],=W7KAM(4)[7],
-    =W7RTX(4)[7],=W7WZ(5)[8],=W8AKS(5)[8],=W8BFX(3)[6],=W8FJ(5)[8],
-    =W8FN(4)[7],=W8HGH(5)[8],=W8HY(5)[8],=W8KA(3)[6],=W8MHW(4)[7],
+    =W6NWS(5)[8],=W6UB(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],=W7IY(5)[8],
+    =W7KAM(4)[7],=W7RTX(4)[7],=W7WZ(5)[8],=W8AKS(5)[8],=W8BFX(3)[6],
+    =W8FJ(5)[8],=W8FN(4)[7],=W8HGH(5)[8],=W8HY(5)[8],=W8KA(3)[6],=W8MHW(4)[7],
     =W8OHT(5)[8],=W8WEJ(5)[8],=W8ZA(5)[8],=W9CF(3)[6],=W9DKC(5)[8],
     =W9GE(5)[8],=W9KB(5)[8],=W9LHG(4)[7],=W9NGA(3)[6],=W9PL(3)[6],
     =WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],=WA1UJU(4)[8],=WA3C(4)[8],
@@ -632,13 +641,13 @@ Palmyra & Jarvis Islands: 31:  61:  OC:    5.87:   162.07:    11.0:  KH5:
 Kingman Reef:             31:  61:  OC:    6.40:   162.40:    11.0:  KH5K:
     AH5K,KH5K,NH5K,WH5K;
 Hawaii:                   31:  61:  OC:   19.67:   155.57:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AA6MS,=K4EVR,=K6JAE,=K6TR,=K7ZAR,=K9AGI,
-    =KB0PXK,=KB2MRY,=KB6EGA,=KB7QKJ,=KC2ZSG,=KC2ZSH,=KC2ZSI,=KC4FUE,=KC4HHS,
-    =KC7EJC,=KC9AUA,=KD0QLQ,=KD6EPD,=KD7UAV,=KD7UZG,=KD8QML,=KE6CQE,=KE6TIS,
-    =KF5AHW,=KF5LBQ,=KF6FAY,=KG4SGV,=KG6HRX,=KG6JJP,=KG6NNF,=KG6NQI,=KG6OOB,
-    =KG6RJI,=KG6SDD,=KG7CJI,=KI6CRL,=KI6NOC,=KI6VYB,=KI6ZRV,=KI7OS,=KJ4KND,
-    =KJ6GYD,=KK4EEC,=KM6RM,=KN6ZU,=KO6QT,=N5NNK,=N6CGA,=N6QBK,=N7CLW,=NH2JO,
-    =NY7Z,=W7PEA,=W8JAY,=W8WH,=WB4JTT,=WB5C,=WB6SAA,=WB7BOR,=WD6GHJ,=WU0H;
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=K4EVR,=K6JAE,=K6TR,=K7ZAR,=K9AGI,=KB0PXK,
+    =KB2MRY,=KB6EGA,=KB7QKJ,=KC2ZSG,=KC2ZSH,=KC2ZSI,=KC4FUE,=KC4HHS,=KC7EJC,
+    =KC9AUA,=KD0QLQ,=KD6EPD,=KD7UAV,=KD7UZG,=KD8QML,=KE6CQE,=KE6TIS,=KF5AHW,
+    =KF5LBQ,=KG4SGV,=KG6HRX,=KG6JJP,=KG6NNF,=KG6NQI,=KG6OOB,=KG6RJI,=KG6SDD,
+    =KG7CJI,=KI6CRL,=KI6NOC,=KI6VYB,=KI6ZRV,=KI7OS,=KJ4KND,=KJ6GYD,=KK4EEC,
+    =KM6RM,=KN6ZU,=KO6QT,=N5NNK,=N6CGA,=N6QBK,=NH2JO,=NY7Z,=W7PEA,=W8JAY,
+    =W8WH,=WB4JTT,=WB5C,=WB6SAA,=WB7BOR,=WD6GHJ,=WU0H;
 Kure Island:              31:  61:  OC:   29.00:   178.00:    10.0:  KH7K:
     AH7K,KH7K,NH7K,WH7K;
 American Samoa:           32:  62:  OC:  -14.32:   170.78:    11.0:  KH8:
@@ -649,19 +658,19 @@ Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
     AH9,KH9,NH9,WH9;
 Alaska:                   01:  01:  NA:   63.87:   153.78:     8.0:  KL:
     AL,KL,NL,WL,=AD7VV,=AE7LN,=K2NPS,=KB5UWU,=KB7DEL,=KB7QLB,=KC0OKQ,=KC9CMY,
-    =KD4KSB,=KD5WEV,=KD7TWB,=KD7VXE,=KD8GMS,=KD8JOU,=KE5HHR,=KE6TCE,=KE7EOP,
-    =KF5FJQ,=KF5NDT,=KF5NHR,=KF6LGK,=KG4WNZ,=KG6RJE,=KJ4PSV,=KJ4WDI,=KJ6KRG,
-    =KK4CLS,=KK4LRE,=KP4X,=KR4WV,=KW1W,=KY7J,=N0XCW,=N1KNK,=N6SPP,=N7UWT,
-    =N7XNM,=N7ZYS,=NH2GZ,=W5TLB,=W8OES,=WA2BIW,=WA7PXH,=WB6COP,=WT5T;
+    =KD5WEV,=KD7TWB,=KD7VXE,=KD8GMS,=KD8JOU,=KE5HHR,=KE6TCE,=KE7EOP,=KF5FJQ,
+    =KF5NDT,=KF5NHR,=KF6LGK,=KG4WNZ,=KG6RJE,=KJ4PSV,=KJ4WDI,=KJ6KRG,=KK4CLS,
+    =KK4LRE,=KP4X,=KR4WV,=KW1W,=KY7J,=N0XCW,=N1KNK,=N6SPP,=N7UWT,=N7XNM,
+    =N7ZYS,=NH2GZ,=W5TLB,=W8OES,=WA2BIW,=WA7PXH,=WB6COP,=WT5T;
 Navassa Island:           08:  11:  NA:   18.40:    75.00:     5.0:  KP1:
     KP1,NP1,WP1;
 US Virgin Islands:        08:  11:  NA:   17.73:    64.80:     4.0:  KP2:
-    KP2,NP2,WP2,=KH2XQ,=KH2XR,=KI4FOE,=KV2AA,=KV4BT,=KV4CF,=KV4FZ,=N1TKK,
-    =NQ3X,=WB4WFU;
+    KP2,NP2,WP2,=KH2XQ,=KH2XR,=KI4FOE,=KV4BT,=KV4CF,=KV4FZ,=N1TKK,=NQ3X,
+    =WB4WFU;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
-    KP3,KP4,NP3,NP4,WP3,WP4,=AF5IZ,=KB1IJU,=KB1KDP,=KB2NMT,=KB2OIF,=KB2OPM,
-    =KB2RYP,=KC2CYJ,=KC2LET,=KC2TE,=KC5DKT,=KE4WUE,=KF5PWC,=KH2RU,=KI5EEE,
-    =KP2Z,=N1VCW,=N2PGO,=N4JZD,=NB0G;
+    KP3,KP4,NP3,NP4,WP3,WP4,=AF5IZ,=KB1IJU,=KB1KDP,=KB2NMT,=KB2OPM,=KB2RYP,
+    =KC2CYJ,=KC2LET,=KC2TE,=KC5DKT,=KE4WUE,=KF5PWC,=KH2RU,=KP2Z,=N1VCW,=N2PGO,
+    =N4JZD,=NB0G,=W4L;
 Desecheo Island:          08:  11:  NA:   18.08:    67.88:     4.0:  KP5:
     KP5,NP5,WP5;
 Norway:                   14:  18:  EU:   61.00:    -9.00:    -1.0:  LA:
@@ -762,22 +771,9 @@ Argentina:                13:  14:  SA:  -34.80:    65.92:     3.0:  LU:
     LW2W[16],LW2X[16],LW2Y[16],LW3V[16],LW3W[16],LW3X[16],LW3Y[16],LW4V[16],
     LW4W[16],LW4X[16],LW4Y[16],LW5V[16],LW5W[16],LW5X[16],LW5Y[16],LW6V[16],
     LW6W[16],LW6X[16],LW6Y[16],LW7V[16],LW7W[16],LW7X[16],LW7Y[16],LW8V[16],
-    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],
-    =LU/UA4WHX/X[16],=LU1DU/D,=LU1EUU/D,=LU1EY/D,=LU1FHE/F,=LU1FSE/F,
-    =LU1HCG/H,=LU1HPW/H,=LU1KWC/K,=LU1LT/L,=LU1QAH/Q,=LU1QHC/Q,=LU1QR/Q,
-    =LU1XB/XA[16],=LU1YDC/Y[16],=LU2AGQ/D,=LU2FP/F,=LU2HJ/H,=LU2HNV/H,
-    =LU2KLC/K,=LU2WA/W[16],=LU3ARE/D,=LU3AYE/D,=LU3FCI/F,=LU3HKA/H,
-    =LU3VMB/V[16],=LU3YEP/Y[16],=LU4DBT/D,=LU4EET/D,=LU4ETN/D,=LU4HTD/H,
-    =LU4LAD/L,=LU4LBU/L,=LU4QQ/Q,=LU4VAU/V[16],=LU4VBW/V[16],=LU4VMB/V[16],
-    =LU4VMG/V[16],=LU4YAB/Y[16],=LU5AHN/D,=LU5EAO/D,=LU5FYX/F,=LU5HR/H,
-    =LU5HTA/H,=LU5JU/J,=LU5QAJ/Q,=LU5VAI/V[16],=LU5VFL/V[16],=LU5VLB/V[16],
-    =LU5YF/V[16],=LU6FE/F,=LU6HCA/H,=LU6KAQ/K,=LU6QAN/Q,=LU6QB/Q,=LU6QER/Q,
-    =LU6QI/Q,=LU6VAC/V[16],=LU6VDT/V[16],=LU6VFL/V[16],=LU6VR/V[16],
-    =LU6YBK/Y[16],=LU7DOT/D,=LU7DSY/D,=LU7FCU/F,=LU7FM/F,=LU7FOE/F,=LU7HW/H,
-    =LU7KT/K,=LU7QBE/Q,=LU7VBT/V[16],=LU7VFG/V[16],=LU7YCL/Y[16],=LU8ATM/D,
-    =LU8DCH/D,=LU8DWR/D,=LU8DZE/D,=LU8FAB/F,=LU8IEZ/I,=LU8YMP/Y[16],=LU9AOS/D,
-    =LU9EI/D,=LU9QRV/Q,=LW3DG/D,=LW3DN/D,=LW4HTA/H,=LW5DUS/D,=LW6EGE/D,
-    =LW7EDH/D;
+    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU1EEZ/D,
+    =LU1EQ/D,=LU1VOF/D,=LU1XS/O,=LU2DT/D,=LU5YF/V[16],=LU7DOT/D,=LU7FM/F,
+    =LU8DCH/D,=LU8DZE/D,=LU9JLV/J,=LW5EOL/D;
 Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -815,9 +811,7 @@ Aruba:                    09:  11:  SA:   12.53:    69.98:     4.0:  P4:
 DPR of Korea:             25:  44:  AS:   39.78:  -126.30:    -9.0:  P5:
     HM,P5,P6,P7,P8,P9;
 Netherlands:              14:  27:  EU:   52.28:    -5.47:    -1.0:  PA:
-    PA,PB,PC,PD,PE,PF,PG,PH,PI,=PA3BXR/MILL,=PA6KMS/MILL,=PA6MZD/MILL,
-    =PA6STAR/MILL,=PD0ARI/MILL,=PD1JL/MILL,=PH4RTM/MILL,=PI4ET/MILL,
-    =PI4ETL/MILL;
+    PA,PB,PC,PD,PE,PF,PG,PH,PI;
 Curacao:                  09:  11:  SA:   12.17:    69.00:     4.0:  PJ2:
     PJ2;
 Bonaire:                  09:  11:  SA:   12.20:    68.25:     4.0:  PJ4:
@@ -826,14 +820,10 @@ Saba & St. Eustatius:     08:  11:  NA:   17.57:    63.10:     4.0:  PJ5:
     PJ5,PJ6;
 Sint Maarten:             08:  11:  NA:   18.07:    63.07:     4.0:  PJ7:
     PJ7;
-Brazil:                   11:  12:  SA:  -10.00:    53.00:     3.0:  PY:
-    PP,PQ,PR,PS,PT,PU,PV,PW,PX,PY,ZV,ZW,ZX,ZY,ZZ,PP1[15],PP2[15],PP3[15],
-    PP4[15],PP5[15],PP6[13],PP7[13],PQ2[13],PQ3[15],PQ4[15],PQ8[13],PR3[15],
-    PR4[15],PR7[13],PR8[13],PS3[15],PS4[15],PS7[13],PS8[13],PT2[13],PT3[15],
-    PT4[15],PT7[13],PT9[15],PU3[15],PU4[15],PV3[15],PV4[15],PW3[15],PW4[15],
-    PX3[15],PX4[15],PY1[15],PY2[15],PY3[15],PY4[15],PY5[15],PY6[13],PY7[13],
-    PY8[13],PY9[13],ZV3[15],ZV4[15],ZW3[15],ZW4[15],ZX3[15],ZX4[15],ZY3[15],
-    ZY4[15],ZZ3[15],ZZ4[15];
+Brazil:                   11:  15:  SA:  -10.00:    53.00:     3.0:  PY:
+    PP,PQ,PR,PS,PT,PU,PV,PW,PX,PY,ZV,ZW,ZX,ZY,ZZ,PP6[13],PP7[13],PP8[12],
+    PQ2[13],PQ8[13],PR7[13],PR8[13],PS7[13],PS8[13],PT2[13],PT7[13],PT8[12],
+    PV8[12],PW8[12],PY6[13],PY7[13],PY8[13],PY9[13];
 Fernando de Noronha:      11:  13:  SA:   -3.85:    32.43:     2.0:  PY0F:
     PP0F,PP0R,PQ0F,PQ0R,PR0F,PR0R,PS0F,PS0R,PT0F,PT0R,PU0F,PU0R,PV0F,PV0R,
     PW0F,PW0R,PX0F,PX0R,PY0F,PY0R,PY0Z,ZV0F,ZV0R,ZW0F,ZW0R,ZX0F,ZX0R,ZY0F,
@@ -848,7 +838,7 @@ Trindade & Martim Vaz:    11:  15:  SA:  -20.50:    29.32:     2.0:  PY0T:
 Suriname:                 09:  12:  SA:    4.00:    56.00:     3.0:  PZ:
     PZ;
 Franz Josef Land:         40:  75:  EU:   80.68:   -49.92:    -3.0:  R1FJ:
-    FJL,R1FJ,RI1FJ;
+    FJL,R1FJ,RI1FJ,=RK9UR/1,=UA9AOY/1;
 Western Sahara:           33:  46:  AF:   24.82:    13.85:     0.0:  S0:
     S0;
 Bangladesh:               22:  41:  AS:   24.12:   -89.65:    -6.0:  S2:
@@ -874,7 +864,7 @@ Mount Athos:              20:  28:  EU:   40.00:   -24.00:    -2.0:  SV/a:
 Dodecanese:               20:  28:  EU:   36.17:   -27.93:    -2.0:  SV5:
     J45,SV5,SW5,SX5,SY5,SZ5,=SV0XCA/5;
 Crete:                    20:  28:  EU:   35.23:   -24.78:    -2.0:  SV9:
-    J49,SV9,SW9,SX9,SY9,SZ9,=SV0XBN/9,=SV0XCC/9;
+    J49,SV9,SW9,SX9,SY9,SZ9,=SV0XCC/9;
 Tuvalu:                   31:  65:  OC:   -8.50:  -179.20:   -12.0:  T2:
     T2;
 Western Kiribati:         31:  65:  OC:    1.42:  -173.00:   -12.0:  T30:
@@ -892,7 +882,7 @@ San Marino:               15:  28:  EU:   43.95:   -12.45:    -1.0:  T7:
 Palau:                    27:  64:  OC:    7.45:  -134.53:    -9.0:  T8:
     T8;
 Asiatic Turkey:           20:  39:  AS:   39.18:   -35.65:    -2.0:  TA:
-    TA,TB,TC,YM,=TA1BM/3,=TA1BZ/2,=TA1D/3,=TA1FA/2;
+    TA,TB,TC,YM,=TA1BM/3,=TA1BZ/2,=TA1D/3;
 European Turkey:          20:  39:  EU:   41.02:   -28.97:    -2.0:  *TA1:
     TA1,TB1,TC1,YM1;
 Iceland:                  40:  17:  EU:   64.80:    18.73:     0.0:  TF:
@@ -922,79 +912,79 @@ Benin:                    35:  46:  AF:    9.87:    -2.25:    -1.0:  TY:
 Mali:                     35:  46:  AF:   18.00:     2.58:     0.0:  TZ:
     TZ;
 European Russia:          16:  29:  EU:   53.65:   -41.37:    -4.0:  UA:
-    R,RA27,U,R1N[19],R1O[19],R1P[20],R1Z[19],R290(17)[30],R4H[30],R4I[30],
-    R4W[30],R8F(17)[30],R8G(17)[30],R8X(17)[19],R9F(17)[30],R9G(17)[30],
-    R9X(17)[19],RA1N[19],RA1O[19],RA1P[20],RA1Z[19],RA4H[30],RA4I[30],
-    RA4W[30],RA8F(17)[30],RA8G(17)[30],RA8X(17)[19],RA9F(17)[30],RA9G(17)[30],
-    RA9X(17)[19],RC1N[19],RC1O[19],RC1P[20],RC1Z[19],RC4H[30],RC4I[30],
-    RC4W[30],RC8F(17)[30],RC8G(17)[30],RC8X(17)[19],RC9F(17)[30],RC9G(17)[30],
-    RC9X(17)[19],RD1N[19],RD1O[19],RD1P[20],RD1Z[19],RD4H[30],RD4I[30],
-    RD4W[30],RD8F(17)[30],RD8G(17)[30],RD8X(17)[19],RD9F(17)[30],RD9G(17)[30],
-    RD9X(17)[19],RF1N[19],RF1O[19],RF1P[20],RF1Z[19],RF4H[30],RF4I[30],
-    RF4W[30],RF8F(17)[30],RF8G(17)[30],RF8X(17)[19],RF9F(17)[30],RF9G(17)[30],
-    RF9X(17)[19],RG1N[19],RG1O[19],RG1P[20],RG1Z[19],RG4H[30],RG4I[30],
-    RG4W[30],RG8F(17)[30],RG8G(17)[30],RG8X(17)[19],RG9F(17)[30],RG9G(17)[30],
-    RG9X(17)[19],RI1N[19],RI1O[19],RI1P[20],RI1Z[19],RI4H[30],RI4I[30],
-    RI4W[30],RI8F(17)[30],RI8G(17)[30],RI8X(17)[19],RI9F(17)[30],RI9G(17)[30],
-    RI9X(17)[19],RJ1N[19],RJ1O[19],RJ1P[20],RJ1Z[19],RJ4H[30],RJ4I[30],
-    RJ4W[30],RJ8F(17)[30],RJ8G(17)[30],RJ8X(17)[19],RJ9F(17)[30],RJ9G(17)[30],
-    RJ9X(17)[19],RK1N[19],RK1O[19],RK1P[20],RK1Z[19],RK4H[30],RK4I[30],
-    RK4W[30],RK8F(17)[30],RK8G(17)[30],RK8X(17)[19],RK9F(17)[30],RK9G(17)[30],
-    RK9X(17)[19],RL1N[19],RL1O[19],RL1P[20],RL1Z[19],RL4H[30],RL4I[30],
-    RL4W[30],RL8F(17)[30],RL8G(17)[30],RL8X(17)[19],RL9F(17)[30],RL9G(17)[30],
-    RL9X(17)[19],RM1N[19],RM1O[19],RM1P[20],RM1Z[19],RM4H[30],RM4I[30],
-    RM4W[30],RM8F(17)[30],RM8G(17)[30],RM8X(17)[19],RM9F(17)[30],RM9G(17)[30],
-    RM9X(17)[19],RN1N[19],RN1O[19],RN1P[20],RN1Z[19],RN4H[30],RN4I[30],
-    RN4W[30],RN8F(17)[30],RN8G(17)[30],RN8X(17)[19],RN9F(17)[30],RN9G(17)[30],
-    RN9X(17)[19],RO1N[19],RO1O[19],RO1P[20],RO1Z[19],RO4H[30],RO4I[30],
-    RO4W[30],RO8F(17)[30],RO8G(17)[30],RO8X(17)[19],RO9F(17)[30],RO9G(17)[30],
-    RO9X(17)[19],RP1N[19],RP1O[19],RP1P[20],RP1Z[19],RP4H[30],RP4I[30],
-    RP4W[30],RP8F(17)[30],RP8G(17)[30],RP8X(17)[19],RP9F(17)[30],RP9G(17)[30],
-    RP9X(17)[19],RQ1N[19],RQ1O[19],RQ1P[20],RQ1Z[19],RQ4H[30],RQ4I[30],
-    RQ4W[30],RQ8F(17)[30],RQ8G(17)[30],RQ8X(17)[19],RQ9F(17)[30],RQ9G(17)[30],
-    RQ9X(17)[19],RR1N[19],RR1O[19],RR1P[20],RR1Z[19],RR4H[30],RR4I[30],
-    RR4W[30],RR8F(17)[30],RR8G(17)[30],RR8X(17)[19],RR9F(17)[30],RR9G(17)[30],
-    RR9X(17)[19],RT1N[19],RT1O[19],RT1P[20],RT1Z[19],RT4H[30],RT4I[30],
-    RT4W[30],RT8F(17)[30],RT8G(17)[30],RT8X(17)[19],RT9F(17)[30],RT9G(17)[30],
-    RT9X(17)[19],RU1N[19],RU1O[19],RU1P[20],RU1Z[19],RU4H[30],RU4I[30],
-    RU4W[30],RU8F(17)[30],RU8G(17)[30],RU8X(17)[19],RU9F(17)[30],RU9G(17)[30],
-    RU9X(17)[19],RV1N[19],RV1O[19],RV1P[20],RV1Z[19],RV4H[30],RV4I[30],
-    RV4W[30],RV8F(17)[30],RV8G(17)[30],RV8X(17)[19],RV9F(17)[30],RV9G(17)[30],
-    RV9X(17)[19],RW1N[19],RW1O[19],RW1P[20],RW1Z[19],RW4H[30],RW4I[30],
-    RW4W[30],RW8F(17)[30],RW8G(17)[30],RW8X(17)[19],RW9F(17)[30],RW9G(17)[30],
-    RW9X(17)[19],RX1N[19],RX1O[19],RX1P[20],RX1Z[19],RX4H[30],RX4I[30],
-    RX4W[30],RX8F(17)[30],RX8G(17)[30],RX8X(17)[19],RX9F(17)[30],RX9G(17)[30],
-    RX9X(17)[19],RY1N[19],RY1O[19],RY1P[20],RY1Z[19],RY4H[30],RY4I[30],
-    RY4W[30],RY8F(17)[30],RY8G(17)[30],RY8X(17)[19],RY9F(17)[30],RY9G(17)[30],
-    RY9X(17)[19],RZ1N[19],RZ1O[19],RZ1P[20],RZ1Z[19],RZ4H[30],RZ4I[30],
-    RZ4W[30],RZ8F(17)[30],RZ8G(17)[30],RZ8X(17)[19],RZ9F(17)[30],RZ9G(17)[30],
-    RZ9X(17)[19],U1N[19],U1O[19],U1P[20],U1Z[19],U4H[30],U4I[30],U4W[30],
-    U8F(17)[30],U8G(17)[30],U8X(17)[19],U9F(17)[30],U9G(17)[30],U9X(17)[19],
-    UA1N[19],UA1O[19],UA1P[20],UA1Z[19],UA4H[30],UA4I[30],UA4W[30],
-    UA8F(17)[30],UA8G(17)[30],UA8X(17)[19],UA9F(17)[30],UA9G(17)[30],
-    UA9X(17)[19],UB1N[19],UB1O[19],UB1P[20],UB1Z[19],UB4H[30],UB4I[30],
-    UB4W[30],UB8F(17)[30],UB8G(17)[30],UB8X(17)[19],UB9F(17)[30],UB9G(17)[30],
-    UB9X(17)[19],UC1N[19],UC1O[19],UC1P[20],UC1Z[19],UC4H[30],UC4I[30],
-    UC4W[30],UC8F(17)[30],UC8G(17)[30],UC8X(17)[19],UC9F(17)[30],UC9G(17)[30],
-    UC9X(17)[19],UD1N[19],UD1O[19],UD1P[20],UD1Z[19],UD4H[30],UD4I[30],
-    UD4W[30],UD8F(17)[30],UD8G(17)[30],UD8X(17)[19],UD9F(17)[30],UD9G(17)[30],
-    UD9X(17)[19],UE1N[19],UE1O[19],UE1P[20],UE1Z[19],UE4H[30],UE4I[30],
-    UE4W[30],UE8F(17)[30],UE8G(17)[30],UE8X(17)[19],UE9F(17)[30],UE9G(17)[30],
-    UE9X(17)[19],UF1N[19],UF1O[19],UF1P[20],UF1Z[19],UF4H[30],UF4I[30],
-    UF4W[30],UF8F(17)[30],UF8G(17)[30],UF8X(17)[19],UF9F(17)[30],UF9G(17)[30],
-    UF9X(17)[19],UG1N[19],UG1O[19],UG1P[20],UG1Z[19],UG4H[30],UG4I[30],
-    UG4W[30],UG8F(17)[30],UG8G(17)[30],UG8X(17)[19],UG9F(17)[30],UG9G(17)[30],
-    UG9X(17)[19],UH1N[19],UH1O[19],UH1P[20],UH1Z[19],UH4H[30],UH4I[30],
-    UH4W[30],UH8F(17)[30],UH8G(17)[30],UH8X(17)[19],UH9F(17)[30],UH9G(17)[30],
-    UH9X(17)[19],UI1N[19],UI1O[19],UI1P[20],UI1Z[19],UI4H[30],UI4I[30],
-    UI4W[30],UI8F(17)[30],UI8G(17)[30],UI8X(17)[19],UI9F(17)[30],UI9G(17)[30],
-    UI9X(17)[19],=R863LC,=R88EPC,=R95PW,=RA27FM(17)[30],=RU27FQ(17)[30],
-    =RU27FW(17)[30],=RU2FB/6/P,=RW9WJ/4/P[30];
+    R,U,R1N[19],R1O[19],R1P[20],R1Z[19],R4H[30],R4I[30],R4W[30],R8F(17)[30],
+    R8G(17)[30],R8X(17)[19],R9F(17)[30],R9G(17)[30],R9X(17)[19],RA1N[19],
+    RA1O[19],RA1P[20],RA1Z[19],RA4H[30],RA4I[30],RA4W[30],RA8F(17)[30],
+    RA8G(17)[30],RA8X(17)[19],RA9F(17)[30],RA9G(17)[30],RA9X(17)[19],RC1N[19],
+    RC1O[19],RC1P[20],RC1Z[19],RC4H[30],RC4I[30],RC4W[30],RC8F(17)[30],
+    RC8G(17)[30],RC8X(17)[19],RC9F(17)[30],RC9G(17)[30],RC9X(17)[19],RD1N[19],
+    RD1O[19],RD1P[20],RD1Z[19],RD4H[30],RD4I[30],RD4W[30],RD8F(17)[30],
+    RD8G(17)[30],RD8X(17)[19],RD9F(17)[30],RD9G(17)[30],RD9X(17)[19],RF1N[19],
+    RF1O[19],RF1P[20],RF1Z[19],RF4H[30],RF4I[30],RF4W[30],RF8F(17)[30],
+    RF8G(17)[30],RF8X(17)[19],RF9F(17)[30],RF9G(17)[30],RF9X(17)[19],RG1N[19],
+    RG1O[19],RG1P[20],RG1Z[19],RG4H[30],RG4I[30],RG4W[30],RG8F(17)[30],
+    RG8G(17)[30],RG8X(17)[19],RG9F(17)[30],RG9G(17)[30],RG9X(17)[19],RI1N[19],
+    RI1O[19],RI1P[20],RI1Z[19],RI4H[30],RI4I[30],RI4W[30],RI8F(17)[30],
+    RI8G(17)[30],RI8X(17)[19],RI9F(17)[30],RI9G(17)[30],RI9X(17)[19],RJ1N[19],
+    RJ1O[19],RJ1P[20],RJ1Z[19],RJ4H[30],RJ4I[30],RJ4W[30],RJ8F(17)[30],
+    RJ8G(17)[30],RJ8X(17)[19],RJ9F(17)[30],RJ9G(17)[30],RJ9X(17)[19],RK1N[19],
+    RK1O[19],RK1P[20],RK1Z[19],RK4H[30],RK4I[30],RK4W[30],RK8F(17)[30],
+    RK8G(17)[30],RK8X(17)[19],RK9F(17)[30],RK9G(17)[30],RK9X(17)[19],RL1N[19],
+    RL1O[19],RL1P[20],RL1Z[19],RL4H[30],RL4I[30],RL4W[30],RL8F(17)[30],
+    RL8G(17)[30],RL8X(17)[19],RL9F(17)[30],RL9G(17)[30],RL9X(17)[19],RM1N[19],
+    RM1O[19],RM1P[20],RM1Z[19],RM4H[30],RM4I[30],RM4W[30],RM8F(17)[30],
+    RM8G(17)[30],RM8X(17)[19],RM9F(17)[30],RM9G(17)[30],RM9X(17)[19],RN1N[19],
+    RN1O[19],RN1P[20],RN1Z[19],RN4H[30],RN4I[30],RN4W[30],RN8F(17)[30],
+    RN8G(17)[30],RN8X(17)[19],RN9F(17)[30],RN9G(17)[30],RN9X(17)[19],RO1N[19],
+    RO1O[19],RO1P[20],RO1Z[19],RO4H[30],RO4I[30],RO4W[30],RO8F(17)[30],
+    RO8G(17)[30],RO8X(17)[19],RO9F(17)[30],RO9G(17)[30],RO9X(17)[19],RP1N[19],
+    RP1O[19],RP1P[20],RP1Z[19],RP4H[30],RP4I[30],RP4W[30],RP8F(17)[30],
+    RP8G(17)[30],RP8X(17)[19],RP9F(17)[30],RP9G(17)[30],RP9X(17)[19],RQ1N[19],
+    RQ1O[19],RQ1P[20],RQ1Z[19],RQ4H[30],RQ4I[30],RQ4W[30],RQ8F(17)[30],
+    RQ8G(17)[30],RQ8X(17)[19],RQ9F(17)[30],RQ9G(17)[30],RQ9X(17)[19],RR1N[19],
+    RR1O[19],RR1P[20],RR1Z[19],RR4H[30],RR4I[30],RR4W[30],RR8F(17)[30],
+    RR8G(17)[30],RR8X(17)[19],RR9F(17)[30],RR9G(17)[30],RR9X(17)[19],RT1N[19],
+    RT1O[19],RT1P[20],RT1Z[19],RT4H[30],RT4I[30],RT4W[30],RT8F(17)[30],
+    RT8G(17)[30],RT8X(17)[19],RT9F(17)[30],RT9G(17)[30],RT9X(17)[19],RU1N[19],
+    RU1O[19],RU1P[20],RU1Z[19],RU4H[30],RU4I[30],RU4W[30],RU8F(17)[30],
+    RU8G(17)[30],RU8X(17)[19],RU9F(17)[30],RU9G(17)[30],RU9X(17)[19],RV1N[19],
+    RV1O[19],RV1P[20],RV1Z[19],RV4H[30],RV4I[30],RV4W[30],RV8F(17)[30],
+    RV8G(17)[30],RV8X(17)[19],RV9F(17)[30],RV9G(17)[30],RV9X(17)[19],RW1N[19],
+    RW1O[19],RW1P[20],RW1Z[19],RW4H[30],RW4I[30],RW4W[30],RW8F(17)[30],
+    RW8G(17)[30],RW8X(17)[19],RW9F(17)[30],RW9G(17)[30],RW9X(17)[19],RX1N[19],
+    RX1O[19],RX1P[20],RX1Z[19],RX4H[30],RX4I[30],RX4W[30],RX8F(17)[30],
+    RX8G(17)[30],RX8X(17)[19],RX9F(17)[30],RX9G(17)[30],RX9X(17)[19],RY1N[19],
+    RY1O[19],RY1P[20],RY1Z[19],RY4H[30],RY4I[30],RY4W[30],RY8F(17)[30],
+    RY8G(17)[30],RY8X(17)[19],RY9F(17)[30],RY9G(17)[30],RY9X(17)[19],RZ1N[19],
+    RZ1O[19],RZ1P[20],RZ1Z[19],RZ4H[30],RZ4I[30],RZ4W[30],RZ8F(17)[30],
+    RZ8G(17)[30],RZ8X(17)[19],RZ9F(17)[30],RZ9G(17)[30],RZ9X(17)[19],U1N[19],
+    U1O[19],U1P[20],U1Z[19],U4H[30],U4I[30],U4W[30],U8F(17)[30],U8G(17)[30],
+    U8X(17)[19],U9F(17)[30],U9G(17)[30],U9X(17)[19],UA1N[19],UA1O[19],
+    UA1P[20],UA1Z[19],UA4H[30],UA4I[30],UA4W[30],UA8F(17)[30],UA8G(17)[30],
+    UA8X(17)[19],UA9F(17)[30],UA9G(17)[30],UA9X(17)[19],UB1N[19],UB1O[19],
+    UB1P[20],UB1Z[19],UB4H[30],UB4I[30],UB4W[30],UB8F(17)[30],UB8G(17)[30],
+    UB8X(17)[19],UB9F(17)[30],UB9G(17)[30],UB9X(17)[19],UC1N[19],UC1O[19],
+    UC1P[20],UC1Z[19],UC4H[30],UC4I[30],UC4W[30],UC8F(17)[30],UC8G(17)[30],
+    UC8X(17)[19],UC9F(17)[30],UC9G(17)[30],UC9X(17)[19],UD1N[19],UD1O[19],
+    UD1P[20],UD1Z[19],UD4H[30],UD4I[30],UD4W[30],UD8F(17)[30],UD8G(17)[30],
+    UD8X(17)[19],UD9F(17)[30],UD9G(17)[30],UD9X(17)[19],UE1N[19],UE1O[19],
+    UE1P[20],UE1Z[19],UE4H[30],UE4I[30],UE4W[30],UE8F(17)[30],UE8G(17)[30],
+    UE8X(17)[19],UE9F(17)[30],UE9G(17)[30],UE9X(17)[19],UF1N[19],UF1O[19],
+    UF1P[20],UF1Z[19],UF4H[30],UF4I[30],UF4W[30],UF8F(17)[30],UF8G(17)[30],
+    UF8X(17)[19],UF9F(17)[30],UF9G(17)[30],UF9X(17)[19],UG1N[19],UG1O[19],
+    UG1P[20],UG1Z[19],UG4H[30],UG4I[30],UG4W[30],UG8F(17)[30],UG8G(17)[30],
+    UG8X(17)[19],UG9F(17)[30],UG9G(17)[30],UG9X(17)[19],UH1N[19],UH1O[19],
+    UH1P[20],UH1Z[19],UH4H[30],UH4I[30],UH4W[30],UH8F(17)[30],UH8G(17)[30],
+    UH8X(17)[19],UH9F(17)[30],UH9G(17)[30],UH9X(17)[19],UI1N[19],UI1O[19],
+    UI1P[20],UI1Z[19],UI4H[30],UI4I[30],UI4W[30],UI8F(17)[30],UI8G(17)[30],
+    UI8X(17)[19],UI9F(17)[30],UI9G(17)[30],UI9X(17)[19],=R863LC,=R863LX,
+    =R88EPC,=R95PW,=RA27FM(17)[30],=RD9CX/6/P,=RU27FQ(17)[30],=RU27FW(17)[30],
+    =RU2FB/6/P,=UE80RWW;
 Kaliningrad:              15:  29:  EU:   54.72:   -20.52:    -3.0:  UA2:
     R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RF2F,RF2K,RG2F,RG2K,RI2F,RI2K,RJ2F,RJ2K,
     RK2F,RK2K,RL2F,RL2K,RM2F,RM2K,RN2F,RN2K,RO2F,RO2K,RP2F,RP2K,RQ2F,RQ2K,
     RR2F,RR2K,RT2F,RT2K,RU2F,RU2K,RV2F,RV2K,RW2F,RW2K,RX2F,RX2K,RY2F,RY2K,
-    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UE2,UF2,UG2,UH2,UI2,=R2MWO;
+    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UE2,UF2,UG2,UH2,UI2,=R01DTV/2,=R2MWO;
 Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     R0,R8(17)[30],R9,RA0,RA8(17)[30],RA9,RB0,RB8(17)[30],RB9,RC0,RC8(17)[30],
     RC9,RD0,RD8(17)[30],RD9,RE0,RE8(17)[30],RE9,RF0,RF8(17)[30],RF9,RG0,
@@ -1121,10 +1111,8 @@ Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     UI8O(18)[31],UI8P(18)[31],UI8S(16)[30],UI8T(16)[30],UI8U(18)[31],
     UI8V(18)[31],UI8W(16)[30],UI8Y(18)[31],UI8Z(18)[31],UI9I(18)[31],
     UI9M(17)[30],UI9P(18)[31],UI9S(16),UI9T(16),UI9V(18)[31],UI9W(16),
-    =R27UFA(16),=R4WAB/9/P,=R8OA/9/P(18)[31],=R9OOO/9/P(23)[32],
-    =R9OY/9/P(23)[32],=RA/DL6XK,=RA/KE5JA(19)[34],=RA/UR5HVR(18)[32],
-    =RA27TR(16),=RU27WB(16),=RU27WF(16),=RU27WN(16),=RU27WO(16),
-    =RZ9DX/9/P(18)[22];
+    =R27UFA(16),=RA/DL6XK,=RA/KE5JA(19)[34],=RA27TR(16),=RU27WB(16),
+    =RU27WF(16),=RU27WN(16),=RU27WO(16);
 Uzbekistan:               17:  30:  AS:   41.40:   -63.97:    -5.0:  UK:
     UJ,UK,UL,UM;
 Kazakhstan:               17:  30:  AS:   48.17:   -65.18:    -5.0:  UN:
@@ -1180,12 +1168,12 @@ Canada:                   05:  09:  NA:   44.35:    78.75:     5.0:  VE:
     CI1(1)[2],CI2,CJ2[4],CK2[4],CY1,CY2(2),CZ0(2)[4],CZ1(1)[2],CZ2,VA2[4],
     VB2[4],VC2[4],VD1,VD2(2),VE2[4],VF0(2)[4],VF1(1)[2],VF2,VG2[4],VO1,VO2(2),
     VX2[4],VY0(2)[4],VY1(1)[2],VY2,XJ1,XJ2(2),XK0(2)[4],XK1(1)[2],XK2,XL2[4],
-    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20130625,=VA2PL(2)[4],
-    =VE2DXY(2)[4],=VE2EKA(2)[4],=VE2ENB(2)[4],=VE2EW(2)[4],=VE2FK[9],
-    =VE2GSO(2)[4],=VE2IM(2)[4],=VE2KK(2)[4],=VE3GNO/2[4],=VY0PW(4)[3];
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20130802,=VA2PL(2)[4],
+    =VE2DXY(2)[4],=VE2EKA(2)[4],=VE2ENB(2)[4],=VE2FK[9],=VE2GSO(2)[4],
+    =VE2IM(2)[4],=VE2KK(2)[4],=VE2XB/3(4)[4],=VE3AX/7(3)[2],=VY0PW(4)[3];
 Australia:                30:  59:  OC:  -23.70:  -132.33:   -10.0:  VK:
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ,AX4[55],VH4[55],VI4[55],VJ4[55],VK4[55],
-    VL4[55],VM4[55],VN4[55],VZ4[55],=VI103WIA(29)[58];
+    VL4[55],VM4[55],VN4[55],VZ4[55];
 Heard Island:             39:  68:  AF:  -53.08:   -73.50:    -5.0:  VK0H:
     =VK0IR;
 Macquarie Island:         30:  60:  OC:  -54.60:  -158.88:   -10.0:  VK0M:
@@ -1203,7 +1191,7 @@ Willis Island:            30:  55:  OC:  -16.22:  -150.02:   -10.0:  VK9W:
     AX9W,AX9Z,VH9W,VH9Z,VI9W,VI9Z,VJ9W,VJ9Z,VK9W,VK9Z,VL9W,VL9Z,VM9W,VM9Z,
     VN9W,VN9Z,VZ9W,VZ9Z;
 Christmas Island:         29:  54:  OC:  -10.48:  -105.63:    -7.0:  VK9X:
-    AX9X,VH9X,VI9X,VJ9X,VK9X,VL9X,VM9X,VN9X,VZ9X,=VK9DAC;
+    AX9X,VH9X,VI9X,VJ9X,VK9X,VL9X,VM9X,VN9X,VZ9X;
 Anguilla:                 08:  11:  NA:   18.23:    63.00:     4.0:  VP2E:
     VP2E;
 Montserrat:               08:  11:  NA:   16.75:    62.18:     4.0:  VP2M:
@@ -1264,7 +1252,7 @@ Indonesia:                28:  51:  OC:   -7.30:  -109.88:    -7.0:  YB:
     YE6[54],YE7[54],YE8[54],YF0[54],YF1[54],YF2[54],YF3[54],YF4[54],YF5[54],
     YF6[54],YF7[54],YF8[54],YG0[54],YG1[54],YG2[54],YG3[54],YG4[54],YG5[54],
     YG6[54],YG7[54],YG8[54],YH0[54],YH1[54],YH2[54],YH3[54],YH4[54],YH5[54],
-    YH6[54],YH7[54],YH8[54];
+    YH6[54],YH7[54],YH8[54],=YD1BZW/YL[54];
 Iraq:                     21:  39:  AS:   33.92:   -42.78:    -3.0:  YI:
     HN,YI;
 Vanuatu:                  32:  56:  OC:  -17.67:  -168.38:   -11.0:  YJ:
@@ -1290,7 +1278,7 @@ Zimbabwe:                 38:  53:  AF:  -18.00:   -31.00:    -2.0:  Z2:
 Macedonia:                15:  28:  EU:   41.60:   -21.65:    -1.0:  Z3:
     Z3;
 Kosovo:                   15:  28:  EU:   42.67:   -21.17:    -1.0:  *Z6:
-    Z6,=YU8/IV3LAR;
+    Z6;
 Republic of South Sudan:  34:  48:  AF:    4.85:   -31.60:    -3.0:  Z8:
     Z8;
 Albania:                  15:  28:  EU:   41.00:   -20.00:    -1.0:  ZA:

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index f5e1a3030c62bf2eec61420a741376c857d1a98d..a9011f557c9add8a5a37df0f358353c28e16b99a 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -309,14 +309,26 @@
   '=2M1ODL' => '381',
   '=2V0CDY' => '66',
   '=2V0CGM' => '66',
+  '=2V0CLJ' => '66',
   '=2V0CSB' => '62',
+  '=2V0CVL' => '66',
+  '=2V0DAA' => '66',
+  '=2V0DUN' => '66',
+  '=2V0GME' => '66',
+  '=2V0GNG' => '66',
+  '=2V0GUL' => '64,381',
   '=2V0IOM' => '61',
   '=2V0IVG' => '62',
   '=2V0JCH' => '64,381',
   '=2V0KAU' => '64,381',
   '=2V0KED' => '66',
+  '=2V0TAX' => '64,381',
   '=2V0WDS' => '66',
   '=2V0YLX' => '61',
+  '=2V1EPO' => '66',
+  '=2V1HFE' => '64,381',
+  '=2V1MIC' => '64,381',
+  '=2V1SJB' => '64,381',
   '=3D2C' => '295',
   '=3D2RI' => '297',
   '=3Y0E' => '256',
@@ -330,7 +342,6 @@
   '=AA4DD' => '206',
   '=AA4R' => '206',
   '=AA4YL' => '206',
-  '=AA6MS' => '105,418,419',
   '=AB4GG' => '206',
   '=AB4IQ' => '206',
   '=AB9DU' => '206',
@@ -363,16 +374,13 @@
   '=DP1POL' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=DT8A' => '339',
   '=E51WL' => '341',
-  '=EA5RKL/8' => '36',
-  '=F6KBG/MSW' => '42',
+  '=EA4BQ/8' => '36',
   '=FK8IK/C' => '313',
-  '=FO/KH0PR' => '310',
-  '=FO/UT6UD' => '311',
+  '=FO/UT6UD' => '310',
   '=G0FBJ' => '381',
   '=GB0APS' => '66',
-  '=GB0AWS' => '66',
+  '=GB0BOL' => '64,381',
   '=GB0BSS' => '64,381',
-  '=GB0CFD' => '66',
   '=GB0GDS' => '64,381',
   '=GB0GGR' => '64,381',
   '=GB0GPF' => '62',
@@ -380,10 +388,13 @@
   '=GB0NHL' => '64,381',
   '=GB0POS' => '64,381',
   '=GB0REL' => '62',
+  '=GB0SSB' => '64,381',
+  '=GB0TH' => '64,381',
   '=GB0TS' => '66',
   '=GB1AJ' => '64,381',
   '=GB1BW' => '66',
   '=GB1FHS' => '64,381',
+  '=GB1LAY' => '64,381',
   '=GB1OL' => '64,381',
   '=GB1PD' => '66',
   '=GB1RB' => '64,381',
@@ -393,7 +404,6 @@
   '=GB2CHC' => '64,381',
   '=GB2DMR' => '62',
   '=GB2ELH' => '381',
-  '=GB2EPC' => '64,381',
   '=GB2FLB' => '66',
   '=GB2GGM' => '66',
   '=GB2GKR' => '64,381',
@@ -403,14 +413,12 @@
   '=GB2LBN' => '64,381',
   '=GB2LOL' => '62',
   '=GB2LSA' => '66',
+  '=GB2LSH' => '66',
   '=GB2LT' => '64,381',
-  '=GB2MAC' => '62',
   '=GB2MOF' => '64,381',
   '=GB2OL' => '64,381',
   '=GB2OWM' => '64,381',
-  '=GB2QM' => '381',
   '=GB2SB' => '381',
-  '=GB2SNM/MILL' => '60',
   '=GB2SQN' => '64,381',
   '=GB2SR' => '64,381',
   '=GB2UAS' => '62',
@@ -419,8 +427,9 @@
   '=GB3ANG' => '64,381',
   '=GB3LER' => '381',
   '=GB3LER/B' => '381',
+  '=GB4CTC' => '66',
   '=GB4GS' => '64,381',
-  '=GB4JDF' => '61',
+  '=GB4JPJ' => '64,381',
   '=GB4LER' => '381',
   '=GB4MBC' => '66',
   '=GB4MDI' => '66',
@@ -433,8 +442,6 @@
   '=GB5GEO' => '66',
   '=GB5SPD' => '62',
   '=GB6BLB' => '66',
-  '=GB6MW/MILL' => '60',
-  '=GB8CCC' => '66',
   '=GM0CXQ' => '381',
   '=GM0CYJ' => '381',
   '=GM0DJI' => '381',
@@ -481,7 +488,6 @@
   '=GM4SRU' => '381',
   '=GM4SSA' => '381',
   '=GM4SWU' => '381',
-  '=GM4WSB/P' => '64,381',
   '=GM4WXQ' => '381',
   '=GM4YEL' => '381',
   '=GM4ZHL' => '381',
@@ -498,45 +504,79 @@
   '=GS3ZET' => '381',
   '=GV0ANA' => '66',
   '=GV0DBW' => '64,381',
+  '=GV0DCK' => '66',
   '=GV0DIV' => '66',
+  '=GV0EME' => '66',
   '=GV0FRE' => '66',
   '=GV0GMN' => '64,381',
   '=GV0GRD' => '64,381',
+  '=GV0LZE' => '64,381',
   '=GV0MNP' => '66',
   '=GV0NPL' => '66',
   '=GV0OBX' => '64,381',
   '=GV0OGN' => '64,381',
+  '=GV0OUD' => '61',
+  '=GV0SYV' => '64,381',
+  '=GV0VRP' => '64,381',
   '=GV1BAN' => '64,381',
+  '=GV1BZT' => '62',
+  '=GV1FKY' => '66',
   '=GV1IOT' => '66',
   '=GV1JFV' => '66',
+  '=GV1NBW' => '66',
   '=GV1YQM' => '66',
   '=GV3ATZ' => '66',
+  '=GV3JIJ' => '64,381',
   '=GV3KVD' => '62',
+  '=GV3NIG' => '64,381',
   '=GV3NNZ' => '64,381',
   '=GV3SG' => '62',
+  '=GV3ULP' => '64,381',
   '=GV3UOF' => '66',
+  '=GV3VTB' => '64,381',
+  '=GV3WEZ' => '66',
+  '=GV3XJQ' => '66',
   '=GV3XQJ' => '66',
+  '=GV3YEO' => '61',
   '=GV4BKG' => '66',
   '=GV4BLO' => '64,381',
+  '=GV4BRS' => '66',
+  '=GV4CQZ' => '66',
   '=GV4EMX' => '64,381',
   '=GV4FUE' => '62',
   '=GV4GUH' => '62',
   '=GV4HRJ' => '64,381',
+  '=GV4ILS' => '64,381',
+  '=GV4JKR' => '66',
   '=GV4JOJ' => '64,381',
+  '=GV4JQP' => '66',
   '=GV4JTF' => '62',
+  '=GV4KLN' => '64,381',
+  '=GV4LVW' => '64,381',
+  '=GV4LXL' => '62',
   '=GV4NQJ' => '66',
+  '=GV4PUC' => '66',
   '=GV4SRQ' => '62',
+  '=GV4VTB' => '64,381',
+  '=GV4WVN' => '62',
   '=GV4XQJ' => '64,381',
   '=GV6AFB' => '61',
+  '=GV6BRC' => '66',
+  '=GV6JPC' => '66',
+  '=GV6KON' => '64,381',
+  '=GV6NKG' => '66',
+  '=GV7AXB' => '62',
   '=GV7DHA' => '64,381',
+  '=GV7GDE' => '64,381',
   '=GV7GMC' => '64,381',
+  '=GV7HTG' => '61',
   '=GV7THH' => '62',
   '=GV7UNV' => '66',
+  '=GV7VJK' => '66',
   '=GV8AVM' => '64,381',
   '=GV8DPV' => '64,381',
   '=GV8IQC' => '66',
-  '=HC2AO/8' => '72',
-  '=HC2IWM/8' => '72',
+  '=GV8LYS' => '64,381',
   '=HF0POL' => '339',
   '=HK0TU' => '327',
   '=IQ0AH' => '84',
@@ -621,6 +661,7 @@
   '=K7RB' => '206',
   '=K7RE' => '206',
   '=K7SCX' => '206',
+  '=K7ST/FO' => '311',
   '=K7SV' => '206',
   '=K7TD' => '206',
   '=K7VK' => '206',
@@ -665,7 +706,6 @@
   '=KB1KDP' => '113',
   '=KB2MRY' => '105,418,419',
   '=KB2NMT' => '113',
-  '=KB2OIF' => '113',
   '=KB2OPM' => '113',
   '=KB2RYP' => '113',
   '=KB5EZ' => '206',
@@ -702,7 +742,6 @@
   '=KC9AUA' => '105,418,419',
   '=KC9CMY' => '110,420,421,422,423',
   '=KD0QLQ' => '105,418,419',
-  '=KD4KSB' => '110,420,421,422,423',
   '=KD4POJ' => '206',
   '=KD5WEV' => '110,420,421,422,423',
   '=KD6EPD' => '105,418,419',
@@ -736,7 +775,6 @@
   '=KF5NHR' => '110,420,421,422,423',
   '=KF5PWC' => '113',
   '=KF5ULC' => '100',
-  '=KF6FAY' => '105,418,419',
   '=KF6LGK' => '110,420,421,422,423',
   '=KG0F' => '206',
   '=KG4CUY' => '206',
@@ -767,7 +805,6 @@
   '=KI4EZC' => '206',
   '=KI4FOE' => '112',
   '=KI4SP' => '206',
-  '=KI5EEE' => '113',
   '=KI6CRL' => '105,418,419',
   '=KI6DY' => '206',
   '=KI6NOC' => '105,418,419',
@@ -824,7 +861,6 @@
   '=KU4A' => '206',
   '=KU8E' => '206',
   '=KV1E' => '206',
-  '=KV2AA' => '112',
   '=KV4BT' => '112',
   '=KV4CF' => '112',
   '=KV4FZ' => '112',
@@ -836,96 +872,19 @@
   '=KY7J' => '110,420,421,422,423',
   '=KZ1W' => '206',
   '=KZ2V' => '206',
-  '=LU/UA4WHX/X' => '117,427,428',
-  '=LU1DU/D' => '117,427,428',
-  '=LU1EUU/D' => '117,427,428',
-  '=LU1EY/D' => '117,427,428',
-  '=LU1FHE/F' => '117,427,428',
-  '=LU1FSE/F' => '117,427,428',
-  '=LU1HCG/H' => '117,427,428',
-  '=LU1HPW/H' => '117,427,428',
-  '=LU1KWC/K' => '117,427,428',
-  '=LU1LT/L' => '117,427,428',
-  '=LU1QAH/Q' => '117,427,428',
-  '=LU1QHC/Q' => '117,427,428',
-  '=LU1QR/Q' => '117,427,428',
-  '=LU1XB/XA' => '117,427,428',
-  '=LU1YDC/Y' => '117,427,428',
+  '=LU1EEZ/D' => '117,427,428',
+  '=LU1EQ/D' => '117,427,428',
+  '=LU1VOF/D' => '117,427,428',
+  '=LU1XS/O' => '117,427,428',
   '=LU1ZA' => '337',
-  '=LU2AGQ/D' => '117,427,428',
-  '=LU2FP/F' => '117,427,428',
-  '=LU2HJ/H' => '117,427,428',
-  '=LU2HNV/H' => '117,427,428',
-  '=LU2KLC/K' => '117,427,428',
-  '=LU2WA/W' => '117,427,428',
-  '=LU3ARE/D' => '117,427,428',
-  '=LU3AYE/D' => '117,427,428',
-  '=LU3FCI/F' => '117,427,428',
-  '=LU3HKA/H' => '117,427,428',
-  '=LU3VMB/V' => '117,427,428',
-  '=LU3YEP/Y' => '117,427,428',
-  '=LU4DBT/D' => '117,427,428',
-  '=LU4EET/D' => '117,427,428',
-  '=LU4ETN/D' => '117,427,428',
-  '=LU4HTD/H' => '117,427,428',
-  '=LU4LAD/L' => '117,427,428',
-  '=LU4LBU/L' => '117,427,428',
-  '=LU4QQ/Q' => '117,427,428',
-  '=LU4VAU/V' => '117,427,428',
-  '=LU4VBW/V' => '117,427,428',
-  '=LU4VMB/V' => '117,427,428',
-  '=LU4VMG/V' => '117,427,428',
-  '=LU4YAB/Y' => '117,427,428',
-  '=LU5AHN/D' => '117,427,428',
-  '=LU5EAO/D' => '117,427,428',
-  '=LU5FYX/F' => '117,427,428',
-  '=LU5HR/H' => '117,427,428',
-  '=LU5HTA/H' => '117,427,428',
-  '=LU5JU/J' => '117,427,428',
-  '=LU5QAJ/Q' => '117,427,428',
-  '=LU5VAI/V' => '117,427,428',
-  '=LU5VFL/V' => '117,427,428',
-  '=LU5VLB/V' => '117,427,428',
+  '=LU2DT/D' => '117,427,428',
   '=LU5YF/V' => '117,427,428',
-  '=LU6FE/F' => '117,427,428',
-  '=LU6HCA/H' => '117,427,428',
-  '=LU6KAQ/K' => '117,427,428',
-  '=LU6QAN/Q' => '117,427,428',
-  '=LU6QB/Q' => '117,427,428',
-  '=LU6QER/Q' => '117,427,428',
-  '=LU6QI/Q' => '117,427,428',
-  '=LU6VAC/V' => '117,427,428',
-  '=LU6VDT/V' => '117,427,428',
-  '=LU6VFL/V' => '117,427,428',
-  '=LU6VR/V' => '117,427,428',
-  '=LU6YBK/Y' => '117,427,428',
   '=LU7DOT/D' => '117,427,428',
-  '=LU7DSY/D' => '117,427,428',
-  '=LU7FCU/F' => '117,427,428',
   '=LU7FM/F' => '117,427,428',
-  '=LU7FOE/F' => '117,427,428',
-  '=LU7HW/H' => '117,427,428',
-  '=LU7KT/K' => '117,427,428',
-  '=LU7QBE/Q' => '117,427,428',
-  '=LU7VBT/V' => '117,427,428',
-  '=LU7VFG/V' => '117,427,428',
-  '=LU7YCL/Y' => '117,427,428',
-  '=LU8ATM/D' => '117,427,428',
   '=LU8DCH/D' => '117,427,428',
-  '=LU8DWR/D' => '117,427,428',
   '=LU8DZE/D' => '117,427,428',
-  '=LU8FAB/F' => '117,427,428',
-  '=LU8IEZ/I' => '117,427,428',
-  '=LU8YMP/Y' => '117,427,428',
-  '=LU9AOS/D' => '117,427,428',
-  '=LU9EI/D' => '117,427,428',
-  '=LU9QRV/Q' => '117,427,428',
-  '=LW3DG/D' => '117,427,428',
-  '=LW3DN/D' => '117,427,428',
-  '=LW4HTA/H' => '117,427,428',
-  '=LW5DUS/D' => '117,427,428',
-  '=LW6EGE/D' => '117,427,428',
-  '=LW7EDH/D' => '117,427,428',
+  '=LU9JLV/J' => '117,427,428',
+  '=LW5EOL/D' => '117,427,428',
   '=MA1FJM' => '381',
   '=MM0LSM' => '381',
   '=MM0XAU' => '381',
@@ -939,42 +898,71 @@
   '=MM6SJK' => '381',
   '=MS0ZCG' => '381',
   '=MS0ZET' => '381',
+  '=MV0AEL' => '66',
   '=MV0ALS' => '62',
   '=MV0ASP' => '63',
+  '=MV0BLM' => '66',
+  '=MV0DXH' => '64,381',
   '=MV0EDX' => '66',
+  '=MV0FME' => '64,381',
   '=MV0FMF' => '64,381',
   '=MV0GGB' => '62',
   '=MV0GHM' => '64,381',
   '=MV0GWT' => '66',
+  '=MV0GXE' => '66',
+  '=MV0HAR' => '64,381',
+  '=MV0IML' => '66',
+  '=MV0IOU' => '62',
   '=MV0JFC' => '62',
   '=MV0JLC' => '62',
   '=MV0LGS' => '64,381',
+  '=MV0LLK' => '66',
   '=MV0MOD' => '62',
   '=MV0MSR' => '62',
+  '=MV0MVP' => '62',
   '=MV0NFC' => '64,381',
   '=MV0NJS' => '64,381',
+  '=MV0PJJ' => '66',
+  '=MV0PJJ/P' => '66',
+  '=MV0RRD' => '66',
+  '=MV0SGD' => '66',
+  '=MV0SGQ' => '64,381',
+  '=MV0SGR' => '66',
+  '=MV0SJT' => '64,381',
+  '=MV0TBB' => '66',
   '=MV0TDQ' => '66',
+  '=MV0TGO' => '62',
   '=MV0UAA' => '66',
   '=MV0USK' => '66',
   '=MV0VAX' => '62',
+  '=MV0VRQ' => '66',
   '=MV0WGM' => '62',
   '=MV0WYN' => '66',
   '=MV0XXW' => '64,381',
+  '=MV0ZAO' => '62',
+  '=MV1CFA' => '66',
   '=MV1CFN' => '66',
   '=MV1VOX' => '62',
+  '=MV1VTB' => '64,381',
   '=MV3BRR' => '64,381',
+  '=MV3CVB' => '64,381',
   '=MV3RNI' => '66',
   '=MV3YHA' => '64,381',
+  '=MV3YLX' => '61',
+  '=MV3YMU' => '64,381',
   '=MV5PSL' => '64,381',
   '=MV6BJJ' => '64,381',
+  '=MV6CQN' => '66',
   '=MV6DTE' => '62',
+  '=MV6GTY' => '62',
   '=MV6GWR' => '66',
+  '=MV6GWR/P' => '66',
   '=MV6KSJ' => '64,381',
   '=MV6NIR' => '62',
+  '=MV6NRQ' => '64,381',
   '=MV6TLG' => '62',
   '=MV6URC' => '66',
   '=MV6ZOL' => '66',
-  '=N0RZT' => '206',
   '=N0XCW' => '110,420,421,422,423',
   '=N1CC' => '206',
   '=N1JM' => '206',
@@ -999,6 +987,7 @@
   '=N4AU' => '206',
   '=N4BCB' => '206',
   '=N4BCD' => '206',
+  '=N4CC' => '206',
   '=N4DW' => '206',
   '=N4FZ' => '206',
   '=N4HAI' => '206',
@@ -1027,7 +1016,6 @@
   '=N6CGA' => '105,418,419',
   '=N6QBK' => '105,418,419',
   '=N6SPP' => '110,420,421,422,423',
-  '=N7CLW' => '105,418,419',
   '=N7DR' => '206',
   '=N7EO' => '206',
   '=N7FLT' => '206',
@@ -1103,35 +1091,25 @@
   '=NY6DX' => '206',
   '=NY7Z' => '105,418,419',
   '=OJ1ABOA' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
-  '=PA3BXR/MILL' => '132',
-  '=PA6KMS/MILL' => '132',
-  '=PA6MZD/MILL' => '132',
-  '=PA6STAR/MILL' => '132',
-  '=PD0ARI/MILL' => '132',
-  '=PD1JL/MILL' => '132',
-  '=PH4RTM/MILL' => '132',
-  '=PI4ET/MILL' => '132',
-  '=PI4ETL/MILL' => '132',
+  '=R01DTV/2' => '171',
   '=R27UFA' => '172,523,528',
   '=R2MWO' => '171',
-  '=R4WAB/9/P' => '172,523,528',
   '=R863LC' => '169,516,517,518,519',
+  '=R863LX' => '169,516,517,518,519',
   '=R88EPC' => '169,516,517,518,519',
-  '=R8OA/9/P' => '172,523,528',
   '=R95PW' => '169,516,517,518,519',
-  '=R9OOO/9/P' => '172,523,528',
-  '=R9OY/9/P' => '172,523,528',
   '=RA/DL6XK' => '172,523,528',
   '=RA/KE5JA' => '172,523,528',
-  '=RA/UR5HVR' => '172,523,528',
   '=RA27FM' => '169,516,517,518,519',
   '=RA27TR' => '172,523,528',
+  '=RD9CX/6/P' => '169,516,517,518,519',
   '=RI1ANA' => '339',
   '=RI1ANF' => '339',
   '=RI1ANF/P' => '339',
   '=RI1ANP' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=RI1ANR' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=RI1ANU' => '339',
+  '=RK9UR/1' => '170',
   '=RU27FQ' => '169,516,517,518,519',
   '=RU27FW' => '169,516,517,518,519',
   '=RU27WB' => '172,523,528',
@@ -1139,9 +1117,6 @@
   '=RU27WN' => '172,523,528',
   '=RU27WO' => '172,523,528',
   '=RU2FB/6/P' => '169,516,517,518,519',
-  '=RW9WJ/4/P' => '169,516,517,518,519',
-  '=RZ9DX/9/P' => '172,523,528',
-  '=SV0XBN/9' => '148',
   '=SV0XCA/5' => '147',
   '=SV0XCC/9' => '148',
   '=SV2ASP/A' => '149',
@@ -1149,7 +1124,6 @@
   '=TA1BM/3' => '155',
   '=TA1BZ/2' => '155',
   '=TA1D/3' => '155',
-  '=TA1FA/2' => '155',
   '=TO1PF' => '50,51,379,53',
   '=TO1PF/P' => '50,51,379,53',
   '=TO5A' => '46',
@@ -1157,21 +1131,21 @@
   '=TO5T' => '46',
   '=TO7A' => '46',
   '=TX5K' => '48',
+  '=UA9AOY/1' => '170',
+  '=UE80RWW' => '169,516,517,518,519',
   '=VA2PL' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2DXY' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2EKA' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2ENB' => '187,543,544,545,546,547,548,549,550,551',
-  '=VE2EW' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2FK' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2GSO' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2IM' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2KK' => '187,543,544,545,546,547,548,549,550,551',
-  '=VE3GNO/2' => '187,543,544,545,546,547,548,549,550,551',
-  '=VER20130625' => '187,543,544,545,546,547,548,549,550,551',
-  '=VERSION' => '259',
-  '=VI103WIA' => '188,565,566,567,568,569,570,571,572',
+  '=VE2XB/3' => '187,543,544,545,546,547,548,549,550,551',
+  '=VE3AX/7' => '187,543,544,545,546,547,548,549,550,551',
+  '=VER20130802' => '187,543,544,545,546,547,548,549,550,551',
+  '=VERSION' => '287,652',
   '=VK0IR' => '189',
-  '=VK9DAC' => '331',
   '=VP6DX' => '314',
   '=VP8ADE/B' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VP8DLM' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
@@ -1211,6 +1185,7 @@
   '=W4JHC' => '206',
   '=W4JSI' => '206',
   '=W4KW' => '206',
+  '=W4L' => '113',
   '=W4LC' => '206',
   '=W4NBS' => '206',
   '=W4NZ' => '206',
@@ -1221,7 +1196,6 @@
   '=W4UAL' => '206',
   '=W4UAT' => '206',
   '=W4UT' => '206',
-  '=W5DQ' => '206',
   '=W5JR' => '206',
   '=W5MX' => '206',
   '=W5NZ' => '206',
@@ -1236,6 +1210,7 @@
   '=W6LFB' => '206',
   '=W6NWS' => '206',
   '=W6UB' => '206',
+  '=W6XR' => '206',
   '=W7DO' => '206',
   '=W7HJ' => '206',
   '=W7IY' => '206',
@@ -1320,7 +1295,7 @@
   '=WY7SS' => '206',
   '=WZ4F' => '206',
   '=WZ7I' => '206',
-  '=YU8/IV3LAR' => '321',
+  '=YD1BZW/YL' => '216,635,636',
   'A2' => '1',
   'A3' => '2',
   'A4' => '3',
@@ -4385,8 +4360,6 @@
   'PP0T' => '137',
   'PP1' => '460',
   'PP2' => '461',
-  'PP3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PP4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PP5' => '477',
   'PP6' => '479',
   'PP7' => '455',
@@ -4398,8 +4371,6 @@
   'PQ0S' => '136',
   'PQ0T' => '137',
   'PQ2' => '480',
-  'PQ3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PQ4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PQ8' => '456',
   'PR' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PR0F' => '135',
@@ -4407,8 +4378,6 @@
   'PR0R' => '135',
   'PR0S' => '136',
   'PR0T' => '137',
-  'PR3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PR4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PR7' => '468',
   'PR8' => '469',
   'PS' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
@@ -4417,8 +4386,6 @@
   'PS0R' => '135',
   'PS0S' => '136',
   'PS0T' => '137',
-  'PS3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PS4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PS7' => '472',
   'PS8' => '471',
   'PT' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
@@ -4428,8 +4395,6 @@
   'PT0S' => '136',
   'PT0T' => '137',
   'PT2' => '462',
-  'PT3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PT4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PT7' => '459',
   'PT8' => '454',
   'PT9' => '464',
@@ -4439,16 +4404,12 @@
   'PU0R' => '135',
   'PU0S' => '136',
   'PU0T' => '137',
-  'PU3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PU4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PV' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PV0F' => '135',
   'PV0M' => '137',
   'PV0R' => '135',
   'PV0S' => '136',
   'PV0T' => '137',
-  'PV3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PV4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PV8' => '476',
   'PW' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PW0F' => '135',
@@ -4456,8 +4417,6 @@
   'PW0R' => '135',
   'PW0S' => '136',
   'PW0T' => '137',
-  'PW3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PW4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PW8' => '475',
   'PX' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PX0F' => '135',
@@ -4465,8 +4424,6 @@
   'PX0R' => '135',
   'PX0S' => '136',
   'PX0T' => '137',
-  'PX3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'PX4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PY' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'PY0' => '135,136,137',
   'PY0F' => '135',
@@ -4497,7 +4454,6 @@
   'R1O' => '169,516,517,518,519',
   'R1P' => '169,516,517,518,519',
   'R1Z' => '169,516,517,518,519',
-  'R290' => '169,516,517,518,519',
   'R2F' => '171',
   'R2K' => '171',
   'R3' => '517',
@@ -4540,7 +4496,6 @@
   'RA1P' => '169,516,517,518,519',
   'RA1Z' => '169,516,517,518,519',
   'RA2' => '171',
-  'RA27' => '169,516,517,518,519',
   'RA3' => '517',
   'RA4' => '518',
   'RA4H' => '169,516,517,518,519',
@@ -7017,16 +6972,12 @@
   'ZV0R' => '135',
   'ZV0S' => '136',
   'ZV0T' => '137',
-  'ZV3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'ZV4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'ZW' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'ZW0F' => '135',
   'ZW0M' => '137',
   'ZW0R' => '135',
   'ZW0S' => '136',
   'ZW0T' => '137',
-  'ZW3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'ZW4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'ZX' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'ZX0F' => '135',
   'ZX0M' => '137',
@@ -7035,7 +6986,6 @@
   'ZX0T' => '137',
   'ZX2' => '478',
   'ZX3' => '473',
-  'ZX4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'ZX5' => '477',
   'ZX7' => '472',
   'ZY' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
@@ -7046,8 +6996,6 @@
   'ZY0T' => '137',
   'ZY0Z' => '135',
   'ZY1' => '474',
-  'ZY3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'ZY4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'ZY7' => '459',
   'ZZ' => '481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   'ZZ0F' => '135',
@@ -7055,8 +7003,6 @@
   'ZZ0R' => '135',
   'ZZ0S' => '136',
   'ZZ0T' => '137',
-  'ZZ3' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  'ZZ4' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
 );
 
 

diff --git a/perl/Internet.pm b/perl/Internet.pm
index 89ef472129644914c8b1f21d8f40146e6c5d7037..937886008d87e4e93ec7c647445078fb8ca9ffb0 100644 (file)
--- a/perl/Internet.pm
+++ b/perl/Internet.pm
@@ -70,8 +70,8 @@ $db0sdx_url = 'www.qslinfo.de'; # used by show/db0sdx
 $db0sdx_path = '/qslinfo';
 $db0sdx_suffix = '.asmx';
 $dx425_url = 'www.ariscandicci.it';            # used by show/425
-$contest_host = 'www.sk3bg.se';         # used by show/contest
-$contest_url = "http://$contest_host/contest/text";         # used by show/contest
+#$contest_host = 'www.sk3bg.se';         # used by show/contest
+#$contest_url = "/contest/text";         # used by show/contest
 
 #SHOW/IK3QAR <callsign> Show the 5 most recent informations found on IK3QAR
 ##Callsign Database about QSL Manager, Manager address and comments. This