Update Android to tzdb 2020a
From the 2020a release notes:
Changes to future timestamps
Morocco's second spring-forward transition in 2020 will be May 31,
not May 24 as predicted earlier. (Thanks to Semlali Naoufal.)
Adjust future-year predictions to use the first Sunday after the
day after Ramadan, not the first Sunday after Ramadan.
Canada's Yukon, represented by America/Whitehorse and
America/Dawson, advanced to -07 year-round, beginning with its
spring-forward transition on 2020-03-08, and will not fall back on
2020-11-01. Although a government press release calls this
"permanent Pacific Daylight Saving Time", we prefer MST for
consistency with nearby Dawson Creek, Creston, and Fort Nelson.
(Thanks to Tim Parenti.)
Changes to past timestamps
Shanghai observed DST in 1919. (Thanks to Phake Nick.)
Changes to timezone identifiers
To reflect current usage in English better, America/Godthab has
been renamed to America/Nuuk. A backwards-compatibility link
remains for the old name.
-----------------
Android commentary:
Besides the main Morocco change, the following are relevant:
1) The changes in the Yukon have some knock-ons in Android's data:
Two zones are no longer on UTC-8, which means they are now distinct from
America/Vancouver. One of them, America/Whitehorse, which looks like it
has the biggest population, will now be shown in the SettingsUI manual
time zone picker in recent releases.
2) Some knockons in data for the Godthab / Nuuk ID switch - Nuuk will be
used / shown instead of Godthab by default.
Related to (1) there has been a change the detection order / default
zone for Canada as the current one didn't make sense: it just reflected
historic Android behavior, which was related to longitude and UTC
offset. The new default is Toronto (most populous city, AFAIK), and the
new order will search zones in order of city population (thus,
hopefully, likelihood) and ensure that Android picks the more populous
zones over less populous ones when there is ambiguity.
Adhoc testing suggests no unwanted changes from previous detection behavior.
The following changes will occur, but only the first is likely to happen
in the wild as "DST unknown" from NITZ is mostly theoretical.
a) UTC-7 / no DST / summer: America/Whitehorse not America/Dawson_Creek
b) UTC-7 / DST unknown / summer: America/Vancouver, not America/Dawson_Creek
c) UTC-6 / DST unknown / summer: America/Edmonton, not America/Regina
d) UTC-5 / DST unknown / summer: America/Winnipeg, not America/Atikokan
e) UTC-4 / DST unknown / summer: America/Toronto, not America/Blanc-Sablon
Bug: 154892752
Test: Ran CTS tests: CtsLibcoreTestCases, CtsLibcoreOjTestCases,
Test: CtsIcuTestCases, CtsBionicTestCases, CtsTextTestCases
Change-Id: Id82b58f1029e588908eb7601f1893138b9abf183
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index a78447b..25a0376 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt
@@ -25,7 +25,7 @@
# a time zone for an Android device.
# ianaVersion: The version of the IANA rules this file matches.
-ianaVersion:"2019c"
+ianaVersion:"2020a"
# countries:
#
@@ -764,7 +764,40 @@
# Priority is related to the city population.
countries:<
isoCode:"ca"
- defaultTimeZoneId:"America/St_Johns"
+ defaultTimeZoneId:"America/Toronto"
+
+ # The following zones are in rough population order to support telephony
+ # time zone detection.
+ timeZoneMappings:<
+ utcOffset:"-5:00"
+ id:"America/Toronto"
+ # 5.43M
+ priority:5430
+ >
+ timeZoneMappings:<
+ utcOffset:"-8:00"
+ id:"America/Vancouver"
+ # 2.26M
+ priority:2260
+ >
+ timeZoneMappings:<
+ utcOffset:"-7:00"
+ id:"America/Edmonton"
+ # 1.06M
+ priority:1060
+ >
+ timeZoneMappings:<
+ utcOffset:"-6:00"
+ id:"America/Winnipeg"
+ # 712K
+ priority:712
+ >
+ timeZoneMappings:<
+ utcOffset:"-4:00"
+ id:"America/Halifax"
+ # 316K
+ priority:316
+ >
timeZoneMappings:<
utcOffset:"-3:30"
id:"America/St_Johns"
@@ -772,12 +805,8 @@
priority:109
>
- timeZoneMappings:<
- utcOffset:"-4:00"
- id:"America/Halifax"
- # 316K
- priority:316
- >
+ # Other zones are in offset (in July) order.
+
timeZoneMappings:<
utcOffset:"-4:00"
id:"America/Glace_Bay"
@@ -805,12 +834,6 @@
timeZoneMappings:<
utcOffset:"-5:00"
- id:"America/Toronto"
- # 5.43M
- priority:5430
- >
- timeZoneMappings:<
- utcOffset:"-5:00"
id:"America/Nipigon"
# 1.63K
priority:1
@@ -842,12 +865,6 @@
timeZoneMappings:<
utcOffset:"-6:00"
- id:"America/Winnipeg"
- # 712K
- priority:712
- >
- timeZoneMappings:<
- utcOffset:"-6:00"
id:"America/Regina"
# 215K
priority:215
@@ -879,12 +896,6 @@
timeZoneMappings:<
utcOffset:"-7:00"
- id:"America/Edmonton"
- # 1.06M
- priority:1060
- >
- timeZoneMappings:<
- utcOffset:"-7:00"
id:"America/Cambridge_Bay"
# 1.77K
priority:2
@@ -903,6 +914,12 @@
>
timeZoneMappings:<
utcOffset:"-7:00"
+ id:"America/Whitehorse"
+ # 25.1K
+ priority:251
+ >
+ timeZoneMappings:<
+ utcOffset:"-7:00"
id:"America/Dawson_Creek"
# 13.0K
priority:13
@@ -919,21 +936,8 @@
# 3.90K
priority:4
>
-
timeZoneMappings:<
- utcOffset:"-8:00"
- id:"America/Vancouver"
- # 2.26M
- priority:2260
- >
- timeZoneMappings:<
- utcOffset:"-8:00"
- id:"America/Whitehorse"
- # 25.1K
- priority:251
- >
- timeZoneMappings:<
- utcOffset:"-8:00"
+ utcOffset:"-7:00"
id:"America/Dawson"
# 1.38K
priority:1
@@ -1430,7 +1434,7 @@
# GREENLAND
countries:<
isoCode:"gl"
- defaultTimeZoneId:"America/Godthab"
+ defaultTimeZoneId:"America/Nuuk"
timeZoneMappings:<
utcOffset:"0:00"
id:"America/Danmarkshavn"
@@ -1443,7 +1447,7 @@
timeZoneMappings:<
utcOffset:"-3:00"
- id:"America/Godthab"
+ id:"America/Nuuk"
>
timeZoneMappings:<
diff --git a/input_data/iana/tzdata2019c.tar.gz b/input_data/iana/tzdata2019c.tar.gz
deleted file mode 100644
index 2a9c944..0000000
--- a/input_data/iana/tzdata2019c.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2019c.tar.gz.asc b/input_data/iana/tzdata2019c.tar.gz.asc
deleted file mode 100644
index ed2ac8f..0000000
--- a/input_data/iana/tzdata2019c.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl15Gt8ACgkQ7ZfpDmKq
-fjQJIQ//d285K+JrdfrQdhWCps5cQkxylPUyCvuBLEW7fI/hbyyWDL5Mh0KF1goT
-9eboGFxenHsNGpEpyEp9DGPc17PmA4lck0gQ7Uz3dZ/AkmZ+mFipHKlxk8SDDNEV
-WssSqdKEi8ZkKznVRrfQt2RAHeNHy2xofKmhkVn3dOCOMzp4RCC/eet+gqDVCXmT
-jN+sLRpWJq66fn/Ap3lpAvXVHb5aw/fLb1VsncD5L6JppGdCvdPpEGo4Hx4LgmVt
-pxQE0zACGSQzC49P6UsHPP0kiQDCAvDheyKQsnnWR4ii2elOrcQncKXaSla+CCqQ
-dBClTx52fCTUWzmFHI/aTRz01jOomKa5bK1QSgmIZK4dg56oC6zj9740ingcSrt3
-Q5+hQp5KeXjab/jqgZhWbuWG90Yho8v8WLP9Pde8CYma+UyKzIPsD7KdVqHzGylK
-PYkeyfgR3GuaxOYnseg+xr68OEYXK36PAGspiJkdGklRZ0eoEPNm1PpQSm+mVORP
-LOWgvR6+kz1AFM9Qr0hZph1YfiFp4P3X/fbwweW+uHmSAyiXiXTvDlOhBJ4Od2mG
-J8WWgMzXOK6MP+vbKSVXysFX6GTXkaP4c9Ou9B9OQkF5PGK6294so6dcVJ9Aw7ot
-ZWyzyEdkUX3gyHjsaLbS4TexBu8Y46IPoL+42FbBdO61Aj2QhBA=
-=EFVW
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2020a.tar.gz b/input_data/iana/tzdata2020a.tar.gz
new file mode 100644
index 0000000..15b39fb
--- /dev/null
+++ b/input_data/iana/tzdata2020a.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2020a.tar.gz.asc b/input_data/iana/tzdata2020a.tar.gz.asc
new file mode 100644
index 0000000..222ad46
--- /dev/null
+++ b/input_data/iana/tzdata2020a.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl6iH9MACgkQ7ZfpDmKq
+fjTb6g/+P/l6Nev5Zv8mUktnT6eNKohtgpNRyHd8nYV92wmTiDSzAArFy7oi5CVV
+/jMv8sbV1ssq/5rQ6HUQuMDPgEIO405gxmqRWMhE6UwUbRxxa+/HKGUJH0AHY6Dh
+1UhVD7QA6fDovs84ip/WgTEZYcYApLr2A3IfC0rDqDo42DiSnErFQDvqRMJQkQS1
+p2Pv7YtW/2NZ52wkfq75klSsjlXzlz6CzM5P3/YU/Hylj42sQdbdtbUAyQug3YpD
+QQ2PiZoP92iiGrcwkKXa5xvXJ6jEZCXqi7HbJKt8OW+XpZ/ZYbTZRq+JvMbTqkOL
++XvVufo/pVASgv2V0ynzJu/XRiFUeJaecmEg6QiAiJ74UMTXSGFnK//R32M9dp29
+B4p2X2jmW9qjCwjbjQXl1Yl5ddlSyvBk2Lk4s1repQ2t7kphZx2C8P2WyQYGeP7H
+nZDucfmWK4OSh8cINexBE8xyagmv1T8mC4qEQbVPva6JysaodNBcf9WkKMCgituP
+tbPsVekSmG1GyN2ixPtpY86Fzjr60mEg1UKqHZIagRmH4kjUwd1gINCJgONaZZxo
+c1VfBD8ZORBZfG27+V5ISotKrK2UrKtcrSUEU1CC/ibOm1sSPfg0d5uxUVvg4E8+
+okdszbMnQ1i0eVKW+L+jY5XOO8kmSLp4YcnrqXDyZabxyWIGMt4=
+=7U2J
+-----END PGP SIGNATURE-----
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index f514e79..1820102 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2019c">
+--><timezones ianaversion="2020a">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -159,34 +159,34 @@
<country code="bz" default="America/Belize" everutc="n">
<id>America/Belize</id>
</country>
- <country code="ca" default="America/St_Johns" everutc="n">
- <id>America/St_Johns</id>
+ <country code="ca" default="America/Toronto" everutc="n">
+ <id>America/Toronto</id>
+ <id>America/Vancouver</id>
+ <id>America/Edmonton</id>
+ <id>America/Winnipeg</id>
<id>America/Halifax</id>
+ <id>America/St_Johns</id>
<id notafter="57733200000">America/Glace_Bay</id>
<id notafter="1162098000000">America/Moncton</id>
<id notafter="1299996000000">America/Goose_Bay</id>
<id>America/Blanc-Sablon</id>
- <id>America/Toronto</id>
<id notafter="89186400000">America/Nipigon</id>
<id notafter="120636000000">America/Thunder_Bay</id>
<id notafter="972802800000">America/Iqaluit</id>
<id notafter="796806000000">America/Pangnirtung</id>
<id>America/Atikokan</id>
- <id>America/Winnipeg</id>
<id>America/Regina</id>
<id notafter="1130659200000">America/Rankin_Inlet</id>
<id notafter="986112000000">America/Rainy_River</id>
<id notafter="73472400000">America/Swift_Current</id>
<id notafter="1173600000000">America/Resolute</id>
- <id>America/Edmonton</id>
<id notafter="986115600000">America/Cambridge_Bay</id>
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
- <id>America/Dawson_Creek</id>
+ <id>America/Whitehorse</id>
+ <id notafter="1583661600000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
- <id>America/Vancouver</id>
- <id notafter="309949200000">America/Whitehorse</id>
<id notafter="120646800000">America/Dawson</id>
</country>
<country code="cc" default="Indian/Cocos" everutc="n">
@@ -335,10 +335,10 @@
<country code="gi" default="Europe/Gibraltar" everutc="n">
<id>Europe/Gibraltar</id>
</country>
- <country code="gl" default="America/Godthab" everutc="y">
+ <country code="gl" default="America/Nuuk" everutc="y">
<id>America/Danmarkshavn</id>
<id>America/Scoresbysund</id>
- <id>America/Godthab</id>
+ <id>America/Nuuk</id>
<id>America/Thule</id>
</country>
<country code="gm" default="Africa/Banjul" everutc="y">
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 5cb966b..95a3958 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index 1778881..301e264 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
Binary files differ
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index e79b84e..89facfe 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index d0e6c1d..530048f 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-004.001|2019c|001
\ No newline at end of file
+004.001|2020a|001
\ No newline at end of file
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index f0e8007..9d3ae8d 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -159,34 +159,34 @@
<country code="bz" default="America/Belize" everutc="n">
<id>America/Belize</id>
</country>
- <country code="ca" default="America/St_Johns" everutc="n">
- <id>America/St_Johns</id>
+ <country code="ca" default="America/Toronto" everutc="n">
+ <id>America/Toronto</id>
+ <id>America/Vancouver</id>
+ <id>America/Edmonton</id>
+ <id>America/Winnipeg</id>
<id>America/Halifax</id>
+ <id>America/St_Johns</id>
<id notafter="57733200000">America/Glace_Bay</id>
<id notafter="1162098000000">America/Moncton</id>
<id notafter="1299996000000">America/Goose_Bay</id>
<id>America/Blanc-Sablon</id>
- <id>America/Toronto</id>
<id notafter="89186400000">America/Nipigon</id>
<id notafter="120636000000">America/Thunder_Bay</id>
<id notafter="972802800000">America/Iqaluit</id>
<id notafter="796806000000">America/Pangnirtung</id>
<id>America/Atikokan</id>
- <id>America/Winnipeg</id>
<id>America/Regina</id>
<id notafter="1130659200000">America/Rankin_Inlet</id>
<id notafter="986112000000">America/Rainy_River</id>
<id notafter="73472400000">America/Swift_Current</id>
<id notafter="1173600000000">America/Resolute</id>
- <id>America/Edmonton</id>
<id notafter="986115600000">America/Cambridge_Bay</id>
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
- <id>America/Dawson_Creek</id>
+ <id>America/Whitehorse</id>
+ <id notafter="1583661600000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
- <id>America/Vancouver</id>
- <id notafter="309949200000">America/Whitehorse</id>
<id notafter="120646800000">America/Dawson</id>
</country>
<country code="cc" default="Indian/Cocos" everutc="n">
@@ -335,10 +335,10 @@
<country code="gi" default="Europe/Gibraltar" everutc="n">
<id>Europe/Gibraltar</id>
</country>
- <country code="gl" default="America/Godthab" everutc="y">
+ <country code="gl" default="America/Nuuk" everutc="y">
<id>America/Danmarkshavn</id>
<id>America/Scoresbysund</id>
- <id>America/Godthab</id>
+ <id>America/Nuuk</id>
<id>America/Thule</id>
</country>
<country code="gm" default="Africa/Banjul" everutc="y">
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 68c13e4..c607a8a 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 333cd7b..c5a28a4 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
index 53c3b5c..8ed9429 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml
index bbc984a..5f86aad 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -159,34 +159,34 @@
<country code="bz" default="America/Belize" everutc="n">
<id>America/Belize</id>
</country>
- <country code="ca" default="America/St_Johns" everutc="n">
- <id>America/St_Johns</id>
+ <country code="ca" default="America/Toronto" everutc="n">
+ <id>America/Toronto</id>
+ <id>America/Vancouver</id>
+ <id>America/Edmonton</id>
+ <id>America/Winnipeg</id>
<id>America/Halifax</id>
+ <id>America/St_Johns</id>
<id notafter="57733200000">America/Glace_Bay</id>
<id notafter="1162098000000">America/Moncton</id>
<id notafter="1299996000000">America/Goose_Bay</id>
<id>America/Blanc-Sablon</id>
- <id>America/Toronto</id>
<id notafter="89186400000">America/Nipigon</id>
<id notafter="120636000000">America/Thunder_Bay</id>
<id notafter="972802800000">America/Iqaluit</id>
<id notafter="796806000000">America/Pangnirtung</id>
<id>America/Atikokan</id>
- <id>America/Winnipeg</id>
<id>America/Regina</id>
<id notafter="1130659200000">America/Rankin_Inlet</id>
<id notafter="986112000000">America/Rainy_River</id>
<id notafter="73472400000">America/Swift_Current</id>
<id notafter="1173600000000">America/Resolute</id>
- <id>America/Edmonton</id>
<id notafter="986115600000">America/Cambridge_Bay</id>
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
- <id>America/Dawson_Creek</id>
+ <id>America/Whitehorse</id>
+ <id notafter="1583661600000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
- <id>America/Vancouver</id>
- <id notafter="309949200000">America/Whitehorse</id>
<id notafter="120646800000">America/Dawson</id>
</country>
<country code="cc" default="Indian/Cocos" everutc="n">
@@ -335,10 +335,10 @@
<country code="gi" default="Europe/Gibraltar" everutc="n">
<id>Europe/Gibraltar</id>
</country>
- <country code="gl" default="America/Godthab" everutc="y">
+ <country code="gl" default="America/Nuuk" everutc="y">
<id>America/Danmarkshavn</id>
<id>America/Scoresbysund</id>
- <id>America/Godthab</id>
+ <id>America/Nuuk</id>
<id>America/Thule</id>
</country>
<country code="gm" default="Africa/Banjul" everutc="y">
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 09a1fa9..56afe3b 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index 883b3bd..c2d09f8 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
index a0a1982..533792d 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index f0e8007..9d3ae8d 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -159,34 +159,34 @@
<country code="bz" default="America/Belize" everutc="n">
<id>America/Belize</id>
</country>
- <country code="ca" default="America/St_Johns" everutc="n">
- <id>America/St_Johns</id>
+ <country code="ca" default="America/Toronto" everutc="n">
+ <id>America/Toronto</id>
+ <id>America/Vancouver</id>
+ <id>America/Edmonton</id>
+ <id>America/Winnipeg</id>
<id>America/Halifax</id>
+ <id>America/St_Johns</id>
<id notafter="57733200000">America/Glace_Bay</id>
<id notafter="1162098000000">America/Moncton</id>
<id notafter="1299996000000">America/Goose_Bay</id>
<id>America/Blanc-Sablon</id>
- <id>America/Toronto</id>
<id notafter="89186400000">America/Nipigon</id>
<id notafter="120636000000">America/Thunder_Bay</id>
<id notafter="972802800000">America/Iqaluit</id>
<id notafter="796806000000">America/Pangnirtung</id>
<id>America/Atikokan</id>
- <id>America/Winnipeg</id>
<id>America/Regina</id>
<id notafter="1130659200000">America/Rankin_Inlet</id>
<id notafter="986112000000">America/Rainy_River</id>
<id notafter="73472400000">America/Swift_Current</id>
<id notafter="1173600000000">America/Resolute</id>
- <id>America/Edmonton</id>
<id notafter="986115600000">America/Cambridge_Bay</id>
<id notafter="309945600000">America/Yellowknife</id>
<id notafter="294228000000">America/Inuvik</id>
- <id>America/Dawson_Creek</id>
+ <id>America/Whitehorse</id>
+ <id notafter="1583661600000">America/Dawson_Creek</id>
<id notafter="84013200000">America/Creston</id>
<id notafter="1425808800000">America/Fort_Nelson</id>
- <id>America/Vancouver</id>
- <id notafter="309949200000">America/Whitehorse</id>
<id notafter="120646800000">America/Dawson</id>
</country>
<country code="cc" default="Indian/Cocos" everutc="n">
@@ -335,10 +335,10 @@
<country code="gi" default="Europe/Gibraltar" everutc="n">
<id>Europe/Gibraltar</id>
</country>
- <country code="gl" default="America/Godthab" everutc="y">
+ <country code="gl" default="America/Nuuk" everutc="y">
<id>America/Danmarkshavn</id>
<id>America/Scoresbysund</id>
- <id>America/Godthab</id>
+ <id>America/Nuuk</id>
<id>America/Thule</id>
</country>
<country code="gm" default="Africa/Banjul" everutc="y">
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index f6353da..e9244b9 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index 333cd7b..c5a28a4 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
index 9975cbb..4506871 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
Binary files differ