From 8f652755dc254692ad2eb35147385a8bddca71a6 Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Wed, 16 Mar 2011 10:36:52 +0000 Subject: [PATCH] add CTY-2105 prefixes --- Changes | 2 ++ data/cty.dat | 41 +++++++++++++++++++++-------------------- data/prefix_data.pl | 18 +++++++++++++++--- perl/Version.pm | 4 ++-- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/Changes b/Changes index d15b3100..eb2209d3 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +16Mar11======================================================================= +1. Add CTY-2105 prefixes 10Mar11======================================================================= 1. Add CTY-2104 prefixes 01Mar11======================================================================= diff --git a/data/cty.dat b/data/cty.dat index 957f059a..6ccd97aa 100644 --- a/data/cty.dat +++ b/data/cty.dat @@ -278,10 +278,10 @@ Antarctica: 13: 74: SA: -90.00: 0.00: 0.0: CE9: ZM5(30)[71],ZS7(38)[67],=K9PET/KC4,=3Y8XSA(38)[67],=8J1RL(39)[67], =AT10BP(38)[67],=DP0GVN(38)[67],=DP1POL(38)[67],=I0QHM/IA0PS(30)[71], =II0AMZS(30)[71],=KC4/FT5YK[73],=KC4/WA2DKJ(30),=KC4/WB9YSD(30)[71], - =KC4AAA(39),=KC4AAC[73],=KC4USB(12),=KC4USV(30)[71],=R1ANP(39)[69], - =R1ANR(38)[67],=R1ANY(38)[67],=RI1ANC(29)[70],=RI1ANC/A(39)[69], - =RI1ANR(38)[67],=VP8ADE/B[73],=VP8DLM[73],=VP8DMH[73], - =VU2JBK/AT10(38)[67]; + =KC4AAA(39),=KC4AAC[73],=KC4USB(12),=KC4USV(30)[71],=LU/FT5YK[73], + =OJ1ABOA(38)[67],=R1ANP(39)[69],=R1ANR(38)[67],=R1ANY(38)[67], + =RI1ANC(29)[70],=RI1ANC/A(39)[69],=RI1ANR(38)[67],=SM/OH2FFP(38)[67], + =VP8ADE/B[73],=VP8DLM[73],=VP8DMH[73],=VU2JBK/AT10(38)[67]; Cuba: 08: 11: NA: 21.50: 80.00: 5.0: CM: CL,CM,CO,T4; Morocco: 33: 37: AF: 32.00: 5.00: 0.0: CN: @@ -354,7 +354,7 @@ Turkmenistan: 17: 30: AS: 38.00: -58.00: -5.0: EZ: France: 14: 27: EU: 46.00: -2.00: -1.0: F: F,HW,HX,HY,TH,TM,TP,TQ,TV,TW; Guadeloupe: 08: 11: NA: 16.13: 61.67: 4.0: FG: - FG; + FG,=TO11A; Mayotte: 39: 53: AF: -12.88: -45.15: -3.0: FH: FH,=TO2FH; St. Barthelemy: 08: 11: NA: 17.90: 62.83: 4.0: FJ: @@ -364,7 +364,7 @@ New Caledonia: 32: 56: OC: -21.50: -165.50: -11.0: FK: Chesterfield Islands: 30: 56: OC: -19.87: -158.32: -11.0: FK/c: =FK8IK/C; Martinique: 08: 11: NA: 14.70: 61.03: 4.0: FM: - FM,=TO5A,=TO5T,=TO7A; + FM,=TO1N,=TO5A,=TO5T,=TO7A; French Polynesia: 32: 63: OC: -17.65: 149.40: 10.0: FO: FO; Austral Islands: 32: 63: OC: -23.37: 149.48: 10.0: FO/a: @@ -400,12 +400,12 @@ England: 14: 27: EU: 52.77: 1.47: 0.0: G: Isle of Man: 14: 27: EU: 54.20: 4.53: 0.0: GD: 2D,2T,GD,GT,MD,MT,=GB0AOA,=GB1RT,=GB2RT,=GB5TD; Northern Ireland: 14: 27: EU: 54.73: 6.68: 0.0: GI: - 2I,2N,GI,GN,MI,MN,=GB0SPD,=GB2AD,=GB5SPD; + 2I,2N,GI,GN,MI,MN,=GB0SPD,=GB2AD,=GB2SPD,=GB5SPD; Jersey: 14: 27: EU: 49.22: 2.18: 0.0: GJ: 2H,2J,GH,GJ,MH,MJ; Scotland: 14: 27: EU: 56.82: 4.18: 0.0: GM: 2A,2M,2S,GA,GM,GS,MA,MM,MS,=GB0FSG,=GB1OL,=GB2GEO,=GB2GNL,=GB2LBN,=GB2LT, - =GB2MOF,=GB2MUL,=GB2OWM,=GB2RB,=GB4GS,=GB5FHC; + =GB2MOF,=GB2MUL,=GB2OWM,=GB2RB,=GB2SWF,=GB4GS,=GB5CC,=GB5FHC; Shetland and Fair Isle: 14: 27: EU: 60.50: 1.50: 0.0: *GM/s: 2Z,GZ,MZ,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB0HFC,=GB0OS,=GB2ELH,=GB2ZET, =GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,=GM0ILB,=GM0JDB,=GM0MZD,=GM0OMV, @@ -418,8 +418,9 @@ Shetland and Fair Isle: 14: 27: EU: 60.50: 1.50: 0.0: *GM/s: Guernsey: 14: 27: EU: 49.45: 2.58: 0.0: GU: 2P,2U,GP,GU,MP,MU; Wales: 14: 27: EU: 52.28: 3.73: 0.0: GW: - 2C,2W,2X,2Y,GC,GW,MC,MW,=GB0AWS,=GB0BHR,=GB0CSA,=GB0HEL,=GB0MPA,=GB0SPS, - =GB2GGM,=GB2TD,=GB4BPL,=GB4MD,=GB4MDI,=GB4RC,=GB4SDD,=GB5FI,=GB8CCC; + 2C,2W,2X,2Y,GC,GW,MC,MW,=GB0AWS,=GB0BHR,=GB0CSA,=GB0HEL,=GB0MPA,=GB0PLB, + =GB0SPS,=GB2GGM,=GB2RSC,=GB2TD,=GB4BPL,=GB4MD,=GB4MDI,=GB4RC,=GB4SDD, + =GB5FI,=GB8CCC; Solomon Islands: 28: 51: OC: -9.00: -160.00: -11.0: H4: H4; Temotu: 32: 51: OC: -10.72: -165.80: -11.0: H40: @@ -457,7 +458,7 @@ Thailand: 26: 49: AS: 12.60: -99.70: -7.0: HS: Vatican City: 15: 28: EU: 41.90: -12.47: -1.0: HV: HV; Saudi Arabia: 21: 39: AS: 24.20: -43.83: -3.0: HZ: - 7Z,8Z,HZ,=HZ1SBS/J; + 7Z,8Z,HZ,=HZ1SBS/J,=VERSION; Italy: 15: 28: EU: 42.82: -12.58: -1.0: I: I; African Italy: 33: 37: AF: 35.67: -12.67: -1.0: *IG9: @@ -614,7 +615,7 @@ Navassa Island: 08: 11: NA: 18.40: 75.00: 5.0: KP1: U.S. Virgin Islands: 08: 11: NA: 17.73: 64.80: 4.0: KP2: KP2,NP2,WP2,=K9VV,=KV4BT,=KV4CF,=KV4FZ; Puerto Rico: 08: 11: NA: 18.18: 66.55: 4.0: KP4: - KP3,KP4,NP3,NP4,WP3,WP4,=KC2TE,=KH2RU; + KP3,KP4,NP3,NP4,WP3,WP4,=K4J,=KC2TE,=KH2RU; Desecheo Island: 08: 11: NA: 18.08: 67.88: 4.0: KP5: KP5,NP5,WP5; Norway: 14: 18: EU: 61.00: -9.00: -1.0: LA: @@ -720,8 +721,8 @@ Argentina: 13: 14: SA: -34.80: 65.92: 3.0: LU: =LU2DT/D,=LU2DVI/H,=LU2EE/D,=LU2FP/F,=LU2HOD/D,=LU3DJI/D,=LU3VAL/V[16], =LU4DBP/D,=LU4DBT/D,=LU4DBT/XA[16],=LU4ETN/F,=LU4HOD/F,=LU5DEM/W[16], =LU5DFR/D,=LU5DGI/W[16],=LU5DRV/D,=LU5EJL/D,=LU5FHD/F,=LU6EE/XA[16], - =LU7DSY/V[16],=LU7FM/F,=LU8DIP/D,=LU8DQ/D,=LU9ESD/W[16],=LU9XPA/L,=LV7E/D, - =LW8EAG/D; + =LU7DSY/V[16],=LU7FM/F,=LU8DIP/D,=LU8DQ/D,=LU9ESD/W[16],=LU9JMG/J, + =LU9XPA/L,=LV7E/D,=LW8EAG/D; Luxembourg: 14: 27: EU: 50.00: -6.00: -1.0: LX: LX; Lithuania: 15: 29: EU: 55.45: -23.63: -2.0: LY: @@ -809,7 +810,7 @@ Sudan: 34: 48: AF: 14.47: -28.62: -3.0: ST: Egypt: 34: 38: AF: 26.28: -28.60: -2.0: SU: 6A,6B,SS,SU; Greece: 20: 28: EU: 39.78: -21.78: -2.0: SV: - J4,SV,SW,SX,SY,SZ; + J4,SV,SW,SX,SY,SZ,=SV9DRU/1; Mount Athos: 20: 28: EU: 40.00: -24.00: -2.0: SV/a: =SV2ASP/A; Dodecanese: 20: 28: EU: 36.17: -27.93: -2.0: SV5: @@ -1099,10 +1100,10 @@ Canada: 05: 09: NA: 44.35: 78.75: 5.0: VE: CI1(1)[2],CI2,CJ2[4],CK2[4],CY1,CY2(2),CZ0(2)[4],CZ1(1)[2],CZ2,VA2[4], VB2[4],VC2[4],VD1,VD2(2),VE2[4],VF0(2)[4],VF1(1)[2],VF2,VG2[4],VO1,VO2(2), VX2[4],VY0(2)[4],VY1(1)[2],VY2,XJ1,XJ2(2),XK0(2)[4],XK1(1)[2],XK2,XL2[4], - XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20110310,=VE0MDL(3)[2], - =VE2AEJ(4)[3],=VE2DXY(2)[4],=VE2ENB(2)[4],=VE2FK[9],=VE2GSO(2)[4], - =VE2III(2)[4],=VE2IM(2)[4],=VE2TKH(2)[4],=VE2XAA/2(2)[4],=VE3DO/7(3)[2], - =VE8RAC(2)[4],=VY0PW(4)[3]; + XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20110315,=VE0MDL(3)[2], + =VE2AEJ(4)[3],=VE2DXY(2)[4],=VE2FK[9],=VE2GSO(2)[4],=VE2III(2)[4], + =VE2IM(2)[4],=VE2TKH(2)[4],=VE2XAA/2(2)[4],=VE3DO/7(3)[2],=VE8RAC(2)[4], + =VY0PW(4)[3]; Australia: 30: 59: OC: -23.70: -132.33: -10.0: VK: AX,VH,VI,VJ,VK,VL,VM,VN,VZ,AX4[55],VH4[55],VI4[55],VJ4[55],VK4[55], VL4[55],VM4[55],VN4[55],VZ4[55]; @@ -1186,7 +1187,7 @@ Indonesia: 28: 51: OC: -7.30: -109.88: -7.0: YB: YG6[54],YG7[54],YG8[54],YH0[54],YH1[54],YH2[54],YH3[54],YH4[54],YH5[54], YH6[54],YH7[54],YH8[54]; Iraq: 21: 39: AS: 33.92: -42.78: -3.0: YI: - HN,YI,=VERSION; + HN,YI; Vanuatu: 32: 56: OC: -17.67: -168.38: -11.0: YJ: YJ; Syria: 20: 39: AS: 35.38: -38.20: -2.0: YK: diff --git a/data/prefix_data.pl b/data/prefix_data.pl index f1824367..755a6714 100644 --- a/data/prefix_data.pl +++ b/data/prefix_data.pl @@ -349,6 +349,7 @@ '=GB0HFC' => '381', '=GB0MPA' => '66', '=GB0OS' => '381', + '=GB0PLB' => '66', '=GB0SPD' => '62', '=GB0SPS' => '66', '=GB1OL' => '64,381', @@ -364,7 +365,10 @@ '=GB2MUL' => '64,381', '=GB2OWM' => '64,381', '=GB2RB' => '64,381', + '=GB2RSC' => '66', '=GB2RT' => '61', + '=GB2SPD' => '62', + '=GB2SWF' => '64,381', '=GB2TD' => '66', '=GB2ZET' => '381', '=GB4BPL' => '66', @@ -374,6 +378,7 @@ '=GB4RC' => '66', '=GB4SDD' => '66', '=GB4SI' => '381', + '=GB5CC' => '64,381', '=GB5FHC' => '64,381', '=GB5FI' => '66', '=GB5SPD' => '62', @@ -491,6 +496,7 @@ '=K4IE' => '207', '=K4IQJ' => '207', '=K4IU' => '207', + '=K4J' => '113', '=K4LTA' => '207', '=K4NO' => '207', '=K4NVJ' => '207', @@ -647,6 +653,7 @@ '=KY5R' => '207', '=KZ2V' => '207', '=LP0B/XP' => '117,427,428', + '=LU/FT5YK' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413', '=LU1DKD/D' => '117,427,428', '=LU1DZ/D' => '117,427,428', '=LU1XZ/H' => '117,427,428', @@ -679,6 +686,7 @@ '=LU8DIP/Z' => '340', '=LU8DQ/D' => '117,427,428', '=LU9ESD/W' => '117,427,428', + '=LU9JMG/J' => '117,427,428', '=LU9XPA/L' => '117,427,428', '=LV7E/D' => '117,427,428', '=LW8EAG/D' => '117,427,428', @@ -792,6 +800,7 @@ '=NX1P' => '207', '=NX9T' => '207', '=NY6DX' => '207', + '=OJ1ABOA' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413', '=PY4MAB/BNC' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507', '=R1ANF/B' => '340', '=R1ANP' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413', @@ -805,6 +814,7 @@ '=RI1ANR' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413', '=RK3QS/2' => '171', '=RT9T/2' => '171', + '=SM/OH2FFP' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413', '=SV0LB' => '148', '=SV0LB/9' => '148', '=SV0XAI/9' => '148', @@ -813,8 +823,11 @@ '=SV0XBZ/9' => '148', '=SV0XCA/5' => '147', '=SV2ASP/A' => '149', + '=SV9DRU/1' => '146', '=SX65AP' => '147', '=SX65AP/5' => '147', + '=TO11A' => '43', + '=TO1N' => '46', '=TO2FH' => '44', '=TO2Z' => '50,51,379,53', '=TO5A' => '46', @@ -825,7 +838,6 @@ '=VE0MDL' => '187,543,544,545,546,547,548,549,550,551', '=VE2AEJ' => '187,543,544,545,546,547,548,549,550,551', '=VE2DXY' => '187,543,544,545,546,547,548,549,550,551', - '=VE2ENB' => '187,543,544,545,546,547,548,549,550,551', '=VE2FK' => '187,543,544,545,546,547,548,549,550,551', '=VE2GSO' => '187,543,544,545,546,547,548,549,550,551', '=VE2III' => '187,543,544,545,546,547,548,549,550,551', @@ -834,8 +846,8 @@ '=VE2XAA/2' => '187,543,544,545,546,547,548,549,550,551', '=VE3DO/7' => '187,543,544,545,546,547,548,549,550,551', '=VE8RAC' => '187,543,544,545,546,547,548,549,550,551', - '=VER20110310' => '187,543,544,545,546,547,548,549,550,551', - '=VERSION' => '219', + '=VER20110315' => '187,543,544,545,546,547,548,549,550,551', + '=VERSION' => '82,383,384', '=VK0IR' => '190', '=VK0KEV' => '191', '=VK9AA' => '334', diff --git a/perl/Version.pm b/perl/Version.pm index 99172829..3f38ba45 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion); $version = '1.55'; $subversion = '0'; -$build = '85'; -$gitversion = 'a44669d'; +$build = '86'; +$gitversion = '3c5ad50'; 1; -- 2.34.1