]> dxcluster.net Git - spider.git/commitdiff
projects / spider.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9031814)
try fix node type changes from outside
authorDirk Koopman <djk@tobit.co.uk>
Wed, 30 Dec 2015 19:34:38 +0000 (19:34 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Wed, 30 Dec 2015 19:51:26 +0000 (19:51 +0000)
Also add CTY-2516 prefix changes

Conflicts:
perl/DXProtHandle.pm
perl/cluster.pl

14 files changed:
Changes patch | blob | history
cmd/merge.pl patch | blob | history
cmd/set/arcluster.pl patch | blob | history
cmd/set/bbs.pl patch | blob | history
cmd/set/clx.pl patch | blob | history
cmd/set/dxnet.pl patch | blob | history
cmd/set/node.pl patch | blob | history
cmd/set/spider.pl patch | blob | history
cmd/set/user.pl patch | blob | history
data/cty.dat patch | blob | history
data/prefix_data.pl patch | blob | history
perl/DXProtHandle.pm patch | blob | history
perl/Messages patch | blob | history
perl/cluster.pl patch | blob | history

diff --git a/Changes b/Changes
index 739236a427f17aa97fac836bf3f2cfcabb81f1ae..6928c43cb09583ed5b92cef8bb2453d0ae892bca 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+30Dec15=======================================================================
+1. Add CTY-2516 prefix file
+2. Try to stop and also reset node call user records back to 'S'
 02Jun15=======================================================================
 1. Extend regex for quit to allow other commands starting in 'q'.
 2. Add CTY-2506 prefix file
diff --git a/cmd/merge.pl b/cmd/merge.pl
index 3f8cbcd14a291c594d12a9a6743f83a5c949cd34..3342d1e948b7b1c76004bc8554f41a8222c4fc59 100644 (file)
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -14,7 +14,11 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 return (1, $self->msg('e12')) if !$f[0];
 
 my $call = uc $f[0];
-return (1, $self->msg('e11')) if $call eq $main::mycall;
+return (1, $self->msg('e11', $call)) if $call eq $main::mycall;
+       if ($call eq $main::mycall) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
 
 my $ref = Route::Node::get($call);
 my $dxchan = $ref->dxchan if $ref;
diff --git a/cmd/set/arcluster.pl b/cmd/set/arcluster.pl
index 1587f70337c2fdbd439f3b8c8459ac59446de04b..1b1659745042210f2438f1a7bffb99444bebcdfd 100644 (file)
--- a/cmd/set/arcluster.pl
+++ b/cmd/set/arcluster.pl
@@ -1,5 +1,5 @@
 #
-# set user type to 'S' for Spider node
+# set user type to 'R' for AR-Cluster node
 #
 # Please note that this is only effective if the user is not on-line
 #
@@ -19,6 +19,14 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 
 foreach $call (@args) {
        $call = uc $call;
+       if ($call eq $main::mycall) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
+       if ($call eq $main::myalias) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
        my $chan = DXChannel::get($call);
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
diff --git a/cmd/set/bbs.pl b/cmd/set/bbs.pl
index 8709dcd06646786a3766406cb607964b89c4b22f..9a3f517a30adc03f2641b3ab8bed8b0400bcbdcc 100644 (file)
--- a/cmd/set/bbs.pl
+++ b/cmd/set/bbs.pl
@@ -19,6 +19,14 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 
 foreach $call (@args) {
        $call = uc $call;
+       if ($call eq $main::mycall) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
+       if ($call eq $main::myalias) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
        my $chan = DXChannel::get($call);
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
diff --git a/cmd/set/clx.pl b/cmd/set/clx.pl
index eaead5ab22e0637e7250a1020e0848a82dbd591e..38c02dcd096ec018793ccaac13406db551ac7ff2 100644 (file)
--- a/cmd/set/clx.pl
+++ b/cmd/set/clx.pl
@@ -19,6 +19,14 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 
 foreach $call (@args) {
        $call = uc $call;
+       if ($call eq $main::mycall) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
+       if ($call eq $main::myalias) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
        my $chan = DXChannel::get($call);
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
diff --git a/cmd/set/dxnet.pl b/cmd/set/dxnet.pl
index 6d2011364cacb64e429591baf72c900b91516301..3eadff0bfad1af3738dc1adabc883d0c9dbd917a 100644 (file)
--- a/cmd/set/dxnet.pl
+++ b/cmd/set/dxnet.pl
@@ -1,5 +1,5 @@
 #
-# set user type to 'S' for Spider node
+# set user type to 'X' for DXNet node
 #
 # Please note that this is only effective if the user is not on-line
 #
@@ -19,6 +19,14 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 
 foreach $call (@args) {
        $call = uc $call;
+       if ($call eq $main::mycall) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
+       if ($call eq $main::myalias) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
        my $chan = DXChannel::get($call);
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
diff --git a/cmd/set/node.pl b/cmd/set/node.pl
index 8a1f811170eb7baec3fc02940665dfeb67ad5197..185f906c7752db1fbd87f06e64c865867d67bd18 100644 (file)
--- a/cmd/set/node.pl
+++ b/cmd/set/node.pl
@@ -19,6 +19,14 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 
 foreach $call (@args) {
        $call = uc $call;
+       if ($call eq $main::mycall) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
+       if ($call eq $main::myalias) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
        my $chan = DXChannel::get($call);
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
diff --git a/cmd/set/spider.pl b/cmd/set/spider.pl
index 23cdd3780be256338f5f28da3c801050eb8fc922..a0e519b680d508c72d4298c5cfba7b2434a07ada 100644 (file)
--- a/cmd/set/spider.pl
+++ b/cmd/set/spider.pl
@@ -19,6 +19,14 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 
 foreach $call (@args) {
        $call = uc $call;
+       if ($call eq $main::myalias) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
+       if ($call eq $main::myalias) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
        my $chan = DXChannel::get($call);
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
diff --git a/cmd/set/user.pl b/cmd/set/user.pl
index 209f0e98059cf1902ea1f364ec1ec6325bca2c8c..62951074d1c0f743dcaa24b128d15a1aeaaab06f 100644 (file)
--- a/cmd/set/user.pl
+++ b/cmd/set/user.pl
@@ -19,6 +19,10 @@ return (1, $self->msg('e5')) if $self->priv < 5;
 
 foreach $call (@args) {
        $call = uc $call;
+       if ($call eq $main::mycall) {
+               push @out, $self->msg('e11', $call);
+               next;
+       }
        my $chan = DXChannel::get($call);
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
diff --git a/data/cty.dat b/data/cty.dat
index 269eb6735b49cb4d8b3d8e6ecb5f40211d1e6ce7..22ecc08b8cc45a0fffeee1aba325092f8c5c7d7b 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,BM9S,BN9S,BO9S,BP9S,BQ9S,BU9S,BV9S,BW9S,BX9S,=DX0P;
+    1S,9M0,BM9S,BN9S,BO9S,BP9S,BQ9S,BU9S,BV9S,BW9S,BX9S;
 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:
@@ -19,7 +19,7 @@ Fiji:                     32:  56:  OC:  -17.78:  -177.92:   -12.0:  3D2:
 Conway Reef:              32:  56:  OC:  -22.00:  -175.00:   -12.0:  3D2/c:
     =3D2C;
 Rotuma Island:            32:  56:  OC:  -12.48:  -177.08:   -12.0:  3D2/r:
-    =3D2RI;
+    =3D2AG/P,=3D2RI;
 Swaziland:                38:  57:  AF:  -26.65:   -31.48:    -2.0:  3DA:
     3DA;
 Tunisia:                  33:  37:  AF:   35.40:    -9.32:    -1.0:  3V:
@@ -35,17 +35,17 @@ Peter 1 Island:           12:  72:  SA:  -68.77:    90.58:     4.0:  3Y/p:
 Azerbaijan:               21:  29:  AS:   40.45:   -47.37:    -4.0:  4J:
     4J,4K;
 Georgia:                  21:  29:  AS:   42.00:   -45.00:    -4.0:  4L:
-    4L,UF6V;
+    4L;
 Montenegro:               15:  28:  EU:   42.50:   -19.28:    -1.0:  4O:
     4O;
 Sri Lanka:                22:  41:  AS:    7.60:   -80.70:    -5.5:  4S:
     4P,4Q,4R,4S;
 ITU HQ:                   14:  28:  EU:   46.17:    -6.05:    -1.0:  4U1I:
-    4U0I,4U1I,4U2I,4U3I,4U4I,4U5I,4U6I,4U7I,4U8I,4U9I,=4U150ITU,=4U1WRC;
+    =4U0ITU,=4U1ITU,=4U1WRC;
 United Nations HQ:        05:  08:  NA:   40.75:    73.97:     5.0:  4U1U:
-    4U1U;
+    =4U1UN;
 Vienna Intl Ctr:          15:  28:  EU:   48.20:   -16.30:    -1.0:  *4U1V:
-    4U1V,=4Y1A,=C7A;
+    =4U1A,=4U1VIC,=4U70VIC;
 Timor - Leste:            28:  54:  OC:   -8.80:  -126.05:    -9.0:  4W:
     4W;
 Israel:                   20:  39:  AS:   31.32:   -34.82:    -2.0:  4X:
@@ -91,7 +91,7 @@ Maldives:                 22:  41:  AS:    4.15:   -73.45:    -5.0:  8Q:
 Guyana:                   09:  12:  SA:    6.02:    59.45:     4.0:  8R:
     8R;
 Croatia:                  15:  28:  EU:   45.18:   -15.30:    -1.0:  9A:
-    9A,=9A70DP/KA,=9A70DP/PU,=9A70DP/RI,=9A70DP/ZG;
+    9A;
 Ghana:                    35:  46:  AF:    7.70:     1.57:     0.0:  9G:
     9G;
 Malta:                    15:  28:  EU:   35.88:   -14.42:    -1.0:  9H:
@@ -105,7 +105,7 @@ Sierra Leone:             35:  46:  AF:    8.50:    13.25:     0.0:  9L:
 West Malaysia:            28:  54:  AS:    3.95:  -102.23:    -8.0:  9M2:
     9M,9W;
 East Malaysia:            28:  54:  OC:    2.68:  -113.32:    -8.0:  9M6:
-    9M6,9M8,9M9,9W6,9W8,=9M2MDX/6,=9M4ARD/6,=9M4ARD/8,=9M4CBP;
+    9M6,9M8,9W6,9W8,=9M4CBP,=9M4SAB,=9M90IARU/6,=9M90IARU/8;
 Nepal:                    22:  42:  AS:   27.70:   -85.33:   -5.75:  9N:
     9N;
 Dem. Rep. of the Congo:   36:  52:  AF:   -3.12:   -23.03:    -1.0:  9Q:
@@ -127,7 +127,7 @@ Oman:                     21:  39:  AS:   23.60:   -58.55:    -4.0:  A4:
 Bhutan:                   22:  41:  AS:   27.40:   -90.18:    -6.0:  A5:
     A5;
 United Arab Emirates:     21:  39:  AS:   24.00:   -54.00:    -4.0:  A6:
-    A6;
+    A6,=A61BK/ND,=A61DJ/ND,=A61HA/ND,=A61QQ/ND,=A61SM/ND;
 Qatar:                    21:  39:  AS:   25.25:   -51.13:    -3.0:  A7:
     A7;
 Bahrain:                  21:  39:  AS:   26.03:   -50.53:    -3.0:  A9:
@@ -277,8 +277,7 @@ China:                    24:  44:  AS:   36.00:  -102.00:    -8.0:  BY:
     BZ8N[43],BZ8O[43],BZ8P[43],BZ8Q[43],BZ8R[43],BZ8S[43],BZ8T[43],BZ8U[43],
     BZ8V[43],BZ8W[43],BZ8X[43],BZ9A(24)[43],BZ9B(24)[43],BZ9C(24)[43],
     BZ9D(24)[43],BZ9E(24)[43],BZ9F(24)[43],BZ9S(23)[42],BZ9T(23)[42],
-    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42],=BG9XD/5,
-    =BD9BI/0(23)[42];
+    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42],=B90IARU;
 Nauru:                    31:  65:  OC:   -0.52:  -166.92:   -12.0:  C2:
     C2;
 Andorra:                  14:  27:  EU:   42.58:    -1.62:    -1.0:  C3:
@@ -292,7 +291,7 @@ Mozambique:               37:  53:  AF:  -18.25:   -35.00:    -2.0:  C9:
 Chile:                    12:  14:  SA:  -30.00:    71.00:     4.0:  CE:
     3G,CA,CB,CC,CD,CE,XQ,XR,3G7[16],3G8[16],CA7[16],CA8[16],CB7[16],CB8[16],
     CC7[16],CC8[16],CD7[16],CD8[16],CE7[16],CE8[16],XQ7[16],XQ8[16],XR7[16],
-    XR8[16];
+    XR8[16],=XR90IARU;
 San Felix & San Ambrosio: 12:  14:  SA:  -26.28:    80.07:     4.0:  CE0X:
     3G0X,CA0X,CB0X,CC0X,CD0X,CE0X,XQ0X,XR0X;
 Easter Island:            12:  63:  SA:  -27.10:   109.37:     6.0:  CE0Y:
@@ -305,11 +304,12 @@ Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
     FT3Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT6Y(30)[70],FT7Y(30)[70],
     FT8Y(30)[70],LU1Z[73],LU2Z[73],LU3Z[73],LU4Z[73],LU5Z[73],LU6Z[73],
     LU7Z[73],LU8Z[73],LU9Z[73],RI1AN(29)[69],VI0(39)[69],VK0(39)[69],
-    ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],=8J1RL(39)[67],=D8A(30)[71],
-    =DP0GVN(38)[67],=DP1POL(38)[67],=IA/IZ3SUS(29)[70],=KC4AAA(39),
-    =KC4AAC[73],=KC4USV(30)[71],=OR4TN(38)[67],=RI1ANC(29)[70],
-    =RI1ANM(38)[67],=RI1ANP(39)[69],=RI1ANZ(39)[69],=VP8ADE[73],=VP8ADE/B[73],
-    =VP8DOU[73],=VP8ROT[73];
+    ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],=8J1RL(39)[67],=8T2BH(39)[69],
+    =D8A(30)[71],=DP0GVN(38)[67],=DP1POL(38)[67],=KC4AAA(39),=KC4AAC[73],
+    =KC4USV(30)[71],=OP0LE(38)[67],=OR4TN(38)[67],=RI1ANC(29)[70],
+    =RI1ANM(38)[67],=RI1ANP(39)[69],=RI1ANR(38)[67],=RI1ANZ(39)[69],
+    =VI0ANZAC(29)[70],=VP8ADE[73],=VP8ADE/B[73],=VP8DOU[73],=VP8ROT[73],
+    =VU3BPZ/P(39)[69];
 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:
@@ -323,7 +323,7 @@ Madeira Islands:          33:  36:  AF:   32.75:    16.95:     0.0:  CT3:
 Azores:                   14:  36:  EU:   38.70:    27.23:     1.0:  CU:
     CQ1,CQ8,CR1,CR2,CR8,CS4,CS8,CT8,CU;
 Uruguay:                  13:  14:  SA:  -33.00:    56.00:     3.0:  CX:
-    CV,CW,CX;
+    CV,CW,CX,=CX6DRA/V;
 Sable Island:             05:  09:  NA:   43.93:    59.90:     4.0:  CY0:
     CY0;
 St. Paul Island:          05:  09:  NA:   47.00:    60.00:     4.0:  CY9:
@@ -343,7 +343,7 @@ Eritrea:                  37:  48:  AF:   15.00:   -39.00:    -3.0:  E3:
 Palestine:                20:  39:  AS:   31.28:   -34.27:    -2.0:  E4:
     E4;
 North Cook Islands:       32:  62:  OC:  -10.02:   161.08:    10.0:  E5/n:
-    =E50W,=E51WL[63];
+    =E50W,=E51PT,=E51WL[63];
 South Cook Islands:       32:  63:  OC:  -21.90:   157.93:    10.0:  E5/s:
     E5;
 Niue:                     32:  62:  OC:  -19.03:   169.85:    11.0:  E6:
@@ -351,16 +351,13 @@ Niue:                     32:  62:  OC:  -19.03:   169.85:    11.0:  E6:
 Bosnia-Herzegovina:       15:  28:  EU:   44.32:   -17.57:    -1.0:  E7:
     E7;
 Spain:                    14:  37:  EU:   40.37:     4.88:    -1.0:  EA:
-    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EG90IARU,=EA1EK/ZAP,=EA1RCI/ICA,
-    =EA4RCH/CIE,=EA5ADM/P,=EA5CC/P,=EA5HCC/P,=EA5URV/CAC,=EA7URL/FSV,
-    =EG90IARU/1,=EG90IARU/2,=EG90IARU/3,=EG90IARU/4,=EG90IARU/5,=EG90IARU/7;
+    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EA1RCG/YOA,=EA5CC/P,=EA9UV/7;
 Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
-    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EH90IARU/6;
+    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EA5EZ/6,=EA5EZ/P;
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
-    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=AO150ITU/8,=AO150U,=EA5EZ/8,
-    =EH90IARU/8;
+    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=EA3FNZ/8,=EA5EZ/8;
 Ceuta & Melilla:          33:  37:  AF:   35.90:     5.27:    -1.0:  EA9:
-    AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9,=EA9PD/P,=EA3EGB/9;
+    AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9,=EA9PD/P,=EA5RKB/9;
 Ireland:                  14:  27:  EU:   53.13:     8.02:     0.0:  EI:
     EI,EJ;
 Armenia:                  21:  29:  AS:   40.40:   -44.90:    -4.0:  EK:
@@ -387,17 +384,17 @@ Turkmenistan:             17:  30:  AS:   38.00:   -58.00:    -5.0:  EZ:
 France:                   14:  27:  EU:   46.00:    -2.00:    -1.0:  F:
     F,HW,HX,HY,TH,TM,TP,TQ,TV;
 Guadeloupe:               08:  11:  NA:   16.13:    61.67:     4.0:  FG:
-    FG;
+    FG,=TO6D;
 Mayotte:                  39:  53:  AF:  -12.88:   -45.15:    -3.0:  FH:
     FH;
 St. Barthelemy:           08:  11:  NA:   17.90:    62.83:     4.0:  FJ:
-    FJ;
+    FJ,=TO2EE;
 New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
-    FK;
+    FK,=TX8D,=TX90IARU;
 Chesterfield Islands:     30:  56:  OC:  -19.87:  -158.32:   -11.0:  FK/c:
-    =FK8IK/C;
+    =TX3X;
 Martinique:               08:  11:  NA:   14.70:    61.03:     4.0:  FM:
-    FM,=TO5A,=TO5T,=TO5Y,=TO90IARU;
+    FM,=TO4GU,=TO5A,=TO5T,=TO8M;
 French Polynesia:         32:  63:  OC:  -17.65:   149.40:    10.0:  FO:
     FO;
 Austral Islands:          32:  63:  OC:  -23.37:   149.48:    10.0:  FO/a:
@@ -405,11 +402,11 @@ Austral Islands:          32:  63:  OC:  -23.37:   149.48:    10.0:  FO/a:
 Clipperton Island:        07:  10:  NA:   10.28:   109.22:     8.0:  FO/c:
     =TX5P;
 Marquesas Islands:        31:  63:  OC:   -8.92:   140.07:     9.5:  FO/m:
-    =FO/F6BFH/P;
+    =FO/JI1JKW;
 St. Pierre & Miquelon:    05:  09:  NA:   46.77:    56.20:     3.0:  FP:
     FP;
 Reunion Island:           39:  53:  AF:  -21.12:   -55.48:    -4.0:  FR:
-    FR;
+    FR,=TO90R;
 St. Martin:               08:  11:  NA:   18.08:    63.03:     4.0:  FS:
     FS;
 Glorioso Islands:         39:  53:  AF:  -11.55:   -47.28:    -4.0:  FT/g:
@@ -428,35 +425,33 @@ Amsterdam & St. Paul Is.: 39:  68:  AF:  -37.85:   -77.53:    -5.0:  FT/z:
 Wallis & Futuna Islands:  32:  62:  OC:  -13.30:   176.20:   -12.0:  FW:
     FW,TW;
 French Guiana:            09:  12:  SA:    4.00:    53.00:     3.0:  FY:
-    FY;
+    FY,=TO2A;
 England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
-    2E,G,M;
+    2E,2K,G,M;
 Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
     2D,GD,GT,MD,MT;
 Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
-    2I,GI,GN,MI,MN,=GB0BTC,=GB0GPF,=GB1AFP,=GB1SPD,=GB2BCW,=GB2BOA,=GB2DMR,
-    =GB2MAC,=GB3NGI,=GB4UAS;
+    2I,GI,GN,MI,MN,=GB0BTC,=GB0GPF,=GB1SPD,=GB2BOA,=GB2DMR,=GB3NGI,=GB4ONI,
+    =GB4UAS,=GB5OMU;
 Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
     2J,GH,GJ,MH,MJ,=GB2JSA;
 Shetland Islands:         14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
     GZ,MZ,=2M0BDR,=2M0BDT,=2M0CPN,=2M0GFC,=2M0SEG,=2M0SPX,=2M0ZET,=GB2ELH,
-    =GB2QM,=GB3LER,=GB3LER/B,=GB4LER,=GM0CXQ,=GM0EKM,=GM0GFL,=GM0ILB,=GM0JDB,
-    =GM1FGN,=GM1KKI,=GM1ZNR,=GM3KLA,=GM3WHT,=GM3ZET,=GM4IPK,=GM4JPI,=GM4LBE,
-    =GM4LER,=GM4PXG,=GM4SLV,=GM4SSA,=GM4WSB/P,=GM4WXQ,=GM4ZHL,=GM6RQW,=GM6YQA,
-    =GM7AFE,=GM7GWW,=GM8LNH,=GM8MMA,=GM8YEC,=GS3ZET,=MM0LSM,=MM0XAU,=MM0ZAL,
-    =MM0ZCG,=MM1FJM,=MM3VQO,=MM5PSL,=MM5YLO,=MM6BDU,=MM6BZQ,=MM6MFA,=MM6PTE,
-    =MM6SJK,=MM6ZBG,=MM6ZDW,=MS0ZCG,=MS0ZET;
+    =GB3LER,=GB3LER/B,=GB4LER,=GM0CXQ,=GM0EKM,=GM0GFL,=GM0GFL/P,=GM0ILB,
+    =GM0JDB,=GM1FGN,=GM1KKI,=GM1ZNR,=GM3KLA,=GM3TXF/P,=GM3WHT,=GM3ZET,=GM4IPK,
+    =GM4JPI,=GM4LBE,=GM4LER,=GM4PXG,=GM4SLV,=GM4SSA,=GM4WXQ,=GM4ZHL,=GM6RQW,
+    =GM6YQA,=GM7AFE,=GM7GWW,=GM8LNH,=GM8MMA,=GM8YEC,=GS3ZET,=MM0LSM,=MM0XAU,
+    =MM0ZAL,=MM0ZCG,=MM1FJM,=MM3VQO,=MM5PSL,=MM5YLO,=MM6BDU,=MM6BZQ,=MM6MFA,
+    =MM6PTE,=MM6SJK,=MM6ZBG,=MM6ZDW,=MS0ZCG,=MS0ZET;
 Scotland:                 14:  27:  EU:   56.82:     4.18:     0.0:  GM:
-    2A,2M,GA,GM,GS,GZ,MA,MM,MS,MZ,=GB0GDS,=GB0NHL,=GB0SFM,=GB0SSB,=GB1OL,
-    =GB2CM,=GB2DRC,=GB2ELH,=GB2GEO,=GB2GNL,=GB2MOF,=GB2OWM,=GB2QM,=GB2RB,
-    =GB3ANG,=GB3LER,=GB3LER/B,=GB3ORK,=GB3WOI,=GB4GM,=GB4LER,=GB5AG,=GB5FHC,
-    =GM4WSB/P;
+    2A,2M,GA,GM,GS,GZ,MA,MM,MS,MZ,=GB0GDS,=GB0NHL,=GB1OL,=GB2ELH,=GB2GNL,
+    =GB2OWM,=GB3ANG,=GB3LER,=GB3LER/B,=GB3ORK,=GB4LER,=GB5AG,=GB5FHC,
+    =GM0GFL/P,=GM3TXF/P;
 Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2U,GP,GU,MP,MU;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
-    2W,GC,GW,MC,MW,=GB0GMT,=GB0MIW,=GB0MPA,=GB0MUU,=GB1PJ,=GB2BOW,=GB2CC,
-    =GB2IMD,=GB2LM,=GB2MOP,=GB2SFM,=GB2TD,=GB4GSS,=GB4MD,=GB4MDI,=GB4MPI,
-    =GB4SDD,=GB5GEO,=GB6AC,=GB6BLB,=GB6GGM,=GB8MD;
+    2W,GC,GW,MC,MW,=GB0AVR,=GB0MPA,=GB2IMD,=GB2MOP,=GB4MD,=GB4MDI,=GB4SDD,
+    =GB6BLB;
 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 +459,7 @@ Temotu Province:          32:  51:  OC:  -10.72:  -165.80:   -11.0:  H40:
 Hungary:                  15:  28:  EU:   47.12:   -19.28:    -1.0:  HA:
     HA,HG;
 Switzerland:              14:  28:  EU:   46.87:    -8.12:    -1.0:  HB:
-    HB,HE;
+    HB,HE,=4U1G;
 Liechtenstein:            14:  28:  EU:   47.13:    -9.57:    -1.0:  HB0:
     HB0,HE0;
 Ecuador:                  10:  12:  SA:   -1.40:    78.40:     5.0:  HC:
@@ -494,9 +489,9 @@ 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;
 Italy:                    15:  28:  EU:   42.82:   -12.58:    -1.0:  I:
-    I,=4U0WFP,=4U1GSC,=4U20B,=4U5F;
+    I,=4U0WFP,=4U1GSC,=4U20B,=4U5F,=I4CQO/N,=IK3TZB/N,=IZ1CLA/N;
 African Italy:            33:  37:  AF:   35.67:   -12.67:    -1.0:  *IG9:
-    IG9,IH9,=IY9A;
+    IG9,IH9;
 Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
     IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0ICH,=II0IDP,=II0SB,=IQ0AG,=IQ0AH,
     =IQ0AI,=IQ0AK,=IQ0AL,=IQ0AM,=IQ0EH,=IQ0HO,=IQ0ID,=IQ0NU,=IQ0NU/P,=IQ0OG,
@@ -535,126 +530,131 @@ Jordan:                   20:  39:  AS:   31.18:   -36.42:    -2.0:  JY:
 United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
     AA,AB,AC,AD,AE,AF,AG,AI,AJ,AK,K,N,W,=4U1WB(5)[8],=AA2IL(3)[6],
     =AA4DD(4)[8],=AA4NU(4)[8],=AA4Q(3)[6],=AA4R(4)[8],=AA4YL(4)[8],
-    =AA5TL(3)[6],=AB1HZ(4)[7],=AB4B(4)[8],=AB4GG(4)[8],=AB4IQ(4)[8],
+    =AA5TL(3)[6],=AB4B(4)[8],=AB4EJ(4)[8],=AB4GG(4)[8],=AB4IQ(4)[8],
     =AB4KJ(4)[8],=AB5ZA(4)[6],=AB8RL(5)[8],=AC4CA(4)[7],=AC4G(4)[8],
-    =AC4M(4)[8],=AC4YD(4)[8],=AC6ZM(4)[8],=AC7P(4)[7],=AC8Y(5)[8],=AD1C(4)[7],
-    =AD4EB(4)[8],=AD5OW(4)[8],=AD8J(5)[8],=AE7AP(4)[6],=AG1RL(3)[6],
-    =AG1T(3)[6],=AG3V(4)[7],=AG4W(4)[8],=AG5Z(4)[8],=AI4DB(4)[8],=AI8F(5)[8],
-    =AI9K(4)[7],=AJ4A(4)[8],=AJ7G(5)[8],=AK3Q(4)[8],=AK4QR(4)[8],=AK9D(4)[7],
-    =AL1VE(3)[6],=AL3A(3)[6],=AL5M(4)[7],=K0ACP(4)[8],=K0AU(3)[6],=K0DQ(5)[8],
-    =K0EJ(4)[8],=K0IP(3)[6],=K0JJ(3)[6],=K0LUZ(5)[8],=K0MP(3)[6],=K0NW(3)[6],
-    =K0PJ(4)[8],=K0RG(3)[6],=K0SN(4)[6],=K0TQ(4)[8],=K0TV(5)[8],=K0ZR(5)[8],
-    =K1DC(4)[8],=K1DW(4)[7],=K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],=K2DSW(4)[7],
+    =AC4YD(4)[8],=AC6ZM(4)[8],=AC7P(4)[7],=AC8Y(5)[8],=AD1C(4)[7],
+    =AD4EB(4)[8],=AD8J(5)[8],=AE7AP(4)[6],=AG1RL(3)[6],=AG1T(3)[6],
+    =AG3V(4)[7],=AG4W(4)[8],=AG5Z(4)[8],=AH0U(3)[6],=AH7T(3)[6],=AI0M(4)[8],
+    =AI4DB(4)[8],=AI8F(5)[8],=AI9K(4)[7],=AJ4A(4)[8],=AJ4F(4)[7],=AJ7G(5)[8],
+    =AK3Q(4)[8],=AK4QR(4)[8],=AK9D(4)[7],=AL1VE(3)[6],=AL3A(3)[6],=AL4B(4)[8],
+    =AL5M(4)[7],=K0ACP(4)[8],=K0AU(3)[6],=K0DQ(5)[8],=K0EJ(4)[8],=K0IP(3)[6],
+    =K0JJ(3)[6],=K0LUZ(5)[8],=K0MP(3)[6],=K0NW(3)[6],=K0PJ(4)[8],=K0RG(3)[6],
+    =K0SN(4)[6],=K0TQ(4)[8],=K0TV(5)[8],=K0ZR(5)[8],=K1DC(4)[8],=K1DW(4)[7],
+    =K1GU(4)[8],=K1KD(4)[7],=K1LKR(3)[6],=K1LT(4)[8],=K1OU(4)[8],=K2DSW(4)[7],
     =K2GMY(3)[6],=K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],=K2UR(4)[8],=K2VV(4)[7],
-    =K3DMG(4)[8],=K3FIV(3)[6],=K3GP(4)[8],=K3IE(4)[8],=K3PA(4)[7],=K3WA(4)[8],
-    =K3WT(4)[7],=K3WYC(3)[6],=K3YP(4)[8],=K4AB(4)[8],=K4AMC(4)[8],
-    =K4AMQ(4)[8],=K4AVX(4)[8],=K4BP(4)[8],=K4BX(4)[8],=K4CMS(4)[8],
-    =K4CWW(4)[8],=K4EDI(4)[8],=K4EZS(4)[8],=K4FT(4)[8],=K4FXN(4)[8],
+    =K3DMG(4)[8],=K3EST(3)[6],=K3FIV(3)[6],=K3GP(4)[8],=K3IE(4)[8],
+    =K3PA(4)[7],=K3WA(4)[8],=K3WT(4)[7],=K3WYC(3)[6],=K3YP(4)[8],=K4AB(4)[8],
+    =K4AMC(4)[8],=K4AVX(4)[8],=K4BX(4)[8],=K4CMS(4)[8],=K4CWW(4)[8],
+    =K4DXV(4)[8],=K4EDI(4)[8],=K4EZS(4)[8],=K4FT(4)[8],=K4FXN(4)[8],
     =K4HAL(4)[8],=K4IE(4)[8],=K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],
-    =K4MGE(4)[8],=K4RFT(4)[8],=K4RO(4)[8],=K4SPO(4)[8],=K4TCG(4)[8],
-    =K4TD(4)[8],=K4UU(4)[8],=K4WI(4)[8],=K4WW(4)[8],=K4XU(3)[6],=K4YJ(4)[8],
-    =K4ZGB(4)[8],=K4ZHM(4)[8],=K5AUP(5)[8],=K5EK(5)[8],=K5GDX(4)[8],
-    =K5KG(5)[8],=K5OA(3)[6],=K5RR(3)[6],=K5VIP(5)[8],=K5WP(4)[8],=K5ZD(5)[8],
-    =K6ND(5)[8],=K6RM(5)[8],=K6RQT(4)[8],=K6SXA(4)[7],=K6XT(4)[7],=K6ZB(4)[7],
-    =K7ABV(4)[6],=K7BG(4)[6],=K7BV(5)[8],=K7DR(4)[8],=K7GM(5)[8],=K7IA(4)[7],
-    =K7KAR(4)[7],=K7KU(4)[7],=K7OM(5)[8],=K7RB(4)[7],=K7SCX(4)[7],=K7SV(5)[8],
-    =K7TD(4)[7],=K7VK(4)[6],=K7VU(4)[7],=K7XC(4)[7],=K7ZYV(4)[8],=K8ARY(5)[8],
-    =K8CN(5)[8],=K8FC(5)[8],=K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8NYG(5)[8],
-    =K8PO(5)[8],=K8TE(4)[7],=K8WDX(5)[8],=K8YC(5)[8],=K9DR(4)[7],=K9DU(4)[7],
-    =K9FY(5)[8],=K9IA(5)[8],=K9JF(3)[6],=K9JM(3)[6],=K9MK(4)[7],=K9MU(4)[7],
-    =K9MWM(4)[7],=K9OM(5)[8],=K9OZ(4)[7],=K9RS(5)[8],=K9SG(3)[6],=K9WA(4)[7],
-    =K9WZB(3)[6],=K9YC(3)[6],=KA1KIX(4)[8],=KA3DRR(3)[6],=KA4GAV(4)[7],
-    =KA4OTB(4)[8],=KA7PNH(4)[7],=KA8HDE(4)[7],=KA8Q(5)[8],=KA9A(3)[6],
-    =KB5EZ(4)[8],=KB5JC(5)[8],=KB7FSC(4)[7],=KB7H(4)[8],=KB7Q(4)[6],
-    =KB8V(5)[8],=KB9S(4)[7],=KC0TOT(4)[8],=KC4HW(4)[8],=KC4SAW(4)[8],
-    =KC4TEO(4)[8],=KC4WQ(4)[8],=KC8GCR(5)[8],=KC8R(4)[7],=KD4EE(4)[8],
-    =KD4POJ(4)[7],=KD5UVV(4)[8],=KD9ST(4)[7],=KE0L(4)[8],=KE1B(3)[6],
-    =KE2VB(3)[6],=KE4ETY(4)[8],=KE4KE(4)[7],=KE4KMG(4)[8],=KE4KY(4)[8],
-    =KE5PRL(4)[8],=KE7X(4)[6],=KE8UN(5)[8],=KF2T(3)[6],=KG0F(3)[6],
-    =KG2A(4)[8],=KG4CUY(4)[8],=KG6MC(5)[8],=KH2D(5)[8],=KH6M(5)[8],
-    =KI4SP(4)[8],=KI7MT(4)[6],=KJ4AOM(4)[8],=KJ4IWZ(4)[8],=KJ4KKD(4)[8],
-    =KJ4LTA(4)[8],=KJ4RAQ(4)[8],=KK4JSJ(4)[8],=KK4TE(4)[8],=KK6L(5)[8],
-    =KK6MC(4)[7],=KK7JS(4)[7],=KK9A(5)[8],=KL3DM(5)[8],=KL7DA(5)[8],
-    =KL7FDQ(3)[6],=KL7HM(3)[6],=KL7IKV(3)[6],=KL7QW(4)[7],=KL7WP(3)[6],
-    =KL7WV(5)[8],=KM4DR(4)[7],=KM4FO(4)[8],=KM4JA(4)[8],=KM9R(3)[6],
-    =KN1CBR(4)[7],=KN4OK(4)[8],=KO0Z(4)[8],=KO4OL(4)[8],=KO7X(4)[7],
-    =KO9V(5)[8],=KP2F(4)[8],=KP4N(5)[8],=KR4F(4)[8],=KS4L(4)[8],=KS4X(4)[8],
-    =KS5A(3)[6],=KS7T(4)[6],=KT0R(4)[8],=KT3M(4)[7],=KT4RR(4)[8],=KU4A(4)[8],
-    =KU8E(5)[8],=KV1E(4)[7],=KV6O(4)[7],=KV8S(5)[8],=KW4J(4)[8],=KW7D(4)[7],
-    =KW7Q(4)[7],=KX2P(4)[7],=KX9X(5)[8],=KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],
-    =N0EF(4)[6],=N0FCD(4)[8],=N1CC(4)[7],=N1DID(3)[6],=N1JM(3)[6],=N1KW(4)[8],
-    =N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],=N2WN(4)[8],=N3AIU(3)[6],=N3BB(4)[7],
-    =N3BUO(4)[7],=N3KCJ(3)[6],=N3RC(4)[6],=N3ZZ(3)[6],=N4AB(4)[8],
-    =N4ARO(4)[8],=N4AU(4)[8],=N4BCB(4)[8],=N4BCD(4)[8],=N4DW(4)[8],
-    =N4FNB(4)[8],=N4FZ(4)[8],=N4HAI(4)[8],=N4HID(4)[8],=N4IJ(4)[7],
-    =N4IM(4)[7],=N4JF(4)[8],=N4KG(4)[8],=N4KH(4)[8],=N4NA(4)[8],=N4NM(4)[8],
-    =N4NO(4)[8],=N4OGW(4)[8],=N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],
-    =N4VI(4)[7],=N4VV(4)[8],=N4WE(4)[8],=N4XH(4)[8],=N4ZZ(4)[8],=N5CR(3)[6],
-    =N5CW(4)[8],=N5KO(3)[6],=N5PU(4)[8],=N5RP(4)[8],=N5SMQ(5)[8],=N5TF(4)[8],
-    =N5TOO(5)[8],=N5ZO(3)[6],=N6AR(5)[8],=N6BM(5)[8],=N7DR(4)[7],=N7EO(5)[8],
-    =N7FLT(4)[6],=N7FUL(4)[7],=N7GP(3)[7],=N7IP(4)[6],=N7IV(4)[7],=N7KA(4)[7],
-    =N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],=N7WY(4)[7],=N8CL(5)[8],=N8DEZ(3)[6],
-    =N8II(5)[8],=N8KSG(5)[8],=N8NA(5)[8],=N8OO(4)[7],=N8OQ(5)[8],=N8PR(5)[8],
-    =N8RA(5)[8],=N8WXQ(5)[8],=N9ADG(3)[6],=N9CIQ(4)[7],=N9DFD(5)[8],
-    =N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],=N9RV(4)[6],=N9SB(4)[7],=N9TX(4)[7],
-    =N9UY(5)[8],=N9VPV(4)[7],=NA2U(3)[6],=NA4C(4)[8],=NA4K(4)[8],=NA5NN(4)[8],
-    =NB0O(3)[6],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],=ND4Y(4)[8],=NH6P(3)[6],
-    =NH6Z(3)[6],=NK3L(3)[6],=NK8Q(5)[8],=NL7CQ(4)[7],=NL7XM(5)[8],
-    =NN4MM(4)[8],=NN7A(4)[7],=NO9E(5)[8],=NP2MR(5)[8],=NP3K(5)[8],
-    =NR7DX(4)[6],=NS2X(4)[8],=NS4X(4)[8],=NT4H(4)[8],=NW7M(5)[8],=NW8U(5)[8],
-    =NX1P(3)[6],=NY6DX(5)[8],=W0BR(5)[8],=W0HI(3)[6],=W0PAN(3)[6],=W0PV(5)[8],
-    =W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],=W0YR(5)[8],=W1BO(4)[8],
-    =W1JCW(4)[7],=W1NN(4)[8],=W1PR(3)[6],=W1RH(3)[6],=W1SRD(3)[6],
-    =W1WMU(4)[7],=W1ZD(3)[6],=W2GS(4)[7],=W2OO(4)[8],=W2UP(4)[7],=W2VJN(3)[6],
-    =W3HDH(4)[8],=W3HKK(4)[8],=W4BCG(4)[8],=W4BK(4)[8],=W4CV(4)[8],
-    =W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],=W4EF(3)[6],=W4GKM(4)[8],
-    =W4HOD(4)[8],=W4II(4)[8],=W4JSI(4)[8],=W4KW(4)[8],=W4LC(4)[8],=W4NI(4)[8],
-    =W4NZ(4)[8],=W4RYW(4)[8],=W4TTM(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],
-    =W4UT(4)[8],=W4VAB(4)[8],=W5BEN(4)[8],=W5JR(5)[8],=W5MX(4)[8],=W5NZ(4)[8],
-    =W5THT(4)[8],=W5UE(4)[8],=W5XB(5)[8],=W6DVS(5)[8],=W6GMT(4)[7],
-    =W6IHG(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],=W6NWS(5)[8],=W6RLL(3)[7],
-    =W6SAI(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],=W7KAM(4)[7],=W7KF(4)[6],
-    =W7SE(4)[7],=W7WZ(5)[8],=W8AKS(5)[8],=W8FJ(5)[8],=W8FN(4)[7],=W8HAP(5)[8],
-    =W8HGH(5)[8],=W8KA(3)[6],=W8MHW(4)[7],=W8OHT(5)[8],=W8TK(3)[6],
-    =W8WEJ(5)[8],=W8ZA(5)[8],=W9CF(3)[6],=W9DKB(4)[7],=W9FZ(4)[7],=W9GE(5)[8],
-    =W9JA(4)[7],=W9JEF(4)[7],=W9KB(5)[8],=W9LHG(4)[7],=W9MAF(4)[7],
-    =W9PL(3)[6],=W9RM(4)[7],=W9TW(4)[7],=W9UK(5)[8],=WA0WWW(3)[6],
-    =WA1FCN(4)[8],=WA1UJU(4)[8],=WA2VYA(4)[7],=WA3C(4)[8],=WA5LOU(4)[8],
+    =K4MGE(4)[8],=K4OAQ(4)[8],=K4PJ(4)[8],=K4RFT(4)[8],=K4RO(4)[8],
+    =K4SPO(4)[8],=K4TCG(4)[8],=K4TD(4)[8],=K4TNX(4)[8],=K4UU(4)[8],
+    =K4WI(4)[8],=K4WW(4)[8],=K4XU(3)[6],=K4YJ(4)[8],=K4ZGB(4)[8],=K4ZHM(4)[8],
+    =K5AUP(5)[8],=K5EK(5)[8],=K5GDX(4)[8],=K5KG(5)[8],=K5OA(3)[6],=K5RR(3)[6],
+    =K5TRI(3)[6],=K5VIP(5)[8],=K5WP(4)[8],=K5ZD(5)[8],=K6ND(5)[8],
+    =K6RQT(4)[8],=K6SXA(4)[7],=K6XT(4)[7],=K6ZB(4)[7],=K7ABV(4)[6],
+    =K7BG(4)[6],=K7BV(5)[8],=K7DR(4)[8],=K7GM(5)[8],=K7IA(4)[7],=K7KAR(4)[7],
+    =K7OM(5)[8],=K7RB(4)[7],=K7SCX(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K7VK(4)[6],
+    =K7VU(4)[7],=K7ZYV(4)[8],=K8AC(5)[8],=K8ARY(5)[8],=K8CN(5)[8],=K8FC(5)[8],
+    =K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8LS(4)[7],=K8NYG(5)[8],=K8PO(5)[8],
+    =K8TE(4)[7],=K8WDX(5)[8],=K8YC(5)[8],=K9DR(4)[7],=K9DU(4)[7],=K9FY(5)[8],
+    =K9HXO(5)[8],=K9IA(5)[8],=K9JF(3)[6],=K9JM(3)[6],=K9JN(4)[7],=K9MK(4)[7],
+    =K9MU(4)[7],=K9MWM(4)[7],=K9OM(5)[8],=K9OZ(4)[7],=K9RS(5)[8],=K9SG(3)[6],
+    =K9WA(4)[7],=K9WZB(3)[6],=K9YC(3)[6],=KA1KIX(4)[8],=KA3DRR(3)[6],
+    =KA4GAV(4)[7],=KA4OTB(4)[8],=KA4R(4)[8],=KA7PNH(4)[7],=KA8HDE(4)[7],
+    =KA8Q(5)[8],=KA9A(3)[6],=KA9VVQ(4)[7],=KB5EZ(4)[8],=KB5JC(5)[8],
+    =KB7FSC(4)[7],=KB7H(4)[8],=KB7Q(4)[6],=KB8KMH(5)[8],=KB8V(5)[8],
+    =KB9S(4)[7],=KC4HW(4)[8],=KC4SAW(4)[8],=KC4TEO(4)[8],=KC4WQ(4)[8],
+    =KC8GCR(5)[8],=KC8R(4)[7],=KD4EE(4)[8],=KD4POJ(4)[7],=KD4SN(4)[8],
+    =KD5UVV(4)[8],=KD9ST(4)[7],=KE0L(4)[8],=KE1B(3)[6],=KE2VB(3)[6],
+    =KE4ETY(4)[8],=KE4KE(4)[7],=KE4KMG(4)[8],=KE4KY(4)[8],=KE5PRL(4)[8],
+    =KE7X(4)[6],=KF2T(3)[6],=KG0F(3)[6],=KG2A(4)[8],=KG4CUY(4)[8],
+    =KG6MC(5)[8],=KH2D(5)[8],=KH6M(5)[8],=KH6VM(3)[6],=KH6XS(3)[6],
+    =KI7MT(4)[6],=KJ4AOM(4)[8],=KJ4IWZ(4)[8],=KJ4KKD(4)[8],=KJ4LTA(4)[8],
+    =KK1Z(4)[7],=KK4JSJ(4)[8],=KK4TE(4)[8],=KK5OQ(4)[8],=KK6L(5)[8],
+    =KK6MC(4)[7],=KK7JS(4)[7],=KK9A(5)[8],=KL0MP(5)[8],=KL3DM(5)[8],
+    =KL7DA(5)[8],=KL7FDQ(3)[6],=KL7IKV(3)[6],=KL7QW(4)[7],=KL7WV(5)[8],
+    =KM4DR(4)[7],=KM4FO(4)[8],=KM4JA(4)[8],=KM9R(3)[6],=KN1CBR(4)[7],
+    =KN4OK(4)[8],=KO0Z(4)[8],=KO4OL(4)[8],=KO7X(4)[7],=KO9V(5)[8],=KP2F(4)[8],
+    =KR4F(4)[8],=KS4L(4)[8],=KS4X(4)[8],=KS5A(3)[6],=KS7T(4)[6],=KT0R(4)[8],
+    =KT3M(4)[7],=KT4RR(4)[8],=KU4A(4)[8],=KU8E(5)[8],=KV1E(4)[7],=KV6O(4)[7],
+    =KV8S(5)[8],=KW4J(4)[8],=KW7D(4)[7],=KW7Q(4)[7],=KX2P(4)[7],=KX9X(5)[8],
+    =KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],=N0EF(4)[6],=N0FCD(4)[8],=N0FW(4)[8],
+    =N0KQ(3)[6],=N1CC(4)[7],=N1JM(3)[6],=N1KW(4)[8],=N2BJ(4)[8],=N2IC(4)[7],
+    =N2NS(3)[6],=N2WN(4)[8],=N3AIU(3)[6],=N3BB(4)[7],=N3BUO(4)[7],
+    =N3KCJ(3)[6],=N3RC(3)[6],=N3ZZ(3)[6],=N4AB(4)[8],=N4ARO(4)[8],=N4AU(4)[8],
+    =N4BCB(4)[8],=N4BCD(4)[8],=N4DW(4)[8],=N4FNB(4)[8],=N4HAI(4)[8],
+    =N4HID(4)[8],=N4IJ(4)[7],=N4IM(4)[7],=N4IR(4)[8],=N4JF(4)[8],=N4JRG(4)[8],
+    =N4KG(4)[8],=N4KH(4)[8],=N4NA(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],
+    =N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],=N4VV(4)[8],
+    =N4WE(4)[8],=N4XH(4)[8],=N4ZZ(4)[8],=N5CR(3)[6],=N5CW(4)[8],=N5KO(3)[6],
+    =N5PU(4)[8],=N5RP(4)[8],=N5SMQ(5)[8],=N5TF(4)[8],=N5TOO(5)[8],=N5ZO(3)[6],
+    =N6AR(5)[8],=N7DR(4)[7],=N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],=N7GP(3)[7],
+    =N7IP(4)[6],=N7IV(4)[7],=N7KA(4)[7],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],
+    =N7WY(4)[7],=N8AID(5)[8],=N8CL(5)[8],=N8II(5)[8],=N8IK(5)[8],=N8KSG(5)[8],
+    =N8NA(5)[8],=N8OO(4)[7],=N8OQ(5)[8],=N8RA(5)[8],=N8WXQ(5)[8],=N9ADG(3)[6],
+    =N9CIQ(4)[7],=N9DFD(5)[8],=N9JF(4)[7],=N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],
+    =N9QWV(4)[7],=N9RV(4)[6],=N9SB(4)[7],=N9TX(4)[7],=N9UY(5)[8],=N9VPV(4)[7],
+    =NA2U(3)[6],=NA4C(4)[8],=NA4K(4)[8],=NA5NN(4)[8],=NB0O(3)[6],=NB4M(4)[8],
+    =ND2T(3)[6],=ND4X(4)[8],=ND4Y(4)[8],=NE4RD(4)[7],=NH6P(3)[6],=NH6Z(3)[6],
+    =NJ8M(4)[7],=NK3L(3)[6],=NK8Q(5)[8],=NL7CQ(4)[7],=NL7XM(5)[8],
+    =NN4MM(4)[8],=NN7A(4)[7],=NO9E(5)[8],=NP3K(5)[8],=NR7DX(4)[6],=NS2X(4)[8],
+    =NS4X(4)[8],=NT4H(3)[6],=NU4N(4)[8],=NU4X(4)[8],=NW7M(5)[8],=NW8U(5)[8],
+    =NX1P(3)[6],=NX9T(5)[8],=NY6DX(5)[8],=W0BR(5)[8],=W0CN(5)[8],=W0IMD(5)[8],
+    =W0PAN(3)[6],=W0PV(5)[8],=W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],
+    =W1BO(4)[8],=W1GKT(4)[8],=W1JCW(4)[7],=W1NN(4)[8],=W1PR(3)[6],=W1RH(3)[6],
+    =W1SRD(3)[6],=W1WMU(4)[7],=W1ZD(3)[6],=W2GS(4)[7],=W2OO(4)[8],=W2UP(4)[7],
+    =W2VJN(3)[6],=W3DQN(4)[7],=W3HDH(4)[8],=W3HKK(4)[8],=W4BCG(4)[8],
+    =W4BK(4)[8],=W4CV(4)[8],=W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],
+    =W4EF(3)[6],=W4GKM(4)[8],=W4HOD(4)[8],=W4II(4)[8],=W4JSI(4)[8],
+    =W4KW(4)[8],=W4LC(4)[8],=W4NI(4)[8],=W4NJK(3)[6],=W4NZ(4)[8],=W4RYW(4)[8],
+    =W4TTM(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],=W4UT(4)[8],=W4VAB(4)[8],
+    =W5BEN(4)[8],=W5JR(5)[8],=W5MX(4)[8],=W5NZ(4)[8],=W5UE(4)[8],=W6DVS(5)[8],
+    =W6GMT(4)[7],=W6IHG(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],=W6NWS(5)[8],
+    =W6RLL(3)[7],=W6SAI(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],
+    =W7KAM(4)[7],=W7KF(4)[6],=W7SE(4)[7],=W7WZ(5)[8],=W8AKS(5)[8],=W8FJ(5)[8],
+    =W8FN(4)[7],=W8HAP(5)[8],=W8HGH(5)[8],=W8KA(3)[6],=W8LYJ(5)[8],
+    =W8MHW(4)[7],=W8OHT(5)[8],=W8TK(3)[6],=W8WEJ(5)[8],=W8ZA(5)[8],
+    =W9CF(3)[6],=W9DCA(4)[7],=W9DKB(4)[7],=W9FZ(4)[7],=W9GE(5)[8],=W9JA(4)[7],
+    =W9JEF(4)[7],=W9KB(5)[8],=W9LHG(4)[7],=W9MAF(4)[7],=W9PL(3)[6],
+    =W9RM(4)[7],=W9TW(4)[7],=W9UK(5)[8],=WA0WWW(3)[6],=WA1FCN(4)[8],
+    =WA1UJU(4)[8],=WA2VYA(4)[7],=WA3C(4)[8],=WA4JA(4)[8],=WA5LOU(4)[8],
     =WA5POK(4)[8],=WA5VGI(3)[6],=WA6MM(4)[7],=WA7BME(3)[7],=WA8KAN(5)[8],
     =WA8OJR(5)[8],=WA8QYJ(5)[8],=WA8ZBT(4)[7],=WA9ETL(4)[7],=WB0POH(5)[8],
-    =WB3JFS(3)[6],=WB4CTX(4)[8],=WB4IT(4)[8],=WB4YDL(4)[8],=WB4YDY(4)[8],
-    =WB5EIN(4)[8],=WB7S(4)[7],=WB8CQV(5)[8],=WB8EKG(5)[8],=WB8FVB(4)[7],
-    =WB8IMY(5)[8],=WB8YQJ(3)[6],=WB8YYY(5)[8],=WB9KPT(4)[7],=WC1X(3)[6],
-    =WC7S(4)[7],=WD4OHD(4)[8],=WD5CCA(4)[8],=WE5DX(4)[8],=WE6EZ(4)[7],
-    =WF4U(3)[6],=WF5K(4)[8],=WF7T(4)[8],=WH6E(4)[8],=WH6LE(5)[8],=WH7R(4)[7],
-    =WJ9B(3)[6],=WL7OU(4)[7],=WL7YQ(4)[7],=WM5DX(4)[8],=WN1G(4)[8],
-    =WP3ME(5)[8],=WP3Y(4)[7],=WQ5L(4)[8],=WQ5O(4)[8],=WQ9T(4)[7],=WR3O(4)[8],
-    =WR5G(3)[6],=WR5J(3)[6],=WS6K(4)[8],=WS6X(5)[8],=WS7X(4)[7],=WS9M(5)[8],
-    =WT2P(4)[8],=WT5L(5)[8],=WT8V(5)[8],=WU5E(4)[8],=WW6O(4)[7],=WY7FD(4)[7],
-    =WY7SS(4)[7],=WZ4F(4)[8],=WZ7I(5)[8];
+    =WB3JFS(3)[6],=WB4IT(4)[8],=WB4YDL(4)[8],=WB4YDY(4)[8],=WB5EIN(4)[8],
+    =WB7S(4)[7],=WB8CQV(5)[8],=WB8EKG(5)[8],=WB8IMY(5)[8],=WB8YQJ(3)[6],
+    =WB8YYY(5)[8],=WB9G(4)[7],=WB9KPT(4)[7],=WC1X(3)[6],=WC7S(4)[7],
+    =WD4OHD(4)[8],=WD5CCA(4)[8],=WE5DX(4)[8],=WE6EZ(4)[7],=WF4U(3)[6],
+    =WF5K(4)[8],=WF7T(4)[8],=WH6E(4)[8],=WH6LE(5)[8],=WH7R(4)[7],=WJ9B(3)[6],
+    =WK4AA(4)[8],=WL7OU(4)[7],=WL7YQ(4)[7],=WM5DX(4)[8],=WN1G(4)[8],
+    =WP3ME(5)[8],=WP3Y(4)[7],=WQ5L(4)[8],=WQ9T(4)[7],=WR3O(4)[8],=WR5G(3)[6],
+    =WR5J(3)[6],=WS6K(4)[8],=WS6X(5)[8],=WS7X(4)[7],=WS9M(5)[8],=WT2P(4)[8],
+    =WT5L(5)[8],=WY7FD(4)[7],=WY7SS(4)[7],=WZ4F(4)[8],=WZ7I(5)[8];
 Guantanamo Bay:           08:  11:  NA:   20.00:    75.00:     5.0:  KG4:
     KG4;
 Mariana Islands:          27:  64:  OC:   15.18:  -145.72:   -10.0:  KH0:
-    AH0,KH0,NH0,WH0,=AF6EO,=KG7DCN,=NA1M,=W1PJ,=W3STX,=WH6ZW;
+    AH0,KH0,NH0,WH0,=N0J,=W3FM;
 Baker & Howland Islands:  31:  61:  OC:    0.00:   176.00:    12.0:  KH1:
     AH1,KH1,NH1,WH1;
 Guam:                     27:  64:  OC:   13.37:  -144.70:   -10.0:  KH2:
-    AH2,KH2,NH2,WH2,=KB7OVT,=KD7IRV,=KE7IPG,=KG6DX,=KG6JDX,=NH0A,=NH0B,=WH0AC;
+    AH2,KH2,NH2,WH2,=AC0FG,=AH0AX,=KB7OVT,=KD7IRV,=KE7IPG,=KG6DX,=KG6JDX,
+    =KH0TF,=KM4NVB,=NH0B;
 Johnston Island:          31:  61:  OC:   16.72:   169.53:    10.0:  KH3:
     AH3,KH3,NH3,WH3;
 Midway Island:            31:  61:  OC:   28.20:   177.37:    11.0:  KH4:
     AH4,KH4,NH4,WH4;
 Palmyra & Jarvis Islands: 31:  61:  OC:    5.87:   162.07:    11.0:  KH5:
-    AH5,KH5,NH5,WH5;
+    AH5,KH5,NH5,WH5,=K5P;
 Kingman Reef:             31:  61:  OC:    6.40:   162.40:    11.0:  KH5K:
     AH5K,KH5K,NH5K,WH5K;
 Hawaii:                   31:  61:  OC:   21.12:   157.48:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AC4PJ,=AC4TJ,=K1ENT,=K1OWL,=K2GT,=K5HQM,
-    =K6IJ,=K9FD,=KA0FOR,=KA6RUZ,=KB3OXU,=KC2GSU,=KC7DUT,=KC7I,=KC7JVX,=KC7KAT,
-    =KC7KAW,=KC7LFM,=KD3FZ,=KD5MQY,=KD7GLO,=KD7LMP,=KD7WJM,=KE4RNU,=KE4ZXQ,
-    =KE6AXP,=KE6JXO,=KE7HEW,=KF6MQT,=KF7LRS,=KF7OJR,=KG0XR,=KG7CVR,=KI6WOJ,
-    =KK6OMX,=KQ6CD,=N0ZSJ,=N7BLC,=N7ODC,=W7DJK,=W7NX,=W7RCR,=W8JVF,=WA4ZOF,
-    =WA6UVF,=WB4JTT,=WB6SAA;
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AB8VQ,=K0BAD,=K1VAN,=K2GT,=K4XV,=K5HQM,
+    =K6ATF,=K7ASH,=K7FAR,=K7FR,=K7OJL,=K9FD,=KA8KND,=KB0DJR,=KB1GC,=KB3OXU,
+    =KB3PJS,=KB7EA,=KC7I,=KC7JVX,=KC7KAT,=KC7KAW,=KC7YXO,=KD6CWF,=KD7LMP,
+    =KE5CGA,=KE6AYZ,=KE7RCT,=KF5MXM,=KF5MXP,=KF6FDG,=KF6ZAL,=KF7LRS,=KF7OJR,
+    =KG6LFX,=KG6MZJ,=KG6WZD,=KG7ASP,=KG7EUP,=KJ6NZH,=KJ6RGW,=N6KB,=N7ODC,
+    =N7TOF,=N7ZHK,=NH2CC,=NH2CD,=NH2CF,=NH2II,=W4PPA,=W6CAG,=W6KIT,=W6ROM,
+    =W6SHH,=W7UEA,=WA7ZK,=WB4JTT,=WB5ZDH,=WB6PJT,=WB6SAA,=WR1Z,=WV6K;
 Kure Island:              31:  61:  OC:   29.00:   178.00:    10.0:  KH7K:
     AH7K,KH7K,NH7K,WH7K;
 American Samoa:           32:  62:  OC:  -14.32:   170.78:    11.0:  KH8:
@@ -664,19 +664,19 @@ Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:
 Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
     AH9,KH9,NH9,WH9;
 Alaska:                   01:  01:  NA:   61.40:   148.87:     8.0:  KL:
-    AL,KL,NL,WL,=AB9OM,=AD0DK,=K0CAW,=K7Y,=K7ZOA,=KB1KLH,=KB1WQL,=KB7AMA,
-    =KB8TEW,=KC3DBK,=KC5SLA,=KC7AXO,=KC7GSO,=KC7IKE,=KC7IKF,=KD0CZC,=KD0FJG,
-    =KD2CTE,=KD2GKT,=KD8GEL,=KD8LNA,=KE4YEI,=KE4YLG,=KF4PLR,=KF5YYK,=KF6BOV,
-    =KG4TJS,=KG7GJL,=KG7LBW,=KI4COG,=KJ4IAQ,=KK6IUY,=KM4AGL,=KS0C,=KY7J,
-    =N0IVJ,=N0WXJ,=N2TJY,=N6SPP,=W5JKT,=W5MQS,=W7DDG,=W8TCX,=W9ITU,=WA1FVJ,
-    =WA2BIW;
+    AL,KL,NL,WL,=K5HL,=K7EJM,=K9WUV,=KB7AMA,=KC5SLA,=KC7GSO,=KC7IKE,=KC7IKF,
+    =KC9HIK,=KD0FJG,=KD0VAK,=KD0VAL,=KD2GKT,=KD8BVD,=KE0DYM,=KE4YEI,=KE5JHS,
+    =KE5ZRK,=KE6DXH,=KE7ELL,=KE7FXM,=KE7TRX,=KF6BOV,=KF7UFY,=KG5GDF,=KG5JQC,
+    =KG7GJL,=KG7LBW,=KG7SEQ,=KI4GDI,=KK4WWH,=KK4WWI,=KM4AGL,=KM4KWS,=N0SUB,
+    =N7MTG,=NW4G,=W1RSC,=W6TFD,=W7DDG,=W7WEZ,=W9ITU,=WA1FVJ,=WA2BIW;
 Navassa Island:           08:  11:  NA:   18.40:    75.00:     5.0:  KP1:
     KP1,NP1,WP1;
 US Virgin Islands:        08:  11:  NA:   17.73:    64.80:     4.0:  KP2:
-    KP2,NP2,WP2,=K5TP,=K9VV,=KB1MDZ,=KV4BT,=KV4FZ,=W4YY,=WA4HLB,=WT3A;
+    KP2,NP2,WP2,=K8RF,=K9VV,=KB1MDZ,=KB1ZTY,=KB9KHC,=KC9MCN,=KJ4AYN,=KV4BT,
+    =KV4CQ/P,=KV4FZ,=WA4HLB,=WT3A;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
-    KP3,KP4,NP3,NP4,WP3,WP4,=KA9UTY,=KB1UZV,=KC2TE,=KD4TVS,=KH2RU,=KP2H,=KP2Z,
-    =KP4FD/IARU,=N2KUE,=N5PLN,=NB0G,=WA2RVA,=WB5YOF;
+    KP3,KP4,NP3,NP4,WP3,WP4,=KB8ZVP,=KC2BZZ,=KC2TE,=KF6OGJ,=KG5FVY,=KH2RU,
+    =KJ4LOZ,=KK4DCX,=KM4AKA,=KP2H,=KP2Z;
 Desecheo Island:          08:  11:  NA:   18.08:    67.88:     4.0:  KP5:
     KP5,NP5,WP5;
 Norway:                   14:  18:  EU:   61.00:    -9.00:    -1.0:  LA:
@@ -777,9 +777,8 @@ Argentina:                13:  14:  SA:  -34.80:    65.92:     3.0:  LU:
     LW2W[16],LW2X[16],LW2Y[16],LW3V[16],LW3W[16],LW3X[16],LW3Y[16],LW4V[16],
     LW4W[16],LW4X[16],LW4Y[16],LW5V[16],LW5W[16],LW5X[16],LW5Y[16],LW6V[16],
     LW6W[16],LW6X[16],LW6Y[16],LW7V[16],LW7W[16],LW7X[16],LW7Y[16],LW8V[16],
-    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU1AET/D,
-    =LU1XZ/H,=LU2DVI/H,=LU4DQ/D,=LU4WAP/D,=LU5HJC/XP[16],=LU5OM/K,
-    =LU5YF/V[16],=LU6XQ/D;
+    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU2BPM/D,
+    =LU2DVI/H,=LU3CA/D,=LU4DK/D,=LU5DX/H,=LU5XP/D,=LU9VEA/V[16];
 Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -789,11 +788,14 @@ Bulgaria:                 20:  28:  EU:   42.83:   -25.08:    -2.0:  LZ:
 Peru:                     10:  12:  SA:  -10.00:    76.00:     5.0:  OA:
     4T,OA,OB,OC;
 Lebanon:                  20:  39:  AS:   33.83:   -35.83:    -2.0:  OD:
-    OD;
+    OD,=OD5RI/YOTA;
 Austria:                  15:  28:  EU:   47.33:   -13.33:    -1.0:  OE:
-    4U1V,OE,=4Y1A,=C7A,=OE2015XHQ/SC;
+    OE,=4U1A,=4U1VIC,=4U70VIC;
 Finland:                  15:  18:  EU:   63.78:   -27.08:    -2.0:  OH:
-    OF,OG,OH,OI,OJ;
+    OF,OG,OH,OI,OJ,=OH1BGG/SA,=OH1FJ/S,=OH1SJ/S,=OH1TX/SA,=OH2BMB/SA,
+    =OH2BNX/SA,=OH2MEE/SA,=OH2NAS/SA,=OH2ZY/S,=OH3FJQ/SA,=OH3HB/S,=OH3HHO/SA,
+    =OH3KRB/S,=OH3MY/S,=OH6FA/SA,=OH6FSQ/S,=OH6K/S,=OH6QR/SA,=OH9AR/S,=OI3V/S,
+    =OI3V/SA,=OI6SP/S,=OI7AX/S;
 Aland Islands:            15:  18:  EU:   60.13:   -20.37:    -2.0:  OH0:
     OF0,OG0,OH0,OI0;
 Market Reef:              15:  18:  EU:   60.00:   -19.00:    -2.0:  OJ0:
@@ -817,7 +819,7 @@ Aruba:                    09:  11:  SA:   12.53:    69.98:     4.0:  P4:
 DPR of Korea:             25:  44:  AS:   39.78:  -126.30:    -9.0:  P5:
     HM,P5,P6,P7,P8,P9;
 Netherlands:              14:  27:  EU:   52.28:    -5.47:    -1.0:  PA:
-    PA,PB,PC,PD,PE,PF,PG,PH,PI,=PD0ARI/MILL,=PH4RTM/MILL;
+    PA,PB,PC,PD,PE,PF,PG,PH,PI;
 Curacao:                  09:  11:  SA:   12.17:    69.00:     4.0:  PJ2:
     PJ2;
 Bonaire:                  09:  11:  SA:   12.20:    68.25:     4.0:  PJ4:
@@ -833,7 +835,7 @@ Brazil:                   11:  15:  SA:  -10.00:    53.00:     3.0:  PY:
 Fernando de Noronha:      11:  13:  SA:   -3.85:    32.43:     2.0:  PY0F:
     PP0F,PQ0F,PR0F,PS0F,PT0F,PU0F,PV0F,PW0F,PX0F,PY0F,PY0Z,ZV0F,ZW0F,ZX0F,
     ZY0F,ZY0Z,ZZ0F,PP0R,PQ0R,PR0R,PS0R,PT0R,PU0R,PV0R,PW0R,PX0R,PY0R,ZV0R,
-    ZW0R,ZX0R,ZY0R,ZZ0R,=PY0NY;
+    ZW0R,ZX0R,ZY0R,ZZ0R;
 St. Peter & St. Paul:     11:  13:  SA:    0.00:    29.00:     2.0:  PY0S:
     PP0S,PQ0S,PR0S,PS0S,PT0S,PU0S,PV0S,PW0S,PX0S,PY0S,ZV0S,ZW0S,ZX0S,ZY0S,
     ZZ0S;
@@ -855,7 +857,7 @@ Seychelles:               39:  53:  AF:   -4.67:   -55.47:    -4.0:  S7:
 Sao Tome & Principe:      36:  47:  AF:    0.22:    -6.57:     0.0:  S9:
     S9;
 Sweden:                   14:  18:  EU:   61.20:   -14.57:    -1.0:  SM:
-    7S,8S,SA,SB,SC,SD,SE,SF,SG,SH,SI,SJ,SK,SL,SM;
+    7S,8S,SA,SB,SC,SD,SE,SF,SG,SH,SI,SJ,SK,SL,SM,=SM6AAL/S;
 Poland:                   15:  28:  EU:   52.28:   -18.67:    -1.0:  SP:
     3Z,HF,SN,SO,SP,SQ,SR;
 Sudan:                    34:  48:  AF:   14.47:   -28.62:    -3.0:  ST:
@@ -863,13 +865,13 @@ Sudan:                    34:  48:  AF:   14.47:   -28.62:    -3.0:  ST:
 Egypt:                    34:  38:  AF:   26.28:   -28.60:    -2.0:  SU:
     6A,6B,SS,SU;
 Greece:                   20:  28:  EU:   39.78:   -21.78:    -2.0:  SV:
-    J4,SV,SW,SX,SY,SZ;
+    J4,SV,SW,SX,SY,SZ,=SX90IARU;
 Mount Athos:              20:  28:  EU:   40.00:   -24.00:    -2.0:  SV/a:
     =SV2ASP/A;
 Dodecanese:               20:  28:  EU:   36.17:   -27.93:    -2.0:  SV5:
     J45,SV5,SW5,SX5,SY5,SZ5,=SV0XCA/5;
 Crete:                    20:  28:  EU:   35.23:   -24.78:    -2.0:  SV9:
-    J49,SV9,SW9,SX9,SY9,SZ9,=SV0LB,=SV0XBN/9,=SV0XCC/9;
+    J49,SV9,SW9,SX9,SY9,SZ9,=SV0LB,=SV0XBN/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:
@@ -887,16 +889,15 @@ San Marino:               15:  28:  EU:   43.95:   -12.45:    -1.0:  T7:
 Palau:                    27:  64:  OC:    7.45:  -134.53:    -9.0:  T8:
     T8;
 Asiatic Turkey:           20:  39:  AS:   39.18:   -35.65:    -2.0:  TA:
-    TA,TB,TC,YM;
+    TA,TB,TC,YM,=TA1BX/2;
 European Turkey:          20:  39:  EU:   41.02:   -28.97:    -2.0:  *TA1:
-    TA1,TB1,TC1,YM1,=TA6CQ/1,=TC100A,=TC100GLB,=TC100GP,=TC100GS,=TC100KT,
-    =TC100VKZL;
+    TA1,TB1,TC1,YM1;
 Iceland:                  40:  17:  EU:   64.80:    18.73:     0.0:  TF:
     TF;
 Guatemala:                07:  11:  NA:   15.50:    90.30:     6.0:  TG:
     TD,TG;
 Costa Rica:               07:  11:  NA:   10.00:    84.00:     6.0:  TI:
-    TE,TI;
+    TE,TI,=TI90IARU,=VERSION;
 Cocos Island:             07:  11:  NA:    5.52:    87.05:     6.0:  TI9:
     TE9,TI9;
 Cameroon:                 36:  47:  AF:    5.38:   -11.87:    -1.0:  TJ:
@@ -906,7 +907,7 @@ Corsica:                  15:  28:  EU:   42.00:    -9.00:    -1.0:  TK:
 Central African Republic: 36:  47:  AF:    6.75:   -20.33:    -1.0:  TL:
     TL;
 Republic of the Congo:    36:  52:  AF:   -1.02:   -15.37:    -1.0:  TN:
-    TN,=VERSION;
+    TN;
 Gabon:                    36:  52:  AF:   -0.37:   -11.73:    -1.0:  TR:
     TR;
 Chad:                     36:  47:  AF:   15.80:   -18.17:    -1.0:  TT:
@@ -983,17 +984,16 @@ European Russia:          16:  29:  EU:   53.65:   -41.37:    -4.0:  UA:
     UH1P[20],UH1Z[19],UH4H[30],UH4I[30],UH4W[30],UH8F(17)[30],UH8G(17)[30],
     UH8X(17)[20],UH9F(17)[30],UH9G(17)[30],UH9X(17)[20],UI1N[19],UI1O[19],
     UI1P[20],UI1Z[19],UI4H[30],UI4I[30],UI4W[30],UI8F(17)[30],UI8G(17)[30],
-    UI8X(17)[20],UI9F(17)[30],UI9G(17)[30],UI9X(17)[20],=UA0XAK/3,
-    =R120RK(17)[20],=R120RP(17)[30],=R5VAJ/N,=R90IARU(17)[20],=R9XZ/3,
-    =RJ4P[30],=RM4P[30],=RM4R[30],=RP70KW(17)[20],=RP70PK(17)[30],
-    =RW9WJ/4[30],=UA0ZED/6,=UA4PN[30],=UA4RF[30],=UA4RW[30],=UA9B/1,=UA9FIT/4,
-    =UE95MS;
+    UI8X(17)[20],UI9F(17)[30],UI9G(17)[30],UI9X(17)[20],=R0CM/4,=R0CAF/3,
+    =R90IARU,=RJ4P[30],=RM4R[30],=RT9K/6,=RT9K/7,=RT9T/3,=RU9ZA/7,
+    =RW9WJ/4[30],=UA0BDS/1,=UA4NF[30],=UA4PN[30],=UA4RW[30],=UA9JPX/6,
+    =UA9UAX/3,=UE90FL;
 Kaliningrad:              15:  29:  EU:   54.72:   -20.52:    -3.0:  UA2:
     R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RF2F,RF2K,RG2F,RG2K,RI2F,RI2K,RJ2F,RJ2K,
     RK2F,RK2K,RL2F,RL2K,RM2F,RM2K,RN2F,RN2K,RO2F,RO2K,RP2F,RP2K,RQ2F,RQ2K,
     RR2F,RR2K,RT2F,RT2K,RU2F,RU2K,RV2F,RV2K,RW2F,RW2K,RX2F,RX2K,RY2F,RY2K,
-    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UF2,UG2,UH2,UI2,=R2MWO,=RP70KB,=RP70KG,
-    =RP70MW,=RP70WB,=RY1AAA/2,=UE2AT,=UE2BF,=UE2GC,=UE2IT,=UE2MW,=UE2SK;
+    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UF2,UG2,UH2,UI2,=R2MWO,=RA3ATX/2,
+    =UF1M/2;
 Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     R0,R8(17)[30],R9,RA0,RA8(17)[30],RA9,RB0,RB8(17)[30],RB9,RC0,RC8(17)[30],
     RC9,RD0,RD8(17)[30],RD9,RE0,RE8(17)[30],RE9,RF0,RF8(17)[30],RF9,RG0,
@@ -1120,21 +1120,12 @@ Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     UI8O(18)[31],UI8P(18)[31],UI8S(16)[30],UI8T(16)[30],UI8U(18)[31],
     UI8V(18)[31],UI8W(16)[30],UI8Y(18)[31],UI8Z(18)[31],UI9I(18)[31],
     UI9M(17)[30],UI9P(18)[31],UI9S(16),UI9T(16),UI9V(18)[31],UI9W(16),
-    =R120RB(18)[32],=R120RDP,=R120RG,=R120RI(19)[35],=R120RJ[20],=R120RL,
-    =R120RN(19)[34],=R120RQ(18)[32],=R120RU[20],=R120RW(18)[31],=R120RZ,
-    =R1ZY/9[20],=R2015R,=R3CA/9(18)[22],=R9/UN7JHC(18)[31],=RA/EW8ADX(17)[30],
-    =RA0BA/8(17)[30],=RA4RU/9[20],=RC1M/9(18)[31],=RM2D/0(18)[32],
-    =RP70AB(18)[32],=RP70AF(18)[31],=RP70AS(19)[25],=RP70AY(19)[23],=RP70AZ,
-    =RP70BP(18)[31],=RP70DG(19)[34],=RP70DT,=RP70G,=RP70GA(18)[31],=RP70GB,
-    =RP70GI(16),=RP70GK(17)[30],=RP70GM(16),=RP70GP,=RP70GR,=RP70GS[20],
-    =RP70H(19)[34],=RP70KE,=RP70KM(18)[31],=RP70KV(18)[32],=RP70LF[20],
-    =RP70LL,=RP70LM,=RP70LS(16),=RP70MA,=RP70MC(17)[30],=RP70MD(17)[30],
-    =RP70MP(18)[31],=RP70NK(16),=RP70NM(18)[31],=RP70OB(17)[30],
-    =RP70OF(17)[30],=RP70OS(17)[30],=RP70P,=RP70PM,=RP70R,=RP70RS(18)[32],
-    =RP70SA,=RP70SD(19)[34],=RP70SF[20],=RP70SL(18)[31],=RP70SU[20],=RP70TG,
-    =RP70TM,=RP70UF(16),=RP70UH,=RP70UK(18)[31],=RP70V(19)[34],=RP70YF[20],
-    =RP70ZF(18)[31],=RP70ZO(16),=RQ4D/8(17)[30],=RV3DSA/0(19)[34],
-    =RX6DL/8/P(17)[30],=UA9MA/9(18)[31],=UA9UAX/9(18)[31];
+    =R18KDR/0(19)[30],=R18KDR/8(17)[30],=R120TM,=R170GS/0(19)[34],
+    =R170GS/8(17)[30],=R18KDR/4(16)[30],=R18KDR/9(18)[32],=R1ZY/9[20],
+    =R2015BP,=R2015RR(18)[31],=R2015RY(19)[25],=R2015SV(18)[31],
+    =R9/UN7JHC(18)[31],=RAEM(18)[31],=RC85AO(19)[25],=RM2D/0(19)[34],
+    =RQ4D/8(17)[30],=RU0ZM/9(18)[31],=RU9MV/0(19)[25],=RV3DSA/0(19)[34],
+    =UE56S,=UE64RWA;
 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:
@@ -1180,21 +1171,22 @@ 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,=VER20150529,=VA2PL(2)[4],
-    =VA2RC(2)[4],=VE2CSI(2)[4],=VE2EKA(2)[4],=VE2EW(2)[4],=VE2FK[9],
-    =VE2GSO(2)[4],=VE2IM(2)[4],=VY0PW(4)[3];
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20151225,=VA2PL(2)[4],
+    =VA2RC(2)[4],=VE1RM/4(4)[3],=VE2CSI(2)[4],=VE2EKA(2)[4],=VE2EW(2)[4],
+    =VE2FK[9],=VE2IDX(2)[4],=VE2IM(2)[4],=VE2TKH(2)[4],=VY0PW(4)[3];
 Australia:                30:  59:  OC:  -23.70:  -132.33:   -10.0:  VK:
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ,AX4[55],VH4[55],VI4[55],VJ4[55],VK4[55],
-    VL4[55],VM4[55],VN4[55],VZ4[55],=AX8AA;
+    VL4[55],VM4[55],VN4[55],VZ4[55],=VI90IARU,=VK2IAY/6(29)[58],
+    =VK6YB/2(29)[58];
 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;
 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,=VK9AW;
 Lord Howe Island:         30:  60:  OC:  -31.55:  -159.08:   -10.5:  VK9L:
-    AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L;
+    AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L,=VK2IAY/9;
 Mellish Reef:             30:  56:  OC:  -17.40:  -155.85:   -10.0:  VK9M:
     AX9M,VH9M,VI9M,VJ9M,VK9M,VL9M,VM9M,VN9M,VZ9M;
 Norfolk Island:           32:  60:  OC:  -29.03:  -167.93:   -11.5:  VK9N:
@@ -1219,13 +1211,13 @@ Ducie Island:             32:  63:  OC:  -24.70:   124.80:     8.0:  VP6/d:
 Falkland Islands:         13:  16:  SA:  -51.63:    58.72:     4.0:  VP8:
     VP8;
 South Georgia Island:     13:  73:  SA:  -54.48:    37.08:     2.0:  VP8/g:
-    =VP8SGK;
+    =VP8SGI,=VP8SGK;
 South Shetland Islands:   13:  73:  SA:  -62.08:    58.67:     4.0:  VP8/h:
     CE9,XR9,=HF0POL,=RI1ANA,=RI1ANF,=RI59ANT;
 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:
-    =VP8THU;
+    =VP8STI;
 Bermuda:                  05:  11:  NA:   32.32:    64.73:     4.0:  VP9:
     VP9;
 Chagos Islands:           39:  41:  AF:   -7.32:   -72.42:    -6.0:  VQ9:
@@ -1310,13 +1302,13 @@ Cayman Islands:           08:  11:  NA:   19.32:    81.22:     5.0:  ZF:
 Tokelau Islands:          31:  62:  OC:   -9.40:   171.20:   -13.0:  ZK3:
     ZK3;
 New Zealand:              32:  60:  OC:  -41.83:  -173.27:   -12.0:  ZL:
-    ZK,ZL,ZL50,ZM;
+    ZK,ZL,ZL50,ZM,=ZL90IARU;
 Chatham Islands:          32:  60:  OC:  -43.85:   176.48:  -12.75:  ZL7:
     ZL7,ZM7;
 Kermadec Islands:         32:  60:  OC:  -29.25:   177.92:   -12.0:  ZL8:
     ZL8,ZM8;
-Auckland & Campbell Is.:  32:  60:  OC:  -51.62:  -167.62:   -12.0:  ZL9:
-    ZL9,ZM9;
+N.Z. Subantarctic Is.:    32:  60:  OC:  -51.62:  -167.62:   -12.0:  ZL9:
+    ZL9;
 Paraguay:                 11:  14:  SA:  -25.27:    57.67:     4.0:  ZP:
     ZP;
 South Africa:             38:  57:  AF:  -29.07:   -22.63:    -2.0:  ZS:
diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 2ccd1bf1c61dea9a5f5804b47ceabde5787967d7..db751488122267d84ddb479e03a6ec882cdea271 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -9,6 +9,7 @@
   '2E' => '142',
   '2I' => '144',
   '2J' => '145',
+  '2K' => '142',
   '2M' => '146',
   '2U' => '147',
   '2W' => '148',
@@ -3427,27 +3428,35 @@
   '=2M0SEG' => '679',
   '=2M0SPX' => '679',
   '=2M0ZET' => '679',
+  '=3D2AG/P' => '12',
   '=3D2C' => '11',
   '=3D2RI' => '12',
   '=3Y0E' => '17',
   '=3Y0X' => '18',
+  '=4U0ITU' => '23',
   '=4U0WFP' => '167,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834',
-  '=4U150ITU' => '23',
+  '=4U1A' => '965',
+  '=4U1G' => '152',
   '=4U1GSC' => '167,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834',
+  '=4U1ITU' => '23',
+  '=4U1UN' => '24',
+  '=4U1VIC' => '965',
   '=4U1WB' => '181',
   '=4U1WRC' => '23',
   '=4U20B' => '167,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834',
   '=4U5F' => '167,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834',
-  '=4Y1A' => '965',
+  '=4U70VIC' => '965',
   '=8J1RL' => '1703,1705,1708,1710,1712,1714,1716,332,345',
-  '=9A70DP/KA' => '47',
-  '=9A70DP/PU' => '47',
-  '=9A70DP/RI' => '47',
-  '=9A70DP/ZG' => '47',
-  '=9M2MDX/6' => '54',
-  '=9M4ARD/6' => '54',
-  '=9M4ARD/8' => '54',
+  '=8T2BH' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=9M4CBP' => '54',
+  '=9M4SAB' => '54',
+  '=9M90IARU/6' => '54',
+  '=9M90IARU/8' => '54',
+  '=A61BK/ND' => '65',
+  '=A61DJ/ND' => '65',
+  '=A61HA/ND' => '65',
+  '=A61QQ/ND' => '65',
+  '=A61SM/ND' => '65',
   '=AA2IL' => '181',
   '=AA4DD' => '181',
   '=AA4NU' => '181',
@@ -3455,147 +3464,109 @@
   '=AA4R' => '181',
   '=AA4YL' => '181',
   '=AA5TL' => '181',
-  '=AB1HZ' => '181',
   '=AB4B' => '181',
+  '=AB4EJ' => '181',
   '=AB4GG' => '181',
   '=AB4IQ' => '181',
   '=AB4KJ' => '181',
   '=AB5ZA' => '181',
   '=AB8RL' => '181',
-  '=AB9OM' => '194,884,886,888,890,892',
+  '=AB8VQ' => '189',
+  '=AC0FG' => '184',
   '=AC4CA' => '181',
   '=AC4G' => '181',
-  '=AC4M' => '181',
-  '=AC4PJ' => '189',
-  '=AC4TJ' => '189',
   '=AC4YD' => '181',
   '=AC6ZM' => '181',
   '=AC7P' => '181',
   '=AC8Y' => '181',
-  '=AD0DK' => '194,884,886,888,890,892',
   '=AD1C' => '181',
   '=AD4EB' => '181',
-  '=AD5OW' => '181',
   '=AD8J' => '181',
   '=AE7AP' => '181',
-  '=AF6EO' => '182',
   '=AG1RL' => '181',
   '=AG1T' => '181',
   '=AG3V' => '181',
   '=AG4W' => '181',
   '=AG5Z' => '181',
+  '=AH0AX' => '184',
+  '=AH0U' => '181',
+  '=AH7T' => '181',
+  '=AI0M' => '181',
   '=AI4DB' => '181',
   '=AI8F' => '181',
   '=AI9K' => '181',
   '=AJ4A' => '181',
+  '=AJ4F' => '181',
   '=AJ7G' => '181',
   '=AK3Q' => '181',
   '=AK4QR' => '181',
   '=AK9D' => '181',
   '=AL1VE' => '181',
   '=AL3A' => '181',
+  '=AL4B' => '181',
   '=AL5M' => '181',
-  '=AO150ITU/8' => '104,105',
-  '=AO150U' => '104,105',
   '=AX/VK0TH' => '338',
-  '=AX8AA' => '280,1519,1521,1523,1525,1527,1529,1531,1533',
-  '=BD9BI/0' => '72,404,406,408,410,412,414,416,418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,454,456,458,460,462,464',
-  '=BG9XD/5' => '72,404,406,408,410,412,414,416,418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,454,456,458,460,462,464',
+  '=B90IARU' => '72,404,406,408,410,412,414,416,418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,454,456,458,460,462,464',
   '=BS7H' => '69',
-  '=C7A' => '965',
+  '=CX6DRA/V' => '88,534,536,538,540,542,544,546,548,550,552,554,556,558,560,562,564,566,568,570',
   '=D8A' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=DP0GVN' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=DP1POL' => '1703,1705,1708,1710,1712,1714,1716,332,345',
-  '=DX0P' => '2',
   '=E50W' => '333,1718,1720',
+  '=E51PT' => '333,1718,1720',
   '=E51WL' => '333,1718,1720',
-  '=EA1EK/ZAP' => '101,594,596,598,600,602,604',
-  '=EA1RCI/ICA' => '101,594,596,598,600,602,604',
-  '=EA3EGB/9' => '106,107,606,608',
-  '=EA4RCH/CIE' => '101,594,596,598,600,602,604',
-  '=EA5ADM/P' => '101,594,596,598,600,602,604',
+  '=EA1RCG/YOA' => '101,594,596,598,600,602,604',
+  '=EA3FNZ/8' => '104,105',
   '=EA5CC/P' => '101,594,596,598,600,602,604',
+  '=EA5EZ/6' => '102,103',
   '=EA5EZ/8' => '104,105',
-  '=EA5HCC/P' => '101,594,596,598,600,602,604',
-  '=EA5URV/CAC' => '101,594,596,598,600,602,604',
-  '=EA7URL/FSV' => '101,594,596,598,600,602,604',
+  '=EA5EZ/P' => '102,103',
+  '=EA5RKB/9' => '106,107,606,608',
   '=EA9PD/P' => '106,107,606,608',
-  '=EG90IARU' => '101,594,596,598,600,602,604',
-  '=EG90IARU/1' => '101,594,596,598,600,602,604',
-  '=EG90IARU/2' => '101,594,596,598,600,602,604',
-  '=EG90IARU/3' => '101,594,596,598,600,602,604',
-  '=EG90IARU/4' => '101,594,596,598,600,602,604',
-  '=EG90IARU/5' => '101,594,596,598,600,602,604',
-  '=EG90IARU/7' => '101,594,596,598,600,602,604',
-  '=EH90IARU/6' => '102,103',
-  '=EH90IARU/8' => '104,105',
-  '=FK8IK/C' => '124',
-  '=FO/F6BFH/P' => '129',
+  '=EA9UV/7' => '101,594,596,598,600,602,604',
+  '=FO/JI1JKW' => '129',
+  '=GB0AVR' => '148',
   '=GB0BTC' => '144',
   '=GB0GDS' => '146,680',
-  '=GB0GMT' => '148',
   '=GB0GPF' => '144',
-  '=GB0MIW' => '148',
   '=GB0MPA' => '148',
-  '=GB0MUU' => '148',
   '=GB0NHL' => '146,680',
-  '=GB0SFM' => '146,680',
-  '=GB0SSB' => '146,680',
-  '=GB1AFP' => '144',
   '=GB1OL' => '146,680',
-  '=GB1PJ' => '148',
   '=GB1SPD' => '144',
-  '=GB2BCW' => '144',
   '=GB2BOA' => '144',
-  '=GB2BOW' => '148',
-  '=GB2CC' => '148',
-  '=GB2CM' => '146,680',
   '=GB2DMR' => '144',
-  '=GB2DRC' => '146,680',
   '=GB2ELH' => '679',
-  '=GB2GEO' => '146,680',
   '=GB2GNL' => '146,680',
   '=GB2IMD' => '148',
   '=GB2JSA' => '145',
-  '=GB2LM' => '148',
-  '=GB2MAC' => '144',
-  '=GB2MOF' => '146,680',
   '=GB2MOP' => '148',
   '=GB2OWM' => '146,680',
-  '=GB2QM' => '679',
-  '=GB2RB' => '146,680',
-  '=GB2SFM' => '148',
-  '=GB2TD' => '148',
   '=GB3ANG' => '146,680',
   '=GB3LER' => '679',
   '=GB3LER/B' => '679',
   '=GB3NGI' => '144',
   '=GB3ORK' => '146,680',
-  '=GB3WOI' => '146,680',
-  '=GB4GM' => '146,680',
-  '=GB4GSS' => '148',
   '=GB4LER' => '679',
   '=GB4MD' => '148',
   '=GB4MDI' => '148',
-  '=GB4MPI' => '148',
+  '=GB4ONI' => '144',
   '=GB4SDD' => '148',
   '=GB4UAS' => '144',
   '=GB5AG' => '146,680',
   '=GB5FHC' => '146,680',
-  '=GB5GEO' => '148',
-  '=GB6AC' => '148',
+  '=GB5OMU' => '144',
   '=GB6BLB' => '148',
-  '=GB6GGM' => '148',
-  '=GB8MD' => '148',
   '=GM0CXQ' => '679',
   '=GM0EKM' => '679',
   '=GM0GFL' => '679',
+  '=GM0GFL/P' => '679',
   '=GM0ILB' => '679',
   '=GM0JDB' => '679',
   '=GM1FGN' => '679',
   '=GM1KKI' => '679',
   '=GM1ZNR' => '679',
   '=GM3KLA' => '679',
+  '=GM3TXF/P' => '679',
   '=GM3WHT' => '679',
   '=GM3ZET' => '679',
   '=GM4IPK' => '679',
@@ -3605,7 +3576,6 @@
   '=GM4PXG' => '679',
   '=GM4SLV' => '679',
   '=GM4SSA' => '679',
-  '=GM4WSB/P' => '679',
   '=GM4WXQ' => '679',
   '=GM4ZHL' => '679',
   '=GM6RQW' => '679',
@@ -3618,10 +3588,11 @@
   '=GS3ZET' => '679',
   '=HF0POL' => '345',
   '=HK0TU' => '334',
-  '=IA/IZ3SUS' => '1703,1705,1708,1710,1712,1714,1716,332,345',
+  '=I4CQO/N' => '167,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834',
   '=II0ICH' => '168',
   '=II0IDP' => '168',
   '=II0SB' => '168',
+  '=IK3TZB/N' => '167,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834',
   '=IQ0AG' => '168',
   '=IQ0AH' => '168',
   '=IQ0AI' => '168',
@@ -3637,13 +3608,13 @@
   '=IQ0QP' => '168',
   '=IQ0SS' => '168',
   '=IY0GA' => '168',
-  '=IY9A' => '819',
+  '=IZ1CLA/N' => '167,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834',
   '=JD1YAA' => '335',
   '=JG8NQJ/JD1' => '335',
   '=JW9JKA' => '877',
   '=K0ACP' => '181',
   '=K0AU' => '181',
-  '=K0CAW' => '194,884,886,888,890,892',
+  '=K0BAD' => '189',
   '=K0DQ' => '181',
   '=K0EJ' => '181',
   '=K0IP' => '181',
@@ -3659,11 +3630,12 @@
   '=K0ZR' => '181',
   '=K1DC' => '181',
   '=K1DW' => '181',
-  '=K1ENT' => '189',
   '=K1GU' => '181',
   '=K1KD' => '181',
+  '=K1LKR' => '181',
   '=K1LT' => '181',
-  '=K1OWL' => '189',
+  '=K1OU' => '181',
+  '=K1VAN' => '189',
   '=K2DSW' => '181',
   '=K2GMY' => '181',
   '=K2GT' => '189',
@@ -3673,6 +3645,7 @@
   '=K2UR' => '181',
   '=K2VV' => '181',
   '=K3DMG' => '181',
+  '=K3EST' => '181',
   '=K3FIV' => '181',
   '=K3GP' => '181',
   '=K3IE' => '181',
@@ -3683,12 +3656,11 @@
   '=K3YP' => '181',
   '=K4AB' => '181',
   '=K4AMC' => '181',
-  '=K4AMQ' => '181',
   '=K4AVX' => '181',
-  '=K4BP' => '181',
   '=K4BX' => '181',
   '=K4CMS' => '181',
   '=K4CWW' => '181',
+  '=K4DXV' => '181',
   '=K4EDI' => '181',
   '=K4EZS' => '181',
   '=K4FT' => '181',
@@ -3699,44 +3671,53 @@
   '=K4IU' => '181',
   '=K4LTA' => '181',
   '=K4MGE' => '181',
+  '=K4OAQ' => '181',
+  '=K4PJ' => '181',
   '=K4RFT' => '181',
   '=K4RO' => '181',
   '=K4SPO' => '181',
   '=K4TCG' => '181',
   '=K4TD' => '181',
+  '=K4TNX' => '181',
   '=K4UU' => '181',
   '=K4WI' => '181',
   '=K4WW' => '181',
   '=K4XU' => '181',
+  '=K4XV' => '189',
   '=K4YJ' => '181',
   '=K4ZGB' => '181',
   '=K4ZHM' => '181',
   '=K5AUP' => '181',
   '=K5EK' => '181',
   '=K5GDX' => '181',
+  '=K5HL' => '194,884,886,888,890,892',
   '=K5HQM' => '189',
   '=K5KG' => '181',
   '=K5OA' => '181',
+  '=K5P' => '187,880,882',
   '=K5RR' => '181',
-  '=K5TP' => '196',
+  '=K5TRI' => '181',
   '=K5VIP' => '181',
   '=K5WP' => '181',
   '=K5ZD' => '181',
-  '=K6IJ' => '189',
+  '=K6ATF' => '189',
   '=K6ND' => '181',
-  '=K6RM' => '181',
   '=K6RQT' => '181',
   '=K6SXA' => '181',
   '=K6XT' => '181',
   '=K6ZB' => '181',
   '=K7ABV' => '181',
+  '=K7ASH' => '189',
   '=K7BG' => '181',
   '=K7BV' => '181',
   '=K7DR' => '181',
+  '=K7EJM' => '194,884,886,888,890,892',
+  '=K7FAR' => '189',
+  '=K7FR' => '189',
   '=K7GM' => '181',
   '=K7IA' => '181',
   '=K7KAR' => '181',
-  '=K7KU' => '181',
+  '=K7OJL' => '189',
   '=K7OM' => '181',
   '=K7RB' => '181',
   '=K7SCX' => '181',
@@ -3744,18 +3725,18 @@
   '=K7TD' => '181',
   '=K7VK' => '181',
   '=K7VU' => '181',
-  '=K7XC' => '181',
-  '=K7Y' => '194,884,886,888,890,892',
-  '=K7ZOA' => '194,884,886,888,890,892',
   '=K7ZYV' => '181',
+  '=K8AC' => '181',
   '=K8ARY' => '181',
   '=K8CN' => '181',
   '=K8FC' => '181',
   '=K8GU' => '181',
   '=K8IA' => '181',
   '=K8JQ' => '181',
+  '=K8LS' => '181',
   '=K8NYG' => '181',
   '=K8PO' => '181',
+  '=K8RF' => '196',
   '=K8TE' => '181',
   '=K8WDX' => '181',
   '=K8YC' => '181',
@@ -3763,9 +3744,11 @@
   '=K9DU' => '181',
   '=K9FD' => '189',
   '=K9FY' => '181',
+  '=K9HXO' => '181',
   '=K9IA' => '181',
   '=K9JF' => '181',
   '=K9JM' => '181',
+  '=K9JN' => '181',
   '=K9MK' => '181',
   '=K9MU' => '181',
   '=K9MWM' => '181',
@@ -3775,38 +3758,41 @@
   '=K9SG' => '181',
   '=K9VV' => '196',
   '=K9WA' => '181',
+  '=K9WUV' => '194,884,886,888,890,892',
   '=K9WZB' => '181',
   '=K9YC' => '181',
-  '=KA0FOR' => '189',
   '=KA1KIX' => '181',
   '=KA3DRR' => '181',
   '=KA4GAV' => '181',
   '=KA4OTB' => '181',
-  '=KA6RUZ' => '189',
+  '=KA4R' => '181',
   '=KA7PNH' => '181',
   '=KA8HDE' => '181',
+  '=KA8KND' => '189',
   '=KA8Q' => '181',
   '=KA9A' => '181',
-  '=KA9UTY' => '197',
-  '=KB1KLH' => '194,884,886,888,890,892',
+  '=KA9VVQ' => '181',
+  '=KB0DJR' => '189',
+  '=KB1GC' => '189',
   '=KB1MDZ' => '196',
-  '=KB1UZV' => '197',
-  '=KB1WQL' => '194,884,886,888,890,892',
+  '=KB1ZTY' => '196',
   '=KB3OXU' => '189',
+  '=KB3PJS' => '189',
   '=KB5EZ' => '181',
   '=KB5JC' => '181',
   '=KB7AMA' => '194,884,886,888,890,892',
+  '=KB7EA' => '189',
   '=KB7FSC' => '181',
   '=KB7H' => '181',
   '=KB7OVT' => '184',
   '=KB7Q' => '181',
-  '=KB8TEW' => '194,884,886,888,890,892',
+  '=KB8KMH' => '181',
   '=KB8V' => '181',
+  '=KB8ZVP' => '197',
+  '=KB9KHC' => '196',
   '=KB9S' => '181',
-  '=KC0TOT' => '181',
-  '=KC2GSU' => '189',
+  '=KC2BZZ' => '197',
   '=KC2TE' => '197',
-  '=KC3DBK' => '194,884,886,888,890,892',
   '=KC4AAA' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=KC4AAC' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=KC4HW' => '181',
@@ -3815,8 +3801,6 @@
   '=KC4USV' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=KC4WQ' => '181',
   '=KC5SLA' => '194,884,886,888,890,892',
-  '=KC7AXO' => '194,884,886,888,890,892',
-  '=KC7DUT' => '189',
   '=KC7GSO' => '194,884,886,888,890,892',
   '=KC7I' => '189',
   '=KC7IKE' => '194,884,886,888,890,892',
@@ -3824,26 +3808,25 @@
   '=KC7JVX' => '189',
   '=KC7KAT' => '189',
   '=KC7KAW' => '189',
-  '=KC7LFM' => '189',
+  '=KC7YXO' => '189',
   '=KC8GCR' => '181',
   '=KC8R' => '181',
-  '=KD0CZC' => '194,884,886,888,890,892',
+  '=KC9HIK' => '194,884,886,888,890,892',
+  '=KC9MCN' => '196',
   '=KD0FJG' => '194,884,886,888,890,892',
-  '=KD2CTE' => '194,884,886,888,890,892',
+  '=KD0VAK' => '194,884,886,888,890,892',
+  '=KD0VAL' => '194,884,886,888,890,892',
   '=KD2GKT' => '194,884,886,888,890,892',
-  '=KD3FZ' => '189',
   '=KD4EE' => '181',
   '=KD4POJ' => '181',
-  '=KD4TVS' => '197',
-  '=KD5MQY' => '189',
+  '=KD4SN' => '181',
   '=KD5UVV' => '181',
-  '=KD7GLO' => '189',
+  '=KD6CWF' => '189',
   '=KD7IRV' => '184',
   '=KD7LMP' => '189',
-  '=KD7WJM' => '189',
-  '=KD8GEL' => '194,884,886,888,890,892',
-  '=KD8LNA' => '194,884,886,888,890,892',
+  '=KD8BVD' => '194,884,886,888,890,892',
   '=KD9ST' => '181',
+  '=KE0DYM' => '194,884,886,888,890,892',
   '=KE0L' => '181',
   '=KE1B' => '181',
   '=KE2VB' => '181',
@@ -3851,70 +3834,88 @@
   '=KE4KE' => '181',
   '=KE4KMG' => '181',
   '=KE4KY' => '181',
-  '=KE4RNU' => '189',
   '=KE4YEI' => '194,884,886,888,890,892',
-  '=KE4YLG' => '194,884,886,888,890,892',
-  '=KE4ZXQ' => '189',
+  '=KE5CGA' => '189',
+  '=KE5JHS' => '194,884,886,888,890,892',
   '=KE5PRL' => '181',
-  '=KE6AXP' => '189',
-  '=KE6JXO' => '189',
-  '=KE7HEW' => '189',
+  '=KE5ZRK' => '194,884,886,888,890,892',
+  '=KE6AYZ' => '189',
+  '=KE6DXH' => '194,884,886,888,890,892',
+  '=KE7ELL' => '194,884,886,888,890,892',
+  '=KE7FXM' => '194,884,886,888,890,892',
   '=KE7IPG' => '184',
+  '=KE7RCT' => '189',
+  '=KE7TRX' => '194,884,886,888,890,892',
   '=KE7X' => '181',
-  '=KE8UN' => '181',
   '=KF2T' => '181',
-  '=KF4PLR' => '194,884,886,888,890,892',
-  '=KF5YYK' => '194,884,886,888,890,892',
+  '=KF5MXM' => '189',
+  '=KF5MXP' => '189',
   '=KF6BOV' => '194,884,886,888,890,892',
-  '=KF6MQT' => '189',
+  '=KF6FDG' => '189',
+  '=KF6OGJ' => '197',
+  '=KF6ZAL' => '189',
   '=KF7LRS' => '189',
   '=KF7OJR' => '189',
+  '=KF7UFY' => '194,884,886,888,890,892',
   '=KG0F' => '181',
-  '=KG0XR' => '189',
   '=KG2A' => '181',
   '=KG4CUY' => '181',
-  '=KG4TJS' => '194,884,886,888,890,892',
+  '=KG5FVY' => '197',
+  '=KG5GDF' => '194,884,886,888,890,892',
+  '=KG5JQC' => '194,884,886,888,890,892',
   '=KG6DX' => '184',
   '=KG6JDX' => '184',
+  '=KG6LFX' => '189',
   '=KG6MC' => '181',
-  '=KG7CVR' => '189',
-  '=KG7DCN' => '182',
+  '=KG6MZJ' => '189',
+  '=KG6WZD' => '189',
+  '=KG7ASP' => '189',
+  '=KG7EUP' => '189',
   '=KG7GJL' => '194,884,886,888,890,892',
   '=KG7LBW' => '194,884,886,888,890,892',
+  '=KG7SEQ' => '194,884,886,888,890,892',
+  '=KH0TF' => '184',
   '=KH2D' => '181',
   '=KH2RU' => '197',
   '=KH6M' => '181',
+  '=KH6VM' => '181',
+  '=KH6XS' => '181',
   '=KH8S/NA6M' => '192',
-  '=KI4COG' => '194,884,886,888,890,892',
-  '=KI4SP' => '181',
-  '=KI6WOJ' => '189',
+  '=KI4GDI' => '194,884,886,888,890,892',
   '=KI7MT' => '181',
   '=KJ4AOM' => '181',
-  '=KJ4IAQ' => '194,884,886,888,890,892',
+  '=KJ4AYN' => '196',
   '=KJ4IWZ' => '181',
   '=KJ4KKD' => '181',
+  '=KJ4LOZ' => '197',
   '=KJ4LTA' => '181',
-  '=KJ4RAQ' => '181',
+  '=KJ6NZH' => '189',
+  '=KJ6RGW' => '189',
+  '=KK1Z' => '181',
+  '=KK4DCX' => '197',
   '=KK4JSJ' => '181',
   '=KK4TE' => '181',
-  '=KK6IUY' => '194,884,886,888,890,892',
+  '=KK4WWH' => '194,884,886,888,890,892',
+  '=KK4WWI' => '194,884,886,888,890,892',
+  '=KK5OQ' => '181',
   '=KK6L' => '181',
   '=KK6MC' => '181',
-  '=KK6OMX' => '189',
   '=KK7JS' => '181',
   '=KK9A' => '181',
+  '=KL0MP' => '181',
   '=KL3DM' => '181',
   '=KL7DA' => '181',
   '=KL7FDQ' => '181',
-  '=KL7HM' => '181',
   '=KL7IKV' => '181',
   '=KL7QW' => '181',
-  '=KL7WP' => '181',
   '=KL7WV' => '181',
   '=KM4AGL' => '194,884,886,888,890,892',
+  '=KM4AKA' => '197',
   '=KM4DR' => '181',
   '=KM4FO' => '181',
   '=KM4JA' => '181',
+  '=KM4KWS' => '194,884,886,888,890,892',
+  '=KM4NVB' => '184',
   '=KM9R' => '181',
   '=KN1CBR' => '181',
   '=KN4OK' => '181',
@@ -3925,11 +3926,7 @@
   '=KP2F' => '181',
   '=KP2H' => '197',
   '=KP2Z' => '197',
-  '=KP4FD/IARU' => '197',
-  '=KP4N' => '181',
-  '=KQ6CD' => '189',
   '=KR4F' => '181',
-  '=KS0C' => '194,884,886,888,890,892',
   '=KS4L' => '181',
   '=KS4X' => '181',
   '=KS5A' => '181',
@@ -3941,6 +3938,7 @@
   '=KU8E' => '181',
   '=KV1E' => '181',
   '=KV4BT' => '196',
+  '=KV4CQ/P' => '196',
   '=KV4FZ' => '196',
   '=KV6O' => '181',
   '=KV8S' => '181',
@@ -3950,19 +3948,16 @@
   '=KX2P' => '181',
   '=KX9X' => '181',
   '=KY4F' => '181',
-  '=KY7J' => '194,884,886,888,890,892',
   '=KZ1W' => '181',
   '=KZ2V' => '181',
-  '=LU1AET/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
-  '=LU1XZ/H' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
   '=LU1ZA' => '346',
+  '=LU2BPM/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
   '=LU2DVI/H' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
-  '=LU4DQ/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
-  '=LU4WAP/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
-  '=LU5HJC/XP' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
-  '=LU5OM/K' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
-  '=LU5YF/V' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
-  '=LU6XQ/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
+  '=LU3CA/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
+  '=LU4DK/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
+  '=LU5DX/H' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
+  '=LU5XP/D' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
+  '=LU9VEA/V' => '200,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946',
   '=MM0LSM' => '679',
   '=MM0XAU' => '679',
   '=MM0ZAL' => '679',
@@ -3982,18 +3977,16 @@
   '=MS0ZET' => '679',
   '=N0EF' => '181',
   '=N0FCD' => '181',
-  '=N0IVJ' => '194,884,886,888,890,892',
-  '=N0WXJ' => '194,884,886,888,890,892',
-  '=N0ZSJ' => '189',
+  '=N0FW' => '181',
+  '=N0J' => '182',
+  '=N0KQ' => '181',
+  '=N0SUB' => '194,884,886,888,890,892',
   '=N1CC' => '181',
-  '=N1DID' => '181',
   '=N1JM' => '181',
   '=N1KW' => '181',
   '=N2BJ' => '181',
   '=N2IC' => '181',
-  '=N2KUE' => '197',
   '=N2NS' => '181',
-  '=N2TJY' => '194,884,886,888,890,892',
   '=N2WN' => '181',
   '=N3AIU' => '181',
   '=N3BB' => '181',
@@ -4008,12 +4001,13 @@
   '=N4BCD' => '181',
   '=N4DW' => '181',
   '=N4FNB' => '181',
-  '=N4FZ' => '181',
   '=N4HAI' => '181',
   '=N4HID' => '181',
   '=N4IJ' => '181',
   '=N4IM' => '181',
+  '=N4IR' => '181',
   '=N4JF' => '181',
+  '=N4JRG' => '181',
   '=N4KG' => '181',
   '=N4KH' => '181',
   '=N4NA' => '181',
@@ -4032,7 +4026,6 @@
   '=N5CR' => '181',
   '=N5CW' => '181',
   '=N5KO' => '181',
-  '=N5PLN' => '197',
   '=N5PU' => '181',
   '=N5RP' => '181',
   '=N5SMQ' => '181',
@@ -4040,9 +4033,7 @@
   '=N5TOO' => '181',
   '=N5ZO' => '181',
   '=N6AR' => '181',
-  '=N6BM' => '181',
-  '=N6SPP' => '194,884,886,888,890,892',
-  '=N7BLC' => '189',
+  '=N6KB' => '189',
   '=N7DR' => '181',
   '=N7EO' => '181',
   '=N7FLT' => '181',
@@ -4051,47 +4042,55 @@
   '=N7IP' => '181',
   '=N7IV' => '181',
   '=N7KA' => '181',
+  '=N7MTG' => '194,884,886,888,890,892',
   '=N7MZW' => '181',
   '=N7NG' => '181',
   '=N7ODC' => '189',
+  '=N7TOF' => '189',
   '=N7US' => '181',
   '=N7WY' => '181',
+  '=N7ZHK' => '189',
+  '=N8AID' => '181',
   '=N8CL' => '181',
-  '=N8DEZ' => '181',
   '=N8II' => '181',
+  '=N8IK' => '181',
   '=N8KSG' => '181',
   '=N8NA' => '181',
   '=N8OO' => '181',
   '=N8OQ' => '181',
-  '=N8PR' => '181',
   '=N8RA' => '181',
   '=N8WXQ' => '181',
   '=N9ADG' => '181',
   '=N9CIQ' => '181',
   '=N9DFD' => '181',
+  '=N9JF' => '181',
   '=N9NA' => '181',
   '=N9NB' => '181',
   '=N9NC' => '181',
+  '=N9QWV' => '181',
   '=N9RV' => '181',
   '=N9SB' => '181',
   '=N9TX' => '181',
   '=N9UY' => '181',
   '=N9VPV' => '181',
-  '=NA1M' => '182',
   '=NA2U' => '181',
   '=NA4C' => '181',
   '=NA4K' => '181',
   '=NA5NN' => '181',
-  '=NB0G' => '197',
   '=NB0O' => '181',
   '=NB4M' => '181',
   '=ND2T' => '181',
   '=ND4X' => '181',
   '=ND4Y' => '181',
-  '=NH0A' => '184',
+  '=NE4RD' => '181',
   '=NH0B' => '184',
+  '=NH2CC' => '189',
+  '=NH2CD' => '189',
+  '=NH2CF' => '189',
+  '=NH2II' => '189',
   '=NH6P' => '181',
   '=NH6Z' => '181',
+  '=NJ8M' => '181',
   '=NK3L' => '181',
   '=NK8Q' => '181',
   '=NL7CQ' => '181',
@@ -4099,187 +4098,160 @@
   '=NN4MM' => '181',
   '=NN7A' => '181',
   '=NO9E' => '181',
-  '=NP2MR' => '181',
   '=NP3K' => '181',
   '=NR7DX' => '181',
   '=NS2X' => '181',
   '=NS4X' => '181',
   '=NT4H' => '181',
+  '=NU4N' => '181',
+  '=NU4X' => '181',
+  '=NW4G' => '194,884,886,888,890,892',
   '=NW7M' => '181',
   '=NW8U' => '181',
   '=NX1P' => '181',
+  '=NX9T' => '181',
   '=NY6DX' => '181',
-  '=OE2015XHQ/SC' => '206,966,968,970,972,974,976,978,980,982,984',
+  '=OD5RI/YOTA' => '205',
+  '=OH1BGG/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH1FJ/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH1SJ/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH1TX/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH2BMB/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH2BNX/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH2MEE/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH2NAS/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH2ZY/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH3FJQ/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH3HB/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH3HHO/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH3KRB/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH3MY/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH6FA/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH6FSQ/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH6K/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH6QR/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OH9AR/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OI3V/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OI3V/SA' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OI6SP/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OI7AX/S' => '207,986,988,990,992,994,996,998,1000,1002',
+  '=OP0LE' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=OR4TN' => '1703,1705,1708,1710,1712,1714,1716,332,345',
-  '=PD0ARI/MILL' => '219',
-  '=PH4RTM/MILL' => '219',
-  '=PY0NY' => '226,1084',
-  '=R120RB' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RDP' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RG' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RI' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RJ' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RK' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=R120RL' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RN' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RP' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=R120RQ' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RU' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RW' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R120RZ' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R0CAF/3' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=R0CM/4' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=R120TM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R170GS/0' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R170GS/8' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R18KDR/0' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R18KDR/4' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R18KDR/8' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R18KDR/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
   '=R1ZY/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R2015R' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R2015BP' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R2015RR' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R2015RY' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=R2015SV' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
   '=R2MWO' => '267',
-  '=R3CA/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=R5VAJ/N' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
   '=R9/UN7JHC' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
   '=R90IARU' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=R9XZ/3' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=RA/EW8ADX' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RA0BA/8' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RA4RU/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RC1M/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=RA3ATX/2' => '267',
+  '=RAEM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=RC85AO' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
   '=RI1ANA' => '345',
   '=RI1ANC' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=RI1ANF' => '345',
   '=RI1ANM' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=RI1ANP' => '1703,1705,1708,1710,1712,1714,1716,332,345',
+  '=RI1ANR' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=RI1ANZ' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=RI59ANT' => '345',
   '=RJ4P' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
   '=RM2D/0' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RM4P' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
   '=RM4R' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=RP70AB' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70AF' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70AS' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70AY' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70AZ' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70BP' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70DG' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70DT' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70G' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GA' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GB' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GI' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GK' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GP' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GR' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70GS' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70H' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70KB' => '267',
-  '=RP70KE' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70KG' => '267',
-  '=RP70KM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70KV' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70KW' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=RP70LF' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70LL' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70LM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70LS' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70MA' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70MC' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70MD' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70MP' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70MW' => '267',
-  '=RP70NK' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70NM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70OB' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70OF' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70OS' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70P' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70PK' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=RP70PM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70R' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70RS' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70SA' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70SD' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70SF' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70SL' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70SU' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70TG' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70TM' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70UF' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70UH' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70UK' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70V' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70WB' => '267',
-  '=RP70YF' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70ZF' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RP70ZO' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
   '=RQ4D/8' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=RT9K/6' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=RT9K/7' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=RT9T/3' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=RU0ZM/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=RU9MV/0' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=RU9ZA/7' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
   '=RV3DSA/0' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
   '=RW9WJ/4' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=RX6DL/8/P' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=RY1AAA/2' => '267',
+  '=SM6AAL/S' => '236,1106,1108,1110,1112,1114,1116,1118,1120',
   '=SV0LB' => '243',
   '=SV0XBN/9' => '243',
   '=SV0XCA/5' => '242',
-  '=SV0XCC/9' => '243',
   '=SV2ASP/A' => '241',
-  '=TA6CQ/1' => '1155',
-  '=TC100A' => '1155',
-  '=TC100GLB' => '1155',
-  '=TC100GP' => '1155',
-  '=TC100GS' => '1155',
-  '=TC100KT' => '1155',
-  '=TC100VKZL' => '1155',
+  '=SX90IARU' => '240,1140,1142,1144,1146,1148,1150,1152',
+  '=TA1BX/2' => '252,1154,1156,1158,1160,1162,1164,1166,1168,1170,1172',
+  '=TI90IARU' => '255,1174,1176,1178,1180,1182,1184,1186',
+  '=TO2A' => '141',
+  '=TO2EE' => '122',
+  '=TO4GU' => '125',
   '=TO5A' => '125',
   '=TO5T' => '125',
-  '=TO5Y' => '125',
-  '=TO90IARU' => '125',
+  '=TO6D' => '120',
+  '=TO8M' => '125',
+  '=TO90R' => '131',
+  '=TX3X' => '124',
   '=TX5P' => '128',
   '=TX5W' => '127',
-  '=UA0XAK/3' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=UA0ZED/6' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=TX8D' => '123,124',
+  '=TX90IARU' => '123,124',
+  '=UA0BDS/1' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=UA4NF' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
   '=UA4PN' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=UA4RF' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
   '=UA4RW' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=UA9B/1' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=UA9FIT/4' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
-  '=UA9MA/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=UA9UAX/9' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
-  '=UE2AT' => '267',
-  '=UE2BF' => '267',
-  '=UE2GC' => '267',
-  '=UE2IT' => '267',
-  '=UE2MW' => '267',
-  '=UE2SK' => '267',
-  '=UE95MS' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=UA9JPX/6' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=UA9UAX/3' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=UE56S' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=UE64RWA' => '268,1301,1303,1305,1307,1309,1311,1313,1315,1317,1319,1321,1323,1325,1327,1329,1331,1333,1335,1337,1339,1341,1343,1345,1347,1349,1351,1353,1355,1357,1359,1361,1363',
+  '=UE90FL' => '266,1189,1191,1193,1195,1197,1199,1201,1203,1205,1207,1209,1211,1213,1215,1217,1219,1221,1223,1225,1227,1229,1231,1233,1235,1237,1239,1241,1243,1245,1247,1249,1251,1253,1255,1257,1259,1261,1263,1265,1267,1269,1271,1273,1275,1277,1279,1281,1283,1285,1287,1289,1291,1293,1295,1297,1299',
+  '=UF1M/2' => '267',
   '=VA2PL' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
   '=VA2RC' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
+  '=VE1RM/4' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
   '=VE2CSI' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
   '=VE2EKA' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
   '=VE2EW' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
   '=VE2FK' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
-  '=VE2GSO' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
+  '=VE2IDX' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
   '=VE2IM' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
-  '=VER20150529' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
-  '=VERSION' => '260',
+  '=VE2TKH' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
+  '=VER20151225' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
+  '=VERSION' => '255,1174,1176,1178,1180,1182,1184,1186',
+  '=VI0ANZAC' => '1703,1705,1708,1710,1712,1714,1716,332,345',
+  '=VI90IARU' => '280,1519,1521,1523,1525,1527,1529,1531,1533',
   '=VK0IR' => '337',
+  '=VK2IAY/6' => '280,1519,1521,1523,1525,1527,1529,1531,1533',
+  '=VK2IAY/9' => '340',
+  '=VK6YB/2' => '280,1519,1521,1523,1525,1527,1529,1531,1533',
+  '=VK9AW' => '339',
   '=VP6DX' => '287',
   '=VP8ADE' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=VP8ADE/B' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=VP8DOU' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=VP8ROT' => '1703,1705,1708,1710,1712,1714,1716,332,345',
+  '=VP8SGI' => '344',
   '=VP8SGK' => '344',
-  '=VP8THU' => '347',
+  '=VP8STI' => '347',
+  '=VU3BPZ/P' => '1703,1705,1708,1710,1712,1714,1716,332,345',
   '=VY0PW' => '279,1487,1489,1491,1493,1495,1497,1499,1501,1503,1505,1507,1509,1511,1513,1515,1517',
   '=W0BR' => '181',
-  '=W0HI' => '181',
+  '=W0CN' => '181',
+  '=W0IMD' => '181',
   '=W0PAN' => '181',
   '=W0PV' => '181',
   '=W0QQG' => '181',
   '=W0UCE' => '181',
   '=W0YK' => '181',
-  '=W0YR' => '181',
   '=W1BO' => '181',
+  '=W1GKT' => '181',
   '=W1JCW' => '181',
   '=W1NN' => '181',
-  '=W1PJ' => '182',
   '=W1PR' => '181',
   '=W1RH' => '181',
+  '=W1RSC' => '194,884,886,888,890,892',
   '=W1SRD' => '181',
   '=W1WMU' => '181',
   '=W1ZD' => '181',
@@ -4287,9 +4259,10 @@
   '=W2OO' => '181',
   '=W2UP' => '181',
   '=W2VJN' => '181',
+  '=W3DQN' => '181',
+  '=W3FM' => '182',
   '=W3HDH' => '181',
   '=W3HKK' => '181',
-  '=W3STX' => '182',
   '=W4BCG' => '181',
   '=W4BK' => '181',
   '=W4CV' => '181',
@@ -4304,56 +4277,57 @@
   '=W4KW' => '181',
   '=W4LC' => '181',
   '=W4NI' => '181',
+  '=W4NJK' => '181',
   '=W4NZ' => '181',
+  '=W4PPA' => '189',
   '=W4RYW' => '181',
   '=W4TTM' => '181',
   '=W4UAL' => '181',
   '=W4UAT' => '181',
   '=W4UT' => '181',
   '=W4VAB' => '181',
-  '=W4YY' => '196',
   '=W5BEN' => '181',
-  '=W5JKT' => '194,884,886,888,890,892',
   '=W5JR' => '181',
-  '=W5MQS' => '194,884,886,888,890,892',
   '=W5MX' => '181',
   '=W5NZ' => '181',
-  '=W5THT' => '181',
   '=W5UE' => '181',
-  '=W5XB' => '181',
+  '=W6CAG' => '189',
   '=W6DVS' => '181',
   '=W6GMT' => '181',
   '=W6IHG' => '181',
   '=W6KGP' => '181',
+  '=W6KIT' => '189',
   '=W6LFB' => '181',
   '=W6NWS' => '181',
   '=W6RLL' => '181',
+  '=W6ROM' => '189',
   '=W6SAI' => '181',
+  '=W6SHH' => '189',
+  '=W6TFD' => '194,884,886,888,890,892',
   '=W6XR' => '181',
   '=W7DDG' => '194,884,886,888,890,892',
-  '=W7DJK' => '189',
   '=W7DO' => '181',
   '=W7HJ' => '181',
   '=W7KAM' => '181',
   '=W7KF' => '181',
-  '=W7NX' => '189',
-  '=W7RCR' => '189',
   '=W7SE' => '181',
+  '=W7UEA' => '189',
+  '=W7WEZ' => '194,884,886,888,890,892',
   '=W7WZ' => '181',
   '=W8AKS' => '181',
   '=W8FJ' => '181',
   '=W8FN' => '181',
   '=W8HAP' => '181',
   '=W8HGH' => '181',
-  '=W8JVF' => '189',
   '=W8KA' => '181',
+  '=W8LYJ' => '181',
   '=W8MHW' => '181',
   '=W8OHT' => '181',
-  '=W8TCX' => '194,884,886,888,890,892',
   '=W8TK' => '181',
   '=W8WEJ' => '181',
   '=W8ZA' => '181',
   '=W9CF' => '181',
+  '=W9DCA' => '181',
   '=W9DKB' => '181',
   '=W9FZ' => '181',
   '=W9GE' => '181',
@@ -4372,17 +4346,16 @@
   '=WA1FVJ' => '194,884,886,888,890,892',
   '=WA1UJU' => '181',
   '=WA2BIW' => '194,884,886,888,890,892',
-  '=WA2RVA' => '197',
   '=WA2VYA' => '181',
   '=WA3C' => '181',
   '=WA4HLB' => '196',
-  '=WA4ZOF' => '189',
+  '=WA4JA' => '181',
   '=WA5LOU' => '181',
   '=WA5POK' => '181',
   '=WA5VGI' => '181',
   '=WA6MM' => '181',
-  '=WA6UVF' => '189',
   '=WA7BME' => '181',
+  '=WA7ZK' => '189',
   '=WA8KAN' => '181',
   '=WA8OJR' => '181',
   '=WA8QYJ' => '181',
@@ -4390,21 +4363,21 @@
   '=WA9ETL' => '181',
   '=WB0POH' => '181',
   '=WB3JFS' => '181',
-  '=WB4CTX' => '181',
   '=WB4IT' => '181',
   '=WB4JTT' => '189',
   '=WB4YDL' => '181',
   '=WB4YDY' => '181',
   '=WB5EIN' => '181',
-  '=WB5YOF' => '197',
+  '=WB5ZDH' => '189',
+  '=WB6PJT' => '189',
   '=WB6SAA' => '189',
   '=WB7S' => '181',
   '=WB8CQV' => '181',
   '=WB8EKG' => '181',
-  '=WB8FVB' => '181',
   '=WB8IMY' => '181',
   '=WB8YQJ' => '181',
   '=WB8YYY' => '181',
+  '=WB9G' => '181',
   '=WB9KPT' => '181',
   '=WC1X' => '181',
   '=WC7S' => '181',
@@ -4415,12 +4388,11 @@
   '=WF4U' => '181',
   '=WF5K' => '181',
   '=WF7T' => '181',
-  '=WH0AC' => '184',
   '=WH6E' => '181',
   '=WH6LE' => '181',
-  '=WH6ZW' => '182',
   '=WH7R' => '181',
   '=WJ9B' => '181',
+  '=WK4AA' => '181',
   '=WL7OU' => '181',
   '=WL7YQ' => '181',
   '=WM5DX' => '181',
@@ -4428,8 +4400,8 @@
   '=WP3ME' => '181',
   '=WP3Y' => '181',
   '=WQ5L' => '181',
-  '=WQ5O' => '181',
   '=WQ9T' => '181',
+  '=WR1Z' => '189',
   '=WR3O' => '181',
   '=WR5G' => '181',
   '=WR5J' => '181',
@@ -4440,13 +4412,13 @@
   '=WT2P' => '181',
   '=WT3A' => '196',
   '=WT5L' => '181',
-  '=WT8V' => '181',
-  '=WU5E' => '181',
-  '=WW6O' => '181',
+  '=WV6K' => '189',
   '=WY7FD' => '181',
   '=WY7SS' => '181',
   '=WZ4F' => '181',
   '=WZ7I' => '181',
+  '=XR90IARU' => '78,466,468,470,472,474,476,478,480',
+  '=ZL90IARU' => '325,1629,1631,1633,1635',
   'A2' => '61',
   'A3' => '62',
   'A4' => '63',
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 4d759d4ecd21b937c73dbb210340cfb8e800a73b..4e55b9402c534a512a530362d26f380c9c2218b8 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1169,6 +1169,16 @@ sub handle_41
                return;
        }
 
+       if ($call eq $main::mycall && $call eq $main::myalias) {
+               dbg "DXPROT: PC41 trying to update $call from outside via $origin, ignored";
+               return;
+       }
+       my $chan = DXChannel::get($call);
+       if ($chan) {
+               dbg "DXPROT: PC41 trying to update online $call from outside via $origin, ignored";
+               return;
+       }
+
        # add this station to the user database, if required
        my $user = DXUser::get_current($call);
        $user = DXUser->new($call) unless $user;
@@ -1176,9 +1186,6 @@ sub handle_41
        if ($sort == 1) {
                if (($val =~ /spotter/i || $val =~ /self/i) && $user->name && $user->name ne $val) {
                        dbg("PCPROT: invalid name") if isdbg('chanerr');
-                       if ($main::mycall eq 'GB7DJK' || $main::mycall eq 'GB7BAA' || $main::mycall eq 'WR3D') {
-                               DXChannel::broadcast_nodes(pc41($pc->[1], 1, $user->name)); # send it to everyone including me
-                       }
                        return;
                }
                $user->name($val);
diff --git a/perl/Messages b/perl/Messages
index 78ad316444eda4cecafe9aed234f529d55fe5dec..ef4a7c9a15dcef2bcbd9a57d34a5562569f86448 100644 (file)
--- a/perl/Messages
+++ b/perl/Messages
@@ -83,7 +83,7 @@ package DXM;
                                e8 => 'Need a callsign and some text',
                                e9 => 'Need at least some text',
                                e10 => '$_[0] not connected locally',
-                               e11 => 'Can\'t use $main:mycall as target',
+                               e11 => 'Can\'t use $_[0] as target',
                                e12 => 'Need a node callsign',
                                e13 => '$_[0] is not a node',
                                e14 => 'First argument must be numeric and > 0',
diff --git a/perl/cluster.pl b/perl/cluster.pl
index e64f558691c76ad1b18d8ed62863dca478dfbdd2..fc530e21c1db11b12f554ab43514f33a8e1f01fa 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -502,8 +502,18 @@ sub setup_start
                die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
                my $ref = DXUser::get($mycall);
                die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+               my $oldsort = $ref->sort;
+               if ($oldsort ne 'S') {
+                       $ref->sort('S');
+                       dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+               }
                $ref = DXUser::get($myalias);
                die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+               $oldsort = $ref->sort;
+               if ($oldsort ne 'U') {
+                       $ref->sort('U');
+                       dbg "Resetting sysop user type from $oldsort -> User ('U')";
+               }
        }
 
        # start listening for incoming messages/connects
The DXSpider Git Repository