add cty-1706 and make wpxloc.raw changes

diff --git a/Changes b/Changes
index ee588d0a81d28d4c7953eded696ff21cb54bc92e..c53ee1407c4ec9779d17b67b87813359948df213 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+20Aug07=======================================================================
+1. add cty.dat + wpxloc.raw changes for CTY-1706.
 31Jul07=======================================================================
 1. extend 60m band slighty and add ssb section.
 2. add a new cty.dat (CTY-1705) from Jim AD1C.

diff --git a/data/cty.dat b/data/cty.dat
index 2a0a1e48bf7b2f3e1ba8781acfb047bc2398cd20..c380873c86865d04ddbf5741101c75b242dbd1c0 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -189,8 +189,9 @@ Antarctica:               13:  74:  SA:  -65.00:    64.00:    -4.0:  CE9:
     II0AMZS(30)[71],IR0PS(30)[71],K2ARB/KC4(30)[71],KC4/K2ARB(30)[71],\r
     KC4AAA(39),KC4AAC[73],KC4AAF(30)[71],KC4USB(12)[72],KC4USV(30)[71],\r
     KC4USX(30)[71],LU4ZS[73],R1ANB(29)[73],R1ANC(29)[73],R1AND(38)[67],\r
-    R1ANN(38)[67],R1ANT(29)[69],R1ANZ(29)[73],VP8BF[73],VP8CTR,VP8DJB[73],\r
-    VP8DKF(30)[71],VP8PJ[73],VP8ROT[73],VU3BPZ(38)[67],W1MRQ/KC4(30)[71];\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
 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
@@ -223,6 +224,12 @@ Eritrea:                  37:  48:  AF:   15.30:   -38.90:    -3.0:  E3:
     E3;\r
 Palestine:                20:  39:  AS:   31.40:   -35.10:    -2.0:  E4:\r
     E4;\r
+North Cook Is.:           32:  62:  OC:  -10.40:   161.00:    10.0:  E5/n:\r
+    E51PDX,E51PEN,E51QMA,E51TUG,E51WL;\r
+South Cook Is.:           32:  62:  OC:  -21.20:   159.80:    10.0:  E5/s:\r
+    E5;\r
+Bosnia-Herzegovina:       15:  28:  EU:   43.50:   -18.30:    -1.0:  E7:\r
+    E7,T9;\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
@@ -267,8 +274,8 @@ New Caledonia:            32:  56:  OC:  -22.30:  -166.50:   -11.0:  FK:
 Chesterfield Is.:         30:  56:  OC:  -19.90:  -158.30:   -11.0:  FK/c:\r
     TX0AT,TX0C,TX0DX,TX9;\r
 Martinique:               08:  11:  NA:   14.60:    61.00:     4.0:  FM:\r
-    FM,TO0O,TO0P,TO1A,TO1YR,TO2DX,TO3M,TO3W,TO4A,TO5A,TO5AA,TO5J,TO5MM,TO5T,\r
-    TO5X,TO6M,TO7HAM,TO7X,TO8B,TO9A,TX4B;\r
+    FM,TO0O,TO0P,TO1A,TO1YR,TO2DX,TO3M,TO3T,TO3W,TO4A,TO5A,TO5AA,TO5J,TO5MM,\r
+    TO5T,TO5X,TO6M,TO7HAM,TO7X,TO8B,TO9A,TX4B;\r
 French Polynesia:         32:  63:  OC:  -17.60:   149.50:    10.0:  FO:\r
     FO;\r
 Austral Is.:              32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:\r
@@ -315,17 +322,17 @@ Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:
     GB0GEI,GB0GHD,GB0GKR,GB0GNE,GB0HHW,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,\r
     GB0OS,GB0OYT,GB0PPE,GB0QWM,GB0RBS,GB0SHP,GB0SK,GB0SKY,GB0SS,GB0SSF,\r
     GB100MAS,GB125BRC,GB150NRL,GB1EPC,GB1FVT,GB2AGG,GB2AST,GB2AYR,GB2CHG,\r
-    GB2DHS,GB2ELH,GB2FBM,GB2FIO,GB2FSM,GB2GNL,GB2GTM,GB2HI,GB2HRH,GB2HST,\r
-    GB2HSW,GB2IAS,GB2IGB,GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,\r
-    GB2LAY,GB2LBN,GB2LCL,GB2LCP,GB2LGB,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
-    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,GB8CY,GB8FF,GB8OO,\r
-    GB8RU,GB93AM,MM/DL6MHW;\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
 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
@@ -439,34 +446,34 @@ United States:            05:  08:  NA:   43.00:    87.90:     5.0:  K:
     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],KH6QAJ(3)[6],KH6RW(3)[6],\r
-    KI6DY(4)[7],KK9A(5),KL0LN(4)[8],KL1IF(4)[8],KL2A/7(3)[6],KL7FDQ(3)[6],\r
-    KL7WP(3)[6],KL7XX(4)[8],KM4FO(4),KM6JD(5)[8],KN4Q(4),KN4QS(4)[7],\r
-    KN5H(3)[6],KN6RO(5)[8],KN8J(5),KO7X(4)[7],KP2N(5)[8],KP4E(4)[8],\r
-    KS7T(4)[6],KU1CW(4)[7],KU8E(5),KY1V(4),KY4AA(4),KY4Z(4)[7],N0AX(3)[6],\r
-    N1LN(4)[7],N1SZ(4)[7],N1WI(4),N1ZP(4),N2BJ(4),N2BJL(5),N2IC(4)[7],\r
-    N2LA(4)[7],N2NB(3)[6],N2WN(4),N3AIU(4)[7],N3BB(4)[7],N3ZZ(3)[6],N4CVO(4),\r
-    N4DD(4),N4DW(4),N4GK(4),N4GN(4),N4IR(4),N4IRR(5),N4JF(4),N4KG(4),N4KZ(4),\r
-    N4NO(4),N4OGW(4)[7],N4QS(4),N4SL(3)[6],N4TN(4),N4TZ(4),N4UW(4),N4VV(4),\r
-    N4XM(4),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
+    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
 Guantanamo Bay:           08:  11:  NA:   19.90:    75.20:     5.0:  KG4:\r
@@ -634,8 +641,6 @@ San Marino:               15:  28:  EU:   43.90:   -12.30:    -1.0:  T7:
     T7;\r
 Palau:                    27:  64:  OC:    9.50:  -138.20:   -10.0:  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:    -2.0:  TA:\r
     TA,TB,TC,YM;\r
 Turkey (Europe):          20:  39:  EU:   41.20:   -29.00:    -2.0:  *TA1:\r
@@ -718,8 +723,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
-    UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R270A,R270E,R375I,R3F/9,\r
-    R40WK,R70PW,R9HQ(17)[30],UE105SBM(18)[32],UE15UWC(18)[32];\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
 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
@@ -755,7 +760,8 @@ Canada:                   05:  09:  NA:   45.00:    80.00:     4.0:  VE:
     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),VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];\r
+    VE8AJ(2),VE8PW(2),VE8RCS(2),VER20070810,VY0AA(4)[3],VY0PW(4)[3],\r
+    VY2MGY/3(4)[4];\r
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:\r
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ,VI90ANZAC(29);\r
 Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:\r
@@ -871,10 +877,6 @@ Tristan da Cunha:         38:  66:  AF:  -37.10:    12.30:     0.0:  ZD9:
     ZD9;\r
 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
-    E51PDX,E51PEN,E51QMA,E51TUG,E51WL;\r
-South Cook Is.:           32:  62:  OC:  -21.20:   159.80:    10.0:  ZK1/s:\r
-    E5;\r
 Niue:                     32:  62:  OC:  -19.00:   169.90:    11.0:  ZK2:\r
     ZK2;\r
 Tokelau:                  31:  62:  OC:   -8.40:   172.70:    11.0:  ZK3:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index de96a5fdeb94239c9b2e9c7a593c0abe16c314c0..8fd708d658ea4a577c96da1727d720b1b6be71b4 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -778,12 +778,15 @@
   'E2' => '81',
   'E3' => '334',
   'E4' => '326,532',
-  'E5' => '249,250',
+  'E5' => '250',
+  'E5/N' => '249',
+  'E5/S' => '250',
   'E51PDX' => '249',
   'E51PEN' => '249',
   'E51QMA' => '249',
   'E51TUG' => '249',
   'E51WL' => '249',
+  'E7' => '325',
   'EA' => '34',
   'EA6' => '35',
   'EA8' => '36',
@@ -994,7 +997,7 @@
   'GB2CPC' => '66',
   'GB2DHS' => '64,351',
   'GB2ECG' => '65',
-  'GB2ELH' => '64,351',
+  'GB2ELH' => '351',
   'GB2FBM' => '64,351',
   'GB2FIO' => '64,351',
   'GB2FSM' => '64,351',
@@ -1561,6 +1564,7 @@
   'KH6' => '107,387,388',
   'KH6DX' => '220',
   'KH6HHS' => '220',
+  'KH6QAI' => '220',
   'KH6QAJ' => '220',
   'KH6RW' => '220',
   'KH7' => '387,388',
@@ -2498,6 +2502,7 @@
   'R270A' => '176,425,430',
   'R270E' => '176,425,430',
   'R3' => '419',
+  'R30ZF' => '176,425,430',
   'R375I' => '176,425,430',
   'R3F/9' => '176,425,430',
   'R4' => '420',
@@ -2998,7 +3003,7 @@
   'T4' => '20',
   'T5' => '157',
   'T6' => '230',
-  'T7' => '158',
+  'T7' => '158,325',
   'T8' => '332',
   'T9' => '325',
   'TA' => '159',
@@ -3032,6 +3037,7 @@
   'TO2FG' => '43',
   'TO2OOO' => '43',
   'TO3M' => '46',
+  'TO3T' => '46',
   'TO3W' => '46',
   'TO4A' => '46',
   'TO4E' => '52',
@@ -3191,6 +3197,7 @@
   'UE3' => '419',
   'UE4' => '420',
   'UE6' => '421',
+  'UE60SWA' => '176,425,430',
   'UE7' => '176,425,430',
   'UE8' => '431',
   'UE8T' => '176,425,430',
@@ -3386,6 +3393,7 @@
   'VE8PW' => '191',
   'VE8RCS' => '191',
   'VE9' => '436',
+  'VER20070810' => '191',
   'VERSION' => '536',
   'VF' => '434',
   'VF0' => '191',
@@ -3532,6 +3540,7 @@
   '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',
@@ -4388,8 +4397,8 @@
    246 => bless( { name => 'Tristan-Da-Cunha-ZD9', dxcc => 253, itu => 66, cq => 38, utcoff => 0.00, lat => -37.1, long => -12.3 }, 'Prefix'),
    247 => bless( { name => 'Zimbabwe-Z2', dxcc => 254, itu => 53, cq => 38, utcoff => -2.00, lat => -18, long => 31 }, 'Prefix'),
    248 => bless( { name => 'Cayman-Is-ZF', dxcc => 255, itu => 11, cq => 8, utcoff => 5.00, lat => 19.5, long => -81.2 }, 'Prefix'),
-   249 => bless( { name => 'North-Cook-Is-ZK1/N', dxcc => 256, itu => 62, cq => 32, utcoff => 10.30, lat => -10.5, long => -161 }, 'Prefix'),
-   250 => bless( { name => 'South-Cook-Is-ZK1/S', dxcc => 257, itu => 62, cq => 32, utcoff => 10.30, lat => -21, long => -159.5 }, 'Prefix'),
+   249 => bless( { name => 'North-Cook-Is-E5/N', dxcc => 256, itu => 62, cq => 32, utcoff => 10.30, lat => -10.5, long => -161 }, 'Prefix'),
+   250 => bless( { name => 'South-Cook-Is-E5/S', dxcc => 257, itu => 62, cq => 32, utcoff => 10.30, lat => -21, long => -159.5 }, 'Prefix'),
    251 => bless( { name => 'Niue-ZK2', dxcc => 258, itu => 62, cq => 32, utcoff => 11.00, lat => -19, long => -170 }, 'Prefix'),
    252 => bless( { name => 'Tokelau-ZK3', dxcc => 259, itu => 62, cq => 31, utcoff => 11.00, lat => -8.4, long => -172.7 }, 'Prefix'),
    253 => bless( { name => 'New-Zealand-ZL', dxcc => 260, itu => 60, cq => 32, utcoff => -12.00, lat => -46, long => 170 }, 'Prefix'),
@@ -4464,7 +4473,7 @@
    322 => bless( { name => 'Paraguay-ZP', dxcc => 333, itu => 14, cq => 11, utcoff => 4.00, lat => -25.3, long => -57.7 }, 'Prefix'),
    323 => bless( { name => 'Croatia-9A', dxcc => 334, itu => 28, cq => 15, utcoff => -1.00, lat => 45.1666666666667, long => 15.5 }, 'Prefix'),
    324 => bless( { name => 'Slovenia-S5', dxcc => 335, itu => 28, cq => 15, utcoff => -1.00, lat => 46.1166666666667, long => 14.8166666666667 }, 'Prefix'),
-   325 => bless( { name => 'Bosnia-Hercegovina-T9', dxcc => 336, itu => 28, cq => 15, utcoff => -1.00, lat => 43.8333333333333, long => 18.5 }, 'Prefix'),
+   325 => bless( { name => 'Bosnia-Hercegovina-E7', dxcc => 336, itu => 28, cq => 15, utcoff => -1.00, lat => 43.8333333333333, long => 18.5 }, 'Prefix'),
    326 => bless( { name => 'Palestine-Gaza-E4', dxcc => 337, itu => 39, cq => 20, utcoff => -2.00, lat => 31.4833333333333, long => 34.4166666666667 }, 'Prefix'),
    327 => bless( { name => 'Austral-Is-FO/A', dxcc => 338, itu => 63, cq => 32, utcoff => 10.00, lat => -22.45, long => -151.35 }, 'Prefix'),
    328 => bless( { name => 'Marquesas-Is-FO/M', dxcc => 339, itu => 63, cq => 31, utcoff => 10.00, lat => -8.88333333333333, long => -140.116666666667 }, 'Prefix'),

diff --git a/data/wpxloc.raw b/data/wpxloc.raw
index b90cdbba06566befdb99864c835136ae05bf7064..0642c441f85cfb50cc93a486a5b5037777d0f385 100644 (file)
--- a/data/wpxloc.raw
+++ b/data/wpxloc.raw
@@ -1091,10 +1091,10 @@ ZD8 Ascension-Is-ZD8                                  252 66 36   0.00  8  0  0
 ZD9 Tristan-Da-Cunha-ZD9                              253 66 38   0.00 37  6  0 S  12 18  0 W @\r
 Z2 Zimbabwe-Z2                                        254 53 38  -2.00 18  0  0 S  31  0  0 E @\r
 ZF Cayman-Is-ZF                                       255 11  8   5.00 19 30  0 N  81 12  0 W @\r
-ZK1/N North-Cook-Is-ZK1/N                             256 62 32  10.30 10 30  0 S 161  0  0 W @\r
-E5,ZK1 North-Cook-Is-ZK1/N                            256 62 32  10.30 10 30  0 S 161  0  0 W *\r
-ZK1/S South-Cook-Is-ZK1/S                             257 62 32  10.30 21  0  0 S 159 30  0 W @\r
-E5,ZK1 South-Cook-Is-ZK1/S                            257 62 32  10.30 21  0  0 S 159 30  0 W \r
+E5/N North-Cook-Is-E5/N                             256 62 32  10.30 10 30  0 S 161  0  0 W @\r
+ZK1/N,ZK1 North-Cook-Is-E5/N                            256 62 32  10.30 10 30  0 S 161  0  0 W *\r
+E5/S South-Cook-Is-E5/S                             257 62 32  10.30 21  0  0 S 159 30  0 W @\r
+ZK1/S,ZK1 South-Cook-Is-E5/S                            257 62 32  10.30 21  0  0 S 159 30  0 W \r
 ZK2 Niue-ZK2                                          258 62 32  11.00 19  0  0 S 170  0  0 W @\r
 ZK3 Tokelau-ZK3                                       259 62 31  11.00  8 24  0 S 172 42  0 W @\r
 ZL New-Zealand-ZL                                     260 60 32 -12.00 46  0  0 S 170  0  0 E * @\r
@@ -1220,8 +1220,8 @@ H40 Temotu-H40                                        332 51 32 -11.00 10 43  0
 ZP Paraguay-ZP                                        333 14 11   4.00 25 18  0 S  57 42  0 W @\r
 9A Croatia-9A                                         334 28 15  -1.00 45 10  0 N  15 30  0 E @\r
 S5 Slovenia-S5                                        335 28 15  -1.00 46  7  0 N  14 49  0 E @\r
-T9 Bosnia-Hercegovina-T9                              336 28 15  -1.00 43 50  0 N  18 30  0 E @\r
-4N4 Bosnia-Hercegovina-T9                             336 28 15  -1.00 43 50  0 N  18 30  0 E \r
+E7 Bosnia-Hercegovina-E7                              336 28 15  -1.00 43 50  0 N  18 30  0 E @\r
+4N4,T7 Bosnia-Hercegovina-E7                             336 28 15  -1.00 43 50  0 N  18 30  0 E \r
 E4 Palestine-Gaza-E4                                  337 39 20  -2.00 31 29  0 N  34 25  0 E * @\r
 E4 Palestine-W-Bank-E4                                337 39 20  -2.00 31 32  0 N  35  6  0 E \r
 FO/A Austral-Is-FO/A                                  338 63 32  10.00 22 27  0 S 151 21  0 W @\r

diff --git a/perl/Version.pm b/perl/Version.pm
index 7a61dacd4d62c1c173d758d8e5a0a5c541f8ca9e..b878232df1431efd9b2db1b7e7dc4d3129cb4872 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';
-$build = '134';
+$build = '135';
 
 1;