From f890cf489be545099ffbcbef277f1fd4540d85a6 Mon Sep 17 00:00:00 2001 From: T Loomis Date: Mon, 13 Nov 2023 02:13:28 +0000 Subject: [PATCH] Squashed commits '${title}' --- debian/changelog | 18 + gridtracker.spec | 18 +- package.nw/GridTracker.html | 25 +- package.nw/data/awards.json | 435 +++++++ package.nw/data/combined-with-oceans.json | 902 ++++++------- package.nw/data/dxcc.json | 2 +- package.nw/data/flags.json | 2 +- package.nw/data/mh-root-prefixed.json | 735 ++++------- package.nw/gt_roster.html | 24 +- package.nw/gt_update.odt | Bin 96765 -> 84440 bytes package.nw/gt_update.pdf | Bin 77696 -> 80633 bytes package.nw/i18n/cn-t.json | 2 +- package.nw/i18n/cn.json | 2 +- package.nw/i18n/de.json | 2 +- package.nw/i18n/en-dxcc.json | 2 +- package.nw/i18n/en.json | 4 +- package.nw/i18n/es-dxcc.json | 350 +++++ package.nw/i18n/es-state.json | 149 +++ package.nw/i18n/es.json | 1067 +++++++++++++++ package.nw/i18n/fr.json | 1076 ++++++++++++++++ package.nw/i18n/it.json | 1076 ++++++++++++++++ package.nw/lib/adif.js | 42 +- package.nw/lib/defaults.js | 3 +- package.nw/lib/gt.js | 1144 +++++++---------- package.nw/lib/gtws.js | 2 +- package.nw/lib/i18n.js | 6 +- package.nw/lib/pota.js | 53 +- .../lib/roster/processRosterFiltering.js | 2 +- package.nw/lib/services/pstrotator.js | 14 +- package.nw/lib/shadow.js | 22 +- package.nw/lib/style_roster.css | 9 +- package.nw/lib/third-party.js | 2 +- package.nw/package.json | 2 +- 33 files changed, 5505 insertions(+), 1687 deletions(-) create mode 100644 package.nw/i18n/es-dxcc.json create mode 100644 package.nw/i18n/es-state.json create mode 100644 package.nw/i18n/es.json create mode 100644 package.nw/i18n/fr.json create mode 100644 package.nw/i18n/it.json diff --git a/debian/changelog b/debian/changelog index f74403f..1b0e277 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +gridtracker (1.23.1112) unstable; urgency=low + - Language - Added Français and Italiano (Special thanks to HB9TIH and HB9SNR) + - Language - Added Español (Special thanks to KI2D and HI8O) + - DXCC - Renamed Macedonia to N. Macedonia + - System - Fixed 1.25m displaying as 125cm in English + - Award Tracker - Added ARRL VUCC + - BIGCTY - Update from November 3rd + - Map - Improved speed of mouse-over rendering and ordering + - Map - Grid headers show source (Logbook or Live) + - Call Roster - Fixed issue where Spot wasn't populating correctly + - Rotor - All locations can now aim on ctrl-left-click when enabled + - POTA - Left-click a park (tree) on same band/mode will generate messages in WSJT-X + - Lookup - Added OAMS user to details + - Logging - Descriptive error if QRZ.com logging failure + - Logbook Viewer - Regex enabled callsign searching + - Settings - Logbook - New "Logbook Items Per Page" slider +-- Tag Loomis Sun, 12 Nov 2023 00:00:00 -0000 + gridtracker (1.23.1019) unstable; urgency=low - HTTP - Removed timeouts on transactions affecting log downloading and uploading -- Tag Loomis Thu, 19 Oct 2023 00:00:00 -0000 diff --git a/gridtracker.spec b/gridtracker.spec index eaebcfd..2ff7465 100644 --- a/gridtracker.spec +++ b/gridtracker.spec @@ -1,6 +1,6 @@ Name: {{{ git_name name=gridtracker }}} Summary: GridTracker: An Amateur Radio Companion -Version: 1.23.1019 +Version: 1.23.1112 Release: 1%{?dist} BuildArch: noarch Source0: {{{ git_dir_pack }}} @@ -40,6 +40,22 @@ DESTDIR=${RPM_BUILD_ROOT} make clean %license %{_docdir}/%{name}/ %changelog +* Sun Nov 12 2023 Tag Loomis - 1.23.1112-1 + - Language - Added Français and Italiano (Special thanks to HB9TIH and HB9SNR) + - Language - Added Español (Special thanks to KI2D and HI8O) + - DXCC - Renamed Macedonia to N. Macedonia + - System - Fixed 1.25m displaying as 125cm in English + - Award Tracker - Added ARRL VUCC + - BIGCTY - Update from November 3rd + - Map - Improved speed of mouse-over rendering and ordering + - Map - Grid headers show source (Logbook or Live) + - Call Roster - Fixed issue where Spot wasn't populating correctly + - Rotor - All locations can now aim on ctrl-left-click when enabled + - POTA - Left-click a park (tree) on same band/mode will generate messages in WSJT-X + - Lookup - Added OAMS user to details + - Logging - Descriptive error if QRZ.com logging failure + - Logbook Viewer - Regex enabled callsign searching + - Settings - Logbook - New "Logbook Items Per Page" slider * Thu Oct 19 2023 Tag Loomis - 1.23.1019-1 - HTTP - Removed timeouts on transactions affecting log downloading and uploading * Sun Oct 15 2023 Tag Loomis - 1.23.1015-1 diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 1b4ec52..ccca4c7 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -413,7 +413,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + @@ -625,7 +625,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ">
-
+
简体中文 + + + @@ -1607,6 +1611,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Apply Changes
+
+
+ + + + + + + + + + +
Logbook Items Per Page
100
+ +
+
diff --git a/package.nw/data/awards.json b/package.nw/data/awards.json index 0f52485..13cb1df 100644 --- a/package.nw/data/awards.json +++ b/package.nw/data/awards.json @@ -98,6 +98,441 @@ "sponsor": "ARRL", "tooltip": "Fred Fish Memorial" }, + "VUCC50": { + "name": "VUCC - VHF/UHF Century Club 6m", + "rule": { + "band": [ + "6m" + ], + "count": [ + 100, + 200, + 300, + 400, + 500, + 600, + 700, + 800, + 900, + 1000, + 1100, + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 50MHz" + }, + "VUCC144": { + "name": "VUCC - VHF/UHF Century Club 2m", + "rule": { + "band": [ + "2m" + ], + "count": [ + 100, + 200, + 300, + 400, + 500, + 600, + 700, + 800, + 900, + 1000, + 1100, + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 144MHz" + }, + "VUCC222": { + "name": "VUCC - VHF/UHF Century Club 1.25m", + "rule": { + "band": [ + "1.25m" + ], + "count": [ + 50, + 60, + 70, + 80, + 90, + 100, + 200, + 250 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 222MHz" + }, + "VUCC432": { + "name": "VUCC - VHF/UHF Century Club 70cm", + "rule": { + "band": [ + "70cm" + ], + "count": [ + 50, + 100, + 150, + 200, + 250, + 300 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 430MHz" + }, + "VUCC902": { + "name": "VUCC - VHF/UHF Century Club 33cm", + "rule": { + "band": [ + "33cm" + ], + "count": [ + 25, + 30, + 35, + 40, + 45, + 50, + 55, + 60, + 65, + 70, + 75, + 80, + 85, + 90, + 95, + 100 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 902MHz" + }, + "VUCC1296": { + "name": "VUCC - VHF/UHF Century Club 23cm", + "rule": { + "band": [ + "23cm" + ], + "count": [ + 25, + 50, + 100, + 150, + 200, + 250, + 300, + 350, + 400 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 1296MHz" + }, + "VUCC2-3G": { + "name": "VUCC - VHF/UHF Century Club 13cm", + "rule": { + "band": [ + "13cm" + ], + "count": [ + 10, + 25, + 50, + 100, + 150, + 200, + 250, + 300 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 2.3GHz" + }, + "VUCC3-3G": { + "name": "VUCC - VHF/UHF Century Club 9cm", + "rule": { + "band": [ + "9cm" + ], + "count": [ + 5, + 10, + 20, + 30, + 40, + 50, + 60, + 70, + 80, + 90, + 100 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 3.3GHz" + }, + "VUCC5-7G": { + "name": "VUCC - VHF/UHF Century Club 5cm", + "rule": { + "band": [ + "5cm" + ], + "count": [ + 5, + 10, + 20, + 30, + 40, + 50, + 60, + 70, + 80, + 90, + 100 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 5.7G" + }, + "VUCC10G": { + "name": "VUCC - VHF/UHF Century Club 3cm", + "rule": { + "band": [ + "3cm" + ], + "count": [ + 5, + 10, + 20, + 30, + 40, + 50, + 60, + 70, + 80, + 90, + 100, + 110, + 120, + 130, + 140, + 150, + 160, + 170, + 180, + 190, + 200 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 10GHz" + }, + "VUCC24G": { + "name": "VUCC - VHF/UHF Century Club 1.2cm", + "rule": { + "band": [ + "1.2cm" + ], + "count": [ + 5, + 10, + 15, + 20, + 25, + 30, + 35, + 40, + 45, + 50 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 24GHz" + }, + "VUCC47G": { + "name": "VUCC - VHF/UHF Century Club 6mm", + "rule": { + "band": [ + "6mm" + ], + "count": [ + 5, + 10, + 15, + 20, + 25, + 30, + 35, + 40, + 45, + 50 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 47GHz" + }, + "VUCC75G": { + "name": "VUCC - VHF/UHF Century Club 4mm", + "rule": { + "band": [ + "4mm" + ], + "count": [ + 5, + 10, + 15, + 20, + 25, + 30 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 75GHz" + }, + "VUCC122G": { + "name": "VUCC - VHF/UHF Century Club 2.5mm", + "rule": { + "band": [ + "2.5mm" + ], + "count": [ + 5, + 10, + 15, + 20 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 122GHz" + }, + "VUCC134G": { + "name": "VUCC - VHF/UHF Century Club 2mm", + "rule": { + "band": [ + "2mm" + ], + "count": [ + 5, + 10 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 134GHz" + }, + "VUCC241G": { + "name": "VUCC - VHF/UHF Century Club 1mm", + "rule": { + "band": [ + "1mm" + ], + "count": [ + 5 + ], + "endorse": [], + "mode": [ + "Mixed" + ], + "type": "grids" + }, + "sponsor": "ARRL", + "tooltip": "VUCC 241GHz" + }, "WAC": { "name": "WAC - Worked All Continents", "rule": { diff --git a/package.nw/data/combined-with-oceans.json b/package.nw/data/combined-with-oceans.json index 3074105..5e11ade 100644 --- a/package.nw/data/combined-with-oceans.json +++ b/package.nw/data/combined-with-oceans.json @@ -80,7 +80,7 @@ ] ] }, - "properties": { "tzid": "Africa/Abidjan" } + "properties": { "prop" : "tz" , "tzid": "Africa/Abidjan" } }, { "type": "Feature", @@ -141,7 +141,7 @@ ] ] }, - "properties": { "tzid": "Africa/Accra" } + "properties": { "prop" : "tz" , "tzid": "Africa/Accra" } }, { "type": "Feature", @@ -257,7 +257,7 @@ ] ] }, - "properties": { "tzid": "Africa/Addis_Ababa" } + "properties": { "prop" : "tz" , "tzid": "Africa/Addis_Ababa" } }, { "type": "Feature", @@ -393,7 +393,7 @@ ] ] }, - "properties": { "tzid": "Africa/Algiers" } + "properties": { "prop" : "tz" , "tzid": "Africa/Algiers" } }, { "type": "Feature", @@ -466,7 +466,7 @@ ] ] }, - "properties": { "tzid": "Africa/Asmara" } + "properties": { "prop" : "tz" , "tzid": "Africa/Asmara" } }, { "type": "Feature", @@ -594,7 +594,7 @@ ] ] }, - "properties": { "tzid": "Africa/Bamako" } + "properties": { "prop" : "tz" , "tzid": "Africa/Bamako" } }, { "type": "Feature", @@ -712,7 +712,7 @@ ] ] }, - "properties": { "tzid": "Africa/Bangui" } + "properties": { "prop" : "tz" , "tzid": "Africa/Bangui" } }, { "type": "Feature", @@ -743,7 +743,7 @@ ] ] }, - "properties": { "tzid": "Africa/Banjul" } + "properties": { "prop" : "tz" , "tzid": "Africa/Banjul" } }, { "type": "Feature", @@ -776,7 +776,7 @@ ] ] }, - "properties": { "tzid": "Africa/Bissau" } + "properties": { "prop" : "tz" , "tzid": "Africa/Bissau" } }, { "type": "Feature", @@ -846,7 +846,7 @@ ] ] }, - "properties": { "tzid": "Africa/Blantyre" } + "properties": { "prop" : "tz" , "tzid": "Africa/Blantyre" } }, { "type": "Feature", @@ -951,7 +951,7 @@ ] ] }, - "properties": { "tzid": "Africa/Brazzaville" } + "properties": { "prop" : "tz" , "tzid": "Africa/Brazzaville" } }, { "type": "Feature", @@ -983,7 +983,7 @@ ] ] }, - "properties": { "tzid": "Africa/Bujumbura" } + "properties": { "prop" : "tz" , "tzid": "Africa/Bujumbura" } }, { "type": "Feature", @@ -1070,7 +1070,7 @@ ] ] }, - "properties": { "tzid": "Africa/Cairo" } + "properties": { "prop" : "tz" , "tzid": "Africa/Cairo" } }, { "type": "Feature", @@ -1162,7 +1162,7 @@ ] ] }, - "properties": { "tzid": "Africa/Casablanca" } + "properties": { "prop" : "tz" , "tzid": "Africa/Casablanca" } }, { "type": "Feature", @@ -1177,7 +1177,7 @@ ] ] }, - "properties": { "tzid": "Africa/Ceuta" } + "properties": { "prop" : "tz" , "tzid": "Africa/Ceuta" } }, { "type": "Feature", @@ -1276,7 +1276,7 @@ ] ] }, - "properties": { "tzid": "Africa/Conakry" } + "properties": { "prop" : "tz" , "tzid": "Africa/Conakry" } }, { "type": "Feature", @@ -1351,7 +1351,7 @@ ] ] }, - "properties": { "tzid": "Africa/Dakar" } + "properties": { "prop" : "tz" , "tzid": "Africa/Dakar" } }, { "type": "Feature", @@ -1445,7 +1445,7 @@ ] ] }, - "properties": { "tzid": "Africa/Dar_es_Salaam" } + "properties": { "prop" : "tz" , "tzid": "Africa/Dar_es_Salaam" } }, { "type": "Feature", @@ -1472,7 +1472,7 @@ ] ] }, - "properties": { "tzid": "Africa/Djibouti" } + "properties": { "prop" : "tz" , "tzid": "Africa/Djibouti" } }, { "type": "Feature", @@ -1578,7 +1578,7 @@ ] ] }, - "properties": { "tzid": "Africa/Douala" } + "properties": { "prop" : "tz" , "tzid": "Africa/Douala" } }, { "type": "Feature", @@ -1623,7 +1623,7 @@ ] ] }, - "properties": { "tzid": "Africa/El_Aaiun" } + "properties": { "prop" : "tz" , "tzid": "Africa/El_Aaiun" } }, { "type": "Feature", @@ -1665,7 +1665,7 @@ ] ] }, - "properties": { "tzid": "Africa/Freetown" } + "properties": { "prop" : "tz" , "tzid": "Africa/Freetown" } }, { "type": "Feature", @@ -1746,7 +1746,7 @@ ] ] }, - "properties": { "tzid": "Africa/Gaborone" } + "properties": { "prop" : "tz" , "tzid": "Africa/Gaborone" } }, { "type": "Feature", @@ -1820,7 +1820,7 @@ ] ] }, - "properties": { "tzid": "Africa/Harare" } + "properties": { "prop" : "tz" , "tzid": "Africa/Harare" } }, { "type": "Feature", @@ -2005,7 +2005,7 @@ ] ] }, - "properties": { "tzid": "Africa/Johannesburg" } + "properties": { "prop" : "tz" , "tzid": "Africa/Johannesburg" } }, { "type": "Feature", @@ -2125,7 +2125,7 @@ ] ] }, - "properties": { "tzid": "Africa/Juba" } + "properties": { "prop" : "tz" , "tzid": "Africa/Juba" } }, { "type": "Feature", @@ -2184,7 +2184,7 @@ ] ] }, - "properties": { "tzid": "Africa/Kampala" } + "properties": { "prop" : "tz" , "tzid": "Africa/Kampala" } }, { "type": "Feature", @@ -2332,7 +2332,7 @@ ] ] }, - "properties": { "tzid": "Africa/Khartoum" } + "properties": { "prop" : "tz" , "tzid": "Africa/Khartoum" } }, { "type": "Feature", @@ -2367,7 +2367,7 @@ ] ] }, - "properties": { "tzid": "Africa/Kigali" } + "properties": { "prop" : "tz" , "tzid": "Africa/Kigali" } }, { "type": "Feature", @@ -2513,7 +2513,7 @@ ] ] }, - "properties": { "tzid": "Africa/Kinshasa" } + "properties": { "prop" : "tz" , "tzid": "Africa/Kinshasa" } }, { "type": "Feature", @@ -2621,7 +2621,7 @@ ] ] }, - "properties": { "tzid": "Africa/Lagos" } + "properties": { "prop" : "tz" , "tzid": "Africa/Lagos" } }, { "type": "Feature", @@ -2694,7 +2694,7 @@ ] ] }, - "properties": { "tzid": "Africa/Libreville" } + "properties": { "prop" : "tz" , "tzid": "Africa/Libreville" } }, { "type": "Feature", @@ -2737,7 +2737,7 @@ ] ] }, - "properties": { "tzid": "Africa/Lome" } + "properties": { "prop" : "tz" , "tzid": "Africa/Lome" } }, { "type": "Feature", @@ -2873,7 +2873,7 @@ ] ] }, - "properties": { "tzid": "Africa/Luanda" } + "properties": { "prop" : "tz" , "tzid": "Africa/Luanda" } }, { "type": "Feature", @@ -3066,7 +3066,7 @@ ] ] }, - "properties": { "tzid": "Africa/Lubumbashi" } + "properties": { "prop" : "tz" , "tzid": "Africa/Lubumbashi" } }, { "type": "Feature", @@ -3182,7 +3182,7 @@ ] ] }, - "properties": { "tzid": "Africa/Lusaka" } + "properties": { "prop" : "tz" , "tzid": "Africa/Lusaka" } }, { "type": "Feature", @@ -3232,7 +3232,7 @@ ] ] }, - "properties": { "tzid": "Africa/Malabo" } + "properties": { "prop" : "tz" , "tzid": "Africa/Malabo" } }, { "type": "Feature", @@ -3376,7 +3376,7 @@ ] ] }, - "properties": { "tzid": "Africa/Maputo" } + "properties": { "prop" : "tz" , "tzid": "Africa/Maputo" } }, { "type": "Feature", @@ -3407,7 +3407,7 @@ ] ] }, - "properties": { "tzid": "Africa/Maseru" } + "properties": { "prop" : "tz" , "tzid": "Africa/Maseru" } }, { "type": "Feature", @@ -3432,7 +3432,7 @@ ] ] }, - "properties": { "tzid": "Africa/Mbabane" } + "properties": { "prop" : "tz" , "tzid": "Africa/Mbabane" } }, { "type": "Feature", @@ -3530,7 +3530,7 @@ ] ] }, - "properties": { "tzid": "Africa/Mogadishu" } + "properties": { "prop" : "tz" , "tzid": "Africa/Mogadishu" } }, { "type": "Feature", @@ -3577,7 +3577,7 @@ ] ] }, - "properties": { "tzid": "Africa/Monrovia" } + "properties": { "prop" : "tz" , "tzid": "Africa/Monrovia" } }, { "type": "Feature", @@ -3642,7 +3642,7 @@ ] ] }, - "properties": { "tzid": "Africa/Nairobi" } + "properties": { "prop" : "tz" , "tzid": "Africa/Nairobi" } }, { "type": "Feature", @@ -3743,7 +3743,7 @@ ] ] }, - "properties": { "tzid": "Africa/Ndjamena" } + "properties": { "prop" : "tz" , "tzid": "Africa/Ndjamena" } }, { "type": "Feature", @@ -3838,7 +3838,7 @@ ] ] }, - "properties": { "tzid": "Africa/Niamey" } + "properties": { "prop" : "tz" , "tzid": "Africa/Niamey" } }, { "type": "Feature", @@ -3910,7 +3910,7 @@ ] ] }, - "properties": { "tzid": "Africa/Nouakchott" } + "properties": { "prop" : "tz" , "tzid": "Africa/Nouakchott" } }, { "type": "Feature", @@ -3987,7 +3987,7 @@ ] ] }, - "properties": { "tzid": "Africa/Ouagadougou" } + "properties": { "prop" : "tz" , "tzid": "Africa/Ouagadougou" } }, { "type": "Feature", @@ -4033,7 +4033,7 @@ ] ] }, - "properties": { "tzid": "Africa/Porto-Novo" } + "properties": { "prop" : "tz" , "tzid": "Africa/Porto-Novo" } }, { "type": "Feature", @@ -4057,7 +4057,7 @@ ] ] }, - "properties": { "tzid": "Africa/Sao_Tome" } + "properties": { "prop" : "tz" , "tzid": "Africa/Sao_Tome" } }, { "type": "Feature", @@ -4160,7 +4160,7 @@ ] ] }, - "properties": { "tzid": "Africa/Tripoli" } + "properties": { "prop" : "tz" , "tzid": "Africa/Tripoli" } }, { "type": "Feature", @@ -4230,7 +4230,7 @@ ] ] }, - "properties": { "tzid": "Africa/Tunis" } + "properties": { "prop" : "tz" , "tzid": "Africa/Tunis" } }, { "type": "Feature", @@ -4320,7 +4320,7 @@ ] ] }, - "properties": { "tzid": "Africa/Windhoek" } + "properties": { "prop" : "tz" , "tzid": "Africa/Windhoek" } }, { "type": "Feature", @@ -4471,7 +4471,7 @@ ] ] }, - "properties": { "tzid": "America/Adak" } + "properties": { "prop" : "tz" , "tzid": "America/Adak" } }, { "type": "Feature", @@ -4676,7 +4676,7 @@ ] ] }, - "properties": { "tzid": "America/Anchorage" } + "properties": { "prop" : "tz" , "tzid": "America/Anchorage" } }, { "type": "Feature", @@ -4698,7 +4698,7 @@ ] ] }, - "properties": { "tzid": "America/Anguilla" } + "properties": { "prop" : "tz" , "tzid": "America/Anguilla" } }, { "type": "Feature", @@ -4731,7 +4731,7 @@ ] ] }, - "properties": { "tzid": "America/Antigua" } + "properties": { "prop" : "tz" , "tzid": "America/Antigua" } }, { "type": "Feature", @@ -4749,7 +4749,7 @@ ] ] }, - "properties": { "tzid": "America/Aruba" } + "properties": { "prop" : "tz" , "tzid": "America/Aruba" } }, { "type": "Feature", @@ -4839,7 +4839,7 @@ ] ] }, - "properties": { "tzid": "America/Araguaina" } + "properties": { "prop" : "tz" , "tzid": "America/Araguaina" } }, { "type": "Feature", @@ -4890,7 +4890,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Buenos_Aires" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Buenos_Aires" } }, { "type": "Feature", @@ -4991,7 +4991,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Catamarca" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Catamarca" } }, { "type": "Feature", @@ -5112,7 +5112,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Cordoba" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Cordoba" } }, { "type": "Feature", @@ -5159,7 +5159,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Jujuy" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Jujuy" } }, { "type": "Feature", @@ -5205,7 +5205,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/La_Rioja" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/La_Rioja" } }, { "type": "Feature", @@ -5259,7 +5259,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Mendoza" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Mendoza" } }, { "type": "Feature", @@ -5331,7 +5331,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Rio_Gallegos" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Rio_Gallegos" } }, { "type": "Feature", @@ -5451,7 +5451,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Salta" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Salta" } }, { "type": "Feature", @@ -5507,7 +5507,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/San_Juan" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/San_Juan" } }, { "type": "Feature", @@ -5545,7 +5545,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/San_Luis" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/San_Luis" } }, { "type": "Feature", @@ -5575,7 +5575,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Tucuman" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Tucuman" } }, { "type": "Feature", @@ -5647,7 +5647,7 @@ ] ] }, - "properties": { "tzid": "America/Argentina/Ushuaia" } + "properties": { "prop" : "tz" , "tzid": "America/Argentina/Ushuaia" } }, { "type": "Feature", @@ -5729,7 +5729,7 @@ ] ] }, - "properties": { "tzid": "America/Asuncion" } + "properties": { "prop" : "tz" , "tzid": "America/Asuncion" } }, { "type": "Feature", @@ -5842,7 +5842,7 @@ ] ] }, - "properties": { "tzid": "America/Atikokan" } + "properties": { "prop" : "tz" , "tzid": "America/Atikokan" } }, { "type": "Feature", @@ -5963,7 +5963,7 @@ ] ] }, - "properties": { "tzid": "America/Bahia" } + "properties": { "prop" : "tz" , "tzid": "America/Bahia" } }, { "type": "Feature", @@ -5981,7 +5981,7 @@ ] ] }, - "properties": { "tzid": "America/Bahia_Banderas" } + "properties": { "prop" : "tz" , "tzid": "America/Bahia_Banderas" } }, { "type": "Feature", @@ -6000,7 +6000,7 @@ ] ] }, - "properties": { "tzid": "America/Barbados" } + "properties": { "prop" : "tz" , "tzid": "America/Barbados" } }, { "type": "Feature", @@ -6115,7 +6115,7 @@ ] ] }, - "properties": { "tzid": "America/Belem" } + "properties": { "prop" : "tz" , "tzid": "America/Belem" } }, { "type": "Feature", @@ -6149,7 +6149,7 @@ ] ] }, - "properties": { "tzid": "America/Belize" } + "properties": { "prop" : "tz" , "tzid": "America/Belize" } }, { "type": "Feature", @@ -6172,7 +6172,7 @@ ] ] }, - "properties": { "tzid": "America/Blanc-Sablon" } + "properties": { "prop" : "tz" , "tzid": "America/Blanc-Sablon" } }, { "type": "Feature", @@ -6253,7 +6253,7 @@ ] ] }, - "properties": { "tzid": "America/Boa_Vista" } + "properties": { "prop" : "tz" , "tzid": "America/Boa_Vista" } }, { "type": "Feature", @@ -6486,7 +6486,7 @@ ] ] }, - "properties": { "tzid": "America/Bogota" } + "properties": { "prop" : "tz" , "tzid": "America/Bogota" } }, { "type": "Feature", @@ -6533,7 +6533,7 @@ ] ] }, - "properties": { "tzid": "America/Boise" } + "properties": { "prop" : "tz" , "tzid": "America/Boise" } }, { "type": "Feature", @@ -6570,7 +6570,7 @@ ] ] }, - "properties": { "tzid": "America/Cambridge_Bay" } + "properties": { "prop" : "tz" , "tzid": "America/Cambridge_Bay" } }, { "type": "Feature", @@ -6650,7 +6650,7 @@ ] ] }, - "properties": { "tzid": "America/Campo_Grande" } + "properties": { "prop" : "tz" , "tzid": "America/Campo_Grande" } }, { "type": "Feature", @@ -6703,7 +6703,7 @@ ] ] }, - "properties": { "tzid": "America/Cancun" } + "properties": { "prop" : "tz" , "tzid": "America/Cancun" } }, { "type": "Feature", @@ -6847,7 +6847,7 @@ ] ] }, - "properties": { "tzid": "America/Caracas" } + "properties": { "prop" : "tz" , "tzid": "America/Caracas" } }, { "type": "Feature", @@ -6889,7 +6889,7 @@ ] ] }, - "properties": { "tzid": "America/Cayenne" } + "properties": { "prop" : "tz" , "tzid": "America/Cayenne" } }, { "type": "Feature", @@ -6922,7 +6922,7 @@ ] ] }, - "properties": { "tzid": "America/Cayman" } + "properties": { "prop" : "tz" , "tzid": "America/Cayman" } }, { "type": "Feature", @@ -7145,7 +7145,7 @@ ] ] }, - "properties": { "tzid": "America/Chicago" } + "properties": { "prop" : "tz" , "tzid": "America/Chicago" } }, { "type": "Feature", @@ -7216,7 +7216,7 @@ ] ] }, - "properties": { "tzid": "America/Chihuahua" } + "properties": { "prop" : "tz" , "tzid": "America/Chihuahua" } }, { "type": "Feature", @@ -7276,7 +7276,7 @@ ] ] }, - "properties": { "tzid": "America/Costa_Rica" } + "properties": { "prop" : "tz" , "tzid": "America/Costa_Rica" } }, { "type": "Feature", @@ -7298,7 +7298,7 @@ ] ] }, - "properties": { "tzid": "America/Creston" } + "properties": { "prop" : "tz" , "tzid": "America/Creston" } }, { "type": "Feature", @@ -7401,7 +7401,7 @@ ] ] }, - "properties": { "tzid": "America/Cuiaba" } + "properties": { "prop" : "tz" , "tzid": "America/Cuiaba" } }, { "type": "Feature", @@ -7420,7 +7420,7 @@ ] ] }, - "properties": { "tzid": "America/Curacao" } + "properties": { "prop" : "tz" , "tzid": "America/Curacao" } }, { "type": "Feature", @@ -7443,7 +7443,7 @@ ] ] }, - "properties": { "tzid": "America/Danmarkshavn" } + "properties": { "prop" : "tz" , "tzid": "America/Danmarkshavn" } }, { "type": "Feature", @@ -7458,7 +7458,7 @@ ] ] }, - "properties": { "tzid": "America/Dawson" } + "properties": { "prop" : "tz" , "tzid": "America/Dawson" } }, { "type": "Feature", @@ -7493,7 +7493,7 @@ ] ] }, - "properties": { "tzid": "America/Dawson_Creek" } + "properties": { "prop" : "tz" , "tzid": "America/Dawson_Creek" } }, { "type": "Feature", @@ -7624,7 +7624,7 @@ ] ] }, - "properties": { "tzid": "America/Denver" } + "properties": { "prop" : "tz" , "tzid": "America/Denver" } }, { "type": "Feature", @@ -7683,7 +7683,7 @@ ] ] }, - "properties": { "tzid": "America/Detroit" } + "properties": { "prop" : "tz" , "tzid": "America/Detroit" } }, { "type": "Feature", @@ -7704,7 +7704,7 @@ ] ] }, - "properties": { "tzid": "America/Dominica" } + "properties": { "prop" : "tz" , "tzid": "America/Dominica" } }, { "type": "Feature", @@ -7757,7 +7757,7 @@ ] ] }, - "properties": { "tzid": "America/Edmonton" } + "properties": { "prop" : "tz" , "tzid": "America/Edmonton" } }, { "type": "Feature", @@ -7792,7 +7792,7 @@ ] ] }, - "properties": { "tzid": "America/Eirunepe" } + "properties": { "prop" : "tz" , "tzid": "America/Eirunepe" } }, { "type": "Feature", @@ -7820,7 +7820,7 @@ ] ] }, - "properties": { "tzid": "America/El_Salvador" } + "properties": { "prop" : "tz" , "tzid": "America/El_Salvador" } }, { "type": "Feature", @@ -7848,7 +7848,7 @@ ] ] }, - "properties": { "tzid": "America/Fort_Nelson" } + "properties": { "prop" : "tz" , "tzid": "America/Fort_Nelson" } }, { "type": "Feature", @@ -7975,7 +7975,7 @@ ] ] }, - "properties": { "tzid": "America/Fortaleza" } + "properties": { "prop" : "tz" , "tzid": "America/Fortaleza" } }, { "type": "Feature", @@ -7995,7 +7995,7 @@ ] ] }, - "properties": { "tzid": "America/Glace_Bay" } + "properties": { "prop" : "tz" , "tzid": "America/Glace_Bay" } }, { "type": "Feature", @@ -8136,7 +8136,7 @@ ] ] }, - "properties": { "tzid": "America/Godthab" } + "properties": { "prop" : "tz" , "tzid": "America/Godthab" } }, { "type": "Feature", @@ -8265,7 +8265,7 @@ ] ] }, - "properties": { "tzid": "America/Goose_Bay" } + "properties": { "prop" : "tz" , "tzid": "America/Goose_Bay" } }, { "type": "Feature", @@ -8287,7 +8287,7 @@ ] ] }, - "properties": { "tzid": "America/Grand_Turk" } + "properties": { "prop" : "tz" , "tzid": "America/Grand_Turk" } }, { "type": "Feature", @@ -8307,7 +8307,7 @@ ] ] }, - "properties": { "tzid": "America/Grenada" } + "properties": { "prop" : "tz" , "tzid": "America/Grenada" } }, { "type": "Feature", @@ -8332,7 +8332,7 @@ ] ] }, - "properties": { "tzid": "America/Guadeloupe" } + "properties": { "prop" : "tz" , "tzid": "America/Guadeloupe" } }, { "type": "Feature", @@ -8379,7 +8379,7 @@ ] ] }, - "properties": { "tzid": "America/Guatemala" } + "properties": { "prop" : "tz" , "tzid": "America/Guatemala" } }, { "type": "Feature", @@ -8435,7 +8435,7 @@ ] ] }, - "properties": { "tzid": "America/Guayaquil" } + "properties": { "prop" : "tz" , "tzid": "America/Guayaquil" } }, { "type": "Feature", @@ -8514,7 +8514,7 @@ ] ] }, - "properties": { "tzid": "America/Guyana" } + "properties": { "prop" : "tz" , "tzid": "America/Guyana" } }, { "type": "Feature", @@ -8586,7 +8586,7 @@ ] ] }, - "properties": { "tzid": "America/Halifax" } + "properties": { "prop" : "tz" , "tzid": "America/Halifax" } }, { "type": "Feature", @@ -8637,7 +8637,7 @@ ] ] }, - "properties": { "tzid": "America/Havana" } + "properties": { "prop" : "tz" , "tzid": "America/Havana" } }, { "type": "Feature", @@ -8697,7 +8697,7 @@ ] ] }, - "properties": { "tzid": "America/Hermosillo" } + "properties": { "prop" : "tz" , "tzid": "America/Hermosillo" } }, { "type": "Feature", @@ -8732,7 +8732,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Indianapolis" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Indianapolis" } }, { "type": "Feature", @@ -8748,7 +8748,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Knox" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Knox" } }, { "type": "Feature", @@ -8765,7 +8765,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Marengo" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Marengo" } }, { "type": "Feature", @@ -8781,7 +8781,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Petersburg" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Petersburg" } }, { "type": "Feature", @@ -8799,7 +8799,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Tell_City" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Tell_City" } }, { "type": "Feature", @@ -8814,7 +8814,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Vevay" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Vevay" } }, { "type": "Feature", @@ -8834,7 +8834,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Vincennes" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Vincennes" } }, { "type": "Feature", @@ -8850,7 +8850,7 @@ ] ] }, - "properties": { "tzid": "America/Indiana/Winamac" } + "properties": { "prop" : "tz" , "tzid": "America/Indiana/Winamac" } }, { "type": "Feature", @@ -8865,7 +8865,7 @@ ] ] }, - "properties": { "tzid": "America/Inuvik" } + "properties": { "prop" : "tz" , "tzid": "America/Inuvik" } }, { "type": "Feature", @@ -9084,7 +9084,7 @@ ] ] }, - "properties": { "tzid": "America/Iqaluit" } + "properties": { "prop" : "tz" , "tzid": "America/Iqaluit" } }, { "type": "Feature", @@ -9109,7 +9109,7 @@ ] ] }, - "properties": { "tzid": "America/Jamaica" } + "properties": { "prop" : "tz" , "tzid": "America/Jamaica" } }, { "type": "Feature", @@ -9155,7 +9155,7 @@ ] ] }, - "properties": { "tzid": "America/Juneau" } + "properties": { "prop" : "tz" , "tzid": "America/Juneau" } }, { "type": "Feature", @@ -9177,7 +9177,7 @@ ] ] }, - "properties": { "tzid": "America/Kentucky/Louisville" } + "properties": { "prop" : "tz" , "tzid": "America/Kentucky/Louisville" } }, { "type": "Feature", @@ -9194,7 +9194,7 @@ ] ] }, - "properties": { "tzid": "America/Kentucky/Monticello" } + "properties": { "prop" : "tz" , "tzid": "America/Kentucky/Monticello" } }, { "type": "Feature", @@ -9229,7 +9229,7 @@ ] ] }, - "properties": { "tzid": "America/Kralendijk" } + "properties": { "prop" : "tz" , "tzid": "America/Kralendijk" } }, { "type": "Feature", @@ -9360,7 +9360,7 @@ ] ] }, - "properties": { "tzid": "America/La_Paz" } + "properties": { "prop" : "tz" , "tzid": "America/La_Paz" } }, { "type": "Feature", @@ -9521,7 +9521,7 @@ ] ] }, - "properties": { "tzid": "America/Lima" } + "properties": { "prop" : "tz" , "tzid": "America/Lima" } }, { "type": "Feature", @@ -9662,7 +9662,7 @@ ] ] }, - "properties": { "tzid": "America/Los_Angeles" } + "properties": { "prop" : "tz" , "tzid": "America/Los_Angeles" } }, { "type": "Feature", @@ -9680,7 +9680,7 @@ ] ] }, - "properties": { "tzid": "America/Lower_Princes" } + "properties": { "prop" : "tz" , "tzid": "America/Lower_Princes" } }, { "type": "Feature", @@ -9724,7 +9724,7 @@ ] ] }, - "properties": { "tzid": "America/Maceio" } + "properties": { "prop" : "tz" , "tzid": "America/Maceio" } }, { "type": "Feature", @@ -9799,7 +9799,7 @@ ] ] }, - "properties": { "tzid": "America/Managua" } + "properties": { "prop" : "tz" , "tzid": "America/Managua" } }, { "type": "Feature", @@ -9921,7 +9921,7 @@ ] ] }, - "properties": { "tzid": "America/Manaus" } + "properties": { "prop" : "tz" , "tzid": "America/Manaus" } }, { "type": "Feature", @@ -9940,7 +9940,7 @@ ] ] }, - "properties": { "tzid": "America/Marigot" } + "properties": { "prop" : "tz" , "tzid": "America/Marigot" } }, { "type": "Feature", @@ -9960,7 +9960,7 @@ ] ] }, - "properties": { "tzid": "America/Martinique" } + "properties": { "prop" : "tz" , "tzid": "America/Martinique" } }, { "type": "Feature", @@ -10036,7 +10036,7 @@ ] ] }, - "properties": { "tzid": "America/Matamoros" } + "properties": { "prop" : "tz" , "tzid": "America/Matamoros" } }, { "type": "Feature", @@ -10188,7 +10188,7 @@ ] ] }, - "properties": { "tzid": "America/Mazatlan" } + "properties": { "prop" : "tz" , "tzid": "America/Mazatlan" } }, { "type": "Feature", @@ -10208,7 +10208,7 @@ ] ] }, - "properties": { "tzid": "America/Miquelon" } + "properties": { "prop" : "tz" , "tzid": "America/Miquelon" } }, { "type": "Feature", @@ -10243,7 +10243,7 @@ ] ] }, - "properties": { "tzid": "America/Menominee" } + "properties": { "prop" : "tz" , "tzid": "America/Menominee" } }, { "type": "Feature", @@ -10340,7 +10340,7 @@ ] ] }, - "properties": { "tzid": "America/Merida" } + "properties": { "prop" : "tz" , "tzid": "America/Merida" } }, { "type": "Feature", @@ -10356,7 +10356,7 @@ ] ] }, - "properties": { "tzid": "America/Metlakatla" } + "properties": { "prop" : "tz" , "tzid": "America/Metlakatla" } }, { "type": "Feature", @@ -10534,7 +10534,7 @@ ] ] }, - "properties": { "tzid": "America/Mexico_City" } + "properties": { "prop" : "tz" , "tzid": "America/Mexico_City" } }, { "type": "Feature", @@ -10585,7 +10585,7 @@ ] ] }, - "properties": { "tzid": "America/Moncton" } + "properties": { "prop" : "tz" , "tzid": "America/Moncton" } }, { "type": "Feature", @@ -10706,7 +10706,7 @@ ] ] }, - "properties": { "tzid": "America/Monterrey" } + "properties": { "prop" : "tz" , "tzid": "America/Monterrey" } }, { "type": "Feature", @@ -10766,7 +10766,7 @@ ] ] }, - "properties": { "tzid": "America/Montevideo" } + "properties": { "prop" : "tz" , "tzid": "America/Montevideo" } }, { "type": "Feature", @@ -10785,7 +10785,7 @@ ] ] }, - "properties": { "tzid": "America/Montserrat" } + "properties": { "prop" : "tz" , "tzid": "America/Montserrat" } }, { "type": "Feature", @@ -10833,7 +10833,7 @@ ] ] }, - "properties": { "tzid": "America/Nassau" } + "properties": { "prop" : "tz" , "tzid": "America/Nassau" } }, { "type": "Feature", @@ -11045,7 +11045,7 @@ ] ] }, - "properties": { "tzid": "America/New_York" } + "properties": { "prop" : "tz" , "tzid": "America/New_York" } }, { "type": "Feature", @@ -11061,7 +11061,7 @@ ] ] }, - "properties": { "tzid": "America/Nipigon" } + "properties": { "prop" : "tz" , "tzid": "America/Nipigon" } }, { "type": "Feature", @@ -11320,7 +11320,7 @@ ] ] }, - "properties": { "tzid": "America/Nome" } + "properties": { "prop" : "tz" , "tzid": "America/Nome" } }, { "type": "Feature", @@ -11337,7 +11337,7 @@ ] ] }, - "properties": { "tzid": "America/Noronha" } + "properties": { "prop" : "tz" , "tzid": "America/Noronha" } }, { "type": "Feature", @@ -11356,7 +11356,7 @@ ] ] }, - "properties": { "tzid": "America/North_Dakota/Beulah" } + "properties": { "prop" : "tz" , "tzid": "America/North_Dakota/Beulah" } }, { "type": "Feature", @@ -11373,7 +11373,7 @@ ] ] }, - "properties": { "tzid": "America/North_Dakota/Center" } + "properties": { "prop" : "tz" , "tzid": "America/North_Dakota/Center" } }, { "type": "Feature", @@ -11397,7 +11397,7 @@ ] ] }, - "properties": { "tzid": "America/North_Dakota/New_Salem" } + "properties": { "prop" : "tz" , "tzid": "America/North_Dakota/New_Salem" } }, { "type": "Feature", @@ -11453,7 +11453,7 @@ ] ] }, - "properties": { "tzid": "America/Ojinaga" } + "properties": { "prop" : "tz" , "tzid": "America/Ojinaga" } }, { "type": "Feature", @@ -11512,7 +11512,7 @@ ] ] }, - "properties": { "tzid": "America/Panama" } + "properties": { "prop" : "tz" , "tzid": "America/Panama" } }, { "type": "Feature", @@ -11590,7 +11590,7 @@ ] ] }, - "properties": { "tzid": "America/Pangnirtung" } + "properties": { "prop" : "tz" , "tzid": "America/Pangnirtung" } }, { "type": "Feature", @@ -11646,7 +11646,7 @@ ] ] }, - "properties": { "tzid": "America/Paramaribo" } + "properties": { "prop" : "tz" , "tzid": "America/Paramaribo" } }, { "type": "Feature", @@ -11707,7 +11707,7 @@ ] ] }, - "properties": { "tzid": "America/Phoenix" } + "properties": { "prop" : "tz" , "tzid": "America/Phoenix" } }, { "type": "Feature", @@ -11762,7 +11762,7 @@ ] ] }, - "properties": { "tzid": "America/Port-au-Prince" } + "properties": { "prop" : "tz" , "tzid": "America/Port-au-Prince" } }, { "type": "Feature", @@ -11783,7 +11783,7 @@ ] ] }, - "properties": { "tzid": "America/Port_of_Spain" } + "properties": { "prop" : "tz" , "tzid": "America/Port_of_Spain" } }, { "type": "Feature", @@ -11860,7 +11860,7 @@ ] ] }, - "properties": { "tzid": "America/Porto_Velho" } + "properties": { "prop" : "tz" , "tzid": "America/Porto_Velho" } }, { "type": "Feature", @@ -11903,7 +11903,7 @@ ] ] }, - "properties": { "tzid": "America/Puerto_Rico" } + "properties": { "prop" : "tz" , "tzid": "America/Puerto_Rico" } }, { "type": "Feature", @@ -12000,7 +12000,7 @@ ] ] }, - "properties": { "tzid": "America/Punta_Arenas" } + "properties": { "prop" : "tz" , "tzid": "America/Punta_Arenas" } }, { "type": "Feature", @@ -12017,7 +12017,7 @@ ] ] }, - "properties": { "tzid": "America/Rainy_River" } + "properties": { "prop" : "tz" , "tzid": "America/Rainy_River" } }, { "type": "Feature", @@ -12125,7 +12125,7 @@ ] ] }, - "properties": { "tzid": "America/Rankin_Inlet" } + "properties": { "prop" : "tz" , "tzid": "America/Rankin_Inlet" } }, { "type": "Feature", @@ -12194,7 +12194,7 @@ ] ] }, - "properties": { "tzid": "America/Recife" } + "properties": { "prop" : "tz" , "tzid": "America/Recife" } }, { "type": "Feature", @@ -12243,7 +12243,7 @@ ] ] }, - "properties": { "tzid": "America/Regina" } + "properties": { "prop" : "tz" , "tzid": "America/Regina" } }, { "type": "Feature", @@ -12268,7 +12268,7 @@ ] ] }, - "properties": { "tzid": "America/Resolute" } + "properties": { "prop" : "tz" , "tzid": "America/Resolute" } }, { "type": "Feature", @@ -12320,7 +12320,7 @@ ] ] }, - "properties": { "tzid": "America/Rio_Branco" } + "properties": { "prop" : "tz" , "tzid": "America/Rio_Branco" } }, { "type": "Feature", @@ -12423,7 +12423,7 @@ ] ] }, - "properties": { "tzid": "America/Santarem" } + "properties": { "prop" : "tz" , "tzid": "America/Santarem" } }, { "type": "Feature", @@ -12672,7 +12672,7 @@ ] ] }, - "properties": { "tzid": "America/Santiago" } + "properties": { "prop" : "tz" , "tzid": "America/Santiago" } }, { "type": "Feature", @@ -12708,7 +12708,7 @@ ] ] }, - "properties": { "tzid": "America/Santo_Domingo" } + "properties": { "prop" : "tz" , "tzid": "America/Santo_Domingo" } }, { "type": "Feature", @@ -12899,7 +12899,7 @@ ] ] }, - "properties": { "tzid": "America/Sao_Paulo" } + "properties": { "prop" : "tz" , "tzid": "America/Sao_Paulo" } }, { "type": "Feature", @@ -12918,7 +12918,7 @@ ] ] }, - "properties": { "tzid": "America/Scoresbysund" } + "properties": { "prop" : "tz" , "tzid": "America/Scoresbysund" } }, { "type": "Feature", @@ -12983,7 +12983,7 @@ ] ] }, - "properties": { "tzid": "America/Sitka" } + "properties": { "prop" : "tz" , "tzid": "America/Sitka" } }, { "type": "Feature", @@ -13002,7 +13002,7 @@ ] ] }, - "properties": { "tzid": "America/St_Barthelemy" } + "properties": { "prop" : "tz" , "tzid": "America/St_Barthelemy" } }, { "type": "Feature", @@ -13085,7 +13085,7 @@ ] ] }, - "properties": { "tzid": "America/St_Johns" } + "properties": { "prop" : "tz" , "tzid": "America/St_Johns" } }, { "type": "Feature", @@ -13103,7 +13103,7 @@ ] ] }, - "properties": { "tzid": "America/St_Kitts" } + "properties": { "prop" : "tz" , "tzid": "America/St_Kitts" } }, { "type": "Feature", @@ -13122,7 +13122,7 @@ ] ] }, - "properties": { "tzid": "America/St_Lucia" } + "properties": { "prop" : "tz" , "tzid": "America/St_Lucia" } }, { "type": "Feature", @@ -13157,7 +13157,7 @@ ] ] }, - "properties": { "tzid": "America/St_Thomas" } + "properties": { "prop" : "tz" , "tzid": "America/St_Thomas" } }, { "type": "Feature", @@ -13178,7 +13178,7 @@ ] ] }, - "properties": { "tzid": "America/St_Vincent" } + "properties": { "prop" : "tz" , "tzid": "America/St_Vincent" } }, { "type": "Feature", @@ -13194,7 +13194,7 @@ ] ] }, - "properties": { "tzid": "America/Swift_Current" } + "properties": { "prop" : "tz" , "tzid": "America/Swift_Current" } }, { "type": "Feature", @@ -13285,7 +13285,7 @@ ] ] }, - "properties": { "tzid": "America/Tegucigalpa" } + "properties": { "prop" : "tz" , "tzid": "America/Tegucigalpa" } }, { "type": "Feature", @@ -13323,7 +13323,7 @@ ] ] }, - "properties": { "tzid": "America/Thule" } + "properties": { "prop" : "tz" , "tzid": "America/Thule" } }, { "type": "Feature", @@ -13339,7 +13339,7 @@ ] ] }, - "properties": { "tzid": "America/Thunder_Bay" } + "properties": { "prop" : "tz" , "tzid": "America/Thunder_Bay" } }, { "type": "Feature", @@ -13403,7 +13403,7 @@ ] ] }, - "properties": { "tzid": "America/Tijuana" } + "properties": { "prop" : "tz" , "tzid": "America/Tijuana" } }, { "type": "Feature", @@ -13699,7 +13699,7 @@ ] ] }, - "properties": { "tzid": "America/Toronto" } + "properties": { "prop" : "tz" , "tzid": "America/Toronto" } }, { "type": "Feature", @@ -13721,7 +13721,7 @@ ] ] }, - "properties": { "tzid": "America/Tortola" } + "properties": { "prop" : "tz" , "tzid": "America/Tortola" } }, { "type": "Feature", @@ -13898,7 +13898,7 @@ ] ] }, - "properties": { "tzid": "America/Vancouver" } + "properties": { "prop" : "tz" , "tzid": "America/Vancouver" } }, { "type": "Feature", @@ -13984,7 +13984,7 @@ ] ] }, - "properties": { "tzid": "America/Whitehorse" } + "properties": { "prop" : "tz" , "tzid": "America/Whitehorse" } }, { "type": "Feature", @@ -14067,7 +14067,7 @@ ] ] }, - "properties": { "tzid": "America/Winnipeg" } + "properties": { "prop" : "tz" , "tzid": "America/Winnipeg" } }, { "type": "Feature", @@ -14098,7 +14098,7 @@ ] ] }, - "properties": { "tzid": "America/Yakutat" } + "properties": { "prop" : "tz" , "tzid": "America/Yakutat" } }, { "type": "Feature", @@ -14228,7 +14228,7 @@ ] ] }, - "properties": { "tzid": "America/Yellowknife" } + "properties": { "prop" : "tz" , "tzid": "America/Yellowknife" } }, { "type": "Feature", @@ -14245,7 +14245,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Casey" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Casey" } }, { "type": "Feature", @@ -14261,7 +14261,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Davis" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Davis" } }, { "type": "Feature", @@ -14279,7 +14279,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/DumontDUrville" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/DumontDUrville" } }, { "type": "Feature", @@ -14304,7 +14304,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Macquarie" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Macquarie" } }, { "type": "Feature", @@ -14320,7 +14320,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Mawson" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Mawson" } }, { "type": "Feature", @@ -14355,7 +14355,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/McMurdo" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/McMurdo" } }, { "type": "Feature", @@ -14371,7 +14371,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Palmer" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Palmer" } }, { "type": "Feature", @@ -14398,7 +14398,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Rothera" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Rothera" } }, { "type": "Feature", @@ -14414,7 +14414,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Syowa" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Syowa" } }, { "type": "Feature", @@ -14430,7 +14430,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Troll" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Troll" } }, { "type": "Feature", @@ -14448,7 +14448,7 @@ ] ] }, - "properties": { "tzid": "Antarctica/Vostok" } + "properties": { "prop" : "tz" , "tzid": "Antarctica/Vostok" } }, { "type": "Feature", @@ -14627,7 +14627,7 @@ ] ] }, - "properties": { "tzid": "Arctic/Longyearbyen" } + "properties": { "prop" : "tz" , "tzid": "Arctic/Longyearbyen" } }, { "type": "Feature", @@ -14756,7 +14756,7 @@ ] ] }, - "properties": { "tzid": "Asia/Aden" } + "properties": { "prop" : "tz" , "tzid": "Asia/Aden" } }, { "type": "Feature", @@ -14986,7 +14986,7 @@ ] ] }, - "properties": { "tzid": "Asia/Almaty" } + "properties": { "prop" : "tz" , "tzid": "Asia/Almaty" } }, { "type": "Feature", @@ -15027,7 +15027,7 @@ ] ] }, - "properties": { "tzid": "Asia/Amman" } + "properties": { "prop" : "tz" , "tzid": "Asia/Amman" } }, { "type": "Feature", @@ -15266,7 +15266,7 @@ ] ] }, - "properties": { "tzid": "Asia/Anadyr" } + "properties": { "prop" : "tz" , "tzid": "Asia/Anadyr" } }, { "type": "Feature", @@ -15321,7 +15321,7 @@ ] ] }, - "properties": { "tzid": "Asia/Aqtau" } + "properties": { "prop" : "tz" , "tzid": "Asia/Aqtau" } }, { "type": "Feature", @@ -15410,7 +15410,7 @@ ] ] }, - "properties": { "tzid": "Asia/Aqtobe" } + "properties": { "prop" : "tz" , "tzid": "Asia/Aqtobe" } }, { "type": "Feature", @@ -15526,7 +15526,7 @@ ] ] }, - "properties": { "tzid": "Asia/Ashgabat" } + "properties": { "prop" : "tz" , "tzid": "Asia/Ashgabat" } }, { "type": "Feature", @@ -15601,7 +15601,7 @@ ] ] }, - "properties": { "tzid": "Asia/Atyrau" } + "properties": { "prop" : "tz" , "tzid": "Asia/Atyrau" } }, { "type": "Feature", @@ -15683,7 +15683,7 @@ ] ] }, - "properties": { "tzid": "Asia/Baghdad" } + "properties": { "prop" : "tz" , "tzid": "Asia/Baghdad" } }, { "type": "Feature", @@ -15705,7 +15705,7 @@ ] ] }, - "properties": { "tzid": "Asia/Bahrain" } + "properties": { "prop" : "tz" , "tzid": "Asia/Bahrain" } }, { "type": "Feature", @@ -15783,7 +15783,7 @@ ] ] }, - "properties": { "tzid": "Asia/Baku" } + "properties": { "prop" : "tz" , "tzid": "Asia/Baku" } }, { "type": "Feature", @@ -16042,7 +16042,7 @@ ] ] }, - "properties": { "tzid": "Asia/Bangkok" } + "properties": { "prop" : "tz" , "tzid": "Asia/Bangkok" } }, { "type": "Feature", @@ -16143,7 +16143,7 @@ ] ] }, - "properties": { "tzid": "Asia/Barnaul" } + "properties": { "prop" : "tz" , "tzid": "Asia/Barnaul" } }, { "type": "Feature", @@ -16170,7 +16170,7 @@ ] ] }, - "properties": { "tzid": "Asia/Beirut" } + "properties": { "prop" : "tz" , "tzid": "Asia/Beirut" } }, { "type": "Feature", @@ -16277,7 +16277,7 @@ ] ] }, - "properties": { "tzid": "Asia/Bishkek" } + "properties": { "prop" : "tz" , "tzid": "Asia/Bishkek" } }, { "type": "Feature", @@ -16308,7 +16308,7 @@ ] ] }, - "properties": { "tzid": "Asia/Brunei" } + "properties": { "prop" : "tz" , "tzid": "Asia/Brunei" } }, { "type": "Feature", @@ -16451,7 +16451,7 @@ ] ] }, - "properties": { "tzid": "Asia/Chita" } + "properties": { "prop" : "tz" , "tzid": "Asia/Chita" } }, { "type": "Feature", @@ -16532,7 +16532,7 @@ ] ] }, - "properties": { "tzid": "Asia/Choibalsan" } + "properties": { "prop" : "tz" , "tzid": "Asia/Choibalsan" } }, { "type": "Feature", @@ -16569,7 +16569,7 @@ ] ] }, - "properties": { "tzid": "Asia/Colombo" } + "properties": { "prop" : "tz" , "tzid": "Asia/Colombo" } }, { "type": "Feature", @@ -16634,7 +16634,7 @@ ] ] }, - "properties": { "tzid": "Asia/Damascus" } + "properties": { "prop" : "tz" , "tzid": "Asia/Damascus" } }, { "type": "Feature", @@ -16714,7 +16714,7 @@ ] ] }, - "properties": { "tzid": "Asia/Dhaka" } + "properties": { "prop" : "tz" , "tzid": "Asia/Dhaka" } }, { "type": "Feature", @@ -16753,7 +16753,7 @@ ] ] }, - "properties": { "tzid": "Asia/Dili" } + "properties": { "prop" : "tz" , "tzid": "Asia/Dili" } }, { "type": "Feature", @@ -16819,7 +16819,7 @@ ] ] }, - "properties": { "tzid": "Asia/Dubai" } + "properties": { "prop" : "tz" , "tzid": "Asia/Dubai" } }, { "type": "Feature", @@ -16922,7 +16922,7 @@ ] ] }, - "properties": { "tzid": "Asia/Dushanbe" } + "properties": { "prop" : "tz" , "tzid": "Asia/Dushanbe" } }, { "type": "Feature", @@ -16949,7 +16949,7 @@ ] ] }, - "properties": { "tzid": "Asia/Famagusta" } + "properties": { "prop" : "tz" , "tzid": "Asia/Famagusta" } }, { "type": "Feature", @@ -16965,7 +16965,7 @@ ] ] }, - "properties": { "tzid": "Asia/Gaza" } + "properties": { "prop" : "tz" , "tzid": "Asia/Gaza" } }, { "type": "Feature", @@ -16986,7 +16986,7 @@ ] ] }, - "properties": { "tzid": "Asia/Hebron" } + "properties": { "prop" : "tz" , "tzid": "Asia/Hebron" } }, { "type": "Feature", @@ -17053,7 +17053,7 @@ ] ] }, - "properties": { "tzid": "Asia/Ho_Chi_Minh" } + "properties": { "prop" : "tz" , "tzid": "Asia/Ho_Chi_Minh" } }, { "type": "Feature", @@ -17070,7 +17070,7 @@ ] ] }, - "properties": { "tzid": "Asia/Hong_Kong" } + "properties": { "prop" : "tz" , "tzid": "Asia/Hong_Kong" } }, { "type": "Feature", @@ -17181,7 +17181,7 @@ ] ] }, - "properties": { "tzid": "Asia/Hovd" } + "properties": { "prop" : "tz" , "tzid": "Asia/Hovd" } }, { "type": "Feature", @@ -17423,7 +17423,7 @@ ] ] }, - "properties": { "tzid": "Asia/Irkutsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Irkutsk" } }, { "type": "Feature", @@ -17523,7 +17523,7 @@ ] ] }, - "properties": { "tzid": "Asia/Jakarta" } + "properties": { "prop" : "tz" , "tzid": "Asia/Jakarta" } }, { "type": "Feature", @@ -17608,7 +17608,7 @@ ] ] }, - "properties": { "tzid": "Asia/Jayapura" } + "properties": { "prop" : "tz" , "tzid": "Asia/Jayapura" } }, { "type": "Feature", @@ -17643,7 +17643,7 @@ ] ] }, - "properties": { "tzid": "Asia/Jerusalem" } + "properties": { "prop" : "tz" , "tzid": "Asia/Jerusalem" } }, { "type": "Feature", @@ -17779,7 +17779,7 @@ ] ] }, - "properties": { "tzid": "Asia/Kabul" } + "properties": { "prop" : "tz" , "tzid": "Asia/Kabul" } }, { "type": "Feature", @@ -17964,7 +17964,7 @@ ] ] }, - "properties": { "tzid": "Asia/Kamchatka" } + "properties": { "prop" : "tz" , "tzid": "Asia/Kamchatka" } }, { "type": "Feature", @@ -18157,7 +18157,7 @@ ] ] }, - "properties": { "tzid": "Asia/Karachi" } + "properties": { "prop" : "tz" , "tzid": "Asia/Karachi" } }, { "type": "Feature", @@ -18231,7 +18231,7 @@ ] ] }, - "properties": { "tzid": "Asia/Kathmandu" } + "properties": { "prop" : "tz" , "tzid": "Asia/Kathmandu" } }, { "type": "Feature", @@ -18345,7 +18345,7 @@ ] ] }, - "properties": { "tzid": "Asia/Khandyga" } + "properties": { "prop" : "tz" , "tzid": "Asia/Khandyga" } }, { "type": "Feature", @@ -18847,7 +18847,7 @@ ] ] }, - "properties": { "tzid": "Asia/Kolkata" } + "properties": { "prop" : "tz" , "tzid": "Asia/Kolkata" } }, { "type": "Feature", @@ -19393,7 +19393,7 @@ ] ] }, - "properties": { "tzid": "Asia/Krasnoyarsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Krasnoyarsk" } }, { "type": "Feature", @@ -19476,7 +19476,7 @@ ] ] }, - "properties": { "tzid": "Asia/Kuala_Lumpur" } + "properties": { "prop" : "tz" , "tzid": "Asia/Kuala_Lumpur" } }, { "type": "Feature", @@ -19563,7 +19563,7 @@ ] ] }, - "properties": { "tzid": "Asia/Kuching" } + "properties": { "prop" : "tz" , "tzid": "Asia/Kuching" } }, { "type": "Feature", @@ -19592,7 +19592,7 @@ ] ] }, - "properties": { "tzid": "Asia/Kuwait" } + "properties": { "prop" : "tz" , "tzid": "Asia/Kuwait" } }, { "type": "Feature", @@ -19608,7 +19608,7 @@ ] ] }, - "properties": { "tzid": "Asia/Macau" } + "properties": { "prop" : "tz" , "tzid": "Asia/Macau" } }, { "type": "Feature", @@ -19759,7 +19759,7 @@ ] ] }, - "properties": { "tzid": "Asia/Magadan" } + "properties": { "prop" : "tz" , "tzid": "Asia/Magadan" } }, { "type": "Feature", @@ -19887,7 +19887,7 @@ ] ] }, - "properties": { "tzid": "Asia/Makassar" } + "properties": { "prop" : "tz" , "tzid": "Asia/Makassar" } }, { "type": "Feature", @@ -19980,7 +19980,7 @@ ] ] }, - "properties": { "tzid": "Asia/Manila" } + "properties": { "prop" : "tz" , "tzid": "Asia/Manila" } }, { "type": "Feature", @@ -20062,7 +20062,7 @@ ] ] }, - "properties": { "tzid": "Asia/Muscat" } + "properties": { "prop" : "tz" , "tzid": "Asia/Muscat" } }, { "type": "Feature", @@ -20092,7 +20092,7 @@ ] ] }, - "properties": { "tzid": "Asia/Nicosia" } + "properties": { "prop" : "tz" , "tzid": "Asia/Nicosia" } }, { "type": "Feature", @@ -20159,7 +20159,7 @@ ] ] }, - "properties": { "tzid": "Asia/Novokuznetsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Novokuznetsk" } }, { "type": "Feature", @@ -20236,7 +20236,7 @@ ] ] }, - "properties": { "tzid": "Asia/Novosibirsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Novosibirsk" } }, { "type": "Feature", @@ -20319,7 +20319,7 @@ ] ] }, - "properties": { "tzid": "Asia/Omsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Omsk" } }, { "type": "Feature", @@ -20391,7 +20391,7 @@ ] ] }, - "properties": { "tzid": "Asia/Oral" } + "properties": { "prop" : "tz" , "tzid": "Asia/Oral" } }, { "type": "Feature", @@ -20464,7 +20464,7 @@ ] ] }, - "properties": { "tzid": "Asia/Phnom_Penh" } + "properties": { "prop" : "tz" , "tzid": "Asia/Phnom_Penh" } }, { "type": "Feature", @@ -20534,7 +20534,7 @@ ] ] }, - "properties": { "tzid": "Asia/Pontianak" } + "properties": { "prop" : "tz" , "tzid": "Asia/Pontianak" } }, { "type": "Feature", @@ -20608,7 +20608,7 @@ ] ] }, - "properties": { "tzid": "Asia/Pyongyang" } + "properties": { "prop" : "tz" , "tzid": "Asia/Pyongyang" } }, { "type": "Feature", @@ -20660,7 +20660,7 @@ ] ] }, - "properties": { "tzid": "Asia/Qatar" } + "properties": { "prop" : "tz" , "tzid": "Asia/Qatar" } }, { "type": "Feature", @@ -20745,7 +20745,7 @@ ] ] }, - "properties": { "tzid": "Asia/Qostanay" } + "properties": { "prop" : "tz" , "tzid": "Asia/Qostanay" } }, { "type": "Feature", @@ -20801,7 +20801,7 @@ ] ] }, - "properties": { "tzid": "Asia/Qyzylorda" } + "properties": { "prop" : "tz" , "tzid": "Asia/Qyzylorda" } }, { "type": "Feature", @@ -20910,7 +20910,7 @@ ] ] }, - "properties": { "tzid": "Asia/Riyadh" } + "properties": { "prop" : "tz" , "tzid": "Asia/Riyadh" } }, { "type": "Feature", @@ -21001,7 +21001,7 @@ ] ] }, - "properties": { "tzid": "Asia/Samarkand" } + "properties": { "prop" : "tz" , "tzid": "Asia/Samarkand" } }, { "type": "Feature", @@ -21093,7 +21093,7 @@ ] ] }, - "properties": { "tzid": "Asia/Sakhalin" } + "properties": { "prop" : "tz" , "tzid": "Asia/Sakhalin" } }, { "type": "Feature", @@ -21183,7 +21183,7 @@ ] ] }, - "properties": { "tzid": "Asia/Seoul" } + "properties": { "prop" : "tz" , "tzid": "Asia/Seoul" } }, { "type": "Feature", @@ -21780,7 +21780,7 @@ ] ] }, - "properties": { "tzid": "Asia/Shanghai" } + "properties": { "prop" : "tz" , "tzid": "Asia/Shanghai" } }, { "type": "Feature", @@ -21797,7 +21797,7 @@ ] ] }, - "properties": { "tzid": "Asia/Singapore" } + "properties": { "prop" : "tz" , "tzid": "Asia/Singapore" } }, { "type": "Feature", @@ -22013,7 +22013,7 @@ ] ] }, - "properties": { "tzid": "Asia/Srednekolymsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Srednekolymsk" } }, { "type": "Feature", @@ -22054,7 +22054,7 @@ ] ] }, - "properties": { "tzid": "Asia/Taipei" } + "properties": { "prop" : "tz" , "tzid": "Asia/Taipei" } }, { "type": "Feature", @@ -22128,7 +22128,7 @@ ] ] }, - "properties": { "tzid": "Asia/Tashkent" } + "properties": { "prop" : "tz" , "tzid": "Asia/Tashkent" } }, { "type": "Feature", @@ -22186,7 +22186,7 @@ ] ] }, - "properties": { "tzid": "Asia/Tbilisi" } + "properties": { "prop" : "tz" , "tzid": "Asia/Tbilisi" } }, { "type": "Feature", @@ -22367,7 +22367,7 @@ ] ] }, - "properties": { "tzid": "Asia/Tehran" } + "properties": { "prop" : "tz" , "tzid": "Asia/Tehran" } }, { "type": "Feature", @@ -22405,7 +22405,7 @@ ] ] }, - "properties": { "tzid": "Asia/Thimphu" } + "properties": { "prop" : "tz" , "tzid": "Asia/Thimphu" } }, { "type": "Feature", @@ -22879,7 +22879,7 @@ ] ] }, - "properties": { "tzid": "Asia/Tokyo" } + "properties": { "prop" : "tz" , "tzid": "Asia/Tokyo" } }, { "type": "Feature", @@ -22978,7 +22978,7 @@ ] ] }, - "properties": { "tzid": "Asia/Tomsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Tomsk" } }, { "type": "Feature", @@ -23120,7 +23120,7 @@ ] ] }, - "properties": { "tzid": "Asia/Ulaanbaatar" } + "properties": { "prop" : "tz" , "tzid": "Asia/Ulaanbaatar" } }, { "type": "Feature", @@ -23330,7 +23330,7 @@ ] ] }, - "properties": { "tzid": "Asia/Urumqi" } + "properties": { "prop" : "tz" , "tzid": "Asia/Urumqi" } }, { "type": "Feature", @@ -23459,7 +23459,7 @@ ] ] }, - "properties": { "tzid": "Asia/Ust-Nera" } + "properties": { "prop" : "tz" , "tzid": "Asia/Ust-Nera" } }, { "type": "Feature", @@ -23569,7 +23569,7 @@ ] ] }, - "properties": { "tzid": "Asia/Vientiane" } + "properties": { "prop" : "tz" , "tzid": "Asia/Vientiane" } }, { "type": "Feature", @@ -24113,7 +24113,7 @@ ] ] }, - "properties": { "tzid": "Asia/Vladivostok" } + "properties": { "prop" : "tz" , "tzid": "Asia/Vladivostok" } }, { "type": "Feature", @@ -24492,7 +24492,7 @@ ] ] }, - "properties": { "tzid": "Asia/Yakutsk" } + "properties": { "prop" : "tz" , "tzid": "Asia/Yakutsk" } }, { "type": "Feature", @@ -24673,7 +24673,7 @@ ] ] }, - "properties": { "tzid": "Asia/Yangon" } + "properties": { "prop" : "tz" , "tzid": "Asia/Yangon" } }, { "type": "Feature", @@ -25031,7 +25031,7 @@ ] ] }, - "properties": { "tzid": "Asia/Yekaterinburg" } + "properties": { "prop" : "tz" , "tzid": "Asia/Yekaterinburg" } }, { "type": "Feature", @@ -25072,7 +25072,7 @@ ] ] }, - "properties": { "tzid": "Asia/Yerevan" } + "properties": { "prop" : "tz" , "tzid": "Asia/Yerevan" } }, { "type": "Feature", @@ -25133,7 +25133,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Azores" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Azores" } }, { "type": "Feature", @@ -25152,7 +25152,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Bermuda" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Bermuda" } }, { "type": "Feature", @@ -25237,7 +25237,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Canary" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Canary" } }, { "type": "Feature", @@ -25269,7 +25269,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Cape_Verde" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Cape_Verde" } }, { "type": "Feature", @@ -25291,7 +25291,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Faroe" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Faroe" } }, { "type": "Feature", @@ -25330,7 +25330,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Madeira" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Madeira" } }, { "type": "Feature", @@ -25397,7 +25397,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Reykjavik" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Reykjavik" } }, { "type": "Feature", @@ -25535,7 +25535,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/South_Georgia" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/South_Georgia" } }, { "type": "Feature", @@ -25593,7 +25593,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/St_Helena" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/St_Helena" } }, { "type": "Feature", @@ -25638,7 +25638,7 @@ ] ] }, - "properties": { "tzid": "Atlantic/Stanley" } + "properties": { "prop" : "tz" , "tzid": "Atlantic/Stanley" } }, { "type": "Feature", @@ -25699,7 +25699,7 @@ ] ] }, - "properties": { "tzid": "Australia/Adelaide" } + "properties": { "prop" : "tz" , "tzid": "Australia/Adelaide" } }, { "type": "Feature", @@ -25890,7 +25890,7 @@ ] ] }, - "properties": { "tzid": "Australia/Brisbane" } + "properties": { "prop" : "tz" , "tzid": "Australia/Brisbane" } }, { "type": "Feature", @@ -25908,7 +25908,7 @@ ] ] }, - "properties": { "tzid": "Australia/Broken_Hill" } + "properties": { "prop" : "tz" , "tzid": "Australia/Broken_Hill" } }, { "type": "Feature", @@ -25929,7 +25929,7 @@ ] ] }, - "properties": { "tzid": "Australia/Currie" } + "properties": { "prop" : "tz" , "tzid": "Australia/Currie" } }, { "type": "Feature", @@ -25995,7 +25995,7 @@ ] ] }, - "properties": { "tzid": "Australia/Darwin" } + "properties": { "prop" : "tz" , "tzid": "Australia/Darwin" } }, { "type": "Feature", @@ -26020,7 +26020,7 @@ ] ] }, - "properties": { "tzid": "Australia/Eucla" } + "properties": { "prop" : "tz" , "tzid": "Australia/Eucla" } }, { "type": "Feature", @@ -26091,7 +26091,7 @@ ] ] }, - "properties": { "tzid": "Australia/Hobart" } + "properties": { "prop" : "tz" , "tzid": "Australia/Hobart" } }, { "type": "Feature", @@ -26109,7 +26109,7 @@ ] ] }, - "properties": { "tzid": "Australia/Lindeman" } + "properties": { "prop" : "tz" , "tzid": "Australia/Lindeman" } }, { "type": "Feature", @@ -26129,7 +26129,7 @@ ] ] }, - "properties": { "tzid": "Australia/Lord_Howe" } + "properties": { "prop" : "tz" , "tzid": "Australia/Lord_Howe" } }, { "type": "Feature", @@ -26198,7 +26198,7 @@ ] ] }, - "properties": { "tzid": "Australia/Melbourne" } + "properties": { "prop" : "tz" , "tzid": "Australia/Melbourne" } }, { "type": "Feature", @@ -26361,7 +26361,7 @@ ] ] }, - "properties": { "tzid": "Australia/Perth" } + "properties": { "prop" : "tz" , "tzid": "Australia/Perth" } }, { "type": "Feature", @@ -26447,7 +26447,7 @@ ] ] }, - "properties": { "tzid": "Australia/Sydney" } + "properties": { "prop" : "tz" , "tzid": "Australia/Sydney" } }, { "type": "Feature", @@ -26463,7 +26463,7 @@ ] ] }, - "properties": { "tzid": "Etc/UTC" } + "properties": { "prop" : "tz" , "tzid": "Etc/UTC" } }, { "type": "Feature", @@ -26510,7 +26510,7 @@ ] ] }, - "properties": { "tzid": "Europe/Amsterdam" } + "properties": { "prop" : "tz" , "tzid": "Europe/Amsterdam" } }, { "type": "Feature", @@ -26525,7 +26525,7 @@ ] ] }, - "properties": { "tzid": "Europe/Andorra" } + "properties": { "prop" : "tz" , "tzid": "Europe/Andorra" } }, { "type": "Feature", @@ -26579,7 +26579,7 @@ ] ] }, - "properties": { "tzid": "Europe/Astrakhan" } + "properties": { "prop" : "tz" , "tzid": "Europe/Astrakhan" } }, { "type": "Feature", @@ -26715,7 +26715,7 @@ ] ] }, - "properties": { "tzid": "Europe/Athens" } + "properties": { "prop" : "tz" , "tzid": "Europe/Athens" } }, { "type": "Feature", @@ -26782,7 +26782,7 @@ ] ] }, - "properties": { "tzid": "Europe/Belgrade" } + "properties": { "prop" : "tz" , "tzid": "Europe/Belgrade" } }, { "type": "Feature", @@ -26910,7 +26910,7 @@ ] ] }, - "properties": { "tzid": "Europe/Berlin" } + "properties": { "prop" : "tz" , "tzid": "Europe/Berlin" } }, { "type": "Feature", @@ -26961,7 +26961,7 @@ ] ] }, - "properties": { "tzid": "Europe/Bratislava" } + "properties": { "prop" : "tz" , "tzid": "Europe/Bratislava" } }, { "type": "Feature", @@ -27006,7 +27006,7 @@ ] ] }, - "properties": { "tzid": "Europe/Brussels" } + "properties": { "prop" : "tz" , "tzid": "Europe/Brussels" } }, { "type": "Feature", @@ -27087,7 +27087,7 @@ ] ] }, - "properties": { "tzid": "Europe/Bucharest" } + "properties": { "prop" : "tz" , "tzid": "Europe/Bucharest" } }, { "type": "Feature", @@ -27148,7 +27148,7 @@ ] ] }, - "properties": { "tzid": "Europe/Budapest" } + "properties": { "prop" : "tz" , "tzid": "Europe/Budapest" } }, { "type": "Feature", @@ -27163,7 +27163,7 @@ ] ] }, - "properties": { "tzid": "Europe/Busingen" } + "properties": { "prop" : "tz" , "tzid": "Europe/Busingen" } }, { "type": "Feature", @@ -27206,7 +27206,7 @@ ] ] }, - "properties": { "tzid": "Europe/Chisinau" } + "properties": { "prop" : "tz" , "tzid": "Europe/Chisinau" } }, { "type": "Feature", @@ -27279,7 +27279,7 @@ ] ] }, - "properties": { "tzid": "Europe/Copenhagen" } + "properties": { "prop" : "tz" , "tzid": "Europe/Copenhagen" } }, { "type": "Feature", @@ -27345,7 +27345,7 @@ ] ] }, - "properties": { "tzid": "Europe/Dublin" } + "properties": { "prop" : "tz" , "tzid": "Europe/Dublin" } }, { "type": "Feature", @@ -27361,7 +27361,7 @@ ] ] }, - "properties": { "tzid": "Europe/Gibraltar" } + "properties": { "prop" : "tz" , "tzid": "Europe/Gibraltar" } }, { "type": "Feature", @@ -27380,7 +27380,7 @@ ] ] }, - "properties": { "tzid": "Europe/Guernsey" } + "properties": { "prop" : "tz" , "tzid": "Europe/Guernsey" } }, { "type": "Feature", @@ -27507,7 +27507,7 @@ ] ] }, - "properties": { "tzid": "Europe/Helsinki" } + "properties": { "prop" : "tz" , "tzid": "Europe/Helsinki" } }, { "type": "Feature", @@ -27528,7 +27528,7 @@ ] ] }, - "properties": { "tzid": "Europe/Isle_of_Man" } + "properties": { "prop" : "tz" , "tzid": "Europe/Isle_of_Man" } }, { "type": "Feature", @@ -27690,7 +27690,7 @@ ] ] }, - "properties": { "tzid": "Europe/Istanbul" } + "properties": { "prop" : "tz" , "tzid": "Europe/Istanbul" } }, { "type": "Feature", @@ -27707,7 +27707,7 @@ ] ] }, - "properties": { "tzid": "Europe/Jersey" } + "properties": { "prop" : "tz" , "tzid": "Europe/Jersey" } }, { "type": "Feature", @@ -27734,7 +27734,7 @@ ] ] }, - "properties": { "tzid": "Europe/Kaliningrad" } + "properties": { "prop" : "tz" , "tzid": "Europe/Kaliningrad" } }, { "type": "Feature", @@ -27909,7 +27909,7 @@ ] ] }, - "properties": { "tzid": "Europe/Kiev" } + "properties": { "prop" : "tz" , "tzid": "Europe/Kiev" } }, { "type": "Feature", @@ -28009,7 +28009,7 @@ ] ] }, - "properties": { "tzid": "Europe/Kirov" } + "properties": { "prop" : "tz" , "tzid": "Europe/Kirov" } }, { "type": "Feature", @@ -28064,7 +28064,7 @@ ] ] }, - "properties": { "tzid": "Europe/Lisbon" } + "properties": { "prop" : "tz" , "tzid": "Europe/Lisbon" } }, { "type": "Feature", @@ -28103,7 +28103,7 @@ ] ] }, - "properties": { "tzid": "Europe/Ljubljana" } + "properties": { "prop" : "tz" , "tzid": "Europe/Ljubljana" } }, { "type": "Feature", @@ -28314,7 +28314,7 @@ ] ] }, - "properties": { "tzid": "Europe/London" } + "properties": { "prop" : "tz" , "tzid": "Europe/London" } }, { "type": "Feature", @@ -28338,7 +28338,7 @@ ] ] }, - "properties": { "tzid": "Europe/Luxembourg" } + "properties": { "prop" : "tz" , "tzid": "Europe/Luxembourg" } }, { "type": "Feature", @@ -28512,7 +28512,7 @@ ] ] }, - "properties": { "tzid": "Europe/Madrid" } + "properties": { "prop" : "tz" , "tzid": "Europe/Madrid" } }, { "type": "Feature", @@ -28533,7 +28533,7 @@ ] ] }, - "properties": { "tzid": "Europe/Malta" } + "properties": { "prop" : "tz" , "tzid": "Europe/Malta" } }, { "type": "Feature", @@ -28560,7 +28560,7 @@ ] ] }, - "properties": { "tzid": "Europe/Mariehamn" } + "properties": { "prop" : "tz" , "tzid": "Europe/Mariehamn" } }, { "type": "Feature", @@ -28653,7 +28653,7 @@ ] ] }, - "properties": { "tzid": "Europe/Minsk" } + "properties": { "prop" : "tz" , "tzid": "Europe/Minsk" } }, { "type": "Feature", @@ -28669,7 +28669,7 @@ ] ] }, - "properties": { "tzid": "Europe/Monaco" } + "properties": { "prop" : "tz" , "tzid": "Europe/Monaco" } }, { "type": "Feature", @@ -29353,7 +29353,7 @@ ] ] }, - "properties": { "tzid": "Europe/Moscow" } + "properties": { "prop" : "tz" , "tzid": "Europe/Moscow" } }, { "type": "Feature", @@ -29517,7 +29517,7 @@ ] ] }, - "properties": { "tzid": "Europe/Oslo" } + "properties": { "prop" : "tz" , "tzid": "Europe/Oslo" } }, { "type": "Feature", @@ -29686,7 +29686,7 @@ ] ] }, - "properties": { "tzid": "Europe/Paris" } + "properties": { "prop" : "tz" , "tzid": "Europe/Paris" } }, { "type": "Feature", @@ -29718,7 +29718,7 @@ ] ] }, - "properties": { "tzid": "Europe/Podgorica" } + "properties": { "prop" : "tz" , "tzid": "Europe/Podgorica" } }, { "type": "Feature", @@ -29775,7 +29775,7 @@ ] ] }, - "properties": { "tzid": "Europe/Prague" } + "properties": { "prop" : "tz" , "tzid": "Europe/Prague" } }, { "type": "Feature", @@ -29834,7 +29834,7 @@ ] ] }, - "properties": { "tzid": "Europe/Riga" } + "properties": { "prop" : "tz" , "tzid": "Europe/Riga" } }, { "type": "Feature", @@ -30043,7 +30043,7 @@ ] ] }, - "properties": { "tzid": "Europe/Rome" } + "properties": { "prop" : "tz" , "tzid": "Europe/Rome" } }, { "type": "Feature", @@ -30146,7 +30146,7 @@ ] ] }, - "properties": { "tzid": "Europe/Samara" } + "properties": { "prop" : "tz" , "tzid": "Europe/Samara" } }, { "type": "Feature", @@ -30161,7 +30161,7 @@ ] ] }, - "properties": { "tzid": "Europe/San_Marino" } + "properties": { "prop" : "tz" , "tzid": "Europe/San_Marino" } }, { "type": "Feature", @@ -30202,7 +30202,7 @@ ] ] }, - "properties": { "tzid": "Europe/Sarajevo" } + "properties": { "prop" : "tz" , "tzid": "Europe/Sarajevo" } }, { "type": "Feature", @@ -30277,7 +30277,7 @@ ] ] }, - "properties": { "tzid": "Europe/Saratov" } + "properties": { "prop" : "tz" , "tzid": "Europe/Saratov" } }, { "type": "Feature", @@ -30318,7 +30318,7 @@ ] ] }, - "properties": { "tzid": "Europe/Simferopol" } + "properties": { "prop" : "tz" , "tzid": "Europe/Simferopol" } }, { "type": "Feature", @@ -30348,7 +30348,7 @@ ] ] }, - "properties": { "tzid": "Europe/Skopje" } + "properties": { "prop" : "tz" , "tzid": "Europe/Skopje" } }, { "type": "Feature", @@ -30414,7 +30414,7 @@ ] ] }, - "properties": { "tzid": "Europe/Sofia" } + "properties": { "prop" : "tz" , "tzid": "Europe/Sofia" } }, { "type": "Feature", @@ -30583,7 +30583,7 @@ ] ] }, - "properties": { "tzid": "Europe/Stockholm" } + "properties": { "prop" : "tz" , "tzid": "Europe/Stockholm" } }, { "type": "Feature", @@ -30634,7 +30634,7 @@ ] ] }, - "properties": { "tzid": "Europe/Tallinn" } + "properties": { "prop" : "tz" , "tzid": "Europe/Tallinn" } }, { "type": "Feature", @@ -30668,7 +30668,7 @@ ] ] }, - "properties": { "tzid": "Europe/Tirane" } + "properties": { "prop" : "tz" , "tzid": "Europe/Tirane" } }, { "type": "Feature", @@ -30717,7 +30717,7 @@ ] ] }, - "properties": { "tzid": "Europe/Ulyanovsk" } + "properties": { "prop" : "tz" , "tzid": "Europe/Ulyanovsk" } }, { "type": "Feature", @@ -30746,7 +30746,7 @@ ] ] }, - "properties": { "tzid": "Europe/Uzhgorod" } + "properties": { "prop" : "tz" , "tzid": "Europe/Uzhgorod" } }, { "type": "Feature", @@ -30761,7 +30761,7 @@ ] ] }, - "properties": { "tzid": "Europe/Vaduz" } + "properties": { "prop" : "tz" , "tzid": "Europe/Vaduz" } }, { "type": "Feature", @@ -30776,7 +30776,7 @@ ] ] }, - "properties": { "tzid": "Europe/Vatican" } + "properties": { "prop" : "tz" , "tzid": "Europe/Vatican" } }, { "type": "Feature", @@ -30842,7 +30842,7 @@ ] ] }, - "properties": { "tzid": "Europe/Vienna" } + "properties": { "prop" : "tz" , "tzid": "Europe/Vienna" } }, { "type": "Feature", @@ -30894,7 +30894,7 @@ ] ] }, - "properties": { "tzid": "Europe/Vilnius" } + "properties": { "prop" : "tz" , "tzid": "Europe/Vilnius" } }, { "type": "Feature", @@ -30969,7 +30969,7 @@ ] ] }, - "properties": { "tzid": "Europe/Volgograd" } + "properties": { "prop" : "tz" , "tzid": "Europe/Volgograd" } }, { "type": "Feature", @@ -31054,7 +31054,7 @@ ] ] }, - "properties": { "tzid": "Europe/Warsaw" } + "properties": { "prop" : "tz" , "tzid": "Europe/Warsaw" } }, { "type": "Feature", @@ -31142,7 +31142,7 @@ ] ] }, - "properties": { "tzid": "Europe/Zagreb" } + "properties": { "prop" : "tz" , "tzid": "Europe/Zagreb" } }, { "type": "Feature", @@ -31182,7 +31182,7 @@ ] ] }, - "properties": { "tzid": "Europe/Zaporozhye" } + "properties": { "prop" : "tz" , "tzid": "Europe/Zaporozhye" } }, { "type": "Feature", @@ -31240,7 +31240,7 @@ ] ] }, - "properties": { "tzid": "Europe/Zurich" } + "properties": { "prop" : "tz" , "tzid": "Europe/Zurich" } }, { "type": "Feature", @@ -31304,7 +31304,7 @@ ] ] }, - "properties": { "tzid": "Indian/Antananarivo" } + "properties": { "prop" : "tz" , "tzid": "Indian/Antananarivo" } }, { "type": "Feature", @@ -31354,7 +31354,7 @@ ] ] }, - "properties": { "tzid": "Indian/Chagos" } + "properties": { "prop" : "tz" , "tzid": "Indian/Chagos" } }, { "type": "Feature", @@ -31372,7 +31372,7 @@ ] ] }, - "properties": { "tzid": "Indian/Christmas" } + "properties": { "prop" : "tz" , "tzid": "Indian/Christmas" } }, { "type": "Feature", @@ -31392,7 +31392,7 @@ ] ] }, - "properties": { "tzid": "Indian/Cocos" } + "properties": { "prop" : "tz" , "tzid": "Indian/Cocos" } }, { "type": "Feature", @@ -31425,7 +31425,7 @@ ] ] }, - "properties": { "tzid": "Indian/Comoro" } + "properties": { "prop" : "tz" , "tzid": "Indian/Comoro" } }, { "type": "Feature", @@ -31532,7 +31532,7 @@ ] ] }, - "properties": { "tzid": "Indian/Kerguelen" } + "properties": { "prop" : "tz" , "tzid": "Indian/Kerguelen" } }, { "type": "Feature", @@ -31667,7 +31667,7 @@ ] ] }, - "properties": { "tzid": "Indian/Mahe" } + "properties": { "prop" : "tz" , "tzid": "Indian/Mahe" } }, { "type": "Feature", @@ -31699,7 +31699,7 @@ ] ] }, - "properties": { "tzid": "Indian/Maldives" } + "properties": { "prop" : "tz" , "tzid": "Indian/Maldives" } }, { "type": "Feature", @@ -31760,7 +31760,7 @@ ] ] }, - "properties": { "tzid": "Indian/Mauritius" } + "properties": { "prop" : "tz" , "tzid": "Indian/Mauritius" } }, { "type": "Feature", @@ -31781,7 +31781,7 @@ ] ] }, - "properties": { "tzid": "Indian/Mayotte" } + "properties": { "prop" : "tz" , "tzid": "Indian/Mayotte" } }, { "type": "Feature", @@ -31804,7 +31804,7 @@ ] ] }, - "properties": { "tzid": "Indian/Reunion" } + "properties": { "prop" : "tz" , "tzid": "Indian/Reunion" } }, { "type": "Feature", @@ -31832,7 +31832,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Apia" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Apia" } }, { "type": "Feature", @@ -32098,7 +32098,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Auckland" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Auckland" } }, { "type": "Feature", @@ -32155,7 +32155,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Bougainville" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Bougainville" } }, { "type": "Feature", @@ -32183,7 +32183,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Chatham" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Chatham" } }, { "type": "Feature", @@ -32450,7 +32450,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Chuuk" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Chuuk" } }, { "type": "Feature", @@ -32469,7 +32469,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Easter" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Easter" } }, { "type": "Feature", @@ -32504,7 +32504,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Efate" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Efate" } }, { "type": "Feature", @@ -32595,7 +32595,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Enderbury" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Enderbury" } }, { "type": "Feature", @@ -32640,7 +32640,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Fakaofo" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Fakaofo" } }, { "type": "Feature", @@ -32708,7 +32708,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Fiji" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Fiji" } }, { "type": "Feature", @@ -32801,7 +32801,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Funafuti" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Funafuti" } }, { "type": "Feature", @@ -32828,7 +32828,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Galapagos" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Galapagos" } }, { "type": "Feature", @@ -32887,7 +32887,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Gambier" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Gambier" } }, { "type": "Feature", @@ -33033,7 +33033,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Guadalcanal" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Guadalcanal" } }, { "type": "Feature", @@ -33052,7 +33052,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Guam" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Guam" } }, { "type": "Feature", @@ -33218,7 +33218,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Honolulu" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Honolulu" } }, { "type": "Feature", @@ -33306,7 +33306,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Kiritimati" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Kiritimati" } }, { "type": "Feature", @@ -33324,7 +33324,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Kosrae" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Kosrae" } }, { "type": "Feature", @@ -33350,7 +33350,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Kwajalein" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Kwajalein" } }, { "type": "Feature", @@ -33652,7 +33652,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Majuro" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Majuro" } }, { "type": "Feature", @@ -33721,7 +33721,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Marquesas" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Marquesas" } }, { "type": "Feature", @@ -33749,7 +33749,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Midway" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Midway" } }, { "type": "Feature", @@ -33767,7 +33767,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Nauru" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Nauru" } }, { "type": "Feature", @@ -33786,7 +33786,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Niue" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Niue" } }, { "type": "Feature", @@ -33804,7 +33804,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Norfolk" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Norfolk" } }, { "type": "Feature", @@ -33954,7 +33954,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Noumea" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Noumea" } }, { "type": "Feature", @@ -33997,7 +33997,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Pago_Pago" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Pago_Pago" } }, { "type": "Feature", @@ -34013,7 +34013,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Palau" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Palau" } }, { "type": "Feature", @@ -34029,7 +34029,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Pitcairn" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Pitcairn" } }, { "type": "Feature", @@ -34130,7 +34130,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Pohnpei" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Pohnpei" } }, { "type": "Feature", @@ -34246,7 +34246,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Port_Moresby" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Port_Moresby" } }, { "type": "Feature", @@ -34397,7 +34397,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Rarotonga" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Rarotonga" } }, { "type": "Feature", @@ -34513,7 +34513,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Saipan" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Saipan" } }, { "type": "Feature", @@ -35160,7 +35160,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Tahiti" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Tahiti" } }, { "type": "Feature", @@ -35295,7 +35295,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Tarawa" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Tarawa" } }, { "type": "Feature", @@ -35427,7 +35427,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Tongatapu" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Tongatapu" } }, { "type": "Feature", @@ -35445,7 +35445,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Wake" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Wake" } }, { "type": "Feature", @@ -35477,7 +35477,7 @@ ] ] }, - "properties": { "tzid": "Pacific/Wallis" } + "properties": { "prop" : "tz" , "tzid": "Pacific/Wallis" } }, { "type": "Feature", @@ -36405,7 +36405,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-11" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-11" } }, { "type": "Feature", @@ -36844,7 +36844,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-12" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-12" } }, { "type": "Feature", @@ -37826,7 +37826,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-10" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-10" } }, { "type": "Feature", @@ -38705,7 +38705,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-9" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-9" } }, { "type": "Feature", @@ -39218,7 +39218,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-8" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-8" } }, { "type": "Feature", @@ -39529,7 +39529,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-7" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-7" } }, { "type": "Feature", @@ -39820,7 +39820,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-6" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-6" } }, { "type": "Feature", @@ -40205,7 +40205,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-5" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-5" } }, { "type": "Feature", @@ -40704,7 +40704,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-4" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-4" } }, { "type": "Feature", @@ -41374,7 +41374,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-3" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-3" } }, { "type": "Feature", @@ -41890,7 +41890,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-2" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-2" } }, { "type": "Feature", @@ -42635,7 +42635,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT-1" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT-1" } }, { "type": "Feature", @@ -43142,7 +43142,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT" } }, { "type": "Feature", @@ -43591,7 +43591,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+1" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+1" } }, { "type": "Feature", @@ -43843,7 +43843,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+2" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+2" } }, { "type": "Feature", @@ -44019,7 +44019,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+3" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+3" } }, { "type": "Feature", @@ -44598,7 +44598,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+4" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+4" } }, { "type": "Feature", @@ -45346,7 +45346,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+5" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+5" } }, { "type": "Feature", @@ -45757,7 +45757,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+6" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+6" } }, { "type": "Feature", @@ -45959,7 +45959,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+7" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+7" } }, { "type": "Feature", @@ -46163,7 +46163,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+8" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+8" } }, { "type": "Feature", @@ -46618,7 +46618,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+9" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+9" } }, { "type": "Feature", @@ -47179,7 +47179,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+10" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+10" } }, { "type": "Feature", @@ -47868,7 +47868,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+11" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+11" } }, { "type": "Feature", @@ -48237,7 +48237,7 @@ ] ] }, - "properties": { "tzid": "Etc/GMT+12" } + "properties": { "prop" : "tz" , "tzid": "Etc/GMT+12" } } ] } diff --git a/package.nw/data/dxcc.json b/package.nw/data/dxcc.json index 1310edc..f51324d 100644 --- a/package.nw/data/dxcc.json +++ b/package.nw/data/dxcc.json @@ -19039,7 +19039,7 @@ "type":"Feature", "properties":{ "dxcc_prefix":"Z3", - "dxcc_name":"Macedonia", + "dxcc_name":"N. Macedonia", "dxcc_entity_code":502, "center":[ 21.667428745618047, diff --git a/package.nw/data/flags.json b/package.nw/data/flags.json index a01eba3..d1541a5 100644 --- a/package.nw/data/flags.json +++ b/package.nw/data/flags.json @@ -374,7 +374,7 @@ "497": ["Croatia", "HR", "hr.png"], "499": ["Slovenia", "SI", "si.png"], "501": ["Bosnia and Herzegovina", "BA", "ba.png"], - "502": ["Macedonia", "MK", "mk.png"], + "502": ["N. Macedonia", "MK", "mk.png"], "503": ["Czech Republic", "CZ", "cz.png"], "504": ["Slovak Republic", "SK", "sk.png"], "505": ["Pratas Island", "TW", "tw.png"], diff --git a/package.nw/data/mh-root-prefixed.json b/package.nw/data/mh-root-prefixed.json index 382dcb9..f68b2dc 100644 --- a/package.nw/data/mh-root-prefixed.json +++ b/package.nw/data/mh-root-prefixed.json @@ -1441,6 +1441,7 @@ "VE2GT/150", "VE2HAY/P", "VE2HRI", + "VE2IDX", "VE2III", "VE2IM", "VE2KK", @@ -1514,7 +1515,7 @@ "VE9TEN/5", "VE9XX/6", "VE9ZP/4", - "VER20231007", + "VER20231103", "VF0X", "VF0X/M", "VO/DL2GF", @@ -1878,6 +1879,7 @@ "VE2GHZ/2": "04", "VE2GT/150": "04", "VE2HRI": "04", + "VE2IDX": "04", "VE2III": "04", "VE2IM": "04", "VE2NN": "04", @@ -2036,6 +2038,7 @@ "VE2GHZ/2": "02", "VE2GT/150": "02", "VE2HRI": "02", + "VE2IDX": "02", "VE2III": "02", "VE2IM": "02", "VE2NN": "02", @@ -3039,6 +3042,7 @@ "KI7DUW", "KI7HOC", "KI7PZ", + "KI7SUU", "KI7SWI", "KI8JT", "KJ4IAQ", @@ -3054,6 +3058,7 @@ "KJ6NPJ", "KJ6RFQ", "KJ6ZSX", + "KJ7AXV", "KJ7FOI", "KJ7IR", "KJ7IXG", @@ -3111,6 +3116,7 @@ "KN6FPM", "KN6JOY", "KN6LTY", + "KN6OEF", "KN8IVE", "KO4DHN", "KO4PTO", @@ -3238,6 +3244,7 @@ "W4RSB", "W5ERV", "W5JKT", + "W5MSC", "W5SPY", "W6DDP", "W6GTE", @@ -3274,6 +3281,7 @@ "WA6GFS", "WA7B", "WA7MDS", + "WA7MOS", "WA7PXH", "WA7USX", "WA7YXF", @@ -6874,6 +6882,7 @@ "DP0GVN/P", "DP1POL", "DP1POL/P", + "EM1/UW5EHR", "EM1HO", "EM1KCC", "EM1KGG", @@ -7202,6 +7211,7 @@ "RI1ANV": "70", "RI30ANT": "70", "SM/OH2FFP": "67", + "EM1/UW5EHR": "73", "EM1HO": "73", "EM1KCC": "73", "EM1KGG": "73", @@ -11122,6 +11132,7 @@ "RF1A/9", "RF3A/0", "RF8O", + "RF9C/P", "RF9T", "RF9W", "RG0A", @@ -12200,7 +12211,6 @@ "UA3WB/9", "UA3YH/0", "UA3ZAF/9", - "UA4FMQ/P", "UA4LCQ/9", "UA4LU/0", "UA4LU/9/P", @@ -15204,7 +15214,6 @@ "R2BDY/9": "31", "R2DA/9": "31", "R9/UN0C": "31", - "R9HAF/M": "31", "R9MJ/9": "31", "RA0LH/9": "31", "RA9H": "31", @@ -15319,7 +15328,7 @@ "RP78KIW": "20", "RP78SF": "20", "RQ0C/8": "20", - "RT9J": "20", + "RT9J": "21", "RU6YD/9": "20", "RV6YM/9": "20", "RW4HOH/9": "20", @@ -15515,6 +15524,7 @@ "R400N": "31", "R70B": "31", "R9/EW1TM": "31", + "R9HAF/M": "31", "R9UAG/N": "31", "RA30KR": "31", "RA4CQ/9": "31", @@ -16337,7 +16347,6 @@ "R2BDY/9": "18", "R2DA/9": "18", "R9/UN0C": "18", - "R9HAF/M": "18", "R9MJ/9": "18", "RA0LH/9": "18", "RA9H": "18", @@ -16576,6 +16585,7 @@ "R400N": "18", "R70B": "18", "R9/EW1TM": "18", + "R9HAF/M": "18", "R9UAG/N": "18", "RA30KR": "18", "RA4CQ/9": "18", @@ -19395,7 +19405,8 @@ "worked_modes": {}, "confirmed_modes": {}, "direct": [ - "ET3AA/YOTA" + "ET3AA/YOTA", + "VERSION" ], "prefixITU": {}, "prefixCQ": {}, @@ -20053,7 +20064,6 @@ "RO4H", "RO4I", "RO4W", - "RO80", "RO8F", "RO8G", "RO8X", @@ -20355,6 +20365,7 @@ "R0XAI/7", "R100AP", "R100FA", + "R100FP", "R100K", "R100KOMI", "R100MTK", @@ -20421,6 +20432,9 @@ "R4IO", "R4IT", "R4PBF/M", + "R4PH", + "R4RB", + "R4RM", "R4WAN/P", "R50VAZ", "R5QA/1", @@ -20528,6 +20542,7 @@ "R900DM", "R900DV", "R900RO", + "R90BAK", "R90BRZ", "R90DNF", "R90DOSAAF", @@ -20603,6 +20618,7 @@ "R9OM/6", "R9PA/4", "R9SAO/1", + "R9UG/3", "R9UT/4", "R9WGM/6/M", "R9WI/4/P", @@ -20783,7 +20799,6 @@ "RD9M/3", "RF1P", "RF8F", - "RF9C/P", "RG0F/5", "RG4H", "RG50P", @@ -20922,6 +20937,9 @@ "RO4W", "RO75RK", "RO80KEDR", + "RO80OW", + "RO80PS", + "RO80RO", "RP61XX", "RP62X", "RP63X", @@ -21042,6 +21060,7 @@ "RT30DX", "RT36MS", "RT4I", + "RT4Q", "RT4W", "RT5G/P/FF", "RT60YG", @@ -21161,6 +21180,7 @@ "RV9LM/3/P", "RV9MD/4", "RV9WB/4", + "RV9WB/6", "RV9WB/M", "RV9WKI/4/M", "RV9WKI/4/P", @@ -21259,6 +21279,7 @@ "RZ4HWF/LH", "RZ4HZW/FF", "RZ4I", + "RZ4PXP", "RZ5D/4", "RZ7G/6/FF", "RZ7G/FF", @@ -21351,6 +21372,7 @@ "UA3YH/ANT", "UA4ASE/FF", "UA4ATL/FF", + "UA4FMQ/P", "UA4H", "UA4HAZ/P", "UA4HBM", @@ -21366,6 +21388,7 @@ "UA4NF/M", "UA4PCM/M", "UA4PN", + "UA4PRU", "UA4Q", "UA4RF", "UA4RW", @@ -21625,6 +21648,7 @@ "UF8F", "UG4I", "UG4I/P", + "UG4P", "UI4H", "UI4I", "UI8F", @@ -22427,6 +22451,7 @@ "RK3DZJ/1/LH": "19", "RM1Z": "19", "RM9WN/1": "19", + "RN2F/1": "19", "RP72MU": "19", "RP73MU": "19", "RP73ZP": "19", @@ -22569,16 +22594,24 @@ "UI4I": "29", "RA4NCC": "30", "UA4NF": "30", + "R4PH": "30", + "R4RB": "30", + "R4RM": "30", "RJ4P": "30", "RK4P": "30", "RK4PK": "30", "RM4P": "30", "RM4R": "30", + "RT4Q": "30", + "RZ4PXP": "30", "UA4PN": "30", + "UA4PRU": "30", "UA4Q": "30", "UA4RF": "30", "UA4RW": "30", + "UG4P": "30", "R0CM/4": "30", + "R100FP": "30", "R100MTK": "30", "R100UD": "30", "R4WAN/P": "30", @@ -22652,7 +22685,6 @@ "RC20FM": "30", "RC9F": "30", "RF8F": "30", - "RF9C/P": "30", "RK3AW/4": "30", "RK9F": "30", "RL9F": "30", @@ -22713,6 +22745,7 @@ "R7BA/9/M": "20", "R8MB/1": "20", "R8MB/1/P": "20", + "R8XF/M": "20", "R9/UR7IMG": "20", "R95KOMI": "20", "R9KD/9": "20", @@ -22819,7 +22852,6 @@ "RC20FM": "17", "RC9F": "17", "RF8F": "17", - "RF9C/P": "17", "RK3AW/4": "17", "RK9F": "17", "RL9F": "17", @@ -22880,6 +22912,7 @@ "R7BA/9/M": "17", "R8MB/1": "17", "R8MB/1/P": "17", + "R8XF/M": "17", "R9/UR7IMG": "17", "R95KOMI": "17", "R9KD/9": "17", @@ -26008,6 +26041,7 @@ "LU3WDT/W", "LU3XAP/H", "LU3XAP/XA", + "LU3XCC/XA", "LU3XEI/X", "LU3XEI/XA", "LU3XEM/X", @@ -26021,6 +26055,7 @@ "LU3YLF/V", "LU3YLF/W", "LU3YLF/Y", + "LU3YZ/Y", "LU4AA/D", "LU4AA/F", "LU4AA/H", @@ -26297,7 +26332,10 @@ "LU5ILA/L", "LU5ILA/Y", "LU5JAH/D", + "LU5JAH/I", "LU5JIB/D", + "LU5JIB/I", + "LU5JSB/I", "LU5KAH/K", "LU5LA/L", "LU5LAE/L", @@ -26861,8 +26899,11 @@ "LU9IAE/I", "LU9IAL/I", "LU9IBJ/I", + "LU9JDZ/I", "LU9JMH/D", "LU9JX/L", + "LU9JZX/I", + "LU9JZY/I", "LU9KMB/K", "LU9LCF/L", "LU9LEC/W", @@ -27061,6 +27102,7 @@ "LW6EFR/D", "LW6EGE/D", "LW6EGE/H", + "LW6EGE/V", "LW6EGF/D", "LW6EHD/D", "LW6ELC/D", @@ -28059,6 +28101,7 @@ "LW3DEJ/V": "16", "LW5EE/V": "16", "LW6EEU/V": "16", + "LW6EGE/V": "16", "LW6EQQ/V": "16", "LW9EAG/V": "16", "LT7W/LGT": "16", @@ -28203,6 +28246,7 @@ "LU2XX/XP": "16", "LU3DVN/X": "16", "LU3DVN/XP": "16", + "LU3XCC/XA": "16", "LU3XEI/X": "16", "LU3XEI/XA": "16", "LU3XEM/X": "16", @@ -28266,6 +28310,7 @@ "LU3XAP/XA": "16", "LU3YEP/Y": "16", "LU3YLF/Y": "16", + "LU3YZ/Y": "16", "LU4AA/Y": "16", "LU4DRC/Y": "16", "LU4EL/Y": "16", @@ -28424,6 +28469,7 @@ "NH0Q", "NH7TL", "NP3EZ", + "W0WDW", "W2HAO", "W5LFA", "W6KV", @@ -30224,7 +30270,6 @@ "K2GT", "K2SHO", "K2SOO", - "K3NW", "K3RW", "K3UNS", "K4AJQ", @@ -30241,6 +30286,7 @@ "K6AMA", "K6APP", "K6ARS", + "K6BDN", "K6BHG", "K6BU", "K6DCA", @@ -30384,6 +30430,7 @@ "KC9KEX", "KC9NJG", "KC9SBG", + "KC9WIB", "KD0JNO", "KD0OLJ", "KD0OXU", @@ -30618,6 +30665,7 @@ "KJ6LAW", "KJ6LAX", "KJ6LBI", + "KJ6LVS", "KJ6MQL", "KJ6MSJ", "KJ6NIA", @@ -30642,6 +30690,7 @@ "KK4QAX", "KK4RNF", "KK6BRW", + "KK6CSE", "KK6DIT", "KK6DWS", "KK6EJ", @@ -30651,6 +30700,7 @@ "KK6PGA", "KK6RM", "KK6VJN", + "KK6YBW", "KK6ZQ", "KK6ZZE", "KK7EDB", @@ -30687,6 +30737,7 @@ "KQ6CD", "KQ6M", "KR1LLR", + "KR3BLK", "KU4OY", "KW4JC", "KW6CR", @@ -30712,6 +30763,7 @@ "N3FUR", "N3GWR", "N3HQW", + "N3QIP", "N3RWD", "N3VDM", "N3ZFY", @@ -30742,6 +30794,7 @@ "N7ODC", "N7WBX", "N7WLR", + "N8KGB", "N8UXC", "N9GFL", "N9PPF", @@ -32159,6 +32212,10 @@ "UN0G", "UN0J", "UN0Q", + "UN1F", + "UN1G", + "UN1J", + "UN1Q", "UN2F", "UN2G", "UN2J", @@ -32341,6 +32398,7 @@ ], "prefixITU": { "UN0F": "31", + "UN1F": "31", "UN2F": "31", "UN3F": "31", "UN4F": "31", @@ -32380,6 +32438,7 @@ "UQ8F": "31", "UQ9F": "31", "UN0G": "31", + "UN1G": "31", "UN2G": "31", "UN3G": "31", "UN4G": "31", @@ -32419,6 +32478,7 @@ "UQ8G": "31", "UQ9G": "31", "UN0J": "31", + "UN1J": "31", "UN2J": "31", "UN3J": "31", "UN4J": "31", @@ -32458,6 +32518,7 @@ "UQ8J": "31", "UQ9J": "31", "UN0Q": "31", + "UN1Q": "31", "UN2Q": "31", "UN3Q": "31", "UN4Q": "31", @@ -36602,6 +36663,7 @@ "KC1IHO", "KC1JLY", "KC1KZI", + "KC1RDY", "KC1TBC", "KC2BZZ", "KC2CJL", @@ -36634,6 +36696,7 @@ "KD2YJI", "KD5DVV", "KD5PKH", + "KD7LEI", "KD9GIZ", "KD9MRY", "KD9PLJ", @@ -42602,6 +42665,7 @@ "GB60CRB", "GB6BEN", "GB6TAA", + "GB6WLS", "GB6WW", "GB70M", "GB75CC", @@ -45793,6 +45857,7 @@ "K3LYE", "K3MLT/AT", "K3NT/B29", + "K3NW", "K3QHP", "K3TW/LH", "K3UOC", @@ -45821,6 +45886,7 @@ "K4XS", "K4XSS", "K4YT/M", + "K4Z", "K4Z/ANT", "K5BGG", "K5D", @@ -46006,6 +46072,7 @@ "KB7RQP", "KB7VUR", "KB7YNO", + "KB7ZEM", "KB8JUT", "KB8NRB", "KB8YYA", @@ -46107,7 +46174,6 @@ "KC9HYY/LUS100", "KC9HYY/MMD", "KC9JDB", - "KC9WIB", "KD0EBY", "KD0ETC/LH", "KD0FDP", @@ -46384,6 +46450,7 @@ "KH2PM", "KH2QE", "KH2QH", + "KH2QJ", "KH2QL", "KH2QY", "KH2R", @@ -47019,6 +47086,7 @@ "KL1LV", "KL1LZ", "KL1MF", + "KL1MJ", "KL1MM", "KL1MW", "KL1NER", @@ -47166,7 +47234,6 @@ "KL2WL", "KL2XF", "KL2XI", - "KL2XQ", "KL2YD", "KL2YH", "KL2YI", @@ -47277,7 +47344,6 @@ "KL4EJ", "KL4FX", "KL4GW", - "KL4GY", "KL4H", "KL4IP", "KL4IY", @@ -47286,6 +47352,7 @@ "KL4JQ", "KL4KA", "KL4KF", + "KL4KW", "KL4LJ", "KL4LS", "KL4LV", @@ -47303,6 +47370,7 @@ "KL4QZ", "KL4RA", "KL4RKH", + "KL4RL", "KL4RY", "KL4T", "KL4TP", @@ -47323,6 +47391,8 @@ "KL5DC", "KL5DY/4", "KL5GK", + "KL5GR", + "KL5GZ", "KL5HZ", "KL5L", "KL5NS", @@ -47534,6 +47604,7 @@ "KL7JCQ", "KL7JDQ", "KL7JDS", + "KL7JDY", "KL7JEA", "KL7JEF", "KL7JES", @@ -47765,6 +47836,7 @@ "KL7VU/6", "KL7WA", "KL7WC", + "KL7WG", "KL7WI", "KL7WM", "KL7WN", @@ -47794,6 +47866,7 @@ "KL7ZT", "KL7ZW", "KL8DX", + "KL8R", "KL8RV", "KL8SU", "KL8X", @@ -47915,6 +47988,7 @@ "KP4DSO", "KP4DX/6", "KP4E", + "KP4EBA", "KP4EC/1", "KP4EDL", "KP4EF", @@ -48043,6 +48117,7 @@ "KP4VQ", "KP4VS", "KP4VW", + "KP4VX", "KP4VZ", "KP4WG", "KP4WK", @@ -48057,6 +48132,7 @@ "KP4XZ", "KP4YH", "KP4YLV", + "KP4YM", "KP4YP", "KP4YY", "KP4ZD", @@ -48344,6 +48420,7 @@ "NH2MS", "NH2MW", "NH2NG", + "NH2OE", "NH2R", "NH2S", "NH2W", @@ -48400,6 +48477,7 @@ "NH6LF", "NH6LM", "NH6LR", + "NH6LW", "NH6MG", "NH6NG", "NH6NS", @@ -48427,6 +48505,7 @@ "NH6WF", "NH6WL", "NH6WL/5", + "NH6WQ", "NH6WR", "NH6XN", "NH6XP", @@ -48563,6 +48642,7 @@ "NL7CQ", "NL7CQ/0", "NL7CU", + "NL7CW", "NL7D", "NL7D/7", "NL7DC", @@ -48940,6 +49020,7 @@ "W1QK/LH", "W1RSC", "W1WWS", + "W2FAT", "W2FF", "W2GSB/APM", "W2GSB/LGT", @@ -49122,6 +49203,7 @@ "WD4LOL", "WD4LYN", "WD4TW", + "WD5CAF", "WD5FNX", "WD5GEW", "WD6AYO", @@ -49409,6 +49491,7 @@ "WH6GEZ", "WH6GFE", "WH6GG", + "WH6GHN", "WH6GHO", "WH6GID", "WH6GJD", @@ -49541,6 +49624,7 @@ "WH7P", "WH7PM", "WH7PV", + "WH7PY", "WH7QC", "WH7R", "WH7RG", @@ -49575,6 +49659,7 @@ "WH7ZP", "WH7ZS", "WH8AAG", + "WH8AAH", "WH8ABA", "WH9AAF", "WH9AAH", @@ -49772,6 +49857,7 @@ "WL7P", "WL7PC", "WL7PJ", + "WL7PO", "WL7QC", "WL7QX", "WL7RA", @@ -49850,6 +49936,7 @@ "WP2N", "WP2P", "WP2Q", + "WP2R", "WP2U", "WP2WP", "WP2XX", @@ -49902,6 +49989,7 @@ "WP3WV", "WP3WZ", "WP3ZA", + "WP3ZI", "WP3ZL", "WP3ZO", "WP3ZV", @@ -51279,6 +51367,7 @@ "KB0ON/CS": "07", "KB0UNL": "07", "KB1GC": "07", + "KB7ZEM": "07", "KC0GFG": "07", "KC0KWS": "07", "KC0RMR/AT": "07", @@ -51444,7 +51533,6 @@ "N9CDQ": "07", "NG7A": "07", "NH2LH": "07", - "NH6CF": "07", "NH6EU": "07", "NH6LR": "07", "NH6ON": "07", @@ -51587,6 +51675,7 @@ "K1WCC/LH": "08", "K2LP/CC": "08", "K2STR": "08", + "K3NW": "08", "KA1AA": "08", "KA1BL": "08", "KA1DX": "08", @@ -51691,6 +51780,7 @@ "NH6ZB": "08", "NH7FU": "08", "NL7AK": "08", + "NL7CW": "08", "NL7FC": "08", "NL7FJ": "08", "NL7FJ/1": "08", @@ -51849,6 +51939,7 @@ "KL2TP": "08", "KL3UA": "08", "KL3ZC": "08", + "KL5GZ": "08", "KL7DL": "08", "KL7GB": "08", "KL7JCQ": "08", @@ -52036,6 +52127,7 @@ "KL2UR": "08", "KL2XF": "08", "KL3PP": "08", + "KL4KW": "08", "KL4QG": "08", "KL7FD": "08", "KL7GLK/3": "08", @@ -52111,6 +52203,7 @@ "W6UZC": "08", "WA3YBT": "08", "WD4LYN": "08", + "WD5CAF": "08", "WH6ADS": "08", "WH6AZN": "08", "WH6CE": "08", @@ -52131,6 +52224,7 @@ "WH6OB": "08", "WH6RN": "08", "WH6SKY": "08", + "WH7DH": "08", "WH7F": "08", "WH7USA": "08", "WK3N/IMD": "08", @@ -52181,7 +52275,6 @@ "AB4KR": "08", "AC0CW": "08", "AC7N": "08", - "AD4MM": "08", "AE4RM": "08", "AG4WR": "08", "AH0AJ": "08", @@ -52240,7 +52333,6 @@ "AL4T/4": "08", "AL4X": "08", "AL5A": "08", - "AL5IN": "08", "AL5O": "08", "AL7AL": "08", "AL7AM": "08", @@ -52295,6 +52387,7 @@ "K4WEM": "08", "K4XS": "08", "K4YT/M": "08", + "K4Z": "08", "K4Z/ANT": "08", "K6CEE": "08", "K6CH": "08", @@ -52347,6 +52440,7 @@ "KD5YBF": "08", "KD6FCT": "08", "KD7SKX": "08", + "KD7VZG": "08", "KE4G": "08", "KE4GAJ": "08", "KE4J": "08", @@ -52641,6 +52735,7 @@ "KP4DDS": "08", "KP4DPQ": "08", "KP4DQS": "08", + "KP4EBA": "08", "KP4EDL": "08", "KP4EF": "08", "KP4EH": "08", @@ -52717,6 +52812,7 @@ "KP4WY": "08", "KP4XP": "08", "KP4YLV": "08", + "KP4YM": "08", "KP4ZF": "08", "KP4ZV": "08", "KP4ZX": "08", @@ -52772,10 +52868,12 @@ "NH2KD": "08", "NH2KW": "08", "NH2NG": "08", + "NH2OE": "08", "NH6AU": "08", "NH6AX": "08", "NH6BD/4": "08", "NH6BS": "08", + "NH6CF": "08", "NH6E": "08", "NH6EI": "08", "NH6GE": "08", @@ -53034,6 +53132,7 @@ "WH7GD": "08", "WH7HX": "08", "WH7NI": "08", + "WH7PY": "08", "WH7XK": "08", "WH7XU": "08", "WH7YL": "08", @@ -53075,6 +53174,7 @@ "WP2L": "08", "WP2MA": "08", "WP2P": "08", + "WP2R": "08", "WP3AY": "08", "WP3BC": "08", "WP3D": "08", @@ -53099,6 +53199,7 @@ "WP3U": "08", "WP3WE": "08", "WP3ZA": "08", + "WP3ZI": "08", "WP3ZL": "08", "WP4AIE": "08", "WP4AIL": "08", @@ -53353,7 +53454,6 @@ "KD5MQY": "07", "KD5MUH": "07", "KD7UAV": "07", - "KD7VZG": "07", "KD8BVD": "07", "KE4GNW": "07", "KE4JFB": "07", @@ -53483,6 +53583,7 @@ "KL4RA": "07", "KL5BF": "07", "KL5GK": "07", + "KL5GR": "07", "KL5HZ": "07", "KL5L": "07", "KL5Z": "07", @@ -53554,6 +53655,7 @@ "KP4JV": "07", "KP4JY": "07", "KP4RX": "07", + "KP4VX": "07", "KP4YP": "07", "KP4YY": "07", "KP4ZG": "07", @@ -53611,6 +53713,7 @@ "NH6VR": "07", "NH6WL": "07", "NH6WL/5": "07", + "NH6WQ": "07", "NH7CU": "07", "NH7FO": "07", "NH7MV": "07", @@ -53766,6 +53869,7 @@ "WL7MQ/5": "07", "WL7OP": "07", "WL7OU": "07", + "WL7PO": "07", "WL7SG": "07", "WL7T/P": "07", "WL7W": "07", @@ -53983,6 +54087,7 @@ "KH2LZ": "06", "KH2OJ": "06", "KH2QE": "06", + "KH2QJ": "06", "KH2QL": "06", "KH2QY": "06", "KH2SR": "06", @@ -54143,6 +54248,7 @@ "KL7SY": "06", "KL7VU": "06", "KL7VU/6": "06", + "KL8R": "06", "KM6BI": "06", "KM6EPQ": "06", "KN4YTA": "06", @@ -54320,6 +54426,7 @@ "WH6FTO": "06", "WH6GBC": "06", "WH6GEZ": "06", + "WH6GHN": "06", "WH6IW": "06", "WH6JO": "06", "WH6LZ": "06", @@ -54342,7 +54449,6 @@ "WH6XI": "06", "WH6XX": "06", "WH7DG": "06", - "WH7DH": "06", "WH7HQ": "06", "WH7IV": "06", "WH7IZ": "06", @@ -54405,6 +54511,7 @@ "AC7A": "06", "AC7H": "06", "AC7LR": "06", + "AD4MM": "06", "AE7AE": "06", "AF7DX": "06", "AH0AB": "06", @@ -54483,6 +54590,7 @@ "AL4Q/7": "06", "AL4R": "06", "AL5B": "06", + "AL5IN": "06", "AL5W": "06", "AL6U": "06", "AL7AA": "06", @@ -54922,7 +55030,6 @@ "KL2TZ": "06", "KL2VK": "06", "KL2WE": "06", - "KL2XQ": "06", "KL2YH": "06", "KL2YO": "06", "KL2YQ": "06", @@ -54955,7 +55062,6 @@ "KL4AO": "06", "KL4BQ": "06", "KL4FX": "06", - "KL4GY": "06", "KL4IP": "06", "KL4KF": "06", "KL4NG": "06", @@ -55048,6 +55154,7 @@ "KL7IZC": "06", "KL7JAV": "06", "KL7JDQ": "06", + "KL7JDY": "06", "KL7JEA": "06", "KL7JES": "06", "KL7JIJ": "06", @@ -55183,6 +55290,7 @@ "KL7VN": "06", "KL7VQ": "06", "KL7WC": "06", + "KL7WG": "06", "KL7WM": "06", "KL7WN": "06", "KL7WP": "06", @@ -55375,6 +55483,7 @@ "NP2CT": "06", "NP2KL": "06", "NP2LK": "06", + "NP2MU": "06", "NP2X/7": "06", "NP3PH": "06", "NP4AI/M": "06", @@ -55386,6 +55495,7 @@ "NY7Z": "06", "VA2GLB/P": "06", "W0REP": "06", + "W2FAT": "06", "W2FF": "06", "W2ONH": "06", "W3FO": "06", @@ -55554,6 +55664,7 @@ "WH7XP": "06", "WH7ZP": "06", "WH8AAG": "06", + "WH8AAH": "06", "WI7C": "06", "WL0L": "06", "WL1M": "06", @@ -55836,7 +55947,6 @@ "KC9HYY/EOI": "08", "KC9HYY/LUS100": "08", "KC9HYY/MMD": "08", - "KC9WIB": "08", "KD9Q/M": "08", "KD9TWW": "08", "KE5DDD": "08", @@ -55923,7 +56033,6 @@ "NP2GM": "08", "NP2I": "08", "NP2L/9": "08", - "NP2MU": "08", "NP2WJ": "08", "NP3QC": "08", "NP4ZI": "08", @@ -56061,6 +56170,7 @@ "KL1DN": "08", "KL1IG": "08", "KL1LV": "08", + "KL1MJ": "08", "KL1SE": "08", "KL1SE/4": "08", "KL1ZA": "08", @@ -56111,6 +56221,7 @@ "NH2E": "08", "NH2MS": "08", "NH6BD": "08", + "NH6LW": "08", "NH6T": "08", "NH6T/4": "08", "NH7FK": "08", @@ -56235,6 +56346,7 @@ "WA2GO": "08" }, "directCQ": { + "KL4RL": "04", "N2NL/MM": "07", "AA0EL": "04", "AA7RX": "04", @@ -56291,6 +56403,7 @@ "KB0ON/CS": "04", "KB0UNL": "04", "KB1GC": "04", + "KB7ZEM": "04", "KC0GFG": "04", "KC0KWS": "04", "KC0RMR/AT": "04", @@ -56456,7 +56569,6 @@ "N9CDQ": "04", "NG7A": "04", "NH2LH": "04", - "NH6CF": "04", "NH6EU": "04", "NH6LR": "04", "NH6ON": "04", @@ -56599,6 +56711,7 @@ "K1WCC/LH": "05", "K2LP/CC": "05", "K2STR": "05", + "K3NW": "05", "KA1AA": "05", "KA1BL": "05", "KA1DX": "05", @@ -56703,6 +56816,7 @@ "NH6ZB": "05", "NH7FU": "05", "NL7AK": "05", + "NL7CW": "05", "NL7FC": "05", "NL7FJ": "05", "NL7FJ/1": "05", @@ -56861,6 +56975,7 @@ "KL2TP": "05", "KL3UA": "05", "KL3ZC": "05", + "KL5GZ": "05", "KL7DL": "05", "KL7GB": "05", "KL7JCQ": "05", @@ -57048,6 +57163,7 @@ "KL2UR": "05", "KL2XF": "05", "KL3PP": "05", + "KL4KW": "05", "KL4QG": "05", "KL7FD": "05", "KL7GLK/3": "05", @@ -57123,6 +57239,7 @@ "W6UZC": "05", "WA3YBT": "05", "WD4LYN": "05", + "WD5CAF": "05", "WH6ADS": "05", "WH6AZN": "05", "WH6CE": "05", @@ -57143,6 +57260,7 @@ "WH6OB": "05", "WH6RN": "05", "WH6SKY": "05", + "WH7DH": "05", "WH7F": "05", "WH7USA": "05", "WK3N/IMD": "05", @@ -57193,7 +57311,6 @@ "AB4KR": "05", "AC0CW": "05", "AC7N": "05", - "AD4MM": "05", "AE4RM": "05", "AG4WR": "05", "AH0AJ": "05", @@ -57252,7 +57369,6 @@ "AL4T/4": "05", "AL4X": "05", "AL5A": "05", - "AL5IN": "05", "AL5O": "05", "AL7AL": "05", "AL7AM": "05", @@ -57307,6 +57423,7 @@ "K4WEM": "05", "K4XS": "05", "K4YT/M": "05", + "K4Z": "05", "K4Z/ANT": "05", "K6CEE": "05", "K6CH": "05", @@ -57359,6 +57476,7 @@ "KD5YBF": "05", "KD6FCT": "05", "KD7SKX": "05", + "KD7VZG": "05", "KE4G": "05", "KE4GAJ": "05", "KE4J": "05", @@ -57653,6 +57771,7 @@ "KP4DDS": "05", "KP4DPQ": "05", "KP4DQS": "05", + "KP4EBA": "05", "KP4EDL": "05", "KP4EF": "05", "KP4EH": "05", @@ -57729,6 +57848,7 @@ "KP4WY": "05", "KP4XP": "05", "KP4YLV": "05", + "KP4YM": "05", "KP4ZF": "05", "KP4ZV": "05", "KP4ZX": "05", @@ -57784,10 +57904,12 @@ "NH2KD": "05", "NH2KW": "05", "NH2NG": "05", + "NH2OE": "05", "NH6AU": "05", "NH6AX": "05", "NH6BD/4": "05", "NH6BS": "05", + "NH6CF": "05", "NH6E": "05", "NH6EI": "05", "NH6GE": "05", @@ -58046,6 +58168,7 @@ "WH7GD": "05", "WH7HX": "05", "WH7NI": "05", + "WH7PY": "05", "WH7XK": "05", "WH7XU": "05", "WH7YL": "05", @@ -58087,6 +58210,7 @@ "WP2L": "05", "WP2MA": "05", "WP2P": "05", + "WP2R": "05", "WP3AY": "05", "WP3BC": "05", "WP3D": "05", @@ -58111,6 +58235,7 @@ "WP3U": "05", "WP3WE": "05", "WP3ZA": "05", + "WP3ZI": "05", "WP3ZL": "05", "WP4AIE": "05", "WP4AIL": "05", @@ -58365,7 +58490,6 @@ "KD5MQY": "04", "KD5MUH": "04", "KD7UAV": "04", - "KD7VZG": "04", "KD8BVD": "04", "KE4GNW": "04", "KE4JFB": "04", @@ -58495,6 +58619,7 @@ "KL4RA": "04", "KL5BF": "04", "KL5GK": "04", + "KL5GR": "04", "KL5HZ": "04", "KL5L": "04", "KL5Z": "04", @@ -58566,6 +58691,7 @@ "KP4JV": "04", "KP4JY": "04", "KP4RX": "04", + "KP4VX": "04", "KP4YP": "04", "KP4YY": "04", "KP4ZG": "04", @@ -58623,6 +58749,7 @@ "NH6VR": "04", "NH6WL": "04", "NH6WL/5": "04", + "NH6WQ": "04", "NH7CU": "04", "NH7FO": "04", "NH7MV": "04", @@ -58778,6 +58905,7 @@ "WL7MQ/5": "04", "WL7OP": "04", "WL7OU": "04", + "WL7PO": "04", "WL7SG": "04", "WL7T/P": "04", "WL7W": "04", @@ -58995,6 +59123,7 @@ "KH2LZ": "03", "KH2OJ": "03", "KH2QE": "03", + "KH2QJ": "03", "KH2QL": "03", "KH2QY": "03", "KH2SR": "03", @@ -59155,6 +59284,7 @@ "KL7SY": "03", "KL7VU": "03", "KL7VU/6": "03", + "KL8R": "03", "KM6BI": "03", "KM6EPQ": "03", "KN4YTA": "03", @@ -59332,6 +59462,7 @@ "WH6FTO": "03", "WH6GBC": "03", "WH6GEZ": "03", + "WH6GHN": "03", "WH6IW": "03", "WH6JO": "03", "WH6LZ": "03", @@ -59354,7 +59485,6 @@ "WH6XI": "03", "WH6XX": "03", "WH7DG": "03", - "WH7DH": "03", "WH7HQ": "03", "WH7IV": "03", "WH7IZ": "03", @@ -59417,6 +59547,7 @@ "AC7A": "03", "AC7H": "03", "AC7LR": "03", + "AD4MM": "03", "AE7AE": "03", "AF7DX": "03", "AH0AB": "03", @@ -59495,6 +59626,7 @@ "AL4Q/7": "03", "AL4R": "03", "AL5B": "03", + "AL5IN": "03", "AL5W": "03", "AL6U": "03", "AL7AA": "03", @@ -59934,7 +60066,6 @@ "KL2TZ": "03", "KL2VK": "03", "KL2WE": "03", - "KL2XQ": "03", "KL2YH": "03", "KL2YO": "03", "KL2YQ": "03", @@ -59967,7 +60098,6 @@ "KL4AO": "03", "KL4BQ": "03", "KL4FX": "03", - "KL4GY": "03", "KL4IP": "03", "KL4KF": "03", "KL4NG": "03", @@ -60060,6 +60190,7 @@ "KL7IZC": "03", "KL7JAV": "03", "KL7JDQ": "03", + "KL7JDY": "03", "KL7JEA": "03", "KL7JES": "03", "KL7JIJ": "03", @@ -60195,6 +60326,7 @@ "KL7VN": "03", "KL7VQ": "03", "KL7WC": "03", + "KL7WG": "03", "KL7WM": "03", "KL7WN": "03", "KL7WP": "03", @@ -60387,6 +60519,7 @@ "NP2CT": "03", "NP2KL": "03", "NP2LK": "03", + "NP2MU": "03", "NP2X/7": "03", "NP3PH": "03", "NP4AI/M": "03", @@ -60398,6 +60531,7 @@ "NY7Z": "03", "VA2GLB/P": "03", "W0REP": "03", + "W2FAT": "03", "W2FF": "03", "W2ONH": "03", "W3FO": "03", @@ -60566,6 +60700,7 @@ "WH7XP": "03", "WH7ZP": "03", "WH8AAG": "03", + "WH8AAH": "03", "WI7C": "03", "WL0L": "03", "WL1M": "03", @@ -60848,7 +60983,6 @@ "KC9HYY/EOI": "04", "KC9HYY/LUS100": "04", "KC9HYY/MMD": "04", - "KC9WIB": "04", "KD9Q/M": "04", "KD9TWW": "04", "KE5DDD": "04", @@ -60935,7 +61069,6 @@ "NP2GM": "04", "NP2I": "04", "NP2L/9": "04", - "NP2MU": "04", "NP2WJ": "04", "NP3QC": "04", "NP4ZI": "04", @@ -61073,6 +61206,7 @@ "KL1DN": "04", "KL1IG": "04", "KL1LV": "04", + "KL1MJ": "04", "KL1SE": "04", "KL1SE/4": "04", "KL1ZA": "04", @@ -61123,6 +61257,7 @@ "NH2E": "04", "NH2MS": "04", "NH6BD": "04", + "NH6LW": "04", "NH6T": "04", "NH6T/4": "04", "NH7FK": "04", @@ -61699,6 +61834,7 @@ "GB2EI", "GB2FC", "GB2FLB", + "GB2GFS", "GB2GGM", "GB2GLS", "GB2GOL", @@ -61859,6 +61995,7 @@ "GB90RSGB/62", "GB90RSGB/72", "GB9GGM", + "GB9KW", "GB9TQJ", "GC4BRS/LH", "GG100ACD", @@ -62997,9 +63134,7 @@ "confirmed_bands": {}, "worked_modes": {}, "confirmed_modes": {}, - "direct": [ - "VERSION" - ], + "direct": [], "prefixITU": {}, "prefixCQ": {}, "directITU": {}, @@ -70028,7 +70163,7 @@ "ccc": "IDN", "name": "Indonesia", "continent": "OC", - "ituzone": "51", + "ituzone": "54", "cqzone": "28", "timezone": "8", "ccode": "360", @@ -70285,260 +70420,60 @@ ], "prefix": [ "7A", - "7A0", - "7A1", - "7A2", - "7A3", - "7A4", - "7A5", - "7A6", - "7A7", - "7A8", + "7A9", "7B", - "7B0", - "7B1", - "7B2", - "7B3", - "7B4", - "7B5", - "7B6", - "7B7", - "7B8", + "7B9", "7C", - "7C0", - "7C1", - "7C2", - "7C3", - "7C4", - "7C5", - "7C6", - "7C7", - "7C8", + "7C9", "7D", - "7D0", - "7D1", - "7D2", - "7D3", - "7D4", - "7D5", - "7D6", - "7D7", - "7D8", + "7D9", "7E", - "7E0", - "7E1", - "7E2", - "7E3", - "7E4", - "7E5", - "7E6", - "7E7", - "7E8", + "7E9", "7F", - "7F0", - "7F1", - "7F2", - "7F3", - "7F4", - "7F5", - "7F6", - "7F7", - "7F8", + "7F9", "7G", - "7G0", - "7G1", - "7G2", - "7G3", - "7G4", - "7G5", - "7G6", - "7G7", - "7G8", + "7G9", "7H", - "7H0", - "7H1", - "7H2", - "7H3", - "7H4", - "7H5", - "7H6", - "7H7", - "7H8", + "7H9", "7I", - "7I0", - "7I1", - "7I2", - "7I3", - "7I4", - "7I5", - "7I6", - "7I7", - "7I8", + "7I9", "8A", - "8A0", - "8A1", - "8A2", - "8A3", - "8A4", - "8A5", - "8A6", - "8A7", - "8A8", + "8A9", "8B", - "8B0", - "8B1", - "8B2", - "8B3", - "8B4", - "8B5", - "8B6", - "8B7", - "8B8", + "8B9", "8C", - "8C0", - "8C1", - "8C2", - "8C3", - "8C4", - "8C5", - "8C6", - "8C7", - "8C8", + "8C9", "8D", - "8D0", - "8D1", - "8D2", - "8D3", - "8D4", - "8D5", - "8D6", - "8D7", - "8D8", + "8D9", "8E", - "8E0", - "8E1", - "8E2", - "8E3", - "8E4", - "8E5", - "8E6", - "8E7", - "8E8", + "8E9", "8F", - "8F0", - "8F1", - "8F2", - "8F3", - "8F4", - "8F5", - "8F6", - "8F7", - "8F8", + "8F9", "8G", - "8G0", - "8G1", - "8G2", - "8G3", - "8G4", - "8G5", - "8G6", - "8G7", - "8G8", + "8G9", "8H", - "8H0", - "8H1", - "8H2", - "8H3", - "8H4", - "8H5", - "8H6", - "8H7", - "8H8", + "8H9", "8I", - "8I0", - "8I1", - "8I2", - "8I3", - "8I4", - "8I5", - "8I6", - "8I7", - "8I8", + "8I9", "PK", "PL", "PM", "PN", "PO", "YB", - "YB0", - "YB1", - "YB2", - "YB3", - "YB4", - "YB5", - "YB6", - "YB7", - "YB8", + "YB9", "YC", - "YC0", - "YC1", - "YC2", - "YC3", - "YC4", - "YC5", - "YC6", - "YC7", - "YC8", + "YC9", "YD", - "YD0", - "YD1", - "YD2", - "YD3", - "YD4", - "YD5", - "YD6", - "YD7", - "YD8", + "YD9", "YE", - "YE0", - "YE1", - "YE2", - "YE3", - "YE4", - "YE5", - "YE6", - "YE7", - "YE8", + "YE9", "YF", - "YF0", - "YF1", - "YF2", - "YF3", - "YF4", - "YF5", - "YF6", - "YF7", - "YF8", + "YF9", "YG", - "YG0", - "YG1", - "YG2", - "YG3", - "YG4", - "YG5", - "YG6", - "YG7", - "YG8", + "YG9", "YH", - "YH0", - "YH1", - "YH2", - "YH3", - "YH4", - "YH5", - "YH6", - "YH7", - "YH8" + "YH9" ], "worked": false, "confirmed": false, @@ -70562,243 +70497,34 @@ "YD1NAA/YL" ], "prefixITU": { - "7A0": "54", - "7B0": "54", - "7C0": "54", - "7D0": "54", - "7E0": "54", - "7F0": "54", - "7G0": "54", - "7H0": "54", - "7I0": "54", - "8A0": "54", - "8B0": "54", - "8C0": "54", - "8D0": "54", - "8E0": "54", - "8F0": "54", - "8G0": "54", - "8H0": "54", - "8I0": "54", - "YB0": "54", - "YC0": "54", - "YD0": "54", - "YE0": "54", - "YF0": "54", - "YG0": "54", - "YH0": "54", - "7A1": "54", - "7B1": "54", - "7C1": "54", - "7D1": "54", - "7E1": "54", - "7F1": "54", - "7G1": "54", - "7H1": "54", - "7I1": "54", - "8A1": "54", - "8B1": "54", - "8C1": "54", - "8D1": "54", - "8E1": "54", - "8F1": "54", - "8G1": "54", - "8H1": "54", - "8I1": "54", - "YB1": "54", - "YC1": "54", - "YD1": "54", - "YE1": "54", - "YF1": "54", - "YG1": "54", - "YH1": "54", - "7A2": "54", - "7B2": "54", - "7C2": "54", - "7D2": "54", - "7E2": "54", - "7F2": "54", - "7G2": "54", - "7H2": "54", - "7I2": "54", - "8A2": "54", - "8B2": "54", - "8C2": "54", - "8D2": "54", - "8E2": "54", - "8F2": "54", - "8G2": "54", - "8H2": "54", - "8I2": "54", - "YB2": "54", - "YC2": "54", - "YD2": "54", - "YE2": "54", - "YF2": "54", - "YG2": "54", - "YH2": "54", - "7A3": "54", - "7B3": "54", - "7C3": "54", - "7D3": "54", - "7E3": "54", - "7F3": "54", - "7G3": "54", - "7H3": "54", - "7I3": "54", - "8A3": "54", - "8B3": "54", - "8C3": "54", - "8D3": "54", - "8E3": "54", - "8F3": "54", - "8G3": "54", - "8H3": "54", - "8I3": "54", - "YB3": "54", - "YC3": "54", - "YD3": "54", - "YE3": "54", - "YF3": "54", - "YG3": "54", - "YH3": "54", - "7A4": "54", - "7B4": "54", - "7C4": "54", - "7D4": "54", - "7E4": "54", - "7F4": "54", - "7G4": "54", - "7H4": "54", - "7I4": "54", - "8A4": "54", - "8B4": "54", - "8C4": "54", - "8D4": "54", - "8E4": "54", - "8F4": "54", - "8G4": "54", - "8H4": "54", - "8I4": "54", - "YB4": "54", - "YC4": "54", - "YD4": "54", - "YE4": "54", - "YF4": "54", - "YG4": "54", - "YH4": "54", - "7A5": "54", - "7B5": "54", - "7C5": "54", - "7D5": "54", - "7E5": "54", - "7F5": "54", - "7G5": "54", - "7H5": "54", - "7I5": "54", - "8A5": "54", - "8B5": "54", - "8C5": "54", - "8D5": "54", - "8E5": "54", - "8F5": "54", - "8G5": "54", - "8H5": "54", - "8I5": "54", - "YB5": "54", - "YC5": "54", - "YD5": "54", - "YE5": "54", - "YF5": "54", - "YG5": "54", - "YH5": "54", - "7A6": "54", - "7B6": "54", - "7C6": "54", - "7D6": "54", - "7E6": "54", - "7F6": "54", - "7G6": "54", - "7H6": "54", - "7I6": "54", - "8A6": "54", - "8B6": "54", - "8C6": "54", - "8D6": "54", - "8E6": "54", - "8F6": "54", - "8G6": "54", - "8H6": "54", - "8I6": "54", - "YB6": "54", - "YC6": "54", - "YD6": "54", - "YE6": "54", - "YF6": "54", - "YG6": "54", - "YH6": "54", - "7A7": "54", - "7B7": "54", - "7C7": "54", - "7D7": "54", - "7E7": "54", - "7F7": "54", - "7G7": "54", - "7H7": "54", - "7I7": "54", - "8A7": "54", - "8B7": "54", - "8C7": "54", - "8D7": "54", - "8E7": "54", - "8F7": "54", - "8G7": "54", - "8H7": "54", - "8I7": "54", - "YB7": "54", - "YC7": "54", - "YD7": "54", - "YE7": "54", - "YF7": "54", - "YG7": "54", - "YH7": "54", - "7A8": "54", - "7B8": "54", - "7C8": "54", - "7D8": "54", - "7E8": "54", - "7F8": "54", - "7G8": "54", - "7H8": "54", - "7I8": "54", - "8A8": "54", - "8B8": "54", - "8C8": "54", - "8D8": "54", - "8E8": "54", - "8F8": "54", - "8G8": "54", - "8H8": "54", - "8I8": "54", - "YB8": "54", - "YC8": "54", - "YD8": "54", - "YE8": "54", - "YF8": "54", - "YG8": "54", - "YH8": "54" + "7A9": "51", + "7B9": "51", + "7C9": "51", + "7D9": "51", + "7E9": "51", + "7F9": "51", + "7G9": "51", + "7H9": "51", + "7I9": "51", + "8A9": "51", + "8B9": "51", + "8C9": "51", + "8D9": "51", + "8E9": "51", + "8F9": "51", + "8G9": "51", + "8H9": "51", + "8I9": "51", + "YB9": "51", + "YC9": "51", + "YD9": "51", + "YE9": "51", + "YF9": "51", + "YG9": "51", + "YH9": "51" }, "prefixCQ": {}, - "directITU": { - "YB0AI/LH": "54", - "YC0LND/YL": "54", - "YB1LGP/YL": "54", - "YC1BWA/YL": "54", - "YC1CVA/YL": "54", - "YD1BZW/YL": "54", - "YD1MKQ/YL": "54", - "YD1NAA/YL": "54" - }, + "directITU": {}, "directCQ": {} }, "330": { @@ -76334,19 +76060,25 @@ "direct": [ "7O/DL7ZM", "7O2A", - "7O6T" + "7O6T", + "7O8AD", + "7O8AE" ], "prefixITU": {}, "prefixCQ": {}, "directITU": { "7O/DL7ZM": "48", "7O2A": "48", - "7O6T": "48" + "7O6T": "48", + "7O8AD": "48", + "7O8AE": "48" }, "directCQ": { "7O/DL7ZM": "37", "7O2A": "37", - "7O6T": "37" + "7O6T": "37", + "7O8AD": "37", + "7O8AE": "37" } }, "497": { @@ -76515,13 +76247,13 @@ "dxcc": "502", "cc": "MK", "ccc": "MKD", - "name": "Macedonia", + "name": "N. Macedonia", "continent": "EU", "ituzone": "28", "cqzone": "15", "timezone": "1", "ccode": "807", - "aname": "Macedonia", + "aname": "N. Macedonia", "mh": [ "KN00", "KN01", @@ -77173,6 +76905,7 @@ "worked_modes": {}, "confirmed_modes": {}, "direct": [ + "TO0T", "TO0Z", "TO2D", "TO2EE", diff --git a/package.nw/gt_roster.html b/package.nw/gt_roster.html index e896fa4..3a14a40 100644 --- a/package.nw/gt_roster.html +++ b/package.nw/gt_roster.html @@ -50,7 +50,7 @@
Waiting…
-
Halt Tx
+
Halt Tx
@@ -225,7 +225,7 @@
-

Exceptions

+

Exceptions

@@ -339,7 +339,7 @@
- +
@@ -356,9 +356,9 @@
-
"; + setLookupDiv("lookupLocalDiv", worker); } function startGenMessages(call, grid, instance = null) @@ -15504,9 +15352,7 @@ function mediaCheck() } catch (e) { - alert( - "Unable to create or access " + tryDirectory + " folder.\r\nPermission violation, GT cannot continue" - ); + alert("Unable to create or access " + tryDirectory + " folder.\r\nPermission violation, GT cannot continue"); nw.App.quit(); } @@ -15599,7 +15445,7 @@ function mediaCheck() GT.QSOcount++; if (GT.QSOhash[i].confirmed) GT.QSLcount++; } - + fs.unlinkSync(GT.NWappData + "internal_qso.json"); } else if (fileExists == true) @@ -15749,7 +15595,7 @@ function pskSpotResults(buffer, flag) var grid = json.receptionReport[key].receiverLocator.substr(0, 6); if (grid.length < 4) { continue; } var band = formatBand(Number(parseInt(json.receptionReport[key].frequency) / 1000000)); - var hash = call + mode + band + grid.substr(0, 4); + var hash = call + mode + band; if (hash in GT.receptionReports.spots) { @@ -15777,6 +15623,7 @@ function pskSpotResults(buffer, flag) if (SNR > 255) SNR = 255; if (SNR < 0) SNR = 0; report.color = SNR; + report.source = "P"; } } } @@ -15804,7 +15651,7 @@ function addNewOAMSSpot(cid, db, frequency, band, mode) var report; var call = GT.gtFlagPins[cid].call; var grid = GT.gtFlagPins[cid].grid.substr(0, 6); - var hash = call + mode + band + grid.substr(0, 4); + var hash = call + mode + band; if (hash in GT.receptionReports.spots) { @@ -15828,7 +15675,7 @@ function addNewOAMSSpot(cid, db, frequency, band, mode) if (SNR > 255) SNR = 255; if (SNR < 0) SNR = 0; report.color = SNR; - + report.source = "O"; GT.oamsSpotTimeout = nodeTimers.setTimeout(redrawSpots, 250); } @@ -15888,6 +15735,7 @@ function createSpot(report, key, fromPoint, addToLayer = true) }); spot.setStyle(featureStyle); spot.spot = key; + spot.set("prop", "spot"); spot.size = 6; // Mouseover detection GT.layerSources["psk-spots"].addFeature(spot); @@ -15945,10 +15793,8 @@ function redrawSpots() if (GT.receptionSettings.mergeSpots == false) { - var spot = iconFeature(fromPoint, GT.gtFlagIcon, 100); - + var spot = iconFeature(fromPoint, GT.gtFlagIcon, 100, "homeFlag"); GT.layerSources["psk-spots"].addFeature(spot); - GT.layerSources["psk-heat"].addFeature(spot); } for (var key in GT.receptionReports.spots) diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js index e049cc6..0fb87fd 100644 --- a/package.nw/lib/gtws.js +++ b/package.nw/lib/gtws.js @@ -472,7 +472,7 @@ function makeGtPin(obj) } var LL = squareToCenter(obj.grid); - obj.pin = iconFeature(ol.proj.fromLonLat([LL.o, LL.a]), GT.gtFlagIcon, 100); + obj.pin = iconFeature(ol.proj.fromLonLat([LL.o, LL.a]), GT.gtFlagIcon, 100, "gtFlag"); obj.pin.key = obj.cid; obj.pin.isGtFlag = true; obj.pin.size = 1; diff --git a/package.nw/lib/i18n.js b/package.nw/lib/i18n.js index bbf1c6e..0529e70 100644 --- a/package.nw/lib/i18n.js +++ b/package.nw/lib/i18n.js @@ -2,7 +2,10 @@ let languages = { en: "i18n/en.json", cn: "i18n/cn.json", cnt: "i18n/cn-t.json", - de: "i18n/de.json" + de: "i18n/de.json", + fr: "i18n/fr.json", + it: "i18n/it.json", + es: "i18n/es.json" }; function loadI18n() @@ -10,6 +13,7 @@ function loadI18n() $.i18n().load(languages).done(function () { $.i18n().locale = GT.appSettings.locale; + refreshI18NStrings(); }); } diff --git a/package.nw/lib/pota.js b/package.nw/lib/pota.js index 5154fef..6ada095 100644 --- a/package.nw/lib/pota.js +++ b/package.nw/lib/pota.js @@ -139,7 +139,7 @@ function makeParkFeatures() var report = GT.pota.parkSpots[park][call]; if (parkObj.feature == null && validateMapBandAndMode(report.band, report.mode) && Date.now() < report.expire) { - parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1); + parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1, "parkFlag"); parkObj.feature.key = park; parkObj.feature.size = 22; @@ -222,6 +222,29 @@ function potaSpotFromDecode(callObj) } } +function leftClickPota(parkId) +{ + if (parkId in GT.pota.parkSpots) + { + for (parkCaller in GT.pota.parkSpots[parkId]) + { + let obj = GT.pota.parkSpots[parkId][parkCaller]; + let call = obj.activator; + let grid = obj.activatorGrid; + let band = obj.band; + let mode = obj.mode; + for (let instance in GT.instances) + { + if (GT.instances[instance].valid && GT.instances[instance].status.Band == band && GT.instances[instance].status.MO == mode) + { + setCallAndGrid(call, grid, instance); + return; + } + } + } + } +} + /* function reportPotaRBN(callSpot) { if (Date.now() < callSpot.expire) @@ -334,7 +357,7 @@ function addParkSpotFeature(park, report) if (parkObj.feature == null && validateMapBandAndMode(report.band, report.mode)) { - parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1); + parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1, "parkFlag"); parkObj.feature.key = park; parkObj.feature.size = 22; GT.layerSources.pota.addFeature(parkObj.feature); @@ -572,31 +595,18 @@ function getPotaSchedule() GT.pota.scheduleTimeout = nodeTimers.setTimeout(getPotaSchedule, 900000); } -GT.lastPark = null; function mouseOverPark(feature) { - if (GT.lastPark && GT.lastPark == feature) - { - mouseParkMove(); - return; - } - GT.lastPark = feature; - + if (GT.currentOverlay != 0) return false; createParkTipTable(feature); - - mouseParkMove(); + mouseParkMove(feature); myParktip.style.zIndex = 499; myParktip.style.display = "block"; + return true; } -function mouseOutPark(mouseEvent) -{ - GT.lastPark = null; - myParktip.style.zIndex = -1; -} - -function mouseParkMove() +function mouseParkMove(feature) { var positionInfo = myParktip.getBoundingClientRect(); var windowWidth = window.innerWidth; @@ -613,6 +623,11 @@ function mouseParkMove() myParktip.style.top = getMouseY() - positionInfo.height - 12 + "px"; } +function mouseOutPark(feature) +{ + myParktip.style.zIndex = -1; +} + function createParkTipTable(toolElement) { var worker = ""; diff --git a/package.nw/lib/roster/processRosterFiltering.js b/package.nw/lib/roster/processRosterFiltering.js index fd20863..b394fff 100644 --- a/package.nw/lib/roster/processRosterFiltering.js +++ b/package.nw/lib/roster/processRosterFiltering.js @@ -184,7 +184,7 @@ function processRosterFiltering(callRoster, rosterSettings) if (CR.rosterSettings.columns.Spot == true) { - callObj.spot = window.opener.getSpotTime(callObj.DEcall + callObj.mode + callObj.band + callObj.grid); + callObj.spot = window.opener.getSpotTime(callObj.DEcall + callObj.mode + callObj.band); if (callObj.spot == null) { callObj.spot = { when: 0, snr: 0 }; diff --git a/package.nw/lib/services/pstrotator.js b/package.nw/lib/services/pstrotator.js index d61f686..56a9cf1 100644 --- a/package.nw/lib/services/pstrotator.js +++ b/package.nw/lib/services/pstrotator.js @@ -43,24 +43,14 @@ function aimRotator(info) { const { callObj } = info - if ( - GT.pstrotatorSettings.enable == true && - GT.pstrotatorSettings.port > 0 && - GT.pstrotatorSettings.ip.length > 4 && - (callObj.distance > 0) - ) + if (GT.pstrotatorSettings.enable == true && GT.pstrotatorSettings.port > 0 && GT.pstrotatorSettings.ip.length > 4 && callObj.distance > 0) { // If we have a .grid, we have a .distance and .heading, so just send the heading let payload = `${Math.round(callObj.heading)}`; try { - sendUdpMessage( - payload, - payload.length, - parseInt(GT.pstrotatorSettings.port), - GT.pstrotatorSettings.ip - ); + sendUdpMessage(payload, payload.length, parseInt(GT.pstrotatorSettings.port), GT.pstrotatorSettings.ip); if (callObj.DEcall) { addLastTraffic(`Aiming rotator at ${callObj.DEcall}`); diff --git a/package.nw/lib/shadow.js b/package.nw/lib/shadow.js index 6e9f9a9..a6ef91d 100644 --- a/package.nw/lib/shadow.js +++ b/package.nw/lib/shadow.js @@ -64,7 +64,7 @@ */ return { type: "Feature", - properties: {}, + properties: { prop: "shadow" }, geometry: { type: "Polygon", coordinates: [ @@ -269,13 +269,11 @@ }); var dayNight = { - map: null, + vectorSource: null, vectorLayer: null, init: function (map) { - this.map = map; - var geoJSON = new GeoJSONTerminator(); this.vectorSource = new ol.source.Vector({ @@ -295,7 +293,7 @@ var dayNight = { opacity: Number(GT.mapSettings.shadow), zIndex: 0 }); - this.map.getLayers().insertAt(1, this.vectorLayer); + map.getLayers().insertAt(1, this.vectorLayer); }, refresh: function () { @@ -334,14 +332,12 @@ var dayNight = { }; var moonLayer = { - map: null, + vectorSource: null, vectorLayer: null, icon: null, pin: null, init: function (map) { - this.map = map; - this.icon = new ol.style.Icon({ src: "./img/luna.png", anchorYUnits: "pixels", @@ -354,7 +350,8 @@ var moonLayer = { this.pin = iconFeature( ol.proj.fromLonLat(subLunar(timeNowSec()).ll), this.icon, - 0 + 0, + "moon" ); this.pin.size = 99; this.vectorSource = new ol.source.Vector({}); @@ -363,7 +360,7 @@ var moonLayer = { source: this.vectorSource, zIndex: 30 }); - this.map.getLayers().insertAt(1, this.vectorLayer); + map.getLayers().insertAt(1, this.vectorLayer); }, future: function (now) { @@ -409,7 +406,7 @@ var moonLayer = { } line = new ol.geom.LineString(line); - var feature = new ol.Feature({ geometry: line, name: "moonFlight" }); + var feature = new ol.Feature({ geometry: line, prop: "moonFlight" }); feature.setStyle( new ol.style.Style({ @@ -430,7 +427,8 @@ var moonLayer = { this.pin = iconFeature( ol.proj.fromLonLat(subLunar(now).ll), this.icon, - 0 + 0, + "moon" ); this.pin.size = 99; this.vectorSource.addFeature(this.pin); diff --git a/package.nw/lib/style_roster.css b/package.nw/lib/style_roster.css index eb8837a..5c63c73 100644 --- a/package.nw/lib/style_roster.css +++ b/package.nw/lib/style_roster.css @@ -142,7 +142,7 @@ body.roster { } #RosterControls.normal #MainRosterControls { - margin-left: 160px; + margin-left: 180px; margin-right: 100px; display: flex; flex-direction: row; @@ -154,7 +154,7 @@ body.roster { position: absolute; top: 3px; left: 6px; - width: 160px; + width: 180px; display: flex; flex-direction: row; } @@ -388,7 +388,8 @@ body.roster { /* == Other Elements ====================================== */ #txrxdec { - width: 100px; + padding-left: 5px; + padding-right: 5px; } .link { @@ -410,7 +411,7 @@ table.awardTableCSS { margin: 0; } -table.awardTableCSS td, +table.awardTableCSS td, table.awardTableCSS th { border: 1px solid #888; padding: 0px; diff --git a/package.nw/lib/third-party.js b/package.nw/lib/third-party.js index 0670b5c..6eaaa40 100644 --- a/package.nw/lib/third-party.js +++ b/package.nw/lib/third-party.js @@ -302,7 +302,7 @@ function flightFeature(line, opts, layer, canAnimate) { line = new ol.geom.LineString(line); - var feature = new ol.Feature({ geometry: line, name: 'flight' }); + var feature = new ol.Feature({ geometry: line, prop: 'flight' }); feature.setStyle(new ol.style.Style({ stroke: new ol.style.Stroke({ color: opts.color, width: opts.weight, lineDash: dash, lineDashOffset:dashOff}) })); diff --git a/package.nw/package.json b/package.nw/package.json index 6ab0dd9..075a3cd 100644 --- a/package.nw/package.json +++ b/package.nw/package.json @@ -1,7 +1,7 @@ { "name": "GridTracker", "product_string_do_not_use": "gridtracker", - "version": "1.23.1019", + "version": "1.23.1112", "betaVersion": "", "description": "GridTracker: An Amateur Radio Companion", "author": "GridTracker.org",