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 bad9da4e..9f649fe9 100644 Binary files a/WinTZ/src/com/ibm/icu/dev/tools/wintz/TimeZone.reg and b/WinTZ/src/com/ibm/icu/dev/tools/wintz/TimeZone.reg differ 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