restore old dx spot format, add CTY-3127 prefixes

author Dirk Koopman <djk@tobit.co.uk>

Fri, 26 Nov 2021 01:20:26 +0000 (01:20 +0000)

committer Dirk Koopman <djk@tobit.co.uk>

Fri, 26 Nov 2021 01:20:26 +0000 (01:20 +0000)
author Dirk Koopman <djk@tobit.co.uk>
Fri, 26 Nov 2021 01:20:26 +0000 (01:20 +0000)
committer Dirk Koopman <djk@tobit.co.uk>
Fri, 26 Nov 2021 01:20:26 +0000 (01:20 +0000)
diff --git a/Changes b/Changes

index 2a0b26c8b02b964e71018388ba55418732684745..67bf4dc74958980dd783d2c290274079fd5a8e7d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+25Nov21=======================================================================
+1. Restored spot format back to the way it was.
+2. Added CTY-3127 prefixes
  24Nov21=======================================================================
  1. Make /spider/perl/create_sysop.pl work on a base git cloned tree.
  2. Add /spider/local /spider/local_cmd /spider/local_data to git. 
diff --git a/cmd/dx.pl b/cmd/dx.pl

index c18a2df372f9d7751e8df8adcc7182a611b8ab64..97ed605f40000c326d33f8380e3c52731560ee52 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -141,6 +141,8 @@ my $t = (int ($main::systime/60)) * 60;
  return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
  my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall, $ipaddr);
  
+#$DB::single = 1;
+
  if ($freq =~ /^69/ || $localonly) {
  
         # heaven forfend that we get a 69Mhz band :-)
@@ -149,21 +151,24 @@ if ($freq =~ /^69/ || $localonly) {
         }
  
         $self->dx_spot(undef, undef, @spot);
+
         return (1);
  } else {
-       if (@spot) {
-               # store it 
-               Spot::add(@spot);
-
                 # send orf to the users
-               my $spot;
-
-               if ($ipaddr) {
-                       $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
-               } else {
-                       $spot = DXProt::pc11($spotter, $freq, $spotted, $line);
-               }
+       my $spot;
  
+       if ($ipaddr) {
+               $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
+       } else {
+               $spot = DXProt::pc11($spotter, $freq, $spotted, $line);
+       }
+       
+       $self->dx_spot(undef, undef, @spot);
+       if ($self->isslugged) {
+               push @{$self->{sluggedpcs}}, [61, $spot, \@spot];
+       } else {
+               # store in spots database 
+               Spot::add(@spot);
                 DXProt::send_dx_spot($self, $spot, @spot);
         }
  }
diff --git a/data/cty.dat b/data/cty.dat

index c245cfeb9f1ed126e2db41ccd0d97e00a5dac885..da81a1342eb0b4de445252ccbd5be2694ddb7887 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -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:
      9M,9W;
  East Malaysia:            28:  54:  OC:    2.68:  -113.32:    -8.0:  9M6:
-    9M6,9M8,9W6,9W8,=9M4CAK,=9M4CKT,=9M4CKT/6,=9M4CRP,=9M4CWS,=9M7DX;
+    9M6,9M8,9W6,9W8,=9M4CAK,=9M4CKT,=9M4CRP,=9M4CWS,=9M7DX;
  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:
@@ -277,7 +277,7 @@ China:                    24:  44:  AS:   36.00:  -102.00:    -8.0:  BY:
      BZ8N[43],BZ8O[43],BZ8P[43],BZ8Q[43],BZ8R[43],BZ8S[43],BZ8T[43],BZ8U[43],
      BZ8V[43],BZ8W[43],BZ8X[43],BZ9A(24)[43],BZ9B(24)[43],BZ9C(24)[43],
      BZ9D(24)[43],BZ9E(24)[43],BZ9F(24)[43],BZ9S(23)[42],BZ9T(23)[42],
-    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42],=BG3PUX/Q;
+    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42];
  Nauru:                    31:  65:  OC:   -0.52:  -166.92:   -12.0:  C2:
      C2;
  Andorra:                  14:  27:  EU:   42.58:    -1.62:    -1.0:  C3:
@@ -304,10 +304,10 @@ Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
      FT3Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT6Y(30)[70],FT7Y(30)[70],
      FT8Y(30)[70],LU1Z[73],LU2Z[73],LU3Z[73],LU4Z[73],LU5Z[73],LU6Z[73],
      LU7Z[73],LU8Z[73],LU9Z[73],RI1AN(29)[69],VI0(39)[69],VK0(39)[69],
-    ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],=8J1RL(39)[67],=DP0GVN(38)[67],
-    =DP1POL(38)[67],=KC4AAA(39),=KC4AAC[73],=KC4USB(12),=KC4USN(30),
-    =KC4USV(30)[71],=RI1ANC(29)[70],=RI1ANR(38)[67],=RI60ANT(38)[67],
-    =VP8AL[73];
+    ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],=FT4YM/P(29),=8J1RL(39)[67],
+    =DP0GVN(38)[67],=DP1POL(38)[67],=KC4AAA(39),=KC4AAC[73],=KC4USB(12),
+    =KC4USN(30),=KC4USV(30)[71],=RI1ANC(29)[70],=RI1ANR(38)[67],
+    =RI60ANT(38)[67],=VP8/SQ1SGB[73];
  Cuba:                     08:  11:  NA:   21.50:    80.00:     5.0:  CM:
      CL,CM,CO,T4;
  Morocco:                  33:  37:  AF:   32.00:     5.00:     0.0:  CN:
@@ -350,10 +350,9 @@ Niue:                     32:  62:  OC:  -19.03:   169.85:    11.0:  E6:
  Bosnia-Herzegovina:       15:  28:  EU:   44.32:   -17.57:    -1.0:  E7:
      E7;
  Spain:                    14:  37:  EU:   40.32:     3.43:    -1.0:  EA:
-    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EA2EZ/P,=EA5CC/P,=EA5IKT/P,=EA6AOL/3,
-    =EA9HU,=EA9PD/P;
+    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EA5CC/P,=EA5IKT/P,=EA5RCK/CDI,=EA9HU;
  Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
-    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EA6LU/P;
+    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6;
  Canary Islands:           33:  36:  AF:   28.32:    15.85:     0.0:  EA8:
      AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8;
  Ceuta & Melilla:          33:  37:  AF:   35.90:     5.27:    -1.0:  EA9:
@@ -427,17 +426,17 @@ 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,=TO1A;
  England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
-    2E,G,M;
+    2E,2ZE,G,M;
  Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
      2D,GD,GT,MD,MT;
  Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
-    2I,GI,GN,MI,MN,=GB3NGI,=GB9BOB;
+    2I,GI,GN,MI,MN,=GB3NGI,=GB8LWF;
  Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
      2J,GH,GJ,MH,MJ,=GB2JSA;
  Scotland:                 14:  27:  EU:   56.82:     4.18:     0.0:  GM:
-    2A,2M,GM,GS,MA,MM,MS,=GB0DBS,=GB0GDS,=GB0SAA,=GB0SJR,=GB0WHR,=GB1002ZE,
-    =GB100BCG,=GB1TMH,=GB2ELH,=GB2KDR,=GB2OWM,=GB2ZE,=GB3ANG,=GB3LER,
-    =GB3LER/B,=GB4GDS,=GB4LER,=GB60ANT,=GB8ROC;
+    2A,2M,GM,GS,MA,MM,MS,=GB0DBS,=GB0GDS,=GB0SJR,=GB1002ZE,=GB100BCG,=GB2ELH,
+    =GB2JCM,=GB2OWM,=GB2ZE,=GB3ANG,=GB3LER,=GB3LER/B,=GB4GDS,=GB4LER,=GB60ANT,
+    =GM3WUX/2ZE,=GM4UBJ/2ZE,=GM8IEM/2ZE;
  Shetland Islands:         14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
      =2M0BDR,=2M0BDT,=2M0CPN,=2M0GFC,=2M0SEG,=2M0SPX,=2M0ZET,=GB2ELH,=GB3LER,
      =GB3LER/B,=GB4LER,=GM0AVR,=GM0CXQ,=GM0EKM,=GM0GFL,=GM0ILB,=GM0JDB,=GM1FGN,
@@ -450,7 +449,7 @@ Shetland Islands:         14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
  Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
      2U,GP,GU,MP,MU;
  Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
-    2W,GC,GW,MC,MW,=GB0RSB,=GB1CR,=GB1MIS,=GB2TD,=GB2VK;
+    2W,GC,GW,MC,MW,=GB1MIS,=GB2TD,=GB2VK;
  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:
@@ -488,15 +487,15 @@ Vatican City:             15:  28:  EU:   41.90:   -12.47:    -1.0:  HV:
  Saudi Arabia:             21:  39:  AS:   24.20:   -43.83:    -3.0:  HZ:
      7Z,8Z,HZ;
  Italy:                    15:  28:  EU:   42.82:   -12.58:    -1.0:  I:
-    I,=4U0WFP,=4U1GSC,=4U24OCT,=4U5F,=IT9AAK/0,=IT9AAK/8,=IT9ELM/0,=IT9PQJ/0;
+    I,=4U0WFP,=4U1GSC,=4U24OCT,=4U5F,=IT9ELM/0,=IT9PQJ/0,=IT9RGY/4;
  African Italy:            33:  37:  AF:   35.67:   -12.67:    -1.0:  *IG9:
      IG9,IH9;
  Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
-    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0IADU,=II0ICH,=II0IDP,=II0M,
-    =IO0MMI,=IQ0AG,=IQ0AH,=IQ0AI,=IQ0AK,=IQ0AK/P,=IQ0AL,=IQ0AM,=IQ0EH,=IQ0HO,
-    =IQ0ID,=IQ0JY,=IQ0NU,=IQ0OG,=IQ0OH,=IQ0QP,=IQ0SS,=IY0GA;
+    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0ICH,=II0IDP,=II0M,=IO0MMI,=IQ0AG,
+    =IQ0AH,=IQ0AI,=IQ0AK,=IQ0AK/P,=IQ0AL,=IQ0AM,=IQ0EH,=IQ0HO,=IQ0ID,=IQ0JY,
+    =IQ0NU,=IQ0OG,=IQ0OH,=IQ0QP,=IQ0SS;
  Sicily:                   15:  28:  EU:   37.50:   -14.00:    -1.0:  *IT9:
-    IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9,IY9,=IQ1QQ/9;
+    IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9,IY9,=IQ1QQ/9,=IW0HBY/9;
  Djibouti:                 37:  48:  AF:   11.75:   -42.35:    -3.0:  J2:
      J2;
  Grenada:                  08:  11:  NA:   12.13:    61.68:     4.0:  J3:
@@ -529,8 +528,8 @@ Jordan:                   20:  39:  AS:   31.18:   -36.42:    -2.0:  JY:
      JY;
  United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
      AA,AB,AC,AD,AE,AF,AG,AI,AJ,AK,K,N,W,=4U1WB(5)[8],=AA0O(5)[8],=AA2IL(3)[6],
-    =AA2MA(4)[8],=AA4DD(4)[8],=AA4Q(3)[6],=AA5JF(5)[8],=AA8R(5)[8],
-    =AB4B(4)[8],=AB4GG(4)[8],=AB4IQ(4)[8],=AB8RL(5)[8],=AB8YZ(4)[7],
+    =AA2MA(4)[8],=AA4DD(4)[8],=AA4Q(3)[6],=AA4R(4)[8],=AA5JF(5)[8],
+    =AA8R(5)[8],=AB4B(4)[8],=AB4GG(4)[8],=AB8RL(5)[8],=AB8YZ(4)[7],
      =AC4CA(4)[7],=AC4G(4)[8],=AC6WI(5)[8],=AC6ZM(4)[8],=AC7AF(4)[7],
      =AC8Y(5)[8],=AC9TO(4)[7],=AD1C(4)[7],=AD4EB(4)[8],=AD4TA(4)[8],
      =AD5XI(5)[8],=AD8J(5)[8],=AE4ED(4)[8],=AE6JV(5)[8],=AE7AP(4)[6],
@@ -542,40 +541,41 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
      =K0SN(4)[6],=K0TQ(4)[8],=K0XP(3)[6],=K0ZR(5)[8],=K1DC(4)[8],=K1DW(4)[7],
      =K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],=K2DRH(4)[7],=K2GMY(3)[6],=K2KR(4)[7],
      =K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],=K2VV(4)[7],=K2YAZ(4)[8],=K3DMG(4)[8],
-    =K3EST(3)[6],=K3GP(4)[8],=K3IE(4)[8],=K3NT(4)[7],=K3PA(4)[7],=K3WT(4)[7],
-    =K3YP(4)[8],=K4AB(4)[8],=K4AFE(4)[8],=K4AMC(4)[8],=K4BWP(4)[8],
-    =K4BX(4)[8],=K4DR(4)[8],=K4DXV(4)[8],=K4FN(4)[8],=K4HAL(4)[8],=K4IU(4)[7],
-    =K4OAQ(4)[8],=K4RO(4)[8],=K4TCG(4)[8],=K4TZ(4)[8],=K4UU(4)[8],=K4WG(4)[8],
-    =K4WI(4)[8],=K4WW(4)[8],=K4XU(3)[6],=K4YJ(4)[8],=K4ZGB(4)[8],=K5EK(5)[8],
-    =K5GDX(4)[8],=K5KG(5)[8],=K5OA(3)[6],=K5VIP(5)[8],=K5ZD(5)[8],=K6ND(5)[8],
-    =K6XT(4)[7],=K6ZB(4)[7],=K7ABV(4)[6],=K7BG(4)[7],=K7BV(5)[8],=K7CS(4)[8],
-    =K7DR(4)[8],=K7GM(5)[8],=K7IA(4)[7],=K7JOE(4)[8],=K7OM(5)[8],=K7QA(4)[6],
-    =K7RB(4)[7],=K7SCX(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K8AC(5)[8],=K8ARY(5)[8],
-    =K8CN(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8LBQ(5)[8],=K8LF(5)[8],=K8LS(4)[7],
-    =K8NYG(5)[8],=K8TE(4)[7],=K8TR(3)[6],=K9CHP(5)[8],=K9DR(4)[7],=K9DU(4)[7],
-    =K9GS(5)[8],=K9JM(3)[6],=K9MK(4)[7],=K9OZ(4)[7],=K9RS(5)[8],=K9RZ(3)[6],
+    =K3EST(3)[6],=K3GP(4)[8],=K3IE(4)[8],=K3JWI(4)[8],=K3NT(4)[7],=K3PA(4)[7],
+    =K3WT(4)[7],=K3YP(4)[8],=K4AB(4)[8],=K4AFE(4)[8],=K4AMC(4)[8],
+    =K4BWP(4)[8],=K4BX(4)[8],=K4DR(4)[8],=K4DXV(4)[8],=K4FN(4)[8],
+    =K4HAL(4)[8],=K4IU(4)[7],=K4OAQ(4)[8],=K4RO(4)[8],=K4TCG(4)[8],
+    =K4TG(4)[8],=K4TZ(4)[8],=K4UU(4)[8],=K4WG(4)[8],=K4WI(4)[8],=K4WW(4)[8],
+    =K4XU(3)[6],=K4YJ(4)[8],=K4ZGB(4)[8],=K5EK(5)[8],=K5GDX(4)[8],=K5KG(5)[8],
+    =K5OA(3)[6],=K5VIP(5)[8],=K5ZD(5)[8],=K6ND(5)[8],=K6XT(4)[7],=K6ZB(4)[7],
+    =K7ABV(4)[6],=K7BG(4)[7],=K7BV(5)[8],=K7CS(4)[8],=K7DR(4)[8],=K7GM(5)[8],
+    =K7IA(4)[7],=K7JOE(4)[8],=K7OM(5)[8],=K7QA(4)[6],=K7RB(4)[7],=K7SCX(4)[7],
+    =K7SV(5)[8],=K7TD(4)[7],=K8AC(5)[8],=K8ARY(5)[8],=K8CN(5)[8],=K8IA(3)[6],
+    =K8JQ(5)[8],=K8LBQ(5)[8],=K8LF(5)[8],=K8LS(4)[7],=K8NYG(5)[8],=K8TE(4)[7],
+    =K8TR(3)[6],=K9CHP(5)[8],=K9DR(4)[7],=K9DU(4)[7],=K9GS(5)[8],=K9JM(3)[6],
+    =K9MK(4)[7],=K9MWM(4)[7],=K9OZ(4)[7],=K9PY(3)[6],=K9RS(5)[8],=K9RZ(3)[6],
      =K9WA(4)[7],=K9YC(3)[6],=KA3MTT(4)[8],=KA4GAV(4)[7],=KA4OTB(4)[7],
      =KA7PNH(4)[7],=KA8HDE(4)[7],=KA8Q(5)[8],=KA9FOX(4)[7],=KA9VVQ(4)[7],
      =KB2S(3)[6],=KB4QZH(4)[8],=KB9S(4)[7],=KC2LM(4)[7],=KC4HW(4)[8],
      =KC4NX(4)[8],=KC4SAW(4)[8],=KC4TEO(4)[8],=KC4WQ(4)[8],=KC7QY(4)[7],
      =KC8GCR(5)[8],=KC8J(3)[6],=KC9K(4)[7],=KD0EE(4)[8],=KD2KW(4)[7],
-    =KD4EE(4)[8],=KD4TRG(4)[8],=KD5DD(4)[8],=KD9QS(5)[8],=KE0L(4)[8],
-    =KE0YI(4)[8],=KE1B(3)[6],=KE2VB(3)[6],=KE3K(4)[8],=KE4KY(4)[8],
-    =KE8FT(3)[6],=KF5BA(4)[8],=KF5MU(4)[8],=KG0F(3)[6],=KG4CUY(4)[8],
-    =KG5HVO(4)[8],=KH2AR(4)[7],=KH2BR(3)[6],=KH2D(5)[8],=KH2GM(4)[8],
-    =KH2PM(5)[8],=KH2SR(3)[6],=KH2TJ(3)[6],=KH6CT(5)[8],=KH6GK(3)[6],
-    =KH6M(5)[8],=KH6VM(3)[6],=KH6XS(3)[6],=KH7FC(5)[8],=KI6DY(4)[8],
-    =KI6QDH(4)[7],=KI8I(5)[8],=KJ4AOM(4)[8],=KJ4M(4)[8],=KJ9C(4)[6],
-    =KK9A(5)[8],=KK9N(4)[7],=KL0SS(5)[8],=KL1SE(4)[8],=KL2AX(4)[7],
-    =KL7DJ(3)[6],=KL7HQR(3)[6],=KL7IKV(3)[6],=KL7NW(4)[7],=KL7QW(4)[7],
-    =KL7SK(3)[6],=KM4CH(4)[8],=KM4FO(4)[8],=KM4JA(4)[8],=KM4JAK(4)[8],
-    =KM4RO(4)[8],=KM6Z(4)[8],=KM7W(4)[6],=KN1CBR(4)[7],=KO4OL(4)[8],
-    =KO4Z(4)[8],=KO8SCA(5)[8],=KO8V(5)[8],=KO9V(4)[7],=KP2X(4)[7],=KP3M(5)[8],
-    =KP3U(5)[8],=KP4MD(3)[6],=KR4F(4)[8],=KS0CW(5)[8],=KS4X(4)[8],=KS7T(4)[6],
-    =KS9W(4)[7],=KT3M(4)[7],=KU1CW(3)[6],=KU8E(5)[8],=KV3T(4)[8],=KV8S(4)[7],
-    =KW4J(4)[8],=KW4YA(4)[8],=KW7Q(4)[7],=KX2P(4)[7],=KX4X(4)[8],=KY0Q(4)[8],
-    =KY0W(3)[6],=KZ1W(3)[6],=KZ4KX(4)[8],=KZ9V(4)[7],=N0SMX(5)[8],=N0YY(5)[8],
-    =N2AU(3)[6],=N2BJ(4)[8],=N2IC(4)[7],=N2JNR(3)[6],=N2NL(4)[8],=N3BB(4)[7],
+    =KD4EE(4)[8],=KD4TRG(4)[8],=KD5DD(4)[8],=KD7RF(4)[8],=KD9QS(5)[8],
+    =KE0L(4)[8],=KE0YI(4)[8],=KE1B(3)[6],=KE2VB(3)[6],=KE3K(4)[8],
+    =KE4KY(4)[8],=KE8FT(3)[6],=KF5BA(4)[8],=KF5MU(4)[8],=KG0F(3)[6],
+    =KG4CUY(4)[8],=KG5HVO(4)[8],=KH2AR(4)[7],=KH2BR(3)[6],=KH2D(5)[8],
+    =KH2GM(4)[8],=KH2PM(5)[8],=KH2SR(3)[6],=KH2TJ(3)[6],=KH6CT(5)[8],
+    =KH6GK(3)[6],=KH6M(5)[8],=KH6VM(3)[6],=KH6XS(3)[6],=KH7FC(5)[8],
+    =KI6DY(4)[8],=KI6QDH(4)[7],=KI8I(5)[8],=KJ4AOM(4)[8],=KJ4M(4)[8],
+    =KJ9C(4)[6],=KK9A(5)[8],=KK9N(4)[7],=KL0SS(5)[8],=KL1SE(4)[8],
+    =KL2AX(4)[7],=KL7DJ(3)[6],=KL7HQR(3)[6],=KL7IKV(3)[6],=KL7NW(4)[7],
+    =KL7QW(4)[7],=KL7SK(3)[6],=KM4CH(4)[8],=KM4FO(4)[8],=KM4JA(4)[8],
+    =KM4JAK(4)[8],=KM4RO(4)[8],=KM6Z(4)[8],=KM7W(4)[6],=KN1CBR(4)[7],
+    =KO4OL(4)[8],=KO4Z(4)[8],=KO8SCA(5)[8],=KO8V(5)[8],=KO9V(4)[7],
+    =KP2X(4)[7],=KP3M(5)[8],=KP3U(5)[8],=KP4MD(3)[6],=KR4F(4)[8],=KS0CW(5)[8],
+    =KS4X(4)[8],=KS7T(4)[6],=KS9W(4)[7],=KT3M(4)[7],=KT4O(4)[8],=KU1CW(3)[6],
+    =KU8E(5)[8],=KV3T(4)[8],=KV8S(4)[7],=KW4J(4)[8],=KW4YA(4)[8],=KW7Q(4)[7],
+    =KX2P(4)[7],=KX4X(4)[8],=KY0Q(4)[8],=KY0W(3)[6],=KZ1W(3)[6],=KZ9V(4)[7],
+    =N0YY(5)[8],=N2BJ(4)[8],=N2IC(4)[7],=N2JNR(3)[6],=N2NL(4)[8],=N3BB(4)[7],
      =N3CI(4)[7],=N3RA(4)[8],=N3RC(3)[6],=N3ZZ(3)[6],=N4ARO(4)[8],=N4AU(4)[8],
      =N4BAA(4)[8],=N4BCD(4)[8],=N4DW(4)[8],=N4EL(4)[8],=N4HAI(4)[8],
      =N4JRG(4)[8],=N4KH(4)[8],=N4NO(4)[8],=N4OGW(4)[8],=N4QS(4)[8],=N4SS(4)[8],
@@ -588,18 +588,19 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
      =N8NA(5)[8],=N8NN(5)[8],=N8OO(4)[7],=N8RA(5)[8],=N8WXQ(5)[8],=N9CIQ(4)[7],
      =N9GB(4)[7],=N9HDE(4)[7],=N9JF(4)[7],=N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],
      =N9NM(4)[7],=N9OU(5)[8],=N9RV(4)[6],=N9SB(4)[7],=N9TX(4)[7],=N9VPV(4)[7],
-    =NA4A(4)[8],=NA5NN(4)[8],=ND2T(3)[6],=ND3N(4)[8],=ND4Y(4)[8],=NE8P(5)[8],
-    =NE9U(4)[7],=NF4J(4)[8],=NG7A(4)[7],=NH6L(4)[7],=NH6PK(4)[8],=NH6T(4)[8],
-    =NH6Z(3)[6],=NI7R(5)[8],=NJ4P(4)[8],=NJ8J(5)[8],=NJ8M(4)[7],=NK8Q(5)[8],
-    =NL7CQ(4)[7],=NL7D(3)[6],=NL7P(5)[8],=NL7QC(4)[7],=NL7WA(5)[8],
-    =NL7XM(5)[8],=NL7XT(4)[8],=NN1N(4)[7],=NN4NT(4)[8],=NN5O(4)[8],
-    =NN7A(4)[7],=NN7CW(5)[8],=NN9DD(5)[8],=NO9E(5)[8],=NP2GG(5)[8],
-    =NP3FB(4)[8],=NP3K(5)[8],=NQ6N(4)[8],=NR4L(4)[8],=NR7DX(4)[6],=NS4X(4)[8],
-    =NT0K(5)[8],=NV4B(4)[8],=NW8U(5)[8],=NX1P(3)[6],=NY6DX(5)[8],=NZ7Q(4)[7],
-    =W0BR(5)[8],=W0NA(5)[8],=W0PV(5)[8],=W0QQG(5)[8],=W0RIC(3)[6],=W0YK(3)[6],
-    =W0ZP(4)[8],=W1NN(4)[8],=W1PR(3)[6],=W1RH(3)[6],=W1SRD(3)[6],=W2GS(4)[7],
-    =W2UP(4)[7],=W2VJN(3)[6],=W3CB(4)[8],=W3HDH(4)[8],=W3HKK(4)[8],
-    =W3NX(3)[6],=W3TB(4)[8],=W4BCG(4)[8],=W4DAN(4)[8],=W4EF(3)[6],=W4ER(4)[8],
+    =NA2U(3)[6],=NA4A(4)[8],=NA5NN(4)[8],=ND2T(3)[6],=ND3N(4)[8],=ND4Y(4)[8],
+    =NE8P(5)[8],=NE9U(4)[7],=NF4J(4)[8],=NG7A(4)[7],=NH6L(4)[7],=NH6PK(4)[8],
+    =NH6T(4)[8],=NH6Z(3)[6],=NI7R(5)[8],=NJ4P(4)[8],=NJ8J(5)[8],=NJ8M(4)[7],
+    =NK8Q(5)[8],=NL7CQ(4)[7],=NL7D(3)[6],=NL7P(5)[8],=NL7QC(4)[7],
+    =NL7WA(5)[8],=NL7XM(5)[8],=NL7XT(4)[8],=NN1N(4)[7],=NN4NT(4)[8],
+    =NN5O(4)[8],=NN7A(4)[7],=NN7CW(5)[8],=NN9DD(5)[8],=NO9E(5)[8],
+    =NP2GG(5)[8],=NP2JV(5)[8],=NP3FB(4)[8],=NP3K(5)[8],=NQ6N(4)[8],
+    =NR4L(4)[8],=NR7DX(4)[6],=NS4X(4)[8],=NT0K(5)[8],=NV4B(4)[8],=NW8U(5)[8],
+    =NX1P(3)[6],=NY6DX(5)[8],=NZ7Q(4)[7],=W0BR(5)[8],=W0NA(5)[8],=W0PV(5)[8],
+    =W0QQG(5)[8],=W0RIC(3)[6],=W0YK(3)[6],=W0ZP(4)[8],=W1NN(4)[8],=W1PR(3)[6],
+    =W1RH(3)[6],=W1SRD(3)[6],=W2ACY(4)[7],=W2GS(4)[7],=W2UP(4)[7],
+    =W2VJN(3)[6],=W3CB(4)[8],=W3HDH(4)[8],=W3HKK(4)[8],=W3NX(3)[6],
+    =W3TB(4)[8],=W4BCG(4)[8],=W4DAN(4)[8],=W4EF(3)[6],=W4ER(4)[8],
      =W4GKM(4)[8],=W4JSI(4)[8],=W4KW(4)[8],=W4LC(4)[8],=W4NBS(4)[8],
      =W4NNF(4)[8],=W4NZ(4)[8],=W4PA(4)[8],=W4PF(4)[8],=W4SSF(4)[8],
      =W4TLK(4)[8],=W4UT(4)[8],=W4UWC(4)[8],=W5MX(4)[8],=W5NZ(4)[8],=W5UJ(3)[6],
@@ -610,8 +611,8 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
      =W8FN(5)[8],=W8HAP(5)[8],=W8LYJ(4)[7],=W8OV(4)[7],=W8TK(3)[6],=W9CF(3)[6],
      =W9DC(5)[8],=W9ET(4)[7],=W9JA(4)[7],=W9KKN(3)[6],=W9RNY(4)[7],
      =WA0LJM(5)[8],=WA0WWW(3)[6],=WA1FCN(4)[8],=WA1FMM(4)[7],=WA1UJU(4)[8],
-    =WA2VYA(4)[7],=WA3C(4)[8],=WA5POK(4)[8],=WA8KAN(5)[8],=WA8OJR(5)[8],
-    =WA8ZBT(4)[7],=WB3JFS(3)[6],=WB4YDL(4)[8],=WB4YDY(4)[8],=WB5WAJ(4)[8],
+    =WA2VYA(4)[7],=WA3C(4)[8],=WA4JA(4)[8],=WA5POK(4)[8],=WA8KAN(5)[8],
+    =WA8OJR(5)[8],=WA8ZBT(4)[7],=WB4YDL(4)[8],=WB4YDY(4)[8],=WB5WAJ(4)[8],
      =WB7GR(4)[7],=WB8YYY(5)[8],=WC7S(4)[7],=WE5P(4)[8],=WE6EZ(4)[7],
      =WF7T(4)[8],=WF9A(5)[8],=WH0AI(4)[7],=WH6AQ(5)[8],=WH6FZY(3)[6],
      =WH6LE(5)[8],=WH7R(4)[7],=WJ9B(3)[6],=WL5H(4)[7],=WL7OU(4)[7],
@@ -627,7 +628,7 @@ Mariana Islands:          27:  64:  OC:   15.18:  -145.72:   -10.0:  KH0:
  Baker & Howland Islands:  31:  61:  OC:    0.00:   176.00:    12.0:  KH1:
      AH1,KH1,NH1,WH1;
  Guam:                     27:  64:  OC:   13.37:  -144.70:   -10.0:  KH2:
-    AH2,KH2,NH2,WH2,=AH0IM,=KA1I,=KC2IIT,=KF7BMU,=KG6DX,=KG6JDX,=KH6KK;
+    AH2,KH2,NH2,WH2,=AH0IM,=KA1I,=KC2IIT,=KF7BMU,=KG6DX,=KG6JDX,=WA0OII;
  Johnston Island:          31:  61:  OC:   16.72:   169.53:    10.0:  KH3:
      AH3,KH3,NH3,WH3;
  Midway Island:            31:  61:  OC:   28.20:   177.37:    11.0:  KH4:
@@ -635,13 +636,13 @@ Midway Island:            31:  61:  OC:   28.20:   177.37:    11.0:  KH4:
  Palmyra & Jarvis Islands: 31:  61:  OC:    5.87:   162.07:    11.0:  KH5:
      AH5,KH5,NH5,WH5;
  Hawaii:                   31:  61:  OC:   21.12:   157.48:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AB7RT,=AG5LT,=AG6QD,=AK4RA,=K1ER,=K1TOR,
-    =K2GT,=K2SHO,=K2SOO,=K6BHG,=K6TWG,=K9FD,=KB1HGW,=KB3UWV,=KB3UWW,=KB3VLO,
-    =KB6EGA,=KC7ELH,=KC8JNV,=KD4NFW,=KD6APH,=KE6OTK,=KF5JFX,=KF6YYH,=KF7QMX,
-    =KF7QVM,=KG6EZW,=KG6HFK,=KG7JHH,=KG7KDP,=KH0WJ,=KH3AE,=KI7PEZ,=KI7ZTQ,
-    =KJ6CAV,=KJ6MQL,=KJ6NIA,=KJ6NIB,=KJ6SGY,=KK4EGT,=KK4IUT,=KK6DIT,=KK6GRC,
-    =KK6QAI,=KM4FPS,=KM6HPE,=KN4KYO,=KO4LCM,=KW6CR,=N7OBR,=NR0G,=W1GDM,=W6AKL,
-    =W6DSD,=W6RZY,=W7NX,=W7WKS,=WA6QDQ,=WB4JTT,=WK1K,=WL7CSW;
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AB7RT,=AG5LT,=AG6QD,=AK4RA,=K1TOR,=K2GT,
+    =K2SHO,=K2SOO,=K6BHG,=K6TWG,=K9FD,=KB1HGW,=KB3UWV,=KB3UWW,=KB3VLO,=KB6EGA,
+    =KC7ELH,=KC8JNV,=KD4NFW,=KD6APH,=KE6OTK,=KF6YYH,=KF7QMX,=KF7QVM,=KG6EZW,
+    =KG6HFK,=KG7JHH,=KG7KDP,=KH0WJ,=KH3AE,=KI7PEZ,=KI7ZTQ,=KJ6CAV,=KJ6MQL,
+    =KJ6MSJ,=KJ6NIA,=KJ6NIB,=KJ6SGY,=KK4EGT,=KK4IUT,=KK6DIT,=KK6GRC,=KK6QAI,
+    =KM4FPS,=KM6HPE,=KN4KYO,=KO4LCM,=KW6CR,=N7AK,=NH2IY,=NR0G,=W1GDM,=W6AKL,
+    =W6DSD,=W6RZY,=W7NX,=W7WKS,=WA6QDQ,=WB4JTT,=WL7CSW;
  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:
@@ -651,20 +652,20 @@ Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:
  Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
      AH9,KH9,NH9,WH9;
  Alaska:                   01:  01:  NA:   61.40:   148.87:     8.0:  KL:
-    AL,KL,NL,WL,=K0ESQ,=K4WGX,=K6SAS,=KA1NCN,=KB1IEV,=KB2SVN,=KB9SZM,=KC0JVX,
-    =KC3MPG,=KC6ZLZ,=KC9RQZ,=KD0OAK,=KD5KVP,=KD7RYC,=KE0PRX,=KE7BAQ,=KE8CCS,
-    =KF7GCF,=KF7MVM,=KG6HTQ,=KG7SRS,=KI5KBN,=KI7BKQ,=KJ6NPJ,=KK4BAN,=KK4CAS,
-    =KK4CAU,=KK4CHH,=KK7I,=KM4UUM,=KM6EED,=KN4CCY,=KN4MGX,=KN4MTF,=N1ROR,
-    =N1TX,=N6IGV,=N6QEK,=N7ELD,=NN7C,=NP4TY,=W0HPD,=W1LYD,=W3MKG,=W5ERV,
-    =W5SPY,=W6SMA,=W7CB,=W7EGG,=W7JAL,=WA1FVJ,=WA4BUD,=WA4RRE,=WA7B,=WB5EAA,
-    =WB7ULO,=WB8BRU,=WE9H,=WH7DC,=WI5GUY;
+    AL,KL,NL,WL,=AF7UM,=K4WGX,=K6SAS,=KA1NCN,=KA7GAL,=KB1IEV,=KB2SVN,=KB9SZM,
+    =KC0JVX,=KC2VSR,=KC3MPG,=KC6ZLZ,=KC8VKY,=KC9RQZ,=KD0OAK,=KD5KVP,=KD7RYC,
+    =KE0PRX,=KE7BAQ,=KE8CCS,=KF7MVM,=KG6HTQ,=KG7SRS,=KI4YRQ,=KI5KBN,=KJ6NPJ,
+    =KK4BAN,=KK4CAS,=KK4CAU,=KK4CHH,=KK4WWH,=KK4WWI,=KK7I,=KM6EED,=KN4CCY,
+    =KN4MGX,=KN4MTF,=N1ROR,=N1TX,=N6IGV,=N6QEK,=N6RGP,=NN7C,=NP4TY,=W0HPD,
+    =W1LYD,=W3MKG,=W5ERV,=W5SPY,=W6SMA,=W7CB,=W7EGG,=W7JAL,=WA1FVJ,=WA4BUD,
+    =WA4RRE,=WB5EAA,=WB7ULO,=WB8BRU,=WE9H,=WH7DC,=WI5GUY;
  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,=K9VV,=KV4BT,=W4LIS;
+    KP2,NP2,WP2,=K9VV,=KD6VXI,=KV4BT,=W4LIS;
  Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
-    KP3,KP4,NP3,NP4,WP3,WP4,=KB1KDP,=KC3EUQ,=KG6WWV,=KH2RU,=KI5JZC,=KN4NAR,
-    =KP2H,=KP2Z,=N4AKO,=N5YIZ,=WB2HMY;
+    KP3,KP4,NP3,NP4,WP3,WP4,=KC3EUQ,=KH2RU,=KI5JZC,=KN4NAR,=KP2H,=KP2Z,=N4AKO,
+    =N5YIZ,=WB2HMY;
  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:
@@ -765,13 +766,14 @@ Argentina:                13:  14:  SA:  -32.50:    62.13:     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],
-    =LU1AW/X[16],=LU1COP/D,=LU1COP/E,=LU1LT/L,=LU1VHP/V[16],=LU1VYL/V[16],
-    =LU1YAX/V[16],=LU2DVI/H,=LU2JAL/J,=LU3DRP/D,=LU3JVR/J,=LU4ARU/D,=LU4LAS/L,
-    =LU5DQ/D,=LU5JAH/J,=LU5JIB/J,=LU5YEC/Y[16],=LU6EVD/D,=LU7YG/Y[16],
-    =LU8FRB/F,=LU8JLB/J,=LU8VCC/V[16],=LU9EKQ/D,=LU9FSJ/F,=LU9JDZ/J,=LU9JLB/J,
-    =LU9JZX/J,=LU9LCF/L,=LU9VYY/V[16],=LW3EB/D,=LW3EK/D,=LW3EMP/D,=LW3EMP/J,
-    =LW3EMP/L,=LW7HRM/H;
+    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LT2F/F,
+    =LU1AW/X[16],=LU1COP/D,=LU1COP/E,=LU1DAA/D,=LU1LT/L,=LU1VHP/V[16],
+    =LU1VYL/V[16],=LU1VZ/V[16],=LU1YAX/V[16],=LU2ALF/D,=LU2DVI/H,=LU2EZG/D,
+    =LU2JAL/J,=LU3DVN/X[16],=LU3DYN/D,=LU3JVR/J,=LU3VAL/V[16],=LU4AAO/D,
+    =LU4ARU/D,=LU4FM/F,=LU4LAS/L,=LU5DQ/D,=LU5DSM/ANT,=LU5JAH/J,=LU5JIB/J,
+    =LU5JU/J,=LU5YF/V[16],=LU7YG/Y[16],=LU8JLB/J,=LU8VCC/V[16],=LU9ERA/H,
+    =LU9JDZ/J,=LU9JLB/J,=LU9JZX/J,=LU9LCF/L,=LW1ECO/D,=LW3DBH/D,=LW3EK/D,
+    =LW3EMP/L;
  Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
      LX,=LX9S/J;
  Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -842,11 +844,11 @@ Suriname:                 09:  12:  SA:    4.00:    56.00:     3.0:  PZ:
  Franz Josef Land:         40:  75:  EU:   80.68:   -49.92:    -3.0:  R1FJ:
      RI1F;
  Western Sahara:           33:  46:  AF:   24.82:    13.85:     0.0:  S0:
-    S0;
+    S0,=VERSION;
  Bangladesh:               22:  41:  AS:   24.12:   -89.65:    -6.0:  S2:
      S2,S3;
  Slovenia:                 15:  28:  EU:   46.00:   -14.00:    -1.0:  S5:
-    S5,=S51CK/Y;
+    S5;
  Seychelles:               39:  53:  AF:   -4.67:   -55.47:    -4.0:  S7:
      S7;
  Sao Tome & Principe:      36:  47:  AF:    0.22:    -6.57:     0.0:  S9:
@@ -898,7 +900,7 @@ Guatemala:                07:  11:  NA:   15.50:    90.30:     6.0:  TG:
  Costa Rica:               07:  11:  NA:   10.00:    84.00:     6.0:  TI:
      TE,TI;
  Cocos Island:             07:  11:  NA:    5.52:    87.05:     6.0:  TI9:
-    TE9,TI9,=VERSION;
+    TE9,TI9;
  Cameroon:                 36:  47:  AF:    5.38:   -11.87:    -1.0:  TJ:
      TJ;
  Corsica:                  15:  28:  EU:   42.00:    -9.00:    -1.0:  TK:
@@ -918,97 +920,91 @@ 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,U,R1I(17)[20],R1N[19],R1O[19],R1P[20],R1Y[19],R1Z[19],R4H[30],R4I[30],
-    R4W[30],R8F(17)[30],R8G(17)[30],R8X(17)[20],R9F(17)[30],R9G(17)[30],
-    R9X(17)[20],RA1I(17)[20],RA1N[19],RA1O[19],RA1P[20],RA1Y[19],RA1Z[19],
-    RA4H[30],RA4I[30],RA4W[30],RA8F(17)[30],RA8G(17)[30],RA8X(17)[20],
-    RA9F(17)[30],RA9G(17)[30],RA9X(17)[20],RC1I(17)[20],RC1N[19],RC1O[19],
-    RC1P[20],RC1Y[19],RC1Z[19],RC4H[30],RC4I[30],RC4W[30],RC8F(17)[30],
-    RC8G(17)[30],RC8X(17)[20],RC9F(17)[30],RC9G(17)[30],RC9X(17)[20],
-    RD1I(17)[20],RD1N[19],RD1O[19],RD1P[20],RD1Y[19],RD1Z[19],RD4H[30],
-    RD4I[30],RD4W[30],RD8F(17)[30],RD8G(17)[30],RD8X(17)[20],RD9F(17)[30],
-    RD9G(17)[30],RD9X(17)[20],RE1I(17)[20],RE1N[19],RE1O[19],RE1P[20],
-    RE1Y[19],RE1Z[19],RE4H[30],RE4I[30],RE4W[30],RE8F(17)[30],RE8G(17)[30],
-    RE8X(17)[20],RE9F(17)[30],RE9G(17)[30],RE9X(17)[20],RF1I(17)[20],RF1N[19],
-    RF1O[19],RF1P[20],RF1Y[19],RF1Z[19],RF4H[30],RF4I[30],RF4W[30],
-    RF8F(17)[30],RF8G(17)[30],RF8X(17)[20],RF9F(17)[30],RF9G(17)[30],
-    RF9X(17)[20],RG1I(17)[20],RG1N[19],RG1O[19],RG1P[20],RG1Y[19],RG1Z[19],
-    RG4H[30],RG4I[30],RG4W[30],RG8F(17)[30],RG8G(17)[30],RG8X(17)[20],
-    RG9F(17)[30],RG9G(17)[30],RG9X(17)[20],RI8X(17)[20],RI9X(17)[20],
-    RJ1I(17)[20],RJ1N[19],RJ1O[19],RJ1P[20],RJ1Y[19],RJ1Z[19],RJ4H[30],
-    RJ4I[30],RJ4W[30],RJ8F(17)[30],RJ8G(17)[30],RJ8X(17)[20],RJ9F(17)[30],
-    RJ9G(17)[30],RJ9X(17)[20],RK1I(17)[20],RK1N[19],RK1O[19],RK1P[20],
-    RK1Y[19],RK1Z[19],RK4H[30],RK4I[30],RK4W[30],RK8F(17)[30],RK8G(17)[30],
-    RK8X(17)[20],RK9F(17)[30],RK9G(17)[30],RK9X(17)[20],RL1I(17)[20],RL1N[19],
-    RL1O[19],RL1P[20],RL1Y[19],RL1Z[19],RL4H[30],RL4I[30],RL4W[30],
-    RL8F(17)[30],RL8G(17)[30],RL8X(17)[20],RL9F(17)[30],RL9G(17)[30],
-    RL9X(17)[20],RM1I(17)[20],RM1N[19],RM1O[19],RM1P[20],RM1Y[19],RM1Z[19],
-    RM4H[30],RM4I[30],RM4W[30],RM8F(17)[30],RM8G(17)[30],RM8X(17)[20],
-    RM9F(17)[30],RM9G(17)[30],RM9X(17)[20],RN1I(17)[20],RN1N[19],RN1O[19],
-    RN1P[20],RN1Y[19],RN1Z[19],RN4H[30],RN4I[30],RN4W[30],RN8F(17)[30],
+    R,U,R1I(17)[20],R1N[19],R1O[19],R1P[20],R1Z[19],R4H[30],R4I[30],R4W[30],
+    R8F(17)[30],R8G(17)[30],R8X(17)[20],R9F(17)[30],R9G(17)[30],R9X(17)[20],
+    RA1I(17)[20],RA1N[19],RA1O[19],RA1P[20],RA1Z[19],RA4H[30],RA4I[30],
+    RA4W[30],RA8F(17)[30],RA8G(17)[30],RA8X(17)[20],RA9F(17)[30],RA9G(17)[30],
+    RA9X(17)[20],RC1I(17)[20],RC1N[19],RC1O[19],RC1P[20],RC1Z[19],RC4H[30],
+    RC4I[30],RC4W[30],RC8F(17)[30],RC8G(17)[30],RC8X(17)[20],RC9F(17)[30],
+    RC9G(17)[30],RC9X(17)[20],RD1I(17)[20],RD1N[19],RD1O[19],RD1P[20],
+    RD1Z[19],RD4H[30],RD4I[30],RD4W[30],RD8F(17)[30],RD8G(17)[30],
+    RD8X(17)[20],RD9F(17)[30],RD9G(17)[30],RD9X(17)[20],RE1I(17)[20],RE1N[19],
+    RE1O[19],RE1P[20],RE1Z[19],RE4H[30],RE4I[30],RE4W[30],RE8F(17)[30],
+    RE8G(17)[30],RE8X(17)[20],RE9F(17)[30],RE9G(17)[30],RE9X(17)[20],
+    RF1I(17)[20],RF1N[19],RF1O[19],RF1P[20],RF1Z[19],RF4H[30],RF4I[30],
+    RF4W[30],RF8F(17)[30],RF8G(17)[30],RF8X(17)[20],RF9F(17)[30],RF9G(17)[30],
+    RF9X(17)[20],RG1I(17)[20],RG1N[19],RG1O[19],RG1P[20],RG1Z[19],RG4H[30],
+    RG4I[30],RG4W[30],RG8F(17)[30],RG8G(17)[30],RG8X(17)[20],RG9F(17)[30],
+    RG9G(17)[30],RG9X(17)[20],RI8X(17)[20],RI9X(17)[20],RJ1I(17)[20],RJ1N[19],
+    RJ1O[19],RJ1P[20],RJ1Z[19],RJ4H[30],RJ4I[30],RJ4W[30],RJ8F(17)[30],
+    RJ8G(17)[30],RJ8X(17)[20],RJ9F(17)[30],RJ9G(17)[30],RJ9X(17)[20],
+    RK1I(17)[20],RK1N[19],RK1O[19],RK1P[20],RK1Z[19],RK4H[30],RK4I[30],
+    RK4W[30],RK8F(17)[30],RK8G(17)[30],RK8X(17)[20],RK9F(17)[30],RK9G(17)[30],
+    RK9X(17)[20],RL1I(17)[20],RL1N[19],RL1O[19],RL1P[20],RL1Z[19],RL4H[30],
+    RL4I[30],RL4W[30],RL8F(17)[30],RL8G(17)[30],RL8X(17)[20],RL9F(17)[30],
+    RL9G(17)[30],RL9X(17)[20],RM1I(17)[20],RM1N[19],RM1O[19],RM1P[20],
+    RM1Z[19],RM4H[30],RM4I[30],RM4W[30],RM8F(17)[30],RM8G(17)[30],
+    RM8X(17)[20],RM9F(17)[30],RM9G(17)[30],RM9X(17)[20],RN1I(17)[20],RN1N[19],
+    RN1O[19],RN1P[20],RN1Z[19],RN4H[30],RN4I[30],RN4W[30],RN8F(17)[30],
      RN8G(17)[30],RN8X(17)[20],RN9F(17)[30],RN9G(17)[30],RN9X(17)[20],
-    RO1I(17)[20],RO1N[19],RO1O[19],RO1P[20],RO1Y[19],RO1Z[19],RO4H[30],
-    RO4I[30],RO4W[30],RO8F(17)[30],RO8G(17)[30],RO8X(17)[20],RO9F(17)[30],
-    RO9G(17)[30],RO9X(17)[20],RQ1I(17)[20],RQ1N[19],RQ1O[19],RQ1P[20],
-    RQ1Y[19],RQ1Z[19],RQ4H[30],RQ4I[30],RQ4W[30],RQ8F(17)[30],RQ8G(17)[30],
-    RQ8X(17)[20],RQ9F(17)[30],RQ9G(17)[30],RQ9X(17)[20],RT1I(17)[20],RT1N[19],
-    RT1O[19],RT1P[20],RT1Y[19],RT1Z[19],RT4H[30],RT4I[30],RT4W[30],
-    RT8F(17)[30],RT8G(17)[30],RT8X(17)[20],RT9F(17)[30],RT9G(17)[30],
-    RT9X(17)[20],RU1I(17)[20],RU1N[19],RU1O[19],RU1P[20],RU1Y[19],RU1Z[19],
-    RU4H[30],RU4I[30],RU4W[30],RU8F(17)[30],RU8G(17)[30],RU8X(17)[20],
-    RU9F(17)[30],RU9G(17)[30],RU9X(17)[20],RV1I(17)[20],RV1N[19],RV1O[19],
-    RV1P[20],RV1Y[19],RV1Z[19],RV4H[30],RV4I[30],RV4W[30],RV8F(17)[30],
-    RV8G(17)[30],RV8X(17)[20],RV9F(17)[30],RV9G(17)[30],RV9X(17)[20],
-    RW1I(17)[20],RW1N[19],RW1O[19],RW1P[20],RW1Y[19],RW1Z[19],RW4H[30],
+    RO1I(17)[20],RO1N[19],RO1O[19],RO1P[20],RO1Z[19],RO4H[30],RO4I[30],
+    RO4W[30],RO8F(17)[30],RO8G(17)[30],RO8X(17)[20],RO9F(17)[30],RO9G(17)[30],
+    RO9X(17)[20],RQ1I(17)[20],RQ1N[19],RQ1O[19],RQ1P[20],RQ1Z[19],RQ4H[30],
+    RQ4I[30],RQ4W[30],RQ8F(17)[30],RQ8G(17)[30],RQ8X(17)[20],RQ9F(17)[30],
+    RQ9G(17)[30],RQ9X(17)[20],RT1I(17)[20],RT1N[19],RT1O[19],RT1P[20],
+    RT1Z[19],RT4H[30],RT4I[30],RT4W[30],RT8F(17)[30],RT8G(17)[30],
+    RT8X(17)[20],RT9F(17)[30],RT9G(17)[30],RT9X(17)[20],RU1I(17)[20],RU1N[19],
+    RU1O[19],RU1P[20],RU1Z[19],RU4H[30],RU4I[30],RU4W[30],RU8F(17)[30],
+    RU8G(17)[30],RU8X(17)[20],RU9F(17)[30],RU9G(17)[30],RU9X(17)[20],
+    RV1I(17)[20],RV1N[19],RV1O[19],RV1P[20],RV1Z[19],RV4H[30],RV4I[30],
+    RV4W[30],RV8F(17)[30],RV8G(17)[30],RV8X(17)[20],RV9F(17)[30],RV9G(17)[30],
+    RV9X(17)[20],RW1I(17)[20],RW1N[19],RW1O[19],RW1P[20],RW1Z[19],RW4H[30],
      RW4I[30],RW4W[30],RW8F(17)[30],RW8G(17)[30],RW8X(17)[20],RW9F(17)[30],
      RW9G(17)[30],RW9X(17)[20],RX1I(17)[20],RX1N[19],RX1O[19],RX1P[20],
-    RX1Y[19],RX1Z[19],RX4H[30],RX4I[30],RX4W[30],RX8F(17)[30],RX8G(17)[30],
+    RX1Z[19],RX4H[30],RX4I[30],RX4W[30],RX8F(17)[30],RX8G(17)[30],
      RX8X(17)[20],RX9F(17)[30],RX9G(17)[30],RX9X(17)[20],RY1I(17)[20],RY1N[19],
-    RY1O[19],RY1P[20],RY1Y[19],RY1Z[19],RY4H[30],RY4I[30],RY4W[30],
-    RY8F(17)[30],RY8G(17)[30],RY8X(17)[20],RY9F(17)[30],RY9G(17)[30],
-    RY9X(17)[20],RZ1I(17)[20],RZ1N[19],RZ1O[19],RZ1P[20],RZ1Y[19],RZ1Z[19],
-    RZ4H[30],RZ4I[30],RZ4W[30],RZ8F(17)[30],RZ8G(17)[30],RZ8X(17)[20],
-    RZ9F(17)[30],RZ9G(17)[30],RZ9X(17)[20],U1I(17)[20],U1N[19],U1O[19],
-    U1P[20],U1Y[19],U1Z[19],U4H[30],U4I[30],U4W[30],U8F(17)[30],U8G(17)[30],
-    U8X(17)[20],U9F(17)[30],U9G(17)[30],U9X(17)[20],UA1I(17)[20],UA1N[19],
-    UA1O[19],UA1P[20],UA1Y[19],UA1Z[19],UA4H[30],UA4I[30],UA4W[30],
-    UA8F(17)[30],UA8G(17)[30],UA8X(17)[20],UA9F(17)[30],UA9G(17)[30],
-    UA9X(17)[20],UB1I(17)[20],UB1N[19],UB1O[19],UB1P[20],UB1Y[19],UB1Z[19],
-    UB4H[30],UB4I[30],UB4W[30],UB8F(17)[30],UB8G(17)[30],UB8X(17)[20],
-    UB9F(17)[30],UB9G(17)[30],UB9X(17)[20],UC1I(17)[20],UC1N[19],UC1O[19],
-    UC1P[20],UC1Y[19],UC1Z[19],UC4H[30],UC4I[30],UC4W[30],UC8F(17)[30],
+    RY1O[19],RY1P[20],RY1Z[19],RY4H[30],RY4I[30],RY4W[30],RY8F(17)[30],
+    RY8G(17)[30],RY8X(17)[20],RY9F(17)[30],RY9G(17)[30],RY9X(17)[20],
+    RZ1I(17)[20],RZ1N[19],RZ1O[19],RZ1P[20],RZ1Z[19],RZ4H[30],RZ4I[30],
+    RZ4W[30],RZ8F(17)[30],RZ8G(17)[30],RZ8X(17)[20],RZ9F(17)[30],RZ9G(17)[30],
+    RZ9X(17)[20],U1I(17)[20],U1N[19],U1O[19],U1P[20],U1Z[19],U4H[30],U4I[30],
+    U4W[30],U8F(17)[30],U8G(17)[30],U8X(17)[20],U9F(17)[30],U9G(17)[30],
+    U9X(17)[20],UA1I(17)[20],UA1N[19],UA1O[19],UA1P[20],UA1Z[19],UA4H[30],
+    UA4I[30],UA4W[30],UA8F(17)[30],UA8G(17)[30],UA8X(17)[20],UA9F(17)[30],
+    UA9G(17)[30],UA9X(17)[20],UB1I(17)[20],UB1N[19],UB1O[19],UB1P[20],
+    UB1Z[19],UB4H[30],UB4I[30],UB4W[30],UB8F(17)[30],UB8G(17)[30],
+    UB8X(17)[20],UB9F(17)[30],UB9G(17)[30],UB9X(17)[20],UC1I(17)[20],UC1N[19],
+    UC1O[19],UC1P[20],UC1Z[19],UC4H[30],UC4I[30],UC4W[30],UC8F(17)[30],
      UC8G(17)[30],UC8X(17)[20],UC9F(17)[30],UC9G(17)[30],UC9X(17)[20],
-    UD1I(17)[20],UD1N[19],UD1O[19],UD1P[20],UD1Y[19],UD1Z[19],UD4H[30],
-    UD4I[30],UD4W[30],UD8F(17)[30],UD8G(17)[30],UD8X(17)[20],UD9F(17)[30],
-    UD9G(17)[30],UD9X(17)[20],UE1I(17)[20],UE1N[19],UE1O[19],UE1P[20],
-    UE1Y[19],UE1Z[19],UE4H[30],UE4I[30],UE4W[30],UE8F(17)[30],UE8G(17)[30],
-    UE8X(17)[20],UE9F(17)[30],UE9G(17)[30],UE9X(17)[20],UF1I(17)[20],UF1N[19],
-    UF1O[19],UF1P[20],UF1Y[19],UF1Z[19],UF4H[30],UF4I[30],UF4W[30],
-    UF8F(17)[30],UF8G(17)[30],UF8X(17)[20],UF9F(17)[30],UF9G(17)[30],
-    UF9X(17)[20],UG1I(17)[20],UG1N[19],UG1O[19],UG1P[20],UG1Y[19],UG1Z[19],
-    UG4H[30],UG4I[30],UG4W[30],UG8F(17)[30],UG8G(17)[30],UG8X(17)[20],
-    UG9F(17)[30],UG9G(17)[30],UG9X(17)[20],UH1I(17)[20],UH1N[19],UH1O[19],
-    UH1P[20],UH1Y[19],UH1Z[19],UH4H[30],UH4I[30],UH4W[30],UH8F(17)[30],
-    UH8G(17)[30],UH8X(17)[20],UH9F(17)[30],UH9G(17)[30],UH9X(17)[20],
-    UI1I(17)[20],UI1N[19],UI1O[19],UI1P[20],UI1Y[19],UI1Z[19],UI4H[30],
+    UD1I(17)[20],UD1N[19],UD1O[19],UD1P[20],UD1Z[19],UD4H[30],UD4I[30],
+    UD4W[30],UD8F(17)[30],UD8G(17)[30],UD8X(17)[20],UD9F(17)[30],UD9G(17)[30],
+    UD9X(17)[20],UE1I(17)[20],UE1N[19],UE1O[19],UE1P[20],UE1Z[19],UE4H[30],
+    UE4I[30],UE4W[30],UE8F(17)[30],UE8G(17)[30],UE8X(17)[20],UE9F(17)[30],
+    UE9G(17)[30],UE9X(17)[20],UF1I(17)[20],UF1N[19],UF1O[19],UF1P[20],
+    UF1Z[19],UF4H[30],UF4I[30],UF4W[30],UF8F(17)[30],UF8G(17)[30],
+    UF8X(17)[20],UF9F(17)[30],UF9G(17)[30],UF9X(17)[20],UG1I(17)[20],UG1N[19],
+    UG1O[19],UG1P[20],UG1Z[19],UG4H[30],UG4I[30],UG4W[30],UG8F(17)[30],
+    UG8G(17)[30],UG8X(17)[20],UG9F(17)[30],UG9G(17)[30],UG9X(17)[20],
+    UH1I(17)[20],UH1N[19],UH1O[19],UH1P[20],UH1Z[19],UH4H[30],UH4I[30],
+    UH4W[30],UH8F(17)[30],UH8G(17)[30],UH8X(17)[20],UH9F(17)[30],UH9G(17)[30],
+    UH9X(17)[20],UI1I(17)[20],UI1N[19],UI1O[19],UI1P[20],UI1Z[19],UI4H[30],
      UI4I[30],UI4W[30],UI8F(17)[30],UI8G(17)[30],UI8X(17)[20],UI9F(17)[30],
-    UI9G(17)[30],UI9X(17)[20],=R0CDP/3,=R9JBF/1,=RA9ULL/6,=RD9M/3,=RT9T/3,
-    =UA0QNV/3,=UA3LMR/P,=UB8S/P,=R0AI/3,=R100KOMI(17)[20],=R325G[19],
-    =R325P[19],=R325SF[19],=R325SSF[19],=R325Z[19],=R4HAT[29],=R4HC[29],
-    =R4HCE[29],=R4HCZ[29],=R4HD[29],=R4HDC[29],=R4HDR[29],=R4HL[29],=R4IC[29],
-    =R4ID[29],=R4II[29],=R4IK[29],=R4IM[29],=R4IN[29],=R4IO[29],=R4IT[29],
-    =R4WAN/P[30],=R6DLU/1(17)[20],=R6LCA/J,=R80BRF,=R875TULA,=R8MB/1(17)[20],
-    =RA4HL[29],=RA4NCC[30],=RA60ANT[19],=RC4HT[29],=RC4I[29],=RJ4I[29],
-    =RK4HM[29],=RK4P[30],=RL1I/P(17)[20],=RM4I[29],=RN2FA/3,=RN4HFJ[29],
-    =RN4HIF[29],=RN60ANT[19],=RU4HD[29],=RU4HP[29],=RU4I[29],=RW4HM[29],
-    =RW4HTK[29],=RW4HW[29],=RW4HZ[29],=RW9WJ/4[30],=UA4H[29],=UA4HBM[29],
-    =UA4HGL[29],=UA4HIP[29],=UA4HRZ[29],=UA4HY[29],=UA4NF[30],=UA4PN[30],
-    =UA9XK/1[19],=UB5O/4[30],=UC4I[29],=UE80PQ[19],=UE80SKR,=UI4I[29];
+    UI9G(17)[30],UI9X(17)[20],=R9JBF/1,=RA9ULL/6,=RT9T/3,=UA0QNI/3,=UB8S/P,
+    =R0AI/3,=R325G[19],=R325P[19],=R325SF[19],=R325SSF[19],=R325Z[19],
+    =R4HAT[29],=R4HC[29],=R4HCE[29],=R4HCZ[29],=R4HD[29],=R4HDC[29],
+    =R4HDR[29],=R4HL[29],=R4IC[29],=R4ID[29],=R4II[29],=R4IK[29],=R4IM[29],
+    =R4IN[29],=R4IO[29],=R4IT[29],=R4WAN/P[30],=R6LCA/J,=R8MB/1(17)[20],
+    =R9FCS/4,=RA4HL[29],=RA4NCC[30],=RA60ANT[19],=RC4HT[29],=RC4I[29],
+    =RJ4I[29],=RK4HM[29],=RK4P[30],=RL1I/P(17)[20],=RM4I[29],=RN4HFJ[29],
+    =RN4HIF[29],=RN60ANT[19],=RT9K/6,=RU4HD[29],=RU4HP[29],=RU4I[29],
+    =RW4HM[29],=RW4HTK[29],=RW4HW[29],=RW4HZ[29],=RW9WJ/4[30],=UA3LMR/P,
+    =UA4H[29],=UA4HBM[29],=UA4HGL[29],=UA4HIP[29],=UA4HRZ[29],=UA4HY[29],
+    =UA4NF[30],=UA4PN[30],=UA5B/4,=UC4I[29],=UE80SKR,=UI4I[29];
  Kaliningrad:              15:  29:  EU:   54.72:   -20.52:    -3.0:  UA2:
      R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RE2F,RE2K,RF2F,RF2K,RG2F,RG2K,RJ2F,RJ2K,
      RK2F,RK2K,RL2F,RL2K,RM2F,RM2K,RN2F,RN2K,RO2F,RO2K,RQ2F,RQ2K,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,=R325B,=R325BF,=UB5O/2;
+    UB2,UC2,UD2,UE2,UF2,UG2,UH2,UI2,=R2MWO,=R325B,=R325BF;
  Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
      R0,R8(17)[30],R9,RA0,RA8(17)[30],RA9,RC0,RC8(17)[30],RC9,RD0,RD8(17)[30],
      RD9,RE0,RE8(17)[30],RE9,RF0,RF8(17)[30],RF9,RG0,RG8(17)[30],RG9,RI0,
@@ -1128,11 +1124,9 @@ Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
      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),
      =R2ET/9(18)[31],=R325F(19)[34],=R325TF(19)[34],=R4FBJ/9/P(18)[32],
-    =R800SAN(18)[32],=RA0QK/8(17)[30],=RA4RU/9[20],=RA9MX/0(18)[32],
+    =R800SAN(18)[32],=R9WGK/P,=RA0QK/8(17)[30],=RA4RU/9[20],=RA9MX/0(18)[32],
      =RK60ANT(18)[32],=RL60ANT(19)[34],=RN9S(16),=RT60ANT,=RT9S(16),
-    =RV3DSA/0(19)[34],=RV7B/9[20],=RX6DL/8(17)[30],=RX6DL/8/P(17)[30],
-    =RX9SN/P(16),=RX9WT/P(16),=UB5O/0(19)[23],=UB5O/8(17)[30],=UB5O/9(17)[30],
-    =UD6AOP/0(19)[35];
+    =RV7B/9[20],=RX6DL/8/P(17)[30],=RX9SN/P(16),=RX9WT/P,=UD6AOP/0(19)[35];
  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:
@@ -1177,30 +1171,27 @@ Canada:                   05:  09:  NA:   44.35:    78.75:     5.0:  VE:
      CI0(2)[4],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,=VER20211029,
-    =VA2VVV(2)[4],=VE2CSI(2)[4],=VE2EKA(2)[4],=VE2FK[9],=VE2IDX(2)[4],
-    =VE2IM(2)[4],=VE2TKH(2)[4],=VY0PW(4)[3];
+    XL2[4],XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20211125,
+    =VA2VT(2)[4],=VA2VVV(2)[4],=VE2CSI(2)[4],=VE2EKA(2)[4],=VE2FK[9],
+    =VE2IDX(2)[4],=VE2IM(2)[4],=VE2TKH(2)[4],=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];
+    AX,VI,VJ,VK,VL,AX4[55],VI4[55],VJ4[55],VK4[55],VL4[55],=VK3ZW(29)[55];
  Heard Island:             39:  68:  AF:  -53.08:   -73.50:    -5.0:  VK0H:
      =VK0EK;
  Macquarie Island:         30:  60:  OC:  -54.60:  -158.88:   -10.0:  VK0M:
      =VK0AI;
  Cocos (Keeling) Islands:  29:  54:  OC:  -12.15:   -96.82:    -6.5:  VK9C:
-    AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9FC,VK9KC,VK9Y,VK9ZY,VL9C,
-    VL9Y,VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y;
+    AX9C,AX9Y,VI9C,VI9Y,VK9C,VK9FC,VK9KC,VK9Y,VK9ZY,VZ9Y;
  Lord Howe Island:         30:  60:  OC:  -31.55:  -159.08:   -10.5:  VK9L:
-    AX9L,VH9L,VI9L,VJ9L,VK9FL,VK9L,VK9ZL,VL9L,VM9L,VN9L,VZ9L;
+    AX9L,VI9L,VK9FL,VK9L,VK9ZL,VZ9L;
  Mellish Reef:             30:  56:  OC:  -17.40:  -155.85:   -10.0:  VK9M:
-    AX9M,VH9M,VI9M,VJ9M,VK9M,VL9M,VM9M,VN9M,VZ9M;
+    AX9M,VI9M,VK9M,VZ9M;
  Norfolk Island:           32:  60:  OC:  -29.03:  -167.93:   -11.5:  VK9N:
-    AX9,VH9,VI9,VJ9,VK9,VL9,VM9,VN9,VZ9;
+    AX9,VI9,VK9;
  Willis Island:            30:  55:  OC:  -16.22:  -150.02:   -10.0:  VK9W:
-    AX9W,AX9Z,VH9W,VH9Z,VI9W,VI9Z,VJ9W,VJ9Z,VK9FW,VK9W,VK9Z,VL9W,VL9Z,VM9W,
-    VM9Z,VN9W,VN9Z,VZ9W,VZ9Z;
+    AX9W,AX9Z,VI9W,VI9Z,VK9FW,VK9W,VK9Z,VZ9W;
  Christmas Island:         29:  54:  OC:  -10.48:  -105.63:    -7.0:  VK9X:
-    AX9X,VH9X,VI9X,VJ9X,VK9FX,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X;
+    AX9X,VI9X,VK9FX,VK9KX,VK9X,VZ9X;
  Anguilla:                 08:  11:  NA:   18.23:    63.00:     4.0:  VP2E:
      VP2E;
  Montserrat:               08:  11:  NA:   16.75:    62.18:     4.0:  VP2M:
@@ -1236,7 +1227,7 @@ Andaman & Nicobar Is.:    26:  49:  AS:   12.37:   -92.78:    -5.5:  VU4:
  Lakshadweep Islands:      22:  41:  AS:   11.23:   -72.78:    -5.5:  VU7:
      VU7;
  Mexico:                   06:  10:  NA:   21.32:   100.23:     6.0:  XE:
-    4A,4B,4C,6D,6E,6F,6G,6H,6I,6J,XA,XB,XC,XD,XE,XF,XG,XH,XI;
+    4A,4B,4C,6D,6E,6F,6G,6H,6I,6J,XA,XB,XC,XD,XE,XF,XG,XH,XI,=4C4C;
  Revillagigedo:            06:  10:  NA:   18.77:   110.97:     7.0:  XF4:
      4A4,4B4,4C4,6D4,6E4,6F4,6G4,6H4,6I4,6J4,XA4,XB4,XC4,XD4,XE4,XF4,XG4,XH4,
      XI4;
diff --git a/data/prefix_data.pl b/data/prefix_data.pl

index 7e3b828afd772486e80aa0429c3036b7811afbae..8c9773debaf91a4f548e89c37aba813395bf6526 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -12,6 +12,7 @@
    '2M' => '144',
    '2U' => '145',
    '2W' => '146',
+  '2ZE' => '140',
    '3A' => '3',
    '3B6' => '4,5,348',
    '3B7' => '347',
@@ -3603,6 +3604,7 @@
    '=3D2RI' => '12',
    '=3Y0E' => '17',
    '=3Y0X' => '18',
+  '=4C4C' => '292,1573,1575,1577',
    '=4U0R' => '981',
    '=4U0WFP' => '165,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834,836,838,840,842,844,846,848,850',
    '=4U1A' => '981',
@@ -3620,7 +3622,6 @@
    '=8N60HAM/OKA' => '173,856,860,862,864,866,868,870,872,874,876,878',
    '=9M4CAK' => '54,55,374',
    '=9M4CKT' => '54,55,374',
-  '=9M4CKT/6' => '54,55,374',
    '=9M4CRP' => '54,55,374',
    '=9M4CWS' => '54,55,374',
    '=9M7DX' => '54,55,374',
@@ -3629,11 +3630,11 @@
    '=AA2MA' => '179',
    '=AA4DD' => '179',
    '=AA4Q' => '179',
+  '=AA4R' => '179',
    '=AA5JF' => '179',
    '=AA8R' => '179',
    '=AB4B' => '179',
    '=AB4GG' => '179',
-  '=AB4IQ' => '179',
    '=AB7RT' => '186',
    '=AB8RL' => '179',
    '=AB8YZ' => '179',
@@ -3653,6 +3654,7 @@
    '=AE6JV' => '179',
    '=AE7AP' => '179',
    '=AF4T' => '179',
+  '=AF7UM' => '191,900,902,904,906,908',
    '=AG4W' => '179',
    '=AG5LT' => '186',
    '=AG6QD' => '186',
@@ -3676,7 +3678,6 @@
    '=AL7CR' => '179',
    '=AL7RF' => '179',
    '=AL7RT' => '179',
-  '=BG3PUX/Q' => '73,408,410,412,414,416,418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,454,456,458,460,462,464,466,468',
    '=BS7H' => '70',
    '=C7A' => '981',
    '=CD0YJA/3' => '79,470,472,474,476,478,480,482,484',
@@ -3686,29 +3687,22 @@
    '=DT8A' => '343',
    '=E51PT' => '331,1732,1734',
    '=E51WL' => '331,1732,1734',
-  '=EA2EZ/P' => '102,598,600,602,604,606,608',
    '=EA5CC/P' => '102,598,600,602,604,606,608',
    '=EA5IKT/P' => '102,598,600,602,604,606,608',
-  '=EA6AOL/3' => '102,598,600,602,604,606,608',
-  '=EA6LU/P' => '103',
+  '=EA5RCK/CDI' => '102,598,600,602,604,606,608',
    '=EA9HU' => '102,598,600,602,604,606,608',
-  '=EA9PD/P' => '102,598,600,602,604,606,608',
    '=FO/W7GJ' => '125',
+  '=FT4YM/P' => '1717,1719,1722,1724,1726,1728,1730,330,343',
    '=G8ERJ' => '179',
    '=GB0DBS' => '144,688',
    '=GB0GDS' => '144,688',
-  '=GB0RSB' => '146',
-  '=GB0SAA' => '144,688',
    '=GB0SJR' => '144,688',
-  '=GB0WHR' => '144,688',
    '=GB1002ZE' => '144,688',
    '=GB100BCG' => '144,688',
-  '=GB1CR' => '146',
    '=GB1MIS' => '146',
-  '=GB1TMH' => '144,688',
    '=GB2ELH' => '144,688',
+  '=GB2JCM' => '144,688',
    '=GB2JSA' => '143',
-  '=GB2KDR' => '144,688',
    '=GB2OWM' => '144,688',
    '=GB2TD' => '146',
    '=GB2VK' => '146',
@@ -3720,8 +3714,7 @@
    '=GB4GDS' => '144,688',
    '=GB4LER' => '144,688',
    '=GB60ANT' => '144,688',
-  '=GB8ROC' => '144,688',
-  '=GB9BOB' => '142',
+  '=GB8LWF' => '142',
    '=GM0AVR' => '687',
    '=GM0CXQ' => '687',
    '=GM0EKM' => '687',
@@ -3732,6 +3725,7 @@
    '=GM1KKI' => '687',
    '=GM1ZNR' => '687',
    '=GM3WHT' => '687',
+  '=GM3WUX/2ZE' => '144,688',
    '=GM3ZET' => '687',
    '=GM4IPK' => '687',
    '=GM4JPI' => '687',
@@ -3740,19 +3734,20 @@
    '=GM4PXG' => '687',
    '=GM4SLV' => '687',
    '=GM4SSA' => '687',
+  '=GM4UBJ/2ZE' => '144,688',
    '=GM4WXQ' => '687',
    '=GM4ZHL' => '687',
    '=GM6RQW' => '687',
    '=GM6YQA' => '687',
    '=GM7AFE' => '687',
    '=GM7GWW' => '687',
+  '=GM8IEM/2ZE' => '144,688',
    '=GM8LNH' => '687',
    '=GM8MMA' => '687',
    '=GM8YEC' => '687',
    '=GS3ZET' => '687',
    '=HF0POL' => '343',
    '=HK0TU' => '332',
-  '=II0IADU' => '166',
    '=II0ICH' => '166',
    '=II0IDP' => '166',
    '=II0M' => '166',
@@ -3774,16 +3769,14 @@
    '=IQ0QP' => '166',
    '=IQ0SS' => '166',
    '=IQ1QQ/9' => '845',
-  '=IT9AAK/0' => '165,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834,836,838,840,842,844,846,848,850',
-  '=IT9AAK/8' => '165,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834,836,838,840,842,844,846,848,850',
    '=IT9ELM/0' => '165,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834,836,838,840,842,844,846,848,850',
    '=IT9PQJ/0' => '165,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834,836,838,840,842,844,846,848,850',
-  '=IY0GA' => '166',
+  '=IT9RGY/4' => '165,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834,836,838,840,842,844,846,848,850',
+  '=IW0HBY/9' => '845',
    '=JG8NQJ/JD1' => '333',
    '=JW/LB2PG' => '893',
    '=K0ACP' => '179',
    '=K0EJ' => '179',
-  '=K0ESQ' => '191,900,902,904,906,908',
    '=K0IP' => '179',
    '=K0LUZ' => '179',
    '=K0NW' => '179',
@@ -3795,7 +3788,6 @@
    '=K0ZR' => '179',
    '=K1DC' => '179',
    '=K1DW' => '179',
-  '=K1ER' => '186',
    '=K1GU' => '179',
    '=K1KD' => '179',
    '=K1LT' => '179',
@@ -3815,6 +3807,7 @@
    '=K3EST' => '179',
    '=K3GP' => '179',
    '=K3IE' => '179',
+  '=K3JWI' => '179',
    '=K3NT' => '179',
    '=K3PA' => '179',
    '=K3WT' => '179',
@@ -3832,6 +3825,7 @@
    '=K4OAQ' => '179',
    '=K4RO' => '179',
    '=K4TCG' => '179',
+  '=K4TG' => '179',
    '=K4TZ' => '179',
    '=K4UU' => '179',
    '=K4WG' => '179',
@@ -3886,7 +3880,9 @@
    '=K9GS' => '179',
    '=K9JM' => '179',
    '=K9MK' => '179',
+  '=K9MWM' => '179',
    '=K9OZ' => '179',
+  '=K9PY' => '179',
    '=K9RS' => '179',
    '=K9RZ' => '179',
    '=K9VV' => '193',
@@ -3897,6 +3893,7 @@
    '=KA3MTT' => '179',
    '=KA4GAV' => '179',
    '=KA4OTB' => '179',
+  '=KA7GAL' => '191,900,902,904,906,908',
    '=KA7PNH' => '179',
    '=KA8HDE' => '179',
    '=KA8Q' => '179',
@@ -3904,7 +3901,6 @@
    '=KA9VVQ' => '179',
    '=KB1HGW' => '186',
    '=KB1IEV' => '191,900,902,904,906,908',
-  '=KB1KDP' => '194',
    '=KB2S' => '179',
    '=KB2SVN' => '191,900,902,904,906,908',
    '=KB3UWV' => '186',
@@ -3917,6 +3913,7 @@
    '=KC0JVX' => '191,900,902,904,906,908',
    '=KC2IIT' => '182',
    '=KC2LM' => '179',
+  '=KC2VSR' => '191,900,902,904,906,908',
    '=KC3EUQ' => '194',
    '=KC3MPG' => '191,900,902,904,906,908',
    '=KC4AAA' => '1717,1719,1722,1724,1726,1728,1730,330,343',
@@ -3935,6 +3932,7 @@
    '=KC8GCR' => '179',
    '=KC8J' => '179',
    '=KC8JNV' => '186',
+  '=KC8VKY' => '191,900,902,904,906,908',
    '=KC9K' => '179',
    '=KC9RQZ' => '191,900,902,904,906,908',
    '=KD0EE' => '179',
@@ -3946,6 +3944,8 @@
    '=KD5DD' => '179',
    '=KD5KVP' => '191,900,902,904,906,908',
    '=KD6APH' => '186',
+  '=KD6VXI' => '193',
+  '=KD7RF' => '179',
    '=KD7RYC' => '191,900,902,904,906,908',
    '=KD9QS' => '179',
    '=KE0L' => '179',
@@ -3960,11 +3960,9 @@
    '=KE8CCS' => '191,900,902,904,906,908',
    '=KE8FT' => '179',
    '=KF5BA' => '179',
-  '=KF5JFX' => '186',
    '=KF5MU' => '179',
    '=KF6YYH' => '186',
    '=KF7BMU' => '182',
-  '=KF7GCF' => '191,900,902,904,906,908',
    '=KF7MVM' => '191,900,902,904,906,908',
    '=KF7QMX' => '186',
    '=KF7QVM' => '186',
@@ -3977,7 +3975,6 @@
    '=KG6HFK' => '186',
    '=KG6HTQ' => '191,900,902,904,906,908',
    '=KG6JDX' => '182',
-  '=KG6WWV' => '194',
    '=KG7JHH' => '186',
    '=KG7KDP' => '186',
    '=KG7SRS' => '191,900,902,904,906,908',
@@ -3993,16 +3990,15 @@
    '=KH3AE' => '186',
    '=KH6CT' => '179',
    '=KH6GK' => '179',
-  '=KH6KK' => '182',
    '=KH6M' => '179',
    '=KH6VM' => '179',
    '=KH6XS' => '179',
    '=KH7FC' => '179',
+  '=KI4YRQ' => '191,900,902,904,906,908',
    '=KI5JZC' => '194',
    '=KI5KBN' => '191,900,902,904,906,908',
    '=KI6DY' => '179',
    '=KI6QDH' => '179',
-  '=KI7BKQ' => '191,900,902,904,906,908',
    '=KI7PEZ' => '186',
    '=KI7ZTQ' => '186',
    '=KI8I' => '179',
@@ -4010,6 +4006,7 @@
    '=KJ4M' => '179',
    '=KJ6CAV' => '186',
    '=KJ6MQL' => '186',
+  '=KJ6MSJ' => '186',
    '=KJ6NIA' => '186',
    '=KJ6NIB' => '186',
    '=KJ6NPJ' => '191,900,902,904,906,908',
@@ -4021,6 +4018,8 @@
    '=KK4CHH' => '191,900,902,904,906,908',
    '=KK4EGT' => '186',
    '=KK4IUT' => '186',
+  '=KK4WWH' => '191,900,902,904,906,908',
+  '=KK4WWI' => '191,900,902,904,906,908',
    '=KK6DIT' => '186',
    '=KK6GRC' => '186',
    '=KK6QAI' => '186',
@@ -4042,7 +4041,6 @@
    '=KM4JA' => '179',
    '=KM4JAK' => '179',
    '=KM4RO' => '179',
-  '=KM4UUM' => '191,900,902,904,906,908',
    '=KM6EED' => '191,900,902,904,906,908',
    '=KM6HPE' => '186',
    '=KM6Z' => '179',
@@ -4071,6 +4069,7 @@
    '=KS7T' => '179',
    '=KS9W' => '179',
    '=KT3M' => '179',
+  '=KT4O' => '179',
    '=KU1CW' => '179',
    '=KU8E' => '179',
    '=KV3T' => '179',
@@ -4085,43 +4084,47 @@
    '=KY0Q' => '179',
    '=KY0W' => '179',
    '=KZ1W' => '179',
-  '=KZ4KX' => '179',
    '=KZ9V' => '179',
+  '=LT2F/F' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU1AW/X' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU1COP/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU1COP/E' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU1DAA/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU1LT/L' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU1VHP/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU1VYL/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU1VZ/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU1YAX/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU2ALF/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU2DVI/H' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU2EZG/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU2JAL/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LU3DRP/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU3DVN/X' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU3DYN/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU3JVR/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU3VAL/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU4AAO/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU4ARU/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU4FM/F' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU4LAS/L' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU5DQ/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU5DSM/ANT' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU5JAH/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU5JIB/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LU5YEC/Y' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LU6EVD/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU5JU/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU5YF/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU7YG/Y' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LU8FRB/F' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU8JLB/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU8VCC/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LU9EKQ/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LU9FSJ/F' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LU9ERA/H' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU9JDZ/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU9JLB/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU9JZX/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LU9LCF/L' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LU9VYY/V' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LW3EB/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LW1ECO/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
+  '=LW3DBH/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LW3EK/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LW3EMP/D' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LW3EMP/J' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LW3EMP/L' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
-  '=LW7HRM/H' => '197,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962',
    '=LX9S/J' => '198',
    '=MM0LSM' => '687',
    '=MM0NQY' => '687',
@@ -4149,11 +4152,9 @@
    '=MM8A' => '687',
    '=MS0ZCG' => '687',
    '=MS0ZET' => '687',
-  '=N0SMX' => '179',
    '=N0YY' => '179',
    '=N1ROR' => '191,900,902,904,906,908',
    '=N1TX' => '191,900,902,904,906,908',
-  '=N2AU' => '179',
    '=N2BJ' => '179',
    '=N2IC' => '179',
    '=N2JNR' => '179',
@@ -4203,12 +4204,12 @@
    '=N6IGV' => '191,900,902,904,906,908',
    '=N6JS' => '179',
    '=N6QEK' => '191,900,902,904,906,908',
+  '=N6RGP' => '191,900,902,904,906,908',
    '=N6RSH' => '179',
+  '=N7AK' => '186',
    '=N7DR' => '179',
-  '=N7ELD' => '191,900,902,904,906,908',
    '=N7IV' => '179',
    '=N7MZW' => '179',
-  '=N7OBR' => '186',
    '=N7RCS' => '179',
    '=N7US' => '179',
    '=N7WY' => '179',
@@ -4236,6 +4237,7 @@
    '=N9SB' => '179',
    '=N9TX' => '179',
    '=N9VPV' => '179',
+  '=NA2U' => '179',
    '=NA4A' => '179',
    '=NA5NN' => '179',
    '=ND2T' => '179',
@@ -4246,6 +4248,7 @@
    '=NF4J' => '179',
    '=NG7A' => '179',
    '=NH2B' => '180',
+  '=NH2IY' => '186',
    '=NH6L' => '179',
    '=NH6PK' => '179',
    '=NH6T' => '179',
@@ -4271,6 +4274,7 @@
    '=NN9DD' => '179',
    '=NO9E' => '179',
    '=NP2GG' => '179',
+  '=NP2JV' => '179',
    '=NP3FB' => '179',
    '=NP3K' => '179',
    '=NP4TY' => '191,900,902,904,906,908',
@@ -4292,8 +4296,6 @@
    '=PA6SJB/J' => '216',
    '=PC6RH/J' => '216',
    '=R0AI/3' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=R0CDP/3' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=R100KOMI' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=R2ET/9' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=R2MWO' => '264',
    '=R325B' => '264',
@@ -4323,13 +4325,12 @@
    '=R4IO' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=R4IT' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=R4WAN/P' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=R6DLU/1' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=R6LCA/J' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=R800SAN' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
-  '=R80BRF' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=R875TULA' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=R8MB/1' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
+  '=R9FCS/4' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=R9JBF/1' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
+  '=R9WGK/P' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RA0QK/8' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RA4HL' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RA4NCC' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
@@ -4339,7 +4340,6 @@
    '=RA9ULL/6' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RC4HT' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RC4I' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=RD9M/3' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RI1ANC' => '1717,1719,1722,1724,1726,1728,1730,330,343',
    '=RI1ANR' => '1717,1719,1722,1724,1726,1728,1730,330,343',
    '=RI60ANT' => '1717,1719,1722,1724,1726,1728,1730,330,343',
@@ -4350,29 +4350,26 @@
    '=RL1I/P' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RL60ANT' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RM4I' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=RN2FA/3' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RN4HFJ' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RN4HIF' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RN60ANT' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RN9S' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RT60ANT' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
+  '=RT9K/6' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RT9S' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RT9T/3' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RU4HD' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RU4HP' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RU4I' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=RV3DSA/0' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RV7B/9' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RW4HM' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RW4HTK' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RW4HW' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RW4HZ' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=RW9WJ/4' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=RX6DL/8' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RX6DL/8/P' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RX9SN/P' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
    '=RX9WT/P' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
-  '=S51CK/Y' => '230',
    '=SV0XAZ' => '240',
    '=SV2ASP/A' => '238',
    '=SV2JAO/J' => '237,1156,1158,1160,1162,1164,1166,1168',
@@ -4419,7 +4416,7 @@
    '=TX3X' => '122',
    '=TX5P' => '126',
    '=TX7MB' => '127',
-  '=UA0QNV/3' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
+  '=UA0QNI/3' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UA3LMR/P' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UA4H' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UA4HBM' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
@@ -4429,18 +4426,13 @@
    '=UA4HY' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UA4NF' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UA4PN' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=UA9XK/1' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=UB5O/0' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
-  '=UB5O/2' => '264',
-  '=UB5O/4' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
-  '=UB5O/8' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
-  '=UB5O/9' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
+  '=UA5B/4' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UB8S/P' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UC4I' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UD6AOP/0' => '265,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363,1365,1367,1369,1371,1373,1375,1377,1379',
-  '=UE80PQ' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UE80SKR' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
    '=UI4I' => '263,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315',
+  '=VA2VT' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
    '=VA2VVV' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
    '=VE2CSI' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
    '=VE2EKA' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
@@ -4448,12 +4440,13 @@
    '=VE2IDX' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
    '=VE2IM' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
    '=VE2TKH' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
-  '=VER20211029' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
-  '=VERSION' => '253',
+  '=VER20211125' => '276,1503,1505,1507,1509,1511,1513,1515,1517,1519,1521,1523,1525,1527,1529,1531,1533',
+  '=VERSION' => '228',
    '=VK0AI' => '336',
    '=VK0EK' => '335',
+  '=VK3ZW' => '277,1535,1537,1539,1541,1543,1545,1547,1549',
    '=VP6D' => '284',
-  '=VP8AL' => '1717,1719,1722,1724,1726,1728,1730,330,343',
+  '=VP8/SQ1SGB' => '1717,1719,1722,1724,1726,1728,1730,330,343',
    '=VP8CA' => '342',
    '=VP8DXU' => '345',
    '=VP8PJ' => '344',
@@ -4472,6 +4465,7 @@
    '=W1PR' => '179',
    '=W1RH' => '179',
    '=W1SRD' => '179',
+  '=W2ACY' => '179',
    '=W2GS' => '179',
    '=W2UP' => '179',
    '=W2VJN' => '179',
@@ -4548,6 +4542,7 @@
    '=W9KKN' => '179',
    '=W9RNY' => '179',
    '=WA0LJM' => '179',
+  '=WA0OII' => '182',
    '=WA0WWW' => '179',
    '=WA1FCN' => '179',
    '=WA1FMM' => '179',
@@ -4556,15 +4551,14 @@
    '=WA2VYA' => '179',
    '=WA3C' => '179',
    '=WA4BUD' => '191,900,902,904,906,908',
+  '=WA4JA' => '179',
    '=WA4RRE' => '191,900,902,904,906,908',
    '=WA5POK' => '179',
    '=WA6QDQ' => '186',
-  '=WA7B' => '191,900,902,904,906,908',
    '=WA8KAN' => '179',
    '=WA8OJR' => '179',
    '=WA8ZBT' => '179',
    '=WB2HMY' => '194',
-  '=WB3JFS' => '179',
    '=WB4JTT' => '186',
    '=WB4YDL' => '179',
    '=WB4YDY' => '179',
@@ -4588,7 +4582,6 @@
    '=WH7R' => '179',
    '=WI5GUY' => '191,900,902,904,906,908',
    '=WJ9B' => '179',
-  '=WK1K' => '186',
    '=WL5H' => '179',
    '=WL7CSW' => '186',
    '=WL7OU' => '179',
@@ -15357,7 +15350,6 @@
    'R1T' => '1216',
    'R1W' => '1218',
    'R1X' => '1218',
-  'R1Y' => '1220',
    'R1Z' => '1220',
    'R2A' => '1222',
    'R2B' => '1222',
@@ -15602,7 +15594,6 @@
    'RA1T' => '1216',
    'RA1W' => '1218',
    'RA1X' => '1218',
-  'RA1Y' => '1220',
    'RA1Z' => '1220',
    'RA2' => '264',
    'RA3A' => '1222',
@@ -15822,7 +15813,6 @@
    'RC1T' => '1216',
    'RC1W' => '1218',
    'RC1X' => '1218',
-  'RC1Y' => '1220',
    'RC1Z' => '1220',
    'RC2A' => '1222',
    'RC2B' => '1222',
@@ -16067,7 +16057,6 @@
    'RD1T' => '1216',
    'RD1W' => '1218',
    'RD1X' => '1218',
-  'RD1Y' => '1220',
    'RD1Z' => '1220',
    'RD2A' => '1222',
    'RD2B' => '1222',
@@ -16312,7 +16301,6 @@
    'RE1T' => '1216',
    'RE1W' => '1218',
    'RE1X' => '1218',
-  'RE1Y' => '1220',
    'RE1Z' => '1220',
    'RE2A' => '1222',
    'RE2B' => '1222',
@@ -16557,7 +16545,6 @@
    'RF1T' => '1216',
    'RF1W' => '1218',
    'RF1X' => '1218',
-  'RF1Y' => '1220',
    'RF1Z' => '1220',
    'RF2A' => '1222',
    'RF2B' => '1222',
@@ -16802,7 +16789,6 @@
    'RG1T' => '1216',
    'RG1W' => '1218',
    'RG1X' => '1218',
-  'RG1Y' => '1220',
    'RG1Z' => '1220',
    'RG2A' => '1222',
    'RG2B' => '1222',
@@ -17066,7 +17052,6 @@
    'RJ1T' => '1216',
    'RJ1W' => '1218',
    'RJ1X' => '1218',
-  'RJ1Y' => '1220',
    'RJ1Z' => '1220',
    'RJ2A' => '1222',
    'RJ2B' => '1222',
@@ -17311,7 +17296,6 @@
    'RK1T' => '1216',
    'RK1W' => '1218',
    'RK1X' => '1218',
-  'RK1Y' => '1220',
    'RK1Z' => '1220',
    'RK2A' => '1222',
    'RK2B' => '1222',
@@ -17556,7 +17540,6 @@
    'RL1T' => '1216',
    'RL1W' => '1218',
    'RL1X' => '1218',
-  'RL1Y' => '1220',
    'RL1Z' => '1220',
    'RL2A' => '1222',
    'RL2B' => '1222',
@@ -17801,7 +17784,6 @@
    'RM1T' => '1216',
    'RM1W' => '1218',
    'RM1X' => '1218',
-  'RM1Y' => '1220',
    'RM1Z' => '1220',
    'RM2A' => '1222',
    'RM2B' => '1222',
@@ -18046,7 +18028,6 @@
    'RN1T' => '1216',
    'RN1W' => '1218',
    'RN1X' => '1218',
-  'RN1Y' => '1220',
    'RN1Z' => '1220',
    'RN2A' => '1222',
    'RN2B' => '1222',
@@ -18291,7 +18272,6 @@
    'RO1T' => '1216',
    'RO1W' => '1218',
    'RO1X' => '1218',
-  'RO1Y' => '1220',
    'RO1Z' => '1220',
    'RO2A' => '1222',
    'RO2B' => '1222',
@@ -18536,7 +18516,6 @@
    'RQ1T' => '1216',
    'RQ1W' => '1218',
    'RQ1X' => '1218',
-  'RQ1Y' => '1220',
    'RQ1Z' => '1220',
    'RQ2A' => '1222',
    'RQ2B' => '1222',
@@ -18781,7 +18760,6 @@
    'RT1T' => '1216',
    'RT1W' => '1218',
    'RT1X' => '1218',
-  'RT1Y' => '1220',
    'RT1Z' => '1220',
    'RT2A' => '1222',
    'RT2B' => '1222',
@@ -19026,7 +19004,6 @@
    'RU1T' => '1216',
    'RU1W' => '1218',
    'RU1X' => '1218',
-  'RU1Y' => '1220',
    'RU1Z' => '1220',
    'RU2A' => '1222',
    'RU2B' => '1222',
@@ -19271,7 +19248,6 @@
    'RV1T' => '1216',
    'RV1W' => '1218',
    'RV1X' => '1218',
-  'RV1Y' => '1220',
    'RV1Z' => '1220',
    'RV2A' => '1222',
    'RV2B' => '1222',
@@ -19516,7 +19492,6 @@
    'RW1T' => '1216',
    'RW1W' => '1218',
    'RW1X' => '1218',
-  'RW1Y' => '1220',
    'RW1Z' => '1220',
    'RW2A' => '1222',
    'RW2B' => '1222',
@@ -19761,7 +19736,6 @@
    'RX1T' => '1216',
    'RX1W' => '1218',
    'RX1X' => '1218',
-  'RX1Y' => '1220',
    'RX1Z' => '1220',
    'RX2A' => '1222',
    'RX2B' => '1222',
@@ -20006,7 +19980,6 @@
    'RY1T' => '1216',
    'RY1W' => '1218',
    'RY1X' => '1218',
-  'RY1Y' => '1220',
    'RY1Z' => '1220',
    'RY2A' => '1222',
    'RY2B' => '1222',
@@ -20251,7 +20224,6 @@
    'RZ1T' => '1216',
    'RZ1W' => '1218',
    'RZ1X' => '1218',
-  'RZ1Y' => '1220',
    'RZ1Z' => '1220',
    'RZ2A' => '1222',
    'RZ2B' => '1222',
@@ -20823,7 +20795,6 @@
    'U1T' => '1216',
    'U1W' => '1218',
    'U1X' => '1218',
-  'U1Y' => '1220',
    'U1Z' => '1220',
    'U2A' => '1222',
    'U2B' => '1222',
@@ -21069,7 +21040,6 @@
    'UA1T' => '1216',
    'UA1W' => '1218',
    'UA1X' => '1218',
-  'UA1Y' => '1220',
    'UA1Z' => '1220',
    'UA2' => '264',
    'UA3A' => '1222',
@@ -21289,7 +21259,6 @@
    'UB1T' => '1216',
    'UB1W' => '1218',
    'UB1X' => '1218',
-  'UB1Y' => '1220',
    'UB1Z' => '1220',
    'UB2' => '264',
    'UB3A' => '1222',
@@ -21509,7 +21478,6 @@
    'UC1T' => '1216',
    'UC1W' => '1218',
    'UC1X' => '1218',
-  'UC1Y' => '1220',
    'UC1Z' => '1220',
    'UC2' => '264',
    'UC3A' => '1222',
@@ -21729,7 +21697,6 @@
    'UD1T' => '1216',
    'UD1W' => '1218',
    'UD1X' => '1218',
-  'UD1Y' => '1220',
    'UD1Z' => '1220',
    'UD2' => '264',
    'UD3A' => '1222',
@@ -21949,7 +21916,6 @@
    'UE1T' => '1216',
    'UE1W' => '1218',
    'UE1X' => '1218',
-  'UE1Y' => '1220',
    'UE1Z' => '1220',
    'UE2' => '264',
    'UE3A' => '1222',
@@ -22170,7 +22136,6 @@
    'UF1T' => '1216',
    'UF1W' => '1218',
    'UF1X' => '1218',
-  'UF1Y' => '1220',
    'UF1Z' => '1220',
    'UF2' => '264',
    'UF3A' => '1222',
@@ -22389,7 +22354,6 @@
    'UG1T' => '1216',
    'UG1W' => '1218',
    'UG1X' => '1218',
-  'UG1Y' => '1220',
    'UG1Z' => '1220',
    'UG2' => '264',
    'UG3A' => '1222',
@@ -22609,7 +22573,6 @@
    'UH1T' => '1216',
    'UH1W' => '1218',
    'UH1X' => '1218',
-  'UH1Y' => '1220',
    'UH1Z' => '1220',
    'UH2' => '264',
    'UH3A' => '1222',
@@ -22829,7 +22792,6 @@
    'UI1T' => '1216',
    'UI1W' => '1218',
    'UI1X' => '1218',
-  'UI1Y' => '1220',
    'UI1Z' => '1220',
    'UI2' => '264',
    'UI3A' => '1222',
@@ -26368,23 +26330,6 @@
    'VG7' => '1516',
    'VG8' => '1518',
    'VG9' => '1520',
-  'VH' => '277',
-  'VH1' => '1534',
-  'VH2' => '1536',
-  'VH3' => '1538',
-  'VH4' => '1540',
-  'VH5' => '1542',
-  'VH6' => '1544',
-  'VH7' => '1546',
-  'VH8' => '1548',
-  'VH9' => '278',
-  'VH9C' => '337',
-  'VH9L' => '338',
-  'VH9M' => '339',
-  'VH9W' => '340',
-  'VH9X' => '341',
-  'VH9Y' => '337',
-  'VH9Z' => '340',
    'VI' => '277',
    'VI0' => '1718',
    'VI1' => '1534',
@@ -26412,14 +26357,6 @@
    'VJ6' => '1544',
    'VJ7' => '1546',
    'VJ8' => '1548',
-  'VJ9' => '278',
-  'VJ9C' => '337',
-  'VJ9L' => '338',
-  'VJ9M' => '339',
-  'VJ9W' => '340',
-  'VJ9X' => '341',
-  'VJ9Y' => '337',
-  'VJ9Z' => '340',
    'VK' => '277,1535,1537,1539,1541,1543,1545,1547,1549',
    'VK0' => '1718,335,336',
    'VK0H' => '335',
@@ -26458,48 +26395,6 @@
    'VL6' => '1544',
    'VL7' => '1546',
    'VL8' => '1548',
-  'VL9' => '278',
-  'VL9C' => '337',
-  'VL9L' => '338',
-  'VL9M' => '339',
-  'VL9W' => '340',
-  'VL9X' => '341',
-  'VL9Y' => '337',
-  'VL9Z' => '340',
-  'VM' => '277',
-  'VM1' => '1534',
-  'VM2' => '1536',
-  'VM3' => '1538',
-  'VM4' => '1540',
-  'VM5' => '1542',
-  'VM6' => '1544',
-  'VM7' => '1546',
-  'VM8' => '1548',
-  'VM9' => '278',
-  'VM9C' => '337',
-  'VM9L' => '338',
-  'VM9M' => '339',
-  'VM9W' => '340',
-  'VM9X' => '341',
-  'VM9Y' => '337',
-  'VM9Z' => '340',
-  'VN' => '277',
-  'VN1' => '1534',
-  'VN2' => '1536',
-  'VN3' => '1538',
-  'VN4' => '1540',
-  'VN5' => '1542',
-  'VN6' => '1544',
-  'VN7' => '1546',
-  'VN8' => '1548',
-  'VN9' => '278',
-  'VN9C' => '337',
-  'VN9L' => '338',
-  'VN9M' => '339',
-  'VN9W' => '340',
-  'VN9X' => '341',
-  'VN9Y' => '337',
-  'VN9Z' => '340',
    'VO1' => '1522',
    'VO2' => '1524',
    'VP2' => '279,280,281',
@@ -26550,23 +26445,11 @@
    'VY1' => '1530',
    'VY2' => '1532',
    'VY9' => '276',
-  'VZ' => '277',
-  'VZ1' => '1534',
-  'VZ2' => '1536',
-  'VZ3' => '1538',
-  'VZ4' => '1540',
-  'VZ5' => '1542',
-  'VZ6' => '1544',
-  'VZ7' => '1546',
-  'VZ8' => '1548',
-  'VZ9' => '278',
-  'VZ9C' => '337',
    'VZ9L' => '338',
    'VZ9M' => '339',
    'VZ9W' => '340',
    'VZ9X' => '341',
    'VZ9Y' => '337',
-  'VZ9Z' => '340',
    'W' => '179',
    'W0' => '1666,1667,1668,1669,1670,1671,1672,1673',
    'W1' => '1674,1675,1676,1677,1678,1679',
@@ -28975,8 +28858,8 @@
     1515 => bless( { name => 'Alberta-VE6', dxcc => 197, itu => 2, cq => 4, utcoff => 7.00, lat => 52.1166666666667, long => -113.833333333333, qra => 'DO32CC' }, 'Prefix'),
     1516 => bless( { name => 'British-Columbia-VE', dxcc => 197, itu => 2, cq => 3, utcoff => 7.00, lat => 49.5333333333333, long => -122.666666666667, qra => 'CN89PM' }, 'Prefix'),
     1517 => bless( { name => 'British-Columbia-VE7', dxcc => 197, itu => 2, cq => 3, utcoff => 7.00, lat => 49.5333333333333, long => -122.666666666667, qra => 'CN89PM' }, 'Prefix'),
-   1518 => bless( { name => 'Northwest-Territories-VE', dxcc => 197, itu => 3, cq => 1, utcoff => 7.00, lat => 62.45, long => -147.766666666667, qra => 'BP62CK' }, 'Prefix'),
-   1519 => bless( { name => 'Northwest-Territories-VE8', dxcc => 197, itu => 3, cq => 1, utcoff => 7.00, lat => 62.45, long => -147.766666666667, qra => 'BP62CK' }, 'Prefix'),
+   1518 => bless( { name => 'Northwest-Territories-VE', dxcc => 197, itu => 3, cq => 1, utcoff => 7.00, lat => 62.45, long => -114.4, qra => 'DP22TK' }, 'Prefix'),
+   1519 => bless( { name => 'Northwest-Territories-VE8', dxcc => 197, itu => 3, cq => 1, utcoff => 7.00, lat => 62.45, long => -114.4, qra => 'DP22TK' }, 'Prefix'),
     1520 => bless( { name => 'New-Brunswick-VE', dxcc => 197, itu => 9, cq => 5, utcoff => 4.00, lat => 45.75, long => -65.8, qra => 'FN75CS' }, 'Prefix'),
     1521 => bless( { name => 'New-Brunswick-VE9', dxcc => 197, itu => 9, cq => 5, utcoff => 4.00, lat => 45.75, long => -65.8, qra => 'FN75CS' }, 'Prefix'),
     1522 => bless( { name => 'Newfoundland-VE', dxcc => 197, itu => 9, cq => 5, utcoff => 3.50, lat => 48.4833333333333, long => -55.4666666666667, qra => 'GN28GL' }, 'Prefix'),
diff --git a/data/wpxloc.raw b/data/wpxloc.raw

index 1c6743d119e439da434b98b7d696bccba2dadf23..6ae6981fcc95a19a4ce9e99801597e750a07eea8 100644 (file)
--- a/data/wpxloc.raw
+++ b/data/wpxloc.raw
@@ -1,6 +1,6 @@
  ! $Id$
  !
-! This file was created by Jim Reisert AD1C on 29 Oct 2021
+! This file was created by Jim Reisert AD1C on 25 Nov 2021
  ! See: https://www.country-files.com/dx-cluster/wpxloc/
  !
  ! Highest DXCC number is 359 ("VERSION" entity)
@@ -1447,7 +1447,7 @@ FW/W Wallis-Island-FW                                  59 62 32 -12.00 13 16  0
  FW Wallis-Island-FW/W                                  59 62 32 -12.00 13 16  0 S 176 12  0 W
  FY French-Guiana-FY                                    60 12  9   3.00  4  0  0 N  53  0  0 W @
  G England-G                                            61 27 14   0.00 52 46  0 N   1 28  0 W @
-2E,M England-G                                         61 27 14   0.00 52 46  0 N   1 28  0 W
+2E,2ZE,M England-G                                     61 27 14   0.00 52 46  0 N   1 28  0 W
  GD Isle-of-Man-GD                                      62 27 14   0.00 54 12  0 N   4 32  0 W @
  2D,GT,MD,MT Isle-of-Man-GD                             62 27 14   0.00 54 12  0 N   4 32  0 W
  GI Northern-Ireland-GI                                 63 27 14   0.00 54 44  0 N   6 41  0 W @
@@ -3187,15 +3187,11 @@ UE1W,UE1X,UF1W,UF1X,UG1W,UG1X,UH1W Pskovskaya-UA      179 29 16  -4.00 57 19  0
  UH1X,UI1W,UI1X Pskovskaya-UA                          179 29 16  -4.00 57 19  0 N  29 15  0 E
  UA1Z Murmanskaya-UA                                   179 19 16  -4.00 68  2  0 N  34 34  0 E
  UA Murmanskaya-UA1Z                                   179 19 16  -4.00 68  2  0 N  34 34  0 E
-R1Y,R1Z,RA1Y,RA1Z,RC1Y,RC1Z,RD1Y,RD1Z Murmanskaya-UA  179 19 16  -4.00 68  2  0 N  34 34  0 E
-RE1Y,RE1Z,RF1Y,RF1Z,RG1Y,RG1Z,RJ1Y Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
-RJ1Z,RK1Y,RK1Z,RL1Y,RL1Z,RM1Y,RM1Z Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
-RN1Y,RN1Z,RO1Y,RO1Z,RQ1Y,RQ1Z,RT1Y Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
-RT1Z,RU1Y,RU1Z,RV1Y,RV1Z,RW1Y,RW1Z Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
-RX1Y,RX1Z,RY1Y,RY1Z,RZ1Y,RZ1Z,U1Y,U1Z Murmanskaya-UA  179 19 16  -4.00 68  2  0 N  34 34  0 E
-UA1Y,UB1Y,UB1Z,UC1Y,UC1Z,UD1Y,UD1Z Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
-UE1Y,UE1Z,UF1Y,UF1Z,UG1Y,UG1Z,UH1Y Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
-UH1Z,UI1Y,UI1Z Murmanskaya-UA                         179 19 16  -4.00 68  2  0 N  34 34  0 E
+R1Z,RA1Z,RC1Z,RD1Z,RE1Z,RF1Z,RG1Z Murmanskaya-UA      179 19 16  -4.00 68  2  0 N  34 34  0 E
+RJ1Z,RK1Z,RL1Z,RM1Z,RN1Z,RO1Z,RQ1Z Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
+RT1Z,RU1Z,RV1Z,RW1Z,RX1Z,RY1Z,RZ1Z Murmanskaya-UA     179 19 16  -4.00 68  2  0 N  34 34  0 E
+U1Z,UB1Z,UC1Z,UD1Z,UE1Z,UF1Z,UG1Z Murmanskaya-UA      179 19 16  -4.00 68  2  0 N  34 34  0 E
+UH1Z,UI1Z Murmanskaya-UA                              179 19 16  -4.00 68  2  0 N  34 34  0 E
  UA3A Moscow-city-UA                                   179 29 16  -4.00 55 45  0 N  37 37  0 E
  UA Moscow-city-UA3A                                   179 29 16  -4.00 55 45  0 N  37 37  0 E
  R2A,R2B,R2C,R3A,R3B,R3C,R5A,R5B,R5C Moscow-city-UA    179 29 16  -4.00 55 45  0 N  37 37  0 E
@@ -5017,10 +5013,10 @@ VE7 British-Columbia-VE                               197  2  3   7.00 49 32  0
  VE British-Columbia-VE7                               197  2  3   7.00 49 32  0 N 122 40  0 W
  CF7,CG7,CJ7,CK7,VA7,VB7,VC7,VG7 British-Columbia-VE   197  2  3   7.00 49 32  0 N 122 40  0 W
  VX7,XL7,XM7 British-Columbia-VE                       197  2  3   7.00 49 32  0 N 122 40  0 W
-VE8 Northwest-Territories-VE                          197  3  1   7.00 62 27  0 N 147 46  0 W
-VE Northwest-Territories-VE8                          197  3  1   7.00 62 27  0 N 147 46  0 W
-CF8,CG8,CJ8,CK8,VA8,VB8,VC8 Northwest-Territories-VE  197  3  1   7.00 62 27  0 N 147 46  0 W
-VG8,VX8,XL8,XM8 Northwest-Territories-VE              197  3  1   7.00 62 27  0 N 147 46  0 W
+VE8 Northwest-Territories-VE                          197  3  1   7.00 62 27  0 N 114 24  0 W
+VE Northwest-Territories-VE8                          197  3  1   7.00 62 27  0 N 114 24  0 W
+CF8,CG8,CJ8,CK8,VA8,VB8,VC8 Northwest-Territories-VE  197  3  1   7.00 62 27  0 N 114 24  0 W
+VG8,VX8,XL8,XM8 Northwest-Territories-VE              197  3  1   7.00 62 27  0 N 114 24  0 W
  VE9 New-Brunswick-VE                                  197  9  5   4.00 45 45  0 N  65 48  0 W
  VE New-Brunswick-VE9                                  197  9  5   4.00 45 45  0 N  65 48  0 W
  CF9,CG9,CJ9,CK9,VA9,VB9,VC9,VG9,VX9 New-Brunswick-VE  197  9  5   4.00 45 45  0 N  65 48  0 W
@@ -5043,36 +5039,33 @@ VY2 Prince-Edward-Island-VE                           197  9  5   4.00 46 22  0
  VE Prince-Edward-Island-VY2                           197  9  5   4.00 46 22  0 N  63 26  0 W
  CI2,CZ2,VF2,XK2,XO2 Prince-Edward-Island-VE           197  9  5   4.00 46 22  0 N  63 26  0 W
  VK Australia-VK                                       198 59 30 -10.00 23 42  0 S 132 20  0 E @
-AX,VH,VI,VJ,VL,VM,VN,VZ Australia-VK                  198 59 30 -10.00 23 42  0 S 132 20  0 E
+AX,VI,VJ,VL Australia-VK                              198 59 30 -10.00 23 42  0 S 132 20  0 E
  VK1 Australian-Capital-Territory-VK                   198 59 30 -10.00 35 30  0 S 149  0  0 E
  VK Australian-Capital-Territory-VK1                   198 59 30 -10.00 35 30  0 S 149  0  0 E
-AX1,VH1,VI1,VJ1,VL1 Australian-Capital-Territory-VK   198 59 30 -10.00 35 30  0 S 149  0  0 E
-VM1,VN1,VZ1 Australian-Capital-Territory-VK           198 59 30 -10.00 35 30  0 S 149  0  0 E
+AX1,VI1,VJ1,VL1 Australian-Capital-Territory-VK       198 59 30 -10.00 35 30  0 S 149  0  0 E
  VK2 New-South-Wales-VK                                198 59 30 -10.00 34  0  0 S 151  0  0 E
  VK New-South-Wales-VK2                                198 59 30 -10.00 34  0  0 S 151  0  0 E
-AX2,VH2,VI2,VJ2,VL2,VM2,VN2,VZ2 New-South-Wales-VK    198 59 30 -10.00 34  0  0 S 151  0  0 E
+AX2,VI2,VJ2,VL2 New-South-Wales-VK                    198 59 30 -10.00 34  0  0 S 151  0  0 E
  VK3 Victoria-VK                                       198 59 30 -10.00 38  0  0 S 145  0  0 E
  VK Victoria-VK3                                       198 59 30 -10.00 38  0  0 S 145  0  0 E
-AX3,VH3,VI3,VJ3,VL3,VM3,VN3,VZ3 Victoria-VK           198 59 30 -10.00 38  0  0 S 145  0  0 E
+AX3,VI3,VJ3,VL3 Victoria-VK                           198 59 30 -10.00 38  0  0 S 145  0  0 E
  VK4 Queensland-VK                                     198 55 30 -10.00 27 30  0 S 153  0  0 E
  VK Queensland-VK4                                     198 55 30 -10.00 27 30  0 S 153  0  0 E
-AX4,VH4,VI4,VJ4,VL4,VM4,VN4,VZ4 Queensland-VK         198 55 30 -10.00 27 30  0 S 153  0  0 E
+AX4,VI4,VJ4,VL4 Queensland-VK                         198 55 30 -10.00 27 30  0 S 153  0  0 E
  VK5 South-Australia-VK                                198 59 30  -9.00 34 54  0 S 138 36  0 E
  VK South-Australia-VK5                                198 59 30  -9.00 34 54  0 S 138 36  0 E
-AX5,VH5,VI5,VJ5,VL5,VM5,VN5,VZ5 South-Australia-VK    198 59 30  -9.00 34 54  0 S 138 36  0 E
+AX5,VI5,VJ5,VL5 South-Australia-VK                    198 59 30  -9.00 34 54  0 S 138 36  0 E
  VK6 Western-Australia-VK                              198 58 29  -8.00 32  0  0 S 115 54  0 E
  VK Western-Australia-VK6                              198 58 29  -8.00 32  0  0 S 115 54  0 E
-AX6,VH6,VI6,VJ6,VL6,VM6,VN6,VZ6 Western-Australia-VK  198 58 29  -8.00 32  0  0 S 115 54  0 E
+AX6,VI6,VJ6,VL6 Western-Australia-VK                  198 58 29  -8.00 32  0  0 S 115 54  0 E
  VK7 Tasmania-VK                                       198 59 30 -10.00 42 54  0 S 147 18  0 E
  VK Tasmania-VK7                                       198 59 30 -10.00 42 54  0 S 147 18  0 E
-AX7,VH7,VI7,VJ7,VL7,VM7,VN7,VZ7 Tasmania-VK           198 59 30 -10.00 42 54  0 S 147 18  0 E
+AX7,VI7,VJ7,VL7 Tasmania-VK                           198 59 30 -10.00 42 54  0 S 147 18  0 E
  VK8 Northern-Territory-VK                             198 55 29  -9.00 12 30  0 S 130 54  0 E
  VK Northern-Territory-VK8                             198 55 29  -9.00 12 30  0 S 130 54  0 E
-AX8,VH8,VI8,VJ8,VL8,VM8,VN8 Northern-Territory-VK     198 55 29  -9.00 12 30  0 S 130 54  0 E
-VZ8 Northern-Territory-VK                             198 55 29  -9.00 12 30  0 S 130 54  0 E
+AX8,VI8,VJ8,VL8 Northern-Territory-VK                 198 55 29  -9.00 12 30  0 S 130 54  0 E
  VK9N Norfolk-Island-VK9N                              203 60 32 -11.50 29  2  0 S 167 56  0 E @
-AX9,VH9,VI9,VJ9,VK9,VL9,VM9,VN9 Norfolk-Island-VK9N   203 60 32 -11.50 29  2  0 S 167 56  0 E
-VZ9 Norfolk-Island-VK9N                               203 60 32 -11.50 29  2  0 S 167 56  0 E
+AX9,VI9,VK9 Norfolk-Island-VK9N                       203 60 32 -11.50 29  2  0 S 167 56  0 E
  VP2E Anguilla-VP2E                                    207 11  8   4.00 18 14  0 N  63  0  0 W @
  VP2 Anguilla-VP2E                                     207 11  8   4.00 18 14  0 N  63  0  0 W
  VP2M Montserrat-VP2M                                  208 11  8   4.00 16 45  0 N  62 11  0 W @
@@ -5829,28 +5822,21 @@ VK0M Macquarie-Island-VK0M                            206 60 30 -10.00 54 36  0
  VK0 Macquarie-Island-VK0M                             206 60 30 -10.00 54 36  0 S 158 53  0 E
  VK9C Cocos-Keeling-Islands-VK9C                       201 54 29  -6.50 12  9  0 S  96 49  0 E @
  VK9 Cocos-Keeling-Islands-VK9C                        201 54 29  -6.50 12  9  0 S  96 49  0 E
-AX9C,AX9Y,VH9C,VH9Y,VI9C Cocos-Keeling-Islands-VK9C   201 54 29  -6.50 12  9  0 S  96 49  0 E
-VI9Y,VJ9C,VJ9Y,VK9FC Cocos-Keeling-Islands-VK9C       201 54 29  -6.50 12  9  0 S  96 49  0 E
-VK9KC,VK9Y,VK9ZY,VL9C Cocos-Keeling-Islands-VK9C      201 54 29  -6.50 12  9  0 S  96 49  0 E
-VL9Y,VM9C,VM9Y,VN9C,VN9Y Cocos-Keeling-Islands-VK9C   201 54 29  -6.50 12  9  0 S  96 49  0 E
-VZ9C,VZ9Y Cocos-Keeling-Islands-VK9C                  201 54 29  -6.50 12  9  0 S  96 49  0 E
+AX9C,AX9Y,VI9C,VI9Y,VK9FC Cocos-Keeling-Islands-VK9C  201 54 29  -6.50 12  9  0 S  96 49  0 E
+VK9KC,VK9Y,VK9ZY,VZ9Y Cocos-Keeling-Islands-VK9C      201 54 29  -6.50 12  9  0 S  96 49  0 E
  VK9L Lord-Howe-Island-VK9L                            199 60 30 -10.50 31 33  0 S 159  5  0 E @
  VK9 Lord-Howe-Island-VK9L                             199 60 30 -10.50 31 33  0 S 159  5  0 E
-AX9L,VH9L,VI9L,VJ9L,VK9FL Lord-Howe-Island-VK9L       199 60 30 -10.50 31 33  0 S 159  5  0 E
-VK9ZL,VL9L,VM9L,VN9L,VZ9L Lord-Howe-Island-VK9L       199 60 30 -10.50 31 33  0 S 159  5  0 E
+AX9L,VI9L,VK9FL,VK9ZL,VZ9L Lord-Howe-Island-VK9L      199 60 30 -10.50 31 33  0 S 159  5  0 E
  VK9M Mellish-Reef-VK9M                                202 56 30 -10.00 17 24  0 S 155 51  0 E @
  VK9 Mellish-Reef-VK9M                                 202 56 30 -10.00 17 24  0 S 155 51  0 E
-AX9M,VH9M,VI9M,VJ9M,VL9M,VM9M,VN9M Mellish-Reef-VK9M  202 56 30 -10.00 17 24  0 S 155 51  0 E
-VZ9M Mellish-Reef-VK9M                                202 56 30 -10.00 17 24  0 S 155 51  0 E
+AX9M,VI9M,VZ9M Mellish-Reef-VK9M                      202 56 30 -10.00 17 24  0 S 155 51  0 E
  VK9W Willis-Island-VK9W                               204 55 30 -10.00 16 13  0 S 150  1  0 E @
  VK9 Willis-Island-VK9W                                204 55 30 -10.00 16 13  0 S 150  1  0 E
-AX9W,AX9Z,VH9W,VH9Z,VI9W,VI9Z Willis-Island-VK9W      204 55 30 -10.00 16 13  0 S 150  1  0 E
-VJ9W,VJ9Z,VK9FW,VK9Z,VL9W,VL9Z Willis-Island-VK9W     204 55 30 -10.00 16 13  0 S 150  1  0 E
-VM9W,VM9Z,VN9W,VN9Z,VZ9W,VZ9Z Willis-Island-VK9W      204 55 30 -10.00 16 13  0 S 150  1  0 E
+AX9W,AX9Z,VI9W,VI9Z,VK9FW,VK9Z Willis-Island-VK9W     204 55 30 -10.00 16 13  0 S 150  1  0 E
+VZ9W Willis-Island-VK9W                               204 55 30 -10.00 16 13  0 S 150  1  0 E
  VK9X Christmas-Island-VK9X                            200 54 29  -7.00 10 29  0 S 105 38  0 E @
  VK9 Christmas-Island-VK9X                             200 54 29  -7.00 10 29  0 S 105 38  0 E
-AX9X,VH9X,VI9X,VJ9X,VK9FX Christmas-Island-VK9X       200 54 29  -7.00 10 29  0 S 105 38  0 E
-VK9KX,VL9X,VM9X,VN9X,VZ9X Christmas-Island-VK9X       200 54 29  -7.00 10 29  0 S 105 38  0 E
+AX9X,VI9X,VK9FX,VK9KX,VZ9X Christmas-Island-VK9X      200 54 29  -7.00 10 29  0 S 105 38  0 E
  VP8/G South-Georgia-Island-VP8/G                      211 73 13   2.00 54 29  0 S  37  5  0 W @
  VP8 South-Georgia-Island-VP8/G                        211 73 13   2.00 54 29  0 S  37  5  0 W
  VP8/H South-Shetland-Islands-VP8/H                    214 73 13   4.00 62  5  0 S  58 40  0 W @
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm

index b10149ec6bcbd9bcf75b27e8839898878c21dd41..08b28acd3298b81d3ec7e644dd387aa70977698e 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -156,8 +156,9 @@ sub start
         }
  
         # establish slug queue, if required
-       $self->{sluggedpc11s} = [];
-       $self->{isslugged} = $DXProt::pc92_slug_changes + $main::systime if $DXProt::pc92_slug_changes;
+       $self->{sluggedpcs} = [];
+       $self->{isslugged} = $DXProt::pc92_slug_changes + $DXProt::last_pc92_slug + 5 if $DXProt::pc92_slug_changes;
+       $self->{isslugged} = 0 if $self->{priv} > 0 || $user->registered || $user->homenode eq $main::mycall;
  
         # send the relevant MOTD
         $self->send_motd;
@@ -613,11 +614,17 @@ sub process
                 }
                 ++$users;
                 $maxusers = $users if $users > $maxusers;
-       }
  
-       while (my ($k, $v) = each %nothereslug) {
-               if ($main::systime >= $v + 300) {
-                       delete $nothereslug{$k};
+               if ($dxchan->{isslugged} && $main::systime > $dxchan->{isslugged}) {
+                       foreach my $ref (@{$dxchan->{sluggedpcs}}) {
+                               if ($ref->[0] == 61) {
+                                       Spot::add(@{$ref->[2]});
+                                       DXProt::send_dx_spot($dxchan, $ref->[1], @{$ref->[2]});
+                               }
+                       }
+
+                       $dxchan->{isslugged} = 0;
+                       $dxchan->{sluggedpcs} = [];
                 }
         }
  
@@ -1032,9 +1039,10 @@ sub format_dx_spot
                 $comment = substr($comment, 0,  $clth-3) . ' ' . $_[12] if $_[12]; 
         }
  
-       return sprintf "DX de %-9.9s%10.1f %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+       return sprintf "DX de %-9.9s%9.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
  }
  
+
  # send a dx spot
  sub dx_spot
  {
diff --git a/perl/DXProt.pm b/perl/DXProt.pm

index f8e60b201cc809744da179708fe8a84b9fbe288b..56c81042dcaa7bd11068a0ce7a217dc6b4cdea0f 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -563,6 +563,7 @@ sub send_dx_spot
         foreach $dxchan (@dxchan) {
                 next if $dxchan == $main::me;
                 next if $dxchan == $self && $self->is_node;
+               next if $dxchan == $self;
                 next if $dxchan->is_rbn;
                 if ($line =~ /PC61/ && !($dxchan->is_spider || $dxchan->is_user)) {
                         unless ($pc11) {
author	Dirk Koopman <djk@tobit.co.uk>
	Fri, 26 Nov 2021 01:20:26 +0000 (01:20 +0000)
committer	Dirk Koopman <djk@tobit.co.uk>
	Fri, 26 Nov 2021 01:20:26 +0000 (01:20 +0000)
Changes		patch \| blob \| history
cmd/dx.pl		patch \| blob \| history
data/cty.dat		patch \| blob \| history
data/prefix_data.pl		patch \| blob \| history
data/wpxloc.raw		patch \| blob \| history
perl/DXCommandmode.pm		patch \| blob \| history
perl/DXProt.pm		patch \| blob \| history