From 59ae22db9b01dc959d92b88ce0f8b8f974d69033 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 25 Nov 2024 20:57:49 -0800 Subject: [PROPOSED] Revert zone.tab changes for Concordia, EBO Problem reported by Jule Dabars. * NEWS: Mention this. * checktab.awk: Catch similar mistakes in the future. * zone.tab: Revert previous change. * zone1970.tab: Instead of duplicating entries for Asia/Tokyo and Asia/Singapore, complicate columns 1 and 4. --- NEWS | 4 ++-- checktab.awk | 6 ++++++ zone.tab | 2 -- zone1970.tab | 6 ++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 5c8993b3..fb3d5609 100644 --- a/NEWS +++ b/NEWS @@ -26,8 +26,8 @@ Unreleased, experimental changes Changes to data - Add zone*.tab lines for the Concordia and Eyre Bird Observatory - research stations. (Thanks to Derick Rethans.) + Add zone1970.tab lines for the Concordia and Eyre Bird Observatory + research stations. (Thanks to Derick Rethans and Jule Dabars.) Changes to code diff --git a/checktab.awk b/checktab.awk index 15a3a697..5fa60556 100644 --- a/checktab.awk +++ b/checktab.awk @@ -78,6 +78,12 @@ BEGIN { split(ccs, cca, /,/) cc = cca[1] + if (tztab[tz]) { + printf "%s:%d: %s: duplicate Zone from line %d\n", \ + zone_table, zone_NR, tz, tz2NR[tz] + status = 1 + } + # Don't complain about a special case for Crimea in zone.tab. # FIXME: zone.tab should be removed, since it is obsolete. # Or at least put just "XX" in its country-code column. diff --git a/zone.tab b/zone.tab index ee9bdbb0..d2be6635 100644 --- a/zone.tab +++ b/zone.tab @@ -43,7 +43,6 @@ AQ -6734-06808 Antarctica/Rothera Rothera AQ -690022+0393524 Antarctica/Syowa Syowa AQ -720041+0023206 Antarctica/Troll Troll AQ -7824+10654 Antarctica/Vostok Vostok -AQ -750600+1232000 Asia/Singapore Concordia AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) @@ -70,7 +69,6 @@ AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory AU -3157+11551 Australia/Perth Western Australia (most areas) AU -3143+12852 Australia/Eucla Western Australia (Eucla) -AU -321447+1261806 Asia/Tokyo Eyre Bird Observatory AW +1230-06958 America/Aruba AX +6006+01957 Europe/Mariehamn AZ +4023+04951 Asia/Baku diff --git a/zone1970.tab b/zone1970.tab index 337b767c..5ded0565 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -48,7 +48,6 @@ AQ -6448-06406 Antarctica/Palmer Palmer AQ -6734-06808 Antarctica/Rothera Rothera AQ -720041+0023206 Antarctica/Troll Troll AQ -7824+10654 Antarctica/Vostok Vostok -AQ -750600+1232000 Asia/Singapore Concordia AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba most areas: CB, CC, CN, ER, FM, MN, SE, SF AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) @@ -75,7 +74,6 @@ AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory AU -3157+11551 Australia/Perth Western Australia (most areas) AU -3143+12852 Australia/Eucla Western Australia (Eucla) -AU -321447+1261806 Asia/Tokyo Eyre Bird Observatory AZ +4023+04951 Asia/Baku BB +1306-05937 America/Barbados BD +2343+09025 Asia/Dhaka @@ -185,7 +183,7 @@ IR +3540+05126 Asia/Tehran IT,SM,VA +4154+01229 Europe/Rome JM +175805-0764736 America/Jamaica JO +3157+03556 Asia/Amman -JP +353916+1394441 Asia/Tokyo +JP,AU +353916+1394441 Asia/Tokyo Eyre Bird Observatory KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT -0117+03649 Africa/Nairobi KG +4254+07436 Asia/Bishkek KI,MH,TV,UM,WF +0125+17300 Pacific/Tarawa Gilberts, Marshalls, Wake @@ -295,7 +293,7 @@ RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea SA,AQ,KW,YE +2438+04643 Asia/Riyadh Syowa SB,FM -0932+16012 Pacific/Guadalcanal Pohnpei SD +1536+03232 Africa/Khartoum -SG,MY +0117+10351 Asia/Singapore peninsular Malaysia +SG,AQ,MY +0117+10351 Asia/Singapore peninsular Malaysia, Concordia SR +0550-05510 America/Paramaribo SS +0451+03137 Africa/Juba ST +0020+00644 Africa/Sao_Tome -- 2.43.0