add DXSql/Pg.pm and CTY-2206 Prefix changes

diff --git a/Changes b/Changes
index 010c331965e9a7b07c71603534e97ec2b8a60e0d..f8286c641f1fdcf3b7f724a7500e9d70a8772a33 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+10Apr12=======================================================================
+1. Added DXSql/Pg postgres Spot collection interface from Wijnand PD0MZ. 
+2. Add CTY2206 prefix changes
 13Mar12=======================================================================
 1. add CTY2204 prefix changes + new wpxloc.raw
 12Mar12=======================================================================

diff --git a/data/cty.dat b/data/cty.dat
index cb11080cc69cea6e274a626d4c21426144d37e79..51d729a0b9e320252f75ded17684e12c21f41bd3 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.43:    -1.0:  1A:
     1A;
 Spratly Islands:          26:  50:  AS:    9.88:  -114.23:    -8.0:  1S:
-    1S,9M0,BV9S;
+    1S,9M0,BV9S,=9M6/OH2YY;
 Monaco:                   14:  27:  EU:   43.73:    -7.40:    -1.0:  3A:
     3A;
 Agalega & St. Brandon:    39:  53:  AF:  -10.45:   -56.67:    -4.0:  3B6:
@@ -296,9 +296,9 @@ Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
     ZM5(30)[71],ZS7(38)[67],=K9PET/KC4,=8J1RL(39)[67],=CE9VPM[73],
     =DP0GVN(38)[67],=DP0GVN/P(38)[67],=DP1POL(38)[67],=II0MZ(30)[71],
     =KC4AAA(39),=KC4AAC[73],=KC4USB(12),=KC4USV(30)[71],=OH2FFP/P(38)[67],
-    =OR4TN(38)[67],=R1ANP(39)[69],=R1ANR(38)[67],=RI1ANA(39)[69],
-    =RI1ANC(29)[70],=RI1ANC/P(29)[70],=RI1ANR(38)[67],=VK0BFG(29)[70],
-    =VP8ADE/B[73],=VP8DLM[73],=VP8DMH[73],=VU3BPZ(38)[67],=ZS6KX/7(38)[67];
+    =OR4TN(38)[67],=R1ANP(39)[69],=R1ANR(38)[67],=RI1ANR(38)[67],
+    =VK0BFG(29)[70],=VP8ADE/B[73],=VP8DLM[73],=VP8DMH[73],=VU3BPZ(38)[67],
+    =ZS6KX/7(38)[67];
 Cuba:                     08:  11:  NA:   21.50:    80.00:     5.0:  CM:
     CL,CM,CO,T4;
 Morocco:                  33:  37:  AF:   32.00:     5.00:     0.0:  CN:
@@ -324,7 +324,7 @@ Cape Verde:               35:  46:  AF:   16.00:    24.00:     1.0:  D4:
 Comoros:                  39:  53:  AF:  -11.63:   -43.30:    -3.0:  D6:
     D6;
 Fed. Rep. of Germany:     14:  28:  EU:   51.00:   -10.00:    -1.0:  DL:
-    DA,DB,DC,DD,DE,DF,DG,DH,DI,DJ,DK,DL,DM,DN,DO,DP,DQ,DR,=DL0CUX/LV;
+    DA,DB,DC,DD,DE,DF,DG,DH,DI,DJ,DK,DL,DM,DN,DO,DP,DQ,DR;
 Philippines:              27:  50:  OC:   13.00:  -122.00:    -8.0:  DU:
     4D,4E,4F,4G,4H,4I,DU,DV,DW,DX,DY,DZ;
 Eritrea:                  37:  48:  AF:   15.00:   -39.00:    -3.0:  E3:
@@ -363,7 +363,7 @@ Belarus:                  16:  29:  EU:   54.00:   -28.00:    -2.0:  EU:
     EU,EV,EW;
 Kyrgyzstan:               17:  30:  AS:   41.70:   -74.13:    -6.0:  EX:
     EX,EX2P[31],EX2Q[31],EX6P[31],EX6Q[31],EX7P[31],EX7Q[31],EX8P[31],
-    EX8Q[31],=VERSION;
+    EX8Q[31];
 Tajikistan:               17:  30:  AS:   38.82:   -71.22:    -5.0:  EY:
     EY;
 Turkmenistan:             17:  30:  AS:   38.00:   -58.00:    -5.0:  EZ:
@@ -373,7 +373,7 @@ France:                   14:  27:  EU:   46.00:    -2.00:    -1.0:  F:
 Guadeloupe:               08:  11:  NA:   16.13:    61.67:     4.0:  FG:
     FG,=TO11A;
 Mayotte:                  39:  53:  AF:  -12.88:   -45.15:    -3.0:  FH:
-    FH,=TO4M,=TO7BC;
+    FH,=TO7BC;
 St. Barthelemy:           08:  11:  NA:   17.90:    62.83:     4.0:  FJ:
     FJ,=TO3J,=TO3X;
 New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
@@ -381,7 +381,7 @@ New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
 Chesterfield Islands:     30:  56:  OC:  -19.87:  -158.32:   -11.0:  FK/c:
     =FK8IK/C;
 Martinique:               08:  11:  NA:   14.70:    61.03:     4.0:  FM:
-    FM,=TO5A,=TO5T,=TO5X,=TO7A,=TO8A;
+    FM,=TO5A,=TO5K,=TO5T,=TO5X,=TO7A,=TO8A;
 French Polynesia:         32:  63:  OC:  -17.65:   149.40:    10.0:  FO:
     FO,=TX6T,=TX6T/P;
 Austral Islands:          32:  63:  OC:  -23.37:   149.48:    10.0:  FO/a:
@@ -422,8 +422,8 @@ Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
     2H,2J,GH,GJ,MH,MJ;
 Scotland:                 14:  27:  EU:   56.82:     4.18:     0.0:  GM:
     2A,2M,2S,GA,GM,GS,MA,MM,MS,=GB0FFS,=GB0SSB,=GB1KLD,=GB1OL,=GB2CHC,=GB2GNL,
-    =GB2LBN,=GB2LT,=GB2MOF,=GB2NCL,=GB2OL,=GB2OWM,=GB2SWF,=GB3SWF,=GB4OL,
-    =GB4SWF,=GB5CC,=GB75CC,=GB80GD,=GM6WRW/P,=MM0YHB/P;
+    =GB2LBN,=GB2LT,=GB2MOF,=GB2NCL,=GB2OWM,=GB2SWF,=GB3SWF,=GB4SWF,=GB5CC,
+    =GB75CC,=GB80GD,=GM6WRW/P,=GQ4PRB,=MM0YHB/P,=MQ6BJJ,=MQ6KAU;
 Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
     2Z,GZ,MZ,=2M0ZET,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB0HFC,=GB0OS,=GB2ELH,
     =GB2WG,=GB2ZET,=GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,=GM0ILB,=GM0JDB,
@@ -439,8 +439,8 @@ Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2P,2U,GP,GU,MP,MU;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
     2C,2W,2X,2Y,GC,GW,MC,MW,=GB0AD,=GB0HEL,=GB0MPA,=GB0PLB,=GB0RS,=GB1CDS,
-    =GB1OOC,=GB2FLB,=GB2GGM,=GB2LSA,=GB2RSC,=GB2TD,=GB4BPL,=GB4MBC,=GB4MD,
-    =GB4MDI,=GB4SDD,=GB50RSARS,=GB5FI;
+    =GB1OOC,=GB2GGM,=GB2LSA,=GB2RSC,=GB2TD,=GB4BPL,=GB4MBC,=GB4MD,=GB4MDI,
+    =GB4SDD,=GB50RSARS,=GB5FI,=GQ0TQM,=GQ4BKG;
 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:
@@ -464,7 +464,7 @@ Colombia:                 09:  12:  SA:    5.00:    74.00:     5.0:  HK:
 San Andres & Providencia: 07:  11:  NA:   12.55:    81.72:     5.0:  HK0/a:
     5J0,5K0,HJ0,HK0;
 Malpelo Island:           09:  12:  SA:    3.98:    81.58:     5.0:  HK0/m:
-    5J0M,5K0M,HJ0M,HK0M,=HK0NA,=HK0TU;
+    5J0M,5K0M,HJ0M,HK0M,=HK0TU;
 Republic of Korea:        25:  44:  AS:   36.23:  -127.90:    -9.0:  HL:
     6K,6L,6M,6N,D7,D8,D9,DS,DT,HL,KL9K;
 Panama:                   07:  11:  NA:    9.00:    80.00:     5.0:  HP:
@@ -478,7 +478,7 @@ Vatican City:             15:  28:  EU:   41.90:   -12.47:    -1.0:  HV:
 Saudi Arabia:             21:  39:  AS:   24.20:   -43.83:    -3.0:  HZ:
     7Z,8Z,HZ,=HZ1SBS/J;
 Italy:                    15:  28:  EU:   42.82:   -12.58:    -1.0:  I:
-    I,=IQ0GV/AAW,=I1YRL/GRA;
+    I,=IQ0GV/AAW,=4U1GSC,=I1YRL/GRA;
 African Italy:            33:  37:  AF:   35.67:   -12.67:    -1.0:  *IG9:
     IG9,IH9;
 Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
@@ -500,7 +500,7 @@ St. Vincent:              08:  11:  NA:   13.23:    61.20:     4.0:  J8:
     J8;
 Japan:                    25:  45:  AS:   36.40:  -138.38:    -9.0:  JA:
     7J,7K,7L,7M,7N,8J,8K,8L,8M,8N,JA,JE,JF,JG,JH,JI,JJ,JK,JL,JM,JN,JO,JP,JQ,
-    JR,JS,=7N4RHO/BM;
+    JR,JS;
 Minami Torishima:         27:  90:  OC:   24.28:  -153.97:   -10.0:  JD/m:
     =JD1/JG8NQJ,=JD1BME,=JD1BMM,=JG8NQJ/JD1;
 Ogasawara:                27:  45:  AS:   27.05:  -142.20:    -9.0:  JD/o:
@@ -733,8 +733,8 @@ Argentina:                13:  14:  SA:  -34.80:    65.92:     3.0:  LU:
     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],=LU1DAR/D,
     =LU1DCB/D,=LU1EEZ/D,=LU1HLH/D,=LU1WCR/W[16],=LU1WJF/W[16],=LU1WJY/W[16],
-    =LU1XA/XA[16],=LU1YY/D,=LU1YY/XA[16],=LU2AGQ/D,=LU2AVW/D,=LU2DJB/J,
-    =LU2DVI/H,=LU2XX/XP[16],=LU3DR/D,=LU3DXG/D,=LU3EP/D,=LU3FV/F,
+    =LU1XA/XA[16],=LU1XZ/D,=LU1YY/D,=LU1YY/XA[16],=LU2AGQ/D,=LU2AVW/D,
+    =LU2DJB/J,=LU2DVI/H,=LU2XX/XP[16],=LU3DR/D,=LU3DXG/D,=LU3EP/D,=LU3FV/F,
     =LU4DBP/W[16],=LU4DBT/D,=LU4DBT/W[16],=LU4DBT/XA[16],=LU4DIS/D,=LU4DLL/D,
     =LU4ETN/D,=LU4HSA/D,=LU4HTD/D,=LU5AHN/D,=LU5DEM/W[16],=LU5DGI/W[16],
     =LU5DSM/D,=LU5DX/H,=LU5FZ/F,=LU5VAT/D,=LU6DL/D,=LU6DRN/D,=LU6EE/XA[16],
@@ -835,7 +835,7 @@ Mount Athos:              20:  28:  EU:   40.00:   -24.00:    -2.0:  SV/a:
 Dodecanese:               20:  28:  EU:   36.17:   -27.93:    -2.0:  SV5:
     J45,SV5,SW5,SX5,SY5,SZ5,=SV0XAN/5,=SV0XBZ/5,=SV0XCA/5,=SV9DJO/5;
 Crete:                    20:  28:  EU:   35.23:   -24.78:    -2.0:  SV9:
-    J49,SV9,SW9,SX9,SY9,SZ9,=SV0XAI/9,=SV0XBN/9,=SV0XBZ/9,=SV0XCC/9;
+    J49,SV9,SW9,SX9,SY9,SZ9,=SV0XAI/9,=SV0XBN/9,=SV0XBW,=SV0XBZ/9,=SV0XCC/9;
 Tuvalu:                   31:  65:  OC:   -8.50:  -179.20:   -12.0:  T2:
     T2;
 Western Kiribati:         31:  65:  OC:    1.42:  -173.00:   -12.0:  T30:
@@ -883,84 +883,76 @@ Benin:                    35:  46:  AF:    9.87:    -2.25:    -1.0:  TY:
 Mali:                     35:  46:  AF:   18.00:     2.58:     0.0:  TZ:
     TZ;
 European Russia:          16:  29:  EU:   56.00:   -37.00:    -4.0:  UA:
-    R,U,R1N[19],R1O[19],R1P[20],R1Y[19],R1Z[19],R4H[30],R4I[30],R4W[30],
-    R8F(17)[30],R8G(17)[30],R8X(17)[19],R9F(17)[30],R9G(17)[30],R9X(17)[19],
-    RA1N[19],RA1O[19],RA1P[20],RA1Y[19],RA1Z[19],RA4H[30],RA4I[30],RA4W[30],
-    RA8F(17)[30],RA8G(17)[30],RA8X(17)[19],RA9F(17)[30],RA9G(17)[30],
-    RA9X(17)[19],RC1N[19],RC1O[19],RC1P[20],RC1Y[19],RC1Z[19],RC4H[30],
-    RC4I[30],RC4W[30],RC8F(17)[30],RC8G(17)[30],RC8X(17)[19],RC9F(17)[30],
-    RC9G(17)[30],RC9X(17)[19],RD1N[19],RD1O[19],RD1P[20],RD1Y[19],RD1Z[19],
-    RD4H[30],RD4I[30],RD4W[30],RD8F(17)[30],RD8G(17)[30],RD8X(17)[19],
-    RD9F(17)[30],RD9G(17)[30],RD9X(17)[19],RF1N[19],RF1O[19],RF1P[20],
-    RF1Y[19],RF1Z[19],RF4H[30],RF4I[30],RF4W[30],RF8F(17)[30],RF8G(17)[30],
-    RF8X(17)[19],RF9F(17)[30],RF9G(17)[30],RF9X(17)[19],RG1N[19],RG1O[19],
-    RG1P[20],RG1Y[19],RG1Z[19],RG4H[30],RG4I[30],RG4W[30],RG8F(17)[30],
-    RG8G(17)[30],RG8X(17)[19],RG9F(17)[30],RG9G(17)[30],RG9X(17)[19],RI1N[19],
-    RI1O[19],RI1P[20],RI1Y[19],RI1Z[19],RI4H[30],RI4I[30],RI4W[30],
-    RI8F(17)[30],RI8G(17)[30],RI8X(17)[19],RI9F(17)[30],RI9G(17)[30],
-    RI9X(17)[19],RJ1N[19],RJ1O[19],RJ1P[20],RJ1Y[19],RJ1Z[19],RJ4H[30],
-    RJ4I[30],RJ4W[30],RJ8F(17)[30],RJ8G(17)[30],RJ8X(17)[19],RJ9F(17)[30],
-    RJ9G(17)[30],RJ9X(17)[19],RK1N[19],RK1O[19],RK1P[20],RK1Y[19],RK1Z[19],
-    RK4H[30],RK4I[30],RK4W[30],RK8F(17)[30],RK8G(17)[30],RK8X(17)[19],
-    RK9F(17)[30],RK9G(17)[30],RK9X(17)[19],RL1N[19],RL1O[19],RL1P[20],
-    RL1Y[19],RL1Z[19],RL4H[30],RL4I[30],RL4W[30],RL8F(17)[30],RL8G(17)[30],
-    RL8X(17)[19],RL9F(17)[30],RL9G(17)[30],RL9X(17)[19],RM1N[19],RM1O[19],
-    RM1P[20],RM1Y[19],RM1Z[19],RM4H[30],RM4I[30],RM4W[30],RM8F(17)[30],
-    RM8G(17)[30],RM8X(17)[19],RM9F(17)[30],RM9G(17)[30],RM9X(17)[19],RN1N[19],
-    RN1O[19],RN1P[20],RN1Y[19],RN1Z[19],RN4H[30],RN4I[30],RN4W[30],
-    RN8F(17)[30],RN8G(17)[30],RN8X(17)[19],RN9F(17)[30],RN9G(17)[30],
-    RN9X(17)[19],RO1N[19],RO1O[19],RO1P[20],RO1Y[19],RO1Z[19],RO4H[30],
-    RO4I[30],RO4W[30],RO8F(17)[30],RO8G(17)[30],RO8X(17)[19],RO9F(17)[30],
-    RO9G(17)[30],RO9X(17)[19],RP1N[19],RP1O[19],RP1P[20],RP1Y[19],RP1Z[19],
-    RP4H[30],RP4I[30],RP4W[30],RP8F(17)[30],RP8G(17)[30],RP8X(17)[19],
-    RP9F(17)[30],RP9G(17)[30],RP9X(17)[19],RQ1N[19],RQ1O[19],RQ1P[20],
-    RQ1Y[19],RQ1Z[19],RQ4H[30],RQ4I[30],RQ4W[30],RQ8F(17)[30],RQ8G(17)[30],
-    RQ8X(17)[19],RQ9F(17)[30],RQ9G(17)[30],RQ9X(17)[19],RR1N[19],RR1O[19],
-    RR1P[20],RR1Y[19],RR1Z[19],RR4H[30],RR4I[30],RR4W[30],RR8F(17)[30],
-    RR8G(17)[30],RR8X(17)[19],RR9F(17)[30],RR9G(17)[30],RR9X(17)[19],RT1N[19],
-    RT1O[19],RT1P[20],RT1Y[19],RT1Z[19],RT4H[30],RT4I[30],RT4W[30],
-    RT8F(17)[30],RT8G(17)[30],RT8X(17)[19],RT9F(17)[30],RT9G(17)[30],
-    RT9X(17)[19],RU1N[19],RU1O[19],RU1P[20],RU1Y[19],RU1Z[19],RU4H[30],
-    RU4I[30],RU4W[30],RU8F(17)[30],RU8G(17)[30],RU8X(17)[19],RU9F(17)[30],
-    RU9G(17)[30],RU9X(17)[19],RV1N[19],RV1O[19],RV1P[20],RV1Y[19],RV1Z[19],
-    RV4H[30],RV4I[30],RV4W[30],RV8F(17)[30],RV8G(17)[30],RV8X(17)[19],
-    RV9F(17)[30],RV9G(17)[30],RV9X(17)[19],RW1N[19],RW1O[19],RW1P[20],
-    RW1Y[19],RW1Z[19],RW4H[30],RW4I[30],RW4W[30],RW8F(17)[30],RW8G(17)[30],
-    RW8X(17)[19],RW9F(17)[30],RW9G(17)[30],RW9X(17)[19],RX1N[19],RX1O[19],
-    RX1P[20],RX1Y[19],RX1Z[19],RX4H[30],RX4I[30],RX4W[30],RX8F(17)[30],
-    RX8G(17)[30],RX8X(17)[19],RX9F(17)[30],RX9G(17)[30],RX9X(17)[19],RY1N[19],
-    RY1O[19],RY1P[20],RY1Y[19],RY1Z[19],RY4H[30],RY4I[30],RY4W[30],
-    RY8F(17)[30],RY8G(17)[30],RY8X(17)[19],RY9F(17)[30],RY9G(17)[30],
-    RY9X(17)[19],RZ1N[19],RZ1O[19],RZ1P[20],RZ1Y[19],RZ1Z[19],RZ4H[30],
-    RZ4I[30],RZ4W[30],RZ8F(17)[30],RZ8G(17)[30],RZ8X(17)[19],RZ9F(17)[30],
-    RZ9G(17)[30],RZ9X(17)[19],U1N[19],U1O[19],U1P[20],U1Y[19],U1Z[19],U4H[30],
-    U4I[30],U4W[30],U8F(17)[30],U8G(17)[30],U8X(17)[19],U9F(17)[30],
-    U9G(17)[30],U9X(17)[19],UA1N[19],UA1O[19],UA1P[20],UA1Y[19],UA1Z[19],
-    UA4H[30],UA4I[30],UA4W[30],UA8F(17)[30],UA8G(17)[30],UA8X(17)[19],
-    UA9F(17)[30],UA9G(17)[30],UA9X(17)[19],UB1N[19],UB1O[19],UB1P[20],
-    UB1Y[19],UB1Z[19],UB4H[30],UB4I[30],UB4W[30],UB8F(17)[30],UB8G(17)[30],
-    UB8X(17)[19],UB9F(17)[30],UB9G(17)[30],UB9X(17)[19],UC1N[19],UC1O[19],
-    UC1P[20],UC1Y[19],UC1Z[19],UC4H[30],UC4I[30],UC4W[30],UC8F(17)[30],
-    UC8G(17)[30],UC8X(17)[19],UC9F(17)[30],UC9G(17)[30],UC9X(17)[19],UD1N[19],
-    UD1O[19],UD1P[20],UD1Y[19],UD1Z[19],UD4H[30],UD4I[30],UD4W[30],
-    UD8F(17)[30],UD8G(17)[30],UD8X(17)[19],UD9F(17)[30],UD9G(17)[30],
-    UD9X(17)[19],UE1N[19],UE1O[19],UE1P[20],UE1Y[19],UE1Z[19],UE4H[30],
-    UE4I[30],UE4W[30],UE8F(17)[30],UE8G(17)[30],UE8X(17)[19],UE9F(17)[30],
-    UE9G(17)[30],UE9X(17)[19],UF1N[19],UF1O[19],UF1P[20],UF1Y[19],UF1Z[19],
-    UF4H[30],UF4I[30],UF4W[30],UF8F(17)[30],UF8G(17)[30],UF8X(17)[19],
-    UF9F(17)[30],UF9G(17)[30],UF9X(17)[19],UG1N[19],UG1O[19],UG1P[20],
-    UG1Y[19],UG1Z[19],UG4H[30],UG4I[30],UG4W[30],UG8F(17)[30],UG8G(17)[30],
-    UG8X(17)[19],UG9F(17)[30],UG9G(17)[30],UG9X(17)[19],UH1N[19],UH1O[19],
-    UH1P[20],UH1Y[19],UH1Z[19],UH4H[30],UH4I[30],UH4W[30],UH8F(17)[30],
-    UH8G(17)[30],UH8X(17)[19],UH9F(17)[30],UH9G(17)[30],UH9X(17)[19],UI1N[19],
-    UI1O[19],UI1P[20],UI1Y[19],UI1Z[19],UI4H[30],UI4I[30],UI4W[30],
-    UI8F(17)[30],UI8G(17)[30],UI8X(17)[19],UI9F(17)[30],UI9G(17)[30],
-    UI9X(17)[19];
+    R,U,R1N[19],R1O[19],R1P[20],R1Z[19],R4H[30],R4I[30],R4W[30],R8F(17)[30],
+    R8G(17)[30],R8X(17)[19],R9F(17)[30],R9G(17)[30],R9X(17)[19],RA1N[19],
+    RA1O[19],RA1P[20],RA1Z[19],RA4H[30],RA4I[30],RA4W[30],RA8F(17)[30],
+    RA8G(17)[30],RA8X(17)[19],RA9F(17)[30],RA9G(17)[30],RA9X(17)[19],RC1N[19],
+    RC1O[19],RC1P[20],RC1Z[19],RC4H[30],RC4I[30],RC4W[30],RC8F(17)[30],
+    RC8G(17)[30],RC8X(17)[19],RC9F(17)[30],RC9G(17)[30],RC9X(17)[19],RD1N[19],
+    RD1O[19],RD1P[20],RD1Z[19],RD4H[30],RD4I[30],RD4W[30],RD8F(17)[30],
+    RD8G(17)[30],RD8X(17)[19],RD9F(17)[30],RD9G(17)[30],RD9X(17)[19],RF1N[19],
+    RF1O[19],RF1P[20],RF1Z[19],RF4H[30],RF4I[30],RF4W[30],RF8F(17)[30],
+    RF8G(17)[30],RF8X(17)[19],RF9F(17)[30],RF9G(17)[30],RF9X(17)[19],RG1N[19],
+    RG1O[19],RG1P[20],RG1Z[19],RG4H[30],RG4I[30],RG4W[30],RG8F(17)[30],
+    RG8G(17)[30],RG8X(17)[19],RG9F(17)[30],RG9G(17)[30],RG9X(17)[19],RI1O[19],
+    RI1P[20],RJ1N[19],RJ1O[19],RJ1P[20],RJ1Z[19],RJ4H[30],RJ4I[30],RJ4W[30],
+    RJ8F(17)[30],RJ8G(17)[30],RJ8X(17)[19],RJ9F(17)[30],RJ9G(17)[30],
+    RJ9X(17)[19],RK1N[19],RK1O[19],RK1P[20],RK1Z[19],RK4H[30],RK4I[30],
+    RK4W[30],RK8F(17)[30],RK8G(17)[30],RK8X(17)[19],RK9F(17)[30],RK9G(17)[30],
+    RK9X(17)[19],RL1N[19],RL1O[19],RL1P[20],RL1Z[19],RL4H[30],RL4I[30],
+    RL4W[30],RL8F(17)[30],RL8G(17)[30],RL8X(17)[19],RL9F(17)[30],RL9G(17)[30],
+    RL9X(17)[19],RM1N[19],RM1O[19],RM1P[20],RM1Z[19],RM4H[30],RM4I[30],
+    RM4W[30],RM8F(17)[30],RM8G(17)[30],RM8X(17)[19],RM9F(17)[30],RM9G(17)[30],
+    RM9X(17)[19],RN1N[19],RN1O[19],RN1P[20],RN1Z[19],RN4H[30],RN4I[30],
+    RN4W[30],RN8F(17)[30],RN8G(17)[30],RN8X(17)[19],RN9F(17)[30],RN9G(17)[30],
+    RN9X(17)[19],RO1N[19],RO1O[19],RO1P[20],RO1Z[19],RO4H[30],RO4I[30],
+    RO4W[30],RO8F(17)[30],RO8G(17)[30],RO8X(17)[19],RO9F(17)[30],RO9G(17)[30],
+    RO9X(17)[19],RP1N[19],RP1O[19],RP1P[20],RP1Z[19],RP4H[30],RP4I[30],
+    RP4W[30],RP8F(17)[30],RP8G(17)[30],RP8X(17)[19],RP9F(17)[30],RP9G(17)[30],
+    RP9X(17)[19],RQ1N[19],RQ1O[19],RQ1P[20],RQ1Z[19],RQ4H[30],RQ4I[30],
+    RQ4W[30],RQ8F(17)[30],RQ8G(17)[30],RQ8X(17)[19],RQ9F(17)[30],RQ9G(17)[30],
+    RQ9X(17)[19],RR1N[19],RR1O[19],RR1P[20],RR1Z[19],RR4H[30],RR4I[30],
+    RR4W[30],RR8F(17)[30],RR8G(17)[30],RR8X(17)[19],RR9F(17)[30],RR9G(17)[30],
+    RR9X(17)[19],RT1N[19],RT1O[19],RT1P[20],RT1Z[19],RT4H[30],RT4I[30],
+    RT4W[30],RT8F(17)[30],RT8G(17)[30],RT8X(17)[19],RT9F(17)[30],RT9G(17)[30],
+    RT9X(17)[19],RU1N[19],RU1O[19],RU1P[20],RU1Z[19],RU4H[30],RU4I[30],
+    RU4W[30],RU8F(17)[30],RU8G(17)[30],RU8X(17)[19],RU9F(17)[30],RU9G(17)[30],
+    RU9X(17)[19],RV1N[19],RV1O[19],RV1P[20],RV1Z[19],RV4H[30],RV4I[30],
+    RV4W[30],RV8F(17)[30],RV8G(17)[30],RV8X(17)[19],RV9F(17)[30],RV9G(17)[30],
+    RV9X(17)[19],RW1N[19],RW1O[19],RW1P[20],RW1Z[19],RW4H[30],RW4I[30],
+    RW4W[30],RW8F(17)[30],RW8G(17)[30],RW8X(17)[19],RW9F(17)[30],RW9G(17)[30],
+    RW9X(17)[19],RX1N[19],RX1O[19],RX1P[20],RX1Z[19],RX4H[30],RX4I[30],
+    RX4W[30],RX8F(17)[30],RX8G(17)[30],RX8X(17)[19],RX9F(17)[30],RX9G(17)[30],
+    RX9X(17)[19],RY1N[19],RY1O[19],RY1P[20],RY1Z[19],RY4H[30],RY4I[30],
+    RY4W[30],RY8F(17)[30],RY8G(17)[30],RY8X(17)[19],RY9F(17)[30],RY9G(17)[30],
+    RY9X(17)[19],RZ1N[19],RZ1O[19],RZ1P[20],RZ1Z[19],RZ4H[30],RZ4I[30],
+    RZ4W[30],RZ8F(17)[30],RZ8G(17)[30],RZ8X(17)[19],RZ9F(17)[30],RZ9G(17)[30],
+    RZ9X(17)[19],U1N[19],U1O[19],U1P[20],U1Z[19],U4H[30],U4I[30],U4W[30],
+    U8F(17)[30],U8G(17)[30],U8X(17)[19],U9F(17)[30],U9G(17)[30],U9X(17)[19],
+    UA1N[19],UA1O[19],UA1P[20],UA1Z[19],UA4H[30],UA4I[30],UA4W[30],
+    UA8F(17)[30],UA8G(17)[30],UA8X(17)[19],UA9F(17)[30],UA9G(17)[30],
+    UA9X(17)[19],UB1N[19],UB1O[19],UB1P[20],UB1Z[19],UB4H[30],UB4I[30],
+    UB4W[30],UB8F(17)[30],UB8G(17)[30],UB8X(17)[19],UB9F(17)[30],UB9G(17)[30],
+    UB9X(17)[19],UC1N[19],UC1O[19],UC1P[20],UC1Z[19],UC4H[30],UC4I[30],
+    UC4W[30],UC8F(17)[30],UC8G(17)[30],UC8X(17)[19],UC9F(17)[30],UC9G(17)[30],
+    UC9X(17)[19],UD1N[19],UD1O[19],UD1P[20],UD1Z[19],UD4H[30],UD4I[30],
+    UD4W[30],UD8F(17)[30],UD8G(17)[30],UD8X(17)[19],UD9F(17)[30],UD9G(17)[30],
+    UD9X(17)[19],UE1N[19],UE1O[19],UE1P[20],UE1Z[19],UE4H[30],UE4I[30],
+    UE4W[30],UE8F(17)[30],UE8G(17)[30],UE8X(17)[19],UE9F(17)[30],UE9G(17)[30],
+    UE9X(17)[19],UF1N[19],UF1O[19],UF1P[20],UF1Z[19],UF4H[30],UF4I[30],
+    UF4W[30],UF8F(17)[30],UF8G(17)[30],UF8X(17)[19],UF9F(17)[30],UF9G(17)[30],
+    UF9X(17)[19],UG1N[19],UG1O[19],UG1P[20],UG1Z[19],UG4H[30],UG4I[30],
+    UG4W[30],UG8F(17)[30],UG8G(17)[30],UG8X(17)[19],UG9F(17)[30],UG9G(17)[30],
+    UG9X(17)[19],UH1N[19],UH1O[19],UH1P[20],UH1Z[19],UH4H[30],UH4I[30],
+    UH4W[30],UH8F(17)[30],UH8G(17)[30],UH8X(17)[19],UH9F(17)[30],UH9G(17)[30],
+    UH9X(17)[19],UI1N[19],UI1O[19],UI1P[20],UI1Z[19],UI4H[30],UI4I[30],
+    UI4W[30],UI8F(17)[30],UI8G(17)[30],UI8X(17)[19],UI9F(17)[30],UI9G(17)[30],
+    UI9X(17)[19],=UE85DRK(17)[19];
 Kaliningrad:              15:  29:  EU:   54.82:   -21.60:    -2.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,=R2MWO;
+    R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RF2F,RF2K,RG2F,RG2K,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,=R2MWO;
 Asiatic Russia:           17:  30:  AS:   67.18:  -104.00:    -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,
@@ -972,137 +964,118 @@ Asiatic Russia:           17:  30:  AS:   67.18:  -104.00:    -7.0:  UA9:
     RX9,RY0,RY8(17)[30],RY9,RZ0,RZ8(17)[30],RZ9,U0,U8(17)[30],U9,UA0,
     UA8(17)[30],UA9,UB0,UB8(17)[30],UB9,UC0,UC8(17)[30],UC9,UD0,UD8(17)[30],
     UD9,UE0,UE8(17)[30],UE9,UF0,UF8(17)[30],UF9,UG0,UG8(17)[30],UG9,UH0,
-    UH8(17)[30],UH9,UI0,UI8(17)[30],UI9,R0P(18)[32],R0T(18)[32],R0V(18)[32],
-    R8H(18)[31],R8I(18)[31],R8O(18)[31],R8P(18)[31],R8S(16)[30],R8T(16)[30],
-    R8U(18)[31],R8V(18)[31],R8W(16)[30],R8Y(18)[31],R8Z(18)[31],R9I(18)[31],
-    R9M(17)[30],R9P(18)[31],R9S(16),R9T(16),R9V(18)[31],R9W(16),RA0P(18)[32],
-    RA0T(18)[32],RA0V(18)[32],RA8H(18)[31],RA8I(18)[31],RA8O(18)[31],
-    RA8P(18)[31],RA8S(16)[30],RA8T(16)[30],RA8U(18)[31],RA8V(18)[31],
-    RA8W(16)[30],RA8Y(18)[31],RA8Z(18)[31],RA9I(18)[31],RA9M(17)[30],
-    RA9P(18)[31],RA9S(16),RA9T(16),RA9V(18)[31],RA9W(16),RC0P(18)[32],
-    RC0T(18)[32],RC0V(18)[32],RC8H(18)[31],RC8I(18)[31],RC8O(18)[31],
-    RC8P(18)[31],RC8S(16)[30],RC8T(16)[30],RC8U(18)[31],RC8V(18)[31],
-    RC8W(16)[30],RC8Y(18)[31],RC8Z(18)[31],RC9I(18)[31],RC9M(17)[30],
-    RC9P(18)[31],RC9S(16),RC9T(16),RC9V(18)[31],RC9W(16),RD0P(18)[32],
-    RD0T(18)[32],RD0V(18)[32],RD8H(18)[31],RD8I(18)[31],RD8O(18)[31],
-    RD8P(18)[31],RD8S(16)[30],RD8T(16)[30],RD8U(18)[31],RD8V(18)[31],
-    RD8W(16)[30],RD8Y(18)[31],RD8Z(18)[31],RD9I(18)[31],RD9M(17)[30],
-    RD9P(18)[31],RD9S(16),RD9T(16),RD9V(18)[31],RD9W(16),RF0P(18)[32],
-    RF0T(18)[32],RF0V(18)[32],RF8H(18)[31],RF8I(18)[31],RF8O(18)[31],
-    RF8P(18)[31],RF8S(16)[30],RF8T(16)[30],RF8U(18)[31],RF8V(18)[31],
-    RF8W(16)[30],RF8Y(18)[31],RF8Z(18)[31],RF9I(18)[31],RF9M(17)[30],
-    RF9P(18)[31],RF9S(16),RF9T(16),RF9V(18)[31],RF9W(16),RG0P(18)[32],
-    RG0T(18)[32],RG0V(18)[32],RG8H(18)[31],RG8I(18)[31],RG8O(18)[31],
-    RG8P(18)[31],RG8S(16)[30],RG8T(16)[30],RG8U(18)[31],RG8V(18)[31],
-    RG8W(16)[30],RG8Y(18)[31],RG8Z(18)[31],RG9I(18)[31],RG9M(17)[30],
-    RG9P(18)[31],RG9S(16),RG9T(16),RG9V(18)[31],RG9W(16),RI0P(18)[32],
-    RI0T(18)[32],RI0V(18)[32],RI8H(18)[31],RI8I(18)[31],RI8O(18)[31],
-    RI8P(18)[31],RI8S(16)[30],RI8T(16)[30],RI8U(18)[31],RI8V(18)[31],
-    RI8W(16)[30],RI8Y(18)[31],RI8Z(18)[31],RI9I(18)[31],RI9M(17)[30],
-    RI9P(18)[31],RI9S(16),RI9T(16),RI9V(18)[31],RI9W(16),RJ0P(18)[32],
-    RJ0T(18)[32],RJ0V(18)[32],RJ8H(18)[31],RJ8I(18)[31],RJ8O(18)[31],
-    RJ8P(18)[31],RJ8S(16)[30],RJ8T(16)[30],RJ8U(18)[31],RJ8V(18)[31],
-    RJ8W(16)[30],RJ8Y(18)[31],RJ8Z(18)[31],RJ9I(18)[31],RJ9M(17)[30],
-    RJ9P(18)[31],RJ9S(16),RJ9T(16),RJ9V(18)[31],RJ9W(16),RK0P(18)[32],
-    RK0T(18)[32],RK0V(18)[32],RK8H(18)[31],RK8I(18)[31],RK8O(18)[31],
-    RK8P(18)[31],RK8S(16)[30],RK8T(16)[30],RK8U(18)[31],RK8V(18)[31],
-    RK8W(16)[30],RK8Y(18)[31],RK8Z(18)[31],RK9I(18)[31],RK9M(17)[30],
-    RK9P(18)[31],RK9S(16),RK9T(16),RK9V(18)[31],RK9W(16),RL0P(18)[32],
-    RL0T(18)[32],RL0V(18)[32],RL8H(18)[31],RL8I(18)[31],RL8O(18)[31],
-    RL8P(18)[31],RL8S(16)[30],RL8T(16)[30],RL8U(18)[31],RL8V(18)[31],
-    RL8W(16)[30],RL8Y(18)[31],RL8Z(18)[31],RL9I(18)[31],RL9M(17)[30],
-    RL9P(18)[31],RL9S(16),RL9T(16),RL9V(18)[31],RL9W(16),RM0P(18)[32],
-    RM0T(18)[32],RM0V(18)[32],RM8H(18)[31],RM8I(18)[31],RM8O(18)[31],
-    RM8P(18)[31],RM8S(16)[30],RM8T(16)[30],RM8U(18)[31],RM8V(18)[31],
-    RM8W(16)[30],RM8Y(18)[31],RM8Z(18)[31],RM9I(18)[31],RM9M(17)[30],
-    RM9P(18)[31],RM9S(16),RM9T(16),RM9V(18)[31],RM9W(16),RN0P(18)[32],
-    RN0T(18)[32],RN0V(18)[32],RN8H(18)[31],RN8I(18)[31],RN8O(18)[31],
-    RN8P(18)[31],RN8S(16)[30],RN8T(16)[30],RN8U(18)[31],RN8V(18)[31],
-    RN8W(16)[30],RN8Y(18)[31],RN8Z(18)[31],RN9I(18)[31],RN9M(17)[30],
-    RN9P(18)[31],RN9S(16),RN9T(16),RN9V(18)[31],RN9W(16),RO0P(18)[32],
-    RO0T(18)[32],RO0V(18)[32],RO8H(18)[31],RO8I(18)[31],RO8O(18)[31],
-    RO8P(18)[31],RO8S(16)[30],RO8T(16)[30],RO8U(18)[31],RO8V(18)[31],
-    RO8W(16)[30],RO8Y(18)[31],RO8Z(18)[31],RO9I(18)[31],RO9M(17)[30],
-    RO9P(18)[31],RO9S(16),RO9T(16),RO9V(18)[31],RO9W(16),RP0P(18)[32],
-    RP0T(18)[32],RP0V(18)[32],RP8H(18)[31],RP8I(18)[31],RP8O(18)[31],
-    RP8P(18)[31],RP8S(16)[30],RP8T(16)[30],RP8U(18)[31],RP8V(18)[31],
-    RP8W(16)[30],RP8Y(18)[31],RP8Z(18)[31],RP9I(18)[31],RP9M(17)[30],
-    RP9P(18)[31],RP9S(16),RP9T(16),RP9V(18)[31],RP9W(16),RQ0P(18)[32],
-    RQ0T(18)[32],RQ0V(18)[32],RQ8H(18)[31],RQ8I(18)[31],RQ8O(18)[31],
-    RQ8P(18)[31],RQ8S(16)[30],RQ8T(16)[30],RQ8U(18)[31],RQ8V(18)[31],
-    RQ8W(16)[30],RQ8Y(18)[31],RQ8Z(18)[31],RQ9I(18)[31],RQ9M(17)[30],
-    RQ9P(18)[31],RQ9S(16),RQ9T(16),RQ9V(18)[31],RQ9W(16),RR0P(18)[32],
-    RR0T(18)[32],RR0V(18)[32],RR8H(18)[31],RR8I(18)[31],RR8O(18)[31],
-    RR8P(18)[31],RR8S(16)[30],RR8T(16)[30],RR8U(18)[31],RR8V(18)[31],
-    RR8W(16)[30],RR8Y(18)[31],RR8Z(18)[31],RR9I(18)[31],RR9M(17)[30],
-    RR9P(18)[31],RR9S(16),RR9T(16),RR9V(18)[31],RR9W(16),RT0P(18)[32],
-    RT0T(18)[32],RT0V(18)[32],RT8H(18)[31],RT8I(18)[31],RT8O(18)[31],
-    RT8P(18)[31],RT8S(16)[30],RT8T(16)[30],RT8U(18)[31],RT8V(18)[31],
-    RT8W(16)[30],RT8Y(18)[31],RT8Z(18)[31],RT9I(18)[31],RT9M(17)[30],
-    RT9P(18)[31],RT9S(16),RT9T(16),RT9V(18)[31],RT9W(16),RU0P(18)[32],
-    RU0T(18)[32],RU0V(18)[32],RU8H(18)[31],RU8I(18)[31],RU8O(18)[31],
-    RU8P(18)[31],RU8S(16)[30],RU8T(16)[30],RU8U(18)[31],RU8V(18)[31],
-    RU8W(16)[30],RU8Y(18)[31],RU8Z(18)[31],RU9I(18)[31],RU9M(17)[30],
-    RU9P(18)[31],RU9S(16),RU9T(16),RU9V(18)[31],RU9W(16),RV0P(18)[32],
-    RV0T(18)[32],RV0V(18)[32],RV8H(18)[31],RV8I(18)[31],RV8O(18)[31],
-    RV8P(18)[31],RV8S(16)[30],RV8T(16)[30],RV8U(18)[31],RV8V(18)[31],
-    RV8W(16)[30],RV8Y(18)[31],RV8Z(18)[31],RV9I(18)[31],RV9M(17)[30],
-    RV9P(18)[31],RV9S(16),RV9T(16),RV9V(18)[31],RV9W(16),RW0P(18)[32],
-    RW0T(18)[32],RW0V(18)[32],RW8H(18)[31],RW8I(18)[31],RW8O(18)[31],
-    RW8P(18)[31],RW8S(16)[30],RW8T(16)[30],RW8U(18)[31],RW8V(18)[31],
-    RW8W(16)[30],RW8Y(18)[31],RW8Z(18)[31],RW9I(18)[31],RW9M(17)[30],
-    RW9P(18)[31],RW9S(16),RW9T(16),RW9V(18)[31],RW9W(16),RX0P(18)[32],
-    RX0T(18)[32],RX0V(18)[32],RX8H(18)[31],RX8I(18)[31],RX8O(18)[31],
-    RX8P(18)[31],RX8S(16)[30],RX8T(16)[30],RX8U(18)[31],RX8V(18)[31],
-    RX8W(16)[30],RX8Y(18)[31],RX8Z(18)[31],RX9I(18)[31],RX9M(17)[30],
-    RX9P(18)[31],RX9S(16),RX9T(16),RX9V(18)[31],RX9W(16),RY0P(18)[32],
-    RY0T(18)[32],RY0V(18)[32],RY8H(18)[31],RY8I(18)[31],RY8O(18)[31],
-    RY8P(18)[31],RY8S(16)[30],RY8T(16)[30],RY8U(18)[31],RY8V(18)[31],
-    RY8W(16)[30],RY8Y(18)[31],RY8Z(18)[31],RY9I(18)[31],RY9M(17)[30],
-    RY9P(18)[31],RY9S(16),RY9T(16),RY9V(18)[31],RY9W(16),RZ0P(18)[32],
-    RZ0T(18)[32],RZ0V(18)[32],RZ8H(18)[31],RZ8I(18)[31],RZ8O(18)[31],
-    RZ8P(18)[31],RZ8S(16)[30],RZ8T(16)[30],RZ8U(18)[31],RZ8V(18)[31],
-    RZ8W(16)[30],RZ8Y(18)[31],RZ8Z(18)[31],RZ9I(18)[31],RZ9M(17)[30],
-    RZ9P(18)[31],RZ9S(16),RZ9T(16),RZ9V(18)[31],RZ9W(16),U0P(18)[32],
-    U0T(18)[32],U0V(18)[32],U8H(18)[31],U8I(18)[31],U8O(18)[31],U8P(18)[31],
-    U8S(16)[30],U8T(16)[30],U8U(18)[31],U8V(18)[31],U8W(16)[30],U8Y(18)[31],
-    U8Z(18)[31],U9I(18)[31],U9M(17)[30],U9P(18)[31],U9S(16),U9T(16),
-    U9V(18)[31],U9W(16),UA0P(18)[32],UA0T(18)[32],UA0V(18)[32],UA8H(18)[31],
-    UA8I(18)[31],UA8O(18)[31],UA8P(18)[31],UA8S(16)[30],UA8T(16)[30],
-    UA8U(18)[31],UA8V(18)[31],UA8W(16)[30],UA8Y(18)[31],UA8Z(18)[31],
-    UA9I(18)[31],UA9M(17)[30],UA9P(18)[31],UA9S(16),UA9T(16),UA9V(18)[31],
-    UA9W(16),UB0P(18)[32],UB0T(18)[32],UB0V(18)[32],UB8H(18)[31],UB8I(18)[31],
+    UH8(17)[30],UH9,UI0,UI8(17)[30],UI9,R0T(18)[32],R8H(18)[31],R8I(18)[31],
+    R8O(18)[31],R8P(18)[31],R8S(16)[30],R8T(16)[30],R8U(18)[31],R8V(18)[31],
+    R8W(16)[30],R8Y(18)[31],R8Z(18)[31],R9I(18)[31],R9M(17)[30],R9P(18)[31],
+    R9S(16),R9T(16),R9V(18)[31],R9W(16),RA0T(18)[32],RA8H(18)[31],
+    RA8I(18)[31],RA8O(18)[31],RA8P(18)[31],RA8S(16)[30],RA8T(16)[30],
+    RA8U(18)[31],RA8V(18)[31],RA8W(16)[30],RA8Y(18)[31],RA8Z(18)[31],
+    RA9I(18)[31],RA9M(17)[30],RA9P(18)[31],RA9S(16),RA9T(16),RA9V(18)[31],
+    RA9W(16),RC0T(18)[32],RC8H(18)[31],RC8I(18)[31],RC8O(18)[31],RC8P(18)[31],
+    RC8S(16)[30],RC8T(16)[30],RC8U(18)[31],RC8V(18)[31],RC8W(16)[30],
+    RC8Y(18)[31],RC8Z(18)[31],RC9I(18)[31],RC9M(17)[30],RC9P(18)[31],RC9S(16),
+    RC9T(16),RC9V(18)[31],RC9W(16),RD0T(18)[32],RD8H(18)[31],RD8I(18)[31],
+    RD8O(18)[31],RD8P(18)[31],RD8S(16)[30],RD8T(16)[30],RD8U(18)[31],
+    RD8V(18)[31],RD8W(16)[30],RD8Y(18)[31],RD8Z(18)[31],RD9I(18)[31],
+    RD9M(17)[30],RD9P(18)[31],RD9S(16),RD9T(16),RD9V(18)[31],RD9W(16),
+    RF0T(18)[32],RF8H(18)[31],RF8I(18)[31],RF8O(18)[31],RF8P(18)[31],
+    RF8S(16)[30],RF8T(16)[30],RF8U(18)[31],RF8V(18)[31],RF8W(16)[30],
+    RF8Y(18)[31],RF8Z(18)[31],RF9I(18)[31],RF9M(17)[30],RF9P(18)[31],RF9S(16),
+    RF9T(16),RF9V(18)[31],RF9W(16),RG0T(18)[32],RG8H(18)[31],RG8I(18)[31],
+    RG8O(18)[31],RG8P(18)[31],RG8S(16)[30],RG8T(16)[30],RG8U(18)[31],
+    RG8V(18)[31],RG8W(16)[30],RG8Y(18)[31],RG8Z(18)[31],RG9I(18)[31],
+    RG9M(17)[30],RG9P(18)[31],RG9S(16),RG9T(16),RG9V(18)[31],RG9W(16),
+    RJ0T(18)[32],RJ8H(18)[31],RJ8I(18)[31],RJ8O(18)[31],RJ8P(18)[31],
+    RJ8S(16)[30],RJ8T(16)[30],RJ8U(18)[31],RJ8V(18)[31],RJ8W(16)[30],
+    RJ8Y(18)[31],RJ8Z(18)[31],RJ9I(18)[31],RJ9M(17)[30],RJ9P(18)[31],RJ9S(16),
+    RJ9T(16),RJ9V(18)[31],RJ9W(16),RK0T(18)[32],RK8H(18)[31],RK8I(18)[31],
+    RK8O(18)[31],RK8P(18)[31],RK8S(16)[30],RK8T(16)[30],RK8U(18)[31],
+    RK8V(18)[31],RK8W(16)[30],RK8Y(18)[31],RK8Z(18)[31],RK9I(18)[31],
+    RK9M(17)[30],RK9P(18)[31],RK9S(16),RK9T(16),RK9V(18)[31],RK9W(16),
+    RL0T(18)[32],RL8H(18)[31],RL8I(18)[31],RL8O(18)[31],RL8P(18)[31],
+    RL8S(16)[30],RL8T(16)[30],RL8U(18)[31],RL8V(18)[31],RL8W(16)[30],
+    RL8Y(18)[31],RL8Z(18)[31],RL9I(18)[31],RL9M(17)[30],RL9P(18)[31],RL9S(16),
+    RL9T(16),RL9V(18)[31],RL9W(16),RM0T(18)[32],RM8H(18)[31],RM8I(18)[31],
+    RM8O(18)[31],RM8P(18)[31],RM8S(16)[30],RM8T(16)[30],RM8U(18)[31],
+    RM8V(18)[31],RM8W(16)[30],RM8Y(18)[31],RM8Z(18)[31],RM9I(18)[31],
+    RM9M(17)[30],RM9P(18)[31],RM9S(16),RM9T(16),RM9V(18)[31],RM9W(16),
+    RN0T(18)[32],RN8H(18)[31],RN8I(18)[31],RN8O(18)[31],RN8P(18)[31],
+    RN8S(16)[30],RN8T(16)[30],RN8U(18)[31],RN8V(18)[31],RN8W(16)[30],
+    RN8Y(18)[31],RN8Z(18)[31],RN9I(18)[31],RN9M(17)[30],RN9P(18)[31],RN9S(16),
+    RN9T(16),RN9V(18)[31],RN9W(16),RO0T(18)[32],RO8H(18)[31],RO8I(18)[31],
+    RO8O(18)[31],RO8P(18)[31],RO8S(16)[30],RO8T(16)[30],RO8U(18)[31],
+    RO8V(18)[31],RO8W(16)[30],RO8Y(18)[31],RO8Z(18)[31],RO9I(18)[31],
+    RO9M(17)[30],RO9P(18)[31],RO9S(16),RO9T(16),RO9V(18)[31],RO9W(16),
+    RP0T(18)[32],RP8H(18)[31],RP8I(18)[31],RP8O(18)[31],RP8P(18)[31],
+    RP8S(16)[30],RP8T(16)[30],RP8U(18)[31],RP8V(18)[31],RP8W(16)[30],
+    RP8Y(18)[31],RP8Z(18)[31],RP9I(18)[31],RP9M(17)[30],RP9P(18)[31],RP9S(16),
+    RP9T(16),RP9V(18)[31],RP9W(16),RQ0T(18)[32],RQ8H(18)[31],RQ8I(18)[31],
+    RQ8O(18)[31],RQ8P(18)[31],RQ8S(16)[30],RQ8T(16)[30],RQ8U(18)[31],
+    RQ8V(18)[31],RQ8W(16)[30],RQ8Y(18)[31],RQ8Z(18)[31],RQ9I(18)[31],
+    RQ9M(17)[30],RQ9P(18)[31],RQ9S(16),RQ9T(16),RQ9V(18)[31],RQ9W(16),
+    RR0T(18)[32],RR8H(18)[31],RR8I(18)[31],RR8O(18)[31],RR8P(18)[31],
+    RR8S(16)[30],RR8T(16)[30],RR8U(18)[31],RR8V(18)[31],RR8W(16)[30],
+    RR8Y(18)[31],RR8Z(18)[31],RR9I(18)[31],RR9M(17)[30],RR9P(18)[31],RR9S(16),
+    RR9T(16),RR9V(18)[31],RR9W(16),RT0T(18)[32],RT8H(18)[31],RT8I(18)[31],
+    RT8O(18)[31],RT8P(18)[31],RT8S(16)[30],RT8T(16)[30],RT8U(18)[31],
+    RT8V(18)[31],RT8W(16)[30],RT8Y(18)[31],RT8Z(18)[31],RT9I(18)[31],
+    RT9M(17)[30],RT9P(18)[31],RT9S(16),RT9T(16),RT9V(18)[31],RT9W(16),
+    RU0T(18)[32],RU8H(18)[31],RU8I(18)[31],RU8O(18)[31],RU8P(18)[31],
+    RU8S(16)[30],RU8T(16)[30],RU8U(18)[31],RU8V(18)[31],RU8W(16)[30],
+    RU8Y(18)[31],RU8Z(18)[31],RU9I(18)[31],RU9M(17)[30],RU9P(18)[31],RU9S(16),
+    RU9T(16),RU9V(18)[31],RU9W(16),RV0T(18)[32],RV8H(18)[31],RV8I(18)[31],
+    RV8O(18)[31],RV8P(18)[31],RV8S(16)[30],RV8T(16)[30],RV8U(18)[31],
+    RV8V(18)[31],RV8W(16)[30],RV8Y(18)[31],RV8Z(18)[31],RV9I(18)[31],
+    RV9M(17)[30],RV9P(18)[31],RV9S(16),RV9T(16),RV9V(18)[31],RV9W(16),
+    RW0T(18)[32],RW8H(18)[31],RW8I(18)[31],RW8O(18)[31],RW8P(18)[31],
+    RW8S(16)[30],RW8T(16)[30],RW8U(18)[31],RW8V(18)[31],RW8W(16)[30],
+    RW8Y(18)[31],RW8Z(18)[31],RW9I(18)[31],RW9M(17)[30],RW9P(18)[31],RW9S(16),
+    RW9T(16),RW9V(18)[31],RW9W(16),RX0T(18)[32],RX8H(18)[31],RX8I(18)[31],
+    RX8O(18)[31],RX8P(18)[31],RX8S(16)[30],RX8T(16)[30],RX8U(18)[31],
+    RX8V(18)[31],RX8W(16)[30],RX8Y(18)[31],RX8Z(18)[31],RX9I(18)[31],
+    RX9M(17)[30],RX9P(18)[31],RX9S(16),RX9T(16),RX9V(18)[31],RX9W(16),
+    RY0T(18)[32],RY8H(18)[31],RY8I(18)[31],RY8O(18)[31],RY8P(18)[31],
+    RY8S(16)[30],RY8T(16)[30],RY8U(18)[31],RY8V(18)[31],RY8W(16)[30],
+    RY8Y(18)[31],RY8Z(18)[31],RY9I(18)[31],RY9M(17)[30],RY9P(18)[31],RY9S(16),
+    RY9T(16),RY9V(18)[31],RY9W(16),RZ0T(18)[32],RZ8H(18)[31],RZ8I(18)[31],
+    RZ8O(18)[31],RZ8P(18)[31],RZ8S(16)[30],RZ8T(16)[30],RZ8U(18)[31],
+    RZ8V(18)[31],RZ8W(16)[30],RZ8Y(18)[31],RZ8Z(18)[31],RZ9I(18)[31],
+    RZ9M(17)[30],RZ9P(18)[31],RZ9S(16),RZ9T(16),RZ9V(18)[31],RZ9W(16),
+    U0T(18)[32],U8H(18)[31],U8I(18)[31],U8O(18)[31],U8P(18)[31],U8S(16)[30],
+    U8T(16)[30],U8U(18)[31],U8V(18)[31],U8W(16)[30],U8Y(18)[31],U8Z(18)[31],
+    U9I(18)[31],U9M(17)[30],U9P(18)[31],U9S(16),U9T(16),U9V(18)[31],U9W(16),
+    UA0T(18)[32],UA8H(18)[31],UA8I(18)[31],UA8O(18)[31],UA8P(18)[31],
+    UA8S(16)[30],UA8T(16)[30],UA8U(18)[31],UA8V(18)[31],UA8W(16)[30],
+    UA8Y(18)[31],UA8Z(18)[31],UA9I(18)[31],UA9M(17)[30],UA9P(18)[31],UA9S(16),
+    UA9T(16),UA9V(18)[31],UA9W(16),UB0T(18)[32],UB8H(18)[31],UB8I(18)[31],
     UB8O(18)[31],UB8P(18)[31],UB8S(16)[30],UB8T(16)[30],UB8U(18)[31],
     UB8V(18)[31],UB8W(16)[30],UB8Y(18)[31],UB8Z(18)[31],UB9I(18)[31],
     UB9M(17)[30],UB9P(18)[31],UB9S(16),UB9T(16),UB9V(18)[31],UB9W(16),
-    UC0P(18)[32],UC0T(18)[32],UC0V(18)[32],UC8H(18)[31],UC8I(18)[31],
-    UC8O(18)[31],UC8P(18)[31],UC8S(16)[30],UC8T(16)[30],UC8U(18)[31],
-    UC8V(18)[31],UC8W(16)[30],UC8Y(18)[31],UC8Z(18)[31],UC9I(18)[31],
-    UC9M(17)[30],UC9P(18)[31],UC9S(16),UC9T(16),UC9V(18)[31],UC9W(16),
-    UD0P(18)[32],UD0T(18)[32],UD0V(18)[32],UD8H(18)[31],UD8I(18)[31],
+    UC0T(18)[32],UC8H(18)[31],UC8I(18)[31],UC8O(18)[31],UC8P(18)[31],
+    UC8S(16)[30],UC8T(16)[30],UC8U(18)[31],UC8V(18)[31],UC8W(16)[30],
+    UC8Y(18)[31],UC8Z(18)[31],UC9I(18)[31],UC9M(17)[30],UC9P(18)[31],UC9S(16),
+    UC9T(16),UC9V(18)[31],UC9W(16),UD0T(18)[32],UD8H(18)[31],UD8I(18)[31],
     UD8O(18)[31],UD8P(18)[31],UD8S(16)[30],UD8T(16)[30],UD8U(18)[31],
     UD8V(18)[31],UD8W(16)[30],UD8Y(18)[31],UD8Z(18)[31],UD9I(18)[31],
     UD9M(17)[30],UD9P(18)[31],UD9S(16),UD9T(16),UD9V(18)[31],UD9W(16),
-    UE0P(18)[32],UE0T(18)[32],UE0V(18)[32],UE8H(18)[31],UE8I(18)[31],
-    UE8O(18)[31],UE8P(18)[31],UE8S(16)[30],UE8T(16)[30],UE8U(18)[31],
-    UE8V(18)[31],UE8W(16)[30],UE8Y(18)[31],UE8Z(18)[31],UE9I(18)[31],
-    UE9M(17)[30],UE9P(18)[31],UE9S(16),UE9T(16),UE9V(18)[31],UE9W(16),
-    UF0P(18)[32],UF0T(18)[32],UF0V(18)[32],UF8H(18)[31],UF8I(18)[31],
+    UE0T(18)[32],UE8H(18)[31],UE8I(18)[31],UE8O(18)[31],UE8P(18)[31],
+    UE8S(16)[30],UE8T(16)[30],UE8U(18)[31],UE8V(18)[31],UE8W(16)[30],
+    UE8Y(18)[31],UE8Z(18)[31],UE9I(18)[31],UE9M(17)[30],UE9P(18)[31],UE9S(16),
+    UE9T(16),UE9V(18)[31],UE9W(16),UF0T(18)[32],UF8H(18)[31],UF8I(18)[31],
     UF8O(18)[31],UF8P(18)[31],UF8S(16)[30],UF8T(16)[30],UF8U(18)[31],
     UF8V(18)[31],UF8W(16)[30],UF8Y(18)[31],UF8Z(18)[31],UF9I(18)[31],
     UF9M(17)[30],UF9P(18)[31],UF9S(16),UF9T(16),UF9V(18)[31],UF9W(16),
-    UG0P(18)[32],UG0T(18)[32],UG0V(18)[32],UG8H(18)[31],UG8I(18)[31],
-    UG8O(18)[31],UG8P(18)[31],UG8S(16)[30],UG8T(16)[30],UG8U(18)[31],
-    UG8V(18)[31],UG8W(16)[30],UG8Y(18)[31],UG8Z(18)[31],UG9I(18)[31],
-    UG9M(17)[30],UG9P(18)[31],UG9S(16),UG9T(16),UG9V(18)[31],UG9W(16),
-    UH0P(18)[32],UH0T(18)[32],UH0V(18)[32],UH8H(18)[31],UH8I(18)[31],
+    UG0T(18)[32],UG8H(18)[31],UG8I(18)[31],UG8O(18)[31],UG8P(18)[31],
+    UG8S(16)[30],UG8T(16)[30],UG8U(18)[31],UG8V(18)[31],UG8W(16)[30],
+    UG8Y(18)[31],UG8Z(18)[31],UG9I(18)[31],UG9M(17)[30],UG9P(18)[31],UG9S(16),
+    UG9T(16),UG9V(18)[31],UG9W(16),UH0T(18)[32],UH8H(18)[31],UH8I(18)[31],
     UH8O(18)[31],UH8P(18)[31],UH8S(16)[30],UH8T(16)[30],UH8U(18)[31],
     UH8V(18)[31],UH8W(16)[30],UH8Y(18)[31],UH8Z(18)[31],UH9I(18)[31],
     UH9M(17)[30],UH9P(18)[31],UH9S(16),UH9T(16),UH9V(18)[31],UH9W(16),
-    UI0P(18)[32],UI0T(18)[32],UI0V(18)[32],UI8H(18)[31],UI8I(18)[31],
-    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);
+    UI0T(18)[32],UI8H(18)[31],UI8I(18)[31],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);
 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,7 +1131,7 @@ 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,=VER20120311,=VA2PL(2)[4],
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20120323,=VA2PL(2)[4],
     =VE0MDL(3)[2],=VE2AEJ(4)[4],=VE2CSI(2)[4],=VE2DXY(2)[4],=VE2EKA(2)[4],
     =VE2ENB(2)[4],=VE2FK[9],=VE2GSO(2)[4],=VE2HRI(2)[4],=VE2III(2)[4],
     =VE2IM(2)[4],=VE2TKH(2)[4],=VY0PW(4)[3];
@@ -1168,10 +1141,10 @@ Australia:                30:  59:  OC:  -23.70:  -132.33:   -10.0:  VK:
 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,=AX0TH,=VK0TH;
+    =AX/VK0TH,=VK0TH;
 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;
+    VN9C,VN9Y,VZ9C,VZ9Y,=VK9AA;
 Lord Howe Island:         30:  60:  OC:  -31.55:  -159.08:   -10.5:  VK9L:
     AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L,=VK9FLHI,=VK9ZLH;
 Mellish Reef:             30:  56:  OC:  -17.40:  -155.85:   -10.0:  VK9M:
@@ -1190,7 +1163,7 @@ Montserrat:               08:  11:  NA:   16.75:    62.18:     4.0:  VP2M:
 British Virgin Islands:   08:  11:  NA:   18.33:    64.75:     4.0:  VP2V:
     VP2V;
 Turks & Caicos Islands:   08:  11:  NA:   21.77:    71.75:     5.0:  VP5:
-    VP5,VQ5;
+    VP5,VQ5,=VERSION;
 Pitcairn Island:          32:  63:  OC:  -24.35:   128.32:     8.0:  VP6:
     VP6;
 Ducie Island:             32:  63:  OC:  -24.70:   124.80:     8.0:  VP6/d:
@@ -1200,7 +1173,7 @@ Falkland Islands:         13:  16:  SA:  -51.63:    58.72:     4.0:  VP8:
 South Georgia Island:     13:  73:  SA:  -54.48:    37.08:     2.0:  VP8/g:
     =VP8DIF;
 South Shetland Islands:   13:  73:  SA:  -62.08:    58.67:     4.0:  VP8/h:
-    CE9,XR9,=EA1CYK/P,=HF0POL,=VP8/EA1CYK,=VP8/EA1CYK/P;
+    CE9,XR9,=EA1CYK/P,=HF0POL,=RI1ANA,=VP8/EA1CYK,=VP8/EA1CYK/P;
 South Orkney Islands:     13:  73:  SA:  -60.60:    45.55:     3.0:  VP8/o:
     =LU1ZA;
 South Sandwich Islands:   13:  73:  SA:  -58.43:    26.33:     2.0:  VP8/s:

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index a85c27f2666f6e31b5a1359f56dd13db217d3766..da4a92e43cc895ce79bee02d54647f8a76cc5e0f 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -313,12 +313,13 @@
   '=3D2RI' => '299',
   '=3Y0E' => '258',
   '=3Y0X' => '296',
+  '=4U1GSC' => '83,388,389',
   '=4U1WB' => '207',
   '=4U1WRC' => '260',
-  '=7N4RHO/BM' => '91,390,391,392,393',
   '=8J1RL' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=9M4CBP' => '289,652',
   '=9M4CRB' => '289,652',
+  '=9M6/OH2YY' => '247',
   '=9M8DX/2' => '288',
   '=AA4DD' => '207',
   '=AA4YL' => '207',
@@ -342,11 +343,9 @@
   '=AJ4A' => '207',
   '=AJ4F' => '207',
   '=AX/VK0TH' => '191',
-  '=AX0TH' => '191',
   '=BG0GE/9' => '10,343,344,345',
   '=BS7H' => '303',
   '=CE9VPM' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
-  '=DL0CUX/LV' => '32',
   '=DP0GVN' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=DP0GVN/P' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=DP1POL' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
@@ -378,7 +377,6 @@
   '=GB2AD' => '62',
   '=GB2CHC' => '64,381',
   '=GB2ELH' => '381',
-  '=GB2FLB' => '66',
   '=GB2GGM' => '66',
   '=GB2GNL' => '64,381',
   '=GB2LBN' => '64,381',
@@ -386,7 +384,6 @@
   '=GB2LT' => '64,381',
   '=GB2MOF' => '64,381',
   '=GB2NCL' => '64,381',
-  '=GB2OL' => '64,381',
   '=GB2OWM' => '64,381',
   '=GB2PP' => '62',
   '=GB2RSC' => '66',
@@ -400,7 +397,6 @@
   '=GB4MBC' => '66',
   '=GB4MD' => '66',
   '=GB4MDI' => '66',
-  '=GB4OL' => '64,381',
   '=GB4SDD' => '66',
   '=GB4SI' => '381',
   '=GB4SWF' => '64,381',
@@ -470,10 +466,12 @@
   '=GM8LNH' => '381',
   '=GM8MMA' => '381',
   '=GM8YEC' => '381',
+  '=GQ0TQM' => '66',
+  '=GQ4BKG' => '66',
+  '=GQ4PRB' => '64,381',
   '=GS3ZET' => '381',
   '=GS4WAB/P' => '381',
   '=HF0POL' => '340',
-  '=HK0NA' => '329',
   '=HK0TU' => '329',
   '=HZ1SBS/J' => '82,383,384',
   '=I1YRL/GRA' => '83,388,389',
@@ -703,6 +701,7 @@
   '=LU1WJF/W' => '117,427,428',
   '=LU1WJY/W' => '117,427,428',
   '=LU1XA/XA' => '117,427,428',
+  '=LU1XZ/D' => '117,427,428',
   '=LU1YY/D' => '117,427,428',
   '=LU1YY/XA' => '117,427,428',
   '=LU1ZA' => '338',
@@ -770,6 +769,8 @@
   '=MM5PSL' => '381',
   '=MM6ACW' => '381',
   '=MM6SJK' => '381',
+  '=MQ6BJJ' => '64,381',
+  '=MQ6KAU' => '64,381',
   '=MS0ZCG' => '381',
   '=MS0ZET' => '381',
   '=N0EOP' => '207',
@@ -877,13 +878,12 @@
   '=R1ANP' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=R1ANR' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=R2MWO' => '171',
-  '=RI1ANA' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
-  '=RI1ANC' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
-  '=RI1ANC/P' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
+  '=RI1ANA' => '340',
   '=RI1ANR' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=SV0XAI/9' => '148',
   '=SV0XAN/5' => '147',
   '=SV0XBN/9' => '148',
+  '=SV0XBW' => '148',
   '=SV0XBZ/5' => '147',
   '=SV0XBZ/9' => '148',
   '=SV0XCA/5' => '147',
@@ -895,8 +895,8 @@
   '=TO2R' => '50,51,379,53',
   '=TO3J' => '322',
   '=TO3X' => '322',
-  '=TO4M' => '44',
   '=TO5A' => '46',
+  '=TO5K' => '46',
   '=TO5T' => '46',
   '=TO5X' => '46',
   '=TO7A' => '46',
@@ -906,6 +906,7 @@
   '=TX6T' => '47,376,377,48,312,313',
   '=TX6T/P' => '47,376,377,48,312,313',
   '=TX7M' => '313',
+  '=UE85DRK' => '169,516,517,518,519',
   '=VA2PL' => '187,543,544,545,546,547,548,549,550,551',
   '=VE0MDL' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2AEJ' => '187,543,544,545,546,547,548,549,550,551',
@@ -919,11 +920,12 @@
   '=VE2III' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2IM' => '187,543,544,545,546,547,548,549,550,551',
   '=VE2TKH' => '187,543,544,545,546,547,548,549,550,551',
-  '=VER20120311' => '187,543,544,545,546,547,548,549,550,551',
-  '=VERSION' => '182',
+  '=VER20120323' => '187,543,544,545,546,547,548,549,550,551',
+  '=VERSION' => '195',
   '=VK0BFG' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VK0IR' => '190',
   '=VK0TH' => '191',
+  '=VK9AA' => '334',
   '=VK9FLHI' => '332',
   '=VK9ZLH' => '332',
   '=VO1AU/BY1DX' => '10,343,344,345',
@@ -4147,16 +4149,13 @@
   'QQ' => '342',
   'R' => '515',
   'R0' => '520,522,526',
-  'R0P' => '172,523,528',
   'R0T' => '172,523,528',
-  'R0V' => '172,523,528',
   'R1' => '516',
   'R1AN' => '414',
   'R1FJ' => '170',
   'R1N' => '169,516,517,518,519',
   'R1O' => '169,516,517,518,519',
   'R1P' => '169,516,517,518,519',
-  'R1Y' => '169,516,517,518,519',
   'R1Z' => '169,516,517,518,519',
   'R2F' => '171',
   'R2K' => '171',
@@ -4193,14 +4192,11 @@
   'R9W' => '172,523,528',
   'R9X' => '169,516,517,518,519',
   'RA0' => '520,522,526',
-  'RA0P' => '172,523,528',
   'RA0T' => '172,523,528',
-  'RA0V' => '172,523,528',
   'RA1' => '516',
   'RA1N' => '169,516,517,518,519',
   'RA1O' => '169,516,517,518,519',
   'RA1P' => '169,516,517,518,519',
-  'RA1Y' => '169,516,517,518,519',
   'RA1Z' => '169,516,517,518,519',
   'RA2' => '171',
   'RA3' => '517',
@@ -4244,14 +4240,11 @@
   'RB8' => '529',
   'RB9' => '523,528',
   'RC0' => '520,522,526',
-  'RC0P' => '172,523,528',
   'RC0T' => '172,523,528',
-  'RC0V' => '172,523,528',
   'RC1' => '516',
   'RC1N' => '169,516,517,518,519',
   'RC1O' => '169,516,517,518,519',
   'RC1P' => '169,516,517,518,519',
-  'RC1Y' => '169,516,517,518,519',
   'RC1Z' => '169,516,517,518,519',
   'RC2' => '171',
   'RC2F' => '171',
@@ -4289,14 +4282,11 @@
   'RC9W' => '172,523,528',
   'RC9X' => '169,516,517,518,519',
   'RD0' => '520,522,526',
-  'RD0P' => '172,523,528',
   'RD0T' => '172,523,528',
-  'RD0V' => '172,523,528',
   'RD1' => '516',
   'RD1N' => '169,516,517,518,519',
   'RD1O' => '169,516,517,518,519',
   'RD1P' => '169,516,517,518,519',
-  'RD1Y' => '169,516,517,518,519',
   'RD1Z' => '169,516,517,518,519',
   'RD2' => '171',
   'RD2F' => '171',
@@ -4342,14 +4332,11 @@
   'RE8' => '529',
   'RE9' => '523,528',
   'RF0' => '520,522,526',
-  'RF0P' => '172,523,528',
   'RF0T' => '172,523,528',
-  'RF0V' => '172,523,528',
   'RF1' => '516',
   'RF1N' => '169,516,517,518,519',
   'RF1O' => '169,516,517,518,519',
   'RF1P' => '169,516,517,518,519',
-  'RF1Y' => '169,516,517,518,519',
   'RF1Z' => '169,516,517,518,519',
   'RF2' => '171',
   'RF2F' => '171',
@@ -4387,14 +4374,11 @@
   'RF9W' => '172,523,528',
   'RF9X' => '169,516,517,518,519',
   'RG0' => '520,522,526',
-  'RG0P' => '172,523,528',
   'RG0T' => '172,523,528',
-  'RG0V' => '172,523,528',
   'RG1' => '516',
   'RG1N' => '169,516,517,518,519',
   'RG1O' => '169,516,517,518,519',
   'RG1P' => '169,516,517,518,519',
-  'RG1Y' => '169,516,517,518,519',
   'RG1Z' => '169,516,517,518,519',
   'RG2' => '171',
   'RG2F' => '171',
@@ -4440,61 +4424,23 @@
   'RH8' => '529',
   'RH9' => '523,528',
   'RI0' => '520,522,526',
-  'RI0P' => '172,523,528',
-  'RI0T' => '172,523,528',
-  'RI0V' => '172,523,528',
   'RI1' => '516',
   'RI1AN' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   'RI1FJ' => '170',
-  'RI1N' => '169,516,517,518,519',
   'RI1O' => '169,516,517,518,519',
   'RI1P' => '169,516,517,518,519',
-  'RI1Y' => '169,516,517,518,519',
-  'RI1Z' => '169,516,517,518,519',
   'RI2' => '171',
-  'RI2F' => '171',
-  'RI2K' => '171',
   'RI3' => '517',
   'RI4' => '518',
-  'RI4H' => '169,516,517,518,519',
-  'RI4I' => '169,516,517,518,519',
-  'RI4W' => '169,516,517,518,519',
   'RI6' => '519',
   'RI8' => '529',
-  'RI8F' => '169,516,517,518,519',
-  'RI8G' => '169,516,517,518,519',
-  'RI8H' => '172,523,528',
-  'RI8I' => '172,523,528',
-  'RI8O' => '172,523,528',
-  'RI8P' => '172,523,528',
-  'RI8S' => '172,523,528',
-  'RI8T' => '172,523,528',
-  'RI8U' => '172,523,528',
-  'RI8V' => '172,523,528',
-  'RI8W' => '172,523,528',
-  'RI8X' => '169,516,517,518,519',
-  'RI8Y' => '172,523,528',
-  'RI8Z' => '172,523,528',
   'RI9' => '523,528',
-  'RI9F' => '169,516,517,518,519',
-  'RI9G' => '169,516,517,518,519',
-  'RI9I' => '172,523,528',
-  'RI9M' => '172,523,528',
-  'RI9P' => '172,523,528',
-  'RI9S' => '172,523,528',
-  'RI9T' => '172,523,528',
-  'RI9V' => '172,523,528',
-  'RI9W' => '172,523,528',
-  'RI9X' => '169,516,517,518,519',
   'RJ0' => '520,522,526',
-  'RJ0P' => '172,523,528',
   'RJ0T' => '172,523,528',
-  'RJ0V' => '172,523,528',
   'RJ1' => '516',
   'RJ1N' => '169,516,517,518,519',
   'RJ1O' => '169,516,517,518,519',
   'RJ1P' => '169,516,517,518,519',
-  'RJ1Y' => '169,516,517,518,519',
   'RJ1Z' => '169,516,517,518,519',
   'RJ2' => '171',
   'RJ2F' => '171',
@@ -4532,14 +4478,11 @@
   'RJ9W' => '172,523,528',
   'RJ9X' => '169,516,517,518,519',
   'RK0' => '520,522,526',
-  'RK0P' => '172,523,528',
   'RK0T' => '172,523,528',
-  'RK0V' => '172,523,528',
   'RK1' => '516',
   'RK1N' => '169,516,517,518,519',
   'RK1O' => '169,516,517,518,519',
   'RK1P' => '169,516,517,518,519',
-  'RK1Y' => '169,516,517,518,519',
   'RK1Z' => '169,516,517,518,519',
   'RK2' => '171',
   'RK2F' => '171',
@@ -4577,14 +4520,11 @@
   'RK9W' => '172,523,528',
   'RK9X' => '169,516,517,518,519',
   'RL0' => '520,522,526',
-  'RL0P' => '172,523,528',
   'RL0T' => '172,523,528',
-  'RL0V' => '172,523,528',
   'RL1' => '516',
   'RL1N' => '169,516,517,518,519',
   'RL1O' => '169,516,517,518,519',
   'RL1P' => '169,516,517,518,519',
-  'RL1Y' => '169,516,517,518,519',
   'RL1Z' => '169,516,517,518,519',
   'RL2' => '171',
   'RL2F' => '171',
@@ -4622,14 +4562,11 @@
   'RL9W' => '172,523,528',
   'RL9X' => '169,516,517,518,519',
   'RM0' => '520,522,526',
-  'RM0P' => '172,523,528',
   'RM0T' => '172,523,528',
-  'RM0V' => '172,523,528',
   'RM1' => '516',
   'RM1N' => '169,516,517,518,519',
   'RM1O' => '169,516,517,518,519',
   'RM1P' => '169,516,517,518,519',
-  'RM1Y' => '169,516,517,518,519',
   'RM1Z' => '169,516,517,518,519',
   'RM2' => '171',
   'RM2F' => '171',
@@ -4667,14 +4604,11 @@
   'RM9W' => '172,523,528',
   'RM9X' => '169,516,517,518,519',
   'RN0' => '520,522,526',
-  'RN0P' => '172,523,528',
   'RN0T' => '172,523,528',
-  'RN0V' => '172,523,528',
   'RN1' => '516',
   'RN1N' => '169,516,517,518,519',
   'RN1O' => '169,516,517,518,519',
   'RN1P' => '169,516,517,518,519',
-  'RN1Y' => '169,516,517,518,519',
   'RN1Z' => '169,516,517,518,519',
   'RN2' => '171',
   'RN2F' => '171',
@@ -4712,14 +4646,11 @@
   'RN9W' => '172,523,528',
   'RN9X' => '169,516,517,518,519',
   'RO0' => '520,522,526',
-  'RO0P' => '172,523,528',
   'RO0T' => '172,523,528',
-  'RO0V' => '172,523,528',
   'RO1' => '516',
   'RO1N' => '169,516,517,518,519',
   'RO1O' => '169,516,517,518,519',
   'RO1P' => '169,516,517,518,519',
-  'RO1Y' => '169,516,517,518,519',
   'RO1Z' => '169,516,517,518,519',
   'RO2' => '171',
   'RO2F' => '171',
@@ -4757,14 +4688,11 @@
   'RO9W' => '172,523,528',
   'RO9X' => '169,516,517,518,519',
   'RP0' => '520,522,526',
-  'RP0P' => '172,523,528',
   'RP0T' => '172,523,528',
-  'RP0V' => '172,523,528',
   'RP1' => '516',
   'RP1N' => '169,516,517,518,519',
   'RP1O' => '169,516,517,518,519',
   'RP1P' => '169,516,517,518,519',
-  'RP1Y' => '169,516,517,518,519',
   'RP1Z' => '169,516,517,518,519',
   'RP2' => '171',
   'RP2F' => '171',
@@ -4802,14 +4730,11 @@
   'RP9W' => '172,523,528',
   'RP9X' => '169,516,517,518,519',
   'RQ0' => '520,522,526',
-  'RQ0P' => '172,523,528',
   'RQ0T' => '172,523,528',
-  'RQ0V' => '172,523,528',
   'RQ1' => '516',
   'RQ1N' => '169,516,517,518,519',
   'RQ1O' => '169,516,517,518,519',
   'RQ1P' => '169,516,517,518,519',
-  'RQ1Y' => '169,516,517,518,519',
   'RQ1Z' => '169,516,517,518,519',
   'RQ2' => '171',
   'RQ2F' => '171',
@@ -4847,14 +4772,11 @@
   'RQ9W' => '172,523,528',
   'RQ9X' => '169,516,517,518,519',
   'RR0' => '520,522,526',
-  'RR0P' => '172,523,528',
   'RR0T' => '172,523,528',
-  'RR0V' => '172,523,528',
   'RR1' => '516',
   'RR1N' => '169,516,517,518,519',
   'RR1O' => '169,516,517,518,519',
   'RR1P' => '169,516,517,518,519',
-  'RR1Y' => '169,516,517,518,519',
   'RR1Z' => '169,516,517,518,519',
   'RR2' => '171',
   'RR2F' => '171',
@@ -4900,14 +4822,11 @@
   'RS8' => '529',
   'RS9' => '523,528',
   'RT0' => '520,522,526',
-  'RT0P' => '172,523,528',
   'RT0T' => '172,523,528',
-  'RT0V' => '172,523,528',
   'RT1' => '516',
   'RT1N' => '169,516,517,518,519',
   'RT1O' => '169,516,517,518,519',
   'RT1P' => '169,516,517,518,519',
-  'RT1Y' => '169,516,517,518,519',
   'RT1Z' => '169,516,517,518,519',
   'RT2' => '171',
   'RT2F' => '171',
@@ -4945,14 +4864,11 @@
   'RT9W' => '172,523,528',
   'RT9X' => '169,516,517,518,519',
   'RU0' => '520,522,526',
-  'RU0P' => '172,523,528',
   'RU0T' => '172,523,528',
-  'RU0V' => '172,523,528',
   'RU1' => '516',
   'RU1N' => '169,516,517,518,519',
   'RU1O' => '169,516,517,518,519',
   'RU1P' => '169,516,517,518,519',
-  'RU1Y' => '169,516,517,518,519',
   'RU1Z' => '169,516,517,518,519',
   'RU2' => '171',
   'RU2F' => '171',
@@ -4990,14 +4906,11 @@
   'RU9W' => '172,523,528',
   'RU9X' => '169,516,517,518,519',
   'RV0' => '520,522,526',
-  'RV0P' => '172,523,528',
   'RV0T' => '172,523,528',
-  'RV0V' => '172,523,528',
   'RV1' => '516',
   'RV1N' => '169,516,517,518,519',
   'RV1O' => '169,516,517,518,519',
   'RV1P' => '169,516,517,518,519',
-  'RV1Y' => '169,516,517,518,519',
   'RV1Z' => '169,516,517,518,519',
   'RV2' => '171',
   'RV2F' => '171',
@@ -5035,14 +4948,11 @@
   'RV9W' => '172,523,528',
   'RV9X' => '169,516,517,518,519',
   'RW0' => '520,522,526',
-  'RW0P' => '172,523,528',
   'RW0T' => '172,523,528',
-  'RW0V' => '172,523,528',
   'RW1' => '516',
   'RW1N' => '169,516,517,518,519',
   'RW1O' => '169,516,517,518,519',
   'RW1P' => '169,516,517,518,519',
-  'RW1Y' => '169,516,517,518,519',
   'RW1Z' => '169,516,517,518,519',
   'RW2' => '171',
   'RW2F' => '171',
@@ -5080,14 +4990,11 @@
   'RW9W' => '172,523,528',
   'RW9X' => '169,516,517,518,519',
   'RX0' => '520,522,526',
-  'RX0P' => '172,523,528',
   'RX0T' => '172,523,528',
-  'RX0V' => '172,523,528',
   'RX1' => '516',
   'RX1N' => '169,516,517,518,519',
   'RX1O' => '169,516,517,518,519',
   'RX1P' => '169,516,517,518,519',
-  'RX1Y' => '169,516,517,518,519',
   'RX1Z' => '169,516,517,518,519',
   'RX2' => '171',
   'RX2F' => '171',
@@ -5125,14 +5032,11 @@
   'RX9W' => '172,523,528',
   'RX9X' => '169,516,517,518,519',
   'RY0' => '520,522,526',
-  'RY0P' => '172,523,528',
   'RY0T' => '172,523,528',
-  'RY0V' => '172,523,528',
   'RY1' => '516',
   'RY1N' => '169,516,517,518,519',
   'RY1O' => '169,516,517,518,519',
   'RY1P' => '169,516,517,518,519',
-  'RY1Y' => '169,516,517,518,519',
   'RY1Z' => '169,516,517,518,519',
   'RY2' => '171',
   'RY2F' => '171',
@@ -5170,14 +5074,11 @@
   'RY9W' => '172,523,528',
   'RY9X' => '169,516,517,518,519',
   'RZ0' => '520,522,526',
-  'RZ0P' => '172,523,528',
   'RZ0T' => '172,523,528',
-  'RZ0V' => '172,523,528',
   'RZ1' => '516',
   'RZ1N' => '169,516,517,518,519',
   'RZ1O' => '169,516,517,518,519',
   'RZ1P' => '169,516,517,518,519',
-  'RZ1Y' => '169,516,517,518,519',
   'RZ1Z' => '169,516,517,518,519',
   'RZ2' => '171',
   'RZ2F' => '171',
@@ -5306,14 +5207,11 @@
   'TZ' => '168',
   'U' => '515',
   'U0' => '520,522,526',
-  'U0P' => '172,523,528',
   'U0T' => '172,523,528',
-  'U0V' => '172,523,528',
   'U1' => '516',
   'U1N' => '169,516,517,518,519',
   'U1O' => '169,516,517,518,519',
   'U1P' => '169,516,517,518,519',
-  'U1Y' => '169,516,517,518,519',
   'U1Z' => '169,516,517,518,519',
   'U2F' => '171',
   'U2K' => '171',
@@ -5352,14 +5250,11 @@
   'U9X' => '169,516,517,518,519',
   'UA' => '169,516,517,518,519',
   'UA0' => '521,522,524,525,527',
-  'UA0P' => '172,523,528',
   'UA0T' => '172,523,528',
-  'UA0V' => '172,523,528',
   'UA1' => '516',
   'UA1N' => '169,516,517,518,519',
   'UA1O' => '169,516,517,518,519',
   'UA1P' => '169,516,517,518,519',
-  'UA1Y' => '169,516,517,518,519',
   'UA1Z' => '169,516,517,518,519',
   'UA2' => '171',
   'UA3' => '517',
@@ -5395,14 +5290,11 @@
   'UA9W' => '172,523,528',
   'UA9X' => '169,516,517,518,519',
   'UB0' => '520,522,526',
-  'UB0P' => '172,523,528',
   'UB0T' => '172,523,528',
-  'UB0V' => '172,523,528',
   'UB1' => '516',
   'UB1N' => '169,516,517,518,519',
   'UB1O' => '169,516,517,518,519',
   'UB1P' => '169,516,517,518,519',
-  'UB1Y' => '169,516,517,518,519',
   'UB1Z' => '169,516,517,518,519',
   'UB2' => '171',
   'UB3' => '517',
@@ -5438,14 +5330,11 @@
   'UB9W' => '172,523,528',
   'UB9X' => '169,516,517,518,519',
   'UC0' => '520,522,526',
-  'UC0P' => '172,523,528',
   'UC0T' => '172,523,528',
-  'UC0V' => '172,523,528',
   'UC1' => '516',
   'UC1N' => '169,516,517,518,519',
   'UC1O' => '169,516,517,518,519',
   'UC1P' => '169,516,517,518,519',
-  'UC1Y' => '169,516,517,518,519',
   'UC1Z' => '169,516,517,518,519',
   'UC2' => '171',
   'UC3' => '517',
@@ -5481,14 +5370,11 @@
   'UC9W' => '172,523,528',
   'UC9X' => '169,516,517,518,519',
   'UD0' => '520,522,526',
-  'UD0P' => '172,523,528',
   'UD0T' => '172,523,528',
-  'UD0V' => '172,523,528',
   'UD1' => '516',
   'UD1N' => '169,516,517,518,519',
   'UD1O' => '169,516,517,518,519',
   'UD1P' => '169,516,517,518,519',
-  'UD1Y' => '169,516,517,518,519',
   'UD1Z' => '169,516,517,518,519',
   'UD2' => '171',
   'UD3' => '517',
@@ -5524,14 +5410,11 @@
   'UD9W' => '172,523,528',
   'UD9X' => '169,516,517,518,519',
   'UE0' => '520,522,526',
-  'UE0P' => '172,523,528',
   'UE0T' => '172,523,528',
-  'UE0V' => '172,523,528',
   'UE1' => '516',
   'UE1N' => '169,516,517,518,519',
   'UE1O' => '169,516,517,518,519',
   'UE1P' => '169,516,517,518,519',
-  'UE1Y' => '169,516,517,518,519',
   'UE1Z' => '169,516,517,518,519',
   'UE2' => '171',
   'UE3' => '517',
@@ -5567,14 +5450,11 @@
   'UE9W' => '172,523,528',
   'UE9X' => '169,516,517,518,519',
   'UF0' => '520,522,526',
-  'UF0P' => '172,523,528',
   'UF0T' => '172,523,528',
-  'UF0V' => '172,523,528',
   'UF1' => '516',
   'UF1N' => '169,516,517,518,519',
   'UF1O' => '169,516,517,518,519',
   'UF1P' => '169,516,517,518,519',
-  'UF1Y' => '169,516,517,518,519',
   'UF1Z' => '169,516,517,518,519',
   'UF2' => '171',
   'UF3' => '517',
@@ -5611,14 +5491,11 @@
   'UF9W' => '172,523,528',
   'UF9X' => '169,516,517,518,519',
   'UG0' => '520,522,526',
-  'UG0P' => '172,523,528',
   'UG0T' => '172,523,528',
-  'UG0V' => '172,523,528',
   'UG1' => '516',
   'UG1N' => '169,516,517,518,519',
   'UG1O' => '169,516,517,518,519',
   'UG1P' => '169,516,517,518,519',
-  'UG1Y' => '169,516,517,518,519',
   'UG1Z' => '169,516,517,518,519',
   'UG2' => '171',
   'UG3' => '517',
@@ -5654,14 +5531,11 @@
   'UG9W' => '172,523,528',
   'UG9X' => '169,516,517,518,519',
   'UH0' => '520,522,526',
-  'UH0P' => '172,523,528',
   'UH0T' => '172,523,528',
-  'UH0V' => '172,523,528',
   'UH1' => '516',
   'UH1N' => '169,516,517,518,519',
   'UH1O' => '169,516,517,518,519',
   'UH1P' => '169,516,517,518,519',
-  'UH1Y' => '169,516,517,518,519',
   'UH1Z' => '169,516,517,518,519',
   'UH2' => '171',
   'UH3' => '517',
@@ -5697,14 +5571,11 @@
   'UH9W' => '172,523,528',
   'UH9X' => '169,516,517,518,519',
   'UI0' => '520,522,526',
-  'UI0P' => '172,523,528',
   'UI0T' => '172,523,528',
-  'UI0V' => '172,523,528',
   'UI1' => '516',
   'UI1N' => '169,516,517,518,519',
   'UI1O' => '169,516,517,518,519',
   'UI1P' => '169,516,517,518,519',
-  'UI1Y' => '169,516,517,518,519',
   'UI1Z' => '169,516,517,518,519',
   'UI2' => '171',
   'UI3' => '517',

diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index d125cc59ca37ac4ba436a0438f8c1cb8ab0656fd..9c440fbd48acab19ec7d32d80a83e92f6d18ff3a 100644 (file)
--- a/perl/DXSql.pm
+++ b/perl/DXSql.pm
@@ -10,8 +10,6 @@ package DXSql;
 
 use strict;
 
-use DXSql::SQLite;
-use DXSql::mysql;
 use DXDebug;
 
 use vars qw($active);

diff --git a/perl/DXSql/Pg.pm b/perl/DXSql/Pg.pm
new file mode 100644 (file)
index 0000000..f24aab3
--- /dev/null
+++ b/perl/DXSql/Pg.pm
@@ -0,0 +1,126 @@
+#
+# Module for SQLite DXSql variants
+#
+# Stuff like table creates and (later) alters
+#
+# Copyright (c) 2005 Dirk Koopman G1TLH
+# Modifications made for Pg, Copyright (c) 2012 Wijnand Modderman-Lenstra PD0MZ
+#
+
+package DXSql::Pg;
+
+use DXDebug;
+
+use vars qw(@ISA);
+@ISA = qw{DXSql};
+
+sub show_tables
+{
+       my $self = shift;
+       #my $s = q(show tables);
+    my $s = q(SELECT table_name FROM information_schema.tables WHERE table_schema = 'public';);
+       my $sth = $self->prepare($s);
+       $sth->execute;
+       my @out;
+       while (my @t = $sth->fetchrow_array) {
+               push @out, @t;
+       }
+       $sth->finish;
+       return @out;
+}
+
+sub has_ipaddr
+{
+       my $self = shift;
+       my $s = q(SELECT column_name FROM information_schema.columns WHERE table_name = 'spot');
+       my $sth = $self->prepare($s);
+       $sth->execute;
+       while (my @t = $sth->fetchrow_array) {
+               if ($t[0] eq 'ipaddr') {
+                       $sth->finish;
+                       return 1;
+               }
+       }
+       $sth->finish;
+       return undef;
+}
+
+sub add_ipaddr
+{
+       my $self = shift;
+       my $s = q(alter table spot add column ipaddr varchar(40));
+       $self->do($s);
+}
+
+sub spot_create_table
+{
+       my $self = shift;
+    my $s;
+    $s = q{create sequence spot_rowid_seq};
+    $self->do($s);
+       $s = q{create table spot (
+rowid sequence primary key ,
+freq real not null,
+spotcall varchar(14) not null,
+time int not null,
+comment varchar(255),
+spotter varchar(14) not null,
+spotdxcc smallint,
+spotterdxcc smallint,
+origin varchar(14),
+spotitu tinyint,
+spotcq tinyint,
+spotteritu tinyint,
+spottercq tinyint,
+spotstate char(2),
+spotterstate char(2),
+ipaddr varchar(40)
+)};
+       $self->do($s);
+    $s = q{alter table spot alter column rowid set default nextval('spot_rowid_seq');};
+    $self->do($s);
+}
+
+sub spot_add_indexes
+{
+       my $self = shift;
+       #dbg('adding spot index ix1');
+       #$self->do('create index spot_ix1 on spot(time desc)');
+       #dbg('adding spot index ix2');
+       #$self->do('create index spot_ix2 on spot(spotcall asc)');
+}
+
+sub spot_insert
+{
+       my $self = shift;
+       my $spot = shift;
+       my $sth = shift;
+       
+       if ($sth) {
+               push @$spot, undef while  @$spot < 15;
+               pop @$spot while @$spot > 15;
+               eval {$sth->execute(undef, @$spot)};
+       } else {
+               my $s = "insert into spot values(NEXTVAL('spot_rowid_seq'),";
+               $s .= sprintf("%.1f,", $spot->[0]);
+               $s .= $self->quote($spot->[1]) . "," ;
+               $s .= $spot->[2] . ',';
+               $s .= (length $spot->[3] ? $self->quote($spot->[3]) : 'NULL') . ',';
+               $s .= $self->quote($spot->[4]) . ',';
+               $s .= $spot->[5] . ',';
+               $s .= $spot->[6] . ',';
+               $s .= (length $spot->[7] ? $self->quote($spot->[7]) : 'NULL') . ',';
+               $s .= $spot->[8] . ',';
+               $s .= $spot->[9] . ',';
+               $s .= $spot->[10] . ',';
+               $s .= $spot->[11] . ',';
+               $s .= (length $spot->[12] ? $self->quote($spot->[12]) : 'NULL') . ',';
+               $s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ',';
+               $s .= (length $spot->[14] ? $self->quote($spot->[14]) : 'NULL') . ')';
+               eval {$self->do($s)};
+       }
+}
+
+
+
+1;  

diff --git a/perl/Version.pm b/perl/Version.pm
index 5b4df4f54087b45d0802e59b15a0fd3332fc8388..803a694c00747e9679a3d75b3115936c2d16cbfa 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
-$build = '111';
-$gitversion = '427bd01';
+$build = '112';
+$gitversion = 'b2aa9a9';
 
 1;