projects / spider.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ee6f84)
replace cty.dat with latest
authorminima <minima>
Tue, 29 Oct 2002 15:13:47 +0000 (15:13 +0000)
committerminima <minima>
Tue, 29 Oct 2002 15:13:47 +0000 (15:13 +0000)
Changes patch | blob | history
data/cty.dat patch | blob | history
data/prefix_data.pl patch | blob | history

diff --git a/Changes b/Changes
index 5f375d5bdf20180f1c275e8c0a50d8c70aae1953..9418f1f60ed529dac0024e29d44207a544487782 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,7 @@
 29Oct02=======================================================================
 1. make sh/log et al a bit more efficient.
 2. fix dupe message in dx.
-3. add k8T, K8O to KH8 and TX5BTY to FO/A
+3. update cty.dat to the latest, add k8T, K8O to KH8 and TX5BTY to FO/A
 25Oct02=======================================================================
 1. remove the dupefile automatically if it becomes corrupted
 2. instrument the startup slightly more
diff --git a/data/cty.dat b/data/cty.dat
index 47ed618a387c1c288956ca9e31901134b61fa141..b297a29785ab47802dbac332b2bfb13c578814ec 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -169,14 +169,15 @@ Antarctica:               13:  74:  SA:  -65.00:    64.00:    -4.0:  CE9:
     7S8AAA(38)[67],7S8BBB(38)[67],8J1RL(39)[67],8J1RM(39)[67],ANT,\r
     AT3A(38)[67],AT3D(38)[67],CE9/G0NKZ[73],CE9AA[73],CE9NPN[73],CE9OH[73],\r
     CE9SAC[73],CE9SDJ[73],DL1KVC/P(38)[67],DP0GVN(38)[67],DS1BMJ[73],\r
-    EM1ANT[73],EM1HO[73],EM1KA[73],EM1KY[73],EM1LV[73],EM1U[73],FT0Y(30)[70],\r
-    FT2Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],IA/I3JPA(30)[71],\r
-    IA0PS(30)[71],KB1TX/KC4(30)[71],KC4/KL7RL,KC4/KN6UR(32),KC4AAA(39),\r
-    KC4AAC[73],KC4AAF(30)[71],KC4USB(12)[72],KC4USV(30)[71],KC4USX(30)[71],\r
-    KK6KO/KC4[73],KK6PH/KC4(30)[71],LU1ZAR[73],LU1ZB[73],LU1ZD[73],LU1ZG[73],\r
-    LU1ZI[73],LU1ZS[73],LU1ZV[73],LU2ZD[73],LU4ZS[73],R1AN,R1AND(38)[73],\r
-    R1ANZ(29)[73],UA3YH/KC4,VI0ANT(39)[69],VK0AQ(29)[70],VK0CK(29)[70],\r
-    VK0CL(29)[70],VK0ERZ(39)[69],VK0FPS(39)[69],VK0IC(39)[69],VK0KC(29)[70],\r
+    EM1ANT[73],EM1HO[73],EM1KA[73],EM1KGG[73],EM1KY[73],EM1LV[73],EM1U[73],\r
+    FT0Y(30)[70],FT2Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],\r
+    IA/I3JPA(30)[71],IA0PS(30)[71],KB1TX/KC4(30)[71],KC4/KE6ZYR,KC4/KL7RL,\r
+    KC4/KN6UR(32),KC4/N2TA,KC4/N3SIG(30)[71],KC4AAA(39),KC4AAC[73],\r
+    KC4AAF(30)[71],KC4USB(12)[72],KC4USV(30)[71],KC4USX(30)[71],KK6KO/KC4[73],\r
+    KK6PH/KC4(30)[71],LU1ZAR[73],LU1ZB[73],LU1ZD[73],LU1ZG[73],LU1ZI[73],\r
+    LU1ZS[73],LU1ZV[73],LU2ZD[73],LU4ZS[73],R1AN,R1AND(38)[73],R1ANZ(29)[73],\r
+    UA3YH/KC4,VI0ANT(39)[69],VK0AQ(29)[70],VK0CK(29)[70],VK0CL(29)[70],\r
+    VK0ERZ(39)[69],VK0FPS(39)[69],VK0IC(39)[69],VK0KC(29)[70],VK0KMT(30)[71],\r
     VK0LL(29)[70],VK0MP(29)[70],VK0NE(39)[69],VK0PD(39)[69],VK0PN(39)[69],\r
     VK0WD(29)[70],VP8/GB4MSS(12),VP8/UT1KY[73],VP8BQE[73],VP8CBL[73],\r
     VP8CES(38)[73],VP8CMR[73],VP8CQC,VP8CRE[73],VP8CRI(38)[73],VP8CTR,\r
@@ -249,7 +250,7 @@ Turkmenistan:             17:  30:  AS:   38.00:   -58.40:    -5.0:  EZ:
 France:                   14:  27:  EU:   48.80:    -2.30:    -1.0:  F:\r
     4U1SCO,F,HW,HX,HY,TH,TM,TP,TQ,TV,TW;\r
 Guadeloupe:               08:  11:  NA:   16.00:    61.70:     4.0:  FG:\r
-    FG,TO5G,TO9T;\r
+    FG,TO4T,TO5G,TO9T;\r
 Mayotte:                  39:  53:  AF:  -13.00:   -45.30:    -3.0:  FH:\r
     FH;\r
 French St. Martin:        08:  11:  NA:   18.10:    63.10:     4.0:  FJ:\r
@@ -261,19 +262,19 @@ Martinique:               08:  11:  NA:   14.60:    61.00:     4.0:  FM:
 French Polynesia:         32:  63:  OC:  -17.60:   149.50:    10.0:  FO:\r
     FO,FO0FRA,TO8K;\r
 Austral Is.:              32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:\r
-    FO0AWI/A,FO0DEH,FO0FI,FO0KOJ,FO0MAC/A,FO0MIZ/A,FO0PAP/A,FO0SUC,FO0WEG,\r
-    FO0XUU/A,TX5BTY,FO/I2YSB,FO/IK2GNW;\r
+    FO/HG9B,FO/I2YSB,FO/IK2GNW,FO0AWI/A,FO0DEH,FO0FI,FO0KOJ,FO0MAC/A,FO0MIZ/A,\r
+    FO0PAP/A,FO0SUC,FO0WEG,FO0XUU/A,TX5BTY,FO/I2YSB,FO/IK2GNW;\r
 Clipperton I.:            07:  10:  NA:   10.30:   109.20:     7.0:  FO/c:\r
     FO0AAA,FO0CI;\r
 Marquesas Is.:            31:  63:  OC:   -9.00:   139.50:    10.0:  FO/m:\r
-    FO0AOI,FO0AWI/M,FO0CLA,FO0ELY,FO0MAC/M,FO0MIZ/M,FO0PAP/M,FO0POM,FO0SAL,\r
-    FO0SOU,FO0TOH,FO0XUU/M,FO0PT;\r
+    FO/SP9FIH,FO0AOI,FO0AWI/M,FO0CLA,FO0ELY,FO0MAC/M,FO0MIZ/M,FO0PAP/M,FO0POM,\r
+    FO0SAL,FO0SOU,FO0TOH,FO0XUU/M,FO0PT;\r
 St. Pierre & Miquelon:    05:  09:  NA:   46.70:    56.00:     3.0:  FP:\r
     FP,TO0DX,TO5M,TO7I;\r
 Reunion:                  39:  53:  AF:  -21.10:   -55.60:    -4.0:  FR:\r
     FR,TO0R,TO3R;\r
 Glorioso:                 39:  53:  AF:  -11.50:   -47.30:    -3.0:  FR/g:\r
-    FR/G,FR5AI,FR5ZQ/G,FR5ZU/G,FR7GL,FR5HG/G;\r
+    FR/G,FR5AI,FR5ZQ/G,FR5ZU/G,FR7GL;\r
 Juan de Nova & Europa:    39:  53:  AF:  -19.60:   -41.60:    -3.0:  FR/j:\r
     E,FR4FA,J;\r
 Tromelin:                 39:  53:  AF:  -15.90:   -54.40:    -4.0:  FR/t:\r
@@ -373,9 +374,9 @@ Minami Torishima:         27:  90:  OC:   24.30:  -154.00:   -10.0:  JD/m:
     7J1ACH,JD1/JI7BCD,JD1BIE/JD1,JD1BIP,JD1BIU,JD1BIY,JD1BIZ,JD1BJA,JD1BJE,\r
     JD1YAA,JD1YBJ,JL1KFR/JD1,JQ8NQJ/JD1;\r
 Ogasawara:                27:  45:  AS:   27.50:  -141.00:   -10.0:  JD/o:\r
-    7J1ATZ,7J1AYK/JD1,JA4GXS/JD1,JD1,JD1/JQ1SUO,JD1AMA,JD1BIE,JD1BIK,JD1BIV,\r
-    JD1BJC,JD1BJP,JF1LGD/JD1,JH2ENF/JD1,JM1YGG/JD1,JQ1SUO/JD1,JR0BQD/JD1,\r
-    KA2IJ;\r
+    7J1ATZ,7J1AYK/JD1,8N1OGA,JA4GXS/JD1,JD1,JD1/JQ1SUO,JD1AMA,JD1BIE,JD1BIK,\r
+    JD1BIV,JD1BJC,JD1BJP,JF1LGD/JD1,JH2ENF/JD1,JM1YGG/JD1,JQ1SUO/JD1,\r
+    JR0BQD/JD1,KA2IJ;\r
 Mongolia:                 23:  32:  AS:   47.90:  -106.90:    -8.0:  JT:\r
     JT,JU,JV;\r
 Svalbard:                 40:  18:  EU:   78.80:   -16.00:    -1.0:  JW:\r
@@ -389,35 +390,36 @@ 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,AA4NU(4),AA8RK(5)[8],AA8UL(5)[8],AA9LA(5)[8],AB,AB4JI(4),AC,AD,\r
     AE,AF,AG,AH0M(5)[8],AH2M(5)[8],AH3C(3)[6],AH3D(3)[6],AI,AJ,AK,AL7H(4)[7],\r
-    AL7L(4)[6],AL7OU(3)[6],K,K0LUZ(5)[8],K0PP(4)[7],K0TV(5)[8],K1KY(4),\r
-    K3AO(4),K3EST(3)[6],K3GP(4),K4AB(4),K4CU(4),K4EKG(4),K4FUN(4),K4NA(4),\r
-    K4NO(4),K4RO(4),K4WW(4),K4XU(3)[6],K5FUV(5)[8],K5IID(5)[8],K5KG(5)[8],\r
-    K5MA(5)[8],K5MDX(4)[8],K5RC(3)[6],K5ZD(5)[8],K5ZM(3)[6],K7ABV(4)[7],\r
-    K7BG(4)[7],K7CMZ(5)[8],K7EY(4)[7],K7LUH(4)[7],K7SV(5)[8],K8CH(5)[8],\r
-    K8FC(5)[8],K8HC(5)[8],K8LT(5)[8],K8PO(5)[8],K8UC(5)[8],K8WT(5)[8],\r
-    KC7UP(4)[7],KC8PE(5)[8],KD8G(5)[8],KE4JUH(4),KE7X(4)[7],KF4BAR(4),\r
-    KG6OK(3)[6],KH0R(3)[6],KL7HIR/3(5)[8],KL7NA(3)[6],KM5DW(5)[8],KO0U(5)[8],\r
-    KR5L(4),KS9Z(5)[8],KU4LL(4),N,N0ICI(5)[8],N3BB(4)[7],N4AR(4),N4GN(4),\r
-    N4KG(4),N4NM(4),N4NO(4),N4TZ(4)[7],N4XM(4),N4YO(4),N5KO(3)[6],N6AR(5)[8],\r
-    N6CQ(5)[8],N6RFM(5)[8],N7DR(4)[7],N7FLT(4)[7],N7ML(4)[6],N7NG(4)[7],\r
-    N7TXX(4)[7],N7UN(5)[8],N8WRL(5)[8],N8YYS(5)[8],N9GG(5)[8],N9HZQ(5)[8],\r
-    NA8V(5)[8],NE9Z(4)[7],NE9Z/7(4)[7],NJ1V(4)[7],NM4T(4),NN4T(4),NP4IW(3)[6],\r
-    NT4L(4)[0],NY4T(4),NY6DX(5)[8],W,W0AD(5)[8],W0MHK(5)[8],W1XE(4)[7],\r
-    W2NA(3)[6],W2VJN(3)[6],W4CAT(4),W4KH(4),W4NS(4),W4RJ(4),W4SRK(4),W4WNG(4),\r
-    W4WW(4),W4YGE(4),W6NWS(5)[8],W6PH(5)[8],W6TER(4)[7],W6XR(5)[8],W7CA(4)[7],\r
-    W7KEU(4)[7],W7LR(4)[7],W7SE(4)[7],W7THY(4)[7],W7WK(4)[7],W7ZQ(4)[7],\r
-    W8AH(5)[8],W8BAR(5)[8],W8JI(5)[8],W9PL(3)[6],W9WBA(5)[8],WA3COS(4)[7],\r
-    WA8KAN(5)[8],WL7WO(5)[8],WL7Y(5)[8],WO4O(4),WQ5L(4)[8],WS7W(4)[7];\r
+    AL7L(4)[6],AL7OU(3)[6],AL7W(3)[6],K,K0LUZ(5)[8],K0PP(4)[7],K0TV(5)[8],\r
+    K1KY(4),K3AO(4),K3EST(3)[6],K3GP(4),K4AB(4),K4CU(4),K4EKG(4),K4FUN(4),\r
+    K4NA(4),K4NO(4),K4RO(4),K4WI(4),K4WW(4),K4XU(3)[6],K5FUV(5)[8],\r
+    K5IID(5)[8],K5KG(5)[8],K5MA(5)[8],K5MDX(4)[8],K5RC(3)[6],K5ZD(5)[8],\r
+    K5ZM(3)[6],K7ABV(4)[7],K7BG(4)[7],K7CMZ(5)[8],K7EY(4)[7],K7LUH(4)[7],\r
+    K7SV(5)[8],K8CH(5)[8],K8FC(5)[8],K8HC(5)[8],K8LT(5)[8],K8PO(5)[8],\r
+    K8UC(5)[8],K8WT(5)[8],KC7UP(4)[7],KC8PE(5)[8],KD8G(5)[8],KE4JUH(4),\r
+    KE7X(4)[7],KF4BAR(4),KG6OK(3)[6],KH0R(3)[6],KL0S(4),KL7HIR/3(5)[8],\r
+    KL7NA(3)[6],KM5DW(5)[8],KO0U(5)[8],KR5L(4),KS9Z(5)[8],KU4LL(4),N,\r
+    N0ICI(5)[8],N3BB(4)[7],N4AR(4),N4GN(4),N4KG(4),N4NM(4),N4NO(4),N4TZ(4)[7],\r
+    N4XM(4),N4YO(4),N5KO(3)[6],N6AR(5)[8],N6CQ(5)[8],N6RFM(5)[8],N7DR(4)[7],\r
+    N7FLT(4)[7],N7ML(4)[6],N7NG(4)[7],N7TXX(4)[7],N7UN(5)[8],N8WRL(5)[8],\r
+    N8YYS(5)[8],N9GG(5)[8],N9HZQ(5)[8],NA4W(4),NA8V(5)[8],NE9Z(4)[7],\r
+    NE9Z/7(4)[7],NJ1V(4)[7],NM4T(4),NN4T(4),NP4IW(3)[6],NT4L(4)[0],NY4T(4),\r
+    NY6DX(5)[8],W,W0AD(5)[8],W0MHK(5)[8],W1XE(4)[7],W2NA(3)[6],W2VJN(3)[6],\r
+    W4CAT(4),W4KH(4),W4NS(4),W4RJ(4),W4SRK(4),W4WNG(4),W4WW(4),W4YGE(4),\r
+    W6NWS(5)[8],W6PH(5)[8],W6TER(4)[7],W6XR(5)[8],W7CA(4)[7],W7KEU(4)[7],\r
+    W7LR(4)[7],W7SE(4)[7],W7THY(4)[7],W7WK(4)[7],W7ZQ(4)[7],W8AH(5)[8],\r
+    W8BAR(5)[8],W8JI(5)[8],W9PL(3)[6],W9WBA(5)[8],WA3COS(4)[7],WA8KAN(5)[8],\r
+    WL7WO(5)[8],WL7Y(5)[8],WO4O(4),WQ5L(4)[8],WS7W(4)[7];\r
 Guantanamo Bay:           08:  11:  NA:   19.90:    75.20:     5.0:  KG4:\r
     KG4;\r
 Mariana Is.:              27:  64:  OC:   15.20:  -145.80:    10.0:  KH0:\r
     AH0,KG6SL,KH0,NH0,WH0;\r
 Baker & Howland Is.:      31:  61:  OC:    0.50:   176.00:    11.0:  KH1:\r
-    AH1,KH1,NH1,WH1,K1B;\r
+    AH1,KH1,NH1,WH1;\r
 Guam:                     27:  64:  OC:   13.50:  -144.80:   -10.0:  KH2:\r
     AH2,KG6ASO,KH2,NH2,WH2;\r
 Johnston I.:              31:  61:  OC:   16.80:   169.50:    10.0:  KH3:\r
-    AH3,KH3,KJ6BZ,NH3,WH3,K3J;\r
+    AH3,KH3,KJ6BZ,NH3,WH3;\r
 Midway I.:                31:  61:  OC:   28.20:   177.40:    11.0:  KH4:\r
     AH4,KH4,NH4,WH4;\r
 Palmyra & Jarvis Is.:     31:  61:  OC:    5.90:   162.10:    10.0:  KH5:\r
@@ -429,7 +431,7 @@ Hawaii:                   31:  61:  OC:   21.30:   157.90:    10.0:  KH6:
 Kure I.:                  31:  61:  OC:   28.40:   178.40:    11.0:  KH7K:\r
     AH7K,KH7K,NH7K,WH7K;\r
 American Samoa:           32:  62:  OC:  -14.30:   170.80:    11.0:  KH8:\r
-    AH8,KH8,KS6BK,KS6CQ,KS6DV,KS6EL,KS6FL,KS6FO,KS6FS,NH8,WH8,K8T,K8O;\r
+    AH8,KH8,KS6BK,KS6CQ,KS6EL,KS6FL,KS6FO,KS6FS,NH8,WH8;\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
@@ -461,7 +463,7 @@ Lebanon:                  20:  39:  AS:   33.90:   -35.50:    -2.0:  OD:
 Austria:                  15:  28:  EU:   48.20:   -16.30:    -1.0:  OE:\r
     4U1VIC,OE;\r
 Finland:                  15:  18:  EU:   60.20:   -25.00:    -2.0:  OH:\r
-    OF,OG,OH,OI;\r
+    OF,OG,OH,OI,OJ;\r
 Aland Is.:                15:  18:  EU:   60.20:   -20.00:    -2.0:  OH0:\r
     OF0,OG0,OH0,OH0MAM,OI0;\r
 Market Reef:              15:  18:  EU:   60.30:   -19.00:    -2.0:  OJ0:\r
@@ -549,8 +551,7 @@ Somalia:                  37:  48:  AF:    2.10:   -45.40:    -3.0:  T5:
 San Marino:               15:  28:  EU:   43.90:   -12.30:    -1.0:  T7:\r
     T7;\r
 Palau:                    27:  64:  OC:    9.50:  -138.20:   -10.0:  T8:\r
-    KC6/N5OK,KC6BP,KC6CS,KC6DO,KC6FS,KC6GB,KC6GG,KC6IY,KC6JF,KC6JJ,KC6MM,\r
-    KC6OK,KC6SM,KC6TG,KC6VO,KC6VW,KC6WG,KC6YA,KC6YZ,T8;\r
+    T8;\r
 Bosnia-Herzegovina:       15:  28:  EU:   43.50:   -18.30:    -1.0:  T9:\r
     T9;\r
 Turkey:                   20:  39:  AS:   40.00:   -33.00:    -3.0:  TA:\r
@@ -588,8 +589,8 @@ Mali:                     35:  46:  AF:   12.70:     8.00:     0.0:  TZ:
 European Russia:          16:  29:  EU:   55.80:   -37.60:    -3.0:  UA:\r
     R,U;\r
 Kaliningradsk:            15:  29:  EU:   55.00:   -20.50:    -3.0:  UA2:\r
-    R2,RA2,RB2,RC2,RD2,RE2,RF2,RH2,RI2,RJ2,RK2,RL2,RM2,RN2,RP2,RQ2,RR2,RS2,\r
-    RT2,RU2,RV2,RW2,RX2,RY2,RZ2,U2,UA2,UB2,UC2,UD2,UF2,UG2,UH2,UI2;\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,UF2,UG2,UH2,UI2;\r
 Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:\r
     R0,R3F/9,R7(17),R8,R8T(18)[32],R8V(18)[32],R9,R9I(18),R9M(17),R9S(17),R9W(17),\r
     RA0,RA7(17),RA8,RA8T(18)[32],RA8V(18)[32],RA9,RA9I(18),RA9M(17),RA9S(17),\r
@@ -598,37 +599,38 @@ Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:
     RC9M(17),RC9S(17),RC9W(17),RD0,RD7(17),RD8,RD8T(18)[32],RD8V(18)[32],RD9,\r
     RD9I(18),RD9M(17),RD9S(17),RD9W(17),RE0,RE7(17),RE8,RE8T(18)[32],RE8V(18)[32],\r
     RE9,RE9I(18),RE9M(17),RE9S(17),RE9W(17),RF0,RF7(17),RF8,RF8T(18)[32],\r
-    RF8V(18)[32],RF9,RF9I(18),RF9M(17),RF9S(17),RF9W(17),RH0,RH7(17),RH8,\r
-    RH8T(18)[32],RH8V(18)[32],RH9,RH9I(18),RH9M(17),RH9S(17),RH9W(17),RI0,RI7(17),\r
-    RI8,RI8T(18)[32],RI8V(18)[32],RI9,RI9I(18),RI9M(17),RI9S(17),RI9W(17),RJ0,\r
-    RJ7(17),RJ8,RJ8T(18)[32],RJ8V(18)[32],RJ9,RJ9I(18),RJ9M(17),RJ9S(17),RJ9W(17),\r
-    RK0,RK7(17),RK8,RK8T(18)[32],RK8V(18)[32],RK9,RK9I(18),RK9M(17),RK9S(17),\r
-    RK9W(17),RL0,RL7(17),RL8,RL8T(18)[32],RL8V(18)[32],RL9,RL9I(18),RL9M(17),\r
-    RL9S(17),RL9W(17),RM0,RM7(17),RM8,RM8T(18)[32],RM8V(18)[32],RM9,RM9I(18),\r
-    RM9M(17),RM9S(17),RM9W(17),RN0,RN7(17),RN8,RN8T(18)[32],RN8V(18)[32],RN9,\r
-    RN9I(18),RN9M(17),RN9S(17),RN9W(17),RP0,RP7(17),RP8,RP8T(18)[32],RP8V(18)[32],\r
-    RP9,RP9I(18),RP9M(17),RP9S(17),RP9W(17),RQ0,RQ7(17),RQ8,RQ8T(18)[32],\r
-    RQ8V(18)[32],RQ9,RQ9I(18),RQ9M(17),RQ9S(17),RQ9W(17),RR0,RR7(17),RR8,\r
-    RR8T(18)[32],RR8V(18)[32],RR9,RR9I(18),RR9M(17),RR9S(17),RR9W(17),RS0,RS7(17),\r
-    RS8,RS8T(18)[32],RS8V(18)[32],RS9,RS9I(18),RS9M(17),RS9S(17),RS9W(17),RT0,\r
-    RT7(17),RT8,RT8T(18)[32],RT8V(18)[32],RT9,RT9I(18),RT9M(17),RT9S(17),RT9W(17),\r
-    RU0,RU7(17),RU8,RU8T(18)[32],RU8V(18)[32],RU9,RU9I(18),RU9M(17),RU9S(17),\r
-    RU9W(17),RV0,RV7(17),RV8,RV8T(18)[32],RV8V(18)[32],RV9,RV9I(18),RV9M(17),\r
-    RV9S(17),RV9W(17),RW0,RW7(17),RW8,RW8T(18)[32],RW8V(18)[32],RW9,RW9I(18),\r
-    RW9M(17),RW9S(17),RW9W(17),RX0,RX7(17),RX8,RX8T(18)[32],RX8V(18)[32],RX9,\r
-    RX9I(18),RX9M(17),RX9S(17),RX9W(17),RY0,RY7(17),RY8,RY8T(18)[32],RY8V(18)[32],\r
-    RY9,RY9I(18),RY9M(17),RY9S(17),RY9W(17),RZ0,RZ7(17),RZ8,RZ8T(18)[32],\r
-    RZ8V(18)[32],RZ9,RZ9I(18),RZ9M(17),RZ9S(17),RZ9W(17),U0,U7(17),U8,U8T(18)[32],\r
-    U8V(18)[32],U9,U9I(18),U9M(17),U9S(17),U9W(17),UA0,UA7(17),UA8,UA8T(18)[32],\r
-    UA8V(18)[32],UA9,UA9I(18),UA9M(17),UA9S(17),UA9W(17),UB0,UB7(17),UB8,\r
-    UB8T(18)[32],UB8V(18)[32],UB9,UB9I(18),UB9M(17),UB9S(17),UB9W(17),UC0,UC7(17),\r
-    UC8,UC8T(18)[32],UC8V(18)[32],UC9,UC9I(18),UC9M(17),UC9S(17),UC9W(17),UD0,\r
-    UD7(17),UD8,UD8T(18)[32],UD8V(18)[32],UD9,UD9I(18),UD9M(17),UD9S(17),UD9W(17),\r
-    UF0,UF7(17),UF8,UF8T(18)[32],UF8V(18)[32],UF9,UF9I(18),UF9M(17),UF9S(17),\r
-    UF9W(17),UG0,UG7(17),UG8,UG8T(18)[32],UG8V(18)[32],UG9,UG9I(18),UG9M(17),\r
-    UG9S(17),UG9W(17),UH0,UH7(17),UH8,UH8T(18)[32],UH8V(18)[32],UH9,UH9I(18),\r
-    UH9M(17),UH9S(17),UH9W(17),UI0,UI7(17),UI8,UI8T(18)[32],UI8V(18)[32],UI9,\r
-    UI9I(18),UI9M(17),UI9S(17),UI9W(17);\r
+    RF8V(18)[32],RF9,RF9I(18),RF9M(17),RF9S(17),RF9W(17),RG0,RG7(17),RG8,\r
+    RG8T(18)[32],RG8V(18)[32],RG9,RG9I(18),RG9M(17),RG9S(17),RG9W(17),RH0,RH7(17),\r
+    RH8,RH8T(18)[32],RH8V(18)[32],RH9,RH9I(18),RH9M(17),RH9S(17),RH9W(17),RI0,\r
+    RI7(17),RI8,RI8T(18)[32],RI8V(18)[32],RI9,RI9I(18),RI9M(17),RI9S(17),RI9W(17),\r
+    RJ0,RJ7(17),RJ8,RJ8T(18)[32],RJ8V(18)[32],RJ9,RJ9I(18),RJ9M(17),RJ9S(17),\r
+    RJ9W(17),RK0,RK7(17),RK8,RK8T(18)[32],RK8V(18)[32],RK9,RK9I(18),RK9M(17),\r
+    RK9S(17),RK9W(17),RL0,RL7(17),RL8,RL8T(18)[32],RL8V(18)[32],RL9,RL9I(18),\r
+    RL9M(17),RL9S(17),RL9W(17),RM0,RM7(17),RM8,RM8T(18)[32],RM8V(18)[32],RM9,\r
+    RM9I(18),RM9M(17),RM9S(17),RM9W(17),RN0,RN7(17),RN8,RN8T(18)[32],RN8V(18)[32],\r
+    RN9,RN9I(18),RN9M(17),RN9S(17),RN9W(17),RP0,RP7(17),RP8,RP8T(18)[32],\r
+    RP8V(18)[32],RP9,RP9I(18),RP9M(17),RP9S(17),RP9W(17),RQ0,RQ7(17),RQ8,\r
+    RQ8T(18)[32],RQ8V(18)[32],RQ9,RQ9I(18),RQ9M(17),RQ9S(17),RQ9W(17),RR0,RR7(17),\r
+    RR8,RR8T(18)[32],RR8V(18)[32],RR9,RR9I(18),RR9M(17),RR9S(17),RR9W(17),RS0,\r
+    RS7(17),RS8,RS8T(18)[32],RS8V(18)[32],RS9,RS9I(18),RS9M(17),RS9S(17),RS9W(17),\r
+    RT0,RT7(17),RT8,RT8T(18)[32],RT8V(18)[32],RT9,RT9I(18),RT9M(17),RT9S(17),\r
+    RT9W(17),RU0,RU7(17),RU8,RU8T(18)[32],RU8V(18)[32],RU9,RU9I(18),RU9M(17),\r
+    RU9S(17),RU9W(17),RV0,RV7(17),RV8,RV8T(18)[32],RV8V(18)[32],RV9,RV9I(18),\r
+    RV9M(17),RV9S(17),RV9W(17),RW0,RW7(17),RW8,RW8T(18)[32],RW8V(18)[32],RW9,\r
+    RW9I(18),RW9M(17),RW9S(17),RW9W(17),RX0,RX7(17),RX8,RX8T(18)[32],RX8V(18)[32],\r
+    RX9,RX9I(18),RX9M(17),RX9S(17),RX9W(17),RY0,RY7(17),RY8,RY8T(18)[32],\r
+    RY8V(18)[32],RY9,RY9I(18),RY9M(17),RY9S(17),RY9W(17),RZ0,RZ7(17),RZ8,\r
+    RZ8T(18)[32],RZ8V(18)[32],RZ9,RZ9I(18),RZ9M(17),RZ9S(17),RZ9W(17),U0,U7(17),\r
+    U8,U8T(18)[32],U8V(18)[32],U9,U9I(18),U9M(17),U9S(17),U9W(17),UA0,UA7(17),UA8,\r
+    UA8T(18)[32],UA8V(18)[32],UA9,UA9I(18),UA9M(17),UA9S(17),UA9W(17),UB0,UB7(17),\r
+    UB8,UB8T(18)[32],UB8V(18)[32],UB9,UB9I(18),UB9M(17),UB9S(17),UB9W(17),UC0,\r
+    UC7(17),UC8,UC8T(18)[32],UC8V(18)[32],UC9,UC9I(18),UC9M(17),UC9S(17),UC9W(17),\r
+    UD0,UD7(17),UD8,UD8T(18)[32],UD8V(18)[32],UD9,UD9I(18),UD9M(17),UD9S(17),\r
+    UD9W(17),UF0,UF7(17),UF8,UF8T(18)[32],UF8V(18)[32],UF9,UF9I(18),UF9M(17),\r
+    UF9S(17),UF9W(17),UG0,UG7(17),UG8,UG8T(18)[32],UG8V(18)[32],UG9,UG9I(18),\r
+    UG9M(17),UG9S(17),UG9W(17),UH0,UH7(17),UH8,UH8T(18)[32],UH8V(18)[32],UH9,\r
+    UH9I(18),UH9M(17),UH9S(17),UH9W(17),UI0,UI7(17),UI8,UI8T(18)[32],UI8V(18)[32],\r
+    UI9,UI9I(18),UI9M(17),UI9S(17),UI9W(17);\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
@@ -650,26 +652,19 @@ Marshall Is.:             31:  65:  OC:    9.10:  -167.30:   -12.0:  V7:
 Brunei:                   28:  54:  OC:    4.90:  -114.90:    -8.0:  V8:\r
     V8;\r
 Canada:                   05:  09:  NA:   45.00:    80.00:     4.0:  VE:\r
-    CF,CG,CH,CI,CJ,CK,CK0(5)[9],CK1(1)[2],CK2(5)[9],CK3(1)[2],CK4(5)[9],\r
-    CK5(1)[2],CK6(5)[9],CK7(1)[2],CK7QO(3)[2],CK7U(3)[2],CK8(5)[9],CK9(1)[2],\r
-    CY,CZ,CZ0(2)[9],CZ1(5)[9],CZ2(2)[9],CZ3(5)[9],CZ4(2)[9],CZ5(5)[9],\r
-    CZ6(2)[9],CZ7(5)[9],CZ8(2)[9],CZ9(5)[9],VA,VA2BY(2),VA2CT(2)[9],VA2DO(2),\r
-    VA2DXE(2),VA2KCE(2),VA2RHJ(2),VA2UA(2),VB,VB2R(2),VB2V(2),VC,VD,VE,\r
-    VE2/N6AA(2)[9],VE2/N6ZZ(2),VE2/WJ2O(2),VE2ACP(2),VE2AE(2),VE2AG(2),\r
-    VE2AOF(2),VE2AQS(2),VE2AS(2),VE2BQB(2),VE2CSI(2),VE2DMG(2),VE2DS(2),\r
-    VE2DWU(2),VE2DYW(2),VE2DYX(2),VE2EAK(2),VE2EDL(2),VE2EDX(2),VE2ELL(2),\r
-    VE2ENB(2),VE2END(2),VE2ENR(2),VE2ERU(2),VE2FCV(2),VE2GSA(2),VE2GSO(2),\r
-    VE2III(2),VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),VE2NRK(2),VE2PR(2),\r
-    VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WT(2),VE2XY(2),VE2YM(2),\r
-    VE3RHJ/2(2),VE8AJ(2),VE8PW(2),VE8RCS(2),VF,VG,VO,VO0(2)[9],VO1(5)[9],\r
-    VO2(2)[9],VO3(5)[9],VO4(2)[9],VO5(5)[9],VO6(2)[9],VO7(5)[9],VO8(2)[9],\r
-    VO9(5)[9],VX,VY,VY0(2),VY0AW(1),VY0KS(1),VY0PS(1),VY1(1)[2],VY2(5)[9],\r
-    VY3(1)[2],VY4(5)[9],VY5(1)[2],VY6(5)[9],VY7(1)[2],VY8(5)[9],VY9(4)[4],\r
-    VY9CC(4)[4],VY9CCA(5)[9],VY9QR(4)[3],WJ2O/VE2(2),XJ,XK,XL,XM,XM2ZP(2),XN,\r
-    XN0(5)[9],XN1(1)[2],XN2(5)[9],XN3(1)[2],XN4(5)[9],XN5(1)[2],XN6(5)[9],\r
-    XN7(1)[2],XN8(5)[9],XN9(1)[2],XO,XO0(2)[9],XO1(5)[9],XO2(2)[9],XO3(5)[9],\r
-    XO4(2)[9],XO5(5)[9],XO6(2)[9],XO7(5)[9],XO7A(3)[2],XO7X(3)[2],XO8(2)[9],\r
-    XO9(5)[9];\r
+    CF,CG,CH1(5)[9],CH2(2)[9],CI0(2)[4],CI1(1)[2],CI2(5)[9],CJ,CK,CY1(5)[9],\r
+    CY2(2)[9],CZ0(2)[4],CZ1(1)[2],CZ2(5)[9],VA,VA2BY(2),VA2CT(2),VA2DO(2),\r
+    VA2DXE(2),VA2KCE(2),VA2RHJ(2),VA2UA(2),VB,VB2R(2),VB2V(2),VC,VC2C(2),\r
+    VD1(5)[9],VD2(2)[9],VE,VE2ACP(2),VE2AE(2),VE2AG(2),VE2AOF(2),VE2AQS(2),\r
+    VE2AS(2),VE2BQB(2),VE2CSI(2),VE2DMG(2),VE2DS(2),VE2DWU(2),VE2DYW(2),\r
+    VE2DYX(2),VE2EAK(2),VE2EDL(2),VE2EDX(2),VE2ELL(2),VE2ENB(2),VE2END(2),\r
+    VE2ENR(2),VE2ERU(2),VE2FCV(2),VE2GSA(2),VE2GSO(2),VE2III(2),VE2IM(2),\r
+    VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),VE2NRK(2),VE2PR(2),VE2QRZ(2),\r
+    VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WT(2),VE2XAA(2),VE2XY(2),VE2YM(2),\r
+    VE3EY/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),VE8RCS(2),VF0(2)[4],VF1(1)[2],\r
+    VF2(5)[9],VG,VO1(5)[9],VO2(2)[9],VX,VY0(2)[4],VY0AW(1),VY0KS(1),VY0PS(1),\r
+    VY1(1)[2],VY2(5)[9],XJ1(5)[9],XJ2(2)[9],XK0(2)[4],XK1(1)[2],XK2(5)[9],XL,\r
+    XM,XN1(5)[9],XN2(2)[9],XO0(2)[4],XO1(1)[2],XO2(5)[9];\r
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:\r
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ;\r
 Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:\r
@@ -677,18 +672,19 @@ Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:
 Macquarie I.:             30:  60:  OC:  -54.70:  -158.80:   -11.0:  VK0M:\r
     AX0,VH0,VI0,VJ0,VK0,VL0,VM0,VN0,VZ0;\r
 Cocos-Keeling:            29:  54:  OC:  -12.20:   -96.80:    -6.5:  VK9C:\r
-    AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9EW,VK9WB,VK9Y,VL9C,VL9Y,\r
-    VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y;\r
+    AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9EW,VK9KC,VK9KY,VK9WB,VK9Y,\r
+    VL9C,VL9Y,VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y;\r
 Lord Howe I.:             30:  60:  OC:  -31.60:  -159.10:   -10.5:  VK9L:\r
-    AX9L,VH9L,VI9L,VJ9L,VK9AE,VK9L,VK9NM,VK9PG,VK9YQS,VL9L,VM9L,VN9L,VZ9L;\r
+    AX9L,VH9L,VI9L,VJ9L,VK9AE,VK9KL,VK9L,VK9NM,VK9PG,VK9YQS,VL9L,VM9L,VN9L,\r
+    VZ9L;\r
 Mellish Reef:             30:  56:  OC:  -17.60:  -155.80:   -10.0:  VK9M:\r
-    AX9M,VH9M,VI9M,VJ9M,VK4ALF/9,VK9M,VL9M,VM9M,VN9M,VZ9M;\r
+    AX9M,VH9M,VI9M,VJ9M,VK4ALF/9,VK9KM,VK9M,VL9M,VM9M,VN9M,VZ9M;\r
 Norfolk I.:               32:  60:  OC:  -29.00:  -168.00:   -11.5:  VK9N:\r
     AX9,VH9,VI9,VJ9,VK9,VL9,VM9,VN9,VZ9;\r
 Willis I.:                30:  55:  OC:  -16.30:  -149.50:   -10.0:  VK9W:\r
-    AX9W,VH9W,VI9W,VJ9W,VK9GS,VK9TR,VK9W,VK9ZG,VL9W,VM9W,VN9W,VZ9W;\r
+    AX9W,VH9W,VI9W,VJ9W,VK9GS,VK9KW,VK9TR,VK9W,VK9ZG,VL9W,VM9W,VN9W,VZ9W;\r
 Christmas I.:             29:  54:  OC:  -10.50:  -105.70:    -7.0:  VK9X:\r
-    AX9X,VH9X,VI9X,VJ9X,VK9GA,VK9X,VL9X,VM9X,VN9X,VZ9X;\r
+    AX9X,VH9X,VI9X,VJ9X,VK9GA,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X;\r
 Anguilla:                 08:  11:  NA:   18.30:    63.00:     4.0:  VP2E:\r
     VP29E,VP2E;\r
 Montserrat:               08:  11:  NA:   16.80:    62.20:     4.0:  VP2M:\r
@@ -699,11 +695,13 @@ Turks & Caicos:           08:  11:  NA:   21.80:    72.40:     4.0:  VP5:
     VP5;\r
 Pitcairn I.:              32:  63:  OC:  -25.10:   130.10:     8.5:  VP6:\r
     VP6;\r
+Ducie I.:                 32:  63:  OC:  -24.40:   124.48:     8.5:  VP6/d:\r
+    VP6DI;\r
 Falkland Is.:             13:  16:  SA:  -51.70:    57.90:     4.0:  VP8:\r
     VP8;\r
 South Georgia:            13:  73:  SA:  -54.30:    36.80:     2.0:  VP8/g:\r
     VP8BUB,VP8CBA,VP8CDJ,VP8CGE,VP8CGK,VP8CID,VP8CIZ,VP8CKB,VP8CLR,VP8SGB,\r
-    VP8SGP,VP8GEO;\r
+    VP8SGP;\r
 South Shetland:           13:  73:  SA:  -62.00:    58.30:     4.0:  VP8/h:\r
     4K1ADQ,4K1F,CE9/CE2NVH,CE9/CE3LOJ,CE9/CE3MMV,CE9/CE5BYE,CE9AP,CE9CMK,\r
     CE9EVG,CE9GEW,CE9MFJ,CE9MFR,CE9NGV,CE9OHB,CE9PUA,CE9PWE,CE9RDS,CX0XY,\r
@@ -784,9 +782,9 @@ Tristan da Cunha:         38:  66:  AF:  -37.10:    12.30:     0.0:  ZD9:
 Cayman Is.:               08:  11:  NA:   19.50:    81.20:     5.0:  ZF:\r
     ZF;\r
 North Cook Is.:           32:  62:  OC:  -10.40:   161.00:    10.0:  ZK1/n:\r
-    ZK1AAH,ZK1AJJ,ZK1AL,ZK1AR,ZK1AT,ZK1BW,ZK1BY,ZK1CG,ZK1CQ,ZK1DT,ZK1HU,ZK1KH,\r
-    ZK1MA,ZK1NDK,ZK1NJC,ZK1OQ,ZK1TW,ZK1UVO,ZK1VDX,ZK1VTK,ZK1WL,ZK1XP,ZK1XR,\r
-    ZK1XXP,ZK1XY;\r
+    ZK1AAH,ZK1AJJ,ZK1AL,ZK1AR,ZK1AT,ZK1BW,ZK1BY,ZK1CQ,ZK1DT,ZK1HU,ZK1KDN,\r
+    ZK1KH,ZK1MA,ZK1NCP,ZK1NDK,ZK1NJC,ZK1OQ,ZK1TW,ZK1UVO,ZK1VDX,ZK1VTK,ZK1VVV,\r
+    ZK1WL,ZK1XP,ZK1XR,ZK1XXP,ZK1XY;\r
 South Cook Is.:           32:  62:  OC:  -21.20:   159.80:    10.0:  ZK1/s:\r
     ZK1;\r
 Niue:                     32:  62:  OC:  -19.00:   169.90:    11.0:  ZK2:\r
diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 7090b4288b076ed8fbf81fc308aac6fe9086d5d7..95671a02a83dfc520eb2ad11976b20436ea45171 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -479,6 +479,7 @@
   '8L' => '159,160,379,380,381',
   '8M' => '159',
   '8N' => '159,160,379,380,381',
+  '8N1OGA' => '162',
   '8O' => '57',
   '8P' => '41',
   '8Q' => '42',
@@ -592,6 +593,7 @@
   'AL7H' => '293',
   'AL7L' => '293',
   'AL7OU' => '293',
+  'AL7W' => '293',
   'AM' => '94',
   'AM6' => '95',
   'AM8' => '96',
@@ -774,6 +776,7 @@
   'CH8' => '443',
   'CH9' => '260',
   'CI' => '445',
+  'CI0' => '260,435,436,437,438,439,440,441,442,443',
   'CI1' => '260,436',
   'CI2' => '437',
   'CI3' => '438',
@@ -794,18 +797,6 @@
   'CJ8' => '443',
   'CJ9' => '260',
   'CK' => '445',
-  'CK0' => '260,435,436,437,438,439,440,441,442,443',
-  'CK1' => '260,435,436,437,438,439,440,441,442,443',
-  'CK2' => '260,435,436,437,438,439,440,441,442,443',
-  'CK3' => '260,435,436,437,438,439,440,441,442,443',
-  'CK4' => '260,435,436,437,438,439,440,441,442,443',
-  'CK5' => '260,435,436,437,438,439,440,441,442,443',
-  'CK6' => '260,435,436,437,438,439,440,441,442,443',
-  'CK7' => '260,435,436,437,438,439,440,441,442,443',
-  'CK7QO' => '260,435,436,437,438,439,440,441,442,443',
-  'CK7U' => '260,435,436,437,438,439,440,441,442,443',
-  'CK8' => '260,435,436,437,438,439,440,441,442,443',
-  'CK9' => '260,435,436,437,438,439,440,441,442,443',
   'CL' => '79',
   'CM' => '79',
   'CN' => '80',
@@ -952,6 +943,7 @@
   'EM1ANT' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'EM1HO' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'EM1KA' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
+  'EM1KGG' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'EM1KY' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'EM1LV' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'EM1U' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
@@ -987,9 +979,11 @@
   'FO' => '109,372,373,110,111,112',
   'FO/A' => '110',
   'FO/C' => '111',
+  'FO/HG9B' => '110',
   'FO/I2YSB' => '110',
   'FO/IK2GNW' => '110',
   'FO/M' => '112',
+  'FO/SP9FIH' => '112',
   'FO0AAA' => '111',
   'FO0AOI' => '112',
   'FO0AWI/A' => '110',
@@ -1024,7 +1018,6 @@
   'FR/T' => '117',
   'FR4FA' => '116',
   'FR5AI' => '115',
-  'FR5HG/G' => '115',
   'FR5ZQ/E' => '116',
   'FR5ZQ/G' => '115',
   'FR5ZQ/J' => '116',
@@ -1232,7 +1225,6 @@
   'K0PP' => '293',
   'K0TV' => '293',
   'K1' => '473,474,475,476,477,478',
-  'K1B' => '169',
   'K1KY' => '293',
   'K1VWL/BY1QH' => '68,346,347',
   'K2' => '479,480',
@@ -1240,7 +1232,6 @@
   'K3AO' => '293',
   'K3EST' => '293',
   'K3GP' => '293',
-  'K3J' => '171',
   'K4' => '485,486,487,488,489,490,491,492',
   'K4AB' => '293',
   'K4CU' => '293',
@@ -1249,6 +1240,7 @@
   'K4NA' => '293',
   'K4NO' => '293',
   'K4RO' => '293',
+  'K4WI' => '293',
   'K4WW' => '293',
   'K4XU' => '293',
   'K5' => '493,494,495,496,497,498',
@@ -1275,9 +1267,7 @@
   'K8FC' => '293',
   'K8HC' => '293',
   'K8LT' => '293',
-  'K8O' => '177',
   'K8PO' => '293',
-  'K8T' => '177',
   'K8UC' => '293',
   'K8WT' => '293',
   'K9' => '514,515,516',
@@ -1290,8 +1280,11 @@
   'KB1TX/KC4' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC' => '293',
   'KC4' => '383,384,385',
+  'KC4/KE6ZYR' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC4/KL7RL' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC4/KN6UR' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
+  'KC4/N2TA' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
+  'KC4/N3SIG' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC4AAA' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC4AAC' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC4AAF' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
@@ -1299,25 +1292,9 @@
   'KC4USV' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC4USX' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KC6' => '418',
-  'KC6/N5OK' => '418',
   'KC6BP' => '418',
-  'KC6CS' => '418',
-  'KC6DO' => '418',
-  'KC6FS' => '418',
-  'KC6GB' => '418',
-  'KC6GG' => '418',
-  'KC6IY' => '418',
   'KC6JF' => '418',
   'KC6JJ' => '418',
-  'KC6MM' => '418',
-  'KC6OK' => '418',
-  'KC6SM' => '418',
-  'KC6TG' => '418',
-  'KC6VO' => '418',
-  'KC6VW' => '418',
-  'KC6WG' => '418',
-  'KC6YA' => '418',
-  'KC6YZ' => '418',
   'KC7UP' => '293',
   'KC8PE' => '293',
   'KD' => '293',
@@ -1368,6 +1345,7 @@
   'KK6KO/KC4' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KK6PH/KC4' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'KL' => '390',
+  'KL0S' => '293',
   'KL7' => '180,388,389,390',
   'KL7DN/1' => '293',
   'KL7HIR' => '293',
@@ -1638,6 +1616,7 @@
   'N9GG' => '293',
   'N9HZQ' => '293',
   'NA' => '293',
+  'NA4W' => '293',
   'NA8V' => '293',
   'NB' => '293',
   'NC' => '293',
@@ -1960,8 +1939,15 @@
   'RG3' => '424',
   'RG4' => '425',
   'RG6' => '422',
+  'RG7' => '248,426',
   'RG8' => '427',
+  'RG8T' => '248,426',
+  'RG8V' => '248,426',
   'RG9' => '248,426',
+  'RG9I' => '248,426',
+  'RG9M' => '248,426',
+  'RG9S' => '248,426',
+  'RG9W' => '248,426',
   'RH0' => '433,429,434',
   'RH1' => '423',
   'RH2' => '247',
@@ -2340,6 +2326,7 @@
   'TO0R' => '114,115,116,117',
   'TO2DX' => '108',
   'TO3R' => '114,115,116,117',
+  'TO4T' => '105',
   'TO5A' => '108',
   'TO5G' => '105',
   'TO5M' => '113',
@@ -2579,6 +2566,7 @@
   'VC' => '445',
   'VC1' => '260,436',
   'VC2' => '437',
+  'VC2C' => '260,435,436,437,438,439,440,441,442,443',
   'VC3' => '438',
   'VC4' => '439',
   'VC5' => '440',
@@ -2599,9 +2587,6 @@
   'VE' => '260,435,436,437,438,439,440,441,442,443',
   'VE1' => '260,436',
   'VE2' => '437',
-  'VE2/N6AA' => '260,435,436,437,438,439,440,441,442,443',
-  'VE2/N6ZZ' => '260,435,436,437,438,439,440,441,442,443',
-  'VE2/WJ2O' => '260,435,436,437,438,439,440,441,442,443',
   'VE2ACP' => '260,435,436,437,438,439,440,441,442,443',
   'VE2AE' => '260,435,436,437,438,439,440,441,442,443',
   'VE2AG' => '260,435,436,437,438,439,440,441,442,443',
@@ -2627,6 +2612,7 @@
   'VE2GSA' => '260,435,436,437,438,439,440,441,442,443',
   'VE2GSO' => '260,435,436,437,438,439,440,441,442,443',
   'VE2III' => '260,435,436,437,438,439,440,441,442,443',
+  'VE2IM' => '260,435,436,437,438,439,440,441,442,443',
   'VE2KK' => '260,435,436,437,438,439,440,441,442,443',
   'VE2MTA' => '260,435,436,437,438,439,440,441,442,443',
   'VE2MTB' => '260,435,436,437,438,439,440,441,442,443',
@@ -2639,9 +2625,11 @@
   'VE2UA' => '260,435,436,437,438,439,440,441,442,443',
   'VE2VH' => '260,435,436,437,438,439,440,441,442,443',
   'VE2WT' => '260,435,436,437,438,439,440,441,442,443',
+  'VE2XAA' => '260,435,436,437,438,439,440,441,442,443',
   'VE2XY' => '260,435,436,437,438,439,440,441,442,443',
   'VE2YM' => '260,435,436,437,438,439,440,441,442,443',
   'VE3' => '438',
+  'VE3EY/2' => '260,435,436,437,438,439,440,441,442,443',
   'VE3RHJ/2' => '260,435,436,437,438,439,440,441,442,443',
   'VE4' => '439',
   'VE5' => '440',
@@ -2653,6 +2641,7 @@
   'VE8RCS' => '260,435,436,437,438,439,440,441,442,443',
   'VE9' => '260',
   'VF' => '445',
+  'VF0' => '260,435,436,437,438,439,440,441,442,443',
   'VF1' => '260,436',
   'VF2' => '437',
   'VF3' => '438',
@@ -2738,6 +2727,7 @@
   'VK0IC' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'VK0IR' => '463',
   'VK0KC' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
+  'VK0KMT' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'VK0LL' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'VK0M' => '464',
   'VK0MP' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
@@ -2772,6 +2762,7 @@
   'VK9KN' => '266',
   'VK9KW' => '267',
   'VK9KX' => '263',
+  'VK9KY' => '462',
   'VK9L' => '262',
   'VK9M' => '265',
   'VK9N' => '266',
@@ -2847,16 +2838,8 @@
   'VN9X' => '263',
   'VN9Y' => '462',
   'VO' => '445',
-  'VO0' => '260,435,436,437,438,439,440,441,442,443',
   'VO1' => '435',
   'VO2' => '444',
-  'VO3' => '260,435,436,437,438,439,440,441,442,443',
-  'VO4' => '260,435,436,437,438,439,440,441,442,443',
-  'VO5' => '260,435,436,437,438,439,440,441,442,443',
-  'VO6' => '260,435,436,437,438,439,440,441,442,443',
-  'VO7' => '260,435,436,437,438,439,440,441,442,443',
-  'VO8' => '260,435,436,437,438,439,440,441,442,443',
-  'VO9' => '260,435,436,437,438,439,440,441,442,443',
   'VP29E' => '270',
   'VP2E' => '270',
   'VP2M' => '271',
@@ -2865,6 +2848,7 @@
   'VP6' => '279,465',
   'VP6/D' => '465',
   'VP6D' => '465',
+  'VP6DI' => '465',
   'VP8' => '275,276,277,278,274',
   'VP8/F' => '274',
   'VP8/G' => '275',
@@ -2897,7 +2881,6 @@
   'VP8CTR' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'VP8FAR' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'VP8GAV' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
-  'VP8GEO' => '275',
   'VP8LU' => '276',
   'VP8ROT' => '75,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368',
   'VP8SGB' => '275',
@@ -2951,9 +2934,6 @@
   'VY7' => '442',
   'VY8' => '443',
   'VY9' => '260',
-  'VY9CC' => '260,435,436,437,438,439,440,441,442,443',
-  'VY9CCA' => '260,435,436,437,438,439,440,441,442,443',
-  'VY9QR' => '260,435,436,437,438,439,440,441,442,443',
   'VZ' => '453',
   'VZ0' => '269',
   'VZ1' => '454',
@@ -3037,7 +3017,6 @@
   'WH9' => '178',
   'WI' => '293',
   'WJ' => '293',
-  'WJ2O/VE2' => '260,435,436,437,438,439,440,441,442,443',
   'WK' => '293',
   'WL' => '390',
   'WL7' => '391',
@@ -3099,6 +3078,7 @@
   'XJ8' => '443',
   'XJ9' => '260',
   'XK' => '445',
+  'XK0' => '260,435,436,437,438,439,440,441,442,443',
   'XK1' => '260,436',
   'XK2' => '437',
   'XK3' => '438',
@@ -3119,9 +3099,7 @@
   'XL8' => '443',
   'XL9' => '260',
   'XM' => '445',
-  'XM2ZP' => '260,435,436,437,438,439,440,441,442,443',
   'XN' => '445',
-  'XN0' => '260,435,436,437,438,439,440,441,442,443',
   'XN1' => '260,436',
   'XN2' => '437',
   'XN3' => '438',
@@ -3140,8 +3118,6 @@
   'XO5' => '440',
   'XO6' => '441',
   'XO7' => '442',
-  'XO7A' => '260,435,436,437,438,439,440,441,442,443',
-  'XO7X' => '260,435,436,437,438,439,440,441,442,443',
   'XO8' => '443',
   'XO9' => '260',
   'XP' => '201',
@@ -3219,12 +3195,13 @@
   'ZK1AT' => '325',
   'ZK1BW' => '325',
   'ZK1BY' => '325',
-  'ZK1CG' => '325',
   'ZK1CQ' => '325',
   'ZK1DT' => '325',
   'ZK1HU' => '325',
+  'ZK1KDN' => '325',
   'ZK1KH' => '325',
   'ZK1MA' => '325',
+  'ZK1NCP' => '325',
   'ZK1NDK' => '325',
   'ZK1NJC' => '325',
   'ZK1OQ' => '325',
@@ -3232,6 +3209,7 @@
   'ZK1UVO' => '325',
   'ZK1VDX' => '325',
   'ZK1VTK' => '325',
+  'ZK1VVV' => '325',
   'ZK1WL' => '325',
   'ZK1XP' => '325',
   'ZK1XR' => '325',
The DXSpider Git Repository