remove autoflush from log objects

add CTY-2410 wpxloc.raw + cty.dat

diff --git a/Changes b/Changes
index 6321bfe6d8848ea5e10f460a56c9f5efb62f4e5b..393d1f150fe02635c4b7951c57c8fabe9196a5e1 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,7 @@
 16Sep14=======================================================================
+1. Add CTY2410 wpxloc.raw + cty.dat
+2. remove autoflush from logs
+16Sep14=======================================================================
 1. Fix (now) missing error_handler
 30Aug14=======================================================================
 1. add CTY-2409 prefixes

diff --git a/data/cty.dat b/data/cty.dat
index e67a454ec5669dee070599924180f1972e93c8db..6997409f595385e60436a381128dc3c30d44aa59 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -103,9 +103,9 @@ Kuwait:                   21:  39:  AS:   29.38:   -47.38:    -3.0:  9K:
 Sierra Leone:             35:  46:  AF:    8.50:    13.25:     0.0:  9L:
     9L;
 West Malaysia:            28:  54:  AS:    3.95:  -102.23:    -8.0:  9M2:
-    9M2,9M4,9M57,9W2,9W4,=9M8DX/2;
+    9M,9W,=9M8DX/2;
 East Malaysia:            28:  54:  OC:    2.68:  -113.32:    -8.0:  9M6:
-    9M6,9M8,9M9,9W6,9W8,=9M4CBP,=9M4LHM,=9M4RSA,=9M57MS;
+    9M6,9M8,9M9,9W6,9W8,=9M4CBP,=9M4RSA,=9M51GW,=9M51SB,=9M57MS,=9M57MW;
 Nepal:                    22:  42:  AS:   27.70:   -85.33:   -5.75:  9N:
     9N;
 Dem. Rep. of the Congo:   36:  52:  AF:   -3.12:   -23.03:    -1.0:  9Q:
@@ -277,7 +277,8 @@ China:                    24:  44:  AS:   36.00:  -102.00:    -8.0:  BY:
     BZ8N[43],BZ8O[43],BZ8P[43],BZ8Q[43],BZ8R[43],BZ8S[43],BZ8T[43],BZ8U[43],
     BZ8V[43],BZ8W[43],BZ8X[43],BZ9A(24)[43],BZ9B(24)[43],BZ9C(24)[43],
     BZ9D(24)[43],BZ9E(24)[43],BZ9F(24)[43],BZ9S(23)[42],BZ9T(23)[42],
-    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42];
+    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42],=BG9XD/4,
+    =BG0GE/9(24)[43];
 Nauru:                    31:  65:  OC:   -0.52:  -166.92:   -12.0:  C2:
     C2;
 Andorra:                  14:  27:  EU:   42.58:    -1.62:    -1.0:  C3:
@@ -301,10 +302,11 @@ Juan Fernandez Islands:   12:  14:  SA:  -33.60:    78.85:     4.0:  CE0Z:
 Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
     3Y[73],AX0(39)[69],AY1Z[73],AY2Z[73],AY3Z[73],AY4Z[73],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],RI1AN(29)[69],
-    VI0(39)[69],VK0(39)[69],ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],
-    =8J1RL(39)[67],=D8A(30)[71],=DP0GVN(38)[67],=DP1POL(38)[67],=KC4AAA(39),
+    FT3Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT6Y(30)[70],FT7Y(30)[70],
+    FT8Y(30)[70],LU1Z[73],LU2Z[73],LU3Z[73],LU4Z[73],LU5Z[73],LU6Z[73],
+    LU7Z[73],LU8Z[73],LU9Z[73],RI1AN(29)[69],VI0(39)[69],VK0(39)[69],
+    ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],=8J1RL(39)[67],=D8A(30)[71],
+    =DP0GVN(38)[67],=DP1POL(38)[67],=IA/IZ3SUS(29)[70],=KC4AAA(39),
     =KC4AAC[73],=KC4USV(30)[71],=RI1ANC(29)[70],=RI1ANP(39)[69],=VP8ADE[73],
     =VP8ADE/B[73],=VP8DOI[73],=VP8ROT[73];
 Cuba:                     08:  11:  NA:   21.50:    80.00:     5.0:  CM:
@@ -350,11 +352,11 @@ Bosnia-Herzegovina:       15:  28:  EU:   44.32:   -17.57:    -1.0:  E7:
 Spain:                    14:  37:  EU:   40.37:     4.88:    -1.0:  EA:
     AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH;
 Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
-    AM06,AM6,AN06,AN6,AO06,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EB3CW/6;
+    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EA5HCC/6,=EB2GKK/6;
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
-    AM08,AM8,AN08,AN8,AO08,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8;
+    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8;
 Ceuta & Melilla:          33:  37:  AF:   35.90:     5.27:    -1.0:  EA9:
-    AM09,AM9,AN09,AN9,AO09,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9;
+    AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9;
 Ireland:                  14:  27:  EU:   53.13:     8.02:     0.0:  EI:
     EI,EJ;
 Armenia:                  21:  29:  AS:   40.40:   -44.90:    -4.0:  EK:
@@ -381,9 +383,9 @@ 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;
 Guadeloupe:               08:  11:  NA:   16.13:    61.67:     4.0:  FG:
-    FG;
+    FG,=TO10RR,=VERSION;
 Mayotte:                  39:  53:  AF:  -12.88:   -45.15:    -3.0:  FH:
-    FH;
+    FH,=TO0X;
 St. Barthelemy:           08:  11:  NA:   17.90:    62.83:     4.0:  FJ:
     FJ;
 New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
@@ -399,7 +401,7 @@ Austral Islands:          32:  63:  OC:  -23.37:   149.48:    10.0:  FO/a:
 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:
-    =FO/UT6UD;
+    =TX7G;
 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:
@@ -407,28 +409,28 @@ Reunion Island:           39:  53:  AF:  -21.12:   -55.48:    -4.0:  FR:
 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:
-    FT4G,FT5G;
+    FT0G,FT1G,FT2G,FT3G,FT4G,FT5G,FT6G,FT7G,FT8G,FT9G;
 Juan de Nova, Europa:     39:  53:  AF:  -17.05:   -42.72:    -3.0:  FT/j:
-    FT4E,FT4J,FT5E,FT5J;
+    FT0E,FT0J,FT1E,FT1J,FT2E,FT2J,FT3E,FT3J,FT4E,FT4J,FT5E,FT5J,FT6E,FT6J,
+    FT7E,FT7J,FT8E,FT8J,FT9E,FT9J;
 Tromelin Island:          39:  53:  AF:  -15.88:   -54.50:    -4.0:  FT/t:
-    FT4T,FT5T;
+    FT0T,FT1T,FT2T,FT3T,FT4T,FT5T,FT6T,FT7T,FT8T,FT9T;
 Crozet Island:            39:  68:  AF:  -46.42:   -51.75:    -5.0:  FT/w:
-    FT0W,FT1W,FT2W,FT4W,FT5W,FT8W;
+    FT0W,FT1W,FT2W,FT3W,FT4W,FT5W,FT6W,FT7W,FT8W;
 Kerguelen Islands:        39:  68:  AF:  -49.00:   -69.27:    -5.0:  FT/x:
-    FT0X,FT1X,FT2X,FT4X,FT5X,FT8X;
+    FT0X,FT1X,FT2X,FT3X,FT4X,FT5X,FT6X,FT7X,FT8X;
 Amsterdam & St. Paul Is.: 39:  68:  AF:  -37.85:   -77.53:    -5.0:  FT/z:
-    FT0Z,FT1Z,FT2Z,FT4Z,FT5Z,FT8Z;
+    FT0Z,FT1Z,FT2Z,FT3Z,FT4Z,FT5Z,FT6Z,FT7Z,FT8Z;
 Wallis & Futuna Islands:  32:  62:  OC:  -13.30:   176.20:   -12.0:  FW:
     FW,TW;
 French Guiana:            09:  12:  SA:    4.00:    53.00:     3.0:  FY:
-    FY;
+    FY,=TO1A;
 England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
-    2E,G,M;
+    2E,G,M,=2SZ;
 Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
-    2D,GD,GT,MD,MT,=GB4JDF;
+    2D,GD,GT,MD,MT;
 Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
-    2I,GI,GN,MI,MN,=GB0GPF,=GB0REL,=GB0RSL,=GB0VC,=GB2AD,=GB4CSC,=GB5BL,
-    =GB5SPD;
+    2I,GI,GN,MI,MN,=GB0GPF,=GB2AD,=GB2DCI,=GB2DMR,=GB4CSC,=GB5SPD,=GB8ROC;
 Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
     2J,GH,GJ,MH,MJ;
 Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
@@ -443,17 +445,16 @@ Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
     =MM0LSM,=MM0XAU,=MM0ZAL,=MM0ZCG,=MM1FJM,=MM3ZET,=MM5PSL,=MM6ACW,=MM6BDU,
     =MM6SJK,=MS0ZCG,=MS0ZET;
 Scotland:                 14:  27:  EU:   56.82:     4.18:     0.0:  GM:
-    2A,2M,GA,GM,GS,GZ,MA,MM,MS,MZ,=G0FBJ,=GB0BAJ,=GB0CHL,=GB0DHL,=GB0GDS,
-    =GB0GGR,=GB0NHL,=GB0NRL,=GB0SBC,=GB0SSB,=GB0TNL,=GB1NHL,=GB1OL,=GB1TAY,
-    =GB2AL,=GB2CM,=GB2GNL,=GB2LBN,=GB2LK,=GB2LT,=GB2MOF,=GB2OWM,=GB2RB,
-    =GB2SQN,=GB2ZET,=GB3ANG,=GB3LER,=GB3LER/B,=GB3ORK,=GB3ORK/B,=GB4CGS,
-    =GB4GM,=GB4LER,=GB5DHL,=GM6WRW/P;
+    2A,2M,GA,GM,GS,GZ,MA,MM,MS,MZ,=G0FBJ,=GB0CWS,=GB0GDS,=GB0GGR,=GB0NHL,
+    =GB0SBC,=GB0SSB,=GB1OL,=GB2CM,=GB2GNL,=GB2LBN,=GB2LT,=GB2MOF,=GB2NZ,
+    =GB2OWM,=GB2RB,=GB2RWW,=GB2ZET,=GB3ANG,=GB3LER,=GB3LER/B,=GB3ORK,
+    =GB3ORK/B,=GB4GM,=GB4LER,=GB5CS,=GM4WSB/P;
 Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2U,GP,GU,MP,MU;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
-    2W,GC,GW,MC,MW,=GB0BVL,=GB0CCC,=GB0DS,=GB0MPA,=GB1BGS,=GB1PGW,=GB2BEF,
-    =GB2BOM,=GB2CR,=GB2IMD,=GB2LSA,=GB2LSH,=GB2MOP,=GB2TD,=GB2WAA,=GB2WW,
-    =GB4ADU,=GB4EUL,=GB4MD,=GB4MDI,=GB4OST,=GB4SDD,=GB4WWI,=GB70BTF,=GB8MD;
+    2W,GC,GW,MC,MW,=GB0BRE,=GB0MPA,=GB0PSG,=GB0WIW,=GB1BGS,=GB1PCA,=GB2BEF,
+    =GB2BOM,=GB2CR,=GB2IMD,=GB2LSA,=GB2MOP,=GB2TD,=GB2WAA,=GB2WW,=GB4GSS,
+    =GB4MD,=GB4MDI,=GB4OST,=GB4SDD,=GB70BTF,=GB8MD;
 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:
@@ -489,14 +490,14 @@ 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,=HZ1BW/ND,=HZ1DG/ND,=HZ1SK/ND;
 Italy:                    15:  28:  EU:   42.82:   -12.58:    -1.0:  I:
     I,=4U0WFP,=4U1GSC,=4U20B,=4U4F;
 African Italy:            33:  37:  AF:   35.67:   -12.67:    -1.0:  *IG9:
-    IG9,IH9,=IY9A;
+    IG9,IH9,=II9R,=IO9Y,=IY9A;
 Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
-    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0ICH,=II0IDP,=IQ0AG,=IQ0AH,=IQ0SS,
-    =IW0HRI,=IY0GA;
+    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0IAML,=II0ICH,=II0IDP,=IQ0AG,
+    =IQ0AH,=IQ0AK,=IQ0SS,=IY0GA;
 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:
@@ -530,64 +531,64 @@ Jordan:                   20:  39:  AS:   31.18:   -36.42:    -2.0:  JY:
     JY;
 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],=AA2IL(3)[6],
-    =AA4DD(4)[8],=AA4Q(3)[6],=AA4R(4)[8],=AA4YL(4)[8],=AB4B(4)[8],
-    =AB4GG(4)[8],=AB4IQ(4)[8],=AB4KJ(4)[8],=AB5ZA(4)[6],=AB8RL(5)[8],
-    =AC4CA(4)[7],=AC4G(4)[8],=AC4M(4)[8],=AC4YD(4)[8],=AC7P(4)[7],=AC8Y(5)[8],
-    =AD1C(4)[7],=AD4EB(4)[8],=AD5OW(4)[8],=AD8J(5)[8],=AE5BR(4)[8],
-    =AE7AP(4)[6],=AF4AI(4)[8],=AF9T(4)[7],=AG1RL(3)[6],=AG1T(3)[6],
+    =AA4DD(4)[8],=AA4Q(3)[6],=AA4R(4)[8],=AA4YL(4)[8],=AB1HZ(4)[7],
+    =AB4B(4)[8],=AB4GG(4)[8],=AB4IQ(4)[8],=AB4KJ(4)[8],=AB5ZA(4)[6],
+    =AB8RL(5)[8],=AC4CA(4)[7],=AC4G(4)[8],=AC4M(4)[8],=AC4YD(4)[8],
+    =AC7P(4)[7],=AC8Y(5)[8],=AD1C(4)[7],=AD4EB(4)[8],=AD5OW(4)[8],=AD8J(5)[8],
+    =AE5BR(4)[8],=AE7AP(4)[6],=AF4AI(4)[8],=AG1RL(3)[6],=AG1T(3)[6],
     =AG3V(4)[7],=AG4W(4)[8],=AG5Z(4)[8],=AI4DB(4)[8],=AI8F(5)[8],=AI9K(4)[7],
     =AJ4A(4)[8],=AJ7G(5)[8],=AK4QU(4)[8],=AK9D(4)[7],=AL1VE(3)[6],=AL3A(3)[6],
-    =AL5M(4)[7],=AL7RF(3)[6],=K0DQ(5)[8],=K0EJ(4)[8],=K0IP(3)[6],=K0JJ(3)[6],
-    =K0LUZ(5)[8],=K0NW(3)[6],=K0PJ(4)[8],=K0SN(4)[6],=K0TQ(4)[8],=K0TV(5)[8],
-    =K0ZR(5)[8],=K1DW(4)[7],=K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],=K1VA(3)[6],
-    =K2DSW(4)[7],=K2GMY(3)[6],=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],
-    =K3WYC(3)[6],=K3YP(4)[8],=K4AB(4)[8],=K4AMC(4)[8],=K4AMQ(4)[8],
-    =K4BP(4)[8],=K4BX(4)[8],=K4CX(4)[8],=K4EDI(4)[8],=K4FT(4)[8],=K4FXN(4)[8],
-    =K4HAL(4)[8],=K4IE(4)[8],=K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],
-    =K4MGE(4)[8],=K4RO(4)[8],=K4SPO(4)[8],=K4TCG(4)[8],=K4TD(4)[8],
-    =K4UU(4)[8],=K4WI(4)[8],=K4WW(4)[8],=K4XU(3)[6],=K4YJ(4)[8],=K4ZGB(4)[8],
-    =K4ZHM(4)[8],=K5AUP(5)[8],=K5EK(5)[8],=K5GDX(4)[8],=K5KG(5)[8],
-    =K5OA(3)[6],=K5RR(3)[6],=K5VIP(5)[8],=K5WP(4)[8],=K5ZD(5)[8],=K6ND(5)[8],
-    =K6RM(5)[8],=K6SXA(4)[7],=K6XT(4)[7],=K6ZB(4)[7],=K7ABV(4)[6],=K7BG(4)[6],
-    =K7BV(5)[8],=K7CS(4)[8],=K7GM(5)[8],=K7IA(4)[7],=K7KU(4)[7],=K7OM(5)[8],
-    =K7RB(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K7VK(4)[6],=K7VU(4)[7],=K7ZYV(4)[8],
-    =K8CN(5)[8],=K8FC(5)[8],=K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8MN(5)[8],
-    =K8NYG(5)[8],=K8PO(5)[8],=K8YC(5)[8],=K9CHP(5)[8],=K9DR(4)[7],=K9DU(4)[7],
-    =K9FY(5)[8],=K9JF(3)[6],=K9JM(3)[6],=K9JWV(3)[6],=K9MK(4)[7],=K9OM(5)[8],
-    =K9OZ(4)[7],=K9QC(4)[7],=K9RS(5)[8],=K9SG(3)[6],=K9WA(4)[7],=K9WZB(3)[6],
-    =K9YC(3)[6],=KA3DRR(3)[6],=KA4OTB(4)[8],=KA4R(4)[8],=KA7PNH(4)[7],
-    =KA8HDE(4)[7],=KA8Q(5)[8],=KB5EZ(4)[8],=KB5JC(5)[8],=KB7FSC(4)[7],
-    =KB7Q(4)[6],=KB8V(5)[8],=KB9S(4)[7],=KC4HW(4)[8],=KC4SAW(4)[8],
-    =KC4TEO(4)[8],=KC4WQ(4)[8],=KC8GCR(5)[8],=KC8R(4)[7],=KD4POJ(4)[7],
-    =KD9ST(4)[7],=KE0L(4)[8],=KE1B(3)[6],=KE2VB(3)[6],=KE4ETY(4)[8],
-    =KE4KMG(4)[8],=KE4KY(4)[8],=KE5PRL(4)[8],=KE7X(4)[6],=KE8UN(5)[8],
-    =KG0F(3)[6],=KG4CUY(4)[8],=KH2D(5)[8],=KI4SP(4)[8],=KI7MT(4)[6],
-    =KJ4AOM(4)[8],=KJ4RAQ(4)[8],=KK4TE(4)[8],=KK6L(5)[8],=KK6MC(4)[7],
+    =AL5M(4)[7],=AL7RF(3)[6],=K0DQ(5)[8],=K0EJ(4)[8],=K0IP(3)[6],=K0LUZ(5)[8],
+    =K0NW(3)[6],=K0PJ(4)[8],=K0SN(4)[6],=K0TQ(4)[8],=K0TV(5)[8],=K0ZR(5)[8],
+    =K1DW(4)[7],=K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],=K2DSW(4)[7],=K2GMY(3)[6],
+    =K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],=K2VV(4)[7],=K3FIV(3)[6],=K3GP(4)[8],
+    =K3IE(4)[8],=K3PA(4)[7],=K3WA(4)[8],=K3WT(4)[7],=K3WYC(3)[6],=K3YP(4)[8],
+    =K4AB(4)[8],=K4AMC(4)[8],=K4AMQ(4)[8],=K4BP(4)[8],=K4BX(4)[8],=K4CX(4)[8],
+    =K4EDI(4)[8],=K4FT(4)[8],=K4FXN(4)[8],=K4HAL(4)[8],=K4IE(4)[8],
+    =K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],=K4MGE(4)[8],=K4RO(4)[8],
+    =K4SPO(4)[8],=K4TCG(4)[8],=K4TD(4)[8],=K4UU(4)[8],=K4WI(4)[8],=K4WW(4)[8],
+    =K4XU(3)[6],=K4YJ(4)[8],=K4ZGB(4)[8],=K4ZHM(4)[8],=K5AUP(5)[8],
+    =K5EK(5)[8],=K5GDX(4)[8],=K5KG(5)[8],=K5OA(3)[6],=K5RR(3)[6],=K5VIP(5)[8],
+    =K5WP(4)[8],=K5ZD(5)[8],=K6ND(5)[8],=K6RM(5)[8],=K6SXA(4)[7],=K6XT(4)[7],
+    =K6ZB(4)[7],=K7ABV(4)[6],=K7BG(4)[6],=K7BV(5)[8],=K7CS(4)[8],=K7GM(5)[8],
+    =K7IA(4)[7],=K7KU(4)[7],=K7OM(5)[8],=K7RB(4)[7],=K7SV(5)[8],=K7TD(4)[7],
+    =K7VK(4)[6],=K7VU(4)[7],=K7ZYV(4)[8],=K8CN(5)[8],=K8FC(5)[8],=K8GU(5)[8],
+    =K8IA(3)[6],=K8JQ(5)[8],=K8MN(5)[8],=K8NYG(5)[8],=K8PO(5)[8],=K8YC(5)[8],
+    =K9CHP(5)[8],=K9DR(4)[7],=K9DU(4)[7],=K9FY(5)[8],=K9IA(5)[8],=K9JF(3)[6],
+    =K9JM(3)[6],=K9JWV(3)[6],=K9MK(4)[7],=K9OM(5)[8],=K9OZ(4)[7],=K9QC(4)[7],
+    =K9RS(5)[8],=K9SG(3)[6],=K9WA(4)[7],=K9WZB(3)[6],=K9YC(3)[6],
+    =KA3DRR(3)[6],=KA4OTB(4)[8],=KA4R(4)[8],=KA7PNH(4)[7],=KA8HDE(4)[7],
+    =KA8Q(5)[8],=KB5EZ(4)[8],=KB5JC(5)[8],=KB7FSC(4)[7],=KB7Q(4)[6],
+    =KB8V(5)[8],=KB9S(4)[7],=KC4HW(4)[8],=KC4SAW(4)[8],=KC4TEO(4)[8],
+    =KC4WQ(4)[8],=KC8GCR(5)[8],=KC8R(4)[7],=KD4POJ(4)[7],=KD9ST(4)[7],
+    =KE0L(4)[8],=KE1B(3)[6],=KE2VB(3)[6],=KE4ETY(4)[8],=KE4KMG(4)[8],
+    =KE4KY(4)[8],=KE5PRL(4)[8],=KE7X(4)[6],=KE8UN(5)[8],=KG0F(3)[6],
+    =KG4CUY(4)[8],=KH2D(5)[8],=KI4SP(4)[8],=KI7MT(4)[6],=KJ4AOM(4)[8],
+    =KJ4LTA(4)[8],=KJ4RAQ(4)[8],=KK4TE(4)[8],=KK6L(5)[8],=KK6MC(4)[7],
     =KK9A(5)[8],=KL0ET(4)[8],=KL7HM(3)[6],=KL7QW(4)[7],=KL7WP(3)[6],
     =KL7WV(5)[8],=KM4DR(4)[7],=KM4JA(4)[8],=KM9R(3)[6],=KO0Z(4)[8],
     =KO4OL(4)[8],=KO4PU(4)[8],=KO7X(4)[7],=KO9V(5)[8],=KP4N(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],=KT3M(4)[7],=KT4RR(4)[8],=KU4A(4)[8],=KU8E(5)[8],=KV6O(4)[7],
-    =KV8S(5)[8],=KW4J(4)[8],=KW7D(4)[7],=KW7Q(4)[7],=KX2P(4)[7],=KX4WB(4)[8],
-    =KX9X(5)[8],=KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],=N0EF(4)[6],=N0FCD(4)[8],
-    =N1CC(4)[7],=N1JM(3)[6],=N1KW(4)[8],=N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],
-    =N2WN(4)[8],=N3AIU(3)[6],=N3BB(4)[7],=N3BUO(4)[7],=N3KCJ(3)[6],
-    =N3RC(4)[6],=N3ZZ(3)[6],=N4AAI(4)[8],=N4ARO(4)[8],=N4ART(4)[8],
+    =KV8S(5)[8],=KW4J(4)[8],=KW7D(4)[7],=KW7Q(4)[7],=KX2P(4)[7],=KX9X(5)[8],
+    =KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],=N0EF(4)[6],=N0FCD(4)[8],=N1CC(4)[7],
+    =N1JM(3)[6],=N1KW(4)[8],=N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],=N2WN(4)[8],
+    =N3AIU(3)[6],=N3BB(4)[7],=N3BUO(4)[7],=N3KCJ(3)[6],=N3RC(4)[6],
+    =N3ZZ(3)[6],=N4AAI(4)[8],=N4AB(4)[8],=N4ARO(4)[8],=N4ART(4)[8],
     =N4AU(4)[8],=N4BCD(4)[8],=N4DW(4)[8],=N4FNB(4)[8],=N4FZ(4)[8],
     =N4HAI(4)[8],=N4IJ(4)[7],=N4IM(4)[7],=N4IR(4)[8],=N4JF(4)[8],=N4KG(4)[8],
-    =N4KH(4)[8],=N4NA(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],=N4QS(4)[8],
-    =N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],=N4VV(4)[8],=N4WE(4)[8],
-    =N4XH(4)[8],=N4ZI(4)[8],=N4ZZ(4)[8],=N5CR(3)[6],=N5CW(4)[8],=N5IE(5)[8],
-    =N5KO(3)[6],=N5PU(4)[8],=N5SMQ(5)[8],=N5ZO(3)[6],=N6AR(5)[8],=N6BM(5)[8],
-    =N7DR(4)[7],=N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],=N7GP(3)[7],=N7IV(4)[7],
-    =N7MB(4)[8],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],=N7WY(4)[7],=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],=N8WXQ(5)[8],=N9ADG(3)[6],=N9CIQ(4)[7],
-    =N9CM(5)[8],=N9DFD(5)[8],=N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],=N9RV(4)[6],
-    =N9SB(4)[7],=N9TX(4)[7],=N9UY(5)[8],=NA2U(3)[6],=NA4C(4)[8],=NA4K(4)[8],
-    =NA5NN(4)[8],=NB0O(3)[6],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],=ND4Y(4)[8],
-    =NE4RD(4)[7],=NE4TN(4)[8],=NG7A(5)[8],=NH6Z(3)[6],=NK3L(3)[6],
+    =N4KH(4)[8],=N4KZ(4)[8],=N4NA(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],
+    =N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],=N4VV(4)[8],
+    =N4WE(4)[8],=N4XH(4)[8],=N4ZI(4)[8],=N4ZZ(4)[8],=N5CR(3)[6],=N5CW(4)[8],
+    =N5IE(5)[8],=N5KO(3)[6],=N5PU(4)[8],=N5SMQ(5)[8],=N5TOO(5)[8],=N5ZO(3)[6],
+    =N6AR(5)[8],=N6BM(5)[8],=N7DR(4)[7],=N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],
+    =N7GP(3)[7],=N7IV(4)[7],=N7MB(4)[8],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],
+    =N7WY(4)[7],=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],=N8WXQ(5)[8],=N9ADG(3)[6],
+    =N9CIQ(4)[7],=N9CM(5)[8],=N9DFD(5)[8],=N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],
+    =N9RV(4)[6],=N9SB(4)[7],=N9TX(4)[7],=N9UY(5)[8],=NA2U(3)[6],=NA4C(4)[8],
+    =NA4K(4)[8],=NA5NN(4)[8],=NB0O(3)[6],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],
+    =ND4Y(4)[8],=NE4RD(4)[7],=NE4TN(4)[8],=NF8I(5)[8],=NH6Z(3)[6],=NK3L(3)[6],
     =NL7CO(4)[7],=NL7CQ(4)[7],=NL7XM(5)[8],=NN3V(3)[6],=NN4MM(4)[8],
     =NN7A(4)[7],=NO7T(3)[7],=NO9E(5)[8],=NP2MR(5)[8],=NP3D(5)[8],=NP3K(5)[8],
     =NP3ST(5)[8],=NQ6N(5)[8],=NR7DX(4)[6],=NS2X(4)[8],=NS4X(4)[8],=NT4H(4)[8],
@@ -603,19 +604,19 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
     =W6GMT(4)[7],=W6IHG(5)[8],=W6IZT(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],
     =W6NWS(5)[8],=W6NY(5)[8],=W6RLL(3)[7],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],
     =W7KAM(4)[7],=W7KF(4)[6],=W7SE(4)[7],=W8AKS(5)[8],=W8BFX(3)[6],
-    =W8FJ(5)[8],=W8FN(4)[7],=W8HAP(5)[8],=W8HGH(5)[8],=W8HY(5)[8],=W8KA(3)[6],
+    =W8FJ(5)[8],=W8FN(4)[7],=W8HAP(5)[8],=W8HGH(5)[8],=W8KA(3)[6],
     =W8KRZ(5)[8],=W8MHW(4)[7],=W8OHT(5)[8],=W8WEJ(5)[8],=W8ZA(5)[8],
     =W9CF(3)[6],=W9DKB(4)[7],=W9FZ(4)[7],=W9GE(5)[8],=W9JA(4)[7],=W9KB(5)[8],
     =W9LHG(4)[7],=W9MAF(4)[7],=W9PL(3)[6],=W9UK(5)[8],=WA0AVL(4)[8],
-    =WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],=WA1UJU(4)[8],=WA3C(4)[8],
-    =WA5VGI(3)[6],=WA6MM(4)[7],=WA7BME(3)[7],=WA8KAN(5)[8],=WA8OJR(5)[8],
-    =WA8QYJ(5)[8],=WA8ZBT(4)[7],=WB3JFS(3)[6],=WB4KDI(4)[8],=WB4YDL(4)[8],
-    =WB4YDY(4)[8],=WB5EIN(4)[8],=WB8CQV(5)[8],=WB8EKG(5)[8],=WB8IMY(5)[8],
-    =WB8YQJ(3)[6],=WB8YYY(5)[8],=WB9G(5)[8],=WC7S(4)[7],=WD4IXD(4)[7],
-    =WD4OHD(4)[8],=WD5F(5)[8],=WE6EZ(4)[7],=WF4U(3)[6],=WF5K(4)[8],
-    =WF7T(4)[8],=WH6E(4)[8],=WJ9B(3)[6],=WL7OU(4)[7],=WM5DX(4)[8],=WQ5L(4)[8],
-    =WQ9T(4)[7],=WR3O(4)[8],=WS6K(4)[8],=WS6X(5)[8],=WS9M(5)[8],=WT5L(5)[8],
-    =WY7FD(4)[7],=WY7SS(4)[7],=WZ7I(5)[8];
+    =WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],=WA1UJU(4)[8],=WA2VYA(4)[7],
+    =WA3C(4)[8],=WA5LOU(4)[8],=WA5VGI(3)[6],=WA6MM(4)[7],=WA7BME(3)[7],
+    =WA8KAN(5)[8],=WA8OJR(5)[8],=WA8QYJ(5)[8],=WA8ZBT(4)[7],=WB3JFS(3)[6],
+    =WB4KDI(4)[8],=WB4YDL(4)[8],=WB4YDY(4)[8],=WB5EIN(4)[8],=WB8CQV(5)[8],
+    =WB8EKG(5)[8],=WB8IMY(5)[8],=WB8YQJ(3)[6],=WB8YYY(5)[8],=WB9G(5)[8],
+    =WC7S(4)[7],=WD4IXD(4)[7],=WD4OHD(4)[8],=WD5F(5)[8],=WE6EZ(4)[7],
+    =WF4U(3)[6],=WF5K(4)[8],=WF7T(4)[8],=WH6E(4)[8],=WJ9B(3)[6],=WL7OU(4)[7],
+    =WM5DX(4)[8],=WQ5L(4)[8],=WQ9T(4)[7],=WR3O(4)[8],=WS6K(4)[8],=WS6X(5)[8],
+    =WS9M(5)[8],=WT5L(5)[8],=WY7FD(4)[7],=WY7SS(4)[7],=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:
@@ -623,8 +624,7 @@ 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,=K5GUM,=KE6ATM,=KG6DX,=KG6JDX,=KG6TEZ,=KG6TWZ,=KK7AV,
-    =W0REP;
+    AH2,KH2,NH2,WH2,=KG6DX,=KG6JDX,=KG6TEZ,=KG6TWZ,=W0REP;
 Johnston Island:          31:  61:  OC:   16.72:   169.53:    10.0:  KH3:
     AH3,KH3,NH3,WH3;
 Midway Island:            31:  61:  OC:   28.20:   177.37:    11.0:  KH4:
@@ -634,13 +634,12 @@ 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:   21.15:   157.53:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AC4PJ,=K1ENT,=K1OWL,=K2GT,=K7ZAR,=K9FD,
-    =KA8EBL,=KB6EGA,=KB7MEU,=KB7UVR,=KC0UUR,=KC2MIU,=KC6HOX,=KC6SHT,=KC7ASJ,
-    =KC7DUT,=KC7I,=KC7LFM,=KD0IRK,=KD0MSD,=KD0QLR,=KD4QWO,=KD5HX,=KD5MQY,
-    =KD7SMV,=KD7WJM,=KE4RNU,=KE6AXP,=KE6EDJ,=KE6JXO,=KE6RAW,=KE7FJA,=KE7HEW,
-    =KF6MQT,=KF7GNP,=KF7TUU,=KG0XR,=KG6TFI,=KG7CVR,=KI4HCZ,=KI4NOH,=KI4YAF,
-    =KJ6QQT,=KJ6SKC,=KK6DLH,=KL1TP,=N0ZSJ,=N1IDP,=N2NL,=N3DJT,=N3QKX,=N7TSV,
-    =N7WBX,=N9SBL,=W6TDX,=W7DJK,=W7KFI,=W7NX,=W7RCR,=WB4JTT;
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AC4PJ,=AC4TJ,=K1ENT,=K1OWL,=K2GT,=K7ZAR,
+    =K9FD,=KA8EBL,=KB6EGA,=KB7MEU,=KB7UVR,=KC6HOX,=KC6SHT,=KC7ASJ,=KC7DUT,
+    =KC7I,=KC7LFM,=KD0MSD,=KD0QLR,=KD5MQY,=KD7SMV,=KD7WJM,=KE4RNU,=KE6AXP,
+    =KE6EDJ,=KE6JXO,=KE6RAW,=KE7HEW,=KF6MQT,=KF7TUU,=KG0XR,=KG6TFI,=KG7CVR,
+    =KI4HCZ,=KI4NOH,=KI4YAF,=KJ6QQT,=KJ6SKC,=KK6DLH,=KL1TP,=N0ZSJ,=N2NL,
+    =N3QKX,=N7TSV,=N7WBX,=N9SBL,=W6TDX,=W7DJK,=W7KFI,=W7NX,=W7RCR,=WB4JTT;
 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:
@@ -650,20 +649,19 @@ Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:
 Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
     AH9,KH9,NH9,WH9;
 Alaska:                   01:  01:  NA:   63.87:   153.78:     8.0:  KL:
-    AL,KL,NL,WL,=AD0FQ,=AJ4MY,=AK2OR,=K2ICW,=K5RSO,=K6GKW,=K6WBZ,=K7GRW,
-    =K7LOP,=K7ZOA,=KB0LOW,=KB1SHE,=KB1WQL,=KB7VFZ,=KB7ZVZ,=KB8SBG,=KC2GVS,
-    =KC8YIV,=KD2CTE,=KD7KRK,=KD8GEL,=KE4YLG,=KE5CVT,=KE5JTB,=KE5QDI,=KE5QDJ,
-    =KE5QDK,=KF4PLR,=KF5STO,=KF6BMF,=KF7LUA,=KF7PFT,=KG4TJS,=KG6TAL,=KH2YN,
-    =KH7BW,=KI4ERC,=KJ4IAQ,=KJ4ZWI,=KK4AMV,=KK4RYG,=KK6IUY,=KK7STL,=KY7J,
-    =N0LHN,=N0WXJ,=N2YZW,=N6SPP,=N7UTV,=N7ZYS,=N8ZPO,=NW9F,=W0RWS,=W5MQS,
-    =W7RAZ,=W8TCX,=WA7USX,=WP4IYI;
+    AL,KL,NL,WL,=AJ4MY,=K2ICW,=K5RSO,=K6WBZ,=K7GRW,=K7ZOA,=KB0LOW,=KB1WQL,
+    =KB7VFZ,=KB7ZVZ,=KB8SBG,=KC2GVS,=KC8YIV,=KD2CTE,=KD7KRK,=KD8GEL,=KE4YLG,
+    =KE5JTB,=KE5QDI,=KE5QDJ,=KE5QDK,=KF4PLR,=KF5STO,=KF7LUA,=KG4TJS,=KG6TAL,
+    =KH2YN,=KI4ERC,=KJ4IAQ,=KJ4ZWI,=KK4AMV,=KK4RYG,=KK6IUY,=KY7J,=N0LHN,
+    =N0WXJ,=N2YZW,=N6SPP,=N7UTV,=N7ZYS,=N8ZPO,=NW9F,=W0RWS,=W5MQS,=W7RAZ,
+    =W8TCX,=WA7USX;
 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,=K9VV,=KD4SGB,=KV4BT,=KV4CF,=KV4FZ,=W4YY,=WI7C;
+    KP2,NP2,WP2,=K5TP,=K9VV,=KD4SGB,=KV4BT,=KV4CF,=KV4FZ,=W4YY,=WI7C;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
     KP3,KP4,NP3,NP4,WP3,WP4,=AF4OU,=KA2GNG,=KB1UZV,=KB3BPK,=KC2CYJ,=KC2TE,
-    =KD4TVS,=KE5LNG,=KF5IBN,=KH2RU,=KP2Z,=N1QVU,=N4LER,=NB0G,=WA2RVA;
+    =KD4TVS,=KH2RU,=KP2Z,=N1QVU,=N4LER,=NB0G,=WA2RVA;
 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:
@@ -764,10 +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,
-    =LU1HBD/D,=LU1WJY/W[16],=LU1XS/O,=LU2DVI/H,=LU2WA/W[16],=LU2XX/XP[16],
-    =LU4HK/H,=LU6DM/D,=LU6WG/W[16],=LU7DCE/D,=LU8EB/M/V[16],=LU9EV/D,
-    =LW3DKO/D,=LW3DSR/D;
+    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU1XS/O,
+    =LU2DVI/H,=LU4JHF/J,=LU5AM/D,=LU5DQ/D,=LU5HJC/X[16],=LU6EVD/D,=LU6FEC/O,
+    =LW3DG/D;
 Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -805,7 +802,7 @@ Aruba:                    09:  11:  SA:   12.53:    69.98:     4.0:  P4:
 DPR of Korea:             25:  44:  AS:   39.78:  -126.30:    -9.0:  P5:
     HM,P5,P6,P7,P8,P9;
 Netherlands:              14:  27:  EU:   52.28:    -5.47:    -1.0:  PA:
-    PA,PB,PC,PD,PE,PF,PG,PH,PI,=PA14NAWAKA/J;
+    PA,PB,PC,PD,PE,PF,PG,PH,PI,=PI4LDN/L;
 Curacao:                  09:  11:  SA:   12.17:    69.00:     4.0:  PJ2:
     PJ2;
 Bonaire:                  09:  11:  SA:   12.20:    68.25:     4.0:  PJ4:
@@ -876,9 +873,9 @@ 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,=TA1AYR/6;
+    TA,TB,TC,YM,=TA1AYR/6,=TA1BZ/2,=TA1FA/2;
 European Turkey:          20:  39:  EU:   41.02:   -28.97:    -2.0:  *TA1:
-    TA1,TB1,TC1,YM1;
+    TA1,TB1,TC1,YM1,=TA2AKG/1,=TA6CQ/1;
 Iceland:                  40:  17:  EU:   64.80:    18.73:     0.0:  TF:
     TF;
 Guatemala:                07:  11:  NA:   15.50:    90.30:     6.0:  TG:
@@ -971,17 +968,17 @@ 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)[20],UH9F(17)[30],UH9G(17)[30],UH9X(17)[20],UI1N[19],UI1O[19],
     UI1P[20],UI1Z[19],UI4H[30],UI4I[30],UI4W[30],UI8F(17)[30],UI8G(17)[30],
-    UI8X(17)[20],UI9F(17)[30],UI9G(17)[30],UI9X(17)[20],=R0IA/3,=R85QMR,
-    =R8UT/4/P,=R9FM/1,=R9JBN/4,=R9KD/6,=RD4CBQ/9(17)[20],=RD9CX/6,=RJ4P[30],
-    =RK4PK[30],=RM4P[30],=RM4R[30],=RN0CF/6,=RQ0C/6,=RT9K/7/P,=RU9MU/1,
-    =RW0BG/3,=RW9AW/5,=RW9WJ/4[30],=RW9WJ/4/P[30],=UA0S/4,=UA4PN[30],
-    =UA4RF[30],=UA4RW[30],=UA9FIT/4,=UA9JON/6,=UB1ZBD/N[19],=UE85AGN;
+    UI8X(17)[20],UI9F(17)[30],UI9G(17)[30],UI9X(17)[20],=R85QMR,=R9KD/6,
+    =R9KW/4,=RA6ACI/9(17)[20],=RJ4P[30],=RK4PK[30],=RM4P[30],=RM4R[30],
+    =RU0ZW/3,=RU2FB/6/P,=RW9WJ/4[30],=UA0JL/6,=UA0QGM/3,=UA4PN[30],=UA4RF[30],
+    =UA4RW[30],=UA8WAA/4,=UA8WAA/5,=UA8WAA/6,=UB8JAF/3,=UE16SA(17)[30],
+    =UE16ST(17)[20],=UE85AGN;
 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,=R14CWC/2,=R22GGR,
-    =R2MWO,=RW9QA/2;
+    =R2MWO,=R310A/2;
 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,
@@ -1108,11 +1105,10 @@ 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),
-    =R14CWC/0,=R14CWC/8(17)[30],=R14CWC/9(17)[30],=R150LB(18)[32],
-    =R8OA/9/P(18)[31],=RA/KE5JA(19)[34],=RA0BA/8(17)[30],=RA1QBH/9[20],
-    =RA1ZZ/0(19)[35],=RA3AV/0(19)[35],=RA3DA/9(18)[32],=RK4PA/9[20],
-    =RN1CR/0(19)[34],=RZ37ZF,=UA3AKO/0(19)[35],=UA3DFM/9[20],
-    =UA8WAA/8(17)[30],=UA9MUY/9(18)[31],=UA9UAX/9(18)[31],=UE70Y(23)[32];
+    =R14CWC/0,=R14CWC/8(17)[30],=R14CWC/9(18)[31],=R1ZBH/0(19)[23],
+    =R2014FX(16),=RA/KE5JA(19)[34],=RA0BA/8(17)[30],=RA1QBH/9[20],
+    =RK4PA/9[20],=RN1CR/0(19)[34],=RN1NS/0(19)[34],=RZ9ON/9(18)[32],=UE16SR,
+    =UE60TDP(16),=UE60TDP/P(16);
 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:
@@ -1158,23 +1154,21 @@ 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,=VER20140830,=VA2PL(2)[4],
-    =VA3ELE/2[4],=VE2CSI(2)[4],=VE2DXY(2)[4],=VE2EKA(2)[4],=VE2ENB(2)[4],
-    =VE2EW(2)[4],=VE2FK[9],=VE2GSO(2)[4],=VE2IM(2)[4],=VE2OV/P[4],
-    =VY0PW(4)[3];
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20141013,=VA2PL(2)[4],
+    =VE2CSI(2)[4],=VE2DXY(2)[4],=VE2EKA(2)[4],=VE2ENB(2)[4],=VE2EW(2)[4],
+    =VE2FK[9],=VE2GSO(2)[4],=VE2IM(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],=VK5CE/8(29)[55],=VK5UK/8(29)[55],
-    =VK8RC/4[55];
+    VL4[55],VM4[55],VN4[55],VZ4[55];
 Heard Island:             39:  68:  AF:  -53.08:   -73.50:    -5.0:  VK0H:
     =VK0IR;
 Macquarie Island:         30:  60:  OC:  -54.60:  -158.88:   -10.0:  VK0M:
-    =AX/VK0TH;
+    =VK0MH;
 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,=VK9EC;
+    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,=VK9DLX;
+    AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L,=VK9DJ,=VK9DLX;
 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:
@@ -1183,7 +1177,7 @@ Willis Island:            30:  55:  OC:  -16.22:  -150.02:   -10.0:  VK9W:
     AX9W,AX9Z,VH9W,VH9Z,VI9W,VI9Z,VJ9W,VJ9Z,VK9W,VK9Z,VL9W,VL9Z,VM9W,VM9Z,
     VN9W,VN9Z,VZ9W,VZ9Z;
 Christmas Island:         29:  54:  OC:  -10.48:  -105.63:    -7.0:  VK9X:
-    AX9X,VH9X,VI9X,VJ9X,VK9X,VL9X,VM9X,VN9X,VZ9X,=VK9AN,=VK9EX;
+    AX9X,VH9X,VI9X,VJ9X,VK9X,VL9X,VM9X,VN9X,VZ9X,=VK9AN;
 Anguilla:                 08:  11:  NA:   18.23:    63.00:     4.0:  VP2E:
     VP2E;
 Montserrat:               08:  11:  NA:   16.75:    62.18:     4.0:  VP2M:
@@ -1286,7 +1280,7 @@ Ascension Island:         36:  66:  AF:   -7.93:    14.37:     0.0:  ZD8:
 Tristan da Cunha & Gough: 38:  66:  AF:  -37.13:    12.30:     0.0:  ZD9:
     ZD9;
 Cayman Islands:           08:  11:  NA:   19.32:    81.22:     5.0:  ZF:
-    ZF,=VERSION;
+    ZF;
 Tokelau Islands:          31:  62:  OC:   -9.40:   171.20:   -13.0:  ZK3:
     ZK3;
 New Zealand:              32:  60:  OC:  -41.83:  -173.27:   -12.0:  ZL:
@@ -1300,6 +1294,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,=ZS1CT/L,=ZS1FRC/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 b7372f9296a951f81f5248b0783c6541113390ca..39908177f22f81bd9731136d6923baf340a36a7a 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -3343,10 +3343,9 @@
   '9J' => '50',
   '9K' => '51',
   '9L' => '52',
+  '9M' => '53',
   '9M0' => '2',
   '9M2' => '53',
-  '9M4' => '53',
-  '9M57' => '53',
   '9M6' => '54',
   '9M8' => '54',
   '9M9' => '54',
@@ -3413,8 +3412,7 @@
   '9T9' => '391',
   '9U' => '57',
   '9V' => '58',
-  '9W2' => '53',
-  '9W4' => '53',
+  '9W' => '53',
   '9W6' => '54',
   '9W8' => '54',
   '9X' => '59',
@@ -3426,6 +3424,7 @@
   '=2M1ANT' => '679',
   '=2M1ASQ' => '679',
   '=2M1ODL' => '679',
+  '=2SZ' => '142',
   '=3D2AG/P' => '12',
   '=3D2C' => '11',
   '=3D2RI' => '12',
@@ -3441,15 +3440,18 @@
   '=8J1RL' => '1687,1689,1692,1694,1696,1698,1700,332,345',
   '=8N1AQ/JD1' => '335',
   '=9M4CBP' => '54',
-  '=9M4LHM' => '54',
   '=9M4RSA' => '54',
+  '=9M51GW' => '54',
+  '=9M51SB' => '54',
   '=9M57MS' => '54',
+  '=9M57MW' => '54',
   '=9M8DX/2' => '53',
   '=AA2IL' => '181',
   '=AA4DD' => '181',
   '=AA4Q' => '181',
   '=AA4R' => '181',
   '=AA4YL' => '181',
+  '=AB1HZ' => '181',
   '=AB2QH' => '182',
   '=AB4B' => '181',
   '=AB4GG' => '181',
@@ -3462,10 +3464,10 @@
   '=AC4G' => '181',
   '=AC4M' => '181',
   '=AC4PJ' => '189',
+  '=AC4TJ' => '189',
   '=AC4YD' => '181',
   '=AC7P' => '181',
   '=AC8Y' => '181',
-  '=AD0FQ' => '194',
   '=AD1C' => '181',
   '=AD4EB' => '181',
   '=AD5OW' => '181',
@@ -3475,7 +3477,6 @@
   '=AF4AI' => '181',
   '=AF4OU' => '197',
   '=AF6EO' => '182',
-  '=AF9T' => '181',
   '=AG1RL' => '181',
   '=AG1T' => '181',
   '=AG3V' => '181',
@@ -3488,65 +3489,56 @@
   '=AJ4A' => '181',
   '=AJ4MY' => '194',
   '=AJ7G' => '181',
-  '=AK2OR' => '194',
   '=AK4QU' => '181',
   '=AK9D' => '181',
   '=AL1VE' => '181',
   '=AL3A' => '181',
   '=AL5M' => '181',
   '=AL7RF' => '181',
-  '=AX/VK0TH' => '338',
+  '=BG0GE/9' => '72,404,406,408,410,412,414,416,418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,454,456,458,460,462,464',
+  '=BG9XD/4' => '72,404,406,408,410,412,414,416,418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,454,456,458,460,462,464',
   '=BS7H' => '69',
   '=C7A' => '949',
   '=D8A' => '1687,1689,1692,1694,1696,1698,1700,332,345',
   '=DP0GVN' => '1687,1689,1692,1694,1696,1698,1700,332,345',
   '=DP1POL' => '1687,1689,1692,1694,1696,1698,1700,332,345',
   '=E51WL' => '333,1702,1704',
-  '=EB3CW/6' => '102,103',
+  '=EA5HCC/6' => '102,103',
+  '=EB2GKK/6' => '102,103',
   '=FK8IK/C' => '124',
-  '=FO/UT6UD' => '129',
   '=G0FBJ' => '679',
-  '=GB0BAJ' => '146,680',
-  '=GB0BVL' => '148',
-  '=GB0CCC' => '148',
-  '=GB0CHL' => '146,680',
-  '=GB0DHL' => '146,680',
-  '=GB0DS' => '148',
+  '=GB0BRE' => '148',
+  '=GB0CWS' => '146,680',
   '=GB0GDS' => '146,680',
   '=GB0GGR' => '146,680',
   '=GB0GPF' => '144',
   '=GB0MPA' => '148',
   '=GB0NHL' => '146,680',
-  '=GB0NRL' => '146,680',
-  '=GB0REL' => '144',
-  '=GB0RSL' => '144',
+  '=GB0PSG' => '148',
   '=GB0SBC' => '146,680',
   '=GB0SSB' => '146,680',
-  '=GB0TNL' => '146,680',
-  '=GB0VC' => '144',
+  '=GB0WIW' => '148',
   '=GB1BGS' => '148',
-  '=GB1NHL' => '146,680',
   '=GB1OL' => '146,680',
-  '=GB1PGW' => '148',
-  '=GB1TAY' => '146,680',
+  '=GB1PCA' => '148',
   '=GB2AD' => '144',
-  '=GB2AL' => '146,680',
   '=GB2BEF' => '148',
   '=GB2BOM' => '148',
   '=GB2CM' => '146,680',
   '=GB2CR' => '148',
+  '=GB2DCI' => '144',
+  '=GB2DMR' => '144',
   '=GB2GNL' => '146,680',
   '=GB2IMD' => '148',
   '=GB2LBN' => '146,680',
-  '=GB2LK' => '146,680',
   '=GB2LSA' => '148',
-  '=GB2LSH' => '148',
   '=GB2LT' => '146,680',
   '=GB2MOF' => '146,680',
   '=GB2MOP' => '148',
+  '=GB2NZ' => '146,680',
   '=GB2OWM' => '146,680',
   '=GB2RB' => '146,680',
-  '=GB2SQN' => '146,680',
+  '=GB2RWW' => '146,680',
   '=GB2TD' => '148',
   '=GB2WAA' => '148',
   '=GB2WW' => '148',
@@ -3556,23 +3548,19 @@
   '=GB3LER/B' => '679',
   '=GB3ORK' => '146,680',
   '=GB3ORK/B' => '146,680',
-  '=GB4ADU' => '148',
-  '=GB4CGS' => '146,680',
   '=GB4CSC' => '144',
-  '=GB4EUL' => '148',
   '=GB4GM' => '146,680',
-  '=GB4JDF' => '143',
+  '=GB4GSS' => '148',
   '=GB4LER' => '679',
   '=GB4MD' => '148',
   '=GB4MDI' => '148',
   '=GB4OST' => '148',
   '=GB4SDD' => '148',
-  '=GB4WWI' => '148',
-  '=GB5BL' => '144',
-  '=GB5DHL' => '146,680',
+  '=GB5CS' => '146,680',
   '=GB5SPD' => '144',
   '=GB70BTF' => '148',
   '=GB8MD' => '148',
+  '=GB8ROC' => '144',
   '=GM0CXQ' => '679',
   '=GM0CYJ' => '679',
   '=GM0DJI' => '679',
@@ -3620,12 +3608,12 @@
   '=GM4SRU' => '679',
   '=GM4SSA' => '679',
   '=GM4SWU' => '679',
+  '=GM4WSB/P' => '146,680',
   '=GM4WXQ' => '679',
   '=GM4YEL' => '679',
   '=GM4ZHL' => '679',
   '=GM6RTO' => '679',
   '=GM6VZB' => '679',
-  '=GM6WRW/P' => '146,680',
   '=GM6WVI' => '679',
   '=GM6YQA' => '679',
   '=GM7AFE' => '679',
@@ -3637,12 +3625,19 @@
   '=GS3ZET' => '679',
   '=HF0POL' => '345',
   '=HK0TU' => '334',
+  '=HZ1BW/ND' => '166,770,772,774',
+  '=HZ1DG/ND' => '166,770,772,774',
+  '=HZ1SK/ND' => '166,770,772,774',
+  '=IA/IZ3SUS' => '1687,1689,1692,1694,1696,1698,1700,332,345',
+  '=II0IAML' => '168',
   '=II0ICH' => '168',
   '=II0IDP' => '168',
+  '=II9R' => '813',
+  '=IO9Y' => '813',
   '=IQ0AG' => '168',
   '=IQ0AH' => '168',
+  '=IQ0AK' => '168',
   '=IQ0SS' => '168',
-  '=IW0HRI' => '168',
   '=IY0GA' => '168',
   '=IY9A' => '813',
   '=JG8NQJ/JD1' => '335',
@@ -3650,7 +3645,6 @@
   '=K0DQ' => '181',
   '=K0EJ' => '181',
   '=K0IP' => '181',
-  '=K0JJ' => '181',
   '=K0LUZ' => '181',
   '=K0NW' => '181',
   '=K0PJ' => '181',
@@ -3664,7 +3658,6 @@
   '=K1KD' => '181',
   '=K1LT' => '181',
   '=K1OWL' => '189',
-  '=K1VA' => '181',
   '=K2DSW' => '181',
   '=K2GMY' => '181',
   '=K2GT' => '189',
@@ -3672,6 +3665,7 @@
   '=K2PO' => '181',
   '=K2RD' => '181',
   '=K2RP' => '181',
+  '=K2VV' => '181',
   '=K3FIV' => '181',
   '=K3GP' => '181',
   '=K3IE' => '181',
@@ -3709,15 +3703,14 @@
   '=K5AUP' => '181',
   '=K5EK' => '181',
   '=K5GDX' => '181',
-  '=K5GUM' => '184',
   '=K5KG' => '181',
   '=K5OA' => '181',
   '=K5RR' => '181',
   '=K5RSO' => '194',
+  '=K5TP' => '196',
   '=K5VIP' => '181',
   '=K5WP' => '181',
   '=K5ZD' => '181',
-  '=K6GKW' => '194',
   '=K6ND' => '181',
   '=K6RM' => '181',
   '=K6SXA' => '181',
@@ -3732,7 +3725,6 @@
   '=K7GRW' => '194',
   '=K7IA' => '181',
   '=K7KU' => '181',
-  '=K7LOP' => '194',
   '=K7OM' => '181',
   '=K7RB' => '181',
   '=K7SV' => '181',
@@ -3756,6 +3748,7 @@
   '=K9DU' => '181',
   '=K9FD' => '189',
   '=K9FY' => '181',
+  '=K9IA' => '181',
   '=K9JF' => '181',
   '=K9JM' => '181',
   '=K9JWV' => '181',
@@ -3778,7 +3771,6 @@
   '=KA8HDE' => '181',
   '=KA8Q' => '181',
   '=KB0LOW' => '194',
-  '=KB1SHE' => '194',
   '=KB1UZV' => '197',
   '=KB1WQL' => '194',
   '=KB3BPK' => '197',
@@ -3794,10 +3786,8 @@
   '=KB8SBG' => '194',
   '=KB8V' => '181',
   '=KB9S' => '181',
-  '=KC0UUR' => '189',
   '=KC2CYJ' => '197',
   '=KC2GVS' => '194',
-  '=KC2MIU' => '189',
   '=KC2TE' => '197',
   '=KC4AAA' => '1687,1689,1692,1694,1696,1698,1700,332,345',
   '=KC4AAC' => '1687,1689,1692,1694,1696,1698,1700,332,345',
@@ -3815,15 +3805,12 @@
   '=KC8GCR' => '181',
   '=KC8R' => '181',
   '=KC8YIV' => '194',
-  '=KD0IRK' => '189',
   '=KD0MSD' => '189',
   '=KD0QLR' => '189',
   '=KD2CTE' => '194',
   '=KD4POJ' => '181',
-  '=KD4QWO' => '189',
   '=KD4SGB' => '196',
   '=KD4TVS' => '197',
-  '=KD5HX' => '189',
   '=KD5MQY' => '189',
   '=KD7KRK' => '194',
   '=KD7SMV' => '189',
@@ -3838,30 +3825,22 @@
   '=KE4KY' => '181',
   '=KE4RNU' => '189',
   '=KE4YLG' => '194',
-  '=KE5CVT' => '194',
   '=KE5JTB' => '194',
-  '=KE5LNG' => '197',
   '=KE5PRL' => '181',
   '=KE5QDI' => '194',
   '=KE5QDJ' => '194',
   '=KE5QDK' => '194',
-  '=KE6ATM' => '184',
   '=KE6AXP' => '189',
   '=KE6EDJ' => '189',
   '=KE6JXO' => '189',
   '=KE6RAW' => '189',
-  '=KE7FJA' => '189',
   '=KE7HEW' => '189',
   '=KE7X' => '181',
   '=KE8UN' => '181',
   '=KF4PLR' => '194',
-  '=KF5IBN' => '197',
   '=KF5STO' => '194',
-  '=KF6BMF' => '194',
   '=KF6MQT' => '189',
-  '=KF7GNP' => '189',
   '=KF7LUA' => '194',
-  '=KF7PFT' => '194',
   '=KF7TUU' => '189',
   '=KG0F' => '181',
   '=KG0XR' => '189',
@@ -3877,7 +3856,6 @@
   '=KH2D' => '181',
   '=KH2RU' => '197',
   '=KH2YN' => '194',
-  '=KH7BW' => '194',
   '=KI4ERC' => '194',
   '=KI4HCZ' => '189',
   '=KI4NOH' => '189',
@@ -3886,6 +3864,7 @@
   '=KI7MT' => '181',
   '=KJ4AOM' => '181',
   '=KJ4IAQ' => '194',
+  '=KJ4LTA' => '181',
   '=KJ4RAQ' => '181',
   '=KJ4ZWI' => '194',
   '=KJ6QQT' => '189',
@@ -3897,8 +3876,6 @@
   '=KK6IUY' => '194',
   '=KK6L' => '181',
   '=KK6MC' => '181',
-  '=KK7AV' => '184',
-  '=KK7STL' => '194',
   '=KK9A' => '181',
   '=KL0ET' => '181',
   '=KL1TP' => '189',
@@ -3937,28 +3914,21 @@
   '=KW7D' => '181',
   '=KW7Q' => '181',
   '=KX2P' => '181',
-  '=KX4WB' => '181',
   '=KX9X' => '181',
   '=KY4F' => '181',
   '=KY7J' => '194',
   '=KZ1W' => '181',
   '=KZ2V' => '181',
-  '=LU1EQ/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU1HBD/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU1WJY/W' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
   '=LU1XS/O' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
   '=LU1ZA' => '346',
   '=LU2DVI/H' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU2WA/W' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU2XX/XP' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU4HK/H' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU6DM/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU6WG/W' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU7DCE/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU8EB/M/V' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LU9EV/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LW3DKO/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
-  '=LW3DSR/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
+  '=LU4JHF/J' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
+  '=LU5AM/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
+  '=LU5DQ/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
+  '=LU5HJC/X' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
+  '=LU6EVD/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
+  '=LU6FEC/O' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
+  '=LW3DG/D' => '200,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930',
   '=MA1FJM' => '679',
   '=MM0LSM' => '679',
   '=MM0XAU' => '679',
@@ -3978,7 +3948,6 @@
   '=N0WXJ' => '194',
   '=N0ZSJ' => '189',
   '=N1CC' => '181',
-  '=N1IDP' => '189',
   '=N1JM' => '181',
   '=N1KW' => '181',
   '=N1QVU' => '197',
@@ -3991,12 +3960,12 @@
   '=N3AIU' => '181',
   '=N3BB' => '181',
   '=N3BUO' => '181',
-  '=N3DJT' => '189',
   '=N3KCJ' => '181',
   '=N3QKX' => '189',
   '=N3RC' => '181',
   '=N3ZZ' => '181',
   '=N4AAI' => '181',
+  '=N4AB' => '181',
   '=N4ARO' => '181',
   '=N4ART' => '181',
   '=N4AU' => '181',
@@ -4011,6 +3980,7 @@
   '=N4JF' => '181',
   '=N4KG' => '181',
   '=N4KH' => '181',
+  '=N4KZ' => '181',
   '=N4LER' => '197',
   '=N4NA' => '181',
   '=N4NM' => '181',
@@ -4032,6 +4002,7 @@
   '=N5KO' => '181',
   '=N5PU' => '181',
   '=N5SMQ' => '181',
+  '=N5TOO' => '181',
   '=N5ZO' => '181',
   '=N6AR' => '181',
   '=N6BM' => '181',
@@ -4087,7 +4058,7 @@
   '=ND4Y' => '181',
   '=NE4RD' => '181',
   '=NE4TN' => '181',
-  '=NG7A' => '181',
+  '=NF8I' => '181',
   '=NH6Z' => '181',
   '=NH8S' => '192',
   '=NK3L' => '181',
@@ -4114,29 +4085,23 @@
   '=NX1P' => '181',
   '=NY4N' => '181',
   '=NY6DX' => '181',
-  '=PA14NAWAKA/J' => '219',
-  '=R0IA/3' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=PI4LDN/L' => '219',
   '=R14CWC/0' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
   '=R14CWC/2' => '267',
   '=R14CWC/8' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
   '=R14CWC/9' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=R150LB' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=R1ZBH/0' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=R2014FX' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
   '=R22GGR' => '267',
   '=R2MWO' => '267',
+  '=R310A/2' => '267',
   '=R85QMR' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=R8OA/9/P' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=R8UT/4/P' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=R9FM/1' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=R9JBN/4' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=R9KD/6' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=R9KW/4' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=RA/KE5JA' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
   '=RA0BA/8' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
   '=RA1QBH/9' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=RA1ZZ/0' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=RA3AV/0' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=RA3DA/9' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=RD4CBQ/9' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RD9CX/6' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=RA6ACI/9' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=RI1ANC' => '1687,1689,1692,1694,1696,1698,1700,332,345',
   '=RI1ANF' => '345',
   '=RI1ANP' => '1687,1689,1692,1694,1696,1698,1700,332,345',
@@ -4147,43 +4112,46 @@
   '=RK4PK' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=RM4P' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=RM4R' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RN0CF/6' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=RN1CR/0' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=RQ0C/6' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RT9K/7/P' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RU9MU/1' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RW0BG/3' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RW9AW/5' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RW9QA/2' => '267',
+  '=RN1NS/0' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=RU0ZW/3' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=RU2FB/6/P' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=RW9WJ/4' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RW9WJ/4/P' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=RZ37ZF' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=RZ9ON/9' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
   '=SV0XBN/9' => '243',
   '=SV0XCA/5' => '242',
   '=SV0XCC/9' => '243',
   '=SV2ASP/A' => '241',
   '=TA1AYR/6' => '252,1138,1140,1142,1144,1146,1148,1150,1152,1154,1156',
+  '=TA1BZ/2' => '252,1138,1140,1142,1144,1146,1148,1150,1152,1154,1156',
+  '=TA1FA/2' => '252,1138,1140,1142,1144,1146,1148,1150,1152,1154,1156',
+  '=TA2AKG/1' => '1139',
+  '=TA6CQ/1' => '1139',
+  '=TO0X' => '121',
+  '=TO10RR' => '120',
+  '=TO1A' => '141',
   '=TO5A' => '125',
   '=TO5T' => '125',
   '=TX4A' => '123,124',
   '=TX5K' => '128',
   '=TX5Z' => '127',
-  '=UA0S/4' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=UA3AKO/0' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=UA3DFM/9' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=TX7G' => '129',
+  '=UA0JL/6' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=UA0QGM/3' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=UA4PN' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=UA4RF' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=UA4RW' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=UA8WAA/8' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=UA9FIT/4' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=UA9JON/6' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=UA9MUY/9' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=UA9UAX/9' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
-  '=UB1ZBD/N' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
-  '=UE70Y' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=UA8WAA/4' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=UA8WAA/5' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=UA8WAA/6' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=UB8JAF/3' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=UE16SA' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=UE16SR' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=UE16ST' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
+  '=UE60TDP' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
+  '=UE60TDP/P' => '268,1285,1287,1289,1291,1293,1295,1297,1299,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347',
   '=UE85AGN' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   '=VA2PL' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
-  '=VA3ELE/2' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
   '=VE2CSI' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
   '=VE2DXY' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
   '=VE2EKA' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
@@ -4192,17 +4160,13 @@
   '=VE2FK' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
   '=VE2GSO' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
   '=VE2IM' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
-  '=VE2OV/P' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
-  '=VER20140830' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
-  '=VERSION' => '323,1607,1609,1611',
+  '=VER20141013' => '279,1471,1473,1475,1477,1479,1481,1483,1485,1487,1489,1491,1493,1495,1497,1499,1501',
+  '=VERSION' => '120',
   '=VK0IR' => '337',
-  '=VK5CE/8' => '280,1503,1505,1507,1509,1511,1513,1515,1517',
-  '=VK5UK/8' => '280,1503,1505,1507,1509,1511,1513,1515,1517',
-  '=VK8RC/4' => '280,1503,1505,1507,1509,1511,1513,1515,1517',
+  '=VK0MH' => '338',
   '=VK9AN' => '343',
+  '=VK9DJ' => '340',
   '=VK9DLX' => '340',
-  '=VK9EC' => '339',
-  '=VK9EX' => '343',
   '=VP6DX' => '287',
   '=VP8ADE' => '1687,1689,1692,1694,1696,1698,1700,332,345',
   '=VP8ADE/B' => '1687,1689,1692,1694,1696,1698,1700,332,345',
@@ -4286,7 +4250,6 @@
   '=W8FN' => '181',
   '=W8HAP' => '181',
   '=W8HGH' => '181',
-  '=W8HY' => '181',
   '=W8KA' => '181',
   '=W8KRZ' => '181',
   '=W8MHW' => '181',
@@ -4310,7 +4273,9 @@
   '=WA1PMA' => '181',
   '=WA1UJU' => '181',
   '=WA2RVA' => '197',
+  '=WA2VYA' => '181',
   '=WA3C' => '181',
+  '=WA5LOU' => '181',
   '=WA5VGI' => '181',
   '=WA6MM' => '181',
   '=WA7BME' => '181',
@@ -4345,7 +4310,6 @@
   '=WJ9B' => '181',
   '=WL7OU' => '181',
   '=WM5DX' => '181',
-  '=WP4IYI' => '194',
   '=WQ5L' => '181',
   '=WQ9T' => '181',
   '=WR3O' => '181',
@@ -4357,8 +4321,6 @@
   '=WY7SS' => '181',
   '=WZ7I' => '181',
   '=ZM90DX' => '325,1613,1615,1617,1619',
-  '=ZS1CT/L' => '330,1625,1627,1629,1631,1633,1635',
-  '=ZS1FRC/L' => '330,1625,1627,1629,1631,1633,1635',
   'A2' => '61',
   'A3' => '62',
   'A4' => '63',
@@ -4491,9 +4453,6 @@
   'AK9' => '1682,1683,1684',
   'AL' => '194',
   'AM' => '101',
-  'AM06' => '102',
-  'AM08' => '104',
-  'AM09' => '106',
   'AM1' => '593',
   'AM2' => '595',
   'AM3' => '597',
@@ -4504,9 +4463,6 @@
   'AM8' => '104',
   'AM9' => '106',
   'AN' => '101',
-  'AN06' => '102',
-  'AN08' => '104',
-  'AN09' => '106',
   'AN1' => '593',
   'AN2' => '595',
   'AN3' => '597',
@@ -4517,9 +4473,6 @@
   'AN8' => '104',
   'AN9' => '106',
   'AO' => '101',
-  'AO06' => '102',
-  'AO08' => '104',
-  'AO09' => '106',
   'AO1' => '593',
   'AO2' => '595',
   'AO3' => '597',
@@ -9290,18 +9243,38 @@
   'FT/W' => '137',
   'FT/X' => '138',
   'FT/Z' => '139',
+  'FT0E' => '673',
+  'FT0G' => '133',
+  'FT0J' => '135',
+  'FT0T' => '136',
   'FT0W' => '137',
   'FT0X' => '138',
   'FT0Y' => '1690',
   'FT0Z' => '139',
+  'FT1E' => '673',
+  'FT1G' => '133',
+  'FT1J' => '135',
+  'FT1T' => '136',
   'FT1W' => '137',
   'FT1X' => '138',
   'FT1Y' => '1690',
   'FT1Z' => '139',
+  'FT2E' => '673',
+  'FT2G' => '133',
+  'FT2J' => '135',
+  'FT2T' => '136',
   'FT2W' => '137',
   'FT2X' => '138',
   'FT2Y' => '1690',
   'FT2Z' => '139',
+  'FT3E' => '673',
+  'FT3G' => '133',
+  'FT3J' => '135',
+  'FT3T' => '136',
+  'FT3W' => '137',
+  'FT3X' => '138',
+  'FT3Y' => '1690',
+  'FT3Z' => '139',
   'FT4E' => '673',
   'FT4G' => '133',
   'FT4J' => '135',
@@ -9316,12 +9289,36 @@
   'FT5T' => '136',
   'FT5W' => '137',
   'FT5X' => '138',
-  'FT5Y' => '1690',
+  'FT5Y' => '1691',
   'FT5Z' => '139',
+  'FT6E' => '673',
+  'FT6G' => '133',
+  'FT6J' => '135',
+  'FT6T' => '136',
+  'FT6W' => '137',
+  'FT6X' => '138',
+  'FT6Y' => '1691',
+  'FT6Z' => '139',
+  'FT7E' => '673',
+  'FT7G' => '133',
+  'FT7J' => '135',
+  'FT7T' => '136',
+  'FT7W' => '137',
+  'FT7X' => '138',
+  'FT7Y' => '1691',
+  'FT7Z' => '139',
+  'FT8E' => '673',
+  'FT8G' => '133',
+  'FT8J' => '135',
+  'FT8T' => '136',
   'FT8W' => '137',
   'FT8X' => '138',
   'FT8Y' => '1691',
   'FT8Z' => '139',
+  'FT9E' => '673',
+  'FT9G' => '133',
+  'FT9J' => '135',
+  'FT9T' => '136',
   'FW' => '140,676,678',
   'FW/F' => '675',
   'FW/W' => '677',
@@ -9558,7 +9555,6 @@
   'IO7' => '789',
   'IO8' => '791',
   'IO9' => '823',
-  'IP1' => '793',
   'IQ0' => '775',
   'IQ1' => '777',
   'IQ2' => '779',
@@ -14724,7 +14720,25 @@
   'OA8' => '945',
   'OA9' => '947',
   'OB' => '204',
+  'OB1' => '931',
+  'OB2' => '933',
+  'OB3' => '935',
+  'OB4' => '937',
+  'OB5' => '939',
+  'OB6' => '941',
+  'OB7' => '943',
+  'OB8' => '945',
+  'OB9' => '947',
   'OC' => '204',
+  'OC1' => '931',
+  'OC2' => '933',
+  'OC3' => '935',
+  'OC4' => '937',
+  'OC5' => '939',
+  'OC6' => '941',
+  'OC7' => '943',
+  'OC8' => '945',
+  'OC9' => '947',
   'OD' => '205',
   'OE' => '206,950,952,954,956,958,960,962,964,966,968',
   'OE1' => '951',
@@ -14738,6 +14752,15 @@
   'OE9' => '967',
   'OF' => '207',
   'OF0' => '208',
+  'OF1' => '969',
+  'OF2' => '971',
+  'OF3' => '973',
+  'OF4' => '975',
+  'OF5' => '977',
+  'OF6' => '979',
+  'OF7' => '981',
+  'OF8' => '983',
+  'OF9' => '985',
   'OG' => '207',
   'OG0' => '208',
   'OG1' => '969',
@@ -14762,6 +14785,15 @@
   'OH9' => '985',
   'OI' => '207',
   'OI0' => '208',
+  'OI1' => '969',
+  'OI2' => '971',
+  'OI3' => '973',
+  'OI4' => '975',
+  'OI5' => '977',
+  'OI6' => '979',
+  'OI7' => '981',
+  'OI8' => '983',
+  'OI9' => '985',
   'OJ' => '207',
   'OJ0' => '209',
   'OK' => '210,988,990',
@@ -14942,7 +14974,7 @@
   'R' => '266',
   'R0' => '268',
   'R0A' => '1284',
-  'R0B' => '1284',
+  'R0B' => '1286',
   'R0C' => '1288',
   'R0D' => '1290',
   'R0E' => '1292',
@@ -15186,7 +15218,7 @@
   'R9Z' => '1346',
   'RA0' => '268',
   'RA0A' => '1284',
-  'RA0B' => '1284',
+  'RA0B' => '1286',
   'RA0C' => '1288',
   'RA0D' => '1290',
   'RA0E' => '1292',
@@ -15407,7 +15439,7 @@
   'RB9' => '268',
   'RC0' => '268',
   'RC0A' => '1284',
-  'RC0B' => '1284',
+  'RC0B' => '1286',
   'RC0C' => '1288',
   'RC0D' => '1290',
   'RC0E' => '1292',
@@ -15650,7 +15682,7 @@
   'RC9Z' => '1346',
   'RD0' => '268',
   'RD0A' => '1284',
-  'RD0B' => '1284',
+  'RD0B' => '1286',
   'RD0C' => '1288',
   'RD0D' => '1290',
   'RD0E' => '1292',
@@ -15896,7 +15928,7 @@
   'RE9' => '268',
   'RF0' => '268',
   'RF0A' => '1284',
-  'RF0B' => '1284',
+  'RF0B' => '1286',
   'RF0C' => '1288',
   'RF0D' => '1290',
   'RF0E' => '1292',
@@ -16139,7 +16171,7 @@
   'RF9Z' => '1346',
   'RG0' => '268',
   'RG0A' => '1284',
-  'RG0B' => '1284',
+  'RG0B' => '1286',
   'RG0C' => '1288',
   'RG0D' => '1290',
   'RG0E' => '1292',
@@ -16385,7 +16417,7 @@
   'RH9' => '268',
   'RI0' => '268',
   'RI0A' => '1284',
-  'RI0B' => '1284',
+  'RI0B' => '1286',
   'RI0C' => '1288',
   'RI0D' => '1290',
   'RI0E' => '1292',
@@ -16630,7 +16662,7 @@
   'RI9Z' => '1346',
   'RJ0' => '268',
   'RJ0A' => '1284',
-  'RJ0B' => '1284',
+  'RJ0B' => '1286',
   'RJ0C' => '1288',
   'RJ0D' => '1290',
   'RJ0E' => '1292',
@@ -16873,7 +16905,7 @@
   'RJ9Z' => '1346',
   'RK0' => '268',
   'RK0A' => '1284',
-  'RK0B' => '1284',
+  'RK0B' => '1286',
   'RK0C' => '1288',
   'RK0D' => '1290',
   'RK0E' => '1292',
@@ -17116,7 +17148,7 @@
   'RK9Z' => '1346',
   'RL0' => '268',
   'RL0A' => '1284',
-  'RL0B' => '1284',
+  'RL0B' => '1286',
   'RL0C' => '1288',
   'RL0D' => '1290',
   'RL0E' => '1292',
@@ -17359,7 +17391,7 @@
   'RL9Z' => '1346',
   'RM0' => '268',
   'RM0A' => '1284',
-  'RM0B' => '1284',
+  'RM0B' => '1286',
   'RM0C' => '1288',
   'RM0D' => '1290',
   'RM0E' => '1292',
@@ -17602,7 +17634,7 @@
   'RM9Z' => '1346',
   'RN0' => '268',
   'RN0A' => '1284',
-  'RN0B' => '1284',
+  'RN0B' => '1286',
   'RN0C' => '1288',
   'RN0D' => '1290',
   'RN0E' => '1292',
@@ -17845,7 +17877,7 @@
   'RN9Z' => '1346',
   'RO0' => '268',
   'RO0A' => '1284',
-  'RO0B' => '1284',
+  'RO0B' => '1286',
   'RO0C' => '1288',
   'RO0D' => '1290',
   'RO0E' => '1292',
@@ -18088,7 +18120,7 @@
   'RO9Z' => '1346',
   'RP0' => '268',
   'RP0A' => '1284',
-  'RP0B' => '1284',
+  'RP0B' => '1286',
   'RP0C' => '1288',
   'RP0D' => '1290',
   'RP0E' => '1292',
@@ -18331,7 +18363,7 @@
   'RP9Z' => '1346',
   'RQ0' => '268',
   'RQ0A' => '1284',
-  'RQ0B' => '1284',
+  'RQ0B' => '1286',
   'RQ0C' => '1288',
   'RQ0D' => '1290',
   'RQ0E' => '1292',
@@ -18574,7 +18606,7 @@
   'RQ9Z' => '1346',
   'RR0' => '268',
   'RR0A' => '1284',
-  'RR0B' => '1284',
+  'RR0B' => '1286',
   'RR0C' => '1288',
   'RR0D' => '1290',
   'RR0E' => '1292',
@@ -18822,7 +18854,7 @@
   'RS9' => '268',
   'RT0' => '268',
   'RT0A' => '1284',
-  'RT0B' => '1284',
+  'RT0B' => '1286',
   'RT0C' => '1288',
   'RT0D' => '1290',
   'RT0E' => '1292',
@@ -19065,7 +19097,7 @@
   'RT9Z' => '1346',
   'RU0' => '268',
   'RU0A' => '1284',
-  'RU0B' => '1284',
+  'RU0B' => '1286',
   'RU0C' => '1288',
   'RU0D' => '1290',
   'RU0E' => '1292',
@@ -19308,7 +19340,7 @@
   'RU9Z' => '1346',
   'RV0' => '268',
   'RV0A' => '1284',
-  'RV0B' => '1284',
+  'RV0B' => '1286',
   'RV0C' => '1288',
   'RV0D' => '1290',
   'RV0E' => '1292',
@@ -19551,7 +19583,7 @@
   'RV9Z' => '1346',
   'RW0' => '268',
   'RW0A' => '1284',
-  'RW0B' => '1284',
+  'RW0B' => '1286',
   'RW0C' => '1288',
   'RW0D' => '1290',
   'RW0E' => '1292',
@@ -19794,7 +19826,7 @@
   'RW9Z' => '1346',
   'RX0' => '268',
   'RX0A' => '1284',
-  'RX0B' => '1284',
+  'RX0B' => '1286',
   'RX0C' => '1288',
   'RX0D' => '1290',
   'RX0E' => '1292',
@@ -20037,7 +20069,7 @@
   'RX9Z' => '1346',
   'RY0' => '268',
   'RY0A' => '1284',
-  'RY0B' => '1284',
+  'RY0B' => '1286',
   'RY0C' => '1288',
   'RY0D' => '1290',
   'RY0E' => '1292',
@@ -20280,7 +20312,7 @@
   'RY9Z' => '1346',
   'RZ0' => '268',
   'RZ0A' => '1284',
-  'RZ0B' => '1284',
+  'RZ0B' => '1286',
   'RZ0C' => '1288',
   'RZ0D' => '1290',
   'RZ0E' => '1292',
@@ -20848,7 +20880,7 @@
   'U' => '266',
   'U0' => '268',
   'U0A' => '1284',
-  'U0B' => '1284',
+  'U0B' => '1286',
   'U0C' => '1288',
   'U0D' => '1290',
   'U0E' => '1292',
@@ -21091,7 +21123,7 @@
   'UA' => '266,1173,1175,1177,1179,1181,1183,1185,1187,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283',
   'UA0' => '268',
   'UA0A' => '1284',
-  'UA0B' => '1284,1286',
+  'UA0B' => '1286',
   'UA0C' => '1288',
   'UA0D' => '1290',
   'UA0E' => '1292',
@@ -21310,7 +21342,7 @@
   'UA9Z' => '1346',
   'UB0' => '268',
   'UB0A' => '1284',
-  'UB0B' => '1284',
+  'UB0B' => '1286',
   'UB0C' => '1288',
   'UB0D' => '1290',
   'UB0E' => '1292',
@@ -21528,7 +21560,7 @@
   'UB9Z' => '1346',
   'UC0' => '268',
   'UC0A' => '1284',
-  'UC0B' => '1284',
+  'UC0B' => '1286',
   'UC0C' => '1288',
   'UC0D' => '1290',
   'UC0E' => '1292',
@@ -21746,7 +21778,7 @@
   'UC9Z' => '1346',
   'UD0' => '268',
   'UD0A' => '1284',
-  'UD0B' => '1284',
+  'UD0B' => '1286',
   'UD0C' => '1288',
   'UD0D' => '1290',
   'UD0E' => '1292',
@@ -21964,7 +21996,7 @@
   'UD9Z' => '1346',
   'UE0' => '268',
   'UE0A' => '1284',
-  'UE0B' => '1284',
+  'UE0B' => '1286',
   'UE0C' => '1288',
   'UE0D' => '1290',
   'UE0E' => '1292',
@@ -22182,7 +22214,7 @@
   'UE9Z' => '1346',
   'UF0' => '268',
   'UF0A' => '1284',
-  'UF0B' => '1284',
+  'UF0B' => '1286',
   'UF0C' => '1288',
   'UF0D' => '1290',
   'UF0E' => '1292',
@@ -22400,7 +22432,7 @@
   'UF9Z' => '1346',
   'UG0' => '268',
   'UG0A' => '1284',
-  'UG0B' => '1284',
+  'UG0B' => '1286',
   'UG0C' => '1288',
   'UG0D' => '1290',
   'UG0E' => '1292',
@@ -22618,7 +22650,7 @@
   'UG9Z' => '1346',
   'UH0' => '268',
   'UH0A' => '1284',
-  'UH0B' => '1284',
+  'UH0B' => '1286',
   'UH0C' => '1288',
   'UH0D' => '1290',
   'UH0E' => '1292',
@@ -22836,7 +22868,7 @@
   'UH9Z' => '1346',
   'UI0' => '268',
   'UI0A' => '1284',
-  'UI0B' => '1284',
+  'UI0B' => '1286',
   'UI0C' => '1288',
   'UI0D' => '1290',
   'UI0E' => '1292',

diff --git a/data/wpxloc.raw b/data/wpxloc.raw
index fb05b2db750206fa188baeb606f0a2be46cff33f..dd03b5effe68f6a2b9ba516a43513703789416c1 100644 (file)
--- a/data/wpxloc.raw
+++ b/data/wpxloc.raw
@@ -1,6 +1,6 @@
 ! $Id$
 !
-! This file was created by Jim Reisert AD1C on 30 Aug 2014
+! This file was created by Jim Reisert AD1C on 13 Oct 2014
 ! See: http://www.country-files.com/dx-cluster/wpxloc/
 !
 ! Highest DXCC number is 357 ("VERSION" entity)
@@ -118,7 +118,7 @@ C4,H2,P3 Cyprus-5B                                    288 39 20  -2.00 35  0  0
 NLD Kuwait-9K                                         310 39 21  -3.00 29 23  0 N  47 23  0 E
 9L Sierra-Leone-9L                                    311 46 35   0.00  8 30  0 N  13 15  0 W @
 9M2 West-Malaysia-9M2                                 312 54 28  -8.00  3 57  0 N 102 14  0 E @
-9M4,9M57,9W2,9W4 West-Malaysia-9M2                    312 54 28  -8.00  3 57  0 N 102 14  0 E
+9M,9W West-Malaysia-9M2                               312 54 28  -8.00  3 57  0 N 102 14  0 E
 9M6 East-Malaysia-9M6                                 313 54 28  -8.00  2 41  0 N 113 19  0 E @
 9M8,9M9,9W6,9W8 East-Malaysia-9M6                     313 54 28  -8.00  2 41  0 N 113 19  0 E
 9N Nepal-9N                                           314 42 22  -5.75 27 42  0 N  85 20  0 E @
@@ -1275,16 +1275,16 @@ EA AL-CA-CO-GR-H-J-MA-SE-EA7                           34 37 14  -1.00 23 24  0
 AM7,AN7,AO7,EB7,EC7,ED7,EE7 AL-CA-CO-GR-H-J-MA-SE-EA   34 37 14  -1.00 23 24  0 N   5 59  0 W
 EF7,EG7,EH7 AL-CA-CO-GR-H-J-MA-SE-EA                   34 37 14  -1.00 23 24  0 N   5 59  0 W
 EA6 Balearic-Islands-EA6                               35 37 14  -1.00 39 36  0 N   2 57  0 E @
-AM06,AM6,AN06,AN6,AO06,AO6,EB6 Balearic-Islands-EA6    35 37 14  -1.00 39 36  0 N   2 57  0 E
-EC6,ED6,EE6,EF6,EG6,EH6 Balearic-Islands-EA6           35 37 14  -1.00 39 36  0 N   2 57  0 E
+AM6,AN6,AO6,EB6,EC6,ED6,EE6,EF6 Balearic-Islands-EA6   35 37 14  -1.00 39 36  0 N   2 57  0 E
+EG6,EH6 Balearic-Islands-EA6                           35 37 14  -1.00 39 36  0 N   2 57  0 E
 EA6 IB-EA6                                             35 37 14  -1.00 39 36  0 N   2 57  0 E @
 EA8 Canary-Islands-EA8                                 36 36 33   0.00 28  6  0 N  15 24  0 W @
-AM08,AM8,AN08,AN8,AO08,AO8,EB8 Canary-Islands-EA8      36 36 33   0.00 28  6  0 N  15 24  0 W
-EC8,ED8,EE8,EF8,EG8,EH8 Canary-Islands-EA8             36 36 33   0.00 28  6  0 N  15 24  0 W
+AM8,AN8,AO8,EB8,EC8,ED8,EE8,EF8 Canary-Islands-EA8     36 36 33   0.00 28  6  0 N  15 24  0 W
+EG8,EH8 Canary-Islands-EA8                             36 36 33   0.00 28  6  0 N  15 24  0 W
 EA8 GC-TF-EA8                                          36 36 33   0.00 28  6  0 N  15 24  0 W @
 EA9 Ceuta-Melilla-EA9                                  37 37 33  -1.00 35 54  0 N   5 16  0 W @
-AM09,AM9,AN09,AN9,AO09,AO9,EB9,EC9 Ceuta-Melilla-EA9   37 37 33  -1.00 35 54  0 N   5 16  0 W
-ED9,EE9,EF9,EG9,EH9 Ceuta-Melilla-EA9                  37 37 33  -1.00 35 54  0 N   5 16  0 W
+AM9,AN9,AO9,EB9,EC9,ED9,EE9,EF9 Ceuta-Melilla-EA9      37 37 33  -1.00 35 54  0 N   5 16  0 W
+EG9,EH9 Ceuta-Melilla-EA9                              37 37 33  -1.00 35 54  0 N   5 16  0 W
 EA9 CE-ML-EA9                                          37 37 33  -1.00 35 54  0 N   5 16  0 W @
 EA9/C Ceuta-EA9                                        37 37 33  -1.00 35 53  0 N   5 18  0 W
 EA9 Ceuta-EA9/C                                        37 37 33  -1.00 35 53  0 N   5 18  0 W
@@ -1404,27 +1404,33 @@ FR Reunion-Island-FR                                   50 53 39  -4.00 21  7  0
 FS St-Martin-FS                                        54 11  8   4.00 18  5  0 N  63  2  0 W @
 FT/G Glorioso-Islands-FT/G                             51 53 39  -4.00 11 33  0 S  47 17  0 E @
 FT Glorioso-Islands-FT/G                               51 53 39  -4.00 11 33  0 S  47 17  0 E
-FT4G,FT5G Glorioso-Islands-FT/G                        51 53 39  -4.00 11 33  0 S  47 17  0 E
+FT0G,FT1G,FT2G,FT3G,FT4G,FT5G Glorioso-Islands-FT/G    51 53 39  -4.00 11 33  0 S  47 17  0 E
+FT6G,FT7G,FT8G,FT9G Glorioso-Islands-FT/G              51 53 39  -4.00 11 33  0 S  47 17  0 E
 FT/J Juan-de-Nova-Europa-FT/J                          52 53 39  -3.00 17  3  0 S  42 43  0 E @
 FT Juan-de-Nova-Europa-FT/J                            52 53 39  -3.00 17  3  0 S  42 43  0 E
 FT/E Europa-FT/J                                       52 53 39  -3.00 22 22  0 S  40 21  0 E
 FT/J Europa-FT/E                                       52 53 39  -3.00 22 22  0 S  40 21  0 E
-FT4E,FT5E Europa-FT/J                                  52 53 39  -3.00 22 22  0 S  40 21  0 E
+FT0E,FT1E,FT2E,FT3E,FT4E,FT5E,FT6E,FT7E Europa-FT/J    52 53 39  -3.00 22 22  0 S  40 21  0 E
+FT8E,FT9E Europa-FT/J                                  52 53 39  -3.00 22 22  0 S  40 21  0 E
 FT/J Juan-de-Nova-FT/J                                 52 53 39  -3.00 17  3  0 S  42 43  0 E @
-FT4J,FT5J Juan-de-Nova-FT/J                            52 53 39  -3.00 17  3  0 S  42 43  0 E
+FT0J,FT1J,FT2J,FT3J,FT4J,FT5J,FT6J Juan-de-Nova-FT/J   52 53 39  -3.00 17  3  0 S  42 43  0 E
+FT7J,FT8J,FT9J Juan-de-Nova-FT/J                       52 53 39  -3.00 17  3  0 S  42 43  0 E
 FT/T Tromelin-Island-FT/T                              53 53 39  -4.00 15 53  0 S  54 30  0 E @
 FT Tromelin-Island-FT/T                                53 53 39  -4.00 15 53  0 S  54 30  0 E
-FT4T,FT5T Tromelin-Island-FT/T                         53 53 39  -4.00 15 53  0 S  54 30  0 E
+FT0T,FT1T,FT2T,FT3T,FT4T,FT5T Tromelin-Island-FT/T     53 53 39  -4.00 15 53  0 S  54 30  0 E
+FT6T,FT7T,FT8T,FT9T Tromelin-Island-FT/T               53 53 39  -4.00 15 53  0 S  54 30  0 E
 FT/W Crozet-Island-FT/W                                55 68 39  -5.00 46 25  0 S  51 45  0 E @
 FT Crozet-Island-FT/W                                  55 68 39  -5.00 46 25  0 S  51 45  0 E
-FT0W,FT1W,FT2W,FT4W,FT5W,FT8W Crozet-Island-FT/W       55 68 39  -5.00 46 25  0 S  51 45  0 E
+FT0W,FT1W,FT2W,FT3W,FT4W,FT5W Crozet-Island-FT/W       55 68 39  -5.00 46 25  0 S  51 45  0 E
+FT6W,FT7W,FT8W Crozet-Island-FT/W                      55 68 39  -5.00 46 25  0 S  51 45  0 E
 FT/X Kerguelen-Islands-FT/X                            56 68 39  -5.00 49  0  0 S  69 16  0 E @
 FT Kerguelen-Islands-FT/X                              56 68 39  -5.00 49  0  0 S  69 16  0 E
-FT0X,FT1X,FT2X,FT4X,FT5X,FT8X Kerguelen-Islands-FT/X   56 68 39  -5.00 49  0  0 S  69 16  0 E
+FT0X,FT1X,FT2X,FT3X,FT4X,FT5X Kerguelen-Islands-FT/X   56 68 39  -5.00 49  0  0 S  69 16  0 E
+FT6X,FT7X,FT8X Kerguelen-Islands-FT/X                  56 68 39  -5.00 49  0  0 S  69 16  0 E
 FT/Z Amsterdam-St-Paul-Is-FT/Z                         58 68 39  -5.00 37 51  0 S  77 32  0 E @
 FT Amsterdam-St-Paul-Is-FT/Z                           58 68 39  -5.00 37 51  0 S  77 32  0 E
-FT0Z,FT1Z,FT2Z,FT4Z,FT5Z Amsterdam-St-Paul-Is-FT/Z     58 68 39  -5.00 37 51  0 S  77 32  0 E
-FT8Z Amsterdam-St-Paul-Is-FT/Z                         58 68 39  -5.00 37 51  0 S  77 32  0 E
+FT0Z,FT1Z,FT2Z,FT3Z,FT4Z Amsterdam-St-Paul-Is-FT/Z     58 68 39  -5.00 37 51  0 S  77 32  0 E
+FT5Z,FT6Z,FT7Z,FT8Z Amsterdam-St-Paul-Is-FT/Z          58 68 39  -5.00 37 51  0 S  77 32  0 E
 FW Wallis-Futuna-Islands-FW                            59 62 32 -12.00 13 18  0 S 176 12  0 W @
 TW Wallis-Futuna-Islands-FW                            59 62 32 -12.00 13 18  0 S 176 12  0 W
 FW/F Hoorn-Islands-Futuna-FW                           59 62 32 -12.00 14 16  0 S 178  8  0 W
@@ -1652,7 +1658,6 @@ IQ8,IR8,IU8 Basilicata-Calabria-Campania-Molise-I      85 28 15  -1.00 40 50  0
 IW8,IZ8 Basilicata-Calabria-Campania-Molise-I          85 28 15  -1.00 40 50  0 N  14 30  0 E
 IA1 Liguria-Islands-I                                  85 28 15  -1.00 44  5  0 N   8 46  0 E
 I Liguria-Islands-IA1                                  85 28 15  -1.00 44  5  0 N   8 46  0 E
-IP1 Liguria-Islands-I                                  85 28 15  -1.00 44  5  0 N   8 46  0 E
 IA2 Lago-Maggiore-Islands-I                            85 28 15  -1.00 45 57  0 N   8 38  0 E
 I Lago-Maggiore-Islands-IA2                            85 28 15  -1.00 45 57  0 N   8 38  0 E
 IA5 Tuscan-Archipeligo-Elba-Island-I                   85 28 15  -1.00 43  7  0 N  10 36  0 E
@@ -2583,22 +2588,31 @@ OA Peru-OA                                            127 12 10   5.00 10  0  0
 4T,OB,OC Peru-OA                                      127 12 10   5.00 10  0  0 S  76  0  0 W
 OA1 Lambayeque-Plura-Tumbes-OA                        127 12 10   5.00  6 31  0 S  79 51  0 W
 OA Lambayeque-Plura-Tumbes-OA1                        127 12 10   5.00  6 31  0 S  79 51  0 W
+OB1,OC1 Lambayeque-Plura-Tumbes-OA                    127 12 10   5.00  6 31  0 S  79 51  0 W
 OA2 Cajamarca-La-Libertad-OA                          127 12 10   5.00  7  9  0 S  78 31  0 W
 OA Cajamarca-La-Libertad-OA2                          127 12 10   5.00  7  9  0 S  78 31  0 W
+OB2,OC2 Cajamarca-La-Libertad-OA                      127 12 10   5.00  7  9  0 S  78 31  0 W
 OA3 Ancash-Huanuco-OA                                 127 12 10   5.00 12  4  0 S  75 12  0 W
 OA Ancash-Huanuco-OA3                                 127 12 10   5.00 12  4  0 S  75 12  0 W
+OB3,OC3 Ancash-Huanuco-OA                             127 12 10   5.00 12  4  0 S  75 12  0 W
 OA4 Callao-Junin-Lima-Pasco-OA                        127 12 10   5.00 12  6  0 S  77  3  0 W
 OA Callao-Junin-Lima-Pasco-OA4                        127 12 10   5.00 12  6  0 S  77  3  0 W
+OB4,OC4 Callao-Junin-Lima-Pasco-OA                    127 12 10   5.00 12  6  0 S  77  3  0 W
 OA5 Apurimac-Ayacucho-Huancavelica-Ica-OA             127 12 10   5.00 13 10  0 S  74 15  0 W
 OA Apurimac-Ayacucho-Huancavelica-Ica-OA5             127 12 10   5.00 13 10  0 S  74 15  0 W
+OB5,OC5 Apurimac-Ayacucho-Huancavelica-Ica-OA         127 12 10   5.00 13 10  0 S  74 15  0 W
 OA6 Arequipa-Moquegua-Tacna-OA                        127 12 10   5.00 16 25  0 S  71 31  0 W
 OA Arequipa-Moquegua-Tacna-OA6                        127 12 10   5.00 16 25  0 S  71 31  0 W
+OB6,OC6 Arequipa-Moquegua-Tacna-OA                    127 12 10   5.00 16 25  0 S  71 31  0 W
 OA7 Cuzco-Madre-de-Dios-Puno-OA                       127 12 10   5.00 13 31  0 S  71 57  0 W
 OA Cuzco-Madre-de-Dios-Puno-OA7                       127 12 10   5.00 13 31  0 S  71 57  0 W
+OB7,OC7 Cuzco-Madre-de-Dios-Puno-OA                   127 12 10   5.00 13 31  0 S  71 57  0 W
 OA8 Loreto-Ucalall-OA                                 127 12 10   5.00  7  0  0 S  75 30  0 W
 OA Loreto-Ucalall-OA8                                 127 12 10   5.00  7  0  0 S  75 30  0 W
+OB8,OC8 Loreto-Ucalall-OA                             127 12 10   5.00  7  0  0 S  75 30  0 W
 OA9 Amazonas-San-Martin-OA                            127 12 10   5.00  6  9  0 S  76 30  0 W
 OA Amazonas-San-Martin-OA9                            127 12 10   5.00  6  9  0 S  76 30  0 W
+OB9,OC9 Amazonas-San-Martin-OA                        127 12 10   5.00  6  9  0 S  76 30  0 W
 OD Lebanon-OD                                         128 39 20  -2.00 33 50  0 N  35 50  0 E @
 OE Austria-OE                                         129 28 15  -1.00 47 20  0 N  13 20  0 E @
 4U1V Vienna-Intl-Ctr-OE                               129 28 15  -1.00 48 12  0 N  16 18  0 E
@@ -2625,31 +2639,31 @@ OH Finland-OH                                         130 18 15  -2.00 63 47  0
 OF,OG,OI,OJ Finland-OH                                130 18 15  -2.00 63 47  0 N  27  5  0 E
 OH1 Turun-Ja-Pori-OH                                  130 18 15  -2.00 60 27  0 N  22 15  0 E
 OH Turun-Ja-Pori-OH1                                  130 18 15  -2.00 60 27  0 N  22 15  0 E
-OG1 Turun-Ja-Pori-OH                                  130 18 15  -2.00 60 27  0 N  22 15  0 E
+OF1,OG1,OI1 Turun-Ja-Pori-OH                          130 18 15  -2.00 60 27  0 N  22 15  0 E
 OH2 Uudenmaa-OH                                       130 18 15  -2.00 60 14  0 N  24 47  0 E
 OH Uudenmaa-OH2                                       130 18 15  -2.00 60 14  0 N  24 47  0 E
-OG2 Uudenmaa-OH                                       130 18 15  -2.00 60 14  0 N  24 47  0 E
+OF2,OG2,OI2 Uudenmaa-OH                               130 18 15  -2.00 60 14  0 N  24 47  0 E
 OH3 Harne-OH                                          130 18 15  -2.00 61 32  0 N  23 45  0 E
 OH Harne-OH3                                          130 18 15  -2.00 61 32  0 N  23 45  0 E
-OG3 Harne-OH                                          130 18 15  -2.00 61 32  0 N  23 45  0 E
+OF3,OG3,OI3 Harne-OH                                  130 18 15  -2.00 61 32  0 N  23 45  0 E
 OH4 Mikkell-OH                                        130 18 15  -2.00 62 30  0 N  28  0  0 E
 OH Mikkell-OH4                                        130 18 15  -2.00 62 30  0 N  28  0  0 E
-OG4 Mikkell-OH                                        130 18 15  -2.00 62 30  0 N  28  0  0 E
+OF4,OG4,OI4 Mikkell-OH                                130 18 15  -2.00 62 30  0 N  28  0  0 E
 OH5 Kymi-OH                                           130 18 15  -2.00 61  0  0 N  28 12  0 E
 OH Kymi-OH5                                           130 18 15  -2.00 61  0  0 N  28 12  0 E
-OG5 Kymi-OH                                           130 18 15  -2.00 61  0  0 N  28 12  0 E
+OF5,OG5,OI5 Kymi-OH                                   130 18 15  -2.00 61  0  0 N  28 12  0 E
 OH6 Keski-Suomen-Vaasa-OH                             130 18 15  -2.00 63  0  0 N  22  0  0 E
 OH Keski-Suomen-Vaasa-OH6                             130 18 15  -2.00 63  0  0 N  22  0  0 E
-OG6 Keski-Suomen-Vaasa-OH                             130 18 15  -2.00 63  0  0 N  22  0  0 E
+OF6,OG6,OI6 Keski-Suomen-Vaasa-OH                     130 18 15  -2.00 63  0  0 N  22  0  0 E
 OH7 Kuopio-Pohjois-Karjala-OH                         130 18 15  -2.00 62 48  0 N  27 30  0 E
 OH Kuopio-Pohjois-Karjala-OH7                         130 18 15  -2.00 62 48  0 N  27 30  0 E
-OG7 Kuopio-Pohjois-Karjala-OH                         130 18 15  -2.00 62 48  0 N  27 30  0 E
+OF7,OG7,OI7 Kuopio-Pohjois-Karjala-OH                 130 18 15  -2.00 62 48  0 N  27 30  0 E
 OH8 Oulu-OH                                           130 18 15  -2.00 65 10  0 N  25 28  0 E
 OH Oulu-OH8                                           130 18 15  -2.00 65 10  0 N  25 28  0 E
-OG8 Oulu-OH                                           130 18 15  -2.00 65 10  0 N  25 28  0 E
+OF8,OG8,OI8 Oulu-OH                                   130 18 15  -2.00 65 10  0 N  25 28  0 E
 OH9 Lapi-OH                                           130 18 15  -2.00 66 30  0 N  26  0  0 E
 OH Lapi-OH9                                           130 18 15  -2.00 66 30  0 N  26  0  0 E
-OG9 Lapi-OH                                           130 18 15  -2.00 66 30  0 N  26  0  0 E
+OF9,OG9,OI9 Lapi-OH                                   130 18 15  -2.00 66 30  0 N  26  0  0 E
 OH0 Aland-Islands-OH0                                 131 18 15  -2.00 60  8  0 N  20 22  0 E @
 OF0,OG0,OI0 Aland-Islands-OH0                         131 18 15  -2.00 60  8  0 N  20 22  0 E
 OJ0 Market-Reef-OJ0                                   132 18 15  -2.00 60  0  0 N  19  0  0 E @
@@ -3921,22 +3935,23 @@ UF0,UF8,UF9,UG0,UG8,UG9,UH0,UH8 Asiatic-Russia-UA9    182 30 17  -7.00 55 53  0
 UH9,UI0,UI8,UI9 Asiatic-Russia-UA9                    182 30 17  -7.00 55 53  0 N  84  5  0 E
 UA0A Krasnoyarsky-UA9                                 182 32 18  -8.00 59 53  0 N  91 40  0 E
 UA9 Krasnoyarsky-UA0A                                 182 32 18  -8.00 59 53  0 N  91 40  0 E
-R0A,R0B,R0H,RA0A,RA0B,RA0H,RC0A Krasnoyarsky-UA9      182 32 18  -8.00 59 53  0 N  91 40  0 E
-RC0B,RC0H,RD0A,RD0B,RD0H,RF0A,RF0B Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RF0H,RG0A,RG0B,RG0H,RI0A,RI0B,RI0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RJ0A,RJ0B,RJ0H,RK0A,RK0B,RK0H,RL0A Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RL0B,RL0H,RM0A,RM0B,RM0H,RN0A,RN0B Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RN0H,RO0A,RO0B,RO0H,RP0A,RP0B,RP0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RQ0A,RQ0B,RQ0H,RR0A,RR0B,RR0H,RT0A Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RT0B,RT0H,RU0A,RU0B,RU0H,RV0A,RV0B Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RV0H,RW0A,RW0B,RW0H,RX0A,RX0B,RX0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-RY0A,RY0B,RY0H,RZ0A,RZ0B,RZ0H,U0A Krasnoyarsky-UA9    182 32 18  -8.00 59 53  0 N  91 40  0 E
-U0B,U0H,UA0B,UA0H,UB0A,UB0B,UB0H Krasnoyarsky-UA9     182 32 18  -8.00 59 53  0 N  91 40  0 E
-UC0A,UC0B,UC0H,UD0A,UD0B,UD0H,UE0A Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-UE0B,UE0H,UF0A,UF0B,UF0H,UG0A,UG0B Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
-UG0H,UH0A,UH0B,UH0H,UI0A,UI0B,UI0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+R0A,R0H,RA0A,RA0H,RC0A,RC0H,RD0A Krasnoyarsky-UA9     182 32 18  -8.00 59 53  0 N  91 40  0 E
+RD0H,RF0A,RF0H,RG0A,RG0H,RI0A,RI0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+RJ0A,RJ0H,RK0A,RK0H,RL0A,RL0H,RM0A Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+RM0H,RN0A,RN0H,RO0A,RO0H,RP0A,RP0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+RQ0A,RQ0H,RR0A,RR0H,RT0A,RT0H,RU0A Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+RU0H,RV0A,RV0H,RW0A,RW0H,RX0A,RX0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+RY0A,RY0H,RZ0A,RZ0H,U0A,U0H,UA0H Krasnoyarsky-UA9     182 32 18  -8.00 59 53  0 N  91 40  0 E
+UB0A,UB0H,UC0A,UC0H,UD0A,UD0H,UE0A Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+UE0H,UF0A,UF0H,UG0A,UG0H,UH0A,UH0H Krasnoyarsky-UA9   182 32 18  -8.00 59 53  0 N  91 40  0 E
+UI0A,UI0H Krasnoyarsky-UA9                            182 32 18  -8.00 59 53  0 N  91 40  0 E
 UA0B Taymyrsky-UA9                                    182 22 18  -8.00 69 24  0 N  86 11  0 E
 UA9 Taymyrsky-UA0B                                    182 22 18  -8.00 69 24  0 N  86 11  0 E
+R0B,RA0B,RC0B,RD0B,RF0B,RG0B,RI0B,RJ0B Taymyrsky-UA9  182 22 18  -8.00 69 24  0 N  86 11  0 E
+RK0B,RL0B,RM0B,RN0B,RO0B,RP0B,RQ0B Taymyrsky-UA9      182 22 18  -8.00 69 24  0 N  86 11  0 E
+RR0B,RT0B,RU0B,RV0B,RW0B,RX0B,RY0B Taymyrsky-UA9      182 22 18  -8.00 69 24  0 N  86 11  0 E
+RZ0B,U0B,UB0B,UC0B,UD0B,UE0B,UF0B,UG0B Taymyrsky-UA9  182 22 18  -8.00 69 24  0 N  86 11  0 E
+UH0B,UI0B Taymyrsky-UA9                               182 22 18  -8.00 69 24  0 N  86 11  0 E
 UA0C Khabarovsky-UA9                                  182 34 19 -11.00 54 48  0 N 136 50  0 E
 UA9 Khabarovsky-UA0C                                  182 34 19 -11.00 54 48  0 N 136 50  0 E
 R0C,RA0C,RC0C,RD0C,RF0C,RG0C,RI0C Khabarovsky-UA9     182 34 19 -11.00 54 48  0 N 136 50  0 E
@@ -5779,8 +5794,8 @@ LU7Z,LU8Z,LU9Z Teniente-Benjamin-Matienzo-Base-CE9    102 73 13   0.00 64 58  0
 CE9 Teniente-Benjamin-Matienzo-Base-ARG-01            102 73 13   0.00 64 58  0 S  60  4  0 W
 AX0,VI0,VK0 Douglas-Mawson-Station-CE9                102 69 39   0.00 67 36  0 S  62 52  0 E
 CE9 Douglas-Mawson-Station-AUS-04                     102 69 39   0.00 67 36  0 S  62 52  0 E
-FT0Y,FT1Y,FT2Y,FT4Y,FT5Y Dumont-D'Urville-Base-CE9    102 74 13   0.00 90  0  0 S   0  0  0 E
-FT8Y Dumont-D'Urville-Base-CE9                        102 70 30   0.00 66 39  0 S 140  0  0 E
+FT0Y,FT1Y,FT2Y,FT3Y,FT4Y Dumont-D'Urville-Base-CE9    102 74 13   0.00 90  0  0 S   0  0  0 E
+FT5Y,FT6Y,FT7Y,FT8Y Dumont-D'Urville-Base-CE9         102 70 30   0.00 66 39  0 S 140  0  0 E
 CE9 Dumont-D'Urville-Base-FRA-01                      102 70 30   0.00 66 39  0 S 140  0  0 E
 3Y Blue-Field-Base-Camp-CE9                           102 73 13   0.00 77 30  0 S  34 12  0 W
 CE9 Blue-Field-Base-Camp-NOR-01                       102 73 13   0.00 77 30  0 S  34 12  0 W

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index 0327a7c7d251913200acc69ee2e015aad9975503..ede817aa446fdae1dc89ae634488401206bc74d5 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -38,9 +38,7 @@ use Carp;
 
 use strict;
 
-use vars qw($log);
-
-our %logobj;
+use vars qw($log %logs);
 
 $log = new('log', 'dat', 'm');
 
@@ -50,16 +48,16 @@ $log = new('log', 'dat', 'm');
 sub new
 {
        my ($prefix, $suffix, $sort) = @_;
-       my $ref = {};
+       my $ref = bless {}, __PACKAGE__;
        $ref->{prefix} = "$main::data/$prefix";
        $ref->{suffix} = $suffix if $suffix;
        $ref->{sort} = $sort;
        
        # make sure the directory exists
        mkdir($ref->{prefix}, 0777) unless -e $ref->{prefix};
-       my $self = bless $ref;
-       $logobj{$self} = $self;
-       return $self;
+       $logs{$ref} = $ref;
+       
+       return $ref;
 }
 
 sub _genfn
@@ -94,7 +92,7 @@ sub open
        
        my $fh = new IO::File $self->{fn}, $mode, 0666;
        return undef if !$fh;
-       $fh->autoflush(0) if $mode ne 'r'; # make it (not) autoflushing if writable
+       $fh->autoflush(0);                      # autofluahing off
        $self->{fh} = $fh;
 
 #      print "opening $self->{fn}\n";
@@ -185,29 +183,27 @@ sub close
        delete $self->{fh};     
 }
 
-sub flush_all
-{
-       foreach my $l (values %logobj) {
-               $l->{fh}->flush if exists $l->{fh};
-       }
-}
-
 sub DESTROY
 {
        my $self = shift;
-       delete $logobj{$self};
+       delete $logs{$self};
        undef $self->{fh};                      # close the filehandle
        delete $self->{fh} if $self->{fh};
 }
 
+sub flushall
+{
+       foreach my $l (values %logs) {
+               $l->{fh}->flush if exists $l->{fh};
+       }
+}
+
 # log something in the system log 
 # this routine is exported to any module that declares DXLog
 # it takes all its args and joins them together with the unixtime writes them out as one line
 # The user is responsible for making sense of this!
 sub Log
 {
-       return unless $log;
-       
        my $t = time;
        $log->writeunix($t, join('^', $t, @_) );
 }
@@ -221,6 +217,5 @@ sub LogDbg
 sub Logclose
 {
        $log->close();
-       undef $log;
 }
 1;

diff --git a/perl/Version.pm b/perl/Version.pm
index 03c1519cb98cbae2a769b2da790972fa534cbda3..de7b071b9b4708cccda9673f3e6eea45ec78311b 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -10,7 +10,7 @@ package main;
 use vars qw($version $build $gitversion);
 
 $version = '1.57';
-$build = '42';
-$gitversion = '03e07f8';
+$build = '43';
+$gitversion = '1d33367';
 
 1;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index ab6673247fcf04c899d1756eb24766493fce7641..70b81f71d031903ea9e2862ef998d6a2f10d5c5e 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -123,7 +123,7 @@ use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
                        $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
                        $clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
                        $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
-                       $can_encode $maxconnect_user $maxconnect_node $idle_interval
+                       $can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval
                   );
 
 @inqueue = ();                                 # the main input queue, an array of hashes
@@ -138,7 +138,9 @@ $maxconnect_user = 3;                       # the maximum no of concurrent connections a user can ha
 $maxconnect_node = 0;                  # Ditto but for nodes. In either case if a new incoming connection
                                                                # takes the no of references in the routing table above these numbers
                                                                # then the connection is refused. This only affects INCOMING connections.
-$idle_interval = 0.500;                        # the wait between invocations of the main idle loop processing.
+$idle_interval = 0.500;                # the wait between invocations of the main idle loop processing.
+$log_flush_interval = 2;               # interval to wait between log flushes
+
 our $ending;                                                              # signal that we are ending;
 
 
@@ -373,7 +375,7 @@ sub idle_loop
                AGWMsg::process();
                
                Timer::handler();
-               DXLog::flush_all();
+               DXLog::flushall();
        }
 
        if (defined &Local::process) {
@@ -602,6 +604,7 @@ $script->run($main::me) if $script;
 #open(DB::OUT, "|tee /tmp/aa");
 
 my $main_loop = Mojo::IOLoop->recurring($idle_interval => \&idle_loop);
+my $log_flush_loop = Mojo::IOLoop->recurring($log_flush_interval => \&DXLog::flushall);
 
 Mojo::IOLoop->start unless Mojo::IOLoop->is_running;