From fbbc01b6797f8eaef2e86c9f52bd205250ee29fb Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <yumaoka@users.noreply.github.com>
Date: Wed, 28 Aug 2019 12:32:47 -0400
Subject: [PATCH] Windows mapping data updated to 2019b level

---
 WinTZ/.gitignore                              |   1 +
 .../com/ibm/icu/dev/tools/wintz/TimeZone.reg  | Bin 305582 -> 319824 bytes
 .../wintz/mapper/ExemplarLocationData.java    |   5 +
 .../icu/dev/tools/wintz/mapper/MapData.java   | 128 ++++++++++--------
 4 files changed, 78 insertions(+), 56 deletions(-)
 create mode 100644 WinTZ/.gitignore

diff --git a/WinTZ/.gitignore b/WinTZ/.gitignore
new file mode 100644
index 00000000..840e7d31
--- /dev/null
+++ b/WinTZ/.gitignore
@@ -0,0 +1 @@
+/classes/
diff --git a/WinTZ/src/com/ibm/icu/dev/tools/wintz/TimeZone.reg b/WinTZ/src/com/ibm/icu/dev/tools/wintz/TimeZone.reg
index bad9da4e7f57a50927c42e77a67ddee65c2985f6..9f649fe9967a28b41d88eb8952ff032a0b9cb438 100644
GIT binary patch
delta 3403
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

delta 2197
zcmZ`)e@xV680UH4SDJ91UkT3>NiRi$6#RO35Fi>dHyAlZYt9+E(<w7_?%dS5QiIKY
z*cdV1;?ah5LlZ+}r)RxR({AaKsnKC&HkrG*)UBLex@<M(dcNQ9aZ>6(-@V`G*XMaY
z&+|TS<eO)Een<;CVT7KfCl$(-S)HM?@arKNQ<G)nL^3u_=L^u60j22s3)-aCtI3Dm
z`55TuUepTs5)5>Rd~~gaN^Cs9oicE=NJeh2meJE&r0*9S#vbtUQ1_8uyL6qdk&&>U
zA|J=WS-ci~4mgY5yFm*zsSLoBABRrs?|~+p)CR1c#p?|4a&RLQ@HM6jcPABu8q^B_
z?$DxBxj_Ff#s4K7yNcD>;Kbl8R!E9sOX0yWvzg@$p3vKhoIFWx*`VG+t%TLd=*Dsq
zc!rD(DB1jl^ASF2<Cq=`(=&wWF)*dB7LZ9C&6_|Aqc(=SrS2|-TG_BKBwf8W{O6#k
z4z-?5oA(rsu_l?=HVL+mh7CrBi>1E6Hk@C(YEFggqvM>~)e0vNgT$&9KN78Rf(=^Z
zLW5U~rc=xWvBZ&AEpmdvCN`vkSqiw-LMP-JqLuGMoHw_eTfBzade)%Ta-ov-#A#;Y
zM7<gfkC+9I>QAR=WbL&y33Tv0!t}&3J;N|P2By_?VmA)pwLqu9f63j4RUWWm`y{Yq
z)CHMRpPwU3f41R45-Sq-L2EwbV=NbvW$?K|Y#z<CaL!cFW%yw`&i6oy>8zrYA)1PT
zkGUKDZYaX_<*;9ox@|m`ZDTfh@fimOHK=UKvtjiOf~>yA=V9!1u&bt5Armlg16E`6
zIB~3Xi*PBe8hX=F_k%;0eOgM5^kQ%ixG=UE+Er#Pw2U;dT2>~vY<IWbWF4w;3smLF
z`V4O<Iwc#F{u!i?vhoRptb96<ghK5&25cnGuLSF=wl8Dls9lCi*}S_=^__;AOst+J
zQZTrW*;Lt8*t$%uuV6d#K*v8eu|3lFp1_X7qNsHX6L@|z`%MPN<(pZ$&c!geiwTvs
zm35~YmHO_}G=%dZU1>X+gNhvDr{(z$MW&m^8zMhmE~7$w#_QNDc{bK<C&C7~Egm7I
z)kk~6HAAcj)lW(X4EM8kjD5~>q&_tVW1E-_uODC^$iRm}vg{&^c2Z(po$Mp&`*w-R
zw~MVn*9E%Z{+H>J82;*$!)#SC>fbX#;{><ZUMg?qG+r!qDRAHx3*cA3Gd)y4wjQvr
zk05$(vTO`21NzJrb~W)QmI<=H!mh}!j9HaMONH6_4jlNCWwjjis%!UH?I@a{EMvE5
zNMxHM^qRRBG3??3U1{8|g21n*8lzcfOiqWXQKVU%fsr>@rsY^xNpn+wiasQ>R;y)r
zJdX#)sGbU5J67uJoI}h@zcXF!Sk4_IACo?;<(D~3$C<lCE=FGA={Q)&Yrrl0=M-c8
z1nObyI=<ek8Wmq^$8G&Q%OpE`g>HqvkM{!Ve}kD;ImWJXYk1!5=dsy%(<yYR?VYZ|
zV@20ce`%0IO%>EUU$)qfD++{{ZW_G>ZqWk;xbXxlZW$0b=oVe_+U=dvSJfzejsON`
z3R-G$(lzBT5g8Wgu|n|}>FUI6;brJMC!FZJAk6HRV$8<+kTh;Hj-uvW=Ls7J)~}-3
zh}J*}`bva`+9^)GiANZ&ZHmwqe4_R)`Nr<h{;;2-hwcBqcWHE=q9{QdZP{T#{qsaO
zn(Ow79yQ<{HfDqOX-t9(MKTUli5HE%g{}_j&d~}{n5J@;i>_%HX%k*7JITH3%ROS^
z*hF#`HJ#Bz0+cT(mX1njhL;?hLCeX0QqXehn_wO3xwvzOUIvoVF?uO+G~NqrZf9`<
z5|tR1L-*d?LuT6A8Ihuzz7|(TpzES=VB`U@<U2xr3x6kcjP{EIm~lpAS*>r+6{{8T
ax^{$FzVyG7ESH>dTNlL)_3kBc-u^Epz8v}h

diff --git a/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/ExemplarLocationData.java b/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/ExemplarLocationData.java
index 590e9c51..374c0557 100644
--- a/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/ExemplarLocationData.java
+++ b/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/ExemplarLocationData.java
@@ -127,6 +127,7 @@ class ExemplarLocationData {
         {"Kaliningrad", "Europe/Kaliningrad"},
         {"Karachi", "Asia/Karachi"},
         {"Kathmandu", "Asia/Kathmandu"},
+        {"Khartoum", "Africa/Khartoum"},
         {"Kiritimati Island", "Pacific/Kiritimati"},
         {"Kolkata", "Asia/Kolkata"},
         {"Krasnoyarsk", "Asia/Krasnoyarsk"},
@@ -169,8 +170,10 @@ class ExemplarLocationData {
         {"Port Moresby", "Pacific/Port_Moresby"},
         {"Prague", "Europe/Prague"},
         {"Pretoria", "Africa/Johannesburg"},
+        {"Punta Arenas", "America/Punta_Arenas"},
         {"Pyongyang", "Asia/Pyongyang"},
         {"Quito", "America/Guayaquil"},
+        {"Qyzylorda", "Asia/Qyzylorda"},
         {"Reykjavik", "Atlantic/Reykjavik"},
         {"Riga", "Europe/Riga"},
         {"Rio Branco", "America/Rio_Branco"},
@@ -183,8 +186,10 @@ class ExemplarLocationData {
         {"Samoa", "Pacific/Apia"},
         {"San Juan", "America/Puerto_Rico"},
         {"Santiago", "America/Santiago"},
+        {"Sao Tome", "Africa/Sao_Tome"},
         {"Sapporo", ""},
         {"Sarajevo", "Europe/Sarajevo"},
+        {"Saratov", "Europe/Saratov"},
         {"Saskatchewan", "America/Regina"},
         {"Seoul", "Asia/Seoul"},
         {"Singapore", "Asia/Singapore"},
diff --git a/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/MapData.java b/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/MapData.java
index fc725c63..1a8a49ea 100644
--- a/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/MapData.java
+++ b/WinTZ/src/com/ibm/icu/dev/tools/wintz/mapper/MapData.java
@@ -7,8 +7,8 @@
 package com.ibm.icu.dev.tools.wintz.mapper;
 
 public class MapData {
-    static final String TZDATA_VERSION = "2017a";
-    static final String WINTZDATA_VERSION = "7e00600";
+    static final String TZDATA_VERSION = "2019b";
+    static final String WINTZDATA_VERSION = "7e11200";
 
     static final String DEFAULT = "D";
     static final String REGION_DEFAULT = "R";
@@ -272,6 +272,11 @@ public class MapData {
         {"US Eastern Standard Time", "US", "America/Indiana/Vevay"},
 
 
+        // --------------------------------------------------------------------
+        // (UTC-05:00) Turks and Caicos
+        {"Turks And Caicos Standard Time", "TC", "America/Grand_Turk", DEFAULT}, // Turks and Caicos
+
+
         // --------------------------------------------------------------------
         // (UTC-04:00) Asuncion
         {"Paraguay Standard Time", "PY", "America/Asuncion", DEFAULT}, // Asuncion
@@ -369,11 +374,6 @@ public class MapData {
         {"Pacific SA Standard Time", "CL", "America/Santiago", DEFAULT}, // Santiago
 
 
-        // --------------------------------------------------------------------
-        // (UTC-04:00) Turks and Caicos
-        {"Turks And Caicos Standard Time", "TC", "America/Grand_Turk", DEFAULT}, // Turks and Caicos
-
-
         // --------------------------------------------------------------------
         // (UTC-03:30) Newfoundland
         {"Newfoundland Standard Time", "CA", "America/St_Johns", DEFAULT}, // Newfoundland
@@ -418,10 +418,6 @@ public class MapData {
         // zone defined as of March 1, 2017.
         {"SA Eastern Standard Time", "AQ", "Antarctica/Palmer"},
 
-        // New zone in tzdata2017a, UTC-3:00 all year long since Dec 2016.
-        // Windows may add a new zone for this. For now, we use this mapping
-        // with other UTC-3:00/No DST zones.
-        {"SA Eastern Standard Time", "CL", "America/Punta_Arenas", REGION_DEFAULT},
 
         // --------------------------------------------------------------------
         // (UTC-03:00) City of Buenos Aires
@@ -449,6 +445,11 @@ public class MapData {
         {"Montevideo Standard Time", "UY", "America/Montevideo", DEFAULT}, // Montevideo
 
 
+        // --------------------------------------------------------------------
+        // (UTC-03:00) Punta Arenas
+        {"Magallanes Standard Time", "CL", "America/Punta_Arenas", DEFAULT}, // Punta Arenas
+
+
         // --------------------------------------------------------------------
         // (UTC-03:00) Saint Pierre and Miquelon
         {"Saint Pierre Standard Time", "PM", "America/Miquelon", DEFAULT}, // Saint Pierre and Miquelon
@@ -493,13 +494,6 @@ public class MapData {
         {"UTC", "GL", "America/Danmarkshavn", REGION_DEFAULT},
 
 
-        // --------------------------------------------------------------------
-        // (UTC+00:00) Casablanca
-        {"Morocco Standard Time", "EH", "Africa/El_Aaiun", REGION_DEFAULT},
-
-        {"Morocco Standard Time", "MA", "Africa/Casablanca", DEFAULT},
-
-
         // --------------------------------------------------------------------
         // (UTC+00:00) Dublin, Edinburgh, Lisbon, London
         {"GMT Standard Time", "ES", "Atlantic/Canary", REGION_DEFAULT},
@@ -548,11 +542,21 @@ public class MapData {
 
         {"Greenwich Standard Time", "SN", "Africa/Dakar", REGION_DEFAULT},
 
-        {"Greenwich Standard Time", "ST", "Africa/Sao_Tome", REGION_DEFAULT},
-
         {"Greenwich Standard Time", "TG", "Africa/Lome", REGION_DEFAULT},
 
 
+        // --------------------------------------------------------------------
+        // (UTC+00:00) Sao Tome
+        {"Sao Tome Standard Time", "ST", "Africa/Sao_Tome", DEFAULT}, // Sao Tome
+
+
+        // --------------------------------------------------------------------
+        // (UTC+00:00) Casablanca
+        {"Morocco Standard Time", "EH", "Africa/El_Aaiun", REGION_DEFAULT},
+
+        {"Morocco Standard Time", "MA", "Africa/Casablanca", DEFAULT},
+
+
         // --------------------------------------------------------------------
         // (UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna
         {"W. Europe Standard Time", "AD", "Europe/Andorra",REGION_DEFAULT},
@@ -662,11 +666,6 @@ public class MapData {
         {"W. Central Africa Standard Time", "TN", "Africa/Tunis", REGION_DEFAULT},
 
 
-        // --------------------------------------------------------------------
-        // (UTC+01:00) Windhoek
-        {"Namibia Standard Time", "NA", "Africa/Windhoek", DEFAULT}, // Windhoek
-
-
         // --------------------------------------------------------------------
         // (UTC+02:00) Amman
         {"Jordan Standard Time", "JO", "Asia/Amman", DEFAULT}, // Amman
@@ -675,12 +674,14 @@ public class MapData {
         // --------------------------------------------------------------------
         // (UTC+02:00) Athens, Bucharest
         {"GTB Standard Time", "CY", "Asia/Nicosia", REGION_DEFAULT},
+        {"GTB Standard Time", "CY", "Asia/Famagusta"},
 
         {"GTB Standard Time", "GR", "Europe/Athens", REGION_DEFAULT}, // Athens
 
         {"GTB Standard Time", "RO", "Europe/Bucharest", DEFAULT}, // Bucharest
 
 
+
         // --------------------------------------------------------------------
         // (UTC+02:00) Beirut
         {"Middle East Standard Time", "LB", "Asia/Beirut", DEFAULT}, // Beirut
@@ -766,11 +767,21 @@ public class MapData {
         {"Kaliningrad Standard Time", "RU", "Europe/Kaliningrad", DEFAULT}, // Kaliningrad
 
 
+        // --------------------------------------------------------------------
+        // (UTC+02:00) Khartoum
+        {"Sudan Standard Time", "SD", "Africa/Khartoum", DEFAULT}, // Khartoum
+
+
         // --------------------------------------------------------------------
         // (UTC+02:00) Tripoli
         {"Libya Standard Time", "LY", "Africa/Tripoli", DEFAULT},
 
 
+        // --------------------------------------------------------------------
+        // (UTC+02:00) Windhoek
+        {"Namibia Standard Time", "NA", "Africa/Windhoek", DEFAULT}, // Windhoek
+
+
         // --------------------------------------------------------------------
         // (UTC+03:00) Baghdad
         {"Arabic Standard Time", "IQ", "Asia/Baghdad", DEFAULT}, // Baghdad
@@ -780,11 +791,6 @@ public class MapData {
         // (UTC+03:00) Istanbul
         {"Turkey Standard Time", "TR", "Europe/Istanbul", DEFAULT}, // Istanbul
 
-        // Asia/Famagusta was separated from Asia/Nicosia.
-        // This is UTC+3:00/No DST. We don't map Famagusta to E. Africa Standard Time
-        // (default mapping for UTC+3:00/No DST), because it follows Turkey.
-        {"Turkey Standard Time", "CY", "Asia/Famagusta", REGION_DEFAULT},
-        
 
         // --------------------------------------------------------------------
         // (UTC+03:00) Kuwait, Riyadh
@@ -805,10 +811,9 @@ public class MapData {
 
 
         // --------------------------------------------------------------------
-        // (UTC+03:00) Moscow, St. Petersburg, Volgograd
+        // (UTC+03:00) Moscow, St. Petersburg
         {"Russian Standard Time", "RU", "Europe/Moscow", DEFAULT}, // Moscow
         {"Russian Standard Time", "RU", "Europe/Kirov"},
-        {"Russian Standard Time", "RU", "Europe/Volgograd"}, // Volgograd
 
         {"Russian Standard Time", "UA", "Europe/Simferopol", REGION_DEFAULT},
 
@@ -827,8 +832,6 @@ public class MapData {
 
         {"E. Africa Standard Time", "MG", "Indian/Antananarivo", REGION_DEFAULT},
 
-        {"E. Africa Standard Time", "SD", "Africa/Khartoum", REGION_DEFAULT},
-
         {"E. Africa Standard Time", "SO", "Africa/Mogadishu", REGION_DEFAULT},
 
         {"E. Africa Standard Time", "SS", "Africa/Juba", REGION_DEFAULT},
@@ -869,11 +872,6 @@ public class MapData {
         {"Astrakhan Standard Time", "RU", "Europe/Astrakhan", DEFAULT}, // Astrakhan
         {"Astrakhan Standard Time", "RU", "Europe/Ulyanovsk"}, // Ulyanovsk
  
-        // We don't know how Windows handle Europe/Saratov at this moment.
-        // This is separated from Europe/Volgograd. Since Dec 4 2016, Europe/Saratov
-        // moved from UTC+3 to UTC+4. This zone could be mapped to Russian Time Zone 3,
-        // but this zone shares the same offset a bit longer in 2016.
-        {"Astrakhan Standard Time", "RU", "Europe/Saratov"},
 
         // --------------------------------------------------------------------
         // (UTC+04:00) Baku
@@ -896,11 +894,21 @@ public class MapData {
         {"Mauritius Standard Time", "RE", "Indian/Reunion", REGION_DEFAULT},
 
 
+        // --------------------------------------------------------------------
+        // (UTC+04:00) Saratov
+        {"Saratov Standard Time", "RU", "Europe/Saratov", DEFAULT}, // Saratov
+
+
         // --------------------------------------------------------------------
         // (UTC+04:00) Tbilisi
         {"Georgian Standard Time", "GE", "Asia/Tbilisi", DEFAULT}, // Tbilisi
 
 
+        // --------------------------------------------------------------------
+        // (UTC+04:00) Volgograd
+        {"Volgograd Standard Time", "RU", "Europe/Volgograd", DEFAULT}, // Volgograd
+
+
         // --------------------------------------------------------------------
         // (UTC+04:00) Yerevan
         {"Caucasus Standard Time", "AM", "Asia/Yerevan", DEFAULT}, // Yerevan
@@ -950,6 +958,11 @@ public class MapData {
         {"Pakistan Standard Time", "PK", "Asia/Karachi", DEFAULT}, // Karachi
 
 
+        // --------------------------------------------------------------------
+        // (UTC+05:00) Qyzylorda
+        {"Qyzylorda Standard Time", "KZ", "Asia/Qyzylorda", DEFAULT}, // Qyzylorda
+
+
         // --------------------------------------------------------------------
         // (UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi
         {"India Standard Time", "IN", "Asia/Calcutta", DEFAULT}, // Kolkata
@@ -970,7 +983,7 @@ public class MapData {
         {"Central Asia Standard Time", "KG", "Asia/Bishkek", REGION_DEFAULT},
 
         {"Central Asia Standard Time", "KZ", "Asia/Almaty", DEFAULT}, // Astana
-        {"Central Asia Standard Time", "KZ", "Asia/Qyzylorda"},
+        {"Central Asia Standard Time", "KZ", "Asia/Qostanay"},
 
         // There are three Windows time zones with UTC offset +06:00 without DST for now.
         // Other two used to observe DST until recently comparing to this zone. So we'll
@@ -1086,6 +1099,11 @@ public class MapData {
 
         {"Singapore Standard Time", "SG", "Asia/Singapore", DEFAULT}, // Singapore
 
+        // Casey station uses UTC+8 (no DST). It's Australian facility, therefore we may
+        // put this into W. Australia Standard Time, but this zone observes DST. For now,
+        // we put Casey in the same group with Etc/GMT-8.
+        {"Singapore Standard Time", "AQ", "Antarctica/Casey", REGION_DEFAULT},
+
         // There are six Windows time zones with UTC offset +08:00 without DST for now.
         // Probably, this zone never observe DST in near future comparing to others,
         // so we'll use this zone as default UTC+08:00/no DST zone.
@@ -1108,11 +1126,6 @@ public class MapData {
         {"Ulaanbaatar Standard Time", "MN", "Asia/Choibalsan"},
 
 
-        // --------------------------------------------------------------------
-        // (UTC+08:30) Pyongyang
-        {"North Korea Standard Time", "KP", "Asia/Pyongyang", DEFAULT}, // Pyongyang
-
-
         // --------------------------------------------------------------------
         // (UTC+08:45) Eucla
         {"Aus Central W. Standard Time", "AU", "Australia/Eucla", DEFAULT}, // Eucla
@@ -1142,6 +1155,11 @@ public class MapData {
         {"Tokyo Standard Time", "PW", "Pacific/Palau", REGION_DEFAULT},
 
 
+        // --------------------------------------------------------------------
+        // (UTC+09:00) Pyongyang
+        {"North Korea Standard Time", "KP", "Asia/Pyongyang", DEFAULT}, // Pyongyang
+
+
         // --------------------------------------------------------------------
         // (UTC+09:00) Seoul
         {"Korea Standard Time", "KR", "Asia/Seoul", DEFAULT}, // Seoul
@@ -1259,10 +1277,6 @@ public class MapData {
         // just because we use this zone as the default UTC+11:00/no DST zone.
         {"Central Pacific Standard Time", "AU", "Antarctica/Macquarie", REGION_DEFAULT},
 
-        // Same as Macquarie Island above. Using this zone for UTC+11:00/no DST zones
-        // which don't really belong to others.
-        {"Central Pacific Standard Time", "AQ", "Antarctica/Casey", REGION_DEFAULT},
-
 
         // --------------------------------------------------------------------
         // (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky
@@ -1305,17 +1319,19 @@ public class MapData {
         {"Chatham Islands Standard Time", "NZ", "Pacific/Chatham", DEFAULT}, // Chatham
 
 
+        // --------------------------------------------------------------------
+        // (UTC+13:00) Coordinated Universal Time+13
+        {"UTC+13", "ZZ", "Etc/GMT-13", DEFAULT},
+
+        {"UTC+13", "KI", "Pacific/Enderbury", REGION_DEFAULT},
+
+        {"UTC+13", "TK", "Pacific/Fakaofo", REGION_DEFAULT},
+
+
         // --------------------------------------------------------------------
         // (UTC+13:00) Nuku'alofa
         {"Tonga Standard Time", "TO", "Pacific/Tongatapu", DEFAULT}, // Nuku'alofa
 
-        // Enderbury/Fakaofo are not in Tonga, but close enough and using the
-        // same UTC offset/no DST.
-        {"Tonga Standard Time", "KI", "Pacific/Enderbury", REGION_DEFAULT},
-        {"Tonga Standard Time", "TK", "Pacific/Fakaofo", REGION_DEFAULT},
-
-        // This is the only Windows time zone with UTC offset +13:00 without DST
-        {"Tonga Standard Time", "ZZ", "Etc/GMT-13", REGION_DEFAULT},
 
         // --------------------------------------------------------------------
         // (UTC+13:00) Samoa