add cty-1701

diff --git a/Changes b/Changes
index f7fe8c7cf0b30c6c5893801a2c1b712a3311518c..8df74d3b78fb9f4a26a4ec5a1bf7b55c7cc7d795 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
-23Nov06=======================================================================
-1. added wrapping to over length lines in console.pl.
+15Jan06=======================================================================
+1. added CTY-1701
+06Jan06=======================================================================
+1. altered blocking handling for sockets for modern perl implementations
 03Nov06=======================================================================
 1. add CTY-1609 changes
 2. add back Geo::Taf code with submitted mods

diff --git a/data/cty.dat b/data/cty.dat
index 08fa2e14ba321e0a8de8fb9d25ddac9ff1a0914c..af607faf00504933ff717481175a52d3fcc58038 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -1,7 +1,7 @@
 Sov Mil Order of Malta:   15:  28:  EU:   41.90:   -12.40:    -1.0:  1A:\r
     1A;\r
 Spratly Is.:              26:  50:  AS:    8.80:  -111.90:    -8.0:  1S:\r
-    1S,9M0,BV9S,DU0K,DX0K;\r
+    1S,9M0,BV9S,9M4SDX,DU0K,DX0JP,DX0K;\r
 Monaco:                   14:  27:  EU:   43.70:    -7.40:    -1.0:  3A:\r
     3A;\r
 Agalega & St. Brandon:    39:  53:  AF:  -10.40:   -56.60:    -4.0:  3B6:\r
@@ -182,13 +182,14 @@ Antarctica:               13:  74:  SA:  -65.00:    64.00:    -4.0:  CE9:
     ANT,AX0,FT0Y(30)[70],FT2Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],\r
     LU1Z[73],R1AN,VH0(39)[69],VI0(39)[69],VJ0(39)[69],VK0(39)[69],VL0(39)[69],\r
     VM0(39)[69],VN0(39)[69],VZ0(39)[69],ZL0(30)[71],ZL5(30)[71],ZM5(30)[71],\r
-    ZS7(38)[67],8J1RF(39)[67],8J1RL(39)[67],9V0A,CE9/VK0LD[73],DP0GVN(38)[67],\r
-    DP1POL(38)[67],EM1HO[73],EM1KGG[73],EM1U[73],EM1UC[73],IA0PS(30)[71],\r
-    II0AMZS(30)[71],IR0PS(30)[71],K2ARB/KC4(30)[71],KC4/K2ARB(30)[71],\r
-    KC4AAA(39),KC4AAC[73],KC4AAF(30)[71],KC4USB(12)[72],KC4USV(30)[71],\r
-    KC4USX(30)[71],LU4ZS[73],R1ANB(29)[73],R1ANC(29)[73],R1AND(38)[67],\r
-    R1ANN(38)[67],R1ANT(29)[69],R1ANZ(29)[73],VP8BF[73],VP8CTR,VP8DJB[73],\r
-    VP8PJ[73],VP8ROT[73],VU3BPZ(38)[67],W1MRQ/KC4(30)[71];\r
+    ZS7(38)[67],8J1RF(39)[67],8J1RL(39)[67],9V0A,CE9/R7C(30)[71],\r
+    CE9/VK0LD[73],DP0GVN(38)[67],DP1POL(38)[67],EM1HO[73],EM1KGG[73],EM1U[73],\r
+    EM1UC[73],IA0PS(30)[71],II0AMZS(30)[71],IR0PS(30)[71],K2ARB/KC4(30)[71],\r
+    K9PET/KC4,KC4/K2ARB(30)[71],KC4/R7C(39),KC4AAA(39),KC4AAC[73],\r
+    KC4AAF(30)[71],KC4USB(12)[72],KC4USV(30)[71],KC4USX(30)[71],LU4ZS[73],\r
+    R1ANB(29)[73],R1ANC(29)[73],R1AND(38)[67],R1ANN(38)[67],R1ANT(29)[69],\r
+    R1ANZ(29)[73],VP8BF[73],VP8CTR,VP8DJB[73],VP8DKF(30)[71],VP8PJ[73],\r
+    VP8ROT[73],VU3BPZ(38)[67],W1MRQ/KC4(30)[71],W3ASA/KC4,W3WKO/KC4,W3WKP/KC4;\r
 Cuba:                     08:  11:  NA:   23.10:    82.40:     5.0:  CM:\r
     CL,CM,CO,T4;\r
 Morocco:                  33:  37:  AF:   33.60:     7.50:     0.0:  CN:\r
@@ -319,8 +320,8 @@ Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:
     GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,GB400CA,GB4AAS,GB4CGW,GB4DAS,GB4GM,\r
     GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,GB4TSR,GB4ZBS,GB50ATC,GB50SWL,GB5AST,\r
     GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,GB60BBC,GB60CRB,GB60NTS,GB6MI,GB6SA,\r
-    GB6SM,GB6WW,GB700BSB,GB75GD,GB75SCP,GB75STT,GB8AYR,GB8CA,GB8CF,GB8CI,\r
-    GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,GB93AM,MM/DL6MHW;\r
+    GB6SM,GB6TAA,GB6WW,GB700BSB,GB75GD,GB75SCP,GB75STT,GB8AYR,GB8CA,GB8CF,\r
+    GB8CI,GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,GB93AM,MM/DL6MHW;\r
 Shetlands:                14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:\r
     GZ,MZ,2M1ANT,2M1ASQ,2M1ODL,GM0DJI,GM0EKM,GM0ILB,GM0MZD,GM0VFA,GM1CBQ,\r
     GM1KKI,GM1ZNR,GM3KLA,GM3STU,GM3WCH,GM3WHT,GM3XPQ,GM3ZET,GM3ZNM,GM3ZXH,\r
@@ -401,7 +402,7 @@ Japan:                    25:  45:  AS:   35.70:  -139.80:    -9.0:  JA:
     JP,JQ,JR,JS;\r
 Minami Torishima:         27:  90:  OC:   24.30:  -154.00:   -10.0:  JD/m:\r
     7J1ACH,JD1/JI7BCD,JD1BIE/JD1,JD1BIP,JD1BIU,JD1BIY,JD1BIZ,JD1BJA,JD1BJE,\r
-    JD1YAA,JD1YBJ,JE7IZM/JD1,JG8NQJ/JD1,JL1KFR/JD1,JR6TYH/JD1;\r
+    JD1BME,JD1YAA,JD1YBJ,JE7IZM/JD1,JG8NQJ/JD1,JL1KFR/JD1,JR6TYH/JD1;\r
 Ogasawara:                27:  45:  AS:   27.50:  -141.00:   -10.0:  JD/o:\r
     JD1;\r
 Mongolia:                 23:  32:  AS:   47.90:  -106.90:    -8.0:  JT:\r
@@ -503,27 +504,28 @@ Norway:                   14:  18:  EU:   60.00:   -10.70:    -1.0:  LA:
 Argentina:                13:  14:  SA:  -34.60:    58.40:     3.0:  LU:\r
     AY,AZ,L2,L3,L4,L5,L6,L7,L8,L9,LO,LP,LQ,LR,LS,LT,LU,LV,LW,AY0N/X,AY3DR/D,\r
     AY4EJ/D,AY5E/D,AY7DSY/D,DJ4SN/LU/X,L20ARC/D,L21ESC/LH,L25E/D,L30EY/D,\r
-    L30EY/V,L40E/D,L44D/D,L80AA/D,L8D/X,LO0D/D,LU/DH4PB/R,LU/DH4PB/S,LU1AEE/D,\r
-    LU1AF/D,LU1CDP/D,LU1DK/D,LU1DMA/E,LU1DZ/P,LU1DZ/Q,LU1DZ/R,LU1DZ/S,LU1DZ/X,\r
-    LU1EJ/W,LU1EQ/D,LU1EYW/D,LU1OFN/I,LU1VZ/V,LU1XAW/X,LU1XY/X,LU1YU/D,\r
-    LU1YY/Y,LU2DT/D,LU2DT/LH,LU2DVI/H,LU2EE/D,LU2EJB/X,LU2VC/D,LU2WV/O,\r
-    LU2XX/X,LU3CQ/D,LU3DJI/D,LU3DJI/W,LU3DOC/D,LU3DR/D,LU3DR/V,LU3ES/W,\r
-    LU4AAO/D,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,LU4DRH/E,LU4EJ/D,LU4ETN/D,\r
-    LU4WG/W,LU5BE/D,LU5DEM/D,LU5DEM/V,LU5DIT/D,LU5DIT/V,LU5DRV/D,LU5DRV/V,\r
-    LU5DT/D,LU5DV/D,LU5DWS/D,LU5EAO/D,LU5EFX/Y,LU5EWO/D,LU5XC/X,LU6DBL/D,\r
-    LU6DKT/D,LU6DRD/D,LU6DRD/E,LU6DRR/D,LU6EC/W,LU6EJJ/D,LU6EPR/D,LU6EPR/E,\r
-    LU6EYK/X,LU6UO/D,LU6UO/P,LU6UO/Q,LU6UO/R,LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,\r
-    LU7DID/V,LU7DID/Y,LU7DIR/D,LU7DJJ/W,LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,\r
-    LU7DSY/W,LU7DW/D,LU7DZL/D,LU7DZL/E,LU7EGH/V,LU7EGY/D,LU7EO/D,LU7EPC/D,\r
-    LU7EPC/W,LU7VCH/D,LU7WFM/W,LU8ADX/D,LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,\r
-    LU8DWR/V,LU8EBJ/D,LU8EBJ/E,LU8EBK/D,LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,\r
-    LU8EGS/D,LU8EHQ/D,LU8EHQ/E,LU8EHQ/W,LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8EOT/Y,\r
-    LU8ERH/D,LU8EXJ/D,LU8EXN/D,LU8FOZ/V,LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,\r
-    LU9DBK/X,LU9DKX/X,LU9EJS/E,LU9ESD/D,LU9ESD/V,LU9ESD/Y,LU9EV/LH,LU9JMG/J,\r
-    LW2DX/P,LW2DX/Q,LW2DX/R,LW2DX/S,LW2ENB/D,LW3DKC/D,LW3DKC/E,LW3DKO/D,\r
-    LW3DKO/E,LW3HAQ/D,LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,LW4EM/LH,LW5DR/LH,\r
-    LW5DWX/D,LW5EE/D,LW5EE/V,LW5EOL/D,LW7DAF/W,LW7DNS/E,LW8DMK/D,LW8EU/D,\r
-    LW8EXF/D,LW9DCF/Y,LW9EAG/D,LW9EAG/V,LW9EVA/D,LW9EVA/E;\r
+    L30EY/V,L40E/D,L44D/D,L80AA/D,L8D/X,LO0D/D,LO7E/D,LU/DH4PB/R,LU/DH4PB/S,\r
+    LU1AEE/D,LU1AF/D,LU1CDP/D,LU1DK/D,LU1DMA/E,LU1DZ/P,LU1DZ/Q,LU1DZ/R,\r
+    LU1DZ/S,LU1DZ/X,LU1EJ/W,LU1EQ/D,LU1EYW/D,LU1OFN/I,LU1VZ/V,LU1XAW/X,\r
+    LU1XY/X,LU1YU/D,LU1YY/Y,LU2DT/D,LU2DT/LH,LU2DVI/H,LU2EE/D,LU2EJB/X,\r
+    LU2VC/D,LU2WV/O,LU2XX/X,LU3CQ/D,LU3DJI/D,LU3DJI/W,LU3DOC/D,LU3DR/D,\r
+    LU3DR/V,LU3ES/W,LU4AAO/D,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,LU4DRH/E,\r
+    LU4EJ/D,LU4ETN/D,LU4WG/W,LU5BE/D,LU5BOJ/O,LU5DEM/D,LU5DEM/V,LU5DIT/D,\r
+    LU5DIT/V,LU5DRV/D,LU5DRV/V,LU5DT/D,LU5DV/D,LU5DWS/D,LU5EAO/D,LU5EFX/Y,\r
+    LU5EWO/D,LU5XC/X,LU6DBL/D,LU6DKT/D,LU6DRD/D,LU6DRD/E,LU6DRR/D,LU6EC/W,\r
+    LU6EJJ/D,LU6EPR/D,LU6EPR/E,LU6EYK/X,LU6UO/D,LU6UO/P,LU6UO/Q,LU6UO/R,\r
+    LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,LU7DID/V,LU7DID/Y,LU7DIR/D,LU7DJJ/W,\r
+    LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,LU7DSY/W,LU7DW/D,LU7DZL/D,LU7DZL/E,\r
+    LU7EGH/V,LU7EGY/D,LU7EO/D,LU7EPC/D,LU7EPC/W,LU7VCH/D,LU7WFM/W,LU8ADX/D,\r
+    LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,LU8DWR/V,LU8EBJ/D,LU8EBJ/E,LU8EBK/D,\r
+    LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,LU8EGS/D,LU8EHQ/D,LU8EHQ/E,LU8EHQ/W,\r
+    LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8EOT/Y,LU8ERH/D,LU8EXJ/D,LU8EXN/D,LU8FOZ/V,\r
+    LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,LU9DBK/X,LU9DKX/X,LU9EJS/E,LU9ESD/D,\r
+    LU9ESD/V,LU9ESD/Y,LU9EV/LH,LU9JMG/J,LW1EXU/Y,LW2DX/P,LW2DX/Q,LW2DX/R,\r
+    LW2DX/S,LW2DX/Y,LW2ENB/D,LW3DKC/D,LW3DKC/E,LW3DKO/D,LW3DKO/E,LW3HAQ/D,\r
+    LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,LW4EM/LH,LW5DR/LH,LW5DWX/D,LW5EE/D,\r
+    LW5EE/V,LW5EOL/D,LW7DAF/W,LW7DNS/E,LW8DMK/D,LW8EU/D,LW8EXF/D,LW9DCF/Y,\r
+    LW9EAG/D,LW9EAG/V,LW9EVA/D,LW9EVA/E;\r
 Luxembourg:               14:  27:  EU:   49.60:    -6.20:    -1.0:  LX:\r
     LX;\r
 Lithuania:                15:  29:  EU:   54.50:   -25.50:    -2.0:  LY:\r
@@ -660,57 +662,58 @@ Mali:                     35:  46:  AF:   12.70:     8.00:     0.0:  TZ:
     TZ;\r
 European Russia:          16:  29:  EU:   55.80:   -37.60:    -3.0:  UA:\r
     R,RD4W[30],RK4W[30],RM4W[30],RN4W[30],RU4W[30],RV4W[30],RW4W[30],U,\r
-    UA4W[30],R20CH,UE200TARS;\r
+    UA4W[30],R20CH,R7C,R7C/1,R7C/3,R7C/4,UE200TARS;\r
 Kaliningrad:              15:  29:  EU:   55.00:   -20.50:    -2.0:  UA2:\r
     R2,R60F,R750,RA2,RB2,RC2,RD2,RE2,RF2,RG2,RH2,RI2,RJ2,RK2,RL2,RM2,RN2,RP2,\r
     RQ2,RR2,RS2,RT2,RU2,RV2,RW2,RX2,RY2,RZ2,U2,UA2,UB2,UC2,UD2,UE2,UF2,UG2,\r
     UH2,UI2,R60A;\r
 Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:\r
-    R0,R8,R8T(18)[32],R8V(18)[33],R9,R9I(18)[31],R9M(17),R9S(16),R9T(16),R9W(16),\r
-    RA0,RA8,RA8T(18)[32],RA8V(18)[33],RA9,RA9I(18)[31],RA9M(17),RA9S(16),\r
-    RA9T(16),RA9W(16),RB0,RB8,RB8T(18)[32],RB8V(18)[33],RB9,RB9I(18)[31],\r
-    RB9M(17),RB9S(16),RB9T(16),RB9W(16),RC0,RC8,RC8T(18)[32],RC8V(18)[33],RC9,\r
-    RC9I(18)[31],RC9M(17),RC9S(16),RC9T(16),RC9W(16),RD0,RD8,RD8T(18)[32],\r
-    RD8V(18)[33],RD9,RD9I(18)[31],RD9M(17),RD9S(16),RD9T(16),RD9W(16),RE0,RE8,\r
-    RE8T(18)[32],RE8V(18)[33],RE9,RE9I(18)[31],RE9M(17),RE9S(16),RE9T(16),\r
-    RE9W(16),RF0,RF8,RF8T(18)[32],RF8V(18)[33],RF9,RF9I(18)[31],RF9M(17),\r
-    RF9S(16),RF9T(16),RF9W(16),RG0,RG8,RG8T(18)[32],RG8V(18)[33],RG9,\r
-    RG9I(18)[31],RG9M(17),RG9S(16),RG9T(16),RG9W(16),RH0,RH8,RH8T(18)[32],\r
-    RH8V(18)[33],RH9,RH9I(18)[31],RH9M(17),RH9S(16),RH9T(16),RH9W(16),RI0,RI8,\r
-    RI8T(18)[32],RI8V(18)[33],RI9,RI9I(18)[31],RI9M(17),RI9S(16),RI9T(16),\r
-    RI9W(16),RJ0,RJ8,RJ8T(18)[32],RJ8V(18)[33],RJ9,RJ9I(18)[31],RJ9M(17),\r
-    RJ9S(16),RJ9T(16),RJ9W(16),RK0,RK8,RK8T(18)[32],RK8V(18)[33],RK9,\r
-    RK9I(18)[31],RK9M(17),RK9S(16),RK9T(16),RK9W(16),RL0,RL8,RL8T(18)[32],\r
-    RL8V(18)[33],RL9,RL9I(18)[31],RL9M(17),RL9S(16),RL9T(16),RL9W(16),RM0,RM8,\r
-    RM8T(18)[32],RM8V(18)[33],RM9,RM9I(18)[31],RM9M(17),RM9S(16),RM9T(16),\r
-    RM9W(16),RN0,RN8,RN8T(18)[32],RN8V(18)[33],RN9,RN9I(18)[31],RN9M(17),\r
-    RN9S(16),RN9T(16),RN9W(16),RP0,RP8,RP8T(18)[32],RP8V(18)[33],RP9,\r
-    RP9I(18)[31],RP9M(17),RP9S(16),RP9T(16),RP9W(16),RQ0,RQ8,RQ8T(18)[32],\r
-    RQ8V(18)[33],RQ9,RQ9I(18)[31],RQ9M(17),RQ9S(16),RQ9T(16),RQ9W(16),RR0,RR8,\r
-    RR8T(18)[32],RR8V(18)[33],RR9,RR9I(18)[31],RR9M(17),RR9S(16),RR9T(16),\r
-    RR9W(16),RS0,RS8,RS8T(18)[32],RS8V(18)[33],RS9,RS9I(18)[31],RS9M(17),\r
-    RS9S(16),RS9T(16),RS9W(16),RT0,RT8,RT8T(18)[32],RT8V(18)[33],RT9,\r
-    RT9I(18)[31],RT9M(17),RT9S(16),RT9T(16),RT9W(16),RU0,RU8,RU8T(18)[32],\r
-    RU8V(18)[33],RU9,RU9I(18)[31],RU9M(17),RU9S(16),RU9T(16),RU9W(16),RV0,RV8,\r
-    RV8T(18)[32],RV8V(18)[33],RV9,RV9I(18)[31],RV9M(17),RV9S(16),RV9T(16),\r
-    RV9W(16),RW0,RW8,RW8T(18)[32],RW8V(18)[33],RW9,RW9I(18)[31],RW9M(17),\r
-    RW9S(16),RW9T(16),RW9W(16),RX0,RX8,RX8T(18)[32],RX8V(18)[33],RX9,\r
-    RX9I(18)[31],RX9M(17),RX9S(16),RX9T(16),RX9W(16),RY0,RY8,RY8T(18)[32],\r
-    RY8V(18)[33],RY9,RY9I(18)[31],RY9M(17),RY9S(16),RY9T(16),RY9W(16),RZ0,RZ8,\r
-    RZ8T(18)[32],RZ8V(18)[33],RZ9,RZ9I(18)[31],RZ9M(17),RZ9S(16),RZ9T(16),\r
-    RZ9W(16),U0,U8,U8T(18)[32],U8V(18)[33],U9,U9I(18)[31],U9M(17),U9S(16),U9T(16),\r
-    U9W(16),UA0,UA8,UA8T(18)[32],UA8V(18)[33],UA9,UA9I(18)[31],UA9M(17),UA9S(16),\r
-    UA9T(16),UA9W(16),UB0,UB8,UB8T(18)[32],UB8V(18)[33],UB9,UB9I(18)[31],\r
-    UB9M(17),UB9S(16),UB9T(16),UB9W(16),UC0,UC8,UC8T(18)[32],UC8V(18)[33],UC9,\r
-    UC9I(18)[31],UC9M(17),UC9S(16),UC9T(16),UC9W(16),UD0,UD8,UD8T(18)[32],\r
-    UD8V(18)[33],UD9,UD9I(18)[31],UD9M(17),UD9S(16),UD9T(16),UD9W(16),UE0,UE8,\r
-    UE8T(18)[32],UE8V(18)[33],UE9,UE9I(18)[31],UE9M(17),UE9S(16),UE9T(16),\r
-    UE9W(16),UF0,UF8,UF8T(18)[32],UF8V(18)[33],UF9,UF9I(18)[31],UF9M(17),\r
-    UF9S(16),UF9T(16),UF9W(16),UG0,UG8,UG8T(18)[32],UG8V(18)[33],UG9,\r
-    UG9I(18)[31],UG9M(17),UG9S(16),UG9T(16),UG9W(16),UH0,UH8,UH8T(18)[32],\r
-    UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),UH9S(16),UH9T(16),UH9W(16),UI0,UI8,\r
-    UI8T(18)[32],UI8V(18)[33],UI9,UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),\r
-    UI9W(16),R270A,R270E,R375I,R3F/9,R9HQ(17)[30],UE105SBM(18)[32];\r
+    R0,R7,R8,R8T(18)[32],R8V(18)[33],R9,R9I(18)[31],R9M(17),R9S(16),R9T(16),\r
+    R9W(16),RA0,RA7,RA8,RA8T(18)[32],RA8V(18)[33],RA9,RA9I(18)[31],RA9M(17),\r
+    RA9S(16),RA9T(16),RA9W(16),RB0,RB7,RB8,RB8T(18)[32],RB8V(18)[33],RB9,\r
+    RB9I(18)[31],RB9M(17),RB9S(16),RB9T(16),RB9W(16),RC0,RC7,RC8,RC8T(18)[32],\r
+    RC8V(18)[33],RC9,RC9I(18)[31],RC9M(17),RC9S(16),RC9T(16),RC9W(16),RD0,RD7,RD8,\r
+    RD8T(18)[32],RD8V(18)[33],RD9,RD9I(18)[31],RD9M(17),RD9S(16),RD9T(16),\r
+    RD9W(16),RE0,RE7,RE8,RE8T(18)[32],RE8V(18)[33],RE9,RE9I(18)[31],RE9M(17),\r
+    RE9S(16),RE9T(16),RE9W(16),RF0,RF7,RF8,RF8T(18)[32],RF8V(18)[33],RF9,\r
+    RF9I(18)[31],RF9M(17),RF9S(16),RF9T(16),RF9W(16),RG0,RG7,RG8,RG8T(18)[32],\r
+    RG8V(18)[33],RG9,RG9I(18)[31],RG9M(17),RG9S(16),RG9T(16),RG9W(16),RH0,RH7,RH8,\r
+    RH8T(18)[32],RH8V(18)[33],RH9,RH9I(18)[31],RH9M(17),RH9S(16),RH9T(16),\r
+    RH9W(16),RI0,RI7,RI8,RI8T(18)[32],RI8V(18)[33],RI9,RI9I(18)[31],RI9M(17),\r
+    RI9S(16),RI9T(16),RI9W(16),RJ0,RJ7,RJ8,RJ8T(18)[32],RJ8V(18)[33],RJ9,\r
+    RJ9I(18)[31],RJ9M(17),RJ9S(16),RJ9T(16),RJ9W(16),RK0,RK7,RK8,RK8T(18)[32],\r
+    RK8V(18)[33],RK9,RK9I(18)[31],RK9M(17),RK9S(16),RK9T(16),RK9W(16),RL0,RL7,RL8,\r
+    RL8T(18)[32],RL8V(18)[33],RL9,RL9I(18)[31],RL9M(17),RL9S(16),RL9T(16),\r
+    RL9W(16),RM0,RM7,RM8,RM8T(18)[32],RM8V(18)[33],RM9,RM9I(18)[31],RM9M(17),\r
+    RM9S(16),RM9T(16),RM9W(16),RN0,RN7,RN8,RN8T(18)[32],RN8V(18)[33],RN9,\r
+    RN9I(18)[31],RN9M(17),RN9S(16),RN9T(16),RN9W(16),RP0,RP7,RP8,RP8T(18)[32],\r
+    RP8V(18)[33],RP9,RP9I(18)[31],RP9M(17),RP9S(16),RP9T(16),RP9W(16),RQ0,RQ7,RQ8,\r
+    RQ8T(18)[32],RQ8V(18)[33],RQ9,RQ9I(18)[31],RQ9M(17),RQ9S(16),RQ9T(16),\r
+    RQ9W(16),RR0,RR7,RR8,RR8T(18)[32],RR8V(18)[33],RR9,RR9I(18)[31],RR9M(17),\r
+    RR9S(16),RR9T(16),RR9W(16),RS0,RS7,RS8,RS8T(18)[32],RS8V(18)[33],RS9,\r
+    RS9I(18)[31],RS9M(17),RS9S(16),RS9T(16),RS9W(16),RT0,RT7,RT8,RT8T(18)[32],\r
+    RT8V(18)[33],RT9,RT9I(18)[31],RT9M(17),RT9S(16),RT9T(16),RT9W(16),RU0,RU7,RU8,\r
+    RU8T(18)[32],RU8V(18)[33],RU9,RU9I(18)[31],RU9M(17),RU9S(16),RU9T(16),\r
+    RU9W(16),RV0,RV7,RV8,RV8T(18)[32],RV8V(18)[33],RV9,RV9I(18)[31],RV9M(17),\r
+    RV9S(16),RV9T(16),RV9W(16),RW0,RW7,RW8,RW8T(18)[32],RW8V(18)[33],RW9,\r
+    RW9I(18)[31],RW9M(17),RW9S(16),RW9T(16),RW9W(16),RX0,RX7,RX8,RX8T(18)[32],\r
+    RX8V(18)[33],RX9,RX9I(18)[31],RX9M(17),RX9S(16),RX9T(16),RX9W(16),RY0,RY7,RY8,\r
+    RY8T(18)[32],RY8V(18)[33],RY9,RY9I(18)[31],RY9M(17),RY9S(16),RY9T(16),\r
+    RY9W(16),RZ0,RZ7,RZ8,RZ8T(18)[32],RZ8V(18)[33],RZ9,RZ9I(18)[31],RZ9M(17),\r
+    RZ9S(16),RZ9T(16),RZ9W(16),U0,U7,U8,U8T(18)[32],U8V(18)[33],U9,U9I(18)[31],\r
+    U9M(17),U9S(16),U9T(16),U9W(16),UA0,UA7,UA8,UA8T(18)[32],UA8V(18)[33],UA9,\r
+    UA9I(18)[31],UA9M(17),UA9S(16),UA9T(16),UA9W(16),UB0,UB7,UB8,UB8T(18)[32],\r
+    UB8V(18)[33],UB9,UB9I(18)[31],UB9M(17),UB9S(16),UB9T(16),UB9W(16),UC0,UC7,UC8,\r
+    UC8T(18)[32],UC8V(18)[33],UC9,UC9I(18)[31],UC9M(17),UC9S(16),UC9T(16),\r
+    UC9W(16),UD0,UD7,UD8,UD8T(18)[32],UD8V(18)[33],UD9,UD9I(18)[31],UD9M(17),\r
+    UD9S(16),UD9T(16),UD9W(16),UE0,UE7,UE8,UE8T(18)[32],UE8V(18)[33],UE9,\r
+    UE9I(18)[31],UE9M(17),UE9S(16),UE9T(16),UE9W(16),UF0,UF7,UF8,UF8T(18)[32],\r
+    UF8V(18)[33],UF9,UF9I(18)[31],UF9M(17),UF9S(16),UF9T(16),UF9W(16),UG0,UG7,UG8,\r
+    UG8T(18)[32],UG8V(18)[33],UG9,UG9I(18)[31],UG9M(17),UG9S(16),UG9T(16),\r
+    UG9W(16),UH0,UH7,UH8,UH8T(18)[32],UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),\r
+    UH9S(16),UH9T(16),UH9W(16),UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9,\r
+    UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R270A,R270E,R375I,R3F/9,\r
+    R9HQ(17)[30],UE105SBM(18)[32];\r
 Uzbekistan:               17:  30:  AS:   41.20:   -69.30:    -5.0:  UK:\r
     UJ,UK,UL,UM;\r
 Kazakhstan:               17:  30:  AS:   43.30:   -76.90:    -5.0:  UN:\r
@@ -744,9 +747,9 @@ Canada:                   05:  09:  NA:   45.00:    80.00:     4.0:  VE:
     VE2DXY(2),VE2DYW(2),VE2DYX(2),VE2EAK(2),VE2EDL(2),VE2EDX(2),VE2ELL(2),\r
     VE2ENB(2),VE2END(2),VE2ENR(2),VE2ERU(2),VE2FCV(2),VE2GSA(2),VE2GSO(2),\r
     VE2III(2),VE2IM(2),VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),VE2NRK(2),\r
-    VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WT(2),\r
-    VE2XAA/2(2),VE2XY(2),VE2YM(2),VE3EY/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),\r
-    VE8RCS(2),VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];\r
+    VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WDX(2),\r
+    VE2WT(2),VE2XAA/2(2),VE2XY(2),VE2YM(2),VE3EY/2(2),VE3NE/2(2),VE3RHJ/2(2),\r
+    VE8AJ(2),VE8PW(2),VE8RCS(2),VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];\r
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:\r
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ,VI90ANZAC(29);\r
 Heard I.:                 39:  68:  AF:  -53.00:   -73.40:    -5.0:  VK0H:\r
@@ -785,9 +788,9 @@ South Georgia:            13:  73:  SA:  -54.30:    36.80:     2.0:  VP8/g:
     VP8GEO,VP8SGB,VP8SGK;\r
 South Shetland:           13:  73:  SA:  -62.00:    58.30:     4.0:  VP8/h:\r
     CE9A,CE9R,CA8WCI/9,D88S,DT8A,HF0POL,HF0QF,HL0KSJ,HL5BDS,HL8KSJ,LU/R1ANF,\r
-    LU1ZC,LZ0A,OL0ANT,R1ANF,VP8DJK,XR9A;\r
+    LU1ZC,LZ0A,OL0ANT,R1ANF,VP8/LZ1UQ,VP8DJK,XR9A;\r
 South Orkney:             13:  73:  SA:  -60.00:    45.50:     3.0:  VP8/o:\r
-    AY1ZA,LU1ZA;\r
+    AY1ZA,LU1ZA,LU2ERA/Z;\r
 South Sandwich:           13:  73:  SA:  -57.00:    26.70:     2.0:  VP8/s:\r
     VP8SSI,VP8THU;\r
 Bermuda:                  05:  11:  NA:   32.30:    64.70:     4.0:  VP9:\r
@@ -838,7 +841,7 @@ Romania:                  20:  28:  EU:   44.40:   -26.10:    -2.0:  YO:
 El Salvador:              07:  11:  NA:   13.70:    89.20:     6.0:  YS:\r
     HU,YS;\r
 Serbia:                   15:  28:  EU:   44.90:   -20.50:    -1.0:  YU:\r
-    4N,4O,YT,YU,YZ;\r
+    4N,4O,YT,YT60,YU,YU60,YZ,YZ60;\r
 Venezuela:                09:  12:  SA:   10.50:    67.00:     4.0:  YV:\r
     4M,YV,YW,YX,YY;\r
 Aves I.:                  08:  11:  NA:   15.70:    63.70:     4.0:  YV0:\r
@@ -864,7 +867,7 @@ Tristan da Cunha:         38:  66:  AF:  -37.10:    12.30:     0.0:  ZD9:
 Cayman Is.:               08:  11:  NA:   19.50:    81.20:     5.0:  ZF:\r
     ZF;\r
 North Cook Is.:           32:  62:  OC:  -10.40:   161.00:    10.0:  ZK1/n:\r
-    E51NOU,E51QMA,E51TUG,E51YAQ;\r
+    E51PDX,E51PEN,E51QMA,E51TUG,E51WL;\r
 South Cook Is.:           32:  62:  OC:  -21.20:   159.80:    10.0:  ZK1/s:\r
     E5;\r
 Niue:                     32:  62:  OC:  -19.00:   169.90:    11.0:  ZK2:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 50b86d02e29f020f7585ac864b1b5b98a41d7616..97d47950e5929bd1a6883d8422a3474eee108cc4 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -280,6 +280,7 @@
   '9M2' => '302',
   '9M4' => '302',
   '9M4SAB' => '303,527',
+  '9M4SDX' => '261',
   '9M4SEB' => '303,527',
   '9M4SHQ' => '303,527',
   '9M4SMS' => '303,527',
@@ -682,6 +683,7 @@
   'CE0Y' => '17',
   'CE0Z' => '19',
   'CE9' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
+  'CE9/R7C' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'CE9/VK0LD' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'CE9A' => '208',
   'CE9R' => '208',
@@ -769,6 +771,7 @@
   'DV' => '33',
   'DW' => '33',
   'DX' => '33',
+  'DX0JP' => '261',
   'DX0K' => '261',
   'DY' => '33',
   'DZ' => '33',
@@ -776,10 +779,11 @@
   'E3' => '334',
   'E4' => '326,532',
   'E5' => '249,250',
-  'E51NOU' => '249',
+  'E51PDX' => '249',
+  'E51PEN' => '249',
   'E51QMA' => '249',
   'E51TUG' => '249',
-  'E51YAQ' => '249',
+  'E51WL' => '249',
   'EA' => '34',
   'EA6' => '35',
   'EA8' => '36',
@@ -1117,6 +1121,7 @@
   'GB6SA' => '64,351',
   'GB6SM' => '64,351',
   'GB6SPC' => '61',
+  'GB6TAA' => '64,351',
   'GB6WW' => '64,351',
   'GB700BSB' => '64,351',
   'GB750CC' => '66',
@@ -1297,6 +1302,7 @@
   'JD1BIZ' => '93',
   'JD1BJA' => '93',
   'JD1BJE' => '93',
+  'JD1BME' => '93',
   'JD1YAA' => '93',
   'JD1YBJ' => '93',
   'JE' => '92',
@@ -1430,6 +1436,7 @@
   'K9HUY' => '220',
   'K9JF' => '220',
   'K9OM' => '220',
+  'K9PET/KC4' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'K9VV' => '220',
   'KA0' => '467,473,477,484,485,489,490,502',
   'KA1' => '468,480,482,491,500,507',
@@ -1461,6 +1468,7 @@
   'KC3MR' => '220',
   'KC4' => '460,471,472,478,488,501,503,506,533,534,535',
   'KC4/K2ARB' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
+  'KC4/R7C' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'KC4AAA' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'KC4AAC' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'KC4AAF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
@@ -1768,6 +1776,7 @@
   'LN' => '118',
   'LO' => '119',
   'LO0D/D' => '119,396,397',
+  'LO7E/D' => '119,396,397',
   'LP' => '119',
   'LQ' => '119',
   'LR' => '119',
@@ -1804,6 +1813,7 @@
   'LU2DVI/H' => '119,396,397',
   'LU2EE/D' => '119,396,397',
   'LU2EJB/X' => '119,396,397',
+  'LU2ERA/Z' => '206',
   'LU2VC/D' => '119,396,397',
   'LU2WV/O' => '119,396,397',
   'LU2XX/X' => '119,396,397',
@@ -1825,6 +1835,7 @@
   'LU4WG/W' => '119,396,397',
   'LU4ZS' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'LU5BE/D' => '119,396,397',
+  'LU5BOJ/O' => '119,396,397',
   'LU5DEM/D' => '119,396,397',
   'LU5DEM/V' => '119,396,397',
   'LU5DIT/D' => '119,396,397',
@@ -1914,10 +1925,12 @@
   'LU9JMG/J' => '119,396,397',
   'LV' => '119',
   'LW' => '119',
+  'LW1EXU/Y' => '119,396,397',
   'LW2DX/P' => '119,396,397',
   'LW2DX/Q' => '119,396,397',
   'LW2DX/R' => '119,396,397',
   'LW2DX/S' => '119,396,397',
+  'LW2DX/Y' => '119,396,397',
   'LW2ENB/D' => '119,396,397',
   'LW3DKC/D' => '119,396,397',
   'LW3DKC/E' => '119,396,397',
@@ -2466,7 +2479,12 @@
   'R6' => '421',
   'R60A' => '175',
   'R60F' => '175',
+  'R7' => '176,425,430',
   'R750' => '175',
+  'R7C' => '173,418,419,420,421',
+  'R7C/1' => '173,418,419,420,421',
+  'R7C/3' => '173,418,419,420,421',
+  'R7C/4' => '173,418,419,420,421',
   'R8' => '431',
   'R8T' => '176,425,430',
   'R8V' => '176,425,430',
@@ -2483,6 +2501,7 @@
   'RA3' => '419',
   'RA4' => '420',
   'RA6' => '421',
+  'RA7' => '176,425,430',
   'RA8' => '431',
   'RA8T' => '176,425,430',
   'RA8V' => '176,425,430',
@@ -2498,6 +2517,7 @@
   'RB3' => '419',
   'RB4' => '420',
   'RB6' => '421',
+  'RB7' => '176,425,430',
   'RB8' => '431',
   'RB8T' => '176,425,430',
   'RB8V' => '176,425,430',
@@ -2513,6 +2533,7 @@
   'RC3' => '419',
   'RC4' => '420',
   'RC6' => '421',
+  'RC7' => '176,425,430',
   'RC8' => '431',
   'RC8T' => '176,425,430',
   'RC8V' => '176,425,430',
@@ -2529,6 +2550,7 @@
   'RD4' => '420',
   'RD4W' => '173,418,419,420,421',
   'RD6' => '421',
+  'RD7' => '176,425,430',
   'RD8' => '431',
   'RD8T' => '176,425,430',
   'RD8V' => '176,425,430',
@@ -2544,6 +2566,7 @@
   'RE3' => '419',
   'RE4' => '420',
   'RE6' => '421',
+  'RE7' => '176,425,430',
   'RE8' => '431',
   'RE8T' => '176,425,430',
   'RE8V' => '176,425,430',
@@ -2559,6 +2582,7 @@
   'RF3' => '419',
   'RF4' => '420',
   'RF6' => '421',
+  'RF7' => '176,425,430',
   'RF8' => '431',
   'RF8T' => '176,425,430',
   'RF8V' => '176,425,430',
@@ -2574,6 +2598,7 @@
   'RG3' => '419',
   'RG4' => '420',
   'RG6' => '421',
+  'RG7' => '176,425,430',
   'RG8' => '431',
   'RG8T' => '176,425,430',
   'RG8V' => '176,425,430',
@@ -2589,6 +2614,7 @@
   'RH3' => '419',
   'RH4' => '420',
   'RH6' => '421',
+  'RH7' => '176,425,430',
   'RH8' => '431',
   'RH8T' => '176,425,430',
   'RH8V' => '176,425,430',
@@ -2604,6 +2630,7 @@
   'RI3' => '419',
   'RI4' => '420',
   'RI6' => '421',
+  'RI7' => '176,425,430',
   'RI8' => '431',
   'RI8T' => '176,425,430',
   'RI8V' => '176,425,430',
@@ -2619,6 +2646,7 @@
   'RJ3' => '419',
   'RJ4' => '420',
   'RJ6' => '421',
+  'RJ7' => '176,425,430',
   'RJ8' => '431',
   'RJ8T' => '176,425,430',
   'RJ8V' => '176,425,430',
@@ -2635,6 +2663,7 @@
   'RK4' => '420',
   'RK4W' => '173,418,419,420,421',
   'RK6' => '421',
+  'RK7' => '176,425,430',
   'RK8' => '431',
   'RK8T' => '176,425,430',
   'RK8V' => '176,425,430',
@@ -2650,6 +2679,7 @@
   'RL3' => '419',
   'RL4' => '420',
   'RL6' => '421',
+  'RL7' => '176,425,430',
   'RL8' => '431',
   'RL8T' => '176,425,430',
   'RL8V' => '176,425,430',
@@ -2666,6 +2696,7 @@
   'RM4' => '420',
   'RM4W' => '173,418,419,420,421',
   'RM6' => '421',
+  'RM7' => '176,425,430',
   'RM8' => '431',
   'RM8T' => '176,425,430',
   'RM8V' => '176,425,430',
@@ -2682,6 +2713,7 @@
   'RN4' => '420',
   'RN4W' => '173,418,419,420,421',
   'RN6' => '421',
+  'RN7' => '176,425,430',
   'RN8' => '431',
   'RN8T' => '176,425,430',
   'RN8V' => '176,425,430',
@@ -2705,6 +2737,7 @@
   'RP3' => '419',
   'RP4' => '420',
   'RP6' => '421',
+  'RP7' => '176,425,430',
   'RP8' => '431',
   'RP8T' => '176,425,430',
   'RP8V' => '176,425,430',
@@ -2720,6 +2753,7 @@
   'RQ3' => '419',
   'RQ4' => '420',
   'RQ6' => '421',
+  'RQ7' => '176,425,430',
   'RQ8' => '431',
   'RQ8T' => '176,425,430',
   'RQ8V' => '176,425,430',
@@ -2735,6 +2769,7 @@
   'RR3' => '419',
   'RR4' => '420',
   'RR6' => '421',
+  'RR7' => '176,425,430',
   'RR8' => '431',
   'RR8T' => '176,425,430',
   'RR8V' => '176,425,430',
@@ -2750,6 +2785,7 @@
   'RS3' => '419',
   'RS4' => '420',
   'RS6' => '421',
+  'RS7' => '176,425,430',
   'RS8' => '431',
   'RS8T' => '176,425,430',
   'RS8V' => '176,425,430',
@@ -2765,6 +2801,7 @@
   'RT3' => '419',
   'RT4' => '420',
   'RT6' => '421',
+  'RT7' => '176,425,430',
   'RT8' => '431',
   'RT8T' => '176,425,430',
   'RT8V' => '176,425,430',
@@ -2781,6 +2818,7 @@
   'RU4' => '420',
   'RU4W' => '173,418,419,420,421',
   'RU6' => '421',
+  'RU7' => '176,425,430',
   'RU8' => '431',
   'RU8T' => '176,425,430',
   'RU8V' => '176,425,430',
@@ -2797,6 +2835,7 @@
   'RV4' => '420',
   'RV4W' => '173,418,419,420,421',
   'RV6' => '421',
+  'RV7' => '176,425,430',
   'RV8' => '431',
   'RV8T' => '176,425,430',
   'RV8V' => '176,425,430',
@@ -2813,6 +2852,7 @@
   'RW4' => '420',
   'RW4W' => '173,418,419,420,421',
   'RW6' => '421',
+  'RW7' => '176,425,430',
   'RW8' => '431',
   'RW8T' => '176,425,430',
   'RW8V' => '176,425,430',
@@ -2828,6 +2868,7 @@
   'RX3' => '419',
   'RX4' => '420',
   'RX6' => '421',
+  'RX7' => '176,425,430',
   'RX8' => '431',
   'RX8T' => '176,425,430',
   'RX8V' => '176,425,430',
@@ -2843,6 +2884,7 @@
   'RY3' => '419',
   'RY4' => '420',
   'RY6' => '421',
+  'RY7' => '176,425,430',
   'RY8' => '431',
   'RY8T' => '176,425,430',
   'RY8V' => '176,425,430',
@@ -2858,6 +2900,7 @@
   'RZ3' => '419',
   'RZ4' => '420',
   'RZ6' => '421',
+  'RZ7' => '176,425,430',
   'RZ8' => '431',
   'RZ8T' => '176,425,430',
   'RZ8V' => '176,425,430',
@@ -3030,6 +3073,7 @@
   'U4' => '420',
   'U5' => '177',
   'U6' => '421',
+  'U7' => '176,425,430',
   'U8' => '431',
   'U8T' => '176,425,430',
   'U8V' => '176,425,430',
@@ -3048,6 +3092,7 @@
   'UA4' => '420',
   'UA4W' => '173,418,419,420,421',
   'UA6' => '421',
+  'UA7' => '176,425,430',
   'UA8' => '431',
   'UA8T' => '176,425,430',
   'UA8V' => '176,425,430',
@@ -3063,6 +3108,7 @@
   'UB3' => '419',
   'UB4' => '420',
   'UB6' => '421',
+  'UB7' => '176,425,430',
   'UB8' => '431',
   'UB8T' => '176,425,430',
   'UB8V' => '176,425,430',
@@ -3078,6 +3124,7 @@
   'UC3' => '419',
   'UC4' => '420',
   'UC6' => '421',
+  'UC7' => '176,425,430',
   'UC8' => '431',
   'UC8T' => '176,425,430',
   'UC8V' => '176,425,430',
@@ -3093,6 +3140,7 @@
   'UD3' => '419',
   'UD4' => '420',
   'UD6' => '421',
+  'UD7' => '176,425,430',
   'UD8' => '431',
   'UD8T' => '176,425,430',
   'UD8V' => '176,425,430',
@@ -3110,6 +3158,7 @@
   'UE3' => '419',
   'UE4' => '420',
   'UE6' => '421',
+  'UE7' => '176,425,430',
   'UE8' => '431',
   'UE8T' => '176,425,430',
   'UE8V' => '176,425,430',
@@ -3125,6 +3174,7 @@
   'UF3' => '419',
   'UF4' => '420',
   'UF6' => '421',
+  'UF7' => '176,425,430',
   'UF8' => '431',
   'UF8T' => '176,425,430',
   'UF8V' => '176,425,430',
@@ -3140,6 +3190,7 @@
   'UG3' => '419',
   'UG4' => '420',
   'UG6' => '421',
+  'UG7' => '176,425,430',
   'UG8' => '431',
   'UG8T' => '176,425,430',
   'UG8V' => '176,425,430',
@@ -3155,6 +3206,7 @@
   'UH3' => '419',
   'UH4' => '420',
   'UH6' => '421',
+  'UH7' => '176,425,430',
   'UH8' => '431',
   'UH8T' => '176,425,430',
   'UH8V' => '176,425,430',
@@ -3170,6 +3222,7 @@
   'UI3' => '419',
   'UI4' => '420',
   'UI6' => '421',
+  'UI7' => '176,425,430',
   'UI8' => '431',
   'UI8T' => '176,425,430',
   'UI8V' => '176,425,430',
@@ -3282,12 +3335,14 @@
   'VE2TVU' => '191',
   'VE2UA' => '191',
   'VE2VH' => '191',
+  'VE2WDX' => '191',
   'VE2WT' => '191',
   'VE2XAA/2' => '191',
   'VE2XY' => '191',
   'VE2YM' => '191',
   'VE3' => '442',
   'VE3EY/2' => '191',
+  'VE3NE/2' => '191',
   'VE3RHJ/2' => '191',
   'VE4' => '435',
   'VE5' => '445',
@@ -3439,12 +3494,14 @@
   'VP8/F' => '228',
   'VP8/G' => '205',
   'VP8/H' => '208',
+  'VP8/LZ1UQ' => '208',
   'VP8/O' => '206',
   'VP8/S' => '207',
   'VP8BF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8CTR' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8DJB' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8DJK' => '208',
+  'VP8DKF' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8GEO' => '205',
   'VP8PJ' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'VP8ROT' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
@@ -3516,8 +3573,11 @@
   'W2OO' => '220',
   'W2VJN' => '220',
   'W3' => '469,470,481,499',
+  'W3ASA/KC4' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'W3CP' => '220',
   'W3HDH' => '220',
+  'W3WKO/KC4' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
+  'W3WKP/KC4' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'W4' => '460,471,472,478,488,501,503,506',
   'W4BCG' => '220',
   'W4CID' => '220',
@@ -3936,10 +3996,12 @@
   'YT' => '238',
   'YT3' => '336',
   'YT6' => '336',
+  'YT60' => '238',
   'YU' => '238',
   'YU3' => '336',
   'YU5' => '335',
   'YU6' => '336',
+  'YU60' => '238',
   'YV' => '239',
   'YV0' => '240',
   'YW' => '239',
@@ -3951,6 +4013,7 @@
   'YZ' => '238',
   'YZ3' => '336',
   'YZ6' => '336',
+  'YZ60' => '238',
   'Z2' => '247',
   'Z3' => '335',
   'Z7' => '336',