Skip to content

Commit cc9372f

Browse files
committed
zonedb*: upgrade to TZDB 2023d
1 parent bd859a8 commit cc9372f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+725
-493
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22

33
* Unreleased
4+
* Upgrade TZDB to 2023d
5+
* https://mm.icann.org/pipermail/tz-announce/2023-December/000080.html
6+
* "Ittoqqortoormiit, Greenland changes time zones on 2024-03-31. Vostok,
7+
Antarctica changed time zones on 2023-12-18. Casey, Antarctica changed
8+
time zones five times since 2020. Code and data fixes for Palestine
9+
timestamps starting in 2072. A new data file zonenow.tab for
10+
timestamps starting now."
411
* 2.3.0 (2023-06-27, TZDB version 2023c)
512
* Create [CustomZoneRegistry](examples/CustomZoneRegistry/) example
613
to illustrate how to use a custom registry.

src/zonedb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h
22

33
TOOLS := $(abspath ../../../AceTimeTools)
44
TZ_REPO := $(abspath $(TOOLS)/../tz)
5-
TZ_VERSION := 2023c
5+
TZ_VERSION := 2023d
66
START_YEAR := 2000
77
UNTIL_YEAR := 2200
88

src/zonedb/zone_infos.cpp

Lines changed: 22 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
44
// --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles
55
// --output_dir /home/brian/src/AceTime/src/zonedb
6-
// --tz_version 2023c
6+
// --tz_version 2023d
77
// --action zonedb
88
// --language arduino
99
// --scope basic
@@ -23,10 +23,10 @@
2323
// northamerica
2424
// southamerica
2525
//
26-
// from https://github.com/eggert/tz/releases/tag/2023c
26+
// from https://github.com/eggert/tz/releases/tag/2023d
2727
//
28-
// Supported Zones: 448 (228 zones, 220 links)
29-
// Unsupported Zones: 148 (122 zones, 26 links)
28+
// Supported Zones: 446 (227 zones, 219 links)
29+
// Unsupported Zones: 150 (124 zones, 26 links)
3030
//
3131
// Requested Years: [2000,2200]
3232
// Accurate Years: [2000,32767]
@@ -39,38 +39,38 @@
3939
// Max Buffer Size: 6
4040
//
4141
// Records:
42-
// Infos: 448
43-
// Eras: 240
42+
// Infos: 446
43+
// Eras: 239
4444
// Policies: 65
4545
// Rules: 367
4646
//
4747
// Memory (8-bits):
4848
// Context: 16
4949
// Rules: 3303
5050
// Policies: 195
51-
// Eras: 2640
52-
// Zones: 2964
53-
// Links: 2860
54-
// Registry: 896
51+
// Eras: 2629
52+
// Zones: 2951
53+
// Links: 2847
54+
// Registry: 892
5555
// Formats: 467
5656
// Letters: 29
5757
// Fragments: 116
58-
// Names: 4162 (original: 6534)
59-
// TOTAL: 17648
58+
// Names: 4140 (original: 6495)
59+
// TOTAL: 17585
6060
//
6161
// Memory (32-bits):
6262
// Context: 24
6363
// Rules: 4404
6464
// Policies: 520
65-
// Eras: 3840
66-
// Zones: 5472
67-
// Links: 5280
68-
// Registry: 1792
65+
// Eras: 3824
66+
// Zones: 5448
67+
// Links: 5256
68+
// Registry: 1784
6969
// Formats: 467
7070
// Letters: 41
7171
// Fragments: 138
72-
// Names: 4162 (original: 6534)
73-
// TOTAL: 26140
72+
// Names: 4140 (original: 6495)
73+
// TOTAL: 26046
7474
//
7575
// DO NOT EDIT
7676

@@ -85,7 +85,7 @@ namespace zonedb {
8585
// ZoneContext
8686
//---------------------------------------------------------------------------
8787

88-
static const char kVersionString[] ACE_TIME_PROGMEM = "2023c";
88+
static const char kVersionString[] ACE_TIME_PROGMEM = "2023d";
8989
const __FlashStringHelper* const kTzDatabaseVersion =
9090
(const __FlashStringHelper*) kVersionString;
9191

@@ -149,8 +149,8 @@ const basic::ZoneContext kZoneContext ACE_TIME_PROGMEM = {
149149
};
150150

151151
//---------------------------------------------------------------------------
152-
// Zones: 228
153-
// Eras: 240
152+
// Zones: 227
153+
// Eras: 239
154154
//---------------------------------------------------------------------------
155155

156156
//---------------------------------------------------------------------------
@@ -2465,38 +2465,6 @@ const basic::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = {
24652465
nullptr /*targetInfo*/,
24662466
};
24672467

2468-
//---------------------------------------------------------------------------
2469-
// Zone name: America/Scoresbysund
2470-
// Eras: 1
2471-
//---------------------------------------------------------------------------
2472-
2473-
static const basic::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = {
2474-
// -1:00 EU -01/+00
2475-
{
2476-
&kZonePolicyEU /*zonePolicy*/,
2477-
"-01/+00" /*format*/,
2478-
-4 /*offsetCode*/,
2479-
4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/,
2480-
127 /*untilYearTiny*/,
2481-
1 /*untilMonth*/,
2482-
1 /*untilDay*/,
2483-
0 /*untilTimeCode*/,
2484-
0 /*untilTimeModifier (kSuffixW + minute=0)*/,
2485-
},
2486-
2487-
};
2488-
2489-
static const char kZoneNameAmerica_Scoresbysund[] ACE_TIME_PROGMEM = "\x02" "Scoresbysund";
2490-
2491-
const basic::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = {
2492-
kZoneNameAmerica_Scoresbysund /*name*/,
2493-
0x123f8d2a /*zoneId*/,
2494-
&kZoneContext /*zoneContext*/,
2495-
1 /*numEras*/,
2496-
kZoneEraAmerica_Scoresbysund /*eras*/,
2497-
nullptr /*targetInfo*/,
2498-
};
2499-
25002468
//---------------------------------------------------------------------------
25012469
// Zone name: America/Sitka
25022470
// Eras: 1
@@ -7596,7 +7564,7 @@ const basic::ZoneInfo kZoneWET ACE_TIME_PROGMEM = {
75967564

75977565

75987566
//---------------------------------------------------------------------------
7599-
// Links: 220
7567+
// Links: 219
76007568
//---------------------------------------------------------------------------
76017569

76027570
//---------------------------------------------------------------------------
@@ -8709,21 +8677,6 @@ const basic::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = {
87098677
&kZoneAsia_Riyadh /*targetInfo*/,
87108678
};
87118679

8712-
//---------------------------------------------------------------------------
8713-
// Link name: Antarctica/Vostok -> Asia/Urumqi
8714-
//---------------------------------------------------------------------------
8715-
8716-
static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok";
8717-
8718-
const basic::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = {
8719-
kZoneNameAntarctica_Vostok /*name*/,
8720-
0x4f966fd4 /*zoneId*/,
8721-
&kZoneContext /*zoneContext*/,
8722-
1 /*numEras*/,
8723-
kZoneEraAsia_Urumqi /*eras*/,
8724-
&kZoneAsia_Urumqi /*targetInfo*/,
8725-
};
8726-
87278680
//---------------------------------------------------------------------------
87288681
// Link name: Arctic/Longyearbyen -> Europe/Berlin
87298682
//---------------------------------------------------------------------------

src/zonedb/zone_infos.h

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
44
// --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles
55
// --output_dir /home/brian/src/AceTime/src/zonedb
6-
// --tz_version 2023c
6+
// --tz_version 2023d
77
// --action zonedb
88
// --language arduino
99
// --scope basic
@@ -23,10 +23,10 @@
2323
// northamerica
2424
// southamerica
2525
//
26-
// from https://github.com/eggert/tz/releases/tag/2023c
26+
// from https://github.com/eggert/tz/releases/tag/2023d
2727
//
28-
// Supported Zones: 448 (228 zones, 220 links)
29-
// Unsupported Zones: 148 (122 zones, 26 links)
28+
// Supported Zones: 446 (227 zones, 219 links)
29+
// Unsupported Zones: 150 (124 zones, 26 links)
3030
//
3131
// Requested Years: [2000,2200]
3232
// Accurate Years: [2000,32767]
@@ -39,38 +39,38 @@
3939
// Max Buffer Size: 6
4040
//
4141
// Records:
42-
// Infos: 448
43-
// Eras: 240
42+
// Infos: 446
43+
// Eras: 239
4444
// Policies: 65
4545
// Rules: 367
4646
//
4747
// Memory (8-bits):
4848
// Context: 16
4949
// Rules: 3303
5050
// Policies: 195
51-
// Eras: 2640
52-
// Zones: 2964
53-
// Links: 2860
54-
// Registry: 896
51+
// Eras: 2629
52+
// Zones: 2951
53+
// Links: 2847
54+
// Registry: 892
5555
// Formats: 467
5656
// Letters: 29
5757
// Fragments: 116
58-
// Names: 4162 (original: 6534)
59-
// TOTAL: 17648
58+
// Names: 4140 (original: 6495)
59+
// TOTAL: 17585
6060
//
6161
// Memory (32-bits):
6262
// Context: 24
6363
// Rules: 4404
6464
// Policies: 520
65-
// Eras: 3840
66-
// Zones: 5472
67-
// Links: 5280
68-
// Registry: 1792
65+
// Eras: 3824
66+
// Zones: 5448
67+
// Links: 5256
68+
// Registry: 1784
6969
// Formats: 467
7070
// Letters: 41
7171
// Fragments: 138
72-
// Names: 4162 (original: 6534)
73-
// TOTAL: 26140
72+
// Names: 4140 (original: 6495)
73+
// TOTAL: 26046
7474
//
7575
// DO NOT EDIT
7676

@@ -95,7 +95,7 @@ extern const __FlashStringHelper* const kTzDatabaseVersion;
9595
extern const basic::ZoneContext kZoneContext;
9696

9797
//---------------------------------------------------------------------------
98-
// Supported zones: 228
98+
// Supported zones: 227
9999
//---------------------------------------------------------------------------
100100

101101
extern const basic::ZoneInfo kZoneAfrica_Abidjan; // Africa/Abidjan
@@ -168,7 +168,6 @@ extern const basic::ZoneInfo kZoneAmerica_Puerto_Rico; // America/Puerto_Rico
168168
extern const basic::ZoneInfo kZoneAmerica_Regina; // America/Regina
169169
extern const basic::ZoneInfo kZoneAmerica_Santiago; // America/Santiago
170170
extern const basic::ZoneInfo kZoneAmerica_Sao_Paulo; // America/Sao_Paulo
171-
extern const basic::ZoneInfo kZoneAmerica_Scoresbysund; // America/Scoresbysund
172171
extern const basic::ZoneInfo kZoneAmerica_Sitka; // America/Sitka
173172
extern const basic::ZoneInfo kZoneAmerica_Swift_Current; // America/Swift_Current
174173
extern const basic::ZoneInfo kZoneAmerica_Tegucigalpa; // America/Tegucigalpa
@@ -400,7 +399,6 @@ const uint32_t kZoneIdAmerica_Puerto_Rico = 0x6752ca31; // America/Puerto_Rico
400399
const uint32_t kZoneIdAmerica_Regina = 0xb875371c; // America/Regina
401400
const uint32_t kZoneIdAmerica_Santiago = 0x7410c9bc; // America/Santiago
402401
const uint32_t kZoneIdAmerica_Sao_Paulo = 0x1063bfc9; // America/Sao_Paulo
403-
const uint32_t kZoneIdAmerica_Scoresbysund = 0x123f8d2a; // America/Scoresbysund
404402
const uint32_t kZoneIdAmerica_Sitka = 0x99104ce2; // America/Sitka
405403
const uint32_t kZoneIdAmerica_Swift_Current = 0xdef98e55; // America/Swift_Current
406404
const uint32_t kZoneIdAmerica_Tegucigalpa = 0xbfd6fd4c; // America/Tegucigalpa
@@ -561,7 +559,7 @@ const uint32_t kZoneIdWET = 0x0b882e35; // WET
561559

562560

563561
//---------------------------------------------------------------------------
564-
// Supported links: 220
562+
// Supported links: 219
565563
//---------------------------------------------------------------------------
566564

567565
extern const basic::ZoneInfo kZoneAfrica_Accra; // Africa/Accra -> Africa/Abidjan
@@ -638,7 +636,6 @@ extern const basic::ZoneInfo kZoneAntarctica_DumontDUrville; // Antarctica/Dumon
638636
extern const basic::ZoneInfo kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland
639637
extern const basic::ZoneInfo kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland
640638
extern const basic::ZoneInfo kZoneAntarctica_Syowa; // Antarctica/Syowa -> Asia/Riyadh
641-
extern const basic::ZoneInfo kZoneAntarctica_Vostok; // Antarctica/Vostok -> Asia/Urumqi
642639
extern const basic::ZoneInfo kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Berlin
643640
extern const basic::ZoneInfo kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh
644641
extern const basic::ZoneInfo kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat
@@ -862,7 +859,6 @@ const uint32_t kZoneIdAntarctica_DumontDUrville = 0x5a3c656c; // Antarctica/Dumo
862859
const uint32_t kZoneIdAntarctica_McMurdo = 0x6eeb5585; // Antarctica/McMurdo
863860
const uint32_t kZoneIdAntarctica_South_Pole = 0xcd96b290; // Antarctica/South_Pole
864861
const uint32_t kZoneIdAntarctica_Syowa = 0xe330c7e1; // Antarctica/Syowa
865-
const uint32_t kZoneIdAntarctica_Vostok = 0x4f966fd4; // Antarctica/Vostok
866862
const uint32_t kZoneIdArctic_Longyearbyen = 0xd23e7859; // Arctic/Longyearbyen
867863
const uint32_t kZoneIdAsia_Aden = 0x1fa7084a; // Asia/Aden
868864
const uint32_t kZoneIdAsia_Ashkhabad = 0x15454f09; // Asia/Ashkhabad
@@ -1088,7 +1084,6 @@ const uint8_t kZoneBufSizeAmerica_Puerto_Rico = 1; // America/Puerto_Rico in 19
10881084
const uint8_t kZoneBufSizeAmerica_Regina = 1; // America/Regina in 1949
10891085
const uint8_t kZoneBufSizeAmerica_Santiago = 5; // America/Santiago in 2002
10901086
const uint8_t kZoneBufSizeAmerica_Sao_Paulo = 6; // America/Sao_Paulo in 2003
1091-
const uint8_t kZoneBufSizeAmerica_Scoresbysund = 5; // America/Scoresbysund in 1983
10921087
const uint8_t kZoneBufSizeAmerica_Sitka = 6; // America/Sitka in 2008
10931088
const uint8_t kZoneBufSizeAmerica_Swift_Current = 1; // America/Swift_Current in 1949
10941089
const uint8_t kZoneBufSizeAmerica_Tegucigalpa = 3; // America/Tegucigalpa in 1987
@@ -1249,7 +1244,7 @@ const uint8_t kZoneBufSizeWET = 5; // WET in 1983
12491244

12501245

12511246
//---------------------------------------------------------------------------
1252-
// Unsupported zones: 122
1247+
// Unsupported zones: 124
12531248
//---------------------------------------------------------------------------
12541249

12551250
// Africa/Cairo {policy 'Egypt' not found}
@@ -1309,6 +1304,7 @@ const uint8_t kZoneBufSizeWET = 5; // WET in 1983
13091304
// America/Rio_Branco {UNTIL contains month/day/time}
13101305
// America/Santarem {UNTIL contains month/day/time}
13111306
// America/Santo_Domingo {UNTIL contains month/day/time}
1307+
// America/Scoresbysund {UNTIL contains month/day/time}
13121308
// America/St_Johns {UNTIL contains month/day/time}
13131309
// America/Tijuana {UNTIL contains month/day/time}
13141310
// America/Whitehorse {UNTIL contains month/day/time}
@@ -1318,6 +1314,7 @@ const uint8_t kZoneBufSizeWET = 5; // WET in 1983
13181314
// Antarctica/Mawson {UNTIL contains month/day/time}
13191315
// Antarctica/Palmer {UNTIL contains month/day/time}
13201316
// Antarctica/Troll {UNTIL contains month/day/time}
1317+
// Antarctica/Vostok {UNTIL contains month/day/time}
13211318
// Asia/Almaty {UNTIL contains month/day/time}
13221319
// Asia/Amman {UNTIL contains month/day/time}
13231320
// Asia/Anadyr {UNTIL contains month/day/time}

0 commit comments

Comments
 (0)