add CTY-2614

diff --git a/Changes b/Changes
index 8a1f42527b3903834645e55dfbe8440e5b50b62d..6b64cfc95dc9d882c40cb939ff145c98f42dd061 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+22Nov16=======================================================================
+1. Add CTY-2614 prefixes

 21Nov16=======================================================================
 1. Add CTY-2613 prefixes
 17Nov16=======================================================================
 21Nov16=======================================================================
 1. Add CTY-2613 prefixes
 17Nov16=======================================================================

diff --git a/data/cty.dat b/data/cty.dat
index 9259e21a09b3789800b6350aae08f795bcba0609..3aef3966b5ffce38f4d121bbef8f27cee1243dcc 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -31,7 +31,7 @@ Guinea:                   35:  46:  AF:   11.00:    10.68:     0.0:  3X:
 Bouvet:                   38:  67:  AF:  -54.42:    -3.38:    -1.0:  3Y/b:
     =3Y0E;
 Peter 1 Island:           12:  72:  SA:  -68.77:    90.58:     4.0:  3Y/p:
 Bouvet:                   38:  67:  AF:  -54.42:    -3.38:    -1.0:  3Y/b:
     =3Y0E;
 Peter 1 Island:           12:  72:  SA:  -68.77:    90.58:     4.0:  3Y/p:

-    =3Y0X,=VERSION;
+    =3Y0X;

 Azerbaijan:               21:  29:  AS:   40.45:   -47.37:    -4.0:  4J:
     4J,4K;
 Georgia:                  21:  29:  AS:   42.00:   -45.00:    -4.0:  4L:
 Azerbaijan:               21:  29:  AS:   40.45:   -47.37:    -4.0:  4J:
     4J,4K;
 Georgia:                  21:  29:  AS:   42.00:   -45.00:    -4.0:  4L:


@@ -357,7 +357,7 @@ Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
     AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=EA5EZ/8,=EA7JR/8;
 Ceuta & Melilla:          33:  37:  AF:   35.90:     5.27:    -1.0:  EA9:
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
     AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=EA5EZ/8,=EA7JR/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,=EC5ALJ/9;
+    AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9,=EC5ALJ/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:
 Ireland:                  14:  27:  EU:   53.13:     8.02:     0.0:  EI:
     EI,EJ;
 Armenia:                  21:  29:  AS:   40.40:   -44.90:    -4.0:  EK:


@@ -496,7 +496,7 @@ Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
     =IQ0AM,=IQ0AM/P,=IQ0EH,=IQ0HO,=IQ0ID,=IQ0NU,=IQ0NU/P,=IQ0NV,=IQ0NV/P,
     =IQ0OG,=IQ0QP,=IQ0SS,=IQ0UT,=IQ0XP,=IR0EO,=IY0GA;
 Sicily:                   15:  28:  EU:   37.50:   -14.00:    -1.0:  *IT9:
     =IQ0AM,=IQ0AM/P,=IQ0EH,=IQ0HO,=IQ0ID,=IQ0NU,=IQ0NU/P,=IQ0NV,=IQ0NV/P,
     =IQ0OG,=IQ0QP,=IQ0SS,=IQ0UT,=IQ0XP,=IR0EO,=IY0GA;
 Sicily:                   15:  28:  EU:   37.50:   -14.00:    -1.0:  *IT9:

-    IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9;
+    IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9,IY9;

 Djibouti:                 37:  48:  AF:   11.75:   -42.35:    -3.0:  J2:
     J2;
 Grenada:                  08:  11:  NA:   12.13:    61.68:     4.0:  J3:
 Djibouti:                 37:  48:  AF:   11.75:   -42.35:    -3.0:  J2:
     J2;
 Grenada:                  08:  11:  NA:   12.13:    61.68:     4.0:  J3:


@@ -562,46 +562,47 @@ United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
     =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],=KB8KMH(5)[8],
     =KB8V(5)[8],=KB9S(4)[7],=KC2LM(4)[7],=KC4HW(4)[8],=KC4SAW(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],=KB8KMH(5)[8],
     =KB8V(5)[8],=KB9S(4)[7],=KC2LM(4)[7],=KC4HW(4)[8],=KC4SAW(4)[8],

-    =KC4TEO(4)[8],=KC8R(4)[7],=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],=KE4YVD(4)[8],=KE5PRL(4)[8],=KE7X(4)[6],
-    =KF2T(3)[6],=KG0F(3)[6],=KG4CUY(4)[8],=KG6MC(5)[8],=KH2D(5)[8],
-    =KH6M(5)[8],=KH6VM(3)[6],=KI6DY(4)[7],=KI7MT(4)[6],=KJ4AOM(4)[8],
-    =KJ4IWZ(4)[8],=KJ4KKD(4)[8],=KJ4LTA(4)[8],=KK4JSJ(4)[8],=KK4TE(4)[8],
-    =KK5OQ(4)[8],=KK6L(5)[8],=KK6MC(4)[7],=KK7JS(4)[7],=KK9A(5)[8],
-    =KK9N(4)[7],=KL0MP(5)[8],=KL7IKV(3)[6],=KL7JIU(4)[7],=KL7QW(4)[7],
-    =KL8X(4)[8],=KM4DR(4)[7],=KM4FO(4)[8],=KM4FRM(4)[8],=KM4JA(4)[8],
-    =KM9R(3)[6],=KN8KAZ(4)[7],=KO0Z(4)[8],=KO4OL(4)[8],=KO6UW(4)[6],
-    =KO9V(5)[8],=KP2F(4)[8],=KP4KD(5)[8],=KR2E(3)[6],=KR4F(4)[8],=KS4L(4)[8],
-    =KS4X(4)[8],=KS7T(4)[6],=KT0R(4)[8],=KT3M(4)[7],=KT4RR(4)[8],=KU1CW(3)[6],
-    =KU4A(4)[8],=KU8E(5)[8],=KV1E(4)[7],=KV8S(4)[7],=KW4J(4)[8],=KW7D(4)[7],
-    =KW7Q(4)[7],=KX2P(4)[7],=KY4F(4)[8],=KY4XX(4)[8],=KY6AA(4)[8],=KZ1W(3)[6],
-    =KZ2V(3)[6],=N0EF(4)[6],=N0FCD(4)[8],=N0KQ(3)[6],=N0KVN(3)[6],=N0QQ(5)[8],
-    =N1CC(4)[7],=N1JM(3)[6],=N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],=N2UT(4)[7],
-    =N2WN(4)[8],=N3AIU(3)[6],=N3BB(4)[7],=N3BUO(4)[7],=N3KCJ(3)[6],
-    =N3RC(3)[6],=N3XRU(3)[6],=N3ZZ(3)[6],=N4AB(4)[8],=N4ARO(4)[8],=N4AU(4)[8],
-    =N4BCB(4)[8],=N4BCD(4)[8],=N4DW(4)[8],=N4HAI(4)[8],=N4HID(4)[8],
-    =N4IJ(4)[7],=N4JF(4)[8],=N4JRG(4)[8],=N4KG(4)[8],=N4KH(4)[8],=N4NA(4)[8],
-    =N4NM(4)[8],=N4NO(4)[8],=N4NR(4)[8],=N4OGW(4)[8],=N4QS(4)[8],=N4TZ(4)[8],
-    =N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],=N4VV(4)[8],=N4WE(4)[8],=N4XH(4)[8],
-    =N4ZI(4)[8],=N4ZZ(4)[8],=N5CR(3)[6],=N5CW(4)[8],=N5DX(5)[8],=N5PU(4)[8],
-    =N5RP(4)[8],=N5SMQ(5)[8],=N5TF(4)[8],=N5TOO(5)[8],=N5YT(4)[8],=N5ZO(3)[6],
-    =N6AR(5)[8],=N6FS(4)[8],=N7DF(4)[7],=N7DR(4)[7],=N7DXT(4)[6],=N7FLT(4)[6],
-    =N7FUL(4)[7],=N7GVV(4)[8],=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],=N8KSG(5)[8],=N8NA(5)[8],=N8OO(4)[7],=N8OQ(5)[8],=N8PR(5)[8],
-    =N8TUT(4)[7],=N8VCF(5)[8],=N8WXQ(5)[8],=N9CIQ(4)[7],=N9DFD(5)[8],
-    =N9JF(4)[7],=N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],=N9NM(4)[7],=N9RV(4)[6],
-    =N9SB(4)[7],=N9TX(4)[7],=N9UY(5)[8],=N9VPV(4)[7],=NA4C(4)[8],=NA4K(4)[8],
-    =NA5NN(4)[8],=NA9RB(4)[7],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],=ND4Y(4)[8],
-    =NH6Z(3)[6],=NJ8M(4)[7],=NK3L(3)[6],=NK4P(4)[8],=NK8Q(5)[8],=NL7CQ(4)[7],
-    =NL7QC(4)[7],=NL7XM(5)[8],=NN4MM(4)[8],=NN4SA(4)[8],=NN7A(4)[7],
-    =NO9E(5)[8],=NP2GG(5)[8],=NQ6N(4)[8],=NR7DX(4)[6],=NS4X(4)[8],=NU4N(4)[8],
-    =NU4X(4)[8],=NV4B(4)[8],=NW8U(5)[8],=NX1P(3)[6],=NY6DX(5)[8],=W0BR(5)[8],
-    =W0CN(5)[8],=W0JLC(5)[8],=W0JX(4)[8],=W0PAN(3)[6],=W0PV(5)[8],
-    =W0QQG(5)[8],=W0RIC(3)[6],=W0SK(4)[8],=W0YK(3)[6],=W1BO(4)[8],
-    =W1DGL(3)[6],=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],=W2UP(4)[7],
+    =KC4TEO(4)[8],=KC7QY(4)[7],=KC8R(4)[7],=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],=KE4YVD(4)[8],=KE5PRL(4)[8],
+    =KE7X(4)[6],=KF2T(3)[6],=KG0F(3)[6],=KG4CUY(4)[8],=KG6MC(5)[8],
+    =KH2D(5)[8],=KH6M(5)[8],=KH6VM(3)[6],=KI6DY(4)[7],=KI7MT(4)[6],
+    =KJ4AOM(4)[8],=KJ4IWZ(4)[8],=KJ4KKD(4)[8],=KJ4LTA(4)[8],=KK4JSJ(4)[8],
+    =KK4TE(4)[8],=KK5OQ(4)[8],=KK6L(5)[8],=KK6MC(4)[7],=KK7JS(4)[7],
+    =KK9A(5)[8],=KK9N(4)[7],=KL0MP(5)[8],=KL7IKV(3)[6],=KL7JIU(4)[7],
+    =KL7QW(4)[7],=KL8X(4)[8],=KM4DR(4)[7],=KM4FO(4)[8],=KM4FRM(4)[8],
+    =KM4JA(4)[8],=KM9R(3)[6],=KN8KAZ(4)[7],=KO0Z(4)[8],=KO4OL(4)[8],
+    =KO6UW(4)[6],=KO9V(5)[8],=KP2F(4)[8],=KP4KD(5)[8],=KR2E(3)[6],=KR4F(4)[8],
+    =KS4L(4)[8],=KS4X(4)[8],=KS7T(4)[6],=KT0R(4)[8],=KT3M(4)[7],=KT4RR(4)[8],
+    =KU1CW(3)[6],=KU4A(4)[8],=KU8E(5)[8],=KV1E(4)[7],=KV8S(4)[7],=KW4J(4)[8],
+    =KW7D(4)[7],=KW7Q(4)[7],=KX2P(4)[7],=KY4F(4)[8],=KY4XX(4)[8],=KY6AA(4)[8],
+    =KZ1W(3)[6],=KZ2V(3)[6],=N0EF(4)[6],=N0FCD(4)[8],=N0KQ(3)[6],=N0KVN(3)[6],
+    =N0QQ(5)[8],=N1CC(4)[7],=N1JM(3)[6],=N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],
+    =N2UT(4)[7],=N2WN(4)[8],=N3AIU(3)[6],=N3BB(4)[7],=N3BUO(4)[7],
+    =N3KCJ(3)[6],=N3RC(3)[6],=N3XRU(3)[6],=N3ZZ(3)[6],=N4AB(4)[8],
+    =N4ARO(4)[8],=N4AU(4)[8],=N4BCB(4)[8],=N4BCD(4)[8],=N4DW(4)[8],
+    =N4HAI(4)[8],=N4HID(4)[8],=N4IJ(4)[7],=N4JF(4)[8],=N4JRG(4)[8],
+    =N4KG(4)[8],=N4KH(4)[8],=N4NA(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4NR(4)[8],
+    =N4OGW(4)[8],=N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],
+    =N4VV(4)[8],=N4WE(4)[8],=N4XH(4)[8],=N4ZI(4)[8],=N4ZZ(4)[8],=N5CR(3)[6],
+    =N5CW(4)[8],=N5DX(5)[8],=N5PU(4)[8],=N5RP(4)[8],=N5SMQ(5)[8],=N5TF(4)[8],
+    =N5TOO(5)[8],=N5YT(4)[8],=N5ZO(3)[6],=N6AR(5)[8],=N6FS(4)[8],=N7DF(4)[7],
+    =N7DR(4)[7],=N7DXT(4)[6],=N7FLT(4)[6],=N7FUL(4)[7],=N7GVV(4)[8],
+    =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],=N8KSG(5)[8],=N8NA(5)[8],
+    =N8OO(4)[7],=N8OQ(5)[8],=N8PR(5)[8],=N8TUT(4)[7],=N8VCF(5)[8],
+    =N8WXQ(5)[8],=N9CIQ(4)[7],=N9DFD(5)[8],=N9JF(4)[7],=N9NA(3)[6],
+    =N9NB(5)[8],=N9NC(5)[8],=N9NM(4)[7],=N9RV(4)[6],=N9SB(4)[7],=N9TX(4)[7],
+    =N9UY(5)[8],=N9VPV(4)[7],=NA4C(4)[8],=NA4K(4)[8],=NA5NN(4)[8],
+    =NA9RB(4)[7],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],=ND4Y(4)[8],=NH6Z(3)[6],
+    =NJ8M(4)[7],=NK3L(3)[6],=NK4P(4)[8],=NK8Q(5)[8],=NL7CQ(4)[7],=NL7QC(4)[7],
+    =NL7XM(5)[8],=NN4MM(4)[8],=NN4SA(4)[8],=NN7A(4)[7],=NO9E(5)[8],
+    =NP2GG(5)[8],=NQ6N(4)[8],=NR7DX(4)[6],=NS4X(4)[8],=NU4N(4)[8],=NU4X(4)[8],
+    =NV4B(4)[8],=NW8U(5)[8],=NX1P(3)[6],=NY6DX(5)[8],=W0BR(5)[8],=W0CN(5)[8],
+    =W0JLC(5)[8],=W0JX(4)[8],=W0PAN(3)[6],=W0PV(5)[8],=W0QQG(5)[8],
+    =W0RIC(3)[6],=W0SK(4)[8],=W0YK(3)[6],=W1BO(4)[8],=W1DGL(3)[6],
+    =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],=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],=W4ER(4)[8],=W4GKM(4)[8],=W4GZX(4)[8],=W4HOD(4)[8],
     =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],=W4ER(4)[8],=W4GKM(4)[8],=W4GZX(4)[8],=W4HOD(4)[8],


@@ -650,8 +651,8 @@ Hawaii:                   31:  61:  OC:   21.12:   157.48:    10.0:  KH6:
     =K6ATF,=K6BEF,=K6CEE,=K7QAS,=K9FD,=KA7APU,=KA7RKW,=KB0DJR,=KB5OWT,=KB6EGA,
     =KB7UQH,=KC0WQU,=KC1DBY,=KC6SWR,=KC6YIO,=KC7I,=KC8EFI,=KD7HTG,=KE7JTX,
     =KE7KRQ,=KF4FQR,=KF5MXP,=KH0WJ,=KI6DVJ,=KI6EFY,=KI6FTE,=KI6JEC,=KI7EZG,
     =K6ATF,=K6BEF,=K6CEE,=K7QAS,=K9FD,=KA7APU,=KA7RKW,=KB0DJR,=KB5OWT,=KB6EGA,
     =KB7UQH,=KC0WQU,=KC1DBY,=KC6SWR,=KC6YIO,=KC7I,=KC8EFI,=KD7HTG,=KE7JTX,
     =KE7KRQ,=KF4FQR,=KF5MXP,=KH0WJ,=KI6DVJ,=KI6EFY,=KI6FTE,=KI6JEC,=KI7EZG,

-    =KJ4WOI,=KJ6TJZ,=KK6BRW,=KM6BOQ,=KM6EPQ,=N0RMC,=N6KB,=N6NCT,=NH2CC,=NH2II,
-    =NH2YL,=NT4AA,=W6KIT,=W6NBK,=W7NX,=WA6QDQ;
+    =KJ4WOI,=KJ6TJZ,=KK6BRW,=KM6BOQ,=KM6EPQ,=N0RMC,=N6KB,=N6NCT,=NH2YL,=NT4AA,
+    =W6KIT,=W6NBK,=W7NX,=WA6QDQ;

 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:
 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:


@@ -663,10 +664,10 @@ Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
 Alaska:                   01:  01:  NA:   61.40:   148.87:     8.0:  KL:
     AL,KL,NL,WL,=AB5JB,=AC0CW,=AE7SB,=AH0AH,=K0DJM,=K7EJM,=KB9MWG,=KC0EF,
     =KC0UYK,=KC0WSG,=KC2OJP,=KC2PCV,=KC7NFH,=KC7OQZ,=KC7PLJ,=KC7PLQ,=KC7RCP,
 Alaska:                   01:  01:  NA:   61.40:   148.87:     8.0:  KL:
     AL,KL,NL,WL,=AB5JB,=AC0CW,=AE7SB,=AH0AH,=K0DJM,=K7EJM,=KB9MWG,=KC0EF,
     =KC0UYK,=KC0WSG,=KC2OJP,=KC2PCV,=KC7NFH,=KC7OQZ,=KC7PLJ,=KC7PLQ,=KC7RCP,

-    =KC7WHY,=KD0VAK,=KD8DDY,=KE0DYM,=KE0KKI,=KE5JHS,=KE6VUB,=KE7FNC,=KE7HMJ,
-    =KF6AXS,=KF7VBO,=KG7EBD,=KG7SEQ,=KG7SVM,=KG7SVN,=KI4NGY,=KI4SET,=KI6DES,
-    =N0SN,=N1NJS,=N4CM,=N6JM,=N7ZYS,=N9AIG,=NE7EK,=NW7F,=W0FJN,=W4RSB,=W7JMR,
-    =W7WEZ,=WA7B;
+    =KC7WHY,=KD0VAK,=KD8DDY,=KE0DYM,=KE0KKI,=KE6VUB,=KE7FNC,=KE7HMJ,=KF6AXS,
+    =KF7VBO,=KG7EBD,=KG7SEQ,=KG7SVM,=KG7SVN,=KI4NGY,=KI4SET,=KI6DES,=N0SN,
+    =N1NJS,=N4CM,=N6JM,=N7ZYS,=N9AIG,=NE7EK,=NW7F,=W0FJN,=W4RSB,=W7JMR,=W7WEZ,
+    =WA7B;

 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:
 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:


@@ -674,7 +675,7 @@ US Virgin Islands:        08:  11:  NA:   17.73:    64.80:     4.0:  KP2:
     =KV4CQ/P,=KV4FZ,=KV4KW,=N1VKI;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
     KP3,KP4,NP3,NP4,WP3,WP4,=KB1RUQ,=KC2TE,=KD5DVV,=KE0GFK,=KE5LNG,=KH2RU,
     =KV4CQ/P,=KV4FZ,=KV4KW,=N1VKI;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
     KP3,KP4,NP3,NP4,WP3,WP4,=KB1RUQ,=KC2TE,=KD5DVV,=KE0GFK,=KE5LNG,=KH2RU,

-    =KJ4LOZ,=KM4YBN,=KP2Z,=N1YAY,=N4ERC,=N6RHF,=W4D;
+    =KJ4LOZ,=KM4YBN,=KP2Z,=N1YAY,=N4ERC,=N6RHF;

 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:
 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:


@@ -813,7 +814,7 @@ Denmark:                  14:  18:  EU:   56.00:   -10.00:    -1.0:  OZ:
 Papua New Guinea:         28:  51:  OC:   -9.50:  -147.12:   -10.0:  P2:
     P2;
 Aruba:                    09:  11:  SA:   12.53:    69.98:     4.0:  P4:
 Papua New Guinea:         28:  51:  OC:   -9.50:  -147.12:   -10.0:  P2:
     P2;
 Aruba:                    09:  11:  SA:   12.53:    69.98:     4.0:  P4:

-    P4;
+    P4,=VERSION;

 DPR of Korea:             25:  44:  AS:   39.78:  -126.30:    -9.0:  P5:
     P5,P6,P7,P8,P9;
 Netherlands:              14:  27:  EU:   52.28:    -5.47:    -1.0:  PA:
 DPR of Korea:             25:  44:  AS:   39.78:  -126.30:    -9.0:  P5:
     P5,P6,P7,P8,P9;
 Netherlands:              14:  27:  EU:   52.28:    -5.47:    -1.0:  PA:


@@ -986,7 +987,7 @@ European Russia:          16:  29:  EU:   53.65:   -41.37:    -4.0:  UA:
     UI9X(17)[20],=RZ9SZ/3,=R5QQ/1(17)[20],=R8CZ/4(17)[30],=R8FF/3,=RA0APW/6,
     =RJ4P[30],=RL97WS,=RM4R[30],=RT9K/4[30],=RT9K/6,=RT9K/7,=RT9T/3,
     =RW9WJ/4[30],=RX3XX/N,=UA0BDS/1,=UA0QQO/3,=UA2FT/6,=UA4NF[30],=UA4PN[30],
     UI9X(17)[20],=RZ9SZ/3,=R5QQ/1(17)[20],=R8CZ/4(17)[30],=R8FF/3,=RA0APW/6,
     =RJ4P[30],=RL97WS,=RM4R[30],=RT9K/4[30],=RT9K/6,=RT9K/7,=RT9T/3,
     =RW9WJ/4[30],=RX3XX/N,=UA0BDS/1,=UA0QQO/3,=UA2FT/6,=UA4NF[30],=UA4PN[30],

-    =UA4RF[30],=UA9SY/4[30],=UE25R;
+    =UA4RF[30],=UE25R;

 Kaliningrad:              15:  29:  EU:   54.72:   -20.52:    -3.0:  UA2:
     R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RE2F,RE2K,RF2F,RF2K,RG2F,RG2K,RI2F,RI2K,
     RJ2F,RJ2K,RK2F,RK2K,RL2F,RL2K,RM2F,RM2K,RN2F,RN2K,RO2F,RO2K,RQ2F,RQ2K,
 Kaliningrad:              15:  29:  EU:   54.72:   -20.52:    -3.0:  UA2:
     R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RE2F,RE2K,RF2F,RF2K,RG2F,RG2K,RI2F,RI2K,
     RJ2F,RJ2K,RK2F,RK2K,RL2F,RL2K,RM2F,RM2K,RN2F,RN2K,RO2F,RO2K,RQ2F,RQ2K,


@@ -1161,17 +1162,17 @@ 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],
     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,=VER20161121,=VA2PL(2)[4],
-    =VA2RC(2)[4],=VB2W(2)[4],=VE2CSI(2)[4],=VE2DXY(2)[4],=VE2EKA(2)[4],
-    =VE2EW(2)[4],=VE2FK[9],=VE2IDX(2)[4],=VE2IM(2)[4],=VE2SSS(2)[4],
-    =VE3ZF/2(2)[4],=VY0PW(4)[3];
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20161124,=VA2AGI(2)[4],
+    =VA2PL(2)[4],=VA2RC(2)[4],=VB2W(2)[4],=VC3W/2(2)[4],=VE2CSI(2)[4],
+    =VE2DXY(2)[4],=VE2EKA(2)[4],=VE2EW(2)[4],=VE2FK[9],=VE2IDX(2)[4],
+    =VE2IM(2)[4],=VE2SSS(2)[4],=VE3ZF/2(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],=VK5PAS/6(29)[58],=VK6SX/3;
 Heard Island:             39:  68:  AF:  -53.08:   -73.50:    -5.0:  VK0H:
     =VK0EK;
 Macquarie Island:         30:  60:  OC:  -54.60:  -158.88:   -10.0:  VK0M:
 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],=VK5PAS/6(29)[58],=VK6SX/3;
 Heard Island:             39:  68:  AF:  -53.08:   -73.50:    -5.0:  VK0H:
     =VK0EK;
 Macquarie Island:         30:  60:  OC:  -54.60:  -158.88:   -10.0:  VK0M:

-    =AX/VK0TH;
+    =ZL4DB/P/VK0M;

 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,=VK9AW;
 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,=VK9AW;


@@ -1197,7 +1198,7 @@ Turks & Caicos Islands:   08:  11:  NA:   21.77:    71.75:     5.0:  VP5:
 Pitcairn Island:          32:  63:  OC:  -25.07:   130.10:     8.0:  VP6:
     VP6;
 Ducie Island:             32:  63:  OC:  -24.70:   124.80:     8.0:  VP6/d:
 Pitcairn Island:          32:  63:  OC:  -25.07:   130.10:     8.0:  VP6:
     VP6;
 Ducie Island:             32:  63:  OC:  -24.70:   124.80:     8.0:  VP6/d:

-    =VP6DX;
+    =VP6UU/VP6D;

 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:
 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:

diff --git a/data/wpxloc.raw b/data/wpxloc.raw
index eecc53c787ee7f27f758ee7eb429644e1557542f..6f01fcc7437ca2b0c779727668a4830fa44b158d 100644 (file)
--- a/data/wpxloc.raw
+++ b/data/wpxloc.raw
@@ -1,6 +1,6 @@
 ! $Id$
 !
 ! $Id$
 !

-! This file was created by Jim Reisert AD1C on 21 Nov 2016
+! This file was created by Jim Reisert AD1C on 24 Nov 2016

 ! See: http://www.country-files.com/dx-cluster/wpxloc/
 !
 ! Highest DXCC number is 357 ("VERSION" entity)
 ! See: http://www.country-files.com/dx-cluster/wpxloc/
 !
 ! Highest DXCC number is 357 ("VERSION" entity)


@@ -1688,7 +1688,7 @@ IN3 Trentino-Alto-Adige-I                              85 28 15  -1.00 46 30  0
 I Trentino-Alto-Adige-IN3                              85 28 15  -1.00 46 30  0 N  11 22  0 E
 IT9 Sicily-I                                           85 28 15  -1.00 37 30  0 N  14  0  0 E
 I Sicily-IT9                                           85 28 15  -1.00 37 30  0 N  14  0  0 E
 I Trentino-Alto-Adige-IN3                              85 28 15  -1.00 46 30  0 N  11 22  0 E
 IT9 Sicily-I                                           85 28 15  -1.00 37 30  0 N  14  0  0 E
 I Sicily-IT9                                           85 28 15  -1.00 37 30  0 N  14  0  0 E

-IB9,II9,IJ9,IO9,IQ9,IR9,IU9,IW9 Sicily-I               85 28 15  -1.00 37 30  0 N  14  0  0 E
+IB9,II9,IJ9,IO9,IQ9,IR9,IU9,IW9,IY9 Sicily-I           85 28 15  -1.00 37 30  0 N  14  0  0 E

 IV3 Friuli-Venezia-Giulia-I                            85 28 15  -1.00 46  4  0 N  13 14  0 E
 I Friuli-Venezia-Giulia-IV3                            85 28 15  -1.00 46  4  0 N  13 14  0 E
 IX1 Valle-D'Aosta-I                                    85 28 15  -1.00 45 44  0 N   7 20  0 E
 IV3 Friuli-Venezia-Giulia-I                            85 28 15  -1.00 46  4  0 N  13 14  0 E
 I Friuli-Venezia-Giulia-IV3                            85 28 15  -1.00 46  4  0 N  13 14  0 E
 IX1 Valle-D'Aosta-I                                    85 28 15  -1.00 45 44  0 N   7 20  0 E