add cty1707 prefix changes

Also pickup version and build from PC92 K records

diff --git a/Changes b/Changes
index 90eef3748b965a47201f13fec483c24ddebddde1..d9009a7f252e82ee7831f76b7e29c454a9f23dab 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+23Oct07=======================================================================
+1. Added CTY-1707 prefix changes

 15Oct07=======================================================================
 1. prevent PC61 from propagating outside spider boxes.
 2. simplify the regex for sh/contest to allow it to work on perl < 5.8.x.
 15Oct07=======================================================================
 1. prevent PC61 from propagating outside spider boxes.
 2. simplify the regex for sh/contest to allow it to work on perl < 5.8.x.

diff --git a/data/cty.dat b/data/cty.dat
index c380873c86865d04ddbf5741101c75b242dbd1c0..90b2100b5c4cde0ced39d896fcceae1f07a283e3 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -43,7 +43,7 @@ Sri Lanka:                22:  41:  AS:    7.00:   -79.90:    -5.5:  4S:
 ITU HQ Geneva:            14:  28:  EU:   46.20:    -6.20:    -1.0:  4U1I:\r
     4U1ITU,4U0ITU,4U2ITU,4U3ITU,4U4ITU,4U5ITU,4U6ITU,4U7ITU,4U8ITU,4U9ITU;\r
 United Nations HQ:        05:  08:  NA:   40.80:    74.00:     5.0:  4U1U:\r
 ITU HQ Geneva:            14:  28:  EU:   46.20:    -6.20:    -1.0:  4U1I:\r
     4U1ITU,4U0ITU,4U2ITU,4U3ITU,4U4ITU,4U5ITU,4U6ITU,4U7ITU,4U8ITU,4U9ITU;\r
 United Nations HQ:        05:  08:  NA:   40.80:    74.00:     5.0:  4U1U:\r

-    4U0UN,4U1UN,4U2UN,4U3UN,4U4UN,4U5UN,4U60UN,4U61UN,4U6UN;\r
+    4U0UN,4U1UN,4U2UN,4U3UN,4U4UN,4U50SPACE,4U5UN,4U6UN;\r

 Vienna Intl Ctr:          15:  28:  EU:   48.20:   -16.30:    -1.0:  *4U1V:\r
     4U1VIC;\r
 Timor-Leste:              28:  54:  OC:   -8.60:  -125.50:    -8.0:  4W:\r
 Vienna Intl Ctr:          15:  28:  EU:   48.20:   -16.30:    -1.0:  *4U1V:\r
     4U1VIC;\r
 Timor-Leste:              28:  54:  OC:   -8.60:  -125.50:    -8.0:  4W:\r


@@ -103,9 +103,9 @@ Kuwait:                   21:  39:  AS:   29.50:   -47.80:    -3.0:  9K:
 Sierra Leone:             35:  46:  AF:    8.50:    13.20:     0.0:  9L:\r
     9L;\r
 West Malaysia:            28:  54:  AS:    3.20:  -101.60:    -7.5:  9M2:\r
 Sierra Leone:             35:  46:  AF:    8.50:    13.20:     0.0:  9L:\r
     9L;\r
 West Malaysia:            28:  54:  AS:    3.20:  -101.60:    -7.5:  9M2:\r

-    9M2,9M4,9W2,9W4;\r
+    9M2,9M4,9M50,9W2,9W4;\r

 East Malaysia:            28:  54:  OC:    5.80:  -118.10:    -7.5:  9M6:\r
 East Malaysia:            28:  54:  OC:    5.80:  -118.10:    -7.5:  9M6:\r

-    9M6,9M8,9W6,9W8,9M4SAB,9M4SEB,9M4SHQ,9M4SMS;\r
+    9M6,9M8,9W6,9W8,9M50MS;\r

 Nepal:                    22:  42:  AS:   27.70:   -85.30:   -5.75:  9N:\r
     9N;\r
 Rep. of Congo:            36:  52:  AF:   -4.30:   -15.30:    -1.0:  9Q:\r
 Nepal:                    22:  42:  AS:   27.70:   -85.30:   -5.75:  9N:\r
     9N;\r
 Rep. of Congo:            36:  52:  AF:   -4.30:   -15.30:    -1.0:  9Q:\r


@@ -151,17 +151,19 @@ China:                    24:  44:  AS:   40.00:  -116.40:    -8.0:  BY:
     BD9O(24)[33],BD9P(24)[33],BD9Q(24)[33],BD9R(24)[33],BD9S(24)[33],BG,\r
     BG3G(23)[33],BG3H(23)[33],BG3I(23)[33],BG3J(23)[33],BG3K(23)[33],\r
     BG3L(23)[33],BG9M(24)[33],BG9N(24)[33],BG9O(24)[33],BG9P(24)[33],BG9Q(24)[33],\r
     BD9O(24)[33],BD9P(24)[33],BD9Q(24)[33],BD9R(24)[33],BD9S(24)[33],BG,\r
     BG3G(23)[33],BG3H(23)[33],BG3I(23)[33],BG3J(23)[33],BG3K(23)[33],\r
     BG3L(23)[33],BG9M(24)[33],BG9N(24)[33],BG9O(24)[33],BG9P(24)[33],BG9Q(24)[33],\r

-    BG9R(24)[33],BG9S(24)[33],BI,BL,BL3G(23)[33],BL3H(23)[33],BL3I(23)[33],\r
-    BL3J(23)[33],BL3K(23)[33],BL3L(23)[33],BL9M(24)[33],BL9N(24)[33],\r
-    BL9O(24)[33],BL9P(24)[33],BL9Q(24)[33],BL9R(24)[33],BL9S(24)[33],BT,\r
-    BT3G(23)[33],BT3H(23)[33],BT3I(23)[33],BT3J(23)[33],BT3K(23)[33],\r
-    BT3L(23)[33],BT9M(24)[33],BT9N(24)[33],BT9O(24)[33],BT9P(24)[33],BT9Q(24)[33],\r
-    BT9R(24)[33],BT9S(24)[33],BY,BY3G(23)[33],BY3H(23)[33],BY3I(23)[33],\r
-    BY3J(23)[33],BY3K(23)[33],BY3L(23)[33],BY9M(24)[33],BY9N(24)[33],\r
-    BY9O(24)[33],BY9P(24)[33],BY9Q(24)[33],BY9R(24)[33],BY9S(24)[33],BZ,\r
-    BZ3G(23)[33],BZ3H(23)[33],BZ3I(23)[33],BZ3J(23)[33],BZ3K(23)[33],\r
-    BZ3L(23)[33],BZ9M(24)[33],BZ9N(24)[33],BZ9O(24)[33],BZ9P(24)[33],BZ9Q(24)[33],\r
-    BZ9R(24)[33],BZ9S(24)[33],XS;\r
+    BG9R(24)[33],BG9S(24)[33],BH,BH3G(23)[33],BH3H(23)[33],BH3I(23)[33],\r
+    BH3J(23)[33],BH3K(23)[33],BH3L(23)[33],BH9M(24)[33],BH9N(24)[33],\r
+    BH9O(24)[33],BH9P(24)[33],BH9Q(24)[33],BH9R(24)[33],BH9S(24)[33],BI,BL,\r
+    BL3G(23)[33],BL3H(23)[33],BL3I(23)[33],BL3J(23)[33],BL3K(23)[33],\r
+    BL3L(23)[33],BL9M(24)[33],BL9N(24)[33],BL9O(24)[33],BL9P(24)[33],BL9Q(24)[33],\r
+    BL9R(24)[33],BL9S(24)[33],BT,BT3G(23)[33],BT3H(23)[33],BT3I(23)[33],\r
+    BT3J(23)[33],BT3K(23)[33],BT3L(23)[33],BT9M(24)[33],BT9N(24)[33],\r
+    BT9O(24)[33],BT9P(24)[33],BT9Q(24)[33],BT9R(24)[33],BT9S(24)[33],BY,\r
+    BY3G(23)[33],BY3H(23)[33],BY3I(23)[33],BY3J(23)[33],BY3K(23)[33],\r
+    BY3L(23)[33],BY9M(24)[33],BY9N(24)[33],BY9O(24)[33],BY9P(24)[33],BY9Q(24)[33],\r
+    BY9R(24)[33],BY9S(24)[33],BZ,BZ3G(23)[33],BZ3H(23)[33],BZ3I(23)[33],\r
+    BZ3J(23)[33],BZ3K(23)[33],BZ3L(23)[33],BZ9M(24)[33],BZ9N(24)[33],\r
+    BZ9O(24)[33],BZ9P(24)[33],BZ9Q(24)[33],BZ9R(24)[33],BZ9S(24)[33],XS;\r

 Nauru:                    31:  65:  OC:   -0.50:  -166.90:   -11.5:  C2:\r
     C2;\r
 Andorra:                  14:  27:  EU:   42.50:    -1.50:    -1.0:  C3:\r
 Nauru:                    31:  65:  OC:   -0.50:  -166.90:   -11.5:  C2:\r
     C2;\r
 Andorra:                  14:  27:  EU:   42.50:    -1.50:    -1.0:  C3:\r


@@ -184,14 +186,11 @@ Antarctica:               13:  74:  SA:  -65.00:    64.00:    -4.0:  CE9:
     ANT,AX0,FT0Y(30)[70],FT2Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],\r
     LU1Z[73],R1AN,VH0(39)[69],VI0(39)[69],VJ0(39)[69],VK0(39)[69],VL0(39)[69],\r
     VM0(39)[69],VN0(39)[69],VZ0(39)[69],ZL0(30)[71],ZL5(30)[71],ZM5(30)[71],\r
     ANT,AX0,FT0Y(30)[70],FT2Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],\r
     LU1Z[73],R1AN,VH0(39)[69],VI0(39)[69],VJ0(39)[69],VK0(39)[69],VL0(39)[69],\r
     VM0(39)[69],VN0(39)[69],VZ0(39)[69],ZL0(30)[71],ZL5(30)[71],ZM5(30)[71],\r

-    ZS7(38)[67],8J1RF(39)[67],8J1RL(39)[67],9V0A,CE9/VK0LD[73],DP0GVN(38)[67],\r
-    DP1POL(38)[67],EM1HO[73],EM1KGG[73],EM1U[73],EM1UC[73],IA0PS(30)[71],\r
-    II0AMZS(30)[71],IR0PS(30)[71],K2ARB/KC4(30)[71],KC4/K2ARB(30)[71],\r
-    KC4AAA(39),KC4AAC[73],KC4AAF(30)[71],KC4USB(12)[72],KC4USV(30)[71],\r
-    KC4USX(30)[71],LU4ZS[73],R1ANB(29)[73],R1ANC(29)[73],R1AND(38)[67],\r
-    R1ANN(38)[67],R1ANT(29)[69],R1ANZ(29)[73],VP8/MM0TJR/P[73],VP8BF[73],\r
-    VP8CTR,VP8DJB[73],VP8DKF(30)[71],VP8PJ[73],VP8ROT[73],VU3BPZ(38)[67],\r
-    W1MRQ/KC4(30)[71];\r
+    ZS7(38)[67],8J1RF(39)[67],8J1RL(39)[67],DP0GVN(38)[67],K2ARB/KC4(30)[71],\r
+    KC4/K2ARB(30)[71],KC4AAA(39),KC4AAC[73],KC4AAF(30)[71],KC4USB(12)[72],\r
+    KC4USV(30)[71],KC4USX(30)[71],LU4ZS[73],R1ANB(29)[73],R1ANC(29)[73],\r
+    R1AND(38)[67],R1ANN(38)[67],R1ANT(29)[69],R1ANZ(29)[73],VP8BF[73],\r
+    VP8DJB[73],VP8DKF(30)[71],VP8PJ[73],VP8ROT[73],W1MRQ/KC4(30)[71];\r

 Cuba:                     08:  11:  NA:   23.10:    82.40:     5.0:  CM:\r
     CL,CM,CO,T4;\r
 Morocco:                  33:  37:  AF:   33.60:     7.50:     0.0:  CN:\r
 Cuba:                     08:  11:  NA:   23.10:    82.40:     5.0:  CM:\r
     CL,CM,CO,T4;\r
 Morocco:                  33:  37:  AF:   33.60:     7.50:     0.0:  CN:\r


@@ -199,7 +198,7 @@ Morocco:                  33:  37:  AF:   33.60:     7.50:     0.0:  CN:
 Bolivia:                  10:  12:  SA:  -16.50:    68.40:     4.0:  CP:\r
     CP;\r
 Portugal:                 14:  37:  EU:   38.70:     9.20:     0.0:  CT:\r
 Bolivia:                  10:  12:  SA:  -16.50:    68.40:     4.0:  CP:\r
     CP;\r
 Portugal:                 14:  37:  EU:   38.70:     9.20:     0.0:  CT:\r

-    CQ,CR,CS,CS98,CT,CT98;\r
+    CQ,CR,CS,CT;\r

 Madeira Is.:              33:  36:  AF:   32.60:    16.90:     0.0:  CT3:\r
     CQ3,CQ9,CR3,CR9,CS3,CS9,CT3,CT9,XX;\r
 Azores:                   14:  36:  EU:   37.70:    25.70:     1.0:  CU:\r
 Madeira Is.:              33:  36:  AF:   32.60:    16.90:     0.0:  CT3:\r
     CQ3,CQ9,CR3,CR9,CS3,CS9,CT3,CT9,XX;\r
 Azores:                   14:  36:  EU:   37.70:    25.70:     1.0:  CU:\r


@@ -233,9 +232,9 @@ Bosnia-Herzegovina:       15:  28:  EU:   43.50:   -18.30:    -1.0:  E7:
 Spain:                    14:  37:  EU:   40.40:     3.70:    -1.0:  EA:\r
     AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH;\r
 Balearic Is.:             14:  37:  EU:   39.50:    -2.60:    -1.0:  EA6:\r
 Spain:                    14:  37:  EU:   40.40:     3.70:    -1.0:  EA:\r
     AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH;\r
 Balearic Is.:             14:  37:  EU:   39.50:    -2.60:    -1.0:  EA6:\r

-    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6;\r
+    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,EA5ON/6;\r

 Canary Is.:               33:  36:  AF:   28.40:    15.30:     0.0:  EA8:\r
 Canary Is.:               33:  36:  AF:   28.40:    15.30:     0.0:  EA8:\r

-    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,ED8OTA/D,ED8OTA/H;\r
+    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8;\r

 Ceuta and Melilla:        33:  37:  AF:   35.60:     3.00:    -1.0:  EA9:\r
     AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9;\r
 Ireland:                  14:  27:  EU:   53.30:     6.30:     0.0:  EI:\r
 Ceuta and Melilla:        33:  37:  AF:   35.60:     3.00:    -1.0:  EA9:\r
     AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9;\r
 Ireland:                  14:  27:  EU:   53.30:     6.30:     0.0:  EI:\r


@@ -261,14 +260,14 @@ Tajikistan:               17:  30:  AS:   39.70:   -66.80:    -5.0:  EY:
 Turkmenistan:             17:  30:  AS:   38.00:   -58.40:    -5.0:  EZ:\r
     EZ;\r
 France:                   14:  27:  EU:   48.80:    -2.30:    -1.0:  F:\r
 Turkmenistan:             17:  30:  AS:   38.00:   -58.40:    -5.0:  EZ:\r
     EZ;\r
 France:                   14:  27:  EU:   48.80:    -2.30:    -1.0:  F:\r

-    F,HW,HX,HY,TH,TM,TP,TQ,TV,TW,4U60UO;\r
+    F,HW,HX,HY,TH,TM,TP,TQ,TV,TW;\r

 Guadeloupe:               08:  11:  NA:   16.00:    61.70:     4.0:  FG:\r
     FG,TO1T,TO1USB,TO2ANT,TO2FG,TO2OOO,TO4T,TO5BG,TO5C,TO5G,TO5GI,TO5ROM,TO5S,\r
     TO6T,TO7ACR,TO7AES,TO7DSR,TO7GAS,TO7T,TO8CW,TO8RR,TO9T;\r
 Mayotte:                  39:  53:  AF:  -13.00:   -45.30:    -3.0:  FH:\r
     FH,TO8MZ,TX0P,TX5M,TX5NK,TX5T,TX6A;\r
 French St. Martin:        08:  11:  NA:   18.10:    63.10:     4.0:  FJ:\r
 Guadeloupe:               08:  11:  NA:   16.00:    61.70:     4.0:  FG:\r
     FG,TO1T,TO1USB,TO2ANT,TO2FG,TO2OOO,TO4T,TO5BG,TO5C,TO5G,TO5GI,TO5ROM,TO5S,\r
     TO6T,TO7ACR,TO7AES,TO7DSR,TO7GAS,TO7T,TO8CW,TO8RR,TO9T;\r
 Mayotte:                  39:  53:  AF:  -13.00:   -45.30:    -3.0:  FH:\r
     FH,TO8MZ,TX0P,TX5M,TX5NK,TX5T,TX6A;\r
 French St. Martin:        08:  11:  NA:   18.10:    63.10:     4.0:  FJ:\r

-    FJ,FS,TO5D,TO9PL;\r
+    FJ,FS,TO5D;\r

 New Caledonia:            32:  56:  OC:  -22.30:  -166.50:   -11.0:  FK:\r
     FK,TX8,TX1A,TX5CW;\r
 Chesterfield Is.:         30:  56:  OC:  -19.90:  -158.30:   -11.0:  FK/c:\r
 New Caledonia:            32:  56:  OC:  -22.30:  -166.50:   -11.0:  FK:\r
     FK,TX8,TX1A,TX5CW;\r
 Chesterfield Is.:         30:  56:  OC:  -19.90:  -158.30:   -11.0:  FK/c:\r


@@ -281,7 +280,7 @@ French Polynesia:         32:  63:  OC:  -17.60:   149.50:    10.0:  FO:
 Austral Is.:              32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:\r
     FO/DL1AWI,FO/DL5XU,FO/DL9AWI;\r
 Clipperton I.:            07:  10:  NA:   10.30:   109.20:     7.0:  FO/c:\r
 Austral Is.:              32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:\r
     FO/DL1AWI,FO/DL5XU,FO/DL9AWI;\r
 Clipperton I.:            07:  10:  NA:   10.30:   109.20:     7.0:  FO/c:\r

-    FO0/F8UFT,FO0AAA,FO0CI;\r
+    FO0/F8UFT,FO0AAA,FO0CI,TX5C;\r

 Marquesas Is.:            31:  63:  OC:   -9.00:   139.50:    10.0:  FO/m:\r
     FO/HA9G;\r
 St. Pierre & Miquelon:    05:  09:  NA:   46.70:    56.00:     3.0:  FP:\r
 Marquesas Is.:            31:  63:  OC:   -9.00:   139.50:    10.0:  FO/m:\r
     FO/HA9G;\r
 St. Pierre & Miquelon:    05:  09:  NA:   46.70:    56.00:     3.0:  FP:\r


@@ -291,7 +290,7 @@ Reunion:                  39:  53:  AF:  -21.10:   -55.60:    -4.0:  FR:
 Glorioso:                 39:  53:  AF:  -11.50:   -47.30:    -4.0:  FR/g:\r
     TO4G;\r
 Juan de Nova & Europa:    39:  53:  AF:  -19.60:   -41.60:    -3.0:  FR/j:\r
 Glorioso:                 39:  53:  AF:  -11.50:   -47.30:    -4.0:  FR/g:\r
     TO4G;\r
 Juan de Nova & Europa:    39:  53:  AF:  -19.60:   -41.60:    -3.0:  FR/j:\r

-    FR5IZ/E,TO4E,TO4WW;\r
+    TO4E,TO4WW;\r

 Tromelin:                 39:  53:  AF:  -15.90:   -54.40:    -4.0:  FR/t:\r
     FR5ZQ/T,FR5ZU/T;\r
 Crozet:                   39:  68:  AF:  -46.00:   -52.00:    -4.0:  FT5W:\r
 Tromelin:                 39:  53:  AF:  -15.90:   -54.40:    -4.0:  FR/t:\r
     FR5ZQ/T,FR5ZU/T;\r
 Crozet:                   39:  68:  AF:  -46.00:   -52.00:    -4.0:  FT5W:\r


@@ -303,7 +302,7 @@ Amsterdam & St. Paul:     39:  68:  AF:  -37.70:   -77.60:    -5.0:  FT5Z:
 Wallis & Futuna Is.:      32:  62:  OC:  -13.30:   176.30:   -12.0:  FW:\r
     FW;\r
 French Guiana:            09:  12:  SA:    4.90:    52.30:     3.0:  FY:\r
 Wallis & Futuna Is.:      32:  62:  OC:  -13.30:   176.30:   -12.0:  FW:\r
     FW;\r
 French Guiana:            09:  12:  SA:    4.90:    52.30:     3.0:  FY:\r

-    FY,TO7C,TO7IR,TO7R,TO9IS,TX0A;\r
+    FY,TO7C,TO7IR,TO7R,TX0A;\r

 England:                  14:  27:  EU:   51.50:     0.10:     0.0:  G:\r
     2E,G,M;\r
 Isle of Man:              14:  27:  EU:   54.30:     4.50:     0.0:  GD:\r
 England:                  14:  27:  EU:   51.50:     0.10:     0.0:  G:\r
     2E,G,M;\r
 Isle of Man:              14:  27:  EU:   54.30:     4.50:     0.0:  GD:\r


@@ -312,11 +311,11 @@ Isle of Man:              14:  27:  EU:   54.30:     4.50:     0.0:  GD:
 Northern Ireland:         14:  27:  EU:   54.60:     5.90:     0.0:  GI:\r
     2I,2N,GI,GN,MI,MN,GB0BTC,GB0BVC,GB0CI,GB0CSC,GB0DDF,GB0GPF,GB0MFD,GB0PSM,\r
     GB0REL,GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB1SPD,GB2IL,GB2LL,GB2MGY,\r
 Northern Ireland:         14:  27:  EU:   54.60:     5.90:     0.0:  GI:\r
     2I,2N,GI,GN,MI,MN,GB0BTC,GB0BVC,GB0CI,GB0CSC,GB0DDF,GB0GPF,GB0MFD,GB0PSM,\r
     GB0REL,GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB1SPD,GB2IL,GB2LL,GB2MGY,\r

-    GB2MRI,GB2NIC,GB2NTU,GB2TCA,GB3MNI,GB4CSC,GB4ES,GB4SPD,GB5BIG,GB5BL,\r
-    GB5SPD,GB90SOM;\r
+    GB2MRI,GB2NIC,GB2NTU,GB2TCA,GB3MNI,GB4CSC,GB4ES,GB4SPD,GB50AAD,GB5BIG,\r
+    GB5BL,GB5SPD,GB90SOM;\r

 Jersey:                   14:  27:  EU:   49.30:     2.20:     0.0:  GJ:\r
     2H,2J,GH,GJ,MH,MJ,GB0CLR,GB0GUD,GB0JSA,GB0SHL,GB2BYL,GB2JSA,GB4BHF,\r
 Jersey:                   14:  27:  EU:   49.30:     2.20:     0.0:  GJ:\r
     2H,2J,GH,GJ,MH,MJ,GB0CLR,GB0GUD,GB0JSA,GB0SHL,GB2BYL,GB2JSA,GB4BHF,\r

-    GJ3DVC/L;\r
+    GB50JSA;\r

 Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:\r
     2A,2M,2S,2T,GM,GS,MM,MS,GB0AC,GB0BNC,GB0BWT,GB0DGL,GB0FFS,GB0FLA,GB0GDS,\r
     GB0GEI,GB0GHD,GB0GKR,GB0GNE,GB0HHW,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,\r
 Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:\r
     2A,2M,2S,2T,GM,GS,MM,MS,GB0AC,GB0BNC,GB0BWT,GB0DGL,GB0FFS,GB0FLA,GB0GDS,\r
     GB0GEI,GB0GHD,GB0GKR,GB0GNE,GB0HHW,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,\r


@@ -324,15 +323,15 @@ Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:
     GB100MAS,GB125BRC,GB150NRL,GB1EPC,GB1FVT,GB2AGG,GB2AST,GB2AYR,GB2CHG,\r
     GB2DHS,GB2FBM,GB2FIO,GB2FSM,GB2GNL,GB2GTM,GB2HI,GB2HRH,GB2HST,GB2HSW,\r
     GB2IAS,GB2IGB,GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,GB2LAY,\r
     GB100MAS,GB125BRC,GB150NRL,GB1EPC,GB1FVT,GB2AGG,GB2AST,GB2AYR,GB2CHG,\r
     GB2DHS,GB2FBM,GB2FIO,GB2FSM,GB2GNL,GB2GTM,GB2HI,GB2HRH,GB2HST,GB2HSW,\r
     GB2IAS,GB2IGB,GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,GB2LAY,\r

-    GB2LBN,GB2LCL,GB2LCP,GB2LGB,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LS,GB2LSS,GB2LT,\r
-    GB2LTN,GB2MAS,GB2MOD,GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,GB2NCL,GB2NEF,\r
-    GB2NL,GB2NTS,GB2OWM,GB2OYC,GB2PBF,GB2PS,GB2RB,GB2RRL,GB2SKG,GB2SLH,GB2SPD,\r
-    GB2SSF,GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,GB400CA,GB4AAS,GB4CGW,GB4DAS,\r
-    GB4GM,GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,GB4TSR,GB4ZBS,GB50ATC,GB50SWL,\r
-    GB5AST,GB5BBS,GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,GB60BBC,GB60CRB,\r
-    GB60NTS,GB6MI,GB6SA,GB6SM,GB6TAA,GB6WW,GB700BSB,GB75GD,GB75SCP,GB75STT,\r
-    GB8AYR,GB8CA,GB8CF,GB8CI,GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,GB93AM,\r
-    MM/DL6MHW;\r
+    GB2LBN,GB2LCL,GB2LCP,GB2LGB,GB2LHI,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LS,GB2LSS,\r
+    GB2LT,GB2LTN,GB2MAS,GB2MOD,GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,GB2NCL,\r
+    GB2NEF,GB2NL,GB2NTS,GB2OWM,GB2OYC,GB2PBF,GB2PS,GB2RB,GB2RRL,GB2SKG,GB2SLH,\r
+    GB2SPD,GB2SSF,GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,GB400CA,GB4AAS,GB4CGW,\r
+    GB4DAS,GB4GM,GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,GB4TSR,GB4ZBS,GB50ATC,\r
+    GB50JS,GB50SWL,GB5AST,GB5BBS,GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,GB60BBC,\r
+    GB60CRB,GB60NTS,GB6MI,GB6SA,GB6SM,GB6TAA,GB6WW,GB700BSB,GB75GD,GB75SCP,\r
+    GB75STT,GB8AYR,GB8CA,GB8CF,GB8CI,GB8CM,GB8CN,GB8CO,GB8CSL,GB8CY,GB8FF,\r
+    GB8OO,GB8RU,GB93AM;\r

 Shetland:                 14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:\r
     GZ,MZ,2M0ZET,GB2ELH,GM0AVR,GM0CXQ,GM0CYJ,GM0DJI,GM0EKM,GM0ILB,GM0ULK,\r
     GM1ZNR,GM3KLA,GM3WHT,GM3ZET,GM3ZNM,GM4GPP,GM4GQM,GM4IPK,GM4LBE,GM4LER,\r
 Shetland:                 14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:\r
     GZ,MZ,2M0ZET,GB2ELH,GM0AVR,GM0CXQ,GM0CYJ,GM0DJI,GM0EKM,GM0ILB,GM0ULK,\r
     GM1ZNR,GM3KLA,GM3WHT,GM3ZET,GM3ZNM,GM4GPP,GM4GQM,GM4IPK,GM4LBE,GM4LER,\r


@@ -344,12 +343,12 @@ Wales:                    14:  27:  EU:   51.50:     3.20:     0.0:  GW:
     2C,2W,2X,2Y,GC,GW,MC,MW,GB0CCE,GB0CLC,GB0CVA,GB0GCR,GB0GIW,GB0GLV,GB0HEL,\r
     GB0HMT,GB0ML,GB0MPA,GB0MWL,GB0NEW,GB0PSG,GB0RPO,GB0RSC,GB0SDD,GB0SH,\r
     GB0SOA,GB0SPS,GB0SRH,GB0TD,GB0TTT,GB0WRC,GB100BD,GB100FI,GB100LP,GB1CCC,\r
     2C,2W,2X,2Y,GC,GW,MC,MW,GB0CCE,GB0CLC,GB0CVA,GB0GCR,GB0GIW,GB0GLV,GB0HEL,\r
     GB0HMT,GB0ML,GB0MPA,GB0MWL,GB0NEW,GB0PSG,GB0RPO,GB0RSC,GB0SDD,GB0SH,\r
     GB0SOA,GB0SPS,GB0SRH,GB0TD,GB0TTT,GB0WRC,GB100BD,GB100FI,GB100LP,GB1CCC,\r

-    GB1LSG,GB1SSL,GB1TDS,GB2000SET,GB200A,GB200HNT,GB2ANG,GB2CPC,GB2GGM,\r
+    GB1LSG,GB1SL,GB1SSL,GB1TDS,GB2000SET,GB200A,GB200HNT,GB2ANG,GB2CPC,GB2GGM,\r

     GB2GLS,GB2GOL,GB2GSG,GB2GSS,GB2HDG,GB2IMD,GB2LNP,GB2LSA,GB2MIL,GB2MLM,\r
     GB2MOP,GB2RFS,GB2RSC,GB2RTB,GB2SDD,GB2SIP,GB2TD,GB2TTA,GB2VK,GB2WDS,\r
     GB2WFF,GB2WHO,GB2WSF,GB4BPL,GB4CI,GB4DPS,GB4HMD,GB4HMM,GB4LSG,GB4MD,\r
     GB4MDI,GB4NDG,GB4SA,GB4SMM,GB4SNF,GB4XXX,GB5BS/J,GB5FI,GB5SIP,GB60VLY,\r
     GB2GLS,GB2GOL,GB2GSG,GB2GSS,GB2HDG,GB2IMD,GB2LNP,GB2LSA,GB2MIL,GB2MLM,\r
     GB2MOP,GB2RFS,GB2RSC,GB2RTB,GB2SDD,GB2SIP,GB2TD,GB2TTA,GB2VK,GB2WDS,\r
     GB2WFF,GB2WHO,GB2WSF,GB4BPL,GB4CI,GB4DPS,GB4HMD,GB4HMM,GB4LSG,GB4MD,\r
     GB4MDI,GB4NDG,GB4SA,GB4SMM,GB4SNF,GB4XXX,GB5BS/J,GB5FI,GB5SIP,GB60VLY,\r

-    GB6AR,GB750CC,GB8OQE;\r
+    GB6AR,GB6GW,GB750CC,GB8OQE;\r

 Solomon Islands:          28:  51:  OC:   -9.40:  -160.00:   -11.0:  H4:\r
     H4;\r
 Temotu:                   32:  51:  OC:  -10.70:  -165.80:   -11.0:  H40:\r
 Solomon Islands:          28:  51:  OC:   -9.40:  -160.00:   -11.0:  H4:\r
     H4;\r
 Temotu:                   32:  51:  OC:  -10.70:  -165.80:   -11.0:  H40:\r


@@ -430,52 +429,53 @@ Jordan:                   20:  39:  AS:   32.00:   -35.90:    -2.0:  JY:
 United States:            05:  08:  NA:   43.00:    87.90:     5.0:  K:\r
     4U1WB,AA,AB,AC,AD,AE,AF,AG,AI,AJ,AK,K,N,W,AA0CY(5)[8],AA3VA(4),AB4EJ(4),\r
     AB4GG(4),AC4PY(4),AD4EB(4),AD8J(5),AE9F(3)[6],AG3V(4)[7],AG4W(4),\r
 United States:            05:  08:  NA:   43.00:    87.90:     5.0:  K:\r
     4U1WB,AA,AB,AC,AD,AE,AF,AG,AI,AJ,AK,K,N,W,AA0CY(5)[8],AA3VA(4),AB4EJ(4),\r
     AB4GG(4),AC4PY(4),AD4EB(4),AD8J(5),AE9F(3)[6],AG3V(4)[7],AG4W(4),\r

-    AH0AH(5)[8],AH2AK(5)[8],AH6HJ(5)[8],AH6RI(3)[6],AH8M(5)[8],AL1VE(5)[8],\r
-    AL7C(4)[8],AL7KT(5)[8],AL7LV(5)[8],AL7O(4)[7],AL7QQ(4)[7],AL7W(3)[6],\r
-    K0COP(5)[8],K0JJ(3)[6],K0JJM(4)[7],K0JJR(4)[7],K0LUZ(5)[8],K0TV(5)[8],\r
-    K0TVD(4)[7],K1GU(4),K1GUG(5),K1LKR(3)[6],K1LT(4),K1NG(4),K1NT(4)[7],\r
-    K1NTR(5)[8],K1TN(4),K1TU(4)[7],K2AAW(4),K2BA(4)[7],K2HT(4)[7],K2HTO(5)[8],\r
-    K2RD(3)[6],K2VCO(3)[6],K2VV(4)[7],K3CQ(4),K3GP(4),K3IE(4),K3PA(4)[7],\r
-    K3WT(4)[7],K4AMC(4),K4BEV(4),K4BP(4),K4BX(4),K4BXC(5),K4EJQ(4),K4FXN(4),\r
-    K4HAL(4),K4IE(4),K4IU(4)[7],K4JA(4),K4JNY(4),K4LTA(4),K4NO(4),K4OAQ(4),\r
-    K4RO(4),K4SAC(4),K4TD(4),K4VU(3)[6],K4VUD(5)[8],K4WI(4),K4WW(4),K4WX(4),\r
-    K4XG(4),K4XU(3)[6],K4ZGB(4),K5KG(5)[8],K5MA(5)[8],K5RC(3)[6],K5RR(3)[6],\r
-    K5ZD(5)[8],K5ZDG(4)[7],K6EID(5)[8],K6XT(4)[7],K7ABV(4)[6],K7BG(4)[6],\r
-    K7CMZ(5)[8],K7CS(5)[8],K7GM(5)[8],K7GMF(3)[6],K7IA(4)[7],K7RE(4)[7],\r
-    K7REL(3)[6],K7SV(5)[8],K7TD(4)[7],K7UP(4)[7],K7VU(4)[7],K8AC(5),\r
-    K8IA(3)[6],K8JQ(5),K8OQL(5),K8OSF(5),K8XS(5),K8YC(5),K9AW(5),K9ES(5),\r
-    K9FY(5),K9HUY(5),K9JF(3)[6],K9OM(5),K9VV(5),KA2EYH(4),KA8Q(5),KB7Q(4)[6],\r
-    KC3MR(4),KC7UP(4)[6],KD5M(5)[8],KD5MDO(4)[7],KE4MBP(4),KE4OAR(4),\r
-    KE7NO(4)[6],KH2D(5)[8],KH6DX(3)[6],KH6HHS(5)[8],KH6QAI(3)[6],KH6QAJ(3)[6],\r
-    KH6RW(3)[6],KI6DY(4)[7],KK9A(5),KL0LN(4)[8],KL1IF(4)[8],KL2A/7(3)[6],\r
-    KL7FDQ(3)[6],KL7WP(3)[6],KL7XX(4)[8],KM4FO(4),KM6JD(5)[8],KN4Q(4),\r
-    KN4QS(4)[7],KN5H(3)[6],KN6RO(5)[8],KN8J(5),KO7X(4)[7],KP2N(5)[8],\r
-    KP4E(4)[8],KS7T(4)[6],KU1CW(4)[7],KU8E(5),KY1V(4),KY4AA(4),KY4Z(4)[7],\r
-    N0AX(3)[6],N1LN(4)[7],N1SZ(4)[7],N1WI(4),N1ZP(4),N2BJ(4),N2BJL(5),\r
-    N2IC(4)[7],N2LA(4)[7],N2NB(3)[6],N2WN(4),N3AIU(4)[7],N3BB(4)[7],\r
-    N3ZZ(3)[6],N4CVO(4),N4DD(4),N4DW(4),N4GK(4),N4GN(4),N4IR(4),N4IRR(5),\r
-    N4JF(4),N4KG(4),N4KZ(4),N4NO(4),N4OGW(4)[8],N4QS(4),N4SL(3)[6],N4TN(4),\r
-    N4TZ(4),N4UW(4),N4VV(4),N4XM(4),N4ZZ(4),N6AR(5)[8],N6MW(5)[8],N6MWA(3)[6],\r
-    N6RFM(5)[8],N6ZO(5)[8],N6ZZ(4)[7],N7DC(5)[8],N7DF(4)[7],N7FLT(4)[6],\r
-    N7IV(4)[7],N7NG(5)[8],N7VMR(4)[6],N8FF(5),N8II(5),N8NA(5),N8PR(5),N8RA(5),\r
-    N8WXQ(5),N9ADG(3)[6],NA4K(4),NA4M(4)[7],NA4MA(5)[8],ND2T(3)[6],ND9M(5),\r
-    NH7C(5)[8],NJ4I(4),NL7AU(5)[8],NL7CO(4)[7],NL7XM(5)[8],NP3D(5)[8],NQ4U(4),\r
-    NU4B(4),NU4BP(5),NW7MT(4)[6],NW8U(5),NX9T(5),NY4N(4),NY6DX(5)[8],\r
-    W0RLI(3)[6],W0UCE(5)[8],W0YK(3)[6],W0YR(5)[8],W0YRN(4)[7],W0ZZ(3)[6],\r
-    W0ZZQ(4)[7],W1DY(4)[7],W1DYH(5)[8],W1DYJ(5)[8],W1MVY(3)[6],W1RH(3)[6],\r
-    W1SRD(3)[6],W2OO(4),W2VJN(3)[6],W3CP(3)[6],W3HDH(4),W4BCG(4),W4CID(4),\r
-    W4DAN(4),W4DHE(4),W4DVG(4),W4EEH(4),W4EF(3)[6],W4FMS(4),W4GKM(4),W4HZD(4),\r
-    W4JSI(4),W4KW(4),W4LC(4),W4LIA(4),W4NBS(4),W4NI(4),W4NTI(4),W4NZ(4),\r
-    W4PA(4),W4RYW(4),W4TDB(4),W4TYU(4),W4YOK(4)[7],W5KI(5)[8],W5REA(5)[8],\r
-    W6AAN(5)[8],W6DSQ(4)[8],W6FC(5)[8],W6IHG(5)[8],W6JV(5)[8],W6LFB(4)[7],\r
-    W6NWS(5)[8],W6TER(4)[7],W6UB(4)[8],W6XR(5)[8],W6YJ(4)[7],W7FG(4)[7],\r
-    W7LPF(5)[8],W7LR(4)[6],W7LRD(3)[6],W7QF(5)[8],W7SE(4)[7],W8AEF(3)[6],\r
-    W8FJ(5),W8HGH(5),W8TN(5),W8WEJ(5),W8ZA(5),W9GE(5),W9GEN(4),W9IGJ(5),\r
-    W9MAK(3)[6],W9NGA(3)[6],WA0KDS(3)[6],WA1FCN(4),WA1MKE(4),WA1UJU(4),\r
-    WA2MNO(4)[7],WA4GLH(4),WA4JA(4),WA4OSD(4),WA5VGI(3)[6],WA8WV(5),WB2ORD(4),\r
-    WB4YDL(4),WB4ZBI(4),WB6BWZ(5)[8],WB8YQJ(3)[6],WB8YYY(5),WD4K(4),WD4OHD(4),\r
-    WG7Y(4)[7],WH0AI(4)[8],WH6ASW/M(3)[6],WJ9B(5),WL7K(3)[6],WN4M(4),WO4O(4),\r
-    WO5D(5)[8],WP4JBG(4)[8],WS4Y(4)[7],WT5L(5)[8],WX4TM(4);\r
+    AH0AH(5)[8],AH2AK(5)[8],AH6HJ(5)[8],AH6RI(3)[6],AH8M(5)[8],AL0F(3)[6],\r
+    AL1VE(5)[8],AL7C(4)[8],AL7KT(5)[8],AL7LV(5)[8],AL7NS(5)[8],AL7O(4)[7],\r
+    AL7QQ(4)[7],AL7W(3)[6],K0COP(5)[8],K0JJ(3)[6],K0JJM(4)[7],K0JJR(4)[7],\r
+    K0LUZ(5)[8],K0TV(5)[8],K0TVD(4)[7],K1GU(4),K1GUG(5),K1LKR(3)[6],K1LT(4),\r
+    K1NG(4),K1NT(4)[7],K1NTR(5)[8],K1TN(4),K1TU(4)[7],K2AAW(4),K2BA(4)[7],\r
+    K2HT(4)[7],K2HTO(5)[8],K2RD(3)[6],K2VCO(3)[6],K2VV(4)[7],K3CQ(4),K3GP(4),\r
+    K3IE(4),K3PA(4)[7],K3WT(4)[7],K4AMC(4),K4BEV(4),K4BP(4),K4BX(4),K4BXC(5),\r
+    K4EJQ(4),K4FXN(4),K4HAL(4),K4IE(4),K4IU(4)[7],K4JA(4),K4JNY(4),K4LTA(4),\r
+    K4NO(4),K4OAQ(4),K4RO(4),K4SAC(4),K4TD(4),K4VU(3)[6],K4VUD(5)[8],K4WI(4),\r
+    K4WW(4),K4WX(4),K4XG(4),K4XU(3)[6],K4ZGB(4),K5KG(5)[8],K5MA(5)[8],\r
+    K5RC(3)[6],K5RR(3)[6],K5ZD(5)[8],K5ZDG(4)[7],K6EID(5)[8],K6XT(4)[7],\r
+    K7ABV(4)[6],K7BG(4)[6],K7CMZ(5)[8],K7CS(5)[8],K7GM(5)[8],K7GMF(3)[6],\r
+    K7IA(4)[7],K7RE(4)[7],K7REL(3)[6],K7SV(5)[8],K7TD(4)[7],K7UP(4)[7],\r
+    K7VU(4)[7],K8AC(5),K8IA(3)[6],K8JQ(5),K8OQL(5),K8OSF(5),K8XS(5),K8YC(5),\r
+    K9AW(5),K9ES(5),K9FY(5),K9HUY(5),K9JF(3)[6],K9OM(5),K9VV(5),KA2EYH(4),\r
+    KA8Q(5),KB7Q(4)[6],KC3MR(4),KC7UP(4)[6],KD5M(5)[8],KD5MDO(4)[7],KE4MBP(4),\r
+    KE4OAR(4),KE7NO(4)[6],KH2D(5)[8],KH6DX(3)[6],KH6GJV(3)[6],KH6HHS(5)[8],\r
+    KH6OE(4)[8],KH6QAI(3)[6],KH6QAJ(3)[6],KH6RW(3)[6],KI6DY(4)[7],KK9A(5),\r
+    KL0ET(4)[8],KL0LN(4)[8],KL1IF(4)[8],KL2A/7(3)[6],KL7FDQ(3)[6],KL7WP(3)[6],\r
+    KL7XX(4)[8],KM4FO(4),KM6JD(5)[8],KN4Q(4),KN4QS(4)[7],KN5H(3)[6],\r
+    KN6RO(5)[8],KN8J(5),KO7X(4)[7],KP2N(5)[8],KP4E(4)[8],KS7T(4)[6],\r
+    KU1CW(4)[7],KU8E(5),KY1V(4),KY4AA(4),KY4Z(4)[7],N0AX(3)[6],N1LN(4)[7],\r
+    N1SZ(4)[7],N1WI(4),N1ZP(4),N2BJ(4),N2BJL(5),N2IC(4)[7],N2LA(4)[7],\r
+    N2NB(3)[6],N2WN(4),N3AIU(4)[7],N3BB(4)[7],N3ZZ(3)[6],N4CVO(4),N4DD(4),\r
+    N4DW(4),N4GK(4),N4GN(4),N4IR(4),N4IRR(5),N4JF(4),N4KG(4),N4KZ(4),N4NO(4),\r
+    N4OGW(4)[7],N4QS(4),N4SL(3)[6],N4TN(4),N4TZ(4),N4UW(4),N4VV(4),N4XM(4),\r
+    N4ZZ(4),N6AR(5)[8],N6MW(5)[8],N6MWA(3)[6],N6RFM(5)[8],N6ZO(5)[8],\r
+    N6ZZ(4)[7],N7DC(5)[8],N7DF(4)[7],N7FLT(4)[6],N7IV(4)[7],N7NG(5)[8],\r
+    N7VMR(4)[6],N8FF(5),N8II(5),N8NA(5),N8PR(5),N8RA(5),N8WXQ(5),N9ADG(3)[6],\r
+    NA4K(4),NA4M(4)[7],NA4MA(5)[8],ND2T(3)[6],ND9M(5),NH7C(5)[8],NJ4I(4),\r
+    NL7AU(5)[8],NL7CO(4)[7],NL7XM(5)[8],NP3D(5)[8],NQ4U(4),NU4B(4),NU4BP(5),\r
+    NW7MT(4)[6],NW8U(5),NX9T(5),NY4N(4),NY6DX(5)[8],W0RLI(3)[6],W0UCE(5)[8],\r
+    W0YK(3)[6],W0YR(5)[8],W0YRN(4)[7],W0ZZ(3)[6],W0ZZQ(4)[7],W1DY(4)[7],\r
+    W1DYH(5)[8],W1DYJ(5)[8],W1MVY(3)[6],W1RH(3)[6],W1SRD(3)[6],W2OO(4),\r
+    W2VJN(3)[6],W3CP(3)[6],W3HDH(4),W4BCG(4),W4CID(4),W4DAN(4),W4DHE(4),\r
+    W4DVG(4),W4EEH(4),W4EF(3)[6],W4FMS(4),W4GKM(4),W4HZD(4),W4JSI(4),W4KW(4),\r
+    W4LC(4),W4LIA(4),W4NBS(4),W4NI(4),W4NTI(4),W4NZ(4),W4PA(4),W4RYW(4),\r
+    W4TDB(4),W4TYU(4),W4YOK(4)[7],W5KI(5)[8],W5REA(5)[8],W6AAN(5)[8],\r
+    W6DSQ(4)[8],W6FC(5)[8],W6IHG(5)[8],W6JV(5)[8],W6LFB(4)[7],W6NWS(5)[8],\r
+    W6TER(4)[7],W6UB(4)[8],W6XR(5)[8],W6YJ(4)[7],W7FG(4)[7],W7LPF(5)[8],\r
+    W7LR(4)[6],W7LRD(3)[6],W7QF(5)[8],W7SE(4)[7],W8AEF(3)[6],W8FJ(5),W8HGH(5),\r
+    W8TN(5),W8WEJ(5),W8ZA(5),W9GE(5),W9GEN(4),W9IGJ(5),W9MAK(3)[6],\r
+    W9NGA(3)[6],WA0KDS(3)[6],WA1FCN(4),WA1MKE(4),WA1UJU(4),WA2MNO(4)[7],\r
+    WA4GLH(4),WA4JA(4),WA4OSD(4),WA5VGI(3)[6],WA8WV(5),WB2ORD(4),WB4YDL(4),\r
+    WB4ZBI(4),WB6BWZ(5)[8],WB8YQJ(3)[6],WB8YYY(5),WD4K(4),WD4OHD(4),\r
+    WG7Y(4)[7],WH0AI(4)[8],WH6ASW/M(3)[6],WJ9B(5),WL7BPY(4)[7],WL7K(3)[6],\r
+    WN4M(4),WO4O(4),WO5D(5)[8],WP4JBG(4)[8],WS4Y(4)[7],WT5L(5)[8],WX4TM(4);\r

 Guantanamo Bay:           08:  11:  NA:   19.90:    75.20:     5.0:  KG4:\r
     KG4,KG44;\r
 Mariana Is.:              27:  64:  OC:   15.20:  -145.80:   -10.0:  KH0:\r
 Guantanamo Bay:           08:  11:  NA:   19.90:    75.20:     5.0:  KG4:\r
     KG4,KG44;\r
 Mariana Is.:              27:  64:  OC:   15.20:  -145.80:   -10.0:  KH0:\r


@@ -499,7 +499,7 @@ Kure I.:                  31:  61:  OC:   28.40:   178.40:    11.0:  KH7K:
 American Samoa:           32:  62:  OC:  -14.30:   170.80:    11.0:  KH8:\r
     AH8,KH8,NH8,WH8;\r
 Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:\r
 American Samoa:           32:  62:  OC:  -14.30:   170.80:    11.0:  KH8:\r
     AH8,KH8,NH8,WH8;\r
 Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:\r

-    KH8S/K3UY,KH8SI,N8S;\r
+    KH8SI;\r

 Wake I.:                  31:  65:  OC:   19.30:  -166.60:   -12.0:  KH9:\r
     AH9,KH9,NH9,WH9;\r
 Alaska:                   01:  01:  NA:   61.20:   150.00:     9.0:  KL:\r
 Wake I.:                  31:  65:  OC:   19.30:  -166.60:   -12.0:  KH9:\r
     AH9,KH9,NH9,WH9;\r
 Alaska:                   01:  01:  NA:   61.20:   150.00:     9.0:  KL:\r


@@ -515,30 +515,32 @@ Desecheo I.:              08:  11:  NA:   18.30:    67.50:     5.0:  KP5:
 Norway:                   14:  18:  EU:   60.00:   -10.70:    -1.0:  LA:\r
     LA,LB,LC,LD,LE,LF,LG,LH,LI,LJ,LK,LL,LM,LN;\r
 Argentina:                13:  14:  SA:  -34.60:    58.40:     3.0:  LU:\r
 Norway:                   14:  18:  EU:   60.00:   -10.70:    -1.0:  LA:\r
     LA,LB,LC,LD,LE,LF,LG,LH,LI,LJ,LK,LL,LM,LN;\r
 Argentina:                13:  14:  SA:  -34.60:    58.40:     3.0:  LU:\r

-    AY,AZ,L2,L3,L4,L5,L6,L7,L8,L9,LO,LP,LQ,LR,LS,LT,LU,LV,LW,AY0N/X,AY3DR/D,\r
-    AY4EJ/D,AY5E/D,AY7DSY/D,DJ4SN/LU/X,L20ARC/D,L21ESC/LH,L25E/D,L30EY/D,\r
-    L30EY/V,L40E/D,L44D/D,L80AA/D,L8D/X,LO0D/D,LO7E/D,LU/DH4PB/R,LU/DH4PB/S,\r
-    LU1AEE/D,LU1AF/D,LU1CDP/D,LU1DK/D,LU1DMA/E,LU1DZ/P,LU1DZ/Q,LU1DZ/R,\r
-    LU1DZ/S,LU1DZ/X,LU1EJ/W,LU1EQ/D,LU1EYW/D,LU1OFN/I,LU1VZ/V,LU1XAW/X,\r
-    LU1XY/X,LU1YU/D,LU1YY/Y,LU2DT/D,LU2DT/LH,LU2DVI/H,LU2EE/D,LU2EJB/X,\r
-    LU2VC/D,LU2WV/O,LU2XX/X,LU3CQ/D,LU3DJI/D,LU3DJI/W,LU3DOC/D,LU3DR/D,\r
-    LU3DR/V,LU3ES/W,LU4AAO/D,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,LU4DRH/E,\r
-    LU4EJ/D,LU4ETN/D,LU4WG/W,LU5BE/D,LU5BOJ/O,LU5DEM/D,LU5DEM/V,LU5DIT/D,\r
-    LU5DIT/V,LU5DRV/D,LU5DRV/V,LU5DT/D,LU5DV/D,LU5DWS/D,LU5EAO/D,LU5EFX/Y,\r
-    LU5EWO/D,LU5XC/X,LU6DBL/D,LU6DKT/D,LU6DRD/D,LU6DRD/E,LU6DRR/D,LU6EC/W,\r
-    LU6EJJ/D,LU6EPR/D,LU6EPR/E,LU6EYK/X,LU6UO/D,LU6UO/P,LU6UO/Q,LU6UO/R,\r
-    LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,LU7DID/V,LU7DID/Y,LU7DIR/D,LU7DJJ/W,\r
-    LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,LU7DSY/W,LU7DW/D,LU7DZL/D,LU7DZL/E,\r
-    LU7EGH/V,LU7EGY/D,LU7EO/D,LU7EPC/D,LU7EPC/W,LU7VCH/D,LU7WFM/W,LU8ADX/D,\r
-    LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,LU8DWR/V,LU8EBJ/D,LU8EBJ/E,LU8EBK/D,\r
-    LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,LU8EGS/D,LU8EHQ/D,LU8EHQ/E,LU8EHQ/W,\r
-    LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8EOT/Y,LU8ERH/D,LU8EXJ/D,LU8EXN/D,LU8FOZ/V,\r
-    LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,LU9DBK/X,LU9DKX/X,LU9EJS/E,LU9ESD/D,\r
-    LU9ESD/V,LU9ESD/Y,LU9EV/LH,LU9JMG/J,LW1EXU/Y,LW2DX/P,LW2DX/Q,LW2DX/R,\r
+    AY,AZ,L2,L3,L4,L5,L6,L7,L8,L84VI/D,L9,LO,LP,LQ,LR,LS,LT,LU,LU1DZ/E,LV,LW,\r
+    AY0N/X,AY3DR/D,AY4EJ/D,AY5E/D,AY7DSY/D,DJ4SN/LU/X,L20ARC/D,L21ESC/LH,\r
+    L25E/D,L30EY/D,L30EY/V,L40E/D,L44D/D,L80AA/D,L8D/X,LO0D/D,LO7E/D,\r
+    LU/DH4PB/R,LU/DH4PB/S,LU1AEE/D,LU1AF/D,LU1CDP/D,LU1DK/D,LU1DMA/E,LU1DZ/P,\r
+    LU1DZ/Q,LU1DZ/R,LU1DZ/S,LU1DZ/X,LU1EJ/W,LU1EQ/D,LU1EYW/D,LU1OFN/I,\r
+    LU1VOF/D,LU1VZ/V,LU1XAW/X,LU1XY/X,LU1YU/D,LU1YY/Y,LU2DT/D,LU2DT/LH,\r
+    LU2DVI/H,LU2EE/D,LU2EE/E,LU2EJB/X,LU2VC/D,LU2WV/O,LU2XX/X,LU3CQ/D,\r
+    LU3DJI/D,LU3DJI/W,LU3DOC/D,LU3DR/D,LU3DR/V,LU3DXG/D,LU3ES/D,LU3ES/W,\r
+    LU4AAO/D,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,LU4DRH/E,LU4EJ/D,LU4ETN/D,\r
+    LU4WG/W,LU5BE/D,LU5BOJ/O,LU5DEM/D,LU5DEM/V,LU5DIT/D,LU5DIT/V,LU5DRV/D,\r
+    LU5DRV/V,LU5DT/D,LU5DV/D,LU5DWS/D,LU5EAO/D,LU5EFX/Y,LU5EWO/D,LU5FZ/D,\r
+    LU5XC/X,LU6DBL/D,LU6DKT/D,LU6DRD/D,LU6DRD/E,LU6DRN/D,LU6DRR/D,LU6EC/W,\r
+    LU6EJJ/D,LU6EPR/D,LU6EPR/E,LU6EYK/X,LU6JJ/D,LU6UO/D,LU6UO/P,LU6UO/Q,\r
+    LU6UO/R,LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,LU7BTO/D,LU7DID/V,LU7DID/Y,\r
+    LU7DIR/D,LU7DJJ/W,LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,LU7DSY/W,LU7DW/D,\r
+    LU7DZL/D,LU7DZL/E,LU7EGH/V,LU7EGY/D,LU7EO/D,LU7EPC/D,LU7EPC/W,LU7VCH/D,\r
+    LU7WFM/W,LU7WW/W,LU8ADX/D,LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,LU8DWR/V,\r
+    LU8EBJ/D,LU8EBJ/E,LU8EBK/D,LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,LU8EGS/D,\r
+    LU8EHQ/D,LU8EHQ/E,LU8EHQ/W,LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8EOT/Y,LU8ERH/D,\r
+    LU8EXJ/D,LU8EXN/D,LU8FOZ/V,LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,LU9AUC/D,\r
+    LU9DBK/X,LU9DKX/X,LU9EI/F,LU9EJS/E,LU9ESD/D,LU9ESD/V,LU9ESD/Y,LU9EV/LH,\r
+    LU9JMG/J,LW1DAL/D,LW1EXU/D,LW1EXU/Y,LW2DX/D,LW2DX/P,LW2DX/Q,LW2DX/R,\r

     LW2DX/S,LW2DX/Y,LW2ENB/D,LW3DKC/D,LW3DKC/E,LW3DKO/D,LW3DKO/E,LW3HAQ/D,\r
     LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,LW4EM/LH,LW5DR/LH,LW5DWX/D,LW5EE/D,\r
     LW2DX/S,LW2DX/Y,LW2ENB/D,LW3DKC/D,LW3DKC/E,LW3DKO/D,LW3DKO/E,LW3HAQ/D,\r
     LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,LW4EM/LH,LW5DR/LH,LW5DWX/D,LW5EE/D,\r

-    LW5EE/V,LW5EOL/D,LW7DAF/W,LW7DNS/E,LW8DMK/D,LW8EU/D,LW8EXF/D,LW9DCF/Y,\r
-    LW9EAG/D,LW9EAG/V,LW9EVA/D,LW9EVA/E;\r
+    LW5EE/V,LW5EOL/D,LW6DTM/D,LW7DAF/D,LW7DAF/W,LW7DLY/D,LW7DNS/E,LW8DMK/D,\r
+    LW8ECQ/D,LW8EU/D,LW8EXF/D,LW9DCF/Y,LW9EAG/D,LW9EAG/V,LW9EVA/D,LW9EVA/E;\r

 Luxembourg:               14:  27:  EU:   49.60:    -6.20:    -1.0:  LX:\r
     LX;\r
 Lithuania:                15:  29:  EU:   54.50:   -25.50:    -2.0:  LY:\r
 Luxembourg:               14:  27:  EU:   49.60:    -6.20:    -1.0:  LX:\r
     LX;\r
 Lithuania:                15:  29:  EU:   54.50:   -25.50:    -2.0:  LY:\r


@@ -552,7 +554,7 @@ Lebanon:                  20:  39:  AS:   33.90:   -35.50:    -2.0:  OD:
 Austria:                  15:  28:  EU:   48.20:   -16.30:    -1.0:  OE:\r
     OE,SH75,4U1VIC;\r
 Finland:                  15:  18:  EU:   60.20:   -25.00:    -2.0:  OH:\r
 Austria:                  15:  28:  EU:   48.20:   -16.30:    -1.0:  OE:\r
     OE,SH75,4U1VIC;\r
 Finland:                  15:  18:  EU:   60.20:   -25.00:    -2.0:  OH:\r

-    OF,OG,OH,OI,OJ,OH0JJS/1;\r
+    OF,OG,OH,OI,OJ;\r

 Aland Is.:                15:  18:  EU:   60.20:   -20.00:    -2.0:  OH0:\r
     OF0,OG0,OH0,OI0;\r
 Market Reef:              15:  18:  EU:   60.30:   -19.00:    -2.0:  OJ0:\r
 Aland Is.:                15:  18:  EU:   60.20:   -20.00:    -2.0:  OH0:\r
     OF0,OG0,OH0,OI0;\r
 Market Reef:              15:  18:  EU:   60.30:   -19.00:    -2.0:  OJ0:\r


@@ -673,15 +675,15 @@ Mali:                     35:  46:  AF:   12.70:     8.00:     0.0:  TZ:
     TZ;\r
 European Russia:          16:  29:  EU:   55.80:   -37.60:    -3.0:  UA:\r
     R,RD4W[30],RK4W[30],RM4W[30],RN4W[30],RU4W[30],RV4W[30],RW4W[30],U,\r
     TZ;\r
 European Russia:          16:  29:  EU:   55.80:   -37.60:    -3.0:  UA:\r
     R,RD4W[30],RK4W[30],RM4W[30],RN4W[30],RU4W[30],RV4W[30],RW4W[30],U,\r

-    UA4W[30],R20CH,R7C,R7C/1,R7C/3,R7C/4,UE200TARS;\r
+    UA4W[30],R7C,R7C/1,R7C/3,R7C/4;\r

 Kaliningrad:              15:  29:  EU:   55.00:   -20.50:    -2.0:  UA2:\r
 Kaliningrad:              15:  29:  EU:   55.00:   -20.50:    -2.0:  UA2:\r

-    R2,R60F,R750,RA2,RB2,RC2,RD2,RE2,RF2,RG2,RH2,RI2,RJ2,RK2,RL2,RM2,RN2,RP2,\r
-    RQ2,RR2,RS2,RT2,RU2,RV2,RW2,RX2,RY2,RZ2,U2,UA2,UB2,UC2,UD2,UE2,UF2,UG2,\r
-    UH2,UI2,R60A;\r
+    R2,RA2,RB2,RC2,RD2,RE2,RF2,RG2,RH2,RI2,RJ2,RK2,RL2,RM2,RN2,RP2,RQ2,RR2,\r
+    RS2,RT2,RU2,RV2,RW2,RX2,RY2,RZ2,U2,UA2,UB2,UC2,UD2,UE2,UF2,UG2,UH2,UI2,\r
+    R5K/2,UA1AAE/2;\r

 Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:\r
 Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:\r

-    R0,R7,R8,R8T(18)[32],R8V(18)[33],R9,R9I(18)[31],R9M(17),R9S(16),R9T(16),\r
-    R9W(16),RA0,RA7,RA8,RA8T(18)[32],RA8V(18)[33],RA9,RA9I(18)[31],RA9M(17),\r
-    RA9S(16),RA9T(16),RA9W(16),RB0,RB7,RB8,RB8T(18)[32],RB8V(18)[33],RB9,\r
+    R0,R450W,R7,R8,R8T(18)[32],R8V(18)[33],R9,R9I(18)[31],R9M(17),R9S(16),\r
+    R9T(16),R9W(16),RA0,RA7,RA8,RA8T(18)[32],RA8V(18)[33],RA9,RA9I(18)[31],\r
+    RA9M(17),RA9S(16),RA9T(16),RA9W(16),RB0,RB7,RB8,RB8T(18)[32],RB8V(18)[33],RB9,\r

     RB9I(18)[31],RB9M(17),RB9S(16),RB9T(16),RB9W(16),RC0,RC7,RC8,RC8T(18)[32],\r
     RC8V(18)[33],RC9,RC9I(18)[31],RC9M(17),RC9S(16),RC9T(16),RC9W(16),RD0,RD7,RD8,\r
     RD8T(18)[32],RD8V(18)[33],RD9,RD9I(18)[31],RD9M(17),RD9S(16),RD9T(16),\r
     RB9I(18)[31],RB9M(17),RB9S(16),RB9T(16),RB9W(16),RC0,RC7,RC8,RC8T(18)[32],\r
     RC8V(18)[33],RC9,RC9I(18)[31],RC9M(17),RC9S(16),RC9T(16),RC9W(16),RD0,RD7,RD8,\r
     RD8T(18)[32],RD8V(18)[33],RD9,RD9I(18)[31],RD9M(17),RD9S(16),RD9T(16),\r


@@ -723,8 +725,8 @@ Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:
     UG8T(18)[32],UG8V(18)[33],UG9,UG9I(18)[31],UG9M(17),UG9S(16),UG9T(16),\r
     UG9W(16),UH0,UH7,UH8,UH8T(18)[32],UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),\r
     UH9S(16),UH9T(16),UH9W(16),UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9,\r
     UG8T(18)[32],UG8V(18)[33],UG9,UG9I(18)[31],UG9M(17),UG9S(16),UG9T(16),\r
     UG9W(16),UH0,UH7,UH8,UH8T(18)[32],UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),\r
     UH9S(16),UH9T(16),UH9W(16),UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9,\r

-    UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R270A,R270E,R30ZF,R375I,\r
-    R3F/9,R40WK,R70PW,R9HQ(17)[30],UE105SBM(18)[32],UE15UWC(18)[32],UE60SWA;\r
+    UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R30ZF,R35NP,R3F/9,R9HQ(17)[30],\r
+    UE60SWA;\r

 Uzbekistan:               17:  30:  AS:   41.20:   -69.30:    -5.0:  UK:\r
     UJ,UK,UL,UM;\r
 Kazakhstan:               17:  30:  AS:   43.30:   -76.90:    -5.0:  UN:\r
 Uzbekistan:               17:  30:  AS:   41.20:   -69.30:    -5.0:  UK:\r
     UJ,UK,UL,UM;\r
 Kazakhstan:               17:  30:  AS:   43.30:   -76.90:    -5.0:  UN:\r


@@ -740,7 +742,7 @@ St. Kitts & Nevis:        08:  11:  NA:   17.30:    62.60:     4.0:  V4:
 Namibia:                  38:  57:  AF:  -22.60:   -17.10:    -1.0:  V5:\r
     V5;\r
 Micronesia:               27:  65:  OC:    6.90:  -158.30:   -10.0:  V6:\r
 Namibia:                  38:  57:  AF:  -22.60:   -17.10:    -1.0:  V5:\r
     V5;\r
 Micronesia:               27:  65:  OC:    6.90:  -158.30:   -10.0:  V6:\r

-    V6,V63JQ/C,V63JQ/K,V63JY/C,V63JY/K,V63OP/C,V63OP/K,V63VE/C,V63VE/K;\r
+    V6;\r

 Marshall Is.:             31:  65:  OC:    9.10:  -167.30:   -12.0:  V7:\r
     V7;\r
 Brunei:                   28:  54:  OC:    4.90:  -114.90:    -8.0:  V8:\r
 Marshall Is.:             31:  65:  OC:    9.10:  -167.30:   -12.0:  V7:\r
     V7;\r
 Brunei:                   28:  54:  OC:    4.90:  -114.90:    -8.0:  V8:\r


@@ -759,11 +761,11 @@ Canada:                   05:  09:  NA:   45.00:    80.00:     4.0:  VE:
     VE2ENB(2),VE2END(2),VE2ENR(2),VE2ERU(2),VE2FCV(2),VE2GSA(2),VE2GSO(2),\r
     VE2III(2),VE2IM(2),VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),VE2NRK(2),\r
     VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WDX(2),\r
     VE2ENB(2),VE2END(2),VE2ENR(2),VE2ERU(2),VE2FCV(2),VE2GSA(2),VE2GSO(2),\r
     VE2III(2),VE2IM(2),VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),VE2NRK(2),\r
     VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WDX(2),\r

-    VE2WT(2),VE2XAA/2(2),VE2XY(2),VE2YM(2),VE3EY/2(2),VE3NE/2(2),VE3RHJ/2(2),\r
-    VE8AJ(2),VE8PW(2),VE8RCS(2),VER20070810,VY0AA(4)[3],VY0PW(4)[3],\r
-    VY2MGY/3(4)[4];\r
+    VE2WT(2),VE2XAA/2(2),VE2XY(2),VE2YM(2),VE2Z(2),VE2ZC(5),VE2ZM(5),VE2ZV(5),\r
+    VE3EY/2(2),VE3NE/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),VE8RCS(2),VER20071023,\r
+    VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];\r

 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:\r
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:\r

-    AX,VH,VI,VJ,VK,VL,VM,VN,VZ,VI90ANZAC(29);\r
+    AX,VH,VI,VJ,VK,VL,VM,VN,VZ;\r

 Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:\r
     VK0HI,VK0IR;\r
 Macquarie I.:             30:  60:  OC:  -54.70:  -158.80:   -11.0:  VK0M:\r
 Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:\r
     VK0HI,VK0IR;\r
 Macquarie I.:             30:  60:  OC:  -54.70:  -158.80:   -11.0:  VK0M:\r


@@ -772,8 +774,7 @@ Cocos-Keeling:            29:  54:  OC:  -12.20:   -96.80:    -6.5:  VK9C:
     AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9FC,VK9KC,VK9KY,VK9Y,VL9C,\r
     VL9Y,VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y,VK9AA;\r
 Lord Howe I.:             30:  60:  OC:  -31.60:  -159.10:   -10.5:  VK9L:\r
     AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9FC,VK9KC,VK9KY,VK9Y,VL9C,\r
     VL9Y,VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y,VK9AA;\r
 Lord Howe I.:             30:  60:  OC:  -31.60:  -159.10:   -10.5:  VK9L:\r

-    AX9L,VH9L,VI9L,VJ9L,VK9CL,VK9FL,VK9GL,VK9KL,VK9L,VL9L,VM9L,VN9L,VZ9L,\r
-    VK9AE,VK9NM,VK9PG,VK9YQS;\r
+    AX9L,VH9L,VI9L,VJ9L,VK9CL,VK9FL,VK9GL,VK9KL,VK9L,VL9L,VM9L,VN9L,VZ9L;\r

 Mellish Reef:             30:  56:  OC:  -17.60:  -155.80:   -10.0:  VK9M:\r
     AX9M,VH9M,VI9M,VJ9M,VK9FM,VK9KM,VK9M,VL9M,VM9M,VN9M,VZ9M;\r
 Norfolk I.:               32:  60:  OC:  -29.00:  -168.00:   -11.5:  VK9N:\r
 Mellish Reef:             30:  56:  OC:  -17.60:  -155.80:   -10.0:  VK9M:\r
     AX9M,VH9M,VI9M,VJ9M,VK9FM,VK9KM,VK9M,VL9M,VM9M,VN9M,VZ9M;\r
 Norfolk I.:               32:  60:  OC:  -29.00:  -168.00:   -11.5:  VK9N:\r


@@ -781,7 +782,7 @@ Norfolk I.:               32:  60:  OC:  -29.00:  -168.00:   -11.5:  VK9N:
 Willis I.:                30:  55:  OC:  -16.30:  -149.50:   -10.0:  VK9W:\r
     AX9W,VH9W,VI9W,VJ9W,VK9FW,VK9KW,VK9W,VL9W,VM9W,VN9W,VZ9W;\r
 Christmas I.:             29:  54:  OC:  -10.50:  -105.70:    -7.0:  VK9X:\r
 Willis I.:                30:  55:  OC:  -16.30:  -149.50:   -10.0:  VK9W:\r
     AX9W,VH9W,VI9W,VJ9W,VK9FW,VK9KW,VK9W,VL9W,VM9W,VN9W,VZ9W;\r
 Christmas I.:             29:  54:  OC:  -10.50:  -105.70:    -7.0:  VK9X:\r

-    AX9X,VH9X,VI9X,VJ9X,VK9FX,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X,VK3FY/9;\r
+    AX9X,VH9X,VI9X,VJ9X,VK9FX,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X;\r

 Anguilla:                 08:  11:  NA:   18.30:    63.00:     4.0:  VP2E:\r
     VP2E;\r
 Montserrat:               08:  11:  NA:   16.80:    62.20:     4.0:  VP2M:\r
 Anguilla:                 08:  11:  NA:   18.30:    63.00:     4.0:  VP2E:\r
     VP2E;\r
 Montserrat:               08:  11:  NA:   16.80:    62.20:     4.0:  VP2M:\r


@@ -800,7 +801,7 @@ South Georgia:            13:  73:  SA:  -54.30:    36.80:     2.0:  VP8/g:
     VP8GEO,VP8SGB,VP8SGK;\r
 South Shetland:           13:  73:  SA:  -62.00:    58.30:     4.0:  VP8/h:\r
     CE9A,CE9R,CA8WCI/9,D88S,DT8A,HF0POL,HF0QF,HL0KSJ,HL5BDS,HL8KSJ,LU/R1ANF,\r
     VP8GEO,VP8SGB,VP8SGK;\r
 South Shetland:           13:  73:  SA:  -62.00:    58.30:     4.0:  VP8/h:\r
     CE9A,CE9R,CA8WCI/9,D88S,DT8A,HF0POL,HF0QF,HL0KSJ,HL5BDS,HL8KSJ,LU/R1ANF,\r

-    LU1ZC,LZ0A,OL0ANT,R1ANF,VP8/LZ1UQ,VP8DJK,XR9A;\r
+    LU1ZC,LZ0A,OL0ANT,R1ANF,VP8/LZ1UQ,VP8DJK;\r

 South Orkney:             13:  73:  SA:  -60.00:    45.50:     3.0:  VP8/o:\r
     AY1ZA,LU1ZA,LU2ERA/Z;\r
 South Sandwich:           13:  73:  SA:  -57.00:    26.70:     2.0:  VP8/s:\r
 South Orkney:             13:  73:  SA:  -60.00:    45.50:     3.0:  VP8/o:\r
     AY1ZA,LU1ZA,LU2ERA/Z;\r
 South Sandwich:           13:  73:  SA:  -57.00:    26.70:     2.0:  VP8/s:\r


@@ -814,16 +815,14 @@ Hong Kong:                24:  44:  AS:   22.30:  -114.30:    -8.0:  VR:
 India:                    22:  41:  AS:   22.00:   -80.00:    -5.5:  VU:\r
     8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW;\r
 Andaman & Nicobar:        26:  49:  AS:   11.70:   -92.80:    -5.5:  VU4:\r
 India:                    22:  41:  AS:   22.00:   -80.00:    -5.5:  VU:\r
     8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW;\r
 Andaman & Nicobar:        26:  49:  AS:   11.70:   -92.80:    -5.5:  VU4:\r

-    8T4,8U4,8V4,8W4,8X4,8Y4,AT4,AU4,AV4,AW4,VT4,VU4,VV4,VW4,VU3VPX,VU3VPY,\r
-    VU4AN/RBI;\r
+    8T4,8U4,8V4,8W4,8X4,8Y4,AT4,AU4,AV4,AW4,VT4,VU4,VV4,VW4,VU3VPX,VU3VPY;\r

 Laccadive Is.:            22:  41:  AS:   10.00:   -73.00:    -5.5:  VU7:\r
 Laccadive Is.:            22:  41:  AS:   10.00:   -73.00:    -5.5:  VU7:\r

-    8T7,8U7,8V7,8W7,8X7,8Y7,AT7,AU7,AV7,AW7,VT7,VU7,VV7,VW7,VU7MY/JOS,\r
-    VU7MY/RBI;\r
+    8T7,8U7,8V7,8W7,8X7,8Y7,AT7,AU7,AV7,AW7,VT7,VU7,VV7,VW7;\r

 Mexico:                   06:  10:  NA:   19.40:    99.10:     6.0:  XE:\r
     4A,4B,4C,6D,6E,6F,6G,6H,6I,6J,XA,XB,XC,XD,XE,XF,XG,XH,XI;\r
 Revilla Gigedo:           06:  10:  NA:   19.00:   111.50:     7.0:  XF4:\r
     4A4,4B4,4C4,6D4,6E4,6F4,6G4,6H4,6I4,6J4,XA4,XB4,XC4,XD4,XE4,XF4,XG4,XH4,\r
 Mexico:                   06:  10:  NA:   19.40:    99.10:     6.0:  XE:\r
     4A,4B,4C,6D,6E,6F,6G,6H,6I,6J,XA,XB,XC,XD,XE,XF,XG,XH,XI;\r
 Revilla Gigedo:           06:  10:  NA:   19.00:   111.50:     7.0:  XF4:\r
     4A4,4B4,4C4,6D4,6E4,6F4,6G4,6H4,6I4,6J4,XA4,XB4,XC4,XD4,XE4,XF4,XG4,XH4,\r

-    XI4,XF0C;\r
+    XI4;\r

 Burkina Faso:             35:  46:  AF:   12.40:     1.60:     0.0:  XT:\r
     XT;\r
 Kampuchea:                26:  49:  AS:   11.70:  -104.80:    -7.0:  XU:\r
 Burkina Faso:             35:  46:  AF:   12.40:     1.60:     0.0:  XT:\r
     XT;\r
 Kampuchea:                26:  49:  AS:   11.70:  -104.80:    -7.0:  XU:\r


@@ -854,7 +853,7 @@ Romania:                  20:  28:  EU:   44.40:   -26.10:    -2.0:  YO:
 El Salvador:              07:  11:  NA:   13.70:    89.20:     6.0:  YS:\r
     HU,YS;\r
 Serbia:                   15:  28:  EU:   44.90:   -20.50:    -1.0:  YU:\r
 El Salvador:              07:  11:  NA:   13.70:    89.20:     6.0:  YS:\r
     HU,YS;\r
 Serbia:                   15:  28:  EU:   44.90:   -20.50:    -1.0:  YU:\r

-    4N,YT,YT60,YU,YU60,YZ,YZ60;\r
+    4N,YT,YU,YZ;\r

 Venezuela:                09:  12:  SA:   10.50:    67.00:     4.0:  YV:\r
     4M,YV,YW,YX,YY;\r
 Aves I.:                  08:  11:  NA:   15.70:    63.70:     4.0:  YV0:\r
 Venezuela:                09:  12:  SA:   10.50:    67.00:     4.0:  YV:\r
     4M,YV,YW,YX,YY;\r
 Aves I.:                  08:  11:  NA:   15.70:    63.70:     4.0:  YV0:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 8fd708d658ea4a577c96da1727d720b1b6be71b4..b0014d41411d706fee76170349e87c106b4d81d2 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -115,11 +115,9 @@
   '4U43' => '275',
   '4U4ITU' => '274',
   '4U4UN' => '275',
   '4U43' => '275',
   '4U4ITU' => '274',
   '4U4UN' => '275',

+  '4U50SPACE' => '275',

   '4U5ITU' => '274',
   '4U5UN' => '275',
   '4U5ITU' => '274',
   '4U5UN' => '275',

-  '4U60UN' => '275',
-  '4U60UO' => '42',
-  '4U61UN' => '275',

   '4U6ITU' => '274',
   '4U6UN' => '275',
   '4U7ITU' => '274',
   '4U6ITU' => '274',
   '4U6UN' => '275',
   '4U7ITU' => '274',


@@ -278,11 +276,9 @@
   '9M2' => '302',
   '9M2/PG5M' => '261',
   '9M4' => '302',
   '9M2' => '302',
   '9M2/PG5M' => '261',
   '9M4' => '302',

-  '9M4SAB' => '303,527',

   '9M4SDX' => '261',
   '9M4SDX' => '261',

-  '9M4SEB' => '303,527',
-  '9M4SHQ' => '303,527',
-  '9M4SMS' => '303,527',
+  '9M50' => '302',
+  '9M50MS' => '303,527',

   '9M6' => '303,527',
   '9M8' => '528',
   '9N' => '304',
   '9M6' => '303,527',
   '9M8' => '528',
   '9N' => '304',


@@ -294,7 +290,6 @@
   '9T' => '305',
   '9U' => '306',
   '9V' => '307',
   '9T' => '305',
   '9U' => '306',
   '9V' => '307',

-  '9V0A' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   '9W2' => '302',
   '9W4' => '302',
   '9W6' => '303,527',
   '9W2' => '302',
   '9W4' => '302',
   '9W6' => '303,527',


@@ -448,10 +443,12 @@
   'AK8' => '483,496,510',
   'AK9' => '475,476,509',
   'AL' => '112',
   'AK8' => '483,496,510',
   'AK9' => '475,476,509',
   'AL' => '112',

+  'AL0F' => '220',

   'AL1VE' => '220',
   'AL7C' => '220',
   'AL7KT' => '220',
   'AL7LV' => '220',
   'AL1VE' => '220',
   'AL7C' => '220',
   'AL7KT' => '220',
   'AL7LV' => '220',

+  'AL7NS' => '220',

   'AL7O' => '220',
   'AL7QQ' => '220',
   'AL7W' => '220',
   'AL7O' => '220',
   'AL7QQ' => '220',
   'AL7W' => '220',


@@ -572,6 +569,19 @@
   'BG9R' => '10,339,340,341',
   'BG9S' => '10,339,340,341',
   'BH' => '10',
   'BG9R' => '10,339,340,341',
   'BG9S' => '10,339,340,341',
   'BH' => '10',

+  'BH3G' => '10,339,340,341',
+  'BH3H' => '10,339,340,341',
+  'BH3I' => '10,339,340,341',
+  'BH3J' => '10,339,340,341',
+  'BH3K' => '10,339,340,341',
+  'BH3L' => '10,339,340,341',
+  'BH9M' => '10,339,340,341',
+  'BH9N' => '10,339,340,341',
+  'BH9O' => '10,339,340,341',
+  'BH9P' => '10,339,340,341',
+  'BH9Q' => '10,339,340,341',
+  'BH9R' => '10,339,340,341',
+  'BH9S' => '10,339,340,341',

   'BI' => '10',
   'BJ' => '10',
   'BK' => '10',
   'BI' => '10',
   'BJ' => '10',
   'BK' => '10',


@@ -684,7 +694,6 @@
   'CE0Y' => '17',
   'CE0Z' => '19',
   'CE9' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'CE0Y' => '17',
   'CE0Z' => '19',
   'CE9' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

-  'CE9/VK0LD' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'CE9A' => '208',
   'CE9R' => '208',
   'CF' => '434',
   'CE9A' => '208',
   'CE9R' => '208',
   'CF' => '434',


@@ -712,11 +721,9 @@
   'CS' => '23',
   'CS3' => '25',
   'CS9' => '25',
   'CS' => '23',
   'CS3' => '25',
   'CS9' => '25',

-  'CS98' => '23',

   'CT' => '23',
   'CT3' => '25',
   'CT9' => '25',
   'CT' => '23',
   'CT3' => '25',
   'CT9' => '25',

-  'CT98' => '23',

   'CU' => '24',
   'CV' => '26',
   'CW' => '26',
   'CU' => '24',
   'CV' => '26',
   'CW' => '26',


@@ -759,7 +766,6 @@
   'DP' => '32',
   'DP0' => '365',
   'DP0GVN' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'DP' => '32',
   'DP0' => '365',
   'DP0GVN' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

-  'DP1POL' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'DQ' => '32',
   'DR' => '32',
   'DS' => '78',
   'DQ' => '32',
   'DR' => '32',
   'DS' => '78',


@@ -788,6 +794,7 @@
   'E51WL' => '249',
   'E7' => '325',
   'EA' => '34',
   'E51WL' => '249',
   'E7' => '325',
   'EA' => '34',

+  'EA5ON/6' => '35',

   'EA6' => '35',
   'EA8' => '36',
   'EA9' => '37,346,347',
   'EA6' => '35',
   'EA8' => '36',
   'EA9' => '37,346,347',


@@ -802,8 +809,6 @@
   'ED' => '34',
   'ED6' => '35',
   'ED8' => '36',
   'ED' => '34',
   'ED6' => '35',
   'ED8' => '36',

-  'ED8OTA/D' => '36',
-  'ED8OTA/H' => '36',

   'ED9' => '346,347',
   'EE' => '34',
   'EE6' => '35',
   'ED9' => '346,347',
   'EE' => '34',
   'EE6' => '35',


@@ -826,10 +831,6 @@
   'EK' => '181',
   'EL' => '39',
   'EM' => '177',
   'EK' => '181',
   'EL' => '39',
   'EM' => '177',

-  'EM1HO' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
-  'EM1KGG' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
-  'EM1U' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
-  'EM1UC' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'EN' => '177',
   'EO' => '177',
   'EP' => '40',
   'EN' => '177',
   'EO' => '177',
   'EP' => '40',


@@ -868,7 +869,6 @@
   'FR/G' => '51',
   'FR/J' => '52',
   'FR/T' => '53',
   'FR/G' => '51',
   'FR/J' => '52',
   'FR/T' => '53',

-  'FR5IZ/E' => '52',

   'FR5ZQ/T' => '53',
   'FR5ZU/T' => '53',
   'FS' => '54',
   'FR5ZQ/T' => '53',
   'FR5ZU/T' => '53',
   'FS' => '54',


@@ -982,6 +982,7 @@
   'GB1EPC' => '64,351',
   'GB1FVT' => '64,351',
   'GB1LSG' => '66',
   'GB1EPC' => '64,351',
   'GB1FVT' => '64,351',
   'GB1LSG' => '66',

+  'GB1SL' => '66',

   'GB1SPD' => '62',
   'GB1SSL' => '66',
   'GB1TDS' => '66',
   'GB1SPD' => '62',
   'GB1SSL' => '66',
   'GB1TDS' => '66',


@@ -1032,6 +1033,7 @@
   'GB2LCL' => '64,351',
   'GB2LCP' => '64,351',
   'GB2LGB' => '64,351',
   'GB2LCL' => '64,351',
   'GB2LCP' => '64,351',
   'GB2LGB' => '64,351',

+  'GB2LHI' => '64,351',

   'GB2LL' => '62',
   'GB2LMG' => '64,351',
   'GB2LNM' => '64,351',
   'GB2LL' => '62',
   'GB2LMG' => '64,351',
   'GB2LNM' => '64,351',


@@ -1125,7 +1127,10 @@
   'GB4WXM/P' => '61',
   'GB4XXX' => '66',
   'GB4ZBS' => '64,351',
   'GB4WXM/P' => '61',
   'GB4XXX' => '66',
   'GB4ZBS' => '64,351',

+  'GB50AAD' => '62',

   'GB50ATC' => '64,351',
   'GB50ATC' => '64,351',

+  'GB50JS' => '64,351',
+  'GB50JSA' => '63',

   'GB50LIB' => '65',
   'GB50SWL' => '64,351',
   'GB50UN' => '61',
   'GB50LIB' => '65',
   'GB50SWL' => '64,351',
   'GB50UN' => '61',


@@ -1149,6 +1154,7 @@
   'GB60NTS' => '64,351',
   'GB60VLY' => '66',
   'GB6AR' => '66',
   'GB60NTS' => '64,351',
   'GB60VLY' => '66',
   'GB6AR' => '66',

+  'GB6GW' => '66',

   'GB6MI' => '64,351',
   'GB6SA' => '64,351',
   'GB6SM' => '64,351',
   'GB6MI' => '64,351',
   'GB6SA' => '64,351',
   'GB6SM' => '64,351',


@@ -1167,6 +1173,7 @@
   'GB8CM' => '64,351',
   'GB8CN' => '64,351',
   'GB8CO' => '64,351',
   'GB8CM' => '64,351',
   'GB8CN' => '64,351',
   'GB8CO' => '64,351',

+  'GB8CSL' => '64,351',

   'GB8CY' => '64,351',
   'GB8FF' => '64,351',
   'GB8OO' => '64,351',
   'GB8CY' => '64,351',
   'GB8FF' => '64,351',
   'GB8OO' => '64,351',


@@ -1179,7 +1186,6 @@
   'GH' => '63',
   'GI' => '62',
   'GJ' => '63',
   'GH' => '63',
   'GI' => '62',
   'GJ' => '63',

-  'GJ3DVC/L' => '63',

   'GM' => '64,351',
   'GM/S' => '351',
   'GM0AVR' => '351',
   'GM' => '64,351',
   'GM/S' => '351',
   'GM0AVR' => '351',


@@ -1268,21 +1274,18 @@
   'HY' => '42',
   'HZ' => '83,352,353',
   'I' => '84,357,358',
   'HY' => '42',
   'HZ' => '83,352,353',
   'I' => '84,357,358',

-  'IA0PS' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'IB9' => '356',
   'ID9' => '356',
   'IE9' => '356',
   'IF9' => '356',
   'IG9' => '354',
   'IH9' => '355',
   'IB9' => '356',
   'ID9' => '356',
   'IE9' => '356',
   'IF9' => '356',
   'IG9' => '354',
   'IH9' => '355',

-  'II0AMZS' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'II0P' => '85',
   'II9' => '356',
   'IJ9' => '356',
   'IM0' => '85',
   'IO9' => '356',
   'IQ9' => '356',
   'II0P' => '85',
   'II9' => '356',
   'IJ9' => '356',
   'IM0' => '85',
   'IO9' => '356',
   'IQ9' => '356',

-  'IR0PS' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'IR9' => '356',
   'IS' => '85',
   'IT' => '356',
   'IR9' => '356',
   'IS' => '85',
   'IT' => '356',


@@ -1563,7 +1566,9 @@
   'KH5K' => '106',
   'KH6' => '107,387,388',
   'KH6DX' => '220',
   'KH5K' => '106',
   'KH6' => '107,387,388',
   'KH6DX' => '220',

+  'KH6GJV' => '220',

   'KH6HHS' => '220',
   'KH6HHS' => '220',

+  'KH6OE' => '220',

   'KH6QAI' => '220',
   'KH6QAJ' => '220',
   'KH6RW' => '220',
   'KH6QAI' => '220',
   'KH6QAJ' => '220',
   'KH6RW' => '220',


@@ -1571,7 +1576,6 @@
   'KH7K' => '108',
   'KH8' => '109,333',
   'KH8/S' => '333',
   'KH7K' => '108',
   'KH8' => '109,333',
   'KH8/S' => '333',

-  'KH8S/K3UY' => '333',

   'KH8SI' => '333',
   'KH9' => '110',
   'KI0' => '467,473,477,484,485,489,490,502',
   'KH8SI' => '333',
   'KH9' => '110',
   'KI0' => '467,473,477,484,485,489,490,502',


@@ -1608,6 +1612,7 @@
   'KK9' => '475,476,509',
   'KK9A' => '220',
   'KL' => '392',
   'KK9' => '475,476,509',
   'KK9A' => '220',
   'KL' => '392',

+  'KL0ET' => '220',

   'KL0LN' => '220',
   'KL1IF' => '220',
   'KL2A/7' => '220',
   'KL0LN' => '220',
   'KL1IF' => '220',
   'KL2A/7' => '220',


@@ -1784,6 +1789,7 @@
   'L7' => '119',
   'L8' => '119',
   'L80AA/D' => '119,396,397',
   'L7' => '119',
   'L8' => '119',
   'L80AA/D' => '119,396,397',

+  'L84VI/D' => '119,396,397',

   'L8D/X' => '119,396,397',
   'L9' => '119',
   'LA' => '118,393,394,395',
   'L8D/X' => '119,396,397',
   'L9' => '119',
   'LA' => '118,393,394,395',


@@ -1817,6 +1823,7 @@
   'LU1CDP/D' => '119,396,397',
   'LU1DK/D' => '119,396,397',
   'LU1DMA/E' => '119,396,397',
   'LU1CDP/D' => '119,396,397',
   'LU1DK/D' => '119,396,397',
   'LU1DMA/E' => '119,396,397',

+  'LU1DZ/E' => '119,396,397',

   'LU1DZ/P' => '119,396,397',
   'LU1DZ/Q' => '119,396,397',
   'LU1DZ/R' => '119,396,397',
   'LU1DZ/P' => '119,396,397',
   'LU1DZ/Q' => '119,396,397',
   'LU1DZ/R' => '119,396,397',


@@ -1826,6 +1833,7 @@
   'LU1EQ/D' => '119,396,397',
   'LU1EYW/D' => '119,396,397',
   'LU1OFN/I' => '119,396,397',
   'LU1EQ/D' => '119,396,397',
   'LU1EYW/D' => '119,396,397',
   'LU1OFN/I' => '119,396,397',

+  'LU1VOF/D' => '119,396,397',

   'LU1VZ/V' => '119,396,397',
   'LU1XAW/X' => '119,396,397',
   'LU1XY/X' => '119,396,397',
   'LU1VZ/V' => '119,396,397',
   'LU1XAW/X' => '119,396,397',
   'LU1XY/X' => '119,396,397',


@@ -1838,6 +1846,7 @@
   'LU2DT/LH' => '119,396,397',
   'LU2DVI/H' => '119,396,397',
   'LU2EE/D' => '119,396,397',
   'LU2DT/LH' => '119,396,397',
   'LU2DVI/H' => '119,396,397',
   'LU2EE/D' => '119,396,397',

+  'LU2EE/E' => '119,396,397',

   'LU2EJB/X' => '119,396,397',
   'LU2ERA/Z' => '206',
   'LU2VC/D' => '119,396,397',
   'LU2EJB/X' => '119,396,397',
   'LU2ERA/Z' => '206',
   'LU2VC/D' => '119,396,397',


@@ -1849,6 +1858,8 @@
   'LU3DOC/D' => '119,396,397',
   'LU3DR/D' => '119,396,397',
   'LU3DR/V' => '119,396,397',
   'LU3DOC/D' => '119,396,397',
   'LU3DR/D' => '119,396,397',
   'LU3DR/V' => '119,396,397',

+  'LU3DXG/D' => '119,396,397',
+  'LU3ES/D' => '119,396,397',

   'LU3ES/W' => '119,396,397',
   'LU4AAO/D' => '119,396,397',
   'LU4DA/D' => '119,396,397',
   'LU3ES/W' => '119,396,397',
   'LU4AAO/D' => '119,396,397',
   'LU4DA/D' => '119,396,397',


@@ -1874,17 +1885,20 @@
   'LU5EAO/D' => '119,396,397',
   'LU5EFX/Y' => '119,396,397',
   'LU5EWO/D' => '119,396,397',
   'LU5EAO/D' => '119,396,397',
   'LU5EFX/Y' => '119,396,397',
   'LU5EWO/D' => '119,396,397',

+  'LU5FZ/D' => '119,396,397',

   'LU5XC/X' => '119,396,397',
   'LU6DBL/D' => '119,396,397',
   'LU6DKT/D' => '119,396,397',
   'LU6DRD/D' => '119,396,397',
   'LU6DRD/E' => '119,396,397',
   'LU5XC/X' => '119,396,397',
   'LU6DBL/D' => '119,396,397',
   'LU6DKT/D' => '119,396,397',
   'LU6DRD/D' => '119,396,397',
   'LU6DRD/E' => '119,396,397',

+  'LU6DRN/D' => '119,396,397',

   'LU6DRR/D' => '119,396,397',
   'LU6EC/W' => '119,396,397',
   'LU6EJJ/D' => '119,396,397',
   'LU6EPR/D' => '119,396,397',
   'LU6EPR/E' => '119,396,397',
   'LU6EYK/X' => '119,396,397',
   'LU6DRR/D' => '119,396,397',
   'LU6EC/W' => '119,396,397',
   'LU6EJJ/D' => '119,396,397',
   'LU6EPR/D' => '119,396,397',
   'LU6EPR/E' => '119,396,397',
   'LU6EYK/X' => '119,396,397',

+  'LU6JJ/D' => '119,396,397',

   'LU6UO/D' => '119,396,397',
   'LU6UO/P' => '119,396,397',
   'LU6UO/Q' => '119,396,397',
   'LU6UO/D' => '119,396,397',
   'LU6UO/P' => '119,396,397',
   'LU6UO/Q' => '119,396,397',


@@ -1893,6 +1907,7 @@
   'LU6UO/X' => '119,396,397',
   'LU6XAH/X' => '119,396,397',
   'LU7AC/D' => '119,396,397',
   'LU6UO/X' => '119,396,397',
   'LU6XAH/X' => '119,396,397',
   'LU7AC/D' => '119,396,397',

+  'LU7BTO/D' => '119,396,397',

   'LU7DID/V' => '119,396,397',
   'LU7DID/Y' => '119,396,397',
   'LU7DIR/D' => '119,396,397',
   'LU7DID/V' => '119,396,397',
   'LU7DID/Y' => '119,396,397',
   'LU7DIR/D' => '119,396,397',


@@ -1912,6 +1927,7 @@
   'LU7EPC/W' => '119,396,397',
   'LU7VCH/D' => '119,396,397',
   'LU7WFM/W' => '119,396,397',
   'LU7EPC/W' => '119,396,397',
   'LU7VCH/D' => '119,396,397',
   'LU7WFM/W' => '119,396,397',

+  'LU7WW/W' => '119,396,397',

   'LU8ADX/D' => '119,396,397',
   'LU8DCH/D' => '119,396,397',
   'LU8DCH/Q' => '119,396,397',
   'LU8ADX/D' => '119,396,397',
   'LU8DCH/D' => '119,396,397',
   'LU8DCH/Q' => '119,396,397',


@@ -1941,8 +1957,10 @@
   'LU8XC/X' => '119,396,397',
   'LU8XW/X' => '119,396,397',
   'LU9ARB/D' => '119,396,397',
   'LU8XC/X' => '119,396,397',
   'LU8XW/X' => '119,396,397',
   'LU9ARB/D' => '119,396,397',

+  'LU9AUC/D' => '119,396,397',

   'LU9DBK/X' => '119,396,397',
   'LU9DKX/X' => '119,396,397',
   'LU9DBK/X' => '119,396,397',
   'LU9DKX/X' => '119,396,397',

+  'LU9EI/F' => '119,396,397',

   'LU9EJS/E' => '119,396,397',
   'LU9ESD/D' => '119,396,397',
   'LU9ESD/V' => '119,396,397',
   'LU9EJS/E' => '119,396,397',
   'LU9ESD/D' => '119,396,397',
   'LU9ESD/V' => '119,396,397',


@@ -1951,7 +1969,10 @@
   'LU9JMG/J' => '119,396,397',
   'LV' => '119',
   'LW' => '119',
   'LU9JMG/J' => '119,396,397',
   'LV' => '119',
   'LW' => '119',

+  'LW1DAL/D' => '119,396,397',
+  'LW1EXU/D' => '119,396,397',

   'LW1EXU/Y' => '119,396,397',
   'LW1EXU/Y' => '119,396,397',

+  'LW2DX/D' => '119,396,397',

   'LW2DX/P' => '119,396,397',
   'LW2DX/Q' => '119,396,397',
   'LW2DX/R' => '119,396,397',
   'LW2DX/P' => '119,396,397',
   'LW2DX/Q' => '119,396,397',
   'LW2DX/R' => '119,396,397',


@@ -1973,9 +1994,13 @@
   'LW5EE/D' => '119,396,397',
   'LW5EE/V' => '119,396,397',
   'LW5EOL/D' => '119,396,397',
   'LW5EE/D' => '119,396,397',
   'LW5EE/V' => '119,396,397',
   'LW5EOL/D' => '119,396,397',

+  'LW6DTM/D' => '119,396,397',
+  'LW7DAF/D' => '119,396,397',

   'LW7DAF/W' => '119,396,397',
   'LW7DAF/W' => '119,396,397',

+  'LW7DLY/D' => '119,396,397',

   'LW7DNS/E' => '119,396,397',
   'LW8DMK/D' => '119,396,397',
   'LW7DNS/E' => '119,396,397',
   'LW8DMK/D' => '119,396,397',

+  'LW8ECQ/D' => '119,396,397',

   'LW8EU/D' => '119,396,397',
   'LW8EXF/D' => '119,396,397',
   'LW9DCF/Y' => '119,396,397',
   'LW8EU/D' => '119,396,397',
   'LW8EXF/D' => '119,396,397',
   'LW9DCF/Y' => '119,396,397',


@@ -1995,7 +2020,6 @@
   'MI' => '62',
   'MJ' => '63',
   'MM' => '64',
   'MI' => '62',
   'MJ' => '63',
   'MM' => '64',

-  'MM/DL6MHW' => '64,351',

   'MM0LSM' => '351',
   'MM0XAU' => '351',
   'MM0ZAL' => '351',
   'MM0LSM' => '351',
   'MM0XAU' => '351',
   'MM0ZAL' => '351',


@@ -2072,7 +2096,6 @@
   'N8NA' => '220',
   'N8PR' => '220',
   'N8RA' => '220',
   'N8NA' => '220',
   'N8PR' => '220',
   'N8RA' => '220',

-  'N8S' => '333',

   'N8WXQ' => '220',
   'N9' => '475,476,509',
   'N9ADG' => '220',
   'N8WXQ' => '220',
   'N9' => '475,476,509',
   'N9ADG' => '220',


@@ -2354,7 +2377,6 @@
   'OG0' => '126',
   'OH' => '125,399',
   'OH0' => '126',
   'OG0' => '126',
   'OH' => '125,399',
   'OH0' => '126',

-  'OH0JJS/1' => '125,399',

   'OH0M' => '127',
   'OI' => '125',
   'OI0' => '126',
   'OH0M' => '127',
   'OI' => '125',
   'OI0' => '126',


@@ -2498,21 +2520,15 @@
   'R1FJ' => '174',
   'R1MV' => '312',
   'R2' => '175',
   'R1FJ' => '174',
   'R1MV' => '312',
   'R2' => '175',

-  'R20CH' => '173,418,419,420,421',
-  'R270A' => '176,425,430',
-  'R270E' => '176,425,430',

   'R3' => '419',
   'R30ZF' => '176,425,430',
   'R3' => '419',
   'R30ZF' => '176,425,430',

-  'R375I' => '176,425,430',
+  'R35NP' => '176,425,430',

   'R3F/9' => '176,425,430',
   'R4' => '420',
   'R3F/9' => '176,425,430',
   'R4' => '420',

-  'R40WK' => '176,425,430',
+  'R450W' => '176,425,430',
+  'R5K/2' => '175',

   'R6' => '421',
   'R6' => '421',

-  'R60A' => '175',
-  'R60F' => '175',

   'R7' => '176,425,430',
   'R7' => '176,425,430',

-  'R70PW' => '176,425,430',
-  'R750' => '175',

   'R7C' => '173,418,419,420,421',
   'R7C/1' => '173,418,419,420,421',
   'R7C/3' => '173,418,419,420,421',
   'R7C' => '173,418,419,420,421',
   'R7C/1' => '173,418,419,420,421',
   'R7C/3' => '173,418,419,420,421',


@@ -3075,8 +3091,6 @@
   'TO8MZ' => '44',
   'TO8RR' => '43',
   'TO9A' => '46',
   'TO8MZ' => '44',
   'TO8RR' => '43',
   'TO9A' => '46',

-  'TO9IS' => '59',
-  'TO9PL' => '54',

   'TO9T' => '43',
   'TP' => '42',
   'TQ' => '42',
   'TO9T' => '43',
   'TP' => '42',
   'TQ' => '42',


@@ -3094,6 +3108,7 @@
   'TX0P' => '44',
   'TX1A' => '45,330',
   'TX4B' => '46',
   'TX0P' => '44',
   'TX1A' => '45,330',
   'TX4B' => '46',

+  'TX5C' => '48',

   'TX5CW' => '45,330',
   'TX5M' => '44',
   'TX5NK' => '44',
   'TX5CW' => '45,330',
   'TX5M' => '44',
   'TX5NK' => '44',


@@ -3124,6 +3139,7 @@
   'UA' => '173,418,419,420,421',
   'UA0' => '423,424,426,427,429',
   'UA1' => '418',
   'UA' => '173,418,419,420,421',
   'UA0' => '423,424,426,427,429',
   'UA1' => '418',

+  'UA1AAE/2' => '175',

   'UA1PBN/1' => '174',
   'UA2' => '175',
   'UA3' => '419',
   'UA1PBN/1' => '174',
   'UA2' => '175',
   'UA3' => '419',


@@ -3190,10 +3206,7 @@
   'UD9W' => '176,425,430',
   'UE0' => '422,424,428',
   'UE1' => '418',
   'UD9W' => '176,425,430',
   'UE0' => '422,424,428',
   'UE1' => '418',

-  'UE105SBM' => '176,425,430',
-  'UE15UWC' => '176,425,430',

   'UE2' => '175',
   'UE2' => '175',

-  'UE200TARS' => '173,418,419,420,421',

   'UE3' => '419',
   'UE4' => '420',
   'UE6' => '421',
   'UE3' => '419',
   'UE4' => '420',
   'UE6' => '421',


@@ -3294,14 +3307,6 @@
   'V4' => '218',
   'V5' => '259',
   'V6' => '100,386',
   'V4' => '218',
   'V5' => '259',
   'V6' => '100,386',

-  'V63JQ/C' => '100,386',
-  'V63JQ/K' => '100,386',
-  'V63JY/C' => '100,386',
-  'V63JY/K' => '100,386',
-  'V63OP/C' => '100,386',
-  'V63OP/K' => '100,386',
-  'V63VE/C' => '100,386',
-  'V63VE/K' => '100,386',

   'V7' => '117',
   'V8' => '219',
   'V9' => '257,522,523,524,525',
   'V7' => '117',
   'V8' => '219',
   'V9' => '257,522,523,524,525',


@@ -3380,6 +3385,10 @@
   'VE2XAA/2' => '191',
   'VE2XY' => '191',
   'VE2YM' => '191',
   'VE2XAA/2' => '191',
   'VE2XY' => '191',
   'VE2YM' => '191',

+  'VE2Z' => '191',
+  'VE2ZC' => '191',
+  'VE2ZM' => '191',
+  'VE2ZV' => '191',

   'VE3' => '442',
   'VE3EY/2' => '191',
   'VE3NE/2' => '191',
   'VE3' => '442',
   'VE3EY/2' => '191',
   'VE3NE/2' => '191',


@@ -3393,7 +3402,7 @@
   'VE8PW' => '191',
   'VE8RCS' => '191',
   'VE9' => '436',
   'VE8PW' => '191',
   'VE8RCS' => '191',
   'VE9' => '436',

-  'VER20070810' => '191',
+  'VER20071023' => '191',

   'VERSION' => '536',
   'VF' => '434',
   'VF0' => '191',
   'VERSION' => '536',
   'VF' => '434',
   'VF0' => '191',


@@ -3414,7 +3423,6 @@
   'VI0' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VI0M' => '200',
   'VI9' => '197',
   'VI0' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VI0M' => '200',
   'VI9' => '197',

-  'VI90ANZAC' => '192,447,448,449,450,451,452,453,454',

   'VI9C' => '195',
   'VI9L' => '193',
   'VI9M' => '196',
   'VI9C' => '195',
   'VI9L' => '193',
   'VI9M' => '196',


@@ -3442,7 +3450,6 @@
   'VK1' => '447',
   'VK2' => '448',
   'VK3' => '449',
   'VK1' => '447',
   'VK2' => '448',
   'VK3' => '449',

-  'VK3FY/9' => '194',

   'VK4' => '450',
   'VK5' => '451',
   'VK6' => '452',
   'VK4' => '450',
   'VK5' => '451',
   'VK6' => '452',


@@ -3456,7 +3463,6 @@
   'VK9/Y' => '195',
   'VK9/Z' => '196',
   'VK9AA' => '195',
   'VK9/Y' => '195',
   'VK9/Z' => '196',
   'VK9AA' => '195',

-  'VK9AE' => '193',

   'VK9C' => '195',
   'VK9CL' => '193',
   'VK9CN' => '197',
   'VK9C' => '195',
   'VK9CL' => '193',
   'VK9CN' => '197',


@@ -3482,11 +3488,9 @@
   'VK9NN' => '197',
   'VK9NW' => '198',
   'VK9NX' => '194',
   'VK9NN' => '197',
   'VK9NW' => '198',
   'VK9NX' => '194',

-  'VK9PG' => '193',

   'VK9W' => '198',
   'VK9X' => '194',
   'VK9Y' => '195',
   'VK9W' => '198',
   'VK9X' => '194',
   'VK9Y' => '195',

-  'VK9YQS' => '193',

   'VK9ZC' => '195',
   'VK9ZL' => '193',
   'VK9ZM' => '196',
   'VK9ZC' => '195',
   'VK9ZL' => '193',
   'VK9ZM' => '196',


@@ -3540,11 +3544,9 @@
   'VP8/G' => '205',
   'VP8/H' => '208',
   'VP8/LZ1UQ' => '208',
   'VP8/G' => '205',
   'VP8/H' => '208',
   'VP8/LZ1UQ' => '208',

-  'VP8/MM0TJR/P' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'VP8/O' => '206',
   'VP8/S' => '207',
   'VP8BF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8/O' => '206',
   'VP8/S' => '207',
   'VP8BF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

-  'VP8CTR' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'VP8DJB' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8DJK' => '208',
   'VP8DKF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8DJB' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8DJK' => '208',
   'VP8DKF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',


@@ -3565,16 +3567,12 @@
   'VT4' => '214',
   'VT7' => '215',
   'VU' => '213,456,457,458',
   'VT4' => '214',
   'VT7' => '215',
   'VU' => '213,456,457,458',

-  'VU3BPZ' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',

   'VU3VPX' => '214',
   'VU3VPY' => '214',
   'VU4' => '214',
   'VU3VPX' => '214',
   'VU3VPY' => '214',
   'VU4' => '214',

-  'VU4AN/RBI' => '214',

   'VU7' => '215',
   'VU7/A' => '214',
   'VU7/L' => '215',
   'VU7' => '215',
   'VU7/A' => '214',
   'VU7/L' => '215',

-  'VU7MY/JOS' => '215',
-  'VU7MY/RBI' => '215',

   'VV' => '459',
   'VV4' => '214',
   'VV7' => '215',
   'VV' => '459',
   'VV4' => '214',
   'VV7' => '215',


@@ -3817,6 +3815,7 @@
   'WK8' => '483,496,510',
   'WK9' => '475,476,509',
   'WL' => '112',
   'WK8' => '483,496,510',
   'WK9' => '475,476,509',
   'WL' => '112',

+  'WL7BPY' => '220',

   'WL7K' => '220',
   'WM0' => '467,473,477,484,485,489,490,502',
   'WM1' => '468,480,482,491,500,507',
   'WL7K' => '220',
   'WM0' => '467,473,477,484,485,489,490,502',
   'WM1' => '468,480,482,491,500,507',


@@ -3976,7 +3975,6 @@
   'XE3' => '515',
   'XE4' => '222',
   'XF' => '221',
   'XE3' => '515',
   'XE4' => '222',
   'XF' => '221',

-  'XF0C' => '222',

   'XF4' => '222',
   'XG' => '221',
   'XG4' => '222',
   'XF4' => '222',
   'XG' => '221',
   'XG4' => '222',


@@ -4009,7 +4007,6 @@
   'XR0' => '17',
   'XR0X' => '18',
   'XR0Z' => '19',
   'XR0' => '17',
   'XR0X' => '18',
   'XR0Z' => '19',

-  'XR9A' => '208',

   'XS' => '10',
   'XT' => '223',
   'XU' => '224',
   'XS' => '10',
   'XT' => '223',
   'XU' => '224',


@@ -4042,12 +4039,10 @@
   'YT' => '238',
   'YT3' => '336',
   'YT6' => '336',
   'YT' => '238',
   'YT3' => '336',
   'YT6' => '336',

-  'YT60' => '238',

   'YU' => '238',
   'YU3' => '336',
   'YU5' => '335',
   'YU6' => '336',
   'YU' => '238',
   'YU3' => '336',
   'YU5' => '335',
   'YU6' => '336',

-  'YU60' => '238',

   'YV' => '239',
   'YV0' => '240',
   'YW' => '239',
   'YV' => '239',
   'YV0' => '240',
   'YW' => '239',


@@ -4059,7 +4054,6 @@
   'YZ' => '238',
   'YZ3' => '336',
   'YZ6' => '336',
   'YZ' => '238',
   'YZ3' => '336',
   'YZ6' => '336',

-  'YZ60' => '238',

   'Z2' => '247',
   'Z3' => '335',
   'Z7' => '336',
   'Z2' => '247',
   'Z3' => '335',
   'Z7' => '336',

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index f7f8d0742eb8ecb3ac9090c33be3787ffe8f4c9c..4c7ccf4b256d869e4b6f57910d11e24a1b2214a7 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -2,7 +2,7 @@
 #
 # This module impliments the handlers for the protocal mode for a dx cluster
 #
 #
 # This module impliments the handlers for the protocal mode for a dx cluster
 #

-# Copyright (c) 1998-2006 Dirk Koopman G1TLH
+# Copyright (c) 1998-2007 Dirk Koopman G1TLH

 #
 #
 #
 #
 #
 #


@@ -1667,6 +1667,9 @@ sub handle_92
 
                        push @radd, $add if $add;
                        $parent->reset_obs;
 
                        push @radd, $add if $add;
                        $parent->reset_obs;

+                       $parent->version($ent[4]) if $ent[4];
+                       $parent->build($ent[5]) if $ent[5];
+

                        dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
                }
        } elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
                        dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
                }
        } elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {

diff --git a/perl/Version.pm b/perl/Version.pm
index 7a8288db100c64c11d65efe4eb4f67f526061ade..9824162e8d853d041dd0357ec8bd9378af7b0687 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
 
 $version = '1.54';
 $subversion = '0';

-$build = '175';
+$build = '176';

 
 1;
 
 1;