From 6b481e92be5a8e7954b70aa74233795c5ad1dbc6 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Thu, 12 Nov 2020 13:13:06 -0800 Subject: [PATCH 1/4] Fix three anames for nations --- package.nw/data/mh-root-prefixed.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.nw/data/mh-root-prefixed.json b/package.nw/data/mh-root-prefixed.json index bbc815a..d44145a 100644 --- a/package.nw/data/mh-root-prefixed.json +++ b/package.nw/data/mh-root-prefixed.json @@ -24204,7 +24204,7 @@ "cqzone": ["14"], "timezone": "1", "ccode": "276", - "aname": "Germany", + "aname": "Federal Republic of Germany", "mh": [ "JN37", "JN38", @@ -43146,13 +43146,13 @@ "dxcc": "501", "cc": "BA", "ccc": "BIH", - "name": "Bosnia & Herzegovina", + "name": "Bosnia-Herzegovina", "continent": "EU", "ituzone": ["28"], "cqzone": ["15"], "timezone": "1", "ccode": "70", - "aname": "Bosnia & Herzegovina", + "aname": "Bosnia-Herzegovina", "mh": [ "JN74", "JN75", @@ -43253,13 +43253,13 @@ "dxcc": "504", "cc": "SK", "ccc": "SVK", - "name": "Slovakia", + "name": "Slovak Republic", "continent": "EU", "ituzone": ["28"], "cqzone": ["15"], "timezone": "1", "ccode": "703", - "aname": "Slovakia", + "aname": "Slovak Republic", "mh": [ "JN87", "JN88", From 2600370edef873ee31807082cca89d5acf34b6ba Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Thu, 12 Nov 2020 13:39:56 -0800 Subject: [PATCH 2/4] Update all the aname's correctly to match ADIF 3.1.1 --- package.nw/data/mh-root-prefixed.json | 426 +++++++++++++------------- 1 file changed, 213 insertions(+), 213 deletions(-) diff --git a/package.nw/data/mh-root-prefixed.json b/package.nw/data/mh-root-prefixed.json index d44145a..5ec8e84 100644 --- a/package.nw/data/mh-root-prefixed.json +++ b/package.nw/data/mh-root-prefixed.json @@ -1513,13 +1513,13 @@ "dxcc": "2", "cc": "SA", "ccc": "SAU", - "name": "Abu Ali I", + "name": "Abu Ali Is.", "continent": "AS", "ituzone": ["39"], "cqzone": ["21"], "timezone": "0", "ccode": "682", - "aname": "Abu Ali I", + "aname": "Abu Ali Is.", "mh": ["LL47"], "prefix": [], "worked": false, @@ -1614,13 +1614,13 @@ "dxcc": "4", "cc": "MP", "ccc": "MNP", - "name": "Agalega & St Brandon", + "name": "Agalega & St. Brandon", "continent": "AF", "ituzone": ["53"], "cqzone": ["39"], "timezone": "4", "ccode": "580", - "aname": "Northern Mariana Is", + "aname": "Agalega & St. Brandon Is.", "mh": ["LH89"], "prefix": ["3B6", "3B7"], "worked": false, @@ -1639,13 +1639,13 @@ "dxcc": "5", "cc": "AX", "ccc": "ALA", - "name": "Aland Is", + "name": "Aland Is.", "continent": "EU", "ituzone": ["18"], "cqzone": ["15"], "timezone": "2", "ccode": "248", - "aname": "Aland", + "aname": "Aland Is.", "mh": ["JP90", "KO09", "KP00"], "prefix": [ "OF0", @@ -2575,13 +2575,13 @@ "dxcc": "10", "cc": "FR", "ccc": "FRA", - "name": "Amsterdam & St Paul Is", + "name": "Amsterdam & St. Paul Is.", "continent": "AF", "ituzone": ["68"], "cqzone": ["39"], "timezone": "5", "ccode": "250", - "aname": "Amsterdam & St Paul Is", + "aname": "Amsterdam & St. Paul Is.", "mh": ["MF81", "MF82"], "prefix": [ "FT0Z", @@ -2610,13 +2610,13 @@ "dxcc": "11", "cc": "IN", "ccc": "IND", - "name": "Andaman & Nicobar Is", + "name": "Andaman & Nicobar Is.", "continent": "AS", "ituzone": ["49"], "cqzone": ["26"], "timezone": "6", "ccode": "356", - "aname": "Andaman & Nicobar Is", + "aname": "Andaman & Nicobar Is.", "mh": [ "NJ66", "NJ67", @@ -6262,7 +6262,7 @@ "cqzone": ["16", "17", "18", "19", "23"], "timezone": "7", "ccode": "643", - "aname": "Russian Federation", + "aname": "Asiatic Russia", "mh": [ "AP05", "AP06", @@ -10615,13 +10615,13 @@ "dxcc": "16", "cc": "NZ", "ccc": "NZL", - "name": "Campbell Is", + "name": "Campbell Is.", "continent": "OC", "ituzone": ["60"], "cqzone": ["32"], "timezone": "12", "ccode": "554", - "aname": "Campbell Is", + "aname": "New Zeland Subantartic Islands", "mh": ["RD47"], "prefix": ["ZL9"], "worked": false, @@ -10640,13 +10640,13 @@ "dxcc": "17", "cc": "VE", "ccc": "VEN", - "name": "Aves I", + "name": "Aves I.", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "862", - "aname": "Aves I", + "aname": "Aves I.", "mh": ["FK85"], "prefix": ["4M0", "YV0", "YW0", "YX0", "YY0"], "worked": false, @@ -10704,13 +10704,13 @@ "dxcc": "19", "cc": "CO", "ccc": "COL", - "name": "Bajo Neuvo Bank", + "name": "Bajo Neuvo", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "0", "ccode": "170", - "aname": "Bajo Neuvo Bank", + "aname": "Bajo Neuvo", "mh": ["FK05"], "prefix": [], "worked": false, @@ -10729,13 +10729,13 @@ "dxcc": "20", "cc": "US", "ccc": "USA", - "name": "Baker & Howland Is", + "name": "Baker & Howland Is.", "continent": "OC", "ituzone": ["61"], "cqzone": ["31"], "timezone": "-12", "ccode": "840", - "aname": "Baker & Howland Is", + "aname": "Baker & Howland Is.", "mh": ["AJ10"], "prefix": ["AH1", "KH1", "NH1", "WH1"], "worked": false, @@ -10754,13 +10754,13 @@ "dxcc": "21", "cc": "ES", "ccc": "ESP", - "name": "Balearic Is", + "name": "Balearic Is.", "continent": "EU", "ituzone": ["37"], "cqzone": ["14"], "timezone": "1", "ccode": "724", - "aname": "Balearic Is", + "aname": "Balearic Is.", "mh": ["JM08", "JM09", "JM19", "JM29", "JN10", "JN20"], "prefix": [ "AM6", @@ -10867,13 +10867,13 @@ "dxcc": "24", "cc": "BV", "ccc": "BVT", - "name": "Bouvet I", + "name": "Bouvet", "continent": "AF", "ituzone": ["67"], "cqzone": ["38"], "timezone": "0", "ccode": "74", - "aname": "Bouvet I", + "aname": "Bouvet", "mh": ["JD15"], "prefix": ["=3Y/ZS6GCM", "=3Y0C", "=3Y0E"], "worked": false, @@ -10943,13 +10943,13 @@ "dxcc": "29", "cc": "ES", "ccc": "ESP", - "name": "Canary Is", + "name": "Canary Is.", "continent": "AF", "ituzone": ["36"], "cqzone": ["33"], "timezone": "0", "ccode": "724", - "aname": "Canary Is", + "aname": "Canary Is.", "mh": ["IL07", "IL08", "IL17", "IL18", "IL27", "IL28", "IL38", "IL39"], "prefix": [ "=AM70URE/8", @@ -11073,7 +11073,7 @@ "cqzone": ["31"], "timezone": "12", "ccode": "296", - "aname": "Central Kiribati", + "aname": "C. Kiribati (British Phoenix Is.)", "mh": ["AI35", "AI45", "AI46", "AI47"], "prefix": ["T31"], "worked": false, @@ -11157,13 +11157,13 @@ "dxcc": "33", "cc": "GB", "ccc": "GBR", - "name": "Chagos Is", + "name": "Chagos Is.", "continent": "AF", "ituzone": ["41"], "cqzone": ["39"], "timezone": "5", "ccode": "826", - "aname": "United Kingdom", + "aname": "Chagos Is.", "mh": ["MI53", "MI62"], "prefix": ["VQ9"], "worked": false, @@ -11182,13 +11182,13 @@ "dxcc": "34", "cc": "NZ", "ccc": "NZL", - "name": "Chatham Is", + "name": "Chatham Is.", "continent": "OC", "ituzone": ["60"], "cqzone": ["32"], "timezone": "13", "ccode": "554", - "aname": "Chatham Is", + "aname": "Chatham Is.", "mh": ["AE15", "AE16"], "prefix": ["ZL7", "ZM7"], "worked": false, @@ -11207,13 +11207,13 @@ "dxcc": "35", "cc": "CX", "ccc": "CXR", - "name": "Christmas I", + "name": "Christmas I.", "continent": "OC", "ituzone": ["54"], "cqzone": ["29"], "timezone": "7", "ccode": "162", - "aname": "Christmas I", + "aname": "Christmas I.", "mh": ["OH29"], "prefix": [ "AX9X", @@ -11254,13 +11254,13 @@ "dxcc": "36", "cc": "FR", "ccc": "FRA", - "name": "Clipperton I", + "name": "Clipperton I.", "continent": "NA", "ituzone": ["10"], "cqzone": ["7"], "timezone": "-7", "ccode": "250", - "aname": "Clipperton I", + "aname": "Clipperton I.", "mh": ["DK50"], "prefix": ["=FO0/F8UFT", "=FO0AAA", "=TX5C", "=TX5K", "=TX5P"], "worked": false, @@ -11279,13 +11279,13 @@ "dxcc": "37", "cc": "CR", "ccc": "CRI", - "name": "Cocos I", + "name": "Cocos I.", "continent": "NA", "ituzone": ["11"], "cqzone": ["7"], "timezone": "-6", "ccode": "188", - "aname": "Cocos I", + "aname": "Cocos I.", "mh": ["EJ65"], "prefix": ["TE9", "TI9"], "worked": false, @@ -11304,13 +11304,13 @@ "dxcc": "38", "cc": "CC", "ccc": "CCK", - "name": "Cocos-Keeling Is", + "name": "Cocos (Keeling) Is.", "continent": "OC", "ituzone": ["54"], "cqzone": ["29"], "timezone": "7", "ccode": "166", - "aname": "Cocos(Keeling) Is", + "aname": "Cocos (Keeling) Is.", "mh": ["NH87", "NH88"], "prefix": [ "AX9C", @@ -11418,13 +11418,13 @@ "dxcc": "41", "cc": "FR", "ccc": "FRA", - "name": "Crozet I", + "name": "Crozet I.", "continent": "AF", "ituzone": ["68"], "cqzone": ["39"], "timezone": "3", "ccode": "250", - "aname": "Crozet I", + "aname": "Crozet I.", "mh": ["LE53", "LE54"], "prefix": ["FT0W", "FT4W", "FT5W", "FT8W"], "worked": false, @@ -11443,13 +11443,13 @@ "dxcc": "43", "cc": "PR", "ccc": "PRI", - "name": "Desecheo I", + "name": "Desecheo I.", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "630", - "aname": "Desecheo I", + "aname": "Desecheo I.", "mh": ["FK68"], "prefix": ["KP5", "NP5", "WP5"], "worked": false, @@ -11521,13 +11521,13 @@ "dxcc": "46", "cc": "MY", "ccc": "MYS", - "name": "Malaysia", + "name": "East Malaysia", "continent": "OC", "ituzone": ["54"], "cqzone": ["28"], "timezone": "8", "ccode": "458", - "aname": "Malaysia", + "aname": "East Malaysia", "mh": [ "NJ96", "OJ02", @@ -11652,13 +11652,13 @@ "dxcc": "47", "cc": "CL", "ccc": "CHL", - "name": "Easter I", + "name": "Easter I.", "continent": "SA", "ituzone": ["63"], "cqzone": ["12"], "timezone": "-7", "ccode": "152", - "aname": "Easter I", + "aname": "Easter I.", "mh": ["DG52"], "prefix": ["3G0", "CA0", "CB0", "CC0", "CD0", "CE0", "XQ0", "XR0"], "worked": false, @@ -11683,7 +11683,7 @@ "cqzone": ["31"], "timezone": "12", "ccode": "296", - "aname": "East Kiribati", + "aname": "E. Kiribati (Line Is.)", "mh": [ "RI77", "RI78", @@ -12108,7 +12108,7 @@ "cqzone": ["16"], "timezone": "3", "ccode": "643", - "aname": "Russia Federation", + "aname": "European Russia", "mh": [ "KN64", "KN65", @@ -14100,7 +14100,7 @@ "cqzone": ["40"], "timezone": "3", "ccode": "643", - "aname": "Russian Federation", + "aname": "Franz Josef Land", "mh": [ "LQ49", "LQ59", @@ -14238,13 +14238,13 @@ "dxcc": "65", "cc": "VG", "ccc": "VGB", - "name": "British Virgin Is", + "name": "British Virgin Is.", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "92", - "aname": "British Virgin Is", + "aname": "British Virgin Is.", "mh": ["FK78"], "prefix": ["VP2V"], "worked": false, @@ -14288,13 +14288,13 @@ "dxcc": "69", "cc": "KY", "ccc": "CYM", - "name": "Cayman Is", + "name": "Cayman Is.", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-5", "ccode": "136", - "aname": "Cayman Is", + "aname": "Cayman Is.", "mh": ["EK99", "FK09"], "prefix": ["ZF"], "worked": false, @@ -14357,13 +14357,13 @@ "dxcc": "71", "cc": "EC", "ccc": "ECU", - "name": "Galapagos Is", + "name": "Galapagos Is.", "continent": "SA", "ituzone": ["12"], "cqzone": ["10"], "timezone": "-6", "ccode": "218", - "aname": "Galapagos Is", + "aname": "Galapagos Is.", "mh": ["EI48", "EI49", "EI58", "EI59", "EJ40", "EJ50"], "prefix": [ "=HC1HC/8", @@ -14885,13 +14885,13 @@ "dxcc": "89", "cc": "TC", "ccc": "TCA", - "name": "Turks & Caicos Is", + "name": "Turks & Caicos Is.", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-5", "ccode": "796", - "aname": "Turks & Caicos Is", + "aname": "Turks & Caicos Is.", "mh": ["FL31", "FL41"], "prefix": ["VP5", "VQ5"], "worked": false, @@ -15035,13 +15035,13 @@ "dxcc": "97", "cc": "LC", "ccc": "LCA", - "name": "St Lucia", + "name": "St. Lucia", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "662", - "aname": "St Lucia", + "aname": "St. Lucia", "mh": ["FK93", "FK94"], "prefix": ["J6", "=J69DS/LH"], "worked": false, @@ -15060,13 +15060,13 @@ "dxcc": "98", "cc": "VC", "ccc": "VCT", - "name": "St Vincent & Grenadines", + "name": "St. Vincent", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "670", - "aname": "St Vincent & Grenadines", + "aname": "St. Vincent", "mh": ["FK92", "FK93"], "prefix": ["J8"], "worked": false, @@ -15085,13 +15085,13 @@ "dxcc": "99", "cc": "FR", "ccc": "FRA", - "name": "Glorioso Is", + "name": "Glorioso Is.", "continent": "AF", "ituzone": ["53"], "cqzone": ["39"], "timezone": "3", "ccode": "250", - "aname": "Glorioso Is", + "aname": "Glorioso Is.", "mh": ["LH38"], "prefix": [ "=FR5ZQ/G", @@ -18288,13 +18288,13 @@ "dxcc": "111", "cc": "HM", "ccc": "HMD", - "name": "Heard Is", + "name": "Heard I.", "continent": "AF", "ituzone": ["68"], "cqzone": ["39"], "timezone": "5", "ccode": "334", - "aname": "Heard I & McDonald Is", + "aname": "Heard I.", "mh": ["MD66", "MD67"], "prefix": ["=VK0/K2ARB", "=VK0EK", "=VK0LD"], "worked": false, @@ -18658,13 +18658,13 @@ "dxcc": "117", "cc": "IG", "ccc": "CHE", - "name": "ITU Geneva", + "name": "ITU HQ Geneva", "continent": "EU", "ituzone": ["28"], "cqzone": ["14"], "timezone": "1", "ccode": "756", - "aname": "ITU Geneva", + "aname": "ITU HQ", "mh": ["JN36"], "prefix": ["=4U0ITU", "=4U150ITU", "=4U1ITU", "=4U1WRC"], "worked": false, @@ -18683,13 +18683,13 @@ "dxcc": "118", "cc": "SJ", "ccc": "SJM", - "name": "Jan Mayen I", + "name": "Jan Mayen", "continent": "EU", "ituzone": ["18"], "cqzone": ["40"], "timezone": "-1", "ccode": "744", - "aname": "Svalbard & Jan Mayen", + "aname": "Jan Mayen", "mh": ["IQ50", "IQ51", "IQ61"], "prefix": ["JX"], "worked": false, @@ -18807,13 +18807,13 @@ "dxcc": "123", "cc": "US", "ccc": "USA", - "name": "Johnston I", + "name": "Johnston I.", "continent": "OC", "ituzone": ["61"], "cqzone": ["31"], "timezone": "-11", "ccode": "840", - "aname": "Johnston I", + "aname": "Johnston I.", "mh": ["AK56"], "prefix": ["AH3", "KH3", "=KJ6BZ", "NH3", "WH3"], "worked": false, @@ -18832,13 +18832,13 @@ "dxcc": "124", "cc": "FR", "ccc": "FRA", - "name": "Juan de Nova I", + "name": "Juan de Nova I.", "continent": "AF", "ituzone": ["53"], "cqzone": ["39"], "timezone": "3", "ccode": "250", - "aname": "Juan de Nova I", + "aname": "Juan de Nova, Europa", "mh": ["LH12"], "prefix": [ "=FR/F5NHJ/E", @@ -18880,13 +18880,13 @@ "dxcc": "125", "cc": "CL", "ccc": "CHL", - "name": "Juan Fernandez Is", + "name": "Juan Fernandez Is.", "continent": "SA", "ituzone": ["14"], "cqzone": ["12"], "timezone": "-4", "ccode": "152", - "aname": "Juan Fernandez Is", + "aname": "Juan Fernandez Is.", "mh": ["EF96", "FF06"], "prefix": [ "3G0Z", @@ -18921,7 +18921,7 @@ "cqzone": ["15"], "timezone": "2", "ccode": "643", - "aname": "Russian Federation", + "aname": "Kalingrad", "mh": ["JO94", "KO04", "KO05", "KO14", "KO15"], "prefix": [ "=R01DTV/2", @@ -19535,13 +19535,13 @@ "dxcc": "131", "cc": "FR", "ccc": "FRA", - "name": "Kerguelen Is", + "name": "Kerguelen Is.", "continent": "AF", "ituzone": ["68"], "cqzone": ["39"], "timezone": "5", "ccode": "250", - "aname": "Kerguelen Is", + "aname": "Kerguelen Is.", "mh": ["ME40", "ME41", "ME50"], "prefix": ["FT0X", "FT2X", "FT4X", "FT5X", "FT8X"], "worked": false, @@ -19618,13 +19618,13 @@ "dxcc": "133", "cc": "NZ", "ccc": "NZL", - "name": "Kermadec Is", + "name": "Kermadec Is.", "continent": "OC", "ituzone": ["60"], "cqzone": ["32"], "timezone": "12", "ccode": "554", - "aname": "Kermadec Is", + "aname": "Kermadec Is.", "mh": ["AF09", "AF19", "AG00", "AG10"], "prefix": ["=ZL1GO/8", "ZL8", "ZM8"], "worked": false, @@ -19903,7 +19903,7 @@ "cqzone": ["31"], "timezone": "-11", "ccode": "840", - "aname": "Kure Atoll", + "aname": "Kure I.", "mh": ["AL08"], "prefix": ["AH7K", "KH7K", "NH7K", "WH7K"], "worked": false, @@ -19961,13 +19961,13 @@ "dxcc": "141", "cc": "FK", "ccc": "FLK", - "name": "Falkland Is/Malvinas", + "name": "Falkland Is. (Malvinas)", "continent": "SA", "ituzone": ["16"], "cqzone": ["13"], "timezone": "-4", "ccode": "238", - "aname": "Falkland Is(Malvinas)", + "aname": "Falkland Is.", "mh": ["FD97", "FD98", "GD07", "GD08", "GD18"], "prefix": ["VP8"], "worked": false, @@ -19986,13 +19986,13 @@ "dxcc": "142", "cc": "IN", "ccc": "IND", - "name": "Lakshadweep Is", + "name": "Lakshadweep Is.", "continent": "AS", "ituzone": ["41"], "cqzone": ["22"], "timezone": "6", "ccode": "356", - "aname": "Lakshadweep Is", + "aname": "Lakshadweep Is.", "mh": ["MJ68", "MK60", "MK61"], "prefix": ["=VU3EBX", "VU7", "=VU7MY/JOS", "=VU7MY/RBI"], "worked": false, @@ -20017,7 +20017,7 @@ "cqzone": ["26"], "timezone": "7", "ccode": "418", - "aname": "Lao People's Democratic Republic", + "aname": "Laos", "mh": [ "OK07", "OK08", @@ -20237,13 +20237,13 @@ "dxcc": "147", "cc": "AU", "ccc": "AUS", - "name": "Lord Howe I", + "name": "Lord Howe I.", "continent": "OC", "ituzone": ["60"], "cqzone": ["30"], "timezone": "10", "ccode": "36", - "aname": "Lord Howe I", + "aname": "Lord Howe I.", "mh": ["QF98"], "prefix": [ "AX9L", @@ -21040,13 +21040,13 @@ "dxcc": "151", "cc": "RU", "ccc": "RUS", - "name": "Maly Vysotsky I", + "name": "Malyj Vysotskij I.", "continent": "EU", "ituzone": ["29"], "cqzone": ["16"], "timezone": "3", "ccode": "643", - "aname": "Russian Federation", + "aname": "Malyj Vysotskij I.", "mh": ["KP40"], "prefix": [], "worked": false, @@ -21090,13 +21090,13 @@ "dxcc": "153", "cc": "AU", "ccc": "AUS", - "name": "Macquarie I", + "name": "Macquarie I.", "continent": "OC", "ituzone": ["60"], "cqzone": ["30"], "timezone": "11", "ccode": "36", - "aname": "Macquarie I", + "aname": "Macquarie I.", "mh": ["QD95"], "prefix": [ "=AX/VK0TH", @@ -21253,13 +21253,13 @@ "dxcc": "161", "cc": "CO", "ccc": "COL", - "name": "Malpelo I", + "name": "Malpelo I.", "continent": "SA", "ituzone": ["12"], "cqzone": ["9"], "timezone": "-5", "ccode": "170", - "aname": "Malpelo I", + "aname": "Malpelo I.", "mh": ["EJ93"], "prefix": [ "HJ0M", @@ -21466,13 +21466,13 @@ "dxcc": "166", "cc": "US", "ccc": "USA", - "name": "Mariana Is", + "name": "Mariana Is.", "continent": "OC", "ituzone": ["64"], "cqzone": ["27"], "timezone": "10", "ccode": "840", - "aname": "Mariana Is", + "aname": "Mariana Is.", "mh": ["QK24", "QK25", "QK26", "QK27", "QK28", "QK29", "QL20"], "prefix": [ "=AB2HV", @@ -21575,13 +21575,13 @@ "dxcc": "168", "cc": "MH", "ccc": "MHL", - "name": "Marshall Is", + "name": "Marshall Is.", "continent": "OC", "ituzone": ["65"], "cqzone": ["31"], "timezone": "12", "ccode": "584", - "aname": "Marshall Is", + "aname": "Marshall Is.", "mh": [ "RJ29", "RJ38", @@ -21788,13 +21788,13 @@ "dxcc": "172", "cc": "PN", "ccc": "PCN", - "name": "Pitcairn Is", + "name": "Pitcairn I.", "continent": "OC", "ituzone": ["63"], "cqzone": ["32"], "timezone": "-9", "ccode": "612", - "aname": "Pitcairn", + "aname": "Pitcairn I.", "mh": ["CG44", "CG55", "CG75"], "prefix": ["VP6"], "worked": false, @@ -21864,13 +21864,13 @@ "dxcc": "174", "cc": "US", "ccc": "USA", - "name": "Midway Is", + "name": "Midway I.", "continent": "OC", "ituzone": ["61"], "cqzone": ["31"], "timezone": "-11", "ccode": "840", - "aname": "Midway Is", + "aname": "Midway I.", "mh": ["AL08", "AL18"], "prefix": ["AH4", "KH4", "NH4", "WH4"], "worked": false, @@ -22087,13 +22087,13 @@ "dxcc": "180", "cc": "GR", "ccc": "GRC", - "name": "Mt Athos", + "name": "Mount Athos", "continent": "EU", "ituzone": ["28"], "cqzone": ["20"], "timezone": "2", "ccode": "300", - "aname": "Mt Athos", + "aname": "Mount Athos", "mh": ["KN10"], "prefix": [ "=SV2/SV1RP/T", @@ -22207,13 +22207,13 @@ "dxcc": "182", "cc": "US", "ccc": "USA", - "name": "Navassa I", + "name": "Navassa I.", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-5", "ccode": "840", - "aname": "Navassa I", + "aname": "Navassa I.", "mh": ["FK28"], "prefix": ["KP1", "NP1", "WP1"], "worked": false, @@ -22232,13 +22232,13 @@ "dxcc": "185", "cc": "SB", "ccc": "SLB", - "name": "Solomon Is", + "name": "Solomon Is.", "continent": "OC", "ituzone": ["51"], "cqzone": ["28"], "timezone": "11", "ccode": "90", - "aname": "Solomon Is", + "aname": "Solomon Is.", "mh": [ "QH98", "QI72", @@ -22400,13 +22400,13 @@ "dxcc": "189", "cc": "NF", "ccc": "NFK", - "name": "Norfolk I", + "name": "Norfolk I.", "continent": "OC", "ituzone": ["60"], "cqzone": ["32"], "timezone": "12", "ccode": "574", - "aname": "Norfolk I", + "aname": "Norfolk I.", "mh": ["RG30", "RG31"], "prefix": [ "AX9", @@ -22480,13 +22480,13 @@ "dxcc": "191", "cc": "NZ", "ccc": "NZL", - "name": "Cook Is", + "name": "North Cook Is.", "continent": "OC", "ituzone": ["62"], "cqzone": ["32"], "timezone": "-11", "ccode": "554", - "aname": "North Cook Is", + "aname": "North Cook Is.", "mh": ["BI00", "BI01", "BI10", "BI11"], "prefix": [ "=E50W", @@ -22561,13 +22561,13 @@ "dxcc": "193", "cc": "JP", "ccc": "JPN", - "name": "Ryukyu Is", + "name": "Okinawa (Ryukyu Is.)", "continent": "AS", "ituzone": ["45"], "cqzone": ["25"], "timezone": "0", "ccode": "392", - "aname": "Ryukyu Is", + "aname": "Okinawa (Ryukyu Is.)", "mh": ["PL36", "PL37", "PL46", "PL47"], "prefix": [], "worked": false, @@ -22586,13 +22586,13 @@ "dxcc": "195", "cc": "GQ", "ccc": "GNQ", - "name": "Annobon I", + "name": "Annobon I.", "continent": "AF", "ituzone": ["52"], "cqzone": ["36"], "timezone": "-1", "ccode": "226", - "aname": "Annobon I", + "aname": "Annobon I.", "mh": ["JI28"], "prefix": ["3C0"], "worked": false, @@ -22611,13 +22611,13 @@ "dxcc": "197", "cc": "US", "ccc": "USA", - "name": "Palmyra Atoll", + "name": "Palmyra & Jarvis Is.", "continent": "OC", "ituzone": ["61", "62"], "cqzone": ["31"], "timezone": "-11", "ccode": "840", - "aname": "Palmyra Atoll", + "aname": "Palmyra & Jarvis Is.", "mh": ["AJ85"], "prefix": ["AH5", "KH5", "NH5", "WH5"], "worked": false, @@ -22636,13 +22636,13 @@ "dxcc": "199", "cc": "NO", "ccc": "NOR", - "name": "Peter I I", + "name": "Peter I I.", "continent": "AN", "ituzone": ["72"], "cqzone": ["12"], "timezone": "-6", "ccode": "578", - "aname": "Peter I I", + "aname": "Peter I I.", "mh": ["EC41"], "prefix": ["=3Y0X"], "worked": false, @@ -22661,13 +22661,13 @@ "dxcc": "201", "cc": "ZA", "ccc": "ZAF", - "name": "Prince Edward & Marion I", + "name": "Prince Edward & Marion I.", "continent": "AF", "ituzone": ["57"], "cqzone": ["38"], "timezone": "3", "ccode": "710", - "aname": "Prince Edward & Marion I", + "aname": "Prince Edward & Marion Is.", "mh": ["KE83"], "prefix": ["ZR8", "ZS8", "ZT8", "ZU8"], "worked": false, @@ -22939,13 +22939,13 @@ "dxcc": "204", "cc": "MX", "ccc": "MEX", - "name": "Revillagigedo Is", + "name": "Revillagigedo", "continent": "NA", "ituzone": ["10"], "cqzone": ["6"], "timezone": "-7", "ccode": "484", - "aname": "Revillagigedo Is", + "aname": "Revillagigedo", "mh": ["DK28"], "prefix": [ "4A4", @@ -22984,13 +22984,13 @@ "dxcc": "205", "cc": "AC", "ccc": "ASC", - "name": "Ascension I", + "name": "Ascension I.", "continent": "AF", "ituzone": ["66"], "cqzone": ["36"], "timezone": "0", "ccode": "826", - "aname": "Ascension I", + "aname": "Ascension I.", "mh": ["II22"], "prefix": ["ZD8"], "worked": false, @@ -23090,13 +23090,13 @@ "dxcc": "207", "cc": "MU", "ccc": "MUS", - "name": "Rodriguez I", + "name": "Rodriguez I.", "continent": "AF", "ituzone": ["53"], "cqzone": ["39"], "timezone": "4", "ccode": "480", - "aname": "Rodriguez I", + "aname": "Rodriguez I.", "mh": ["MH10"], "prefix": ["3B9"], "worked": false, @@ -23186,13 +23186,13 @@ "dxcc": "211", "cc": "CA", "ccc": "CAN", - "name": "Sable I", + "name": "Sable I.", "continent": "NA", "ituzone": ["9"], "cqzone": ["5"], "timezone": "-5", "ccode": "124", - "aname": "Sable I", + "aname": "Sable I.", "mh": ["FN93", "GN03"], "prefix": ["CY0"], "worked": false, @@ -23251,13 +23251,13 @@ "dxcc": "213", "cc": "FR", "ccc": "FRA", - "name": "St Martin", + "name": "Saint Martin", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "250", - "aname": "St Martin", + "aname": "Saint Martin", "mh": ["FK88"], "prefix": [ "FS", @@ -23388,7 +23388,7 @@ "cqzone": ["12"], "timezone": "-5", "ccode": "152", - "aname": "San Felix", + "aname": "San Felix & San Ambrosio", "mh": ["EG93", "FG03"], "prefix": [ "3G0X", @@ -23547,13 +23547,13 @@ "dxcc": "222", "cc": "FO", "ccc": "FRO", - "name": "Faroe Is", + "name": "Faroe Is.", "continent": "EU", "ituzone": ["18"], "cqzone": ["14"], "timezone": "0", "ccode": "234", - "aname": "Faroe Is", + "aname": "Faroe Is.", "mh": ["IP61", "IP62"], "prefix": ["OW", "OY", "=OY1CT/HQ"], "worked": false, @@ -24578,13 +24578,13 @@ "dxcc": "234", "cc": "GS", "ccc": "SGS", - "name": "South Cook Is", + "name": "South Cook Is.", "continent": "OC", "ituzone": ["63"], "cqzone": ["32"], "timezone": "-11", "ccode": "239", - "aname": "South Georgia & the South Sandwich Is", + "aname": "South Cook Is.", "mh": ["BG08", "BG09", "BG18", "BG19", "BH00", "BH01", "BH10"], "prefix": [ "E5", @@ -24624,13 +24624,13 @@ "dxcc": "235", "cc": "GS", "ccc": "SGS", - "name": "South Georgia Is", + "name": "South Georgia I.", "continent": "SA", "ituzone": ["73"], "cqzone": ["13"], "timezone": "-2", "ccode": "239", - "aname": "South Georgia Is", + "aname": "South Georgia I.", "mh": [ "HD05", "HD06", @@ -25216,13 +25216,13 @@ "dxcc": "238", "cc": "GB", "ccc": "GBR", - "name": "South Orkney Is", + "name": "South Orkney Is.", "continent": "SA", "ituzone": ["73"], "cqzone": ["13"], "timezone": "-3", "ccode": "826", - "aname": "South Orkney Is", + "aname": "South Orkney Is.", "mh": ["GC69", "GC79"], "prefix": [ "=AY1ZA", @@ -25301,13 +25301,13 @@ "dxcc": "240", "cc": "GS", "ccc": "SGS", - "name": "South Sandwich Is", + "name": "South Sandwich Is.", "continent": "SA", "ituzone": ["73"], "cqzone": ["13"], "timezone": "-3", "ccode": "239", - "aname": "South Sandwich Is", + "aname": "South Sandwich Is.", "mh": ["HD60", "HD61", "HD62", "HD63"], "prefix": ["=VP8STI", "=VP8THU"], "worked": false, @@ -25326,13 +25326,13 @@ "dxcc": "241", "cc": "GB", "ccc": "GBR", - "name": "South Shetland Is", + "name": "South Shetland Is.", "continent": "SA", "ituzone": ["73"], "cqzone": ["13"], "timezone": "-4", "ccode": "826", - "aname": "South Shetland Is", + "aname": "South Shetland Is.", "mh": ["FC86", "FC87", "FC96", "FC97", "GC07", "GC08", "GC17", "GC18"], "prefix": [ "=BY/R1ANF", @@ -25534,7 +25534,7 @@ "cqzone": ["15"], "timezone": "1", "ccode": "470", - "aname": "SMO Malta", + "aname": "Sovereign Military Order of Malta", "mh": ["JN61"], "prefix": ["1A"], "worked": false, @@ -25553,13 +25553,13 @@ "dxcc": "247", "cc": "PH", "ccc": "PHL", - "name": "Spratly Is", + "name": "Spratly Is.", "continent": "AS", "ituzone": ["50"], "cqzone": ["26"], "timezone": "7", "ccode": "608", - "aname": "Spratly Is", + "aname": "Spratly Is.", "mh": ["OJ79", "OJ89", "OK70", "OK71", "OK80", "OK81"], "prefix": [ "9M0", @@ -25879,13 +25879,13 @@ "dxcc": "249", "cc": "KN", "ccc": "KNA", - "name": "St Kitts & Nevis", + "name": "St. Kitts & Nevis", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "659", - "aname": "St Kitts & Nevis", + "aname": "St. Kitts & Nevis", "mh": ["FK87"], "prefix": ["V4"], "worked": false, @@ -25904,13 +25904,13 @@ "dxcc": "250", "cc": "SH", "ccc": "SHN", - "name": "St Helena I", + "name": "St. Helena", "continent": "AF", "ituzone": ["66"], "cqzone": ["36"], "timezone": "0", "ccode": "654", - "aname": "St Helena", + "aname": "St. Helena", "mh": ["IH73", "IH74"], "prefix": ["ZD7"], "worked": false, @@ -25954,13 +25954,13 @@ "dxcc": "252", "cc": "CA", "ccc": "CAN", - "name": "St Paul I", + "name": "St Paul I.", "continent": "NA", "ituzone": ["9"], "cqzone": ["5"], "timezone": "-5", "ccode": "124", - "aname": "St Paul I", + "aname": "St Paul I.", "mh": ["AO47"], "prefix": ["CY9"], "worked": false, @@ -25985,7 +25985,7 @@ "cqzone": ["11"], "timezone": "-2", "ccode": "76", - "aname": "St Peter & St Paul Rocks", + "aname": "St. Peter & St. Paul Rocks", "mh": ["HJ50"], "prefix": [ "PP0S", @@ -26060,13 +26060,13 @@ "dxcc": "256", "cc": "PT", "ccc": "PRT", - "name": "Madeira I", + "name": "Madeira Is.", "continent": "AF", "ituzone": ["36"], "cqzone": ["33"], "timezone": "-1", "ccode": "620", - "aname": "Madeira I", + "aname": "Madeira Is.", "mh": ["IM12", "IM13"], "prefix": [ "CQ2", @@ -27197,13 +27197,13 @@ "dxcc": "270", "cc": "TK", "ccc": "TKL", - "name": "Tokelau Is", + "name": "Tokelau Is.", "continent": "OC", "ituzone": ["62"], "cqzone": ["31"], "timezone": "-11", "ccode": "772", - "aname": "Tokelau", + "aname": "Tokelau Is.", "mh": ["AI31", "AI40", "AI41"], "prefix": ["ZK3"], "worked": false, @@ -27277,13 +27277,13 @@ "dxcc": "273", "cc": "BR", "ccc": "BRA", - "name": "Trindade & Martim Vaz I", + "name": "Trindade & Martim Vaz Is.", "continent": "SA", "ituzone": ["15"], "cqzone": ["11"], "timezone": "-2", "ccode": "76", - "aname": "Trindade & Martim Vaz I", + "aname": "Trindade & Martim Vaz Is.", "mh": ["HG49", "HG59"], "prefix": [ "PP0T", @@ -27333,13 +27333,13 @@ "dxcc": "274", "cc": "GB", "ccc": "GBR", - "name": "Tristan da Cunha & Gough I", + "name": "Tristan da Cunha & Gough I.", "continent": "AF", "ituzone": ["66"], "cqzone": ["38"], "timezone": "0", "ccode": "826", - "aname": "Tristan da Cunha & Gough I", + "aname": "Tristan da Cunha & Gough I.", "mh": ["IE49", "IE59"], "prefix": ["ZD9"], "worked": false, @@ -27421,13 +27421,13 @@ "dxcc": "276", "cc": "FR", "ccc": "FRA", - "name": "Tromelin I", + "name": "Tromelin I.", "continent": "AF", "ituzone": ["53"], "cqzone": ["39"], "timezone": "4", "ccode": "250", - "aname": "Tromelin I", + "aname": "Tromelin I.", "mh": ["LH74"], "prefix": [ "=FR/F6KDF/T", @@ -28856,7 +28856,7 @@ "cqzone": ["20"], "timezone": "2", "ccode": "196", - "aname": "Cyprus SBA", + "aname": "UK Sovereign Base Areas on Cyprus", "mh": ["KM64"], "prefix": ["ZC4", "=ZC4ATC/2000Y"], "worked": false, @@ -29044,13 +29044,13 @@ "dxcc": "285", "cc": "VI", "ccc": "VIR", - "name": "US Virgin Is", + "name": "US Virgin Is.", "continent": "NA", "ituzone": ["11"], "cqzone": ["8"], "timezone": "-4", "ccode": "850", - "aname": "U.S. Virgin Is", + "aname": "Virgin Is.", "mh": ["FK77", "FK78"], "prefix": [ "=AC7FX", @@ -29376,7 +29376,7 @@ "cqzone": ["3", "4", "5"], "timezone": "-5", "ccode": "840", - "aname": "United States", + "aname": "United States of America", "mh": [ "CM79", "CM86", @@ -34233,7 +34233,7 @@ "cqzone": ["15"], "timezone": "1", "ccode": "336", - "aname": "Holy See(Vatican City State)", + "aname": "Vatican", "mh": ["JN61"], "prefix": ["HV", "=HV50VR/IMD"], "worked": false, @@ -34307,13 +34307,13 @@ "dxcc": "297", "cc": "US", "ccc": "USA", - "name": "Wake I", + "name": "Wake I.", "continent": "OC", "ituzone": ["65"], "cqzone": ["31"], "timezone": "12", "ccode": "840", - "aname": "Wake I", + "aname": "Wake I.", "mh": ["RK39"], "prefix": ["AH9", "KH9", "NH9", "WH9"], "worked": false, @@ -34332,13 +34332,13 @@ "dxcc": "298", "cc": "WF", "ccc": "WLF", - "name": "Wallis & Futuna Is", + "name": "Wallis & Futuna Is.", "continent": "OC", "ituzone": ["62"], "cqzone": ["32"], "timezone": "-11", "ccode": "876", - "aname": "Wallis & Futuna", + "aname": "Wallis & Futuna Is.", "mh": ["AH05", "AH15", "AH16"], "prefix": ["FW", "TW"], "worked": false, @@ -34415,7 +34415,7 @@ "cqzone": ["31"], "timezone": "12", "ccode": "296", - "aname": "Kiribati", + "aname": "W. Kiribati (Gilbert Is.)", "mh": [ "AI35", "AI45", @@ -34505,13 +34505,13 @@ "dxcc": "303", "cc": "AU", "ccc": "AUS", - "name": "Willis I", + "name": "Willis Is.", "continent": "OC", "ituzone": ["55"], "cqzone": ["30"], "timezone": "10", "ccode": "36", - "aname": "Willis I", + "aname": "Willis I.", "mh": ["QH53"], "prefix": [ "AX9W", @@ -38443,7 +38443,7 @@ "cqzone": ["21"], "timezone": "4", "ccode": "364", - "aname": "Iran(Islamic Republic of)", + "aname": "Iran", "mh": [ "LL49", "LL57", @@ -38870,7 +38870,7 @@ "cqzone": ["25"], "timezone": "9", "ccode": "408", - "aname": "Democratic People's Republic of Korea", + "aname": "Democratic People's Rep. of Korea", "mh": [ "PM27", "PM28", @@ -39764,7 +39764,7 @@ "cqzone": ["20"], "timezone": "2", "ccode": "760", - "aname": "Syrian Arab Republic", + "aname": "Syria", "mh": [ "KM72", "KM73", @@ -40603,7 +40603,7 @@ "cqzone": ["36"], "timezone": "1", "ccode": "140", - "aname": "Central African Republic", + "aname": "Central Africa", "mh": [ "JJ73", "JJ74", @@ -40829,7 +40829,7 @@ "cqzone": ["36"], "timezone": "1", "ccode": "178", - "aname": "Congo", + "aname": "Republic of the Congo", "mh": [ "JI54", "JI55", @@ -41122,13 +41122,13 @@ "dxcc": "422", "cc": "GM", "ccc": "GMB", - "name": "The Gambia", + "name": "Gambia", "continent": "AF", "ituzone": ["46"], "cqzone": ["35"], "timezone": "0", "ccode": "270", - "aname": "Gambia", + "aname": "The Gambia", "mh": ["IK13", "IK23", "IK33"], "prefix": ["C5", "=C56W/BI"], "worked": false, @@ -41196,13 +41196,13 @@ "dxcc": "428", "cc": "CI", "ccc": "CIV", - "name": "Ivory Coast", + "name": "Cote d'Ivorie", "continent": "AF", "ituzone": ["46"], "cqzone": ["35"], "timezone": "0", "ccode": "384", - "aname": "Ivory Coast", + "aname": "Cote d'Ivorie", "mh": [ "IJ56", "IJ57", @@ -41373,13 +41373,13 @@ "dxcc": "436", "cc": "LY", "ccc": "LBY", - "name": "Libyan Arab Jamahiriya", + "name": "Libya", "continent": "AF", "ituzone": ["38"], "cqzone": ["34"], "timezone": "2", "ccode": "434", - "aname": "Libyan Arab Jamahiriya", + "aname": "Libya", "mh": [ "JL45", "JL46", @@ -42010,13 +42010,13 @@ "dxcc": "453", "cc": "RE", "ccc": "REU", - "name": "Reunion", + "name": "Reunion Is.", "continent": "AF", "ituzone": ["53"], "cqzone": ["39"], "timezone": "4", "ccode": "638", - "aname": "Reunion", + "aname": "Reunion I.", "mh": ["LG78", "LG79"], "prefix": [ "FR", @@ -42152,7 +42152,7 @@ "cqzone": ["32"], "timezone": "12", "ccode": "242", - "aname": "Rotuma", + "aname": "Rotuma I.", "mh": ["RH87"], "prefix": [ "=3D2AG/P", @@ -42579,7 +42579,7 @@ "cqzone": ["37"], "timezone": "3", "ccode": "834", - "aname": "United Republic of Tanzania", + "aname": "Tanzania", "mh": [ "KH78", "KH79", @@ -42963,13 +42963,13 @@ "dxcc": "490", "cc": "KI", "ccc": "KIR", - "name": "Banaba I", + "name": "Banaba Is.", "continent": "OC", "ituzone": ["65"], "cqzone": ["31"], "timezone": "12", "ccode": "296", - "aname": "Banaba I", + "aname": "Banaba I. (Ocean I.)", "mh": ["RI49", "RJ40"], "prefix": ["T33"], "worked": false, @@ -43289,13 +43289,13 @@ "dxcc": "505", "cc": "TW", "ccc": "TWN", - "name": "Pratas I", + "name": "Pratas I.", "continent": "AS", "ituzone": ["44"], "cqzone": ["24"], "timezone": "8", "ccode": "158", - "aname": "Pratas I", + "aname": "Pratas I.", "mh": ["OL80"], "prefix": [ "BM9P", @@ -43355,7 +43355,7 @@ "cqzone": ["28"], "timezone": "11", "ccode": "90", - "aname": "Temotu", + "aname": "Temotu Province", "mh": ["RH29", "RH38", "RH39", "RI30"], "prefix": ["H40"], "worked": false, @@ -43380,7 +43380,7 @@ "cqzone": ["32"], "timezone": "-10", "ccode": "258", - "aname": "Austral Is & Tubuai", + "aname": "Austral I.", "mh": ["BG37"], "prefix": [ "=FO/AC4LN/A", @@ -43441,13 +43441,13 @@ "dxcc": "509", "cc": "FR", "ccc": "FRA", - "name": "Marquesas Is", + "name": "Marquesas Is.", "continent": "OC", "ituzone": ["63"], "cqzone": ["31"], "timezone": "-10", "ccode": "250", - "aname": "Marquesas Is", + "aname": "Marquesas Is.", "mh": ["BI90", "BI91", "BI92", "CH09", "CI00", "CI01"], "prefix": [ "=FO/AC4LN/M", @@ -43500,13 +43500,13 @@ "dxcc": "510", "cc": "PS", "ccc": "PSE", - "name": "Palestinian Authority", + "name": "Palestinian", "continent": "AS", "ituzone": ["39"], "cqzone": ["20"], "timezone": "2", "ccode": "275", - "aname": "Palestinian Territory", + "aname": "Palestinian", "mh": ["KM71", "KM72"], "prefix": ["E4"], "worked": false, @@ -43525,7 +43525,7 @@ "dxcc": "511", "cc": "TL", "ccc": "TLS", - "name": "East Timor", + "name": "Timor-Leste", "continent": "OC", "ituzone": ["54"], "cqzone": ["28"], @@ -43550,13 +43550,13 @@ "dxcc": "512", "cc": "GB", "ccc": "GBR", - "name": "Chesterfield Is", + "name": "Chesterfield Is.", "continent": "OC", "ituzone": ["55"], "cqzone": ["30"], "timezone": "11", "ccode": "826", - "aname": "Chesterfield Is", + "aname": "Chesterfield Is.", "mh": ["QH90"], "prefix": [ "=FK8C/AA7JV", @@ -43584,13 +43584,13 @@ "dxcc": "513", "cc": "PN", "ccc": "PCN", - "name": "Ducie I", + "name": "Ducie I.", "continent": "OC", "ituzone": ["63"], "cqzone": ["32"], "timezone": "-9", "ccode": "612", - "aname": "Ducie I", + "aname": "Ducie I.", "mh": ["CG75"], "prefix": ["=VP6D", "=VP6DI", "=VP6DIA", "=VP6DX", "=VP6UU", "=VP6UU/VP6D"], "worked": false, @@ -43634,13 +43634,13 @@ "dxcc": "515", "cc": "US", "ccc": "USA", - "name": "Swains I", + "name": "Swains I.", "continent": "OC", "ituzone": ["62"], "cqzone": ["32"], "timezone": "-11", "ccode": "840", - "aname": "Swains I", + "aname": "Swains I.", "mh": ["AH48"], "prefix": [ "=KH6BK/KH8", @@ -43672,7 +43672,7 @@ "cqzone": ["0"], "timezone": "0", "ccode": "250", - "aname": "St Barthélemy", + "aname": "Saint Barthélemy", "mh": ["FK87"], "prefix": [ "FJ", @@ -43787,7 +43787,7 @@ "cqzone": ["9"], "timezone": "0", "ccode": "535", - "aname": "Bonaire, St Eustatius & Saba", + "aname": "Bonaire", "mh": ["FK52"], "prefix": ["PJ4"], "worked": false, @@ -43812,7 +43812,7 @@ "cqzone": ["34"], "timezone": "-3", "ccode": "728", - "aname": "South Sudan", + "aname": "South Sudan (Republic of)", "mh": [ "KJ18", "KJ19", @@ -43882,7 +43882,7 @@ "cqzone": ["15"], "timezone": "1", "ccode": "999", - "aname": "Kosovo", + "aname": "Republic of Kosovo", "mh": ["KN01", "KN02", "KN03"], "prefix": ["Z6"], "worked": false, From ae3b3eafbe86e558f5ab241e51dd57b55a224466 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Thu, 12 Nov 2020 13:53:10 -0800 Subject: [PATCH 3/4] Actually use the aname field for ADIF records. --- package.nw/lib/adif.js | 2 +- package.nw/lib/gt.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index 8976401..764ba07 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -1504,7 +1504,7 @@ function sendToLogger(ADIF) { } if (!("COUNTRY" in record) && Number(record["DXCC"]) > 0) { - record["COUNTRY"] = g_dxccToAltName[Number(record["DXCC"])]; + record["COUNTRY"] = g_dxccToADIFName[Number(record["DXCC"])]; } if (g_appSettings.lookupMerge == true) { diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 7b9716b..fc18fed 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -375,6 +375,7 @@ var g_worldGeoData = {}; var g_prefixToMap = {}; var g_directCallToDXCC = {}; var g_dxccToAltName = {}; +var g_dxccToADIFName = {}; var g_dxccToGeoData = {}; var g_gridToDXCC = {}; var g_gridToCQZone = {}; @@ -10299,6 +10300,7 @@ function loadMaidenHeadData() { g_worldGeoData[key].worked_modes = {}; g_worldGeoData[key].confirmed_modes = {}; g_dxccToAltName[g_worldGeoData[key].dxcc] = g_worldGeoData[key].name; + g_dxccToADIFName[g_worldGeoData[key].dxcc] = g_worldGeoData[key].aname; g_dxccToGeoData[g_worldGeoData[key].dxcc] = key; for (var x = 0; x < g_worldGeoData[key].prefix.length; x++) { From 3d278e135d02422ff68e0a0a316da31aa67cecf5 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Thu, 12 Nov 2020 15:56:08 -0800 Subject: [PATCH 4/4] Fix aname for England --- package.nw/data/mh-root-prefixed.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.nw/data/mh-root-prefixed.json b/package.nw/data/mh-root-prefixed.json index 5ec8e84..29ac618 100644 --- a/package.nw/data/mh-root-prefixed.json +++ b/package.nw/data/mh-root-prefixed.json @@ -23578,7 +23578,7 @@ "cqzone": ["14"], "timezone": "0", "ccode": "826", - "aname": "United Kingdom", + "aname": "England", "mh": [ "IN69", "IN79",