add CTY2310

diff --git a/Changes b/Changes
index 9ef07e6956bd5d33afbb18327c7af373f3e4b53c..06b44ff0cbc802c134d3f1bbe53526b7e68f1172 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+09Oct13=======================================================================
+1. Add CTY2310 prefix changes
 13Sep13=======================================================================
 1. Added CTY2309 prefix data, together with its associated wpxloc.raw file.
 10Sep13=======================================================================

diff --git a/data/cty.dat b/data/cty.dat
index 52e022f2245ad943fde54957878bd5b99a71afa0..ce5566c49c9df880a7e9824bd7a415e517bc0b90 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -7,7 +7,7 @@ Monaco:                   14:  27:  EU:   43.73:    -7.40:    -1.0:  3A:
 Agalega & St. Brandon:    39:  53:  AF:  -10.45:   -56.67:    -4.0:  3B6:
     3B6,3B7;
 Mauritius:                39:  53:  AF:  -20.35:   -57.50:    -4.0:  3B8:
-    3B8,=VERSION;
+    3B8;
 Rodriguez Island:         39:  53:  AF:  -19.70:   -63.42:    -4.0:  3B9:
     3B9;
 Equatorial Guinea:        36:  47:  AF:    1.70:   -10.33:    -1.0:  3C:
@@ -23,7 +23,7 @@ Rotuma Island:            32:  56:  OC:  -12.48:  -177.08:   -12.0:  3D2/r:
 Swaziland:                38:  57:  AF:  -26.65:   -31.48:    -2.0:  3DA:
     3DA;
 Tunisia:                  33:  37:  AF:   35.40:    -9.32:    -1.0:  3V:
-    3V,TS,=3V8CB/J;
+    3V,TS;
 Vietnam:                  26:  49:  AS:   15.80:  -107.90:    -7.0:  3W:
     3W,XV;
 Guinea:                   35:  46:  AF:   11.00:    10.68:     0.0:  3X:
@@ -121,7 +121,7 @@ Trinidad & Tobago:        09:  11:  SA:   10.38:    61.28:     4.0:  9Y:
 Botswana:                 38:  57:  AF:  -22.00:   -24.00:    -2.0:  A2:
     8O,A2;
 Tonga:                    32:  62:  OC:  -21.22:   175.13:   -13.0:  A3:
-    A3;
+    A3,=A35JP/H;
 Oman:                     21:  39:  AS:   23.60:   -58.55:    -4.0:  A4:
     A4;
 Bhutan:                   22:  41:  AS:   27.40:   -90.18:    -6.0:  A5:
@@ -303,10 +303,10 @@ Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
     AY5Z[73],AY6Z[73],AY7Z[73],AY8Z[73],AY9Z[73],FT0Y(30)[70],FT1Y(30)[70],
     FT2Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],LU1Z[73],LU2Z[73],
     LU3Z[73],LU4Z[73],LU5Z[73],LU6Z[73],LU7Z[73],LU8Z[73],LU9Z[73],
-    R1AN(29)[69],RI1AN(29)[69],VI0(39)[69],VK0(39)[69],ZL5(30)[71],
-    ZM5(30)[71],ZS7(38)[67],=K9PET/KC4,=8J1RL(39)[67],=DP0GVN(38)[67],
-    =DP1POL(38)[67],=KC4AAA(39),=KC4AAC[73],=KC4USA(30)[71],=KC4USV(30)[71],
-    =OJ1ABOA(38)[67],=RI1ANP(39)[69],=VP8ADE/B[73],=VP8DLM[73];
+    RI1AN(29)[69],VI0(39)[69],VK0(39)[69],ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],
+    =8J1RL(39)[67],=DP0GVN(38)[67],=DP1POL(38)[67],=IA0MZ(30)[71],=KC4AAA(39),
+    =KC4AAC[73],=KC4USA(30)[71],=KC4USV(30)[71],=OJ1ABOA(38)[67],
+    =RI1ANP(39)[69],=VP8ADE/B[73],=VP8DLM[73];
 Cuba:                     08:  11:  NA:   21.50:    80.00:     5.0:  CM:
     CL,CM,CO,T4;
 Morocco:                  33:  37:  AF:   32.00:     5.00:     0.0:  CN:
@@ -348,11 +348,11 @@ Niue:                     32:  62:  OC:  -19.03:   169.85:    11.0:  E6:
 Bosnia-Herzegovina:       15:  28:  EU:   44.32:   -17.57:    -1.0:  E7:
     E7;
 Spain:                    14:  37:  EU:   40.37:     4.88:    -1.0:  EA:
-    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH;
+    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EA6AKN/5;
 Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
-    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EA5ER/6,=EB3CW/6;
+    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6;
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
-    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8;
+    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=EA1AP/8;
 Ceuta & Melilla:          33:  37:  AF:   35.90:     5.27:    -1.0:  EA9:
     AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9;
 Ireland:                  14:  27:  EU:   53.13:     8.02:     0.0:  EI:
@@ -395,7 +395,7 @@ Martinique:               08:  11:  NA:   14.70:    61.03:     4.0:  FM:
 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:
-    =TX5D;
+    =TX5D,=TX5RV;
 Clipperton Island:        07:  10:  NA:   10.28:   109.22:     8.0:  FO/c:
     =TX5K;
 Marquesas Islands:        31:  63:  OC:   -8.92:   140.07:     9.5:  FO/m:
@@ -403,7 +403,7 @@ Marquesas Islands:        31:  63:  OC:   -8.92:   140.07:     9.5:  FO/m:
 St. Pierre & Miquelon:    05:  09:  NA:   46.77:    56.20:     3.0:  FP:
     FP;
 Reunion Island:           39:  53:  AF:  -21.12:   -55.48:    -4.0:  FR:
-    FR,=TO1PF,=TO1PF/P;
+    FR,=TO2R;
 St. Martin:               08:  11:  NA:   18.08:    63.03:     4.0:  FS:
     FS;
 Glorioso Islands:         39:  53:  AF:  -11.55:   -47.28:    -4.0:  FT/g:
@@ -425,53 +425,33 @@ French Guiana:            09:  12:  SA:    4.00:    53.00:     3.0:  FY:
 England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
     2,G,M,ZH,ZI,ZJ;
 Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
-    2D,2T,GD,GT,MD,MT,=2V0IOM,=2V0YLX,=GB0BEA,=GB4JDF,=GV0OUD,=GV3YEO,=GV6AFB,
-    =GV7HTG,=MV3YLX;
+    2D,2T,GD,GT,MD,MT,=GB0BEA,=GB4JDF;
 Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
-    2I,2N,GI,GN,MI,MN,=2V0CSB,=2V0IVG,=GB0GPF,=GB0REL,=GB1SPD,=GB1UAS,=GB2DMR,
-    =GB2DPC,=GB4SPD,=GB5SPD,=GV1BZT,=GV3KVD,=GV3SG,=GV4FUE,=GV4GUH,=GV4JTF,
-    =GV4LXL,=GV4SRQ,=GV4WVN,=GV7AXB,=GV7THH,=MV0ALS,=MV0GGB,=MV0IOU,=MV0JFC,
-    =MV0JLC,=MV0MOD,=MV0MSR,=MV0MVP,=MV0TGO,=MV0VAX,=MV0WGM,=MV0ZAO,=MV1VOX,
-    =MV6DTE,=MV6GTY,=MV6NIR,=MV6TLG;
+    2I,2N,GI,GN,MI,MN,=GB0GPF,=GB0REL,=GB1SPD,=GB2DMR,=GB2DPC,=GB4SPD,=GB5SPD;
 Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
-    2H,2J,GH,GJ,MH,MJ,=MV0ASP;
+    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,=2V0GUL,=2V0JCH,=2V0KAU,=2V0TAX,=2V1HFE,
-    =2V1MIC,=2V1SJB,=GB0BOL,=GB0BSS,=GB0GDS,=GB0GGR,=GB0NHL,=GB0POS,=GB0SBC,
-    =GB0SSB,=GB0TH,=GB0THL,=GB1AJ,=GB1BOL,=GB1FHS,=GB1OL,=GB1RB,=GB2AL,
-    =GB2ATC,=GB2BHM,=GB2CHC,=GB2GKR,=GB2GNL,=GB2KDR,=GB2LBN,=GB2LK,=GB2LT,
-    =GB2MOF,=GB2OL,=GB2OWM,=GB2SQN,=GB2VCB,=GB3ANG,=GB4GS,=GB5AG,=GV0DBW,
-    =GV0GMN,=GV0GRD,=GV0LZE,=GV0OBX,=GV0OGN,=GV0SYV,=GV0VRP,=GV1BAN,=GV3EEW,
-    =GV3JIJ,=GV3NHQ,=GV3NIG,=GV3NKG,=GV3NNZ,=GV3PIP,=GV3ULP,=GV3VTB,=GV4BLO,
-    =GV4EMX,=GV4HRJ,=GV4ILS,=GV4JOJ,=GV4KLN,=GV4LVW,=GV4PRB,=GV4VTB,=GV4XQJ,
-    =GV6KON,=GV7DHA,=GV7GDE,=GV7GMC,=GV8AVM,=GV8DPV,=GV8LYS,=MV0DXH,=MV0FME,
-    =MV0FMF,=MV0GHM,=MV0HAR,=MV0LGS,=MV0NFC,=MV0NJS,=MV0SGQ,=MV0SJT,=MV0XXW,
-    =MV1VTB,=MV3BRR,=MV3CVB,=MV3YHA,=MV3YMU,=MV5PSL,=MV6BJJ,=MV6KSJ,=MV6NRQ;
+    2A,2M,2S,GA,GM,GS,MA,MM,MS,=GB0BSS,=GB0GDS,=GB0GGR,=GB0NHL,=GB0POS,
+    =GB0SBC,=GB0SSB,=GB1BOL,=GB1FHS,=GB1OL,=GB1RB,=GB2ATC,=GB2BHM,=GB2CHC,
+    =GB2GKR,=GB2GNL,=GB2KDR,=GB2LBN,=GB2LT,=GB2MOF,=GB2OL,=GB2OWM,=GB2SQN,
+    =GB2VCB,=GB3ANG,=GB3ORK,=GB4GS,=GB5AG;
 Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
-    2Z,GZ,MZ,=2M0ZET,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB2CAS,=GB2ELH,=GB2SR,
-    =GB2ZET,=GB3LER,=GB3LER/B,=GB4LER,=GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,
-    =GM0GFL,=GM0ILB,=GM0JDB,=GM0MZD,=GM0OMV,=GM0VFA,=GM1BYL,=GM1CBQ,=GM1KKI,
-    =GM1MXN,=GM1ZNR,=GM3KLA,=GM3KZH,=GM3RFR,=GM3SJA,=GM3STU,=GM3UPU,=GM3WCH,
-    =GM3WHT,=GM3XPQ,=GM3ZET,=GM3ZNM,=GM3ZXH,=GM4AGX,=GM4CAQ,=GM4DQD,=GM4ENK,
-    =GM4FNA,=GM4FNE,=GM4GPN,=GM4GPP,=GM4GQD,=GM4GQM,=GM4IPK,=GM4JPI,=GM4KJQ,
-    =GM4LBE,=GM4LER,=GM4PXG,=GM4SLV,=GM4SRU,=GM4SSA,=GM4SWU,=GM4WXQ,=GM4YEL,
-    =GM4ZHL,=GM6RTO,=GM6VZB,=GM6WVI,=GM6YQA,=GM7AFE,=GM7GWW,=GM7RKD,=GM8LNH,
-    =GM8MMA,=GM8YEC,=GS3ZET,=MA1FJM,=MM0LSM,=MM0XAU,=MM0ZAL,=MM0ZCG,=MM1FJM,
-    =MM3ZET,=MM5PSL,=MM6ACW,=MM6BDU,=MM6SJK,=MS0ZCG,=MS0ZET;
+    2Z,GZ,MZ,=2M0ZET,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB2ELH,=GB2ZET,=GB3LER,
+    =GB3LER/B,=GB4LER,=GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,=GM0GFL,=GM0ILB,
+    =GM0JDB,=GM0MZD,=GM0OMV,=GM0VFA,=GM1BYL,=GM1CBQ,=GM1KKI,=GM1MXN,=GM1ZNR,
+    =GM3KLA,=GM3KZH,=GM3RFR,=GM3SJA,=GM3STU,=GM3UPU,=GM3WCH,=GM3WHT,=GM3XPQ,
+    =GM3ZET,=GM3ZNM,=GM3ZXH,=GM4AGX,=GM4CAQ,=GM4DQD,=GM4ENK,=GM4FNA,=GM4FNE,
+    =GM4GPN,=GM4GPP,=GM4GQD,=GM4GQM,=GM4IPK,=GM4JPI,=GM4KJQ,=GM4LBE,=GM4LER,
+    =GM4PXG,=GM4SLV,=GM4SRU,=GM4SSA,=GM4SWU,=GM4WXQ,=GM4YEL,=GM4ZHL,=GM6RTO,
+    =GM6VZB,=GM6WVI,=GM6YQA,=GM7AFE,=GM7GWW,=GM7RKD,=GM8LNH,=GM8MMA,=GM8YEC,
+    =GS3ZET,=MA1FJM,=MM0LSM,=MM0XAU,=MM0ZAL,=MM0ZCG,=MM1FJM,=MM3ZET,=MM5PSL,
+    =MM6ACW,=MM6BDU,=MM6SJK,=MS0ZCG,=MS0ZET;
 Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2P,2U,GP,GU,MP,MU,=GB2JTA;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
-    2C,2W,2X,2Y,GC,GW,MC,MW,=2V0CDY,=2V0CGM,=2V0CLJ,=2V0CVL,=2V0DAA,=2V0DUN,
-    =2V0GME,=2V0GNG,=2V0KED,=2V0WDS,=2V1EPO,=GB0APS,=GB0DVP,=GB0MPA,=GB0TS,
-    =GB1BGS,=GB1BW,=GB1PD,=GB2FLB,=GB2GGM,=GB2IMD,=GB2LSA,=GB2LSH,=GB4CTC,
-    =GB4EUL,=GB4MBC,=GB4MDI,=GB4OST,=GB4PAT,=GB4SDD,=GB5GEO,=GB6BLB,=GV0ANA,
-    =GV0DCK,=GV0DIV,=GV0EME,=GV0FRE,=GV0MNP,=GV0NPL,=GV1FKY,=GV1IOT,=GV1JFV,
-    =GV1NBW,=GV1YQM,=GV3ATZ,=GV3TJE/P,=GV3UOF,=GV3WEZ,=GV3XJQ,=GV3XQJ,=GV4BKG,
-    =GV4BRS,=GV4CQZ,=GV4JKR,=GV4JQP,=GV4NQJ,=GV4PUC,=GV6BRC,=GV6JPC,=GV6NKG,
-    =GV7UNV,=GV7VJK,=GV8IQC,=MV0AEL,=MV0BLM,=MV0EDX,=MV0GWT,=MV0GXE,=MV0HGY/P,
-    =MV0IML,=MV0LLK,=MV0PJJ,=MV0PJJ/P,=MV0RRD,=MV0SGD,=MV0SGR,=MV0TBB,=MV0TDQ,
-    =MV0UAA,=MV0USK,=MV0VRQ,=MV0WYN,=MV1CFA,=MV1CFN,=MV1EYP/P,=MV3RNI,=MV6CQN,
-    =MV6GWR,=MV6GWR/P,=MV6URC,=MV6ZOL;
+    2C,2W,2X,2Y,GC,GW,MC,MW,=GB0APS,=GB0BRE,=GB0DVP,=GB0MPA,=GB0TS,=GB1BGS,
+    =GB1BW,=GB1PD,=GB2FLB,=GB2GGM,=GB2IMD,=GB2LSA,=GB4CTC,=GB4MBC,=GB4MDI,
+    =GB4OST,=GB4PAT,=GB4SDD,=GB5GEO,=GB6BLB,=GB6SPD;
 Solomon Islands:          28:  51:  OC:   -9.00:  -160.00:   -11.0:  H4:
     H4;
 Temotu Province:          32:  51:  OC:  -10.72:  -165.80:   -11.0:  H40:
@@ -507,14 +487,15 @@ 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;
+    7Z,8Z,HZ,=7Z1BL/ND,=7Z1CQ/ND,=7Z1TT/ND,=HZ1BO/ND,=HZ1BW/ND,=HZ1DG/ND,
+    =HZ1HN/ND,=HZ1SK/ND,=HZ1XB/ND;
 Italy:                    15:  28:  EU:   42.82:   -12.58:    -1.0:  I:
     I,=4U1GSC;
 African Italy:            33:  37:  AF:   35.67:   -12.67:    -1.0:  *IG9:
     IG9,IH9;
 Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
-    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0IAML,=IQ0AH,=IQ0ID,=IQ0SS,
-    =IW0HRI,=IY0GA;
+    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0IAML,=IQ0AG,=IQ0AH,=IQ0ID,=IQ0SS,
+    =IW0HRI;
 Sicily:                   15:  28:  EU:   37.50:   -14.00:    -1.0:  *IT9:
     IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9;
 Djibouti:                 37:  48:  AF:   11.75:   -42.35:    -3.0:  J2:
@@ -550,60 +531,61 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
     AA,AB,AC,AD,AE,AF,AG,AI,AJ,AK,K,N,W,=4U1WB(5)[8],=AA4DD(4)[8],=AA4R(4)[8],
     =AA4YL(4)[8],=AB1U(3)[6],=AB4GG(4)[8],=AB4IQ(4)[8],=AB4KJ(4)[8],
     =AB9DU(5)[8],=AC4CA(4)[7],=AC4G(4)[8],=AC4YD(4)[8],=AC8DU(5)[8],
-    =AC8Y(5)[8],=AD1C(4)[7],=AD4EB(4)[8],=AD7MQ(4)[6],=AD8J(5)[8],
-    =AE7AP(4)[6],=AF4AI(4)[8],=AG3V(4)[7],=AG4W(4)[8],=AI4DB(4)[8],
-    =AJ4A(4)[8],=AK4QU(4)[8],=AL7RF(3)[6],=K0DQ(5)[8],=K0IP(3)[6],=K0JJ(3)[6],
-    =K0LUZ(5)[8],=K0NW(3)[6],=K0TQ(4)[8],=K0TV(5)[8],=K0ZR(5)[8],=K1DW(4)[7],
-    =K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],=K1TN(4)[8],=K2AVI(3)[6],=K2FF(4)[7],
-    =K2HT(4)[7],=K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],=K3FIV(3)[6],=K3GP(4)[8],
-    =K3IE(4)[8],=K3PA(4)[7],=K3WA(4)[8],=K3WT(4)[7],=K3YP(4)[8],=K4AB(4)[8],
-    =K4AMC(4)[8],=K4BP(4)[8],=K4BX(4)[8],=K4CX(4)[8],=K4DZR(4)[8],
-    =K4EDI(4)[8],=K4EJQ(4)[8],=K4FT(4)[8],=K4FXN(4)[8],=K4HAL(4)[8],
-    =K4IE(4)[8],=K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],=K4MCK(4)[8],
-    =K4MGE(4)[8],=K4RO(4)[8],=K4SPO(4)[8],=K4TD(4)[8],=K4WI(4)[8],=K4WW(4)[8],
-    =K4ZGB(4)[8],=K4ZHM(4)[8],=K5AUP(5)[8],=K5EK(5)[8],=K5KG(5)[8],
-    =K5OA(3)[6],=K5RQ(5)[8],=K5RR(3)[6],=K5VIP(5)[8],=K5WP(4)[8],=K5ZD(5)[8],
-    =K6ND(5)[8],=K6RM(5)[8],=K6SXA(4)[7],=K6XT(4)[7],=K7ABV(4)[6],=K7BG(4)[6],
-    =K7CS(5)[8],=K7IA(4)[7],=K7KU(4)[7],=K7OM(5)[8],=K7RB(4)[7],=K7RE(4)[7],
-    =K7SCX(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K7VK(4)[6],=K7VU(4)[7],=K8CN(5)[8],
-    =K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8LF(5)[8],=K8MN(5)[8],=K8NYG(5)[8],
-    =K8PO(5)[8],=K8TE(4)[7],=K8WT(5)[8],=K8YC(5)[8],=K9AIH(5)[8],=K9BWI(4)[7],
-    =K9CHP(5)[8],=K9DR(4)[7],=K9DU(4)[7],=K9ES(5)[8],=K9FY(5)[8],=K9IA(5)[8],
-    =K9JF(3)[6],=K9JM(3)[6],=K9JWV(3)[6],=K9MWM(4)[7],=K9OM(5)[8],=K9RS(5)[8],
-    =K9SG(3)[6],=K9WZB(3)[6],=K9YC(3)[6],=KA3DRR(3)[6],=KA4OTB(4)[8],
-    =KA4PKB(4)[8],=KA4R(4)[8],=KA8HDE(4)[7],=KA8Q(5)[8],=KB5EZ(4)[8],
-    =KB5JC(5)[8],=KB7FSC(4)[6],=KB7Q(4)[6],=KB8V(5)[8],=KC4HW(4)[8],
-    =KC4SAW(4)[8],=KC4WQ(4)[8],=KC8GCR(5)[8],=KD4POJ(4)[7],=KD7DCR(4)[6],
-    =KD8EZS(5)[8],=KE1B(3)[6],=KE2VB(3)[6],=KE3D(4)[7],=KE4ETY(4)[8],
-    =KE4KY(4)[8],=KE7X(4)[6],=KE8UN(5)[8],=KG0F(3)[6],=KG4CUY(4)[8],
-    =KG9JP(3)[6],=KH0WJ(5)[8],=KH2D(5)[8],=KH6IDF(4)[7],=KH6OU(5)[8],
-    =KI4EEY(4)[8],=KI4EZC(4)[8],=KI4SP(4)[8],=KI6DY(4)[7],=KI7MT(4)[6],
-    =KJ4AOM(4)[8],=KK4BJV(4)[8],=KK6MC(4)[7],=KK9A(5)[8],=KK9O(5)[8],
-    =KL0ET(4)[8],=KL7FDQ(3)[6],=KL7HM(3)[6],=KL7QW(4)[7],=KL7WP(3)[6],
-    =KL7WV(5)[8],=KL8DX(5)[8],=KM4JA(4)[8],=KO4OL(4)[8],=KO4PU(4)[8],
-    =KO4XJ(4)[8],=KO7X(4)[7],=KP4MM(5)[8],=KR2E(3)[6],=KR4F(4)[8],=KR7C(4)[7],
-    =KS4L(4)[8],=KS4X(4)[8],=KS5A(3)[6],=KS7T(4)[6],=KT0P(5)[8],=KT4TX(4)[8],
-    =KU1CW(4)[7],=KU1YL(4)[7],=KU4A(4)[8],=KU8E(5)[8],=KV1E(4)[7],=KX2P(4)[7],
-    =KX9X(5)[8],=KY0W(3)[6],=KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],=N1CC(4)[7],
-    =N1JM(3)[6],=N1WQ(4)[7],=N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],=N2OPW(4)[8],
-    =N2WN(4)[8],=N3BB(4)[7],=N3BUO(4)[7],=N3PV(3)[6],=N3RC(4)[6],=N3ZZ(3)[6],
-    =N4AAI(4)[8],=N4ARO(4)[8],=N4ART(4)[8],=N4AU(4)[8],=N4BCB(4)[8],
-    =N4BCD(4)[8],=N4CC(3)[6],=N4DW(4)[8],=N4FZ(4)[8],=N4HAI(4)[8],=N4IJ(4)[7],
-    =N4IR(4)[8],=N4JF(4)[8],=N4KG(4)[8],=N4KH(4)[8],=N4NM(4)[8],=N4NO(4)[8],
-    =N4OGW(4)[8],=N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VV(4)[8],
-    =N4ZI(4)[8],=N4ZZ(4)[8],=N5IE(5)[8],=N5KO(3)[6],=N5LZ(3)[6],=N5ZO(3)[6],
-    =N6AR(5)[8],=N6FS(4)[8],=N7DR(4)[7],=N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],
-    =N7IP(4)[6],=N7IV(4)[7],=N7IX(4)[7],=N7KA(4)[7],=N7MB(4)[8],=N7MZW(4)[7],
-    =N7NG(4)[7],=N7US(4)[8],=N8CL(5)[8],=N8DEZ(3)[6],=N8HM(5)[8],=N8II(5)[8],
-    =N8IK(5)[8],=N8NA(5)[8],=N8PR(5)[8],=N8RA(5)[8],=N9ADG(3)[6],=N9CM(5)[8],
-    =N9DFD(5)[8],=N9HDE(4)[7],=N9MM(4)[7],=N9NB(5)[8],=N9NC(5)[8],=N9TX(4)[7],
+    =AC8Y(5)[8],=AD1C(4)[7],=AD4EB(4)[8],=AD7MQ(4)[7],=AD8J(5)[8],
+    =AE7AP(4)[7],=AF4AI(4)[8],=AG3V(4)[7],=AG4W(4)[8],=AI4DB(4)[8],
+    =AJ4A(4)[8],=AK4QU(4)[8],=AL7RF(3)[6],=K0CD(4)[8],=K0DQ(5)[8],=K0EJ(4)[8],
+    =K0IP(3)[6],=K0JJ(3)[6],=K0LUZ(5)[8],=K0NW(3)[6],=K0TQ(4)[8],=K0TV(5)[8],
+    =K0ZR(5)[8],=K1DW(4)[7],=K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],=K1TN(4)[8],
+    =K2AVI(3)[6],=K2FF(4)[7],=K2HT(4)[7],=K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],
+    =K3FIV(3)[6],=K3GP(4)[8],=K3IE(4)[8],=K3PA(4)[7],=K3WA(4)[8],=K3WT(4)[7],
+    =K3YP(4)[8],=K4AB(4)[8],=K4AMC(4)[8],=K4BP(4)[8],=K4BX(4)[8],=K4CX(4)[8],
+    =K4DZR(4)[8],=K4EDI(4)[8],=K4EJQ(4)[8],=K4FT(4)[8],=K4FXN(4)[8],
+    =K4HAL(4)[8],=K4IE(4)[8],=K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],
+    =K4MCK(4)[8],=K4MGE(4)[8],=K4RO(4)[8],=K4SPO(4)[8],=K4TD(4)[8],
+    =K4WI(4)[8],=K4WW(4)[8],=K4ZGB(4)[8],=K4ZHM(4)[8],=K5AUP(5)[8],
+    =K5EK(5)[8],=K5KG(5)[8],=K5OA(3)[6],=K5RQ(5)[8],=K5RR(3)[6],=K5VIP(5)[8],
+    =K5WP(4)[8],=K5ZD(5)[8],=K6ND(5)[8],=K6RM(5)[8],=K6SXA(4)[7],=K6XT(4)[7],
+    =K7ABV(4)[7],=K7BG(4)[7],=K7CS(5)[8],=K7IA(4)[7],=K7KU(4)[7],=K7OM(5)[8],
+    =K7RB(4)[7],=K7RE(4)[7],=K7SCX(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K7VK(4)[7],
+    =K7VU(4)[7],=K8CN(5)[8],=K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8LF(5)[8],
+    =K8MN(5)[8],=K8NYG(5)[8],=K8PO(5)[8],=K8TE(4)[7],=K8WT(5)[8],=K8YC(5)[8],
+    =K9AIH(5)[8],=K9BWI(4)[7],=K9CHP(5)[8],=K9DR(4)[7],=K9DU(4)[7],
+    =K9ES(5)[8],=K9FY(5)[8],=K9IA(5)[8],=K9JF(3)[6],=K9JM(3)[6],=K9JWV(3)[6],
+    =K9MWM(4)[7],=K9OM(5)[8],=K9RS(5)[8],=K9SG(3)[6],=K9WZB(3)[6],=K9YC(3)[6],
+    =KA3DRR(3)[6],=KA4OTB(4)[8],=KA4PKB(4)[8],=KA4R(4)[8],=KA8HDE(4)[7],
+    =KA8Q(5)[8],=KB5EZ(4)[8],=KB5JC(5)[8],=KB7FSC(4)[7],=KB7Q(4)[7],
+    =KB8V(5)[8],=KC4HW(4)[8],=KC4SAW(4)[8],=KC4WQ(4)[8],=KC8GCR(5)[8],
+    =KD4POJ(4)[7],=KD7DCR(4)[7],=KD8EZS(5)[8],=KE1B(3)[6],=KE2VB(3)[6],
+    =KE3D(4)[7],=KE4ETY(4)[8],=KE4KY(4)[8],=KE7X(4)[7],=KE8UN(5)[8],
+    =KG0F(3)[6],=KG4CUY(4)[8],=KG9JP(3)[6],=KH2D(5)[8],=KH6IDF(4)[7],
+    =KH6OU(5)[8],=KI4EEY(4)[8],=KI4EZC(4)[8],=KI4SP(4)[8],=KI6DY(4)[7],
+    =KI7MT(4)[7],=KJ4AOM(4)[8],=KK4BJV(4)[8],=KK6MC(4)[7],=KK9A(5)[8],
+    =KK9O(5)[8],=KL0ET(4)[8],=KL7FDQ(3)[6],=KL7HM(3)[6],=KL7QW(4)[7],
+    =KL7WP(3)[6],=KL7WV(5)[8],=KL8DX(5)[8],=KM4JA(4)[8],=KO0Z(4)[8],
+    =KO4OL(4)[8],=KO4PU(4)[8],=KO4XJ(4)[8],=KO7X(4)[7],=KR2E(3)[6],
+    =KR4F(4)[8],=KR7C(4)[7],=KS4L(4)[8],=KS4X(4)[8],=KS5A(3)[6],=KS7T(4)[7],
+    =KT0P(5)[8],=KT4TX(4)[8],=KU1CW(4)[7],=KU1YL(4)[7],=KU4A(4)[8],
+    =KU8E(5)[8],=KV1E(4)[7],=KX2P(4)[7],=KX9X(5)[8],=KY0W(3)[6],=KY4F(4)[8],
+    =KZ1W(3)[6],=KZ2V(3)[6],=N1CC(4)[7],=N1JM(3)[6],=N1WQ(4)[7],=N2BJ(4)[8],
+    =N2IC(4)[7],=N2NS(3)[6],=N2OPW(4)[8],=N2WN(4)[8],=N3BB(4)[7],=N3BUO(4)[7],
+    =N3PV(3)[6],=N3RC(4)[7],=N3ZZ(3)[6],=N4AAI(4)[8],=N4ARO(4)[8],
+    =N4ART(4)[8],=N4AU(4)[8],=N4BCB(4)[8],=N4BCD(4)[8],=N4CC(3)[6],
+    =N4DW(4)[8],=N4FZ(4)[8],=N4HAI(4)[8],=N4IJ(4)[7],=N4IR(4)[8],=N4JF(4)[8],
+    =N4KG(4)[8],=N4KH(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],=N4QS(4)[8],
+    =N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VV(4)[8],=N4ZI(4)[8],=N4ZZ(4)[8],
+    =N5IE(5)[8],=N5KO(3)[6],=N5LZ(3)[6],=N5ZO(3)[6],=N6AR(5)[8],=N6FS(4)[8],
+    =N7DR(4)[7],=N7EO(5)[8],=N7FLT(4)[7],=N7FUL(4)[7],=N7IP(4)[7],=N7IV(4)[7],
+    =N7IX(4)[7],=N7KA(4)[7],=N7MB(4)[8],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],
+    =N8CL(5)[8],=N8DEZ(3)[6],=N8HM(5)[8],=N8II(5)[8],=N8IK(5)[8],=N8NA(5)[8],
+    =N8OO(4)[7],=N8PR(5)[8],=N8RA(5)[8],=N9ADG(3)[6],=N9CM(5)[8],=N9DFD(5)[8],
+    =N9HDE(4)[7],=N9MM(4)[7],=N9NB(5)[8],=N9NC(5)[8],=N9RV(4)[7],=N9TX(4)[7],
     =N9UY(5)[8],=NA2U(3)[6],=NA4C(4)[8],=NA4K(4)[8],=NA4M(4)[7],=NB4M(4)[8],
-    =ND2T(3)[6],=ND4X(4)[8],=NE4M(4)[8],=NE4RD(4)[6],=NG7A(5)[8],=NH6Z(3)[6],
+    =ND2T(3)[6],=ND4X(4)[8],=NE4M(4)[8],=NE4RD(4)[7],=NG7A(5)[8],=NH6Z(3)[6],
     =NH7RO(4)[7],=NI5O(4)[8],=NJ4I(4)[8],=NJ8J(5)[8],=NL7CO(4)[7],
     =NL7CQ(4)[7],=NL7XM(5)[8],=NN3V(3)[6],=NN4MM(4)[8],=NN7A(4)[7],
-    =NO2D(4)[7],=NO9E(5)[8],=NP2B(5)[8],=NP2I(4)[8],=NP2MR(5)[8],=NP3D(5)[8],
-    =NP3ST(5)[8],=NQ6N(5)[8],=NR7DX(4)[6],=NS2X(4)[8],=NS4X(4)[8],=NU4B(4)[8],
-    =NV4B(4)[8],=NW8U(5)[8],=NX1P(3)[6],=NY4N(4)[8],=NY6DX(5)[8],=W0BR(5)[8],
+    =NO2D(4)[7],=NO9E(5)[8],=NP2MR(5)[8],=NP3D(5)[8],=NP3ST(5)[8],=NQ6N(5)[8],
+    =NR7DX(4)[7],=NR9A(4)[7],=NS2X(4)[8],=NS4X(4)[8],=NU4B(4)[8],=NV4B(4)[8],
+    =NW8U(5)[8],=NX1P(3)[6],=NY4N(4)[8],=NY6DX(5)[8],=W0AIH(4)[8],=W0BR(5)[8],
     =W0IZ(4)[8],=W0PAN(3)[6],=W0PV(5)[8],=W0QQG(5)[8],=W0UCE(5)[8],
     =W0YK(3)[6],=W0YR(5)[8],=W1NN(4)[8],=W1RH(3)[6],=W1SRD(3)[6],=W1ZD(3)[6],
     =W2OO(4)[8],=W2UP(4)[7],=W2VJN(3)[6],=W2VKT(3)[6],=W3HDH(4)[8],
@@ -612,22 +594,22 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
     =W4GKM(4)[8],=W4HK(4)[8],=W4HOD(4)[8],=W4JHC(4)[7],=W4JSI(4)[8],
     =W4KW(4)[8],=W4LC(4)[8],=W4NBS(4)[8],=W4NI(4)[8],=W4NZ(4)[8],=W4PV(4)[8],
     =W4RK(4)[7],=W4RYW(4)[8],=W4TTM(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],
-    =W4UT(4)[8],=W5JR(5)[8],=W5MX(4)[8],=W5NZ(4)[8],=W5XB(5)[8],=W6AAN(5)[8],
-    =W6DVS(5)[8],=W6GMT(4)[7],=W6HGF(5)[8],=W6IHG(5)[8],=W6KGP(4)[7],
-    =W6LFB(4)[7],=W6NWS(5)[8],=W6UB(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],
-    =W7IWW(4)[6],=W7IY(5)[8],=W7KAM(4)[7],=W7RTX(4)[7],=W7WZ(5)[8],
-    =W8AKS(5)[8],=W8BFX(3)[6],=W8FJ(5)[8],=W8FN(4)[7],=W8HGH(5)[8],
-    =W8HY(5)[8],=W8KA(3)[6],=W8MHW(4)[7],=W8OHT(5)[8],=W8WEJ(5)[8],
-    =W8ZA(5)[8],=W9CF(3)[6],=W9DKC(5)[8],=W9GE(5)[8],=W9KB(5)[8],=W9LHG(4)[7],
-    =W9NGA(3)[6],=W9PL(3)[6],=WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],
-    =WA1UJU(4)[8],=WA3C(4)[8],=WA5VGI(3)[6],=WA8KAN(5)[8],=WA8OJR(5)[8],
-    =WA8QYJ(5)[8],=WA8ZBT(4)[7],=WB0POH(5)[8],=WB3JFS(3)[6],=WB4KDI(4)[8],
-    =WB4YDL(4)[8],=WB4YDY(4)[8],=WB8CQV(5)[8],=WB8EKG(5)[8],=WB8IMY(5)[8],
-    =WB8YQJ(3)[6],=WB8YYY(5)[8],=WB9G(5)[8],=WB9JPS(3)[6],=WB9KPT(4)[7],
-    =WC7S(4)[7],=WE6EZ(4)[7],=WF4U(3)[6],=WF7T(4)[8],=WG7Y(4)[7],=WG8Y(5)[8],
-    =WJ9B(3)[6],=WL7OU(4)[7],=WP2NN(3)[6],=WP3ME(5)[8],=WR3O(4)[8],
-    =WR5G(3)[6],=WS6K(4)[8],=WS7X(4)[7],=WS9M(5)[8],=WU9B(3)[6],=WW4R(4)[8],
-    =WY7SS(4)[7],=WZ4F(4)[8],=WZ7I(5)[8];
+    =W4UT(4)[8],=W5BEN(4)[8],=W5JR(5)[8],=W5MX(4)[8],=W5NZ(4)[8],=W5XB(5)[8],
+    =W6AAN(5)[8],=W6DVS(5)[8],=W6GMT(4)[7],=W6HGF(5)[8],=W6IHG(5)[8],
+    =W6KGP(4)[7],=W6LFB(4)[7],=W6NWS(5)[8],=W6UB(4)[8],=W6XR(5)[8],
+    =W7DO(5)[8],=W7HJ(5)[8],=W7IWW(4)[7],=W7IY(5)[8],=W7KAM(4)[7],
+    =W7RTX(4)[7],=W7WZ(5)[8],=W8AKS(5)[8],=W8BFX(3)[6],=W8FJ(5)[8],
+    =W8FN(4)[7],=W8HGH(5)[8],=W8HY(5)[8],=W8KA(3)[6],=W8MHW(4)[7],
+    =W8OHT(5)[8],=W8WEJ(5)[8],=W8ZA(5)[8],=W9CF(3)[6],=W9DKC(5)[8],
+    =W9GE(5)[8],=W9KB(5)[8],=W9LHG(4)[7],=W9MAF(4)[7],=W9NGA(3)[6],
+    =W9PL(3)[6],=WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],=WA1UJU(4)[8],
+    =WA3C(4)[8],=WA5VGI(3)[6],=WA8KAN(5)[8],=WA8OJR(5)[8],=WA8QYJ(5)[8],
+    =WA8ZBT(4)[7],=WB0POH(5)[8],=WB3JFS(3)[6],=WB4KDI(4)[8],=WB4YDL(4)[8],
+    =WB4YDY(4)[8],=WB8CQV(5)[8],=WB8EKG(5)[8],=WB8IMY(5)[8],=WB8YQJ(3)[6],
+    =WB8YYY(5)[8],=WB9G(5)[8],=WB9JPS(3)[6],=WB9KPT(4)[7],=WC7S(4)[7],
+    =WE6EZ(4)[7],=WF4U(3)[6],=WF7T(4)[8],=WG7Y(4)[7],=WG8Y(5)[8],=WJ9B(3)[6],
+    =WL7OU(4)[7],=WP3ME(5)[8],=WR3O(4)[8],=WR5G(3)[6],=WS6K(4)[8],=WS7X(4)[7],
+    =WS9M(5)[8],=WU9B(3)[6],=WW4R(4)[8],=WY7SS(4)[7],=WZ4F(4)[8],=WZ7I(5)[8];
 Guantanamo Bay:           08:  11:  NA:   20.00:    75.00:     5.0:  KG4:
     KG4;
 Mariana Islands:          27:  64:  OC:   15.18:  -145.72:   -10.0:  KH0:
@@ -635,8 +617,8 @@ Mariana Islands:          27:  64:  OC:   15.18:  -145.72:   -10.0:  KH0:
 Baker & Howland Islands:  31:  61:  OC:    0.00:   176.00:    12.0:  KH1:
     AH1,KH1,NH1,WH1;
 Guam:                     27:  64:  OC:   13.37:  -144.70:   -10.0:  KH2:
-    AH2,KH2,NH2,WH2,=KE6ATM,=KF5ULC,=KG6DX,=KG6JDX,=KG6SAD,=KJ6KCJ,=KK7AV,
-    =NH7TL,=WD6DGS;
+    AH2,KH2,NH2,WH2,=KE6ATM,=KF5ULC,=KG6DX,=KG6JDX,=KJ6KCJ,=KK7AV,=NH7TL,
+    =W0REP,=WD6DGS;
 Johnston Island:          31:  61:  OC:   16.72:   169.53:    10.0:  KH3:
     AH3,KH3,NH3,WH3,=KJ6BZ;
 Midway Island:            31:  61:  OC:   28.20:   177.37:    11.0:  KH4:
@@ -646,39 +628,40 @@ Palmyra & Jarvis Islands: 31:  61:  OC:    5.87:   162.07:    11.0:  KH5:
 Kingman Reef:             31:  61:  OC:    6.40:   162.40:    11.0:  KH5K:
     AH5K,KH5K,NH5K,WH5K;
 Hawaii:                   31:  61:  OC:   19.67:   155.57:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AA6KY,=AC7N,=AE5LR,=K4EVR,=K6JAE,=K6TWA,
-    =K7ZAR,=K9AGI,=K9FD,=KA5WMF,=KB2MRY,=KB6EGA,=KB7QKJ,=KB7WUP,=KC0UUR,
-    =KC2MIU,=KC2ZSG,=KC2ZSH,=KC2ZSI,=KC4FUE,=KC4HHS,=KC7HNC,=KC9AUA,=KD0IRK,
-    =KD0QLQ,=KD4QWO,=KD5HX,=KD6EPD,=KD7UAV,=KD7UZG,=KD8QML,=KE6CQE,=KE6TIS,
-    =KF5AHW,=KF5LBQ,=KF7GNP,=KG4SGV,=KG6HRX,=KG6JJP,=KG6NNF,=KG6NQI,=KG6OOB,
-    =KG6RJI,=KG6SDD,=KG7CJI,=KI6CRL,=KI6NOC,=KI6VYB,=KI6ZRV,=KI7OS,=KJ4KND,
-    =KJ6GYD,=KJ6LAW,=KJ6LAX,=KK4EEC,=KM6RM,=KN6ZU,=KO6QT,=N1IDP,=N2AL,=N3DJT,
-    =N3RWD,=N5NNK,=N6CGA,=N6QBK,=NY7Z,=W7PEA,=W8JAY,=W8WH,=WB4JTT,=WB5C,
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AC7N,=AE5LR,=K4EVR,=K6JAE,=K7ZAR,=K9AGI,
+    =K9FD,=KA8EBL,=KB2MRY,=KB6EGA,=KB7MEU,=KB7QKJ,=KB7WUP,=KC0UUR,=KC2MIU,
+    =KC2ZSG,=KC2ZSH,=KC2ZSI,=KC4FUE,=KC4HHS,=KC7HNC,=KC9AUA,=KD0IRK,=KD0QLQ,
+    =KD4QWO,=KD5HX,=KD6EPD,=KD7UAV,=KD7UZG,=KD8QML,=KE6CQE,=KE6CVL,=KE6TIS,
+    =KE7FJA,=KF5AHW,=KF5LBQ,=KF7GNP,=KG4SGV,=KG6HRX,=KG6JJP,=KG6NNF,=KG6NQI,
+    =KG6OOB,=KG6RJI,=KG6SDD,=KG7CJI,=KI6CRL,=KI6NOC,=KI6VYB,=KI6ZRV,=KI7OS,
+    =KJ4KND,=KJ6GYD,=KK4EEC,=KM6RM,=KN6ZU,=KO6QT,=N1IDP,=N2AL,=N3DJT,=N3RWD,
+    =N5NNK,=N6CGA,=N6QBK,=NY7Z,=W7KWS,=W7PEA,=W8JAY,=W8WH,=WB4JTT,=WB5C,
     =WB6SAA,=WB7BOR,=WD6GHJ,=WU0H;
 Kure Island:              31:  61:  OC:   29.00:   178.00:    10.0:  KH7K:
     AH7K,KH7K,NH7K,WH7K;
 American Samoa:           32:  62:  OC:  -14.32:   170.78:    11.0:  KH8:
-    AH8,KH8,NH8,WH8,=AB9OH,=KD8TFY;
+    AH8,KH8,NH8,WH8,=AB9OH,=KD8TFY,=W8A;
 Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:
     =NH8S;
 Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
     AH9,KH9,NH9,WH9,=K9W;
 Alaska:                   01:  01:  NA:   63.87:   153.78:     8.0:  KL:
-    AL,KL,NL,WL,=AD7VV,=AE7LN,=AJ4MY,=AK2OR,=K5TDN,=K6GKW,=KB1NDE,=KB1SHE,
-    =KB5UWU,=KB7DEL,=KB7QLB,=KC0DWD,=KC0OKQ,=KC5QNK,=KD5WEV,=KD7TWB,=KD7VXE,
-    =KD8GMS,=KD8JOU,=KE5HHR,=KE6TCE,=KF5FJQ,=KF5NDT,=KF5NHR,=KF6BMF,=KF6LGK,
-    =KF7PFT,=KG4WNZ,=KG6RJE,=KH7BW,=KJ4PSV,=KJ4WDI,=KJ6KRG,=KK4LRE,=KR4WV,
-    =KW1W,=KY7J,=N0XCW,=N1KNK,=N6SPP,=N7UWT,=N7XNM,=N7ZYS,=NH2GZ,=W1WWS,
-    =W5TLB,=W7IV,=W7ROS,=W8OES,=WA7PXH,=WB6COP,=WP4IYI;
+    AL,KL,NL,WL,=AD7VV,=AE7LN,=AJ4MY,=AK2OR,=K5RSO,=K5TDN,=K6GKW,=KB1NDE,
+    =KB1SHE,=KB5UWU,=KB7DEL,=KC0OKQ,=KC2GVS,=KC7RXR,=KD5WEV,=KD7KRK,=KD7TWB,
+    =KD7VXE,=KD8GMS,=KD8JOU,=KE5HHR,=KE6TCE,=KF4PLR,=KF5FJQ,=KF5NDT,=KF5NHR,
+    =KF6BMF,=KF6LGK,=KF7PFT,=KG4WNZ,=KG6RJE,=KG6TAL,=KH7BW,=KJ4PSV,=KJ4WDI,
+    =KJ6KRG,=KK4LRE,=KK4RYG,=KK7STL,=KP4X,=KR4WV,=KW1W,=KY7J,=N0LHN,=N0XCW,
+    =N1KNK,=N6SPP,=N7UWT,=N7XNM,=N7ZYS,=NH2GZ,=NW9F,=NW9H,=W5TLB,=W7IV,=W7ROS,
+    =W8OES,=WA7PXH,=WA7USX,=WB6COP,=WP4IYI;
 Navassa Island:           08:  11:  NA:   18.40:    75.00:     5.0:  KP1:
     KP1,NP1,WP1;
 US Virgin Islands:        08:  11:  NA:   17.73:    64.80:     4.0:  KP2:
-    KP2,NP2,WP2,=KH2XQ,=KH2XR,=KI4FOE,=KV4BT,=KV4CF,=KV4FZ,=N1TKK,=NQ3X,
-    =WB4WFU;
+    KP2,NP2,WP2,=AD4MM,=KD4SGB,=KH2XQ,=KH2XR,=KI4FOE,=KV4BT,=KV4CF,=KV4FZ,
+    =N1TKK,=NQ3X,=WB4WFU;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
-    KP3,KP4,NP3,NP4,WP3,WP4,=AF5IZ,=KB1IJU,=KB1KDP,=KB1ZKF,=KB2MMX,=KB2NMT,
-    =KB2OPM,=KC2CYJ,=KC2LET,=KC2TE,=KC5DKT,=KE5DDD,=KE5LNG,=KF5IBN,=KF5PWC,
-    =KH2RU,=KP2Z,=N1VCW,=N2VXF,=N4JZD,=NB0G,=W4L;
+    KP3,KP4,NP3,NP4,WP3,WP4,=AF5IZ,=K4D,=KB1IJU,=KB1KDP,=KB2MMX,=KB2NMT,
+    =KC2CYJ,=KC2LET,=KC2TE,=KC5DKT,=KE5LNG,=KF5IBN,=KF5PWC,=KH2RU,=KP2Z,
+    =N1VCW,=N4D,=N4JZD,=NB0G,=W4D;
 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:
@@ -779,11 +762,9 @@ Argentina:                13:  14:  SA:  -34.80:    65.92:     3.0:  LU:
     LW2W[16],LW2X[16],LW2Y[16],LW3V[16],LW3W[16],LW3X[16],LW3Y[16],LW4V[16],
     LW4W[16],LW4X[16],LW4Y[16],LW5V[16],LW5W[16],LW5X[16],LW5Y[16],LW6V[16],
     LW6W[16],LW6X[16],LW6Y[16],LW7V[16],LW7W[16],LW7X[16],LW7Y[16],LW8V[16],
-    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU1EQ/D,
-    =LU1VOF/D,=LU1XS/O,=LU2DT/D,=LU4EJS/V[16],=LU5DQ/D,=LU5JU/J,=LU5WT/W[16],
-    =LU6DM/D,=LU6EVD/D,=LU6HBB/H,=LU6UAL/D,=LU7DOT/D,=LU7EO/D,=LU7FM/F,
-    =LU8DCH/D,=LU8DY/D,=LU8DZE/D,=LU9BSA/H,=LW3DG/D,=LW3DSR/D,=LW4DAF/D,
-    =LW5EOL/D;
+    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU4EFC/L,
+    =LU4EJS/V[16],=LU5DQ/D,=LU5YF/V[16],=LU6EVD/D,=LU7DOT/D,=LU7EO/D,=LU7FM/F,
+    =LU8DCH/D,=LU8DY/D,=LU8DZE/D,=LU9BSA/H,=LU9XPA/L,=LW3DG/D,=LW4DAF/D;
 Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -835,9 +816,9 @@ Brazil:                   11:  15:  SA:  -10.00:    53.00:     3.0:  PY:
     PQ2[13],PQ8[13],PR7[13],PR8[13],PS7[13],PS8[13],PT2[13],PT7[13],PT8[12],
     PV8[12],PW8[12],PY6[13],PY7[13],PY8[13],PY9[13];
 Fernando de Noronha:      11:  13:  SA:   -3.85:    32.43:     2.0:  PY0F:
-    PP0F,PP0R,PQ0F,PQ0R,PR0F,PR0R,PS0F,PS0R,PT0F,PT0R,PU0F,PU0R,PV0F,PV0R,
-    PW0F,PW0R,PX0F,PX0R,PY0F,PY0R,PY0Z,ZV0F,ZV0R,ZW0F,ZW0R,ZX0F,ZX0R,ZY0F,
-    ZY0R,ZY0Z,ZZ0F,ZZ0R;
+    PP0F,PQ0F,PR0F,PS0F,PT0F,PU0F,PV0F,PW0F,PX0F,PY0F,PY0Z,ZV0F,ZW0F,ZX0F,
+    ZY0F,ZY0Z,ZZ0F,PP0R,PQ0R,PR0R,PS0R,PT0R,PU0R,PV0R,PW0R,PX0R,PY0R,ZV0R,
+    ZW0R,ZX0R,ZY0R,ZZ0R;
 St. Peter & St. Paul:     11:  13:  SA:    0.00:    29.00:     2.0:  PY0S:
     PP0S,PQ0S,PR0S,PS0S,PT0S,PU0S,PV0S,PW0S,PX0S,PY0S,ZV0S,ZW0S,ZX0S,ZY0S,
     ZZ0S;
@@ -848,7 +829,7 @@ Trindade & Martim Vaz:    11:  15:  SA:  -20.50:    29.32:     2.0:  PY0T:
 Suriname:                 09:  12:  SA:    4.00:    56.00:     3.0:  PZ:
     PZ;
 Franz Josef Land:         40:  75:  EU:   80.68:   -49.92:    -3.0:  R1FJ:
-    FJL,R1FJ,RI1FJ;
+    FJL,RI1FJ;
 Western Sahara:           33:  46:  AF:   24.82:    13.85:     0.0:  S0:
     S0;
 Bangladesh:               22:  41:  AS:   24.12:   -89.65:    -6.0:  S2:
@@ -892,7 +873,7 @@ San Marino:               15:  28:  EU:   43.95:   -12.45:    -1.0:  T7:
 Palau:                    27:  64:  OC:    7.45:  -134.53:    -9.0:  T8:
     T8;
 Asiatic Turkey:           20:  39:  AS:   39.18:   -35.65:    -2.0:  TA:
-    TA,TB,TC,YM,=TA1E/0,=TA1FA/2;
+    TA,TB,TC,YM,=TA1BM/3;
 European Turkey:          20:  39:  EU:   41.02:   -28.97:    -2.0:  *TA1:
     TA1,TB1,TC1,YM1;
 Iceland:                  40:  17:  EU:   64.80:    18.73:     0.0:  TF:
@@ -987,13 +968,13 @@ European Russia:          16:  29:  EU:   53.65:   -41.37:    -4.0:  UA:
     UH1P[20],UH1Z[19],UH4H[30],UH4I[30],UH4W[30],UH8F(17)[30],UH8G(17)[30],
     UH8X(17)[19],UH9F(17)[30],UH9G(17)[30],UH9X(17)[19],UI1N[19],UI1O[19],
     UI1P[20],UI1Z[19],UI4H[30],UI4I[30],UI4W[30],UI8F(17)[30],UI8G(17)[30],
-    UI8X(17)[19],UI9F(17)[30],UI9G(17)[30],UI9X(17)[19],=R01DTV,=R863LC,
-    =R863LK,=R863LX,=RT9K/6/P,=RU2FB/6/P,=RU9CK/6/P,=RV9CX/6/P,=UE80RWW;
+    UI8X(17)[19],UI9F(17)[30],UI9G(17)[30],UI9X(17)[19],=R863LC,=R863LK,
+    =R863LX,=RU2FB/6/P,=RU9CK/6/P,=RV9CX/6/P,=UE80RWW;
 Kaliningrad:              15:  29:  EU:   54.72:   -20.52:    -3.0:  UA2:
     R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RF2F,RF2K,RG2F,RG2K,RI2F,RI2K,RJ2F,RJ2K,
     RK2F,RK2K,RL2F,RL2K,RM2F,RM2K,RN2F,RN2K,RO2F,RO2K,RP2F,RP2K,RQ2F,RQ2K,
     RR2F,RR2K,RT2F,RT2K,RU2F,RU2K,RV2F,RV2K,RW2F,RW2K,RX2F,RX2K,RY2F,RY2K,
-    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UE2,UF2,UG2,UH2,UI2,=R01DTV/2,=R2MWO;
+    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UE2,UF2,UG2,UH2,UI2,=R2MWO;
 Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     R0,R8(17)[30],R9,RA0,RA8(17)[30],RA9,RB0,RB8(17)[30],RB9,RC0,RC8(17)[30],
     RC9,RD0,RD8(17)[30],RD9,RE0,RE8(17)[30],RE9,RF0,RF8(17)[30],RF9,RG0,
@@ -1120,43 +1101,32 @@ Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     UI8O(18)[31],UI8P(18)[31],UI8S(16)[30],UI8T(16)[30],UI8U(18)[31],
     UI8V(18)[31],UI8W(16)[30],UI8Y(18)[31],UI8Z(18)[31],UI9I(18)[31],
     UI9M(17)[30],UI9P(18)[31],UI9S(16),UI9T(16),UI9V(18)[31],UI9W(16),
-    =R11QRP/8/P(17)[30],=R55TV,=RA/KE5JA(19)[34],=RA/UR5HVR(18)[32],
-    =RA/UT2LA[20],=RA36ZF,=RZ9DX/9/P(18)[22],=UA9UAX/9/P(18)[31],
-    =UE44POL(19)[25],=UE70SL;
+    =R11QRP/8/P(17)[30],=RA/KE5JA(19)[34],=RA/UR5HVR(18)[32],=RA/UT2LA[20],
+    =RV9WMZ/9/P,=RZ9DX/9/P(18)[22],=UE44POL(19)[25],=UE70SL;
 Uzbekistan:               17:  30:  AS:   41.40:   -63.97:    -5.0:  UK:
     UJ,UK,UL,UM;
 Kazakhstan:               17:  30:  AS:   48.17:   -65.18:    -5.0:  UN:
-    UN,UO,UP,UQ,UN0D[31],UN0F[31],UN0G[31],UN0J[31],UN0Q[31],UN0V[31],
-    UN1D[31],UN1F[31],UN1G[31],UN1J[31],UN1Q[31],UN1V[31],UN2D[31],UN2F[31],
-    UN2G[31],UN2J[31],UN2Q[31],UN2V[31],UN3D[31],UN3F[31],UN3G[31],UN3J[31],
-    UN3Q[31],UN3V[31],UN4D[31],UN4F[31],UN4G[31],UN4J[31],UN4Q[31],UN4V[31],
-    UN5D[31],UN5F[31],UN5G[31],UN5J[31],UN5Q[31],UN5V[31],UN6D[31],UN6F[31],
-    UN6G[31],UN6J[31],UN6Q[31],UN6V[31],UN7D[31],UN7F[31],UN7G[31],UN7J[31],
-    UN7Q[31],UN7V[31],UN8D[31],UN8F[31],UN8G[31],UN8J[31],UN8Q[31],UN8V[31],
-    UN9D[31],UN9F[31],UN9G[31],UN9J[31],UN9Q[31],UN9V[31],UO0D[31],UO0F[31],
-    UO0G[31],UO0J[31],UO0Q[31],UO0V[31],UO1D[31],UO1F[31],UO1G[31],UO1J[31],
-    UO1Q[31],UO1V[31],UO2D[31],UO2F[31],UO2G[31],UO2J[31],UO2Q[31],UO2V[31],
-    UO3D[31],UO3F[31],UO3G[31],UO3J[31],UO3Q[31],UO3V[31],UO4D[31],UO4F[31],
-    UO4G[31],UO4J[31],UO4Q[31],UO4V[31],UO5D[31],UO5F[31],UO5G[31],UO5J[31],
-    UO5Q[31],UO5V[31],UO6D[31],UO6F[31],UO6G[31],UO6J[31],UO6Q[31],UO6V[31],
-    UO7D[31],UO7F[31],UO7G[31],UO7J[31],UO7Q[31],UO7V[31],UO8D[31],UO8F[31],
-    UO8G[31],UO8J[31],UO8Q[31],UO8V[31],UO9D[31],UO9F[31],UO9G[31],UO9J[31],
-    UO9Q[31],UO9V[31],UP0D[31],UP0F[31],UP0G[31],UP0J[31],UP0Q[31],UP0V[31],
-    UP1D[31],UP1F[31],UP1G[31],UP1J[31],UP1Q[31],UP1V[31],UP2D[31],UP2F[31],
-    UP2G[31],UP2J[31],UP2Q[31],UP2V[31],UP3D[31],UP3F[31],UP3G[31],UP3J[31],
-    UP3Q[31],UP3V[31],UP4D[31],UP4F[31],UP4G[31],UP4J[31],UP4Q[31],UP4V[31],
-    UP5D[31],UP5F[31],UP5G[31],UP5J[31],UP5Q[31],UP5V[31],UP6D[31],UP6F[31],
-    UP6G[31],UP6J[31],UP6Q[31],UP6V[31],UP7D[31],UP7F[31],UP7G[31],UP7J[31],
-    UP7Q[31],UP7V[31],UP8D[31],UP8F[31],UP8G[31],UP8J[31],UP8Q[31],UP8V[31],
-    UP9D[31],UP9F[31],UP9G[31],UP9J[31],UP9Q[31],UP9V[31],UQ0D[31],UQ0F[31],
-    UQ0G[31],UQ0J[31],UQ0Q[31],UQ0V[31],UQ1D[31],UQ1F[31],UQ1G[31],UQ1J[31],
-    UQ1Q[31],UQ1V[31],UQ2D[31],UQ2F[31],UQ2G[31],UQ2J[31],UQ2Q[31],UQ2V[31],
-    UQ3D[31],UQ3F[31],UQ3G[31],UQ3J[31],UQ3Q[31],UQ3V[31],UQ4D[31],UQ4F[31],
-    UQ4G[31],UQ4J[31],UQ4Q[31],UQ4V[31],UQ5D[31],UQ5F[31],UQ5G[31],UQ5J[31],
-    UQ5Q[31],UQ5V[31],UQ6D[31],UQ6F[31],UQ6G[31],UQ6J[31],UQ6Q[31],UQ6V[31],
-    UQ7D[31],UQ7F[31],UQ7G[31],UQ7J[31],UQ7Q[31],UQ7V[31],UQ8D[31],UQ8F[31],
-    UQ8G[31],UQ8J[31],UQ8Q[31],UQ8V[31],UQ9D[31],UQ9F[31],UQ9G[31],UQ9J[31],
-    UQ9Q[31],UQ9V[31];
+    UN,UO,UP,UQ,UN0F[31],UN0G[31],UN0J[31],UN0Q[31],UN1F[31],UN1G[31],
+    UN1J[31],UN1Q[31],UN2F[31],UN2G[31],UN2J[31],UN2Q[31],UN3F[31],UN3G[31],
+    UN3J[31],UN3Q[31],UN4F[31],UN4G[31],UN4J[31],UN4Q[31],UN5F[31],UN5G[31],
+    UN5J[31],UN5Q[31],UN6F[31],UN6G[31],UN6J[31],UN6Q[31],UN7F[31],UN7G[31],
+    UN7J[31],UN7Q[31],UN8F[31],UN8G[31],UN8J[31],UN8Q[31],UN9F[31],UN9G[31],
+    UN9J[31],UN9Q[31],UO0F[31],UO0G[31],UO0J[31],UO0Q[31],UO1F[31],UO1G[31],
+    UO1J[31],UO1Q[31],UO2F[31],UO2G[31],UO2J[31],UO2Q[31],UO3F[31],UO3G[31],
+    UO3J[31],UO3Q[31],UO4F[31],UO4G[31],UO4J[31],UO4Q[31],UO5F[31],UO5G[31],
+    UO5J[31],UO5Q[31],UO6F[31],UO6G[31],UO6J[31],UO6Q[31],UO7F[31],UO7G[31],
+    UO7J[31],UO7Q[31],UO8F[31],UO8G[31],UO8J[31],UO8Q[31],UO9F[31],UO9G[31],
+    UO9J[31],UO9Q[31],UP0F[31],UP0G[31],UP0J[31],UP0Q[31],UP1F[31],UP1G[31],
+    UP1J[31],UP1Q[31],UP2F[31],UP2G[31],UP2J[31],UP2Q[31],UP3F[31],UP3G[31],
+    UP3J[31],UP3Q[31],UP4F[31],UP4G[31],UP4J[31],UP4Q[31],UP5F[31],UP5G[31],
+    UP5J[31],UP5Q[31],UP6F[31],UP6G[31],UP6J[31],UP6Q[31],UP7F[31],UP7G[31],
+    UP7J[31],UP7Q[31],UP8F[31],UP8G[31],UP8J[31],UP8Q[31],UP9F[31],UP9G[31],
+    UP9J[31],UP9Q[31],UQ0F[31],UQ0G[31],UQ0J[31],UQ0Q[31],UQ1F[31],UQ1G[31],
+    UQ1J[31],UQ1Q[31],UQ2F[31],UQ2G[31],UQ2J[31],UQ2Q[31],UQ3F[31],UQ3G[31],
+    UQ3J[31],UQ3Q[31],UQ4F[31],UQ4G[31],UQ4J[31],UQ4Q[31],UQ5F[31],UQ5G[31],
+    UQ5J[31],UQ5Q[31],UQ6F[31],UQ6G[31],UQ6J[31],UQ6Q[31],UQ7F[31],UQ7G[31],
+    UQ7J[31],UQ7Q[31],UQ8F[31],UQ8G[31],UQ8J[31],UQ8Q[31],UQ9F[31],UQ9G[31],
+    UQ9J[31],UQ9Q[31];
 Ukraine:                  16:  29:  EU:   50.00:   -30.00:    -2.0:  UR:
     EM,EN,EO,U5,UR,US,UT,UU,UV,UW,UX,UY,UZ;
 Antigua & Barbuda:        08:  11:  NA:   17.07:    61.80:     4.0:  V2:
@@ -1178,9 +1148,9 @@ 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,=VER20130912,=VA2PL(2)[4],
-    =VE2CSI(2)[4],=VE2DXY(2)[4],=VE2EKA(2)[4],=VE2ENB(2)[4],=VE2FK[9],
-    =VE2GSO(2)[4],=VE2IM(2)[4],=VE2KK(2)[4],=VY0PW(4)[3];
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20131009,=VA2PL(2)[4],
+    =VE2BZO[9],=VE2CSI(2)[4],=VE2DXY(2)[4],=VE2EKA(2)[4],=VE2ENB(2)[4],
+    =VE2FK[9],=VE2GSO(2)[4],=VE2IM(2)[4],=VE2KK(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];
@@ -1192,7 +1162,7 @@ Cocos (Keeling) Islands:  29:  54:  OC:  -12.15:   -96.82:    -6.5:  VK9C:
     AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9Y,VL9C,VL9Y,VM9C,VM9Y,
     VN9C,VN9Y,VZ9C,VZ9Y;
 Lord Howe Island:         30:  60:  OC:  -31.55:  -159.08:   -10.5:  VK9L:
-    AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L;
+    AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L,=VK9DAC;
 Mellish Reef:             30:  56:  OC:  -17.40:  -155.85:   -10.0:  VK9M:
     AX9M,VH9M,VI9M,VJ9M,VK9M,VL9M,VM9M,VN9M,VZ9M;
 Norfolk Island:           32:  60:  OC:  -29.03:  -167.93:   -11.5:  VK9N:
@@ -1210,7 +1180,7 @@ British Virgin Islands:   08:  11:  NA:   18.33:    64.75:     4.0:  VP2V:
     VP2V;
 Turks & Caicos Islands:   08:  11:  NA:   21.77:    71.75:     5.0:  VP5:
     VP5,VQ5;
-Pitcairn Island:          32:  63:  OC:  -24.35:   128.32:     8.0:  VP6:
+Pitcairn Island:          32:  63:  OC:  -25.07:   130.10:     8.0:  VP6:
     VP6;
 Ducie Island:             32:  63:  OC:  -24.70:   124.80:     8.0:  VP6/d:
     =VP6DX;
@@ -1219,7 +1189,7 @@ Falkland Islands:         13:  16:  SA:  -51.63:    58.72:     4.0:  VP8:
 South Georgia Island:     13:  73:  SA:  -54.48:    37.08:     2.0:  VP8/g:
     =VP8SGK;
 South Shetland Islands:   13:  73:  SA:  -62.08:    58.67:     4.0:  VP8/h:
-    CE9,XR9,=DT8A,=HF0POL,=RI1ANA,=RI1ANF,=RI1ANF/P,=RI1ANU;
+    CE9,XR9,=HF0POL,=RI1ANF,=RI1ANF/P,=RI1ANU;
 South Orkney Islands:     13:  73:  SA:  -60.60:    45.55:     3.0:  VP8/o:
     =LU1ZA;
 South Sandwich Islands:   13:  73:  SA:  -58.43:    26.33:     2.0:  VP8/s:
@@ -1278,7 +1248,7 @@ Romania:                  20:  28:  EU:   45.78:   -24.70:    -2.0:  YO:
 El Salvador:              07:  11:  NA:   14.00:    89.00:     6.0:  YS:
     HU,YS;
 Serbia:                   15:  28:  EU:   44.00:   -21.00:    -1.0:  YU:
-    YT,YU;
+    YT,YU,=YU7RQ/FAIR;
 Venezuela:                09:  12:  SA:    8.00:    66.00:     4.5:  YV:
     4M,YV,YW,YX,YY;
 Aves Island:              08:  11:  NA:   15.67:    63.60:     4.0:  YV0:
@@ -1292,7 +1262,7 @@ Kosovo:                   15:  28:  EU:   42.67:   -21.17:    -1.0:  *Z6:
 Republic of South Sudan:  34:  48:  AF:    4.85:   -31.60:    -3.0:  Z8:
     Z8;
 Albania:                  15:  28:  EU:   41.00:   -20.00:    -1.0:  ZA:
-    ZA;
+    ZA,=VERSION;
 Gibraltar:                14:  37:  EU:   36.15:     5.37:    -1.0:  ZB:
     ZB,ZG;
 UK Base Areas on Cyprus:  20:  39:  AS:   35.32:   -33.57:    -2.0:  ZC4:
@@ -1318,6 +1288,6 @@ Auckland & Campbell Is.:  32:  60:  OC:  -51.62:  -167.62:   -12.0:  ZL9:
 Paraguay:                 11:  14:  SA:  -25.27:    57.67:     4.0:  ZP:
     ZP;
 South Africa:             38:  57:  AF:  -29.07:   -22.63:    -2.0:  ZS:
-    H5,S4,S8,V9,ZR,ZS,ZT,ZU,=ZS1BAK/L;
+    H5,S4,S8,V9,ZR,ZS,ZT,ZU;
 Pr. Edward & Marion Is.:  38:  57:  AF:  -46.88:   -37.72:    -3.0:  ZS8:
     ZR8,ZS8,ZT8,ZU8;

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 7abbddca1ca667d680ed1606aa3ecb2992245170..8e85059464917a03e72609d29711eb0305670d05 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -308,47 +308,27 @@
   '=2M1ANT' => '381',
   '=2M1ASQ' => '381',
   '=2M1ODL' => '381',
-  '=2V0CDY' => '66',
-  '=2V0CGM' => '66',
-  '=2V0CLJ' => '66',
-  '=2V0CSB' => '62',
-  '=2V0CVL' => '66',
-  '=2V0DAA' => '66',
-  '=2V0DUN' => '66',
-  '=2V0GME' => '66',
-  '=2V0GNG' => '66',
-  '=2V0GUL' => '64,381',
-  '=2V0IOM' => '61',
-  '=2V0IVG' => '62',
-  '=2V0JCH' => '64,381',
-  '=2V0KAU' => '64,381',
-  '=2V0KED' => '66',
-  '=2V0TAX' => '64,381',
-  '=2V0WDS' => '66',
-  '=2V0YLX' => '61',
-  '=2V1EPO' => '66',
-  '=2V1HFE' => '64,381',
-  '=2V1MIC' => '64,381',
-  '=2V1SJB' => '64,381',
   '=3D2C' => '297',
   '=3D2DD/P' => '299',
   '=3D2GC/P' => '299',
   '=3D2RA' => '299',
   '=3D2RI' => '299',
-  '=3V8CB/J' => '256',
   '=3Y0E' => '258',
   '=3Y0X' => '296',
   '=4U1GSC' => '83,388,389',
   '=4U1WB' => '207',
   '=4U1WRC' => '260',
+  '=7Z1BL/ND' => '82,383,384',
+  '=7Z1CQ/ND' => '82,383,384',
+  '=7Z1TT/ND' => '82,383,384',
   '=8J1RL' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=9M4SAB' => '289,652',
   '=9M8DX/2' => '288',
   '=9M8SYA/2' => '288',
+  '=A35JP/H' => '2',
   '=AA4DD' => '207',
   '=AA4R' => '207',
   '=AA4YL' => '207',
-  '=AA6KY' => '105,418,419',
   '=AB1U' => '207',
   '=AB4GG' => '207',
   '=AB4IQ' => '207',
@@ -364,6 +344,7 @@
   '=AC8Y' => '207',
   '=AD1C' => '207',
   '=AD4EB' => '207',
+  '=AD4MM' => '112',
   '=AD7MQ' => '207',
   '=AD7VV' => '423',
   '=AD8J' => '207',
@@ -386,16 +367,15 @@
   '=BS7H' => '303',
   '=DP0GVN' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=DP1POL' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
-  '=DT8A' => '340',
   '=E51WL' => '341',
-  '=EA5ER/6' => '35',
-  '=EB3CW/6' => '35',
+  '=EA1AP/8' => '36',
+  '=EA6AKN/5' => '34',
   '=FK8IK/C' => '315',
   '=FO/UT6UD' => '313',
   '=G0FBJ' => '381',
   '=GB0APS' => '66',
   '=GB0BEA' => '61',
-  '=GB0BOL' => '64,381',
+  '=GB0BRE' => '66',
   '=GB0BSS' => '64,381',
   '=GB0DVP' => '66',
   '=GB0GDS' => '64,381',
@@ -407,10 +387,7 @@
   '=GB0REL' => '62',
   '=GB0SBC' => '64,381',
   '=GB0SSB' => '64,381',
-  '=GB0TH' => '64,381',
-  '=GB0THL' => '64,381',
   '=GB0TS' => '66',
-  '=GB1AJ' => '64,381',
   '=GB1BGS' => '66',
   '=GB1BOL' => '64,381',
   '=GB1BW' => '66',
@@ -419,11 +396,8 @@
   '=GB1PD' => '66',
   '=GB1RB' => '64,381',
   '=GB1SPD' => '62',
-  '=GB1UAS' => '62',
-  '=GB2AL' => '64,381',
   '=GB2ATC' => '64,381',
   '=GB2BHM' => '64,381',
-  '=GB2CAS' => '381',
   '=GB2CHC' => '64,381',
   '=GB2DMR' => '62',
   '=GB2DPC' => '62',
@@ -436,22 +410,19 @@
   '=GB2JTA' => '65',
   '=GB2KDR' => '64,381',
   '=GB2LBN' => '64,381',
-  '=GB2LK' => '64,381',
   '=GB2LSA' => '66',
-  '=GB2LSH' => '66',
   '=GB2LT' => '64,381',
   '=GB2MOF' => '64,381',
   '=GB2OL' => '64,381',
   '=GB2OWM' => '64,381',
   '=GB2SQN' => '64,381',
-  '=GB2SR' => '381',
   '=GB2VCB' => '64,381',
   '=GB2ZET' => '381',
   '=GB3ANG' => '64,381',
   '=GB3LER' => '381',
   '=GB3LER/B' => '381',
+  '=GB3ORK' => '64,381',
   '=GB4CTC' => '66',
-  '=GB4EUL' => '66',
   '=GB4GS' => '64,381',
   '=GB4JDF' => '61',
   '=GB4LER' => '381',
@@ -466,6 +437,7 @@
   '=GB5GEO' => '66',
   '=GB5SPD' => '62',
   '=GB6BLB' => '66',
+  '=GB6SPD' => '66',
   '=GM0CXQ' => '381',
   '=GM0CYJ' => '381',
   '=GM0DJI' => '381',
@@ -527,98 +499,26 @@
   '=GM8MMA' => '381',
   '=GM8YEC' => '381',
   '=GS3ZET' => '381',
-  '=GV0ANA' => '66',
-  '=GV0DBW' => '64,381',
-  '=GV0DCK' => '66',
-  '=GV0DIV' => '66',
-  '=GV0EME' => '66',
-  '=GV0FRE' => '66',
-  '=GV0GMN' => '64,381',
-  '=GV0GRD' => '64,381',
-  '=GV0LZE' => '64,381',
-  '=GV0MNP' => '66',
-  '=GV0NPL' => '66',
-  '=GV0OBX' => '64,381',
-  '=GV0OGN' => '64,381',
-  '=GV0OUD' => '61',
-  '=GV0SYV' => '64,381',
-  '=GV0VRP' => '64,381',
-  '=GV1BAN' => '64,381',
-  '=GV1BZT' => '62',
-  '=GV1FKY' => '66',
-  '=GV1IOT' => '66',
-  '=GV1JFV' => '66',
-  '=GV1NBW' => '66',
-  '=GV1YQM' => '66',
-  '=GV3ATZ' => '66',
-  '=GV3EEW' => '64,381',
-  '=GV3JIJ' => '64,381',
-  '=GV3KVD' => '62',
-  '=GV3NHQ' => '64,381',
-  '=GV3NIG' => '64,381',
-  '=GV3NKG' => '64,381',
-  '=GV3NNZ' => '64,381',
-  '=GV3PIP' => '64,381',
-  '=GV3SG' => '62',
-  '=GV3TJE/P' => '66',
-  '=GV3ULP' => '64,381',
-  '=GV3UOF' => '66',
-  '=GV3VTB' => '64,381',
-  '=GV3WEZ' => '66',
-  '=GV3XJQ' => '66',
-  '=GV3XQJ' => '66',
-  '=GV3YEO' => '61',
-  '=GV4BKG' => '66',
-  '=GV4BLO' => '64,381',
-  '=GV4BRS' => '66',
-  '=GV4CQZ' => '66',
-  '=GV4EMX' => '64,381',
-  '=GV4FUE' => '62',
-  '=GV4GUH' => '62',
-  '=GV4HRJ' => '64,381',
-  '=GV4ILS' => '64,381',
-  '=GV4JKR' => '66',
-  '=GV4JOJ' => '64,381',
-  '=GV4JQP' => '66',
-  '=GV4JTF' => '62',
-  '=GV4KLN' => '64,381',
-  '=GV4LVW' => '64,381',
-  '=GV4LXL' => '62',
-  '=GV4NQJ' => '66',
-  '=GV4PRB' => '64,381',
-  '=GV4PUC' => '66',
-  '=GV4SRQ' => '62',
-  '=GV4VTB' => '64,381',
-  '=GV4WVN' => '62',
-  '=GV4XQJ' => '64,381',
-  '=GV6AFB' => '61',
-  '=GV6BRC' => '66',
-  '=GV6JPC' => '66',
-  '=GV6KON' => '64,381',
-  '=GV6NKG' => '66',
-  '=GV7AXB' => '62',
-  '=GV7DHA' => '64,381',
-  '=GV7GDE' => '64,381',
-  '=GV7GMC' => '64,381',
-  '=GV7HTG' => '61',
-  '=GV7THH' => '62',
-  '=GV7UNV' => '66',
-  '=GV7VJK' => '66',
-  '=GV8AVM' => '64,381',
-  '=GV8DPV' => '64,381',
-  '=GV8IQC' => '66',
-  '=GV8LYS' => '64,381',
   '=HF0POL' => '340',
   '=HK0TU' => '329',
+  '=HZ1BO/ND' => '82,383,384',
+  '=HZ1BW/ND' => '82,383,384',
+  '=HZ1DG/ND' => '82,383,384',
+  '=HZ1HN/ND' => '82,383,384',
+  '=HZ1SK/ND' => '82,383,384',
+  '=HZ1XB/ND' => '82,383,384',
+  '=IA0MZ' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=II0IAML' => '84',
+  '=IQ0AG' => '84',
   '=IQ0AH' => '84',
   '=IQ0ID' => '84',
   '=IQ0SS' => '84',
   '=IW0HRI' => '84',
-  '=IY0GA' => '84',
   '=JD1YAA' => '330',
   '=JW9JKA' => '395',
+  '=K0CD' => '207',
   '=K0DQ' => '207',
+  '=K0EJ' => '207',
   '=K0IP' => '207',
   '=K0JJ' => '207',
   '=K0LUZ' => '207',
@@ -649,6 +549,7 @@
   '=K4BP' => '207',
   '=K4BX' => '207',
   '=K4CX' => '207',
+  '=K4D' => '113',
   '=K4DZR' => '207',
   '=K4EDI' => '207',
   '=K4EJQ' => '207',
@@ -675,6 +576,7 @@
   '=K5OA' => '207',
   '=K5RQ' => '207',
   '=K5RR' => '207',
+  '=K5RSO' => '423',
   '=K5TDN' => '423',
   '=K5VIP' => '207',
   '=K5WP' => '207',
@@ -684,7 +586,6 @@
   '=K6ND' => '207',
   '=K6RM' => '207',
   '=K6SXA' => '207',
-  '=K6TWA' => '105,418,419',
   '=K6XT' => '207',
   '=K7ABV' => '207',
   '=K7BG' => '207',
@@ -726,7 +627,6 @@
   '=K9JWV' => '207',
   '=K9MWM' => '207',
   '=K9OM' => '207',
-  '=K9PET/KC4' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=K9RS' => '207',
   '=K9SG' => '207',
   '=K9W' => '108',
@@ -736,18 +636,16 @@
   '=KA4OTB' => '207',
   '=KA4PKB' => '207',
   '=KA4R' => '207',
-  '=KA5WMF' => '105,418,419',
+  '=KA8EBL' => '105,418,419',
   '=KA8HDE' => '207',
   '=KA8Q' => '207',
   '=KB1IJU' => '113',
   '=KB1KDP' => '113',
   '=KB1NDE' => '423',
   '=KB1SHE' => '423',
-  '=KB1ZKF' => '113',
   '=KB2MMX' => '113',
   '=KB2MRY' => '105,418,419',
   '=KB2NMT' => '113',
-  '=KB2OPM' => '113',
   '=KB5EZ' => '207',
   '=KB5JC' => '207',
   '=KB5UAB' => '109',
@@ -755,15 +653,15 @@
   '=KB6EGA' => '105,418,419',
   '=KB7DEL' => '423',
   '=KB7FSC' => '207',
+  '=KB7MEU' => '105,418,419',
   '=KB7Q' => '207',
   '=KB7QKJ' => '105,418,419',
-  '=KB7QLB' => '423',
   '=KB7WUP' => '105,418,419',
   '=KB8V' => '207',
-  '=KC0DWD' => '423',
   '=KC0OKQ' => '423',
   '=KC0UUR' => '105,418,419',
   '=KC2CYJ' => '113',
+  '=KC2GVS' => '423',
   '=KC2LET' => '113',
   '=KC2MIU' => '105,418,419',
   '=KC2TE' => '113',
@@ -780,18 +678,20 @@
   '=KC4USV' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=KC4WQ' => '207',
   '=KC5DKT' => '113',
-  '=KC5QNK' => '423',
   '=KC7HNC' => '105,418,419',
+  '=KC7RXR' => '423',
   '=KC8GCR' => '207',
   '=KC9AUA' => '105,418,419',
   '=KD0IRK' => '105,418,419',
   '=KD0QLQ' => '105,418,419',
   '=KD4POJ' => '207',
   '=KD4QWO' => '105,418,419',
+  '=KD4SGB' => '112',
   '=KD5HX' => '105,418,419',
   '=KD5WEV' => '423',
   '=KD6EPD' => '105,418,419',
   '=KD7DCR' => '207',
+  '=KD7KRK' => '423',
   '=KD7TWB' => '423',
   '=KD7UAV' => '105,418,419',
   '=KD7UZG' => '105,418,419',
@@ -806,15 +706,17 @@
   '=KE3D' => '207',
   '=KE4ETY' => '207',
   '=KE4KY' => '207',
-  '=KE5DDD' => '113',
   '=KE5HHR' => '423',
   '=KE5LNG' => '113',
   '=KE6ATM' => '100',
   '=KE6CQE' => '105,418,419',
+  '=KE6CVL' => '105,418,419',
   '=KE6TCE' => '423',
   '=KE6TIS' => '105,418,419',
+  '=KE7FJA' => '105,418,419',
   '=KE7X' => '207',
   '=KE8UN' => '207',
+  '=KF4PLR' => '423',
   '=KF5AHW' => '105,418,419',
   '=KF5FJQ' => '423',
   '=KF5IBN' => '113',
@@ -840,11 +742,10 @@
   '=KG6OOB' => '105,418,419',
   '=KG6RJE' => '423',
   '=KG6RJI' => '105,418,419',
-  '=KG6SAD' => '100',
   '=KG6SDD' => '105,418,419',
+  '=KG6TAL' => '423',
   '=KG7CJI' => '105,418,419',
   '=KG9JP' => '207',
-  '=KH0WJ' => '207',
   '=KH2D' => '207',
   '=KH2RU' => '113',
   '=KH2XQ' => '112',
@@ -871,13 +772,13 @@
   '=KJ6GYD' => '105,418,419',
   '=KJ6KCJ' => '100',
   '=KJ6KRG' => '423',
-  '=KJ6LAW' => '105,418,419',
-  '=KJ6LAX' => '105,418,419',
   '=KK4BJV' => '207',
   '=KK4EEC' => '105,418,419',
   '=KK4LRE' => '423',
+  '=KK4RYG' => '423',
   '=KK6MC' => '207',
   '=KK7AV' => '100',
+  '=KK7STL' => '423',
   '=KK9A' => '207',
   '=KK9O' => '207',
   '=KL0ET' => '207',
@@ -890,13 +791,14 @@
   '=KM4JA' => '207',
   '=KM6RM' => '105,418,419',
   '=KN6ZU' => '105,418,419',
+  '=KO0Z' => '207',
   '=KO4OL' => '207',
   '=KO4PU' => '207',
   '=KO4XJ' => '207',
   '=KO6QT' => '105,418,419',
   '=KO7X' => '207',
   '=KP2Z' => '113',
-  '=KP4MM' => '207',
+  '=KP4X' => '423',
   '=KR2E' => '207',
   '=KR4F' => '207',
   '=KR4WV' => '423',
@@ -923,19 +825,12 @@
   '=KY7J' => '423',
   '=KZ1W' => '207',
   '=KZ2V' => '207',
-  '=LU1EQ/D' => '117,427,428',
-  '=LU1VOF/D' => '117,427,428',
-  '=LU1XS/O' => '117,427,428',
   '=LU1ZA' => '338',
-  '=LU2DT/D' => '117,427,428',
+  '=LU4EFC/L' => '117,427,428',
   '=LU4EJS/V' => '117,427,428',
   '=LU5DQ/D' => '117,427,428',
-  '=LU5JU/J' => '117,427,428',
-  '=LU5WT/W' => '117,427,428',
-  '=LU6DM/D' => '117,427,428',
+  '=LU5YF/V' => '117,427,428',
   '=LU6EVD/D' => '117,427,428',
-  '=LU6HBB/H' => '117,427,428',
-  '=LU6UAL/D' => '117,427,428',
   '=LU7DOT/D' => '117,427,428',
   '=LU7EO/D' => '117,427,428',
   '=LU7FM/F' => '117,427,428',
@@ -943,10 +838,9 @@
   '=LU8DY/D' => '117,427,428',
   '=LU8DZE/D' => '117,427,428',
   '=LU9BSA/H' => '117,427,428',
+  '=LU9XPA/L' => '117,427,428',
   '=LW3DG/D' => '117,427,428',
-  '=LW3DSR/D' => '117,427,428',
   '=LW4DAF/D' => '117,427,428',
-  '=LW5EOL/D' => '117,427,428',
   '=MA1FJM' => '381',
   '=MM0LSM' => '381',
   '=MM0XAU' => '381',
@@ -960,73 +854,7 @@
   '=MM6SJK' => '381',
   '=MS0ZCG' => '381',
   '=MS0ZET' => '381',
-  '=MV0AEL' => '66',
-  '=MV0ALS' => '62',
-  '=MV0ASP' => '63',
-  '=MV0BLM' => '66',
-  '=MV0DXH' => '64,381',
-  '=MV0EDX' => '66',
-  '=MV0FME' => '64,381',
-  '=MV0FMF' => '64,381',
-  '=MV0GGB' => '62',
-  '=MV0GHM' => '64,381',
-  '=MV0GWT' => '66',
-  '=MV0GXE' => '66',
-  '=MV0HAR' => '64,381',
-  '=MV0HGY/P' => '66',
-  '=MV0IML' => '66',
-  '=MV0IOU' => '62',
-  '=MV0JFC' => '62',
-  '=MV0JLC' => '62',
-  '=MV0LGS' => '64,381',
-  '=MV0LLK' => '66',
-  '=MV0MOD' => '62',
-  '=MV0MSR' => '62',
-  '=MV0MVP' => '62',
-  '=MV0NFC' => '64,381',
-  '=MV0NJS' => '64,381',
-  '=MV0PJJ' => '66',
-  '=MV0PJJ/P' => '66',
-  '=MV0RRD' => '66',
-  '=MV0SGD' => '66',
-  '=MV0SGQ' => '64,381',
-  '=MV0SGR' => '66',
-  '=MV0SJT' => '64,381',
-  '=MV0TBB' => '66',
-  '=MV0TDQ' => '66',
-  '=MV0TGO' => '62',
-  '=MV0UAA' => '66',
-  '=MV0USK' => '66',
-  '=MV0VAX' => '62',
-  '=MV0VRQ' => '66',
-  '=MV0WGM' => '62',
-  '=MV0WYN' => '66',
-  '=MV0XXW' => '64,381',
-  '=MV0ZAO' => '62',
-  '=MV1CFA' => '66',
-  '=MV1CFN' => '66',
-  '=MV1EYP/P' => '66',
-  '=MV1VOX' => '62',
-  '=MV1VTB' => '64,381',
-  '=MV3BRR' => '64,381',
-  '=MV3CVB' => '64,381',
-  '=MV3RNI' => '66',
-  '=MV3YHA' => '64,381',
-  '=MV3YLX' => '61',
-  '=MV3YMU' => '64,381',
-  '=MV5PSL' => '64,381',
-  '=MV6BJJ' => '64,381',
-  '=MV6CQN' => '66',
-  '=MV6DTE' => '62',
-  '=MV6GTY' => '62',
-  '=MV6GWR' => '66',
-  '=MV6GWR/P' => '66',
-  '=MV6KSJ' => '64,381',
-  '=MV6NIR' => '62',
-  '=MV6NRQ' => '64,381',
-  '=MV6TLG' => '62',
-  '=MV6URC' => '66',
-  '=MV6ZOL' => '66',
+  '=N0LHN' => '423',
   '=N0XCW' => '423',
   '=N1CC' => '207',
   '=N1IDP' => '105,418,419',
@@ -1040,7 +868,6 @@
   '=N2IC' => '207',
   '=N2NS' => '207',
   '=N2OPW' => '207',
-  '=N2VXF' => '113',
   '=N2WN' => '207',
   '=N3BB' => '207',
   '=N3BUO' => '207',
@@ -1057,6 +884,7 @@
   '=N4BCB' => '207',
   '=N4BCD' => '207',
   '=N4CC' => '207',
+  '=N4D' => '113',
   '=N4DW' => '207',
   '=N4FZ' => '207',
   '=N4HAI' => '207',
@@ -1107,6 +935,7 @@
   '=N8II' => '207',
   '=N8IK' => '207',
   '=N8NA' => '207',
+  '=N8OO' => '207',
   '=N8PR' => '207',
   '=N8RA' => '207',
   '=N9ADG' => '207',
@@ -1116,6 +945,7 @@
   '=N9MM' => '207',
   '=N9NB' => '207',
   '=N9NC' => '207',
+  '=N9RV' => '207',
   '=N9TX' => '207',
   '=N9UY' => '207',
   '=NA2U' => '207',
@@ -1146,55 +976,49 @@
   '=NN7A' => '207',
   '=NO2D' => '207',
   '=NO9E' => '207',
-  '=NP2B' => '207',
-  '=NP2I' => '207',
   '=NP2MR' => '207',
   '=NP3D' => '207',
   '=NP3ST' => '207',
   '=NQ3X' => '112',
   '=NQ6N' => '207',
   '=NR7DX' => '207',
+  '=NR9A' => '207',
   '=NS2X' => '207',
   '=NS4X' => '207',
   '=NU4B' => '207',
   '=NV4B' => '207',
   '=NW8U' => '207',
+  '=NW9F' => '423',
+  '=NW9H' => '423',
   '=NX1P' => '207',
   '=NY4N' => '207',
   '=NY6DX' => '207',
   '=NY7Z' => '105,418,419',
   '=OJ1ABOA' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
-  '=R01DTV' => '169,516,517,518,519',
-  '=R01DTV/2' => '171',
   '=R11QRP/8/P' => '172,523,528',
   '=R2MWO' => '171',
-  '=R55TV' => '172,523,528',
   '=R863LC' => '169,516,517,518,519',
   '=R863LK' => '169,516,517,518,519',
   '=R863LX' => '169,516,517,518,519',
   '=RA/KE5JA' => '172,523,528',
   '=RA/UR5HVR' => '172,523,528',
   '=RA/UT2LA' => '172,523,528',
-  '=RA36ZF' => '172,523,528',
-  '=RI1ANA' => '340',
   '=RI1ANF' => '340',
   '=RI1ANF/P' => '340',
   '=RI1ANP' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=RI1ANU' => '340',
-  '=RT9K/6/P' => '169,516,517,518,519',
   '=RU2FB/6/P' => '169,516,517,518,519',
   '=RU9CK/6/P' => '169,516,517,518,519',
   '=RV9CX/6/P' => '169,516,517,518,519',
+  '=RV9WMZ/9/P' => '172,523,528',
   '=RZ9DX/9/P' => '172,523,528',
   '=SV0XAN/5' => '147',
   '=SV0XCA/5' => '147',
   '=SV0XCC/9' => '148',
   '=SV2ASP/A' => '149',
-  '=TA1E/0' => '155',
-  '=TA1FA/2' => '155',
+  '=TA1BM/3' => '155',
   '=TO1A' => '59',
-  '=TO1PF' => '50,51,379,53',
-  '=TO1PF/P' => '50,51,379,53',
+  '=TO2R' => '50,51,379,53',
   '=TO2TT' => '44',
   '=TO4FM' => '46',
   '=TO5A' => '46',
@@ -1203,11 +1027,12 @@
   '=TO7A' => '46',
   '=TX5D' => '312',
   '=TX5K' => '48',
-  '=UA9UAX/9/P' => '172,523,528',
+  '=TX5RV' => '312',
   '=UE44POL' => '172,523,528',
   '=UE70SL' => '172,523,528',
   '=UE80RWW' => '169,516,517,518,519',
   '=VA2PL' => '187,543,544,545,546,547,548,549,550,551',
+  '=VE2BZO' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2CSI' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2DXY' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2EKA' => '187,543,544,545,546,547,548,549,550,551',
@@ -1216,27 +1041,29 @@
   '=VE2GSO' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2IM' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2KK' => '187,543,544,545,546,547,548,549,550,551',
-  '=VER20130912' => '187,543,544,545,546,547,548,549,550,551',
-  '=VERSION' => '250',
+  '=VER20131009' => '187,543,544,545,546,547,548,549,550,551',
+  '=VERSION' => '228',
   '=VK0IR' => '190',
+  '=VK9DAC' => '332',
   '=VP6DX' => '316',
   '=VP8ADE/B' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VP8DLM' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VP8SGK' => '337',
   '=VP8THU' => '339',
   '=VY0PW' => '187,543,544,545,546,547,548,549,550,551',
+  '=W0AIH' => '207',
   '=W0BR' => '207',
   '=W0IZ' => '207',
   '=W0PAN' => '207',
   '=W0PV' => '207',
   '=W0QQG' => '207',
+  '=W0REP' => '100',
   '=W0UCE' => '207',
   '=W0YK' => '207',
   '=W0YR' => '207',
   '=W1NN' => '207',
   '=W1RH' => '207',
   '=W1SRD' => '207',
-  '=W1WWS' => '423',
   '=W1ZD' => '207',
   '=W2OO' => '207',
   '=W2UP' => '207',
@@ -1248,6 +1075,7 @@
   '=W4BCG' => '207',
   '=W4BCU' => '207',
   '=W4BK' => '207',
+  '=W4D' => '113',
   '=W4DAN' => '207',
   '=W4DVG' => '207',
   '=W4EEH' => '207',
@@ -1259,7 +1087,6 @@
   '=W4JHC' => '207',
   '=W4JSI' => '207',
   '=W4KW' => '207',
-  '=W4L' => '113',
   '=W4LC' => '207',
   '=W4NBS' => '207',
   '=W4NI' => '207',
@@ -1271,6 +1098,7 @@
   '=W4UAL' => '207',
   '=W4UAT' => '207',
   '=W4UT' => '207',
+  '=W5BEN' => '207',
   '=W5JR' => '207',
   '=W5MX' => '207',
   '=W5NZ' => '207',
@@ -1292,10 +1120,12 @@
   '=W7IWW' => '207',
   '=W7IY' => '207',
   '=W7KAM' => '207',
+  '=W7KWS' => '105,418,419',
   '=W7PEA' => '105,418,419',
   '=W7ROS' => '423',
   '=W7RTX' => '207',
   '=W7WZ' => '207',
+  '=W8A' => '107,318',
   '=W8AKS' => '207',
   '=W8BFX' => '207',
   '=W8FJ' => '207',
@@ -1315,6 +1145,7 @@
   '=W9GE' => '207',
   '=W9KB' => '207',
   '=W9LHG' => '207',
+  '=W9MAF' => '207',
   '=W9NGA' => '207',
   '=W9PL' => '207',
   '=WA0WWW' => '207',
@@ -1325,6 +1156,7 @@
   '=WA5VGI' => '207',
   '=WA6AC' => '109',
   '=WA7PXH' => '423',
+  '=WA7USX' => '423',
   '=WA8KAN' => '207',
   '=WA8OJR' => '207',
   '=WA8QYJ' => '207',
@@ -1359,7 +1191,6 @@
   '=WG8Y' => '207',
   '=WJ9B' => '207',
   '=WL7OU' => '207',
-  '=WP2NN' => '207',
   '=WP3ME' => '207',
   '=WP4IYI' => '423',
   '=WR3O' => '207',
@@ -1373,8 +1204,8 @@
   '=WY7SS' => '207',
   '=WZ4F' => '207',
   '=WZ7I' => '207',
+  '=YU7RQ/FAIR' => '225',
   '=ZM90DX' => '239,639,640,641,642',
-  '=ZS1BAK/L' => '243,644,645,646,647,648,649',
   'A2' => '1',
   'A3' => '2',
   'A4' => '3',
@@ -6031,249 +5862,169 @@
   'UL' => '179',
   'UM' => '179',
   'UN' => '181',
-  'UN0D' => '181',
   'UN0F' => '181',
   'UN0G' => '181',
   'UN0J' => '181',
   'UN0Q' => '181',
-  'UN0V' => '181',
-  'UN1D' => '181',
   'UN1F' => '181',
   'UN1G' => '181',
   'UN1J' => '181',
   'UN1Q' => '181',
-  'UN1V' => '181',
-  'UN2D' => '181',
   'UN2F' => '181',
   'UN2G' => '181',
   'UN2J' => '181',
   'UN2Q' => '181',
-  'UN2V' => '181',
-  'UN3D' => '181',
   'UN3F' => '181',
   'UN3G' => '181',
   'UN3J' => '181',
   'UN3Q' => '181',
-  'UN3V' => '181',
-  'UN4D' => '181',
   'UN4F' => '181',
   'UN4G' => '181',
   'UN4J' => '181',
   'UN4Q' => '181',
-  'UN4V' => '181',
-  'UN5D' => '181',
   'UN5F' => '181',
   'UN5G' => '181',
   'UN5J' => '181',
   'UN5Q' => '181',
-  'UN5V' => '181',
-  'UN6D' => '181',
   'UN6F' => '181',
   'UN6G' => '181',
   'UN6J' => '181',
   'UN6Q' => '181',
-  'UN6V' => '181',
-  'UN7D' => '181',
   'UN7F' => '181',
   'UN7G' => '181',
   'UN7J' => '181',
   'UN7Q' => '181',
-  'UN7V' => '181',
-  'UN8D' => '181',
   'UN8F' => '181',
   'UN8G' => '181',
   'UN8J' => '181',
   'UN8Q' => '181',
-  'UN8V' => '181',
-  'UN9D' => '181',
   'UN9F' => '181',
   'UN9G' => '181',
   'UN9J' => '181',
   'UN9Q' => '181',
-  'UN9V' => '181',
   'UO' => '181',
-  'UO0D' => '181',
   'UO0F' => '181',
   'UO0G' => '181',
   'UO0J' => '181',
   'UO0Q' => '181',
-  'UO0V' => '181',
-  'UO1D' => '181',
   'UO1F' => '181',
   'UO1G' => '181',
   'UO1J' => '181',
   'UO1Q' => '181',
-  'UO1V' => '181',
-  'UO2D' => '181',
   'UO2F' => '181',
   'UO2G' => '181',
   'UO2J' => '181',
   'UO2Q' => '181',
-  'UO2V' => '181',
-  'UO3D' => '181',
   'UO3F' => '181',
   'UO3G' => '181',
   'UO3J' => '181',
   'UO3Q' => '181',
-  'UO3V' => '181',
-  'UO4D' => '181',
   'UO4F' => '181',
   'UO4G' => '181',
   'UO4J' => '181',
   'UO4Q' => '181',
-  'UO4V' => '181',
-  'UO5D' => '181',
   'UO5F' => '181',
   'UO5G' => '181',
   'UO5J' => '181',
   'UO5Q' => '181',
-  'UO5V' => '181',
-  'UO6D' => '181',
   'UO6F' => '181',
   'UO6G' => '181',
   'UO6J' => '181',
   'UO6Q' => '181',
-  'UO6V' => '181',
-  'UO7D' => '181',
   'UO7F' => '181',
   'UO7G' => '181',
   'UO7J' => '181',
   'UO7Q' => '181',
-  'UO7V' => '181',
-  'UO8D' => '181',
   'UO8F' => '181',
   'UO8G' => '181',
   'UO8J' => '181',
   'UO8Q' => '181',
-  'UO8V' => '181',
-  'UO9D' => '181',
   'UO9F' => '181',
   'UO9G' => '181',
   'UO9J' => '181',
   'UO9Q' => '181',
-  'UO9V' => '181',
   'UP' => '181',
-  'UP0D' => '181',
   'UP0F' => '181',
   'UP0G' => '181',
   'UP0J' => '181',
   'UP0Q' => '181',
-  'UP0V' => '181',
-  'UP1D' => '181',
   'UP1F' => '181',
   'UP1G' => '181',
   'UP1J' => '181',
   'UP1Q' => '181',
-  'UP1V' => '181',
-  'UP2D' => '181',
   'UP2F' => '181',
   'UP2G' => '181',
   'UP2J' => '181',
   'UP2Q' => '181',
-  'UP2V' => '181',
-  'UP3D' => '181',
   'UP3F' => '181',
   'UP3G' => '181',
   'UP3J' => '181',
   'UP3Q' => '181',
-  'UP3V' => '181',
-  'UP4D' => '181',
   'UP4F' => '181',
   'UP4G' => '181',
   'UP4J' => '181',
   'UP4Q' => '181',
-  'UP4V' => '181',
-  'UP5D' => '181',
   'UP5F' => '181',
   'UP5G' => '181',
   'UP5J' => '181',
   'UP5Q' => '181',
-  'UP5V' => '181',
-  'UP6D' => '181',
   'UP6F' => '181',
   'UP6G' => '181',
   'UP6J' => '181',
   'UP6Q' => '181',
-  'UP6V' => '181',
-  'UP7D' => '181',
   'UP7F' => '181',
   'UP7G' => '181',
   'UP7J' => '181',
   'UP7Q' => '181',
-  'UP7V' => '181',
-  'UP8D' => '181',
   'UP8F' => '181',
   'UP8G' => '181',
   'UP8J' => '181',
   'UP8Q' => '181',
-  'UP8V' => '181',
-  'UP9D' => '181',
   'UP9F' => '181',
   'UP9G' => '181',
   'UP9J' => '181',
   'UP9Q' => '181',
-  'UP9V' => '181',
   'UQ' => '181',
-  'UQ0D' => '181',
   'UQ0F' => '181',
   'UQ0G' => '181',
   'UQ0J' => '181',
   'UQ0Q' => '181',
-  'UQ0V' => '181',
-  'UQ1D' => '181',
   'UQ1F' => '181',
   'UQ1G' => '181',
   'UQ1J' => '181',
   'UQ1Q' => '181',
-  'UQ1V' => '181',
-  'UQ2D' => '181',
   'UQ2F' => '181',
   'UQ2G' => '181',
   'UQ2J' => '181',
   'UQ2Q' => '181',
-  'UQ2V' => '181',
-  'UQ3D' => '181',
   'UQ3F' => '181',
   'UQ3G' => '181',
   'UQ3J' => '181',
   'UQ3Q' => '181',
-  'UQ3V' => '181',
-  'UQ4D' => '181',
   'UQ4F' => '181',
   'UQ4G' => '181',
   'UQ4J' => '181',
   'UQ4Q' => '181',
-  'UQ4V' => '181',
-  'UQ5D' => '181',
   'UQ5F' => '181',
   'UQ5G' => '181',
   'UQ5J' => '181',
   'UQ5Q' => '181',
-  'UQ5V' => '181',
-  'UQ6D' => '181',
   'UQ6F' => '181',
   'UQ6G' => '181',
   'UQ6J' => '181',
   'UQ6Q' => '181',
-  'UQ6V' => '181',
-  'UQ7D' => '181',
   'UQ7F' => '181',
   'UQ7G' => '181',
   'UQ7J' => '181',
   'UQ7Q' => '181',
-  'UQ7V' => '181',
-  'UQ8D' => '181',
   'UQ8F' => '181',
   'UQ8G' => '181',
   'UQ8J' => '181',
   'UQ8Q' => '181',
-  'UQ8V' => '181',
-  'UQ9D' => '181',
   'UQ9F' => '181',
   'UQ9G' => '181',
   'UQ9J' => '181',
   'UQ9Q' => '181',
-  'UQ9V' => '181',
   'UR' => '173',
   'US' => '173',
   'UT' => '173',

diff --git a/perl/AsyncMsg.pm b/perl/AsyncMsg.pm
index c2eeaadcaf453c587da1278d9165b46542f7296f..7a62bbcc7481fed02bd9e26815e6ccda183dd01d 100644 (file)
--- a/perl/AsyncMsg.pm
+++ b/perl/AsyncMsg.pm
@@ -180,26 +180,29 @@ sub _getpost
        $conn->{_assort} = $sort;
        
        $r = $conn->connect($host, $port);
-       if ($r) {
-               dbg("Sending '$sort $path HTTP/1.0'") if isdbg('async');
-               $conn->send_later("$sort $path HTTP/1.0\n");
-
-               my $h = delete $args{Host} || $host;
-               my $u = delete $args{'User-Agent'} || "DxSpider;$main::version;$main::build;$^O;$main::mycall"; 
-               my $d = delete $args{data};
-               
-           $conn->send_later("Host: $h\n");
-               $conn->send_later("User-Agent: $u\n");
-               while (my ($k,$v) = each %args) {
-                       $conn->send_later("$k: $v\n");
-               }
-               $conn->send_later("\n$d") if defined $d;
-               $conn->send_later("\n");
-       }
        
        return $r ? $conn : undef;
 }
 
+sub _getpost_onconnect
+{
+       
+       dbg("Sending '$sort $path HTTP/1.0'") if isdbg('async');
+       $conn->send_later("$sort $path HTTP/1.0\n");
+       
+       my $h = delete $args{Host} || $host;
+       my $u = delete $args{'User-Agent'} || "DxSpider;$main::version;$main::build;$^O;$main::mycall"; 
+       my $d = delete $args{data};
+       
+       $conn->send_later("Host: $h\n");
+       $conn->send_later("User-Agent: $u\n");
+       while (my ($k,$v) = each %args) {
+               $conn->send_later("$k: $v\n");
+       }
+       $conn->send_later("\n$d") if defined $d;
+       $conn->send_later("\n");
+}
+
 sub get
 {
        my $pkg = shift;
@@ -215,6 +218,7 @@ sub post
 # do a raw connection
 #
 # Async->raw($self, <host>, <port>, [handler => CODE ref], [prefix => <string>]);
+b390vpw
 #
 # With no handler defined, everything sent by the connection will be sent to
 # the caller.
@@ -238,6 +242,20 @@ sub raw
        return $r ? $conn : undef;
 }
 
+sub _on_connect
+{
+       my $conn = shift;
+       my $handle = shift;
+       dbg("AsyncMsg: Connected $conn->{cnum} to $host $port") if isdbg('async');
+}
+
+sub _on_error
+{
+       my $conn = shift;
+       my $msg = shift;
+       dbg("AsyncMsg: ***Connect $conn->{cnum} Failed to $host $port $!") if isdbg('async');   
+}
+
 sub connect
 {
        my $conn = shift;
@@ -245,13 +263,8 @@ sub connect
        my $port = shift;
        
        # start a connection
-       my $r = $conn->SUPER::connect($host, $port);
-       if ($r) {
-               dbg("AsyncMsg: Connected $conn->{cnum} to $host $port") if isdbg('async');
-       } else {
-               dbg("AsyncMsg: ***Connect $conn->{cnum} Failed to $host $port $!") if isdbg('async');
-       }
-       
+       my $r = $conn->SUPER::connect($host, $port, on_connect => &\_on_connect);
+
        return $r;
 }
 

diff --git a/perl/Msg.pm b/perl/Msg.pm
index fadab099783cd36d42463cbb932910a515e399c1..1c86c70ddd170a3a55b093dafd82087b0a2f5dd0 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -143,7 +143,7 @@ sub _on_connect
        $conn->{peerhost} = eval { $handle->peerhost; };
        dbg((ref $conn) . " connected $conn->{cnum} to $conn->{peerhost}:$conn->{peerport}") if isdbg('connll');
        if ($conn->{on_connect}) {
-               &{$conn->{on_connect}}($conn);
+               &{$conn->{on_connect}}($conn, $handle);
        }
 }
 
@@ -155,12 +155,13 @@ sub is_connected
 }
 
 sub connect {
-    my ($pkg, $to_host, $to_port, $rproc,  %args) = @_;
+    my ($pkg, $to_host, $to_port, %args) = @_;
        my $timeout = delete $args{timeout} || $connect_timeout;
        
     # Create a connection end-point object
     my $conn = $pkg;
        unless (ref $pkg) {
+               my $rproc = delete $args{rproc}; 
                $conn = $pkg->new($rproc);
        }
        $conn->{peerhost} = $to_host;
@@ -172,7 +173,7 @@ sub connect {
        my $sock;
        $conn->{sock} = $sock = Mojo::IOLoop::Client->new;
        $sock->on(connect => sub {$conn->_on_connect($_[1])} );
-       $sock->on(error => sub {$conn->disconnect});
+       $sock->on(error => sub {&{$conn->{eproc}}($conn, $_[1]) if exists $conn->{eproc}; $conn->disconnect});
        $sock->on(close => sub {$conn->disconnect});
 
        # copy any args like on_connect, on_disconnect etc

diff --git a/perl/console.pl b/perl/console.pl
index ea46553f39acce2122c0f103f3a038e9c815f5cf..5639488874e573231c748c1824b00185e548e8b3 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -526,7 +526,7 @@ $Text::Wrap::Columns = $cols;
 my $lastmin = 0;
 
 
-$conn = IntMsg->connect($clusteraddr, $clusterport, \&rec_socket);
+$conn = IntMsg->connect($clusteraddr, $clusterport, rproc => \&rec_socket);
 $conn->{on_connect} = \&on_connect;
 $conn->{on_disconnect} = \&on_disconnect;