From bd22b50e33494e5470199a103a03c477aba81453 Mon Sep 17 00:00:00 2001 From: dh1tw Date: Wed, 30 Dec 2015 19:54:16 +0100 Subject: [PATCH] updated country mapping for entity 16 (ZL9) from Auckland & Campbell to "N.Z. Subantarctic Is." --- docs/source/changelog.rst | 31 ++- docs/source/license.rst | 2 +- pyhamtools/countryfilemapping.json | 366 ++++++++++++++++++++++++++++- pyhamtools/version.py | 2 +- 4 files changed, 391 insertions(+), 10 deletions(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index efbcdb4..89f90a7 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,10 +1,27 @@ Changelog --------- +PyHamTools 0.5.3 +================ + +30. December 2015 + + * Updated DXCC entity name of ZL9 (arrl id 16) from Auckland & Campbell to "N.Z. Subantarctic Is." in countrymapping.json (tnx G0UKB) + * Deleted "Auckland" (016) from countrymapping.json + * corrected code example of latlong_to_locator() (tnx VE5ZX) + +PyHamTools 0.5.2 +================ + +14. April 2015 + + * catching another bug related to QRZ.com sessions + + PyHamTools 0.5.1 ================ -14. April 2015 +13. April 2015 * improved handling of expired QRZ.com sessions @@ -17,17 +34,17 @@ PyHamTools 0.5.0 * implemented QRZ.com interface into LookupLib [LookupLib] * changed and unified all output to Unicode - + * corrected Longitude to General Standard (-180...0° West, 0...180° East) [LookupLib] - + * improved callsign decoding alogrithm [CallInfo] - + * added special case to decode location of VK9 callsigns [CallInfo] * added handling of special callsigns which can't be decoded properly inside a separate callsign exception file (e.g. 7QAA) [CallInfo] - + * added ValueError when LOTW data from file contains too many errors [qsl] - + PyHamTools 0.4.2 ================ @@ -35,7 +52,7 @@ PyHamTools 0.4.2 11. October 2014 * added pyhamtools.qsl (get EQSL.cc and LOTW user lists) - + PyHamTools 0.4.1 ================ diff --git a/docs/source/license.rst b/docs/source/license.rst index ac4a7bc..9eb66c9 100644 --- a/docs/source/license.rst +++ b/docs/source/license.rst @@ -2,7 +2,7 @@ license ======= The MIT License (MIT) -Copyright (c) 2014 Tobias Wellnitz +Copyright (c) Tobias Wellnitz Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pyhamtools/countryfilemapping.json b/pyhamtools/countryfilemapping.json index 3ba4475..ed794bc 100644 --- a/pyhamtools/countryfilemapping.json +++ b/pyhamtools/countryfilemapping.json @@ -1 +1,365 @@ -{"Canada": 1, "Kingman Reef": 134, "Swaziland": 468, "Cameroon": 406, "Burkina Faso": 480, "Turkmenistan": 280, "St. Peter & St. Paul": 253, "Azores": 149, "Cocos (Keeling) Islands": 38, "Pratas Island": 505, "St. Barthelemy": 516, "Ascension Island": 205, "Mount Athos": 180, "Madeira Islands": 256, "Conway Reef": 489, "St. Kitts & Nevis": 249, "Alaska": 6, "Jersey": 122, "Reunion Island": 453, "Turks ": 89, "Macao": 152, "South Shetland Islands": 241, "Falkland Islands": 141, "Andorra": 203, "Tokelau Islands": 270, "Nauru": 157, "Norway": 266, "Western Sahara": 302, "Montenegro": 514, "Cayman Islands": 69, "Libya": 436, "Agalega ": 4, "Finland": 224, "Central African Republic": 408, "Liechtenstein": 251, "Wake Island": 297, "United States": 291, "Annobon Island": 195, "Portugal": 272, "European Russia": 54, "Fernando de Noronha": 56, "Rotuma Island": 460, "Banaba Island": 490, "British Virgin Islands": 65, "Pr. Edward & Marion Is.": 201, "Kuwait": 348, "Costa Rica": 308, "Wales": 294, "Nigeria": 450, "Ecuador": 120, "US Virgin Islands": 285, "Australia": 150, "Cocos Island": 37, "Tuvalu": 282, "Hong Kong": 321, "Denmark": 221, "Philippines": 375, "Andaman & Nicobar Is.": 11, "Trindade ": 90, "Morocco": 446, "Shetland and Fair Isle": 279, "Ceuta ": 32, "Dem. Rep. of the Congo": 414, "Estonia": 52, "Kosovo": 296, "Minami Torishima": 177, "Lebanon": 354, "Aves Island": 17, "Republic of Korea": 137, "Dominica": 95, "Colombia": 116, "Palau": 22, "Nepal": 369, "Saba ": 519, "Maldives": 159, "Suriname": 140, "Palmyra & Jarvis Islands": 197, "Jordan": 342, "Eritrea": 51, "Kure Island": 138, "Syria": 384, "Niger": 187, "Equatorial Guinea": 49, "Serbia": 296, "Greece": 236, "Bolivia": 104, "Ghana": 424, "Saudi Arabia": 378, "American Samoa": 9, "Guatemala": 76, "Zimbabwe": 452, "Chesterfield Islands": 512, "Spain": 281, "Glorioso Islands": 99, "Western Kiribati": 301, "Asiatic Turkey": 390, "Trinidad & Tobago": 90, "Oman": 370, "Gabon": 420, "Niue": 188, "Greenland": 237, "Jan Mayen": 118, "United Arab Emirates": 391, "India": 324, "Lesotho": 432, "Republic of South Sudan": 521, "Chagos Islands": 33, "Kenya": 430, "Czech Republic": 503, "Austral Islands": 508, "Solomon Islands": 185, "San Marino": 278, "Mongolia": 363, "Macquarie Island": 153, "Bermuda": 64, "Peru": 136, "Cote d'Ivoire": 428, "Benin": 416, "Kermadec Islands": 133, "UK Base Areas on Cyprus": 283, "China": 318, "Ukraine": 288, "Tonga": 160, "Tromelin Island": 276, "Palmyra ": 197, "Indonesia": 327, "Pr. Edward ": 201, "Mauritius": 165, "United Nations HQ": 289, "Mali": 442, "Turks & Caicos Islands": 89, "Bulgaria": 212, "Saba & St. Eustatius": 519, "Angola": 401, "Amsterdam & St. Paul Is.": 10, "Chad": 410, "South Africa": 462, "Tajikistan": 262, "Brunei Darussalam": 345, "Senegal": 456, "Uganda": 286, "Hungary": 239, "Sable Island": 211, "Bosnia-Herzegovina": 501, "Brazil": 18, "Swains Island": 515, "DPR of Korea": 344, "Lakshadweep Islands": 142, "Trindade & Martim Vaz": 273, "Central Kiribati": 31, "Bouvet": 24, "Iran": 330, "Algeria": 400, "unknown": 0, "Marshall Islands": 168, "Belgium": 209, "Haiti": 78, "Iraq": 333, "Guinea-Bissau": 109, "Isle of Man": 114, "North Cook Islands": 191, "Mexico": 50, "Djibouti": 382, "Mariana Islands": 166, "Dodecanese": 45, "Nicaragua": 86, "Curacao": 517, "St. Vincent": 98, "Market Reef": 167, "Venezuela": 148, "Galapagos Islands": 71, "Iceland": 242, "Zambia": 482, "Revillagigedo": 204, "Kazakhstan": 130, "Kerguelen Islands": 131, "Kyrgyzstan": 135, "Montserrat": 96, "Hawaii": 110, "Guyana": 129, "Honduras": 80, "ITU HQ": 117, "Egypt": 478, "Antarctica": 13, "Namibia": 464, "Comoros": 411, "East Malaysia": 46, "Ethiopia": 53, "Palestine": 510, "Ducie Island": 513, "Agalega & St. Brandon": 4, "St. Lucia": 97, "African Italy": 248, "Liberia": 434, "Netherlands": 263, "Lithuania": 146, "Tanzania": 470, "Christmas Island": 35, "Monaco": 260, "Spratly Islands": 247, "Tristan da Cunha & Gough Islands": 274, "Ceuta & Melilla": 32, "Svalbard": 259, "Afghanistan": 3, "France": 227, "Juan Fernandez Islands": 125, "Vanuatu": 158, "Malawi": 440, "Republic of the Congo": 412, "Dominican Republic": 95, "St. Pierre & Miquelon": 277, "St. Helena": 250, "St. Peter ": 253, "Baker & Howland Islands": 20, "Willis Island": 303, "Balearic Islands": 21, "i.name": 150, "European Turkey": 390, "Rodriguez Island": 207, "Guinea": 107, "Panama": 88, "Luxembourg": 254, "Cape Verde": 409, "Bahamas": 60, "San Felix ": 217, "Gibraltar": 233, "Ireland": 245, "Pitcairn Island": 172, "El Salvador": 74, "Sardinia": 225, "Mellish Reef": 171, "Belize": 66, "Sierra Leone": 458, "Georgia": 75, "Auckland ": 16, "Eastern Kiribati": 48, "Poland": 269, "Moldova": 179, "St. Paul Island": 252, "Guernsey": 106, "Bonaire": 520, "Fed. Rep. of Germany": 230, "Sicily": 248, "Peter 1 Island": 199, "Heard Island": 111, "Uzbekistan": 292, "Ogasawara": 192, "Taiwan": 386, "Cyprus": 215, "Barbados": 62, "Madagascar": 438, "Italy": 248, "Sudan": 466, "West Malaysia": 299, "Micronesia": 173, "Anguilla": 12, "Aland Islands": 5, "Israel": 336, "Papua New Guinea": 163, "Sao Tome & Principe": 219, "Auckland & Campbell Is.": 16, "Martinique": 84, "Clipperton Island": 36, "Mauritania": 444, "Northern Ireland": 265, "Latvia": 145, "South Orkney Islands": 238, "Guadeloupe": 79, "Paraguay": 132, "Fiji": 176, "Botswana": 402, "Baker ": 20, "Trinidad ": 90, "Cambodia": 312, "Slovak Republic": 504, "The Gambia": 422, "Aruba": 91, "Argentina": 100, "Bahrain": 304, "Slovenia": 499, "Guantanamo Bay": 105, "Jamaica": 82, "French Guiana": 63, "England": 223, "New Zealand": 170, "Yemen": 492, "Pakistan": 372, "Albania": 7, "Samoa": 190, "Norfolk Island": 189, "Guam": 103, "Azerbaijan": 18, "Marquesas Islands": 509, "San Felix & San Ambrosio": 217, "Crozet Island": 41, "Wallis & Futuna Islands": 298, "Bangladesh": 305, "Rwanda": 454, "Somalia": 232, "Laos": 143, "Chatham Islands": 34, "Singapore": 381, "South Cook Islands": 234, "Togo": 483, "Armenia": 14, "Easter Island": 47, "Temotu Province": 507, "Bear Island": 266, "Sweden": 284, "Vietnam": 293, "St. Martin": 213, "Vatican City": 295, "Romania": 275, "Lord Howe Island": 147, "Scarborough Reef": 506, "Qatar": 376, "Antigua & Barbuda": 94, "Austria": 206, "Mozambique": 181, "Canary Islands": 29, "Japan": 339, "Sint Maarten": 518, "Faroe Islands": 222, "Scotland": 279, "Belarus": 27, "Chile": 112, "Puerto Rico": 202, "Wallis ": 298, "Timor - Leste": 511, "Croatia": 497, "French Polynesia": 175, "Thailand": 387, "Switzerland": 287, "Grenada": 77, "Desecheo Island": 43, "Navassa Island": 182, "Seychelles": 379, "San Andres ": 216, "Uruguay": 144, "Malpelo Island": 161, "Franz Josef Land": 61, "Midway Island": 174, "Burundi": 404, "Kaliningrad": 126, "Bhutan": 306, "Asiatic Russia": 15, "Malta": 257, "South Sandwich Islands": 240, "Juan de Nova, Europa": 124, "Johnston Island": 123, "Mayotte": 169, "New Caledonia": 162, "Macedonia": 502, "Crete": 40, "Myanmar": 309, "Tunisia": 474, "South Georgia Island": 235, "Cuba": 70, "San Andres & Providencia": 216, "Sov Mil Order of Malta": 246, "Sri Lanka": 315, "Amsterdam ": 10, "Corsica": 214, "Shetland Islands":279} \ No newline at end of file +{ + "Canada": 1, + "Kingman Reef": 134, + "Swaziland": 468, + "Cameroon": 406, + "Burkina Faso": 480, + "Turkmenistan": 280, + "St. Peter & St. Paul": 253, + "Azores": 149, + "Cocos (Keeling) Islands": 38, + "Pratas Island": 505, + "St. Barthelemy": 516, + "Ascension Island": 205, + "Mount Athos": 180, + "Madeira Islands": 256, + "Conway Reef": 489, + "St. Kitts & Nevis": 249, + "Alaska": 6, + "Jersey": 122, + "Reunion Island": 453, + "Turks ": 89, + "Macao": 152, + "South Shetland Islands": 241, + "Falkland Islands": 141, + "Andorra": 203, + "Tokelau Islands": 270, + "Nauru": 157, + "Norway": 266, + "Western Sahara": 302, + "Montenegro": 514, + "Cayman Islands": 69, + "Libya": 436, + "Agalega ": 4, + "Finland": 224, + "Central African Republic": 408, + "Liechtenstein": 251, + "Wake Island": 297, + "United States": 291, + "Annobon Island": 195, + "Portugal": 272, + "European Russia": 54, + "Fernando de Noronha": 56, + "Rotuma Island": 460, + "Banaba Island": 490, + "British Virgin Islands": 65, + "Pr. Edward & Marion Is.": 201, + "Kuwait": 348, + "Costa Rica": 308, + "Wales": 294, + "Nigeria": 450, + "Ecuador": 120, + "US Virgin Islands": 285, + "Australia": 150, + "Cocos Island": 37, + "Tuvalu": 282, + "Hong Kong": 321, + "Denmark": 221, + "Philippines": 375, + "Andaman & Nicobar Is.": 11, + "Trindade ": 90, + "Morocco": 446, + "Shetland and Fair Isle": 279, + "Ceuta ": 32, + "Dem. Rep. of the Congo": 414, + "Estonia": 52, + "Kosovo": 296, + "Minami Torishima": 177, + "Lebanon": 354, + "Aves Island": 17, + "Republic of Korea": 137, + "Dominica": 95, + "Colombia": 116, + "Palau": 22, + "Nepal": 369, + "Saba ": 519, + "Maldives": 159, + "Suriname": 140, + "Palmyra & Jarvis Islands": 197, + "Jordan": 342, + "Eritrea": 51, + "Kure Island": 138, + "Syria": 384, + "Niger": 187, + "Equatorial Guinea": 49, + "Serbia": 296, + "Greece": 236, + "Bolivia": 104, + "Ghana": 424, + "Saudi Arabia": 378, + "American Samoa": 9, + "Guatemala": 76, + "Zimbabwe": 452, + "Chesterfield Islands": 512, + "Spain": 281, + "Glorioso Islands": 99, + "Western Kiribati": 301, + "Asiatic Turkey": 390, + "Trinidad & Tobago": 90, + "Oman": 370, + "Gabon": 420, + "Niue": 188, + "Greenland": 237, + "Jan Mayen": 118, + "United Arab Emirates": 391, + "India": 324, + "Lesotho": 432, + "Republic of South Sudan": 521, + "Chagos Islands": 33, + "Kenya": 430, + "Czech Republic": 503, + "Austral Islands": 508, + "Solomon Islands": 185, + "San Marino": 278, + "Mongolia": 363, + "Macquarie Island": 153, + "Bermuda": 64, + "Peru": 136, + "Cote d'Ivoire": 428, + "Benin": 416, + "Kermadec Islands": 133, + "UK Base Areas on Cyprus": 283, + "China": 318, + "Ukraine": 288, + "Tonga": 160, + "Tromelin Island": 276, + "Palmyra ": 197, + "Indonesia": 327, + "Pr. Edward ": 201, + "Mauritius": 165, + "United Nations HQ": 289, + "Mali": 442, + "Turks & Caicos Islands": 89, + "Bulgaria": 212, + "Saba & St. Eustatius": 519, + "Angola": 401, + "Amsterdam & St. Paul Is.": 10, + "Chad": 410, + "South Africa": 462, + "Tajikistan": 262, + "Brunei Darussalam": 345, + "Senegal": 456, + "Uganda": 286, + "Hungary": 239, + "Sable Island": 211, + "Bosnia-Herzegovina": 501, + "Brazil": 18, + "Swains Island": 515, + "DPR of Korea": 344, + "Lakshadweep Islands": 142, + "Trindade & Martim Vaz": 273, + "Central Kiribati": 31, + "Bouvet": 24, + "Iran": 330, + "Algeria": 400, + "unknown": 0, + "Marshall Islands": 168, + "Belgium": 209, + "Haiti": 78, + "Iraq": 333, + "Guinea-Bissau": 109, + "Isle of Man": 114, + "North Cook Islands": 191, + "Mexico": 50, + "Djibouti": 382, + "Mariana Islands": 166, + "Dodecanese": 45, + "Nicaragua": 86, + "Curacao": 517, + "St. Vincent": 98, + "Market Reef": 167, + "Venezuela": 148, + "Galapagos Islands": 71, + "Iceland": 242, + "Zambia": 482, + "Revillagigedo": 204, + "Kazakhstan": 130, + "Kerguelen Islands": 131, + "Kyrgyzstan": 135, + "Montserrat": 96, + "Hawaii": 110, + "Guyana": 129, + "Honduras": 80, + "ITU HQ": 117, + "Egypt": 478, + "Antarctica": 13, + "Namibia": 464, + "Comoros": 411, + "East Malaysia": 46, + "Ethiopia": 53, + "Palestine": 510, + "Ducie Island": 513, + "Agalega & St. Brandon": 4, + "St. Lucia": 97, + "African Italy": 248, + "Liberia": 434, + "Netherlands": 263, + "Lithuania": 146, + "Tanzania": 470, + "Christmas Island": 35, + "Monaco": 260, + "Spratly Islands": 247, + "Tristan da Cunha & Gough Islands": 274, + "Ceuta & Melilla": 32, + "Svalbard": 259, + "Afghanistan": 3, + "France": 227, + "Juan Fernandez Islands": 125, + "Vanuatu": 158, + "Malawi": 440, + "Republic of the Congo": 412, + "Dominican Republic": 95, + "St. Pierre & Miquelon": 277, + "St. Helena": 250, + "St. Peter ": 253, + "Baker & Howland Islands": 20, + "Willis Island": 303, + "Balearic Islands": 21, + "i.name": 150, + "European Turkey": 390, + "Rodriguez Island": 207, + "Guinea": 107, + "Panama": 88, + "Luxembourg": 254, + "Cape Verde": 409, + "Bahamas": 60, + "San Felix ": 217, + "Gibraltar": 233, + "Ireland": 245, + "Pitcairn Island": 172, + "El Salvador": 74, + "Sardinia": 225, + "Mellish Reef": 171, + "Belize": 66, + "Sierra Leone": 458, + "Georgia": 75, + "Eastern Kiribati": 48, + "Poland": 269, + "Moldova": 179, + "St. Paul Island": 252, + "Guernsey": 106, + "Bonaire": 520, + "Fed. Rep. of Germany": 230, + "Sicily": 248, + "Peter 1 Island": 199, + "Heard Island": 111, + "Uzbekistan": 292, + "Ogasawara": 192, + "Taiwan": 386, + "Cyprus": 215, + "Barbados": 62, + "Madagascar": 438, + "Italy": 248, + "Sudan": 466, + "West Malaysia": 299, + "Micronesia": 173, + "Anguilla": 12, + "Aland Islands": 5, + "Israel": 336, + "Papua New Guinea": 163, + "Sao Tome & Principe": 219, + "N.Z. Subantarctic Is.": 16, + "Martinique": 84, + "Clipperton Island": 36, + "Mauritania": 444, + "Northern Ireland": 265, + "Latvia": 145, + "South Orkney Islands": 238, + "Guadeloupe": 79, + "Paraguay": 132, + "Fiji": 176, + "Botswana": 402, + "Baker ": 20, + "Trinidad ": 90, + "Cambodia": 312, + "Slovak Republic": 504, + "The Gambia": 422, + "Aruba": 91, + "Argentina": 100, + "Bahrain": 304, + "Slovenia": 499, + "Guantanamo Bay": 105, + "Jamaica": 82, + "French Guiana": 63, + "England": 223, + "New Zealand": 170, + "Yemen": 492, + "Pakistan": 372, + "Albania": 7, + "Samoa": 190, + "Norfolk Island": 189, + "Guam": 103, + "Azerbaijan": 18, + "Marquesas Islands": 509, + "San Felix & San Ambrosio": 217, + "Crozet Island": 41, + "Wallis & Futuna Islands": 298, + "Bangladesh": 305, + "Rwanda": 454, + "Somalia": 232, + "Laos": 143, + "Chatham Islands": 34, + "Singapore": 381, + "South Cook Islands": 234, + "Togo": 483, + "Armenia": 14, + "Easter Island": 47, + "Temotu Province": 507, + "Bear Island": 266, + "Sweden": 284, + "Vietnam": 293, + "St. Martin": 213, + "Vatican City": 295, + "Romania": 275, + "Lord Howe Island": 147, + "Scarborough Reef": 506, + "Qatar": 376, + "Antigua & Barbuda": 94, + "Austria": 206, + "Mozambique": 181, + "Canary Islands": 29, + "Japan": 339, + "Sint Maarten": 518, + "Faroe Islands": 222, + "Scotland": 279, + "Belarus": 27, + "Chile": 112, + "Puerto Rico": 202, + "Wallis ": 298, + "Timor - Leste": 511, + "Croatia": 497, + "French Polynesia": 175, + "Thailand": 387, + "Switzerland": 287, + "Grenada": 77, + "Desecheo Island": 43, + "Navassa Island": 182, + "Seychelles": 379, + "San Andres ": 216, + "Uruguay": 144, + "Malpelo Island": 161, + "Franz Josef Land": 61, + "Midway Island": 174, + "Burundi": 404, + "Kaliningrad": 126, + "Bhutan": 306, + "Asiatic Russia": 15, + "Malta": 257, + "South Sandwich Islands": 240, + "Juan de Nova, Europa": 124, + "Johnston Island": 123, + "Mayotte": 169, + "New Caledonia": 162, + "Macedonia": 502, + "Crete": 40, + "Myanmar": 309, + "Tunisia": 474, + "South Georgia Island": 235, + "Cuba": 70, + "San Andres & Providencia": 216, + "Sov Mil Order of Malta": 246, + "Sri Lanka": 315, + "Amsterdam ": 10, + "Corsica": 214, + "Shetland Islands": 279 +} diff --git a/pyhamtools/version.py b/pyhamtools/version.py index d035ac8..8ae2302 100644 --- a/pyhamtools/version.py +++ b/pyhamtools/version.py @@ -1,4 +1,4 @@ #VERSION = (0, 5, 0, 'dev') -VERSION = (0, 5, 1) +VERSION = (0, 5, 3) __release__ = ''.join(['-.'[type(x) == int]+str(x) for x in VERSION])[1:] __version__ = '.'.join((str(VERSION[0]), str(VERSION[1])))