Skip to content

Commit

Permalink
Update to tzdb 2024b
Browse files Browse the repository at this point in the history
  • Loading branch information
phensley committed Oct 22, 2024
1 parent 8466b96 commit 47f0045
Show file tree
Hide file tree
Showing 5 changed files with 320 additions and 332 deletions.
4 changes: 2 additions & 2 deletions packages/cldr-core/src/systems/calendars/autogen.zonedata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

export const metazoneData = {
// mapping of time zone's array index to metazone's array index
zoneindex: '88 3 8 c d e k 13 p r 1b 11 15 ai 17 1c 1d 1e 1f 1g 1h 1k 23 28 2f 3i 1l 3y 1m 1n 1o 1p 1q 1r 1t 1u 1v 1w 1x 1y 20 21 22 24 25 26 27 29 2b 2c 2d 2g 2i 2k 2l 2m 2n 2o 2q 2r 2s 2t 2u 2v 2x 2y 31 32 33 34 35 36 3e 37 38 39 3a 3b 3c 3d 3f 3g 3h 3j 3p 3k 3m 3n 3o 3r 3s 3t 3v 3w 3x 3z 40 41 42 43 44 45 46 49 4a 4b 4c 4d 4e 2w 4f 4g 4h 4i 4k 4l 5a 4n 4o 4p 4q 4r 4s 4t 4u 4v 4w 4x 4y 50 55 56 57 58 59 5b 5c 5d 5e 5f 5g 5i 5j 5l 5m 5o 5p 5s 5t 5u 5v 5w 5x 5y 5z 61 ab -1 63 64 67 68 69 6a 6b 6c aj 6e 6f 6g 6h 7f 6i 6j 6k 6l 6m 6n 6o 6p 6q 6r 6s 66 6t 6v 6x 6y 6z 70 72 73 74 75 76 78 79 7a 7b 7c 7e 7g 7h 7i 7j 7k 7l 7m 7n 7o 7p 7q 7r -1 7s 7t 7u 7w 7x ac 7y 7z 80 81 82 83 84 85 87 89 8a 8b 8c 8d 8e 8f 8g 8h 8i 8j 8k -1 8l -1 -1 8m 8n -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 8n 8p 8q 8r a7 9x 9d 8w 8x 8z 91 92 9g 96 98 -1 99 9a 9c 9e 9f 9h 9j 9l 9n 9o a2 9q 9t 9u 9w 9y 9z a0 a3 a4 a5 a6 a8 -1 -1 aa ag ah -1 -1 ak bn al am an ao ap aq as at av aw bd bg az ar b0 b1 b2 b4 b6 b7 b8 b9 ba bb bc bk bf bh bm bj -1',
zoneindex: '88 3 8 c d e k 13 p r 1b 11 15 ai 17 1c 1d 1e 1f 1g 1h 1k 23 28 2f 3i 1l 3y 1m 1n 1o 1p 1q 1r 1t 1u 1v 1w 1x 1y 20 21 22 24 25 26 27 29 8l 2c 2d 2g 2i 2k 2l 2m ak 2o 2q 2r 2s 2t 2u 2v 2x 2y 31 32 33 34 35 36 3e 37 38 39 3a 3b 3c 3d 3f 3g 3h 3j 3p 3k 3m 3n bn 3r 3s 3t 3v 3w 3x 3z 40 41 42 43 44 45 46 8m 4a 4b 4c 4d 4e 2w 4f 4g 4h 4i 4k 4l 5a 4n 4o 4p 4q 4r 4s 4t 4u 4v 4w 4x 4y 50 55 56 57 58 59 5b 5c 5d 5e 5f 5g 5i 5j 5l 5m 5o 5p 5s 5t 5u 5v 5w 5x 5y 5z 61 ab -1 63 64 67 69 6a 6b 6c aj 6e 6f 6g 6h 7f 6i 6j 6k 6l 6m 6n 6o 6p 6q 6r 6s 66 6t 6v 6x 6y 6z 70 72 73 74 75 76 78 79 7a 7b 7c 7e 7g 7h 7i 7j 7k 7l 7m 7n 7o 7p 7q 7r -1 7s 7t 7u 7w 7x ac 7y 7z 80 81 82 83 84 85 87 89 8a 8b 8c 8d 8e 8f 8g 8h 8i 8j 8k 8n -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 8n 8p 8q 8r a7 9x 9d 8w 8x 8z 91 92 9g 96 98 -1 99 9a 9c 9e 9f 9h 9j 9l 9n 9o a2 9q 9t 9u 9w 9y 9z a0 a3 a4 a5 a6 a8 -1 aa ag ah al am an ao ap aq as at av aw bd bg az ar b0 b1 b2 b4 b6 b7 b8 b9 ba bb bc bk bf bh bm bj',

// array of metazone ids
metazoneids: 'GMT Africa_Eastern Europe_Western Europe_Central Africa_Western Africa_FarWestern Africa_Central Europe_Eastern Africa_Southern Liberia Bering Hawaii_Aleutian Alaska_Hawaii Alaska Atlantic Brasilia Argentina Argentina_Western Paraguay America_Pacific America_Mountain America_Central Amazon Colombia America_Eastern Venezuela French_Guiana Mexico_Pacific Greenland_Western Yukon Acre Greenland Goose_Bay Ecuador Guyana Cuba Bolivia Peru Pierre_Miquelon Uruguay Noronha Dutch_Guiana Suriname Chile Dominican Greenland_Central Greenland_Eastern Newfoundland Australia_Western Casey Davis DumontDUrville Australia_Eastern Mawson New_Zealand Rothera Syowa Vostok Arabian Almaty Kazakhstan_Eastern Kazakhstan_Western Anadyr Magadan Shevchenko Aqtau Aktyubinsk Aqtobe Ashkhabad Turkmenistan Gulf Baku Azerbaijan Indochina Frunze Kyrgystan Brunei India Yakutsk Irkutsk Mongolia Choibalsan Lanka Dacca Bangladesh East_Timor Indonesia_Central Dushanbe Tajikistan Israel Hong_Kong Hovd Indonesia_Western Indonesia_Eastern Afghanistan Kamchatka Karachi Pakistan Nepal Vladivostok Krasnoyarsk Malaya Malaysia Borneo Macau China Philippines Novosibirsk Omsk Uralsk Oral Korea Pyongyang Kizilorda Qyzylorda Myanmar Sakhalin Samarkand Tashkent Uzbekistan Singapore Taipei Tbilisi Georgia Iran Bhutan Japan Urumqi Sverdlovsk Yekaterinburg Yerevan Armenia Azores Cape_Verde South_Georgia Falkland Australia_Central Australia_CentralWestern Lord_Howe Moscow Irish British Turkey Europe_Further_Eastern Kuybyshev Samara Volgograd Indian_Ocean Christmas Cocos French_Southern Seychelles Maldives Mauritius Reunion Apia Papua_New_Guinea Chatham Easter Vanuatu Phoenix_Islands Tokelau Fiji Tuvalu Galapagos Gambier Solomon Guam Chamorro Line_Islands Kosrae Kwajalein Marshall_Islands Marquesas Samoa Nauru Niue Norfolk New_Caledonia Palau Pitcairn Ponape Cook North_Mariana Tahiti Gilbert_Islands Tonga Truk Wake Wallis'.split(' '),
Expand All @@ -18,5 +18,5 @@ export const metazoneData = {
// until timestamps
untils: '-1 -1 -1 -1 42lp80 54et80 5wuyo0 -1 -1 -1 -1 -1 2lxk40 -1 -1 -1 -1 -1 7eveo0 8cm580 -1 7eveo0 -1 -1 -1 -1 -1 -1 3a22s0 -1 -1 -1 -1 -1 fodfs0 qnth00 -1 -1 fodfs0 oyph00 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 17rzf0 -1 -1 -1 -1 -1 -1 -1 p1uqs0 pkmo40 -1 69gig0 am3h80 dyil40 ehhx40 md8w00 mv76o0 -1 -1 ajtx40 cmzh40 oyaqg0 -1 79e140 -1 79dyc0 -1 -1 -1 -1 b1l480 b51cg0 hym0c0 hzl9s0 -1 hym0c0 hzl9s0 -1 bdkr40 -1 b1l480 b51cg0 hyk5o0 i1e340 -1 ajh9k0 b6bn40 fj0b00 fqtsc0 hyk5o0 i1e340 juz1k0 krc0g0 -1 bdkr40 hym0c0 hz8b40 -1 hzl9s0 -1 -1 -1 -1 m80 l0ch00 -1 -1 -1 -1 -1 -1 -1 -1 -1 fkgjk0 g36jg0 g3jck0 gb3vo0 -1 -1 690go0 ex1so0 nj3280 -1 -1 bdkr40 hym0c0 hzl9s0 -1 -1 -1 -1 eqxno0 rkk3k0 -1 eqxno0 rkk3k0 rm5co0 -1 -1 bdkr40 -1 -1 -1 -1 -1 dkhf00 1ztvo0 qj3vg0 -1 1e0p00 -1 -1 -1 -1 -1 k2yb80 mw14g0 -1 -1 nkw140 -1 -1 -1 saxk40 -1 9iylto 9trc9o -1 nkvss0 p5ezg0 -1 -1 -1 -1 -1 -1 -1 -1 m80 -1 bdxy40 ix3240 -1 23fcs0 2ijss0 -1 432zg0 ix3240 jqyzg0 -1 ix3240 -1 -1 ix3240 jqyzg0 -1 ix3240 jeqbk0 -1 -1 4v6bs0 -1 fkge00 g36jg0 -1 -1 bcuts0 -1 5n9fs0 79dyc0 -1 g36jg0 -1 -1 -1 -1 -1 23fcs0 2ijss0 -1 -1 -1 1qkbc0 2ob1w0 bhceg0 bv2gk0 c05vc0 e3bck0 -1 -1 -1 -1 -1 m80 -1 bwats0 i4mr40 -1 1qgos0 -1 690go0 6qpf80 -1 nx4rs0 phnyg0 plmjs0 -1 -1 5e3cg0 -1 -1 -1 -1 -1 -1 -1 79dyc0 -1 -1 lbi8w0 -1 bwo3k0 -1 hncu80 -1 eqxno0 rkk3k0 -1 -1 32jwe0 -1 -1 -1 -1 -1 -1 -1 g36jg0 gb3sw0 -1 -1 -1 g36jg0 gb3sw0 j7vy40 jeqbk0 -1 k2yb80 mw14g0 -1 k2y8g0 -1 -1 2ijn80 g36go0 g4za00 -1 -1 5v6080 sb6tg0 -1 79dyc0 -1 -1 -1 -1 -1 -1 -1 17qro0 -1 -1 -1 -1 -1 -1 -1 qj3vg0 -1 79dyc0 -1 kro7c0 kyrj00 ltqko0 lzr5w0 ofen40 p5dwk0 pg70w0 pogv40 pytbg0 q6tz40 qhmv5o qpws40 r0cxto r8mus0 rj30ho rr7ls0 -1 -1 -1 -1 -1 -1 6fn4c0 -1 -1 -1 -1 -1 -1 -1 i6ey80 s9mq00 -1 -1 kzy1k0 ne06w0 -1 bghm40 i6f3s0 -1 bghm40 i6f100 -1 bdx3k0 i6f3s0 -1 -1 19d0w0 -1 baxow0 -1 -1 -1 bazjk0 -1 -1 -1 ne0cg0 o4nrc0 -1 6wun40 jyjto0 -1 drxa20 ixq620 -1 -1 n30o0 -1 3b0ho0 g0zls0 -1 -1 bbgac0 -1 -1 dkh140 -1 dkh140 -1 -1 -1 -1 -1 -1 -1 -1 -1 n33g0 -1 -1 hqrlo0 lreus0 -1 -1 69g360 -1 69g1s0 -1 -1 fmzwg0 -1 -1 -1 -1 -1 -1 kzyfg0 ne0ks0 -1 -1 -1 bghow0 i6f3s0 -1 -1 9e5gg0 -1 nt2v00 p87lo0 -1 19d0w0 i6f100 s9mq00 -1 bghm40 i6f100 pk1rc0 -1 -1 2uaps0 -1 -1 64pu00 6e2vc0 bb18o0 -1 -1 -1 -1 -1 -1 bb18o0 -1 b3kvk0 -1 -1 99fa20 -1 -1 -1 -1 5vapo0 lres00 -1 -1 -1 -1 bi8t40 -1 bc64w0 -1 bv7s80 c4kqs0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 5tp880 -1 -1 -1 -1 -1 -1 -1 -1 blufs0 -1 -1 -1 -1 -1 -1 -1 -1 -1 am7100 -1 -1 yd6w0 -1 -1 yd6w0 -1 -1 yd6w0 -1 4fid00 7zfx00 od3p00 -1 yd6w0 -1 a1bbw0 liow00 ne0vw0 -1 ap2t40 -1 3ijk00 bv7pg0 dp3xg0 -1 -1 yd6w0 -1 -1 -1 -1 -1 b34fw0 liow00 ne2ns0 -1 -1 b34fw0 bi8yo0 -1 -1 -1 -1 -1 a1bbw0 -1 -1 a1b940 b34fw0 bchk00 -1 -1 blufs0 -1 ap2vw0 cp3bo0 e7u040 n382o0 -1 -1 -1 -1 a1bbw0 -1 bi8yo0 -1 -1 -1 -1 a1bbw0 eqk2s0 fkg040 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 8cmlw0 -1 -1 -1 g5z2w0 -1 77sp80 -1 -1 -1 cc3yo0 -1 -1 -1 77ss00 -1 -1 -1 -1 -1 77ss00 -1 -1 -1 -1 -1 -1 g5z2w0 -1 -1 -1 -1 -1 -1 -1',
// mapping of tzdb id back to cldr stable id used for schema lookups
stableids: '0:Africa/Accra|13:Africa/Addis_Ababa|13:Africa/Asmera|0:Africa/Bamako|10:Africa/Bangui|0:Africa/Banjul|11:Africa/Blantyre|10:Africa/Brazzaville|11:Africa/Bujumbura|0:Africa/Conakry|0:Africa/Dakar|13:Africa/Dar_es_Salaam|13:Africa/Djibouti|10:Africa/Douala|0:Africa/Freetown|11:Africa/Gaborone|11:Africa/Harare|13:Africa/Kampala|11:Africa/Kigali|10:Africa/Kinshasa|10:Africa/Libreville|0:Africa/Lome|10:Africa/Luanda|11:Africa/Lubumbashi|11:Africa/Lusaka|10:Africa/Malabo|7:Africa/Maseru|7:Africa/Mbabane|13:Africa/Mogadishu|10:Africa/Niamey|0:Africa/Nouakchott|0:Africa/Ouagadougou|10:Africa/Porto-Novo|116:America/Anguilla|116:America/Antigua|116:America/Aruba|116:America/Blanc-Sablon|22:America/Buenos_Aires|23:America/Catamarca|111:America/Cayman|111:America/Coral_Harbour|24:America/Cordoba|113:America/Creston|116:America/Curacao|116:America/Dominica|109:America/Godthab|116:America/Grenada|116:America/Guadeloupe|72:America/Indianapolis|25:America/Jujuy|116:America/Kralendijk|84:America/Louisville|116:America/Lower_Princes|116:America/Marigot|27:America/Mendoza|116:America/Montserrat|134:America/Nassau|116:America/Port_of_Spain|116:America/St_Barthelemy|116:America/St_Kitts|116:America/St_Lucia|116:America/St_Thomas|116:America/St_Vincent|116:America/Tortola|346:Antarctica/DumontDUrville|322:Antarctica/McMurdo|200:Antarctica/Syowa|278:Arctic/Longyearbyen|200:Asia/Aden|197:Asia/Bahrain|185:Asia/Brunei|183:Asia/Calcutta|181:Asia/Katmandu|205:Asia/Kuala_Lumpur|200:Asia/Kuwait|166:Asia/Muscat|156:Asia/Phnom_Penh|219:Asia/Rangoon|171:Asia/Saigon|156:Asia/Vientiane|226:Atlantic/Faeroe|0:Atlantic/Reykjavik|0:Atlantic/St_Helena|279:Europe/Amsterdam|297:Europe/Bratislava|311:Europe/Busingen|278:Europe/Copenhagen|291:Europe/Guernsey|291:Europe/Isle_of_Man|291:Europe/Jersey|289:Europe/Kiev|277:Europe/Ljubljana|279:Europe/Luxembourg|285:Europe/Mariehamn|296:Europe/Monaco|278:Europe/Oslo|277:Europe/Podgorica|299:Europe/San_Marino|277:Europe/Sarajevo|277:Europe/Skopje|278:Europe/Stockholm|311:Europe/Vaduz|299:Europe/Vatican|277:Europe/Zagreb|13:Indian/Antananarivo|156:Indian/Christmas|219:Indian/Cocos|13:Indian/Comoro|315:Indian/Kerguelen|166:Indian/Mahe|13:Indian/Mayotte|166:Indian/Reunion|334:Pacific/Enderbury|349:Pacific/Funafuti|349:Pacific/Majuro|343:Pacific/Midway|331:Pacific/Ponape|332:Pacific/Saipan|346:Pacific/Truk|349:Pacific/Wake|349:Pacific/Wallis'
stableids: '0:Africa/Accra|13:Africa/Addis_Ababa|13:Africa/Asmera|0:Africa/Bamako|10:Africa/Bangui|0:Africa/Banjul|11:Africa/Blantyre|10:Africa/Brazzaville|11:Africa/Bujumbura|0:Africa/Conakry|0:Africa/Dakar|13:Africa/Dar_es_Salaam|13:Africa/Djibouti|10:Africa/Douala|0:Africa/Freetown|11:Africa/Gaborone|11:Africa/Harare|13:Africa/Kampala|11:Africa/Kigali|10:Africa/Kinshasa|10:Africa/Libreville|0:Africa/Lome|10:Africa/Luanda|11:Africa/Lubumbashi|11:Africa/Lusaka|10:Africa/Malabo|7:Africa/Maseru|7:Africa/Mbabane|13:Africa/Mogadishu|10:Africa/Niamey|0:Africa/Nouakchott|0:Africa/Ouagadougou|10:Africa/Porto-Novo|116:America/Anguilla|116:America/Antigua|116:America/Aruba|116:America/Blanc-Sablon|22:America/Buenos_Aires|23:America/Catamarca|111:America/Cayman|111:America/Coral_Harbour|24:America/Cordoba|113:America/Creston|116:America/Curacao|116:America/Dominica|109:America/Godthab|116:America/Grenada|116:America/Guadeloupe|72:America/Indianapolis|25:America/Jujuy|116:America/Kralendijk|84:America/Louisville|116:America/Lower_Princes|116:America/Marigot|27:America/Mendoza|116:America/Montserrat|134:America/Nassau|116:America/Port_of_Spain|116:America/St_Barthelemy|116:America/St_Kitts|116:America/St_Lucia|116:America/St_Thomas|116:America/St_Vincent|116:America/Tortola|335:Antarctica/DumontDUrville|311:Antarctica/McMurdo|199:Antarctica/Syowa|272:Arctic/Longyearbyen|199:Asia/Aden|196:Asia/Bahrain|184:Asia/Brunei|182:Asia/Calcutta|213:Asia/Choibalsan|180:Asia/Katmandu|204:Asia/Kuala_Lumpur|199:Asia/Kuwait|165:Asia/Muscat|156:Asia/Phnom_Penh|218:Asia/Rangoon|170:Asia/Saigon|156:Asia/Vientiane|225:Atlantic/Faeroe|0:Atlantic/Reykjavik|0:Atlantic/St_Helena|273:Europe/Amsterdam|291:Europe/Bratislava|305:Europe/Busingen|272:Europe/Copenhagen|285:Europe/Guernsey|285:Europe/Isle_of_Man|285:Europe/Jersey|283:Europe/Kiev|271:Europe/Ljubljana|273:Europe/Luxembourg|279:Europe/Mariehamn|290:Europe/Monaco|272:Europe/Oslo|271:Europe/Podgorica|293:Europe/San_Marino|271:Europe/Sarajevo|271:Europe/Skopje|272:Europe/Stockholm|305:Europe/Vaduz|293:Europe/Vatican|271:Europe/Zagreb|13:Indian/Antananarivo|156:Indian/Christmas|218:Indian/Cocos|13:Indian/Comoro|308:Indian/Kerguelen|165:Indian/Mahe|13:Indian/Mayotte|165:Indian/Reunion|323:Pacific/Enderbury|338:Pacific/Funafuti|338:Pacific/Majuro|332:Pacific/Midway|320:Pacific/Ponape|321:Pacific/Saipan|335:Pacific/Truk|338:Pacific/Wake|338:Pacific/Wallis'
};
2 changes: 1 addition & 1 deletion packages/cldr-core/src/systems/calendars/timezone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class Metazones {
// cases should ensure they're in sync, but warn of a discrepancy
/* istanbul ignore if */
if (zoneids.length !== zoneindex.length) {
console.log(`Error: time zone ids and zone index are not in sync!`);
console.log(`Error: time zone ids and zone index are not in sync!`, zoneids.length, '!=', zoneindex.length);
}

for (let i = 0; i < zoneindex.length; i++) {
Expand Down
8 changes: 4 additions & 4 deletions packages/timezone/__tests__/metadata.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ test('standard offset', () => {
expect(r.countries).toEqual(['CI', 'BF', 'GH', 'GM', 'GN', 'IS', 'ML', 'MR', 'SH', 'SL', 'SN', 'TG']);

r = TZ.zoneMeta('CET')!;
expect(r.zoneid).toEqual('CET');
expect(r.zoneid).toEqual('Europe/Brussels');
expect(r.stdoffset).toEqual(3600000);
expect(r.latitude).toEqual(0);
expect(r.longitude).toEqual(0);
expect(r.countries).toEqual([]);
expect(r.latitude).toEqual(50.833333);
expect(r.longitude).toEqual(4.333333);
expect(r.countries).toEqual(['BE', 'LU', 'NL']);

r = TZ.zoneMeta('FOO');
expect(r).toEqual(undefined);
Expand Down
Loading

0 comments on commit 47f0045

Please sign in to comment.