diff --git a/dxcc.json b/dxcc.json index e3d024a..b3a4fa5 100644 --- a/dxcc.json +++ b/dxcc.json @@ -25,8 +25,8 @@ "name": "Canada", "notes": "", "outgoingQslService": true, - "prefix": "VA,VB,VC,VD,VE,VF,VG,VO,VY", - "prefixRegex": "^V[A-GOY][A-Z0-9/]*$", + "prefix": "CF,CG,CH,CI,CJ,CK,VA,VB,VC,VD,VE,VF,VG,VO,VY,XJ,XK,XL,XM,XN,XO", + "prefixRegex": "^(V[A-GOY]|X[J-KL-O]|C[F-K])[A-Z0-9/]*$", "thirdPartyTraffic": true, "validEnd": "", "validStart": "" @@ -285,7 +285,7 @@ "validEnd": "", "validStart": "" }, - { + { "continent": [ "AN" ], @@ -314,8 +314,8 @@ "name": "Antarctica", "notes": "QSL via country under whose auspices the particular station is operating. The availability of a third-party traffic agreement and a QSL Bureau applies to the country under whose auspices the particular station is operating.", "outgoingQslService": true, - "prefix": "CE9,KC4", - "prefixRegex": "^(CE9|KC4)[A-Z0-9/]*$", + "prefix": "CE9,KC4,RI1", + "prefixRegex": "^(CE9|KC4|RI1)[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -378,7 +378,7 @@ "notes": "", "outgoingQslService": true, "prefix": "UA0,UA8,UA9,UB0,UB8,UB9,UC0,UC8,UC9,UD0,UD8,UD9,UE0,UE8,UE9,UF0,UF8,UF9,UG0,UG8,UG9,UH0,UH8,UH9,UI0,UI8,UI9,RA,RB,RC,RD,RE,RF,RG,RH,RI,RJ,RK,RL,RM,RN,RO,RP,RQ,RR,RS,RT,RU,RV,RW,RX,RY,RZ", - "prefixRegex": "^(U[A-I][089]|R[A-Z089])[A-Z089/]*$", + "prefixRegex": "^(U[A-Z][089].*|R([A-Z089][A-Z0-9]).*)$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -1090,8 +1090,8 @@ "name": "East Malaysia", "notes": "", "outgoingQslService": true, - "prefix": "9M6,9M8", - "prefixRegex": "^9M[68][A-Z0-9/]*$", + "prefix": "9M6,9M8,9W6,9W8", + "prefixRegex": "^9M|9W[68][A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "1963-09-16" @@ -1279,7 +1279,7 @@ "notes": "", "outgoingQslService": true, "prefix": "UA1,UA2,UA3,UA4,UA5,UA6,UA7,UB1,UB2,UB3,UB4,UB5,UB6,UB7,UC1,UC2,UC3,UC4,UC5,UC6,UC7,UD1,UD2,UD3,UD4,UD5,UD6,UD7,UE1,UE2,UE3,UE4,UE5,UE6,UE7,UF1,UF2,UF3,UF4,UF5,UF6,UF7,UG1,UG2,UG3,UG4,UG5,UG6,UG7,UH1,UH2,UH3,UH4,UH5,UH6,UH7,UI1,UI2,UI3,UI4,UI5,UI6,UI7,RA,RB,RC,RD,RE,RF,RG,RH,RI,RJ,RK,RL,RM,RN,RO,RP,RQ,RR,RS,RT,RU,RV,RW,RX,RY,RZ", - "prefixRegex": "^(U[A-I][1-7]|R[A-Z0-7])[A-Z0-7/]*$", + "prefixRegex": "^(R[1-7][A-Z0-9]).*|(R[A-Z][1-7]).*|(U[A-I1-7][A-Z1-7].*)$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -1647,8 +1647,8 @@ "name": "Cuba", "notes": "", "outgoingQslService": true, - "prefix": "CM,CO", - "prefixRegex": "^C[MO][A-Z0-9/]*$", + "prefix": "CL,CM,CO,T4", + "prefixRegex": "^C[LMO]|T4[A-Z0-9/]*$", "thirdPartyTraffic": true, "validEnd": "", "validStart": "" @@ -1809,7 +1809,7 @@ "notes": "", "outgoingQslService": false, "prefix": "HH", - "prefixRegex": "^HH[A-Z0-9/]*$", + "prefixRegex": "^HH|4V[A-Z0-9/]*$", "thirdPartyTraffic": true, "validEnd": "", "validStart": "" @@ -2246,8 +2246,8 @@ "name": "Argentina", "notes": "", "outgoingQslService": true, - "prefix": "LO,LP,LQ,LR,LS,LT,LU,LV,LW", - "prefixRegex": "^L[O-W][A-Z0-9/]*$", + "prefix": "AY,AZ,LO,LP,LQ,LR,LS,LT,LU,LV,LW", + "prefixRegex": "^L[O-W]|AY|AZ|L[1-9][A-Z0-9/]*$", "thirdPartyTraffic": true, "validEnd": "", "validStart": "" @@ -2526,8 +2526,8 @@ "name": "Chile", "notes": "", "outgoingQslService": true, - "prefix": "CA,CB,CC,CD,CE", - "prefixRegex": "^C[A-E][A-Z0-9/]*$", + "prefix": "CA,CB,CC,CD,CE,3G,XR", + "prefixRegex": "^(?:C[A-D][A-Z0-9/]*|CE[1-8][A-Z0-9/]*|3G[A-Z0-9/]*|X[QR][A-Z1-9/]*)$", "thirdPartyTraffic": true, "validEnd": "", "validStart": "" @@ -2638,11 +2638,11 @@ "itu": [ 28 ], - "name": "International Telecommunication Union Headquarters", + "name": "ITU Geneva", "notes": "", "outgoingQslService": true, - "prefix": "4U", - "prefixRegex": "^4U[A-Z0-9/]*$", + "prefix": "4U1ITU", + "prefixRegex": "^4U1ITU.*$", "thirdPartyTraffic": true, "validEnd": "", "validStart": "" @@ -2854,29 +2854,6 @@ "validEnd": "1982-03-10", "validStart": "" }, - { - "continent": [ - "EU" - ], - "countryCode": "ZZ", - "cq": [ - 16 - ], - "deleted": true, - "entityCode": 128, - "flag": "", - "itu": [ - 19 - ], - "name": "Karelo-Finnish Soviet Socialist Republic", - "notes": "Contacts made July 1, 1960, and after, count as European Russia (UA-UI1-7,RA-RZ).", - "outgoingQslService": false, - "prefix": "UN1", - "prefixRegex": "^UN1[A-Z0-9/]*$", - "thirdPartyTraffic": false, - "validEnd": "1960-06-30", - "validStart": "" - }, { "continent": [ "SA" @@ -3081,8 +3058,8 @@ "name": "South Korea", "notes": "", "outgoingQslService": true, - "prefix": "HL,6K,6L,6M,6N", - "prefixRegex": "^(HL|6[K-N])[A-Z0-9/]*$", + "prefix": "DS,DT,HL,6K,6L,6M,6N,D7,D8", + "prefixRegex": "^(DT|DS|HL|6[K-N]|D[78])[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -3383,8 +3360,8 @@ "name": "Australia", "notes": "", "outgoingQslService": true, - "prefix": "VK,AX", - "prefixRegex": "^(VK|AX)[A-Z0-9/]*$", + "prefix": "VH,VI,VJ,VK,AX", + "prefixRegex": "^(V[H-K]|AX)[A-Z0-9/]*$", "thirdPartyTraffic": true, "validEnd": "", "validStart": "" @@ -3495,11 +3472,11 @@ "itu": [ 54 ], - "name": "Malaya", + "name": "West Malaysia", "notes": "Contacts made September 16, 1963, and after, count as West Malaysia (9M2,4) or East Malaysia (9M6,8).", "outgoingQslService": false, - "prefix": "VS2,9M2", - "prefixRegex": "^(VS|9M)2[A-Z0-9/]*$", + "prefix": "9M2,9M4,9M5,9W2,9W4,9W5", + "prefixRegex": "^9M|9W[245][A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "1963-09-15", "validStart": "" @@ -4420,8 +4397,8 @@ "name": "Palestine", "notes": "Contacts made July 1, 1968, and after, count as Israel (4X,4Z).", "outgoingQslService": false, - "prefix": "ZC6,4X1", - "prefixRegex": "^(ZC6|4X1)[A-Z0-9/]*$", + "prefix": "ZC6", + "prefixRegex": "^ZC6[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "1968-06-30", "validStart": "" @@ -4996,8 +4973,8 @@ "name": "Denmark", "notes": "", "outgoingQslService": true, - "prefix": "OU,OV,OW,OZ", - "prefixRegex": "^O[U-WZ][A-Z0-9/]*$", + "prefix": "OU,OV,OW,OZ,5P,5Q,XP", + "prefixRegex": "^(O[U-WZ]|5[P-Q])|XP[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -5042,8 +5019,8 @@ "name": "England", "notes": "", "outgoingQslService": true, - "prefix": "G,GX,M", - "prefixRegex": "^(G|GX|M)[A-Z0-9/]*$", + "prefix": "G,GX,M,2E", + "prefixRegex": "^(G|GX|M|2E)[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -5134,8 +5111,8 @@ "name": "France", "notes": "", "outgoingQslService": true, - "prefix": "F", - "prefixRegex": "^F[A-Z0-9/]*$", + "prefix": "F,HW,HX,HY,TH,TM,TP,TQ,TV,TW,TX", + "prefixRegex": "^(F|HW|HX|HY|TH|TM|TP|TQ|TV|TW|TX)[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -5272,8 +5249,8 @@ "name": "Gibraltar", "notes": "", "outgoingQslService": true, - "prefix": "ZB2", - "prefixRegex": "^ZB2[A-Z0-9/]*$", + "prefix": "ZB", + "prefixRegex": "^ZB[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -5732,7 +5709,7 @@ "itu": [ 13 ], - "name": "Saint Peter and Saint Paul Archipelago", + "name": "St. Peter & St. Paul Rocks", "notes": "", "outgoingQslService": true, "prefix": "PP0S,PQ0S,PR0S,PS0S,PT0S,PU0S,PV0S,PW0S,PX0S,PY0S", @@ -6011,8 +5988,8 @@ "name": "Northern Ireland", "notes": "", "outgoingQslService": true, - "prefix": "GI,GN", - "prefixRegex": "^G[IN][A-Z0-9/]*$", + "prefix": "GI,GN,2I", + "prefixRegex": "^(G[IN][A-Z0-9/]*|2I[A-Z0-9/]*)", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -6103,8 +6080,8 @@ "name": "Poland", "notes": "", "outgoingQslService": true, - "prefix": "SN,SO,SP,SQ,SR", - "prefixRegex": "^S[N-R][A-Z0-9/]*$", + "prefix": "HF,SN,SO,SP,SQ,SR,3Z", + "prefixRegex": "^(HF|S[N-R]|3Z)[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -6172,8 +6149,8 @@ "name": "Portugal", "notes": "", "outgoingQslService": true, - "prefix": "CT", - "prefixRegex": "^CT[A-Z0-9/]*$", + "prefix": "CQ,CR,CS,CT", + "prefixRegex": "^(CQ|CR|CS|CT)[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -6333,8 +6310,8 @@ "name": "Scotland", "notes": "", "outgoingQslService": true, - "prefix": "GM,GS", - "prefixRegex": "^G[MS][A-Z0-9/]*$", + "prefix": "GM,GS,MM,MS,2M", + "prefixRegex": "^G[MS]|M[MS]|2M[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -6379,8 +6356,8 @@ "name": "Spain", "notes": "", "outgoingQslService": true, - "prefix": "EA,EB,EC,ED,EE,EF,EG,EH", - "prefixRegex": "^E[A-H][A-Z0-9/]*$", + "prefix": "EA,EB,EC,ED,EE,EF,EG,EH,AM,AN,AO", + "prefixRegex": "^(E[A-H]|AM|AN|AO)[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -6422,7 +6399,7 @@ "itu": [ 39 ], - "name": "Sovereign Base Areas of Akrotiri and Dhekelia", + "name": "UK Bases on Cyprus", "notes": "", "outgoingQslService": true, "prefix": "ZC4", @@ -6563,8 +6540,8 @@ "name": "United Nations Headquarters", "notes": "", "outgoingQslService": true, - "prefix": "4U", - "prefixRegex": "^4U[A-Z0-9/]*$", + "prefix": "4U1UN", + "prefixRegex": "^4U1UN.*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -6659,8 +6636,8 @@ "name": "Wales", "notes": "", "outgoingQslService": true, - "prefix": "GW,GC", - "prefixRegex": "^G[WC][A-Z0-9/]*$", + "prefix": "GW,GC,2W", + "prefixRegex": "^2W|G[WC][A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -6705,8 +6682,8 @@ "name": "Serbia", "notes": "", "outgoingQslService": true, - "prefix": "YT,YU", - "prefixRegex": "^Y[TU][A-Z0-9/]*$", + "prefix": "YT,YZ,YU,4N", + "prefixRegex": "^(Y[TUZ][A-Z0-9/]*|4N[A-Z0-9/]*)", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -7100,8 +7077,8 @@ "name": "India", "notes": "", "outgoingQslService": true, - "prefix": "VU", - "prefixRegex": "^VU[A-Z0-9/]*$", + "prefix": "AT,AU,VU", + "prefixRegex": "^AT|AU|VU[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -7124,8 +7101,8 @@ "name": "Indonesia", "notes": "", "outgoingQslService": true, - "prefix": "YB,YC,YD,YE,YF,YG,YH", - "prefixRegex": "^Y[B-H][A-Z0-9/]*$", + "prefix": "YB,YC,YD,YE,YF,YG,YH,8A,8B,8C,8D,8E,8F,8G,8H,8I", + "prefixRegex": "^(Y[B-H]|8[A-I])[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "1963-05-01" @@ -7216,8 +7193,8 @@ "name": "Japan", "notes": "", "outgoingQslService": true, - "prefix": "JA,JB,JC,JD,JE,JF,JG,JH,JI,JJ,JK,JL,JM,JN,JO,JP,JQ,JR,JS,7J,7K,7L,7M,7N", - "prefixRegex": "^(J[A-S]|7[J-N])[A-Z0-9/]*$", + "prefix": "JA,JB,JC,JD,JE,JF,JG,JH,JI,JJ,JK,JL,JM,JN,JO,JP,JQ,JR,JS,7J,7K,7L,7M,7N,8N,8J", + "prefixRegex": "^(J[A-S]|7[J-N]|8N|8J)[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -7259,7 +7236,7 @@ "itu": [ 44 ], - "name": "Democratic People's Republic of Korea", + "name": "DPR of Korea", "notes": "", "outgoingQslService": false, "prefix": "P5", @@ -7493,8 +7470,8 @@ "name": "Saudi Arabia", "notes": "", "outgoingQslService": true, - "prefix": "HZ", - "prefixRegex": "^HZ[A-Z0-9/]*$", + "prefix": "HZ,7Z,8Z", + "prefixRegex": "^HZ|7Z|8Z[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -7655,8 +7632,8 @@ "name": "Turkey", "notes": "", "outgoingQslService": true, - "prefix": "TA,TB,TC", - "prefixRegex": "^T[A-C][A-Z0-9/]*$", + "prefix": "TA,TB,TC,YM", + "prefixRegex": "^T[A-C]|YM[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -8253,8 +8230,8 @@ "name": "Morocco", "notes": "", "outgoingQslService": false, - "prefix": "CN", - "prefixRegex": "^CN[A-Z0-9/]*$", + "prefix": "CN,5C,5D,5E", + "prefixRegex": "^(CN|5[C-E])[A-Z0-9/]*$", "thirdPartyTraffic": false, "validEnd": "", "validStart": "" @@ -8830,7 +8807,7 @@ "notes": "New prefix for Bosnia-Herzegovina effective November 17, 2007. Contacts are valid for this entity effective October 15, 1991.", "outgoingQslService": true, "prefix": "E7", - "prefixRegex": "^E7[A-Z0-9/]*$", + "prefixRegex": "^(E7[A-Z0-9/]*|T9[A-Z0-9/]*)", "thirdPartyTraffic": true, "validEnd": "", "validStart": "1991-10-15"