# HG changeset patch # User naoto # Date 1523463287 25200 # Node ID 6a6ee36037ac311ebd9eb9963021f66d59aa5690 # Parent 6b46983d6fbe6898cea52ba087c2e3271937b510 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone Reviewed-by: erikj, sherman diff -r 6b46983d6fbe -r 6a6ee36037ac make/gensrc/GensrcCLDR.gmk --- a/make/gensrc/GensrcCLDR.gmk Wed Apr 11 10:19:37 2018 +0100 +++ b/make/gensrc/GensrcCLDR.gmk Wed Apr 11 09:14:47 2018 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -34,19 +34,28 @@ CLDR_BASE_LOCALES := "en-US" +ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template + $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \ $(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \ $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \ + $(ZONENAME_TEMPLATE) \ $(BUILD_TOOLS_JDK) $(MKDIR) -p $(GENSRC_BASEDIR) - $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -basemodule -o $(GENSRC_BASEDIR) + $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \ + -baselocales $(CLDR_BASE_LOCALES) \ + -o $(GENSRC_BASEDIR) \ + -basemodule \ + -zntempfile $(ZONENAME_TEMPLATE) $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \ $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \ $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \ $(BUILD_TOOLS_JDK) $(MKDIR) -p $(GENSRC_DIR) - $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -o $(GENSRC_DIR) + $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \ + -baselocales $(CLDR_BASE_LOCALES) \ + -o $(GENSRC_DIR) GENSRC_JAVA_BASE += $(CLDR_BASEMETAINFO_FILE) GENSRC_JDK_LOCALEDATA += $(CLDR_METAINFO_FILE) diff -r 6b46983d6fbe -r 6a6ee36037ac make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java --- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java Wed Apr 11 10:19:37 2018 +0100 +++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java Wed Apr 11 09:14:47 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,16 +28,15 @@ import static build.tools.cldrconverter.Bundle.jreTimeZoneNames; import build.tools.cldrconverter.BundleGenerator.BundleType; import java.io.File; -import java.nio.file.DirectoryStream; -import java.nio.file.FileSystems; -import java.nio.file.Files; -import java.nio.file.Path; +import java.nio.file.*; +import java.time.*; import java.util.*; import java.util.ResourceBundle.Control; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.IntStream; +import java.util.stream.Stream; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.xml.sax.SAXNotRecognizedException; @@ -56,12 +55,13 @@ static final String BCP47_LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldmlBCP47.dtd"; - private static String CLDR_BASE = "../CLDR/21.0.1/"; + private static String CLDR_BASE; static String LOCAL_LDML_DTD; static String LOCAL_SPPL_LDML_DTD; static String LOCAL_BCP47_LDML_DTD; private static String SOURCE_FILE_DIR; private static String SPPL_SOURCE_FILE; + private static String SPPL_META_SOURCE_FILE; private static String NUMBERING_SOURCE_FILE; private static String METAZONES_SOURCE_FILE; private static String LIKELYSUBTAGS_SOURCE_FILE; @@ -85,6 +85,7 @@ static final String PARENT_LOCALE_PREFIX = "parentLocale."; private static SupplementDataParseHandler handlerSuppl; + private static SupplementalMetadataParseHandler handlerSupplMeta; private static LikelySubtagsParseHandler handlerLikelySubtags; static NumberingSystemsParseHandler handlerNumbering; static MetaZonesParseHandler handlerMetaZones; @@ -100,6 +101,9 @@ private static final ResourceBundle.Control defCon = ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT); + private static final String[] AVAILABLE_TZIDS = TimeZone.getAvailableIDs(); + private static String zoneNameTempFile; + static enum DraftType { UNCONFIRMED, PROVISIONAL, @@ -195,6 +199,10 @@ verbose = true; break; + case "-zntempfile": + zoneNameTempFile = args[++i]; + break; + case "-help": usage(); System.exit(0); @@ -221,6 +229,7 @@ NUMBERING_SOURCE_FILE = CLDR_BASE + "/supplemental/numberingSystems.xml"; METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml"; TIMEZONE_SOURCE_FILE = CLDR_BASE + "/bcp47/timezone.xml"; + SPPL_META_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalMetadata.xml"; if (BASE_LOCALES.isEmpty()) { setupBaseLocales("en-US"); @@ -234,6 +243,11 @@ List bundles = readBundleList(); convertBundles(bundles); + + // Generate java.time.format.ZoneName.java + if (isBaseModule) { + generateZoneName(); + } } private static void usage() { @@ -246,7 +260,7 @@ + "\t-basemodule generates bundles that go into java.base module%n" + "\t-baselocales loc(,loc)* locales that go into the base module%n" + "\t-o dir output directory (default: ./build/gensrc)%n" - + "\t-o dir output directory (defaut: ./build/gensrc)%n" + + "\t-zntempfile template file for java.time.format.ZoneName.java%n" + "\t-utf8 use UTF-8 rather than \\uxxxx (for debug)%n"); } @@ -401,6 +415,11 @@ // Parse likelySubtags handlerLikelySubtags = new LikelySubtagsParseHandler(); parseLDMLFile(new File(LIKELYSUBTAGS_SOURCE_FILE), handlerLikelySubtags); + + // Parse supplementalMetadata + // Currently only interested in deprecated time zone ids. + handlerSupplMeta = new SupplementalMetadataParseHandler(); + parseLDMLFile(new File(SPPL_META_SOURCE_FILE), handlerSupplMeta); } // Parsers for data in "bcp47" directory @@ -656,13 +675,16 @@ }); } - for (String tzid : handlerMetaZones.keySet()) { - String tzKey = TIMEZONE_ID_PREFIX + tzid; - Object data = map.get(tzKey); + Arrays.stream(AVAILABLE_TZIDS).forEach(tzid -> { + // If the tzid is deprecated, get the data for the replacement id + String tzKey = Optional.ofNullable((String)handlerSupplMeta.get(tzid)) + .orElse(tzid); + Object data = map.get(TIMEZONE_ID_PREFIX + tzKey); + if (data instanceof String[]) { names.put(tzid, data); } else { - String meta = handlerMetaZones.get(tzid); + String meta = handlerMetaZones.get(tzKey); if (meta != null) { String metaKey = METAZONE_ID_PREFIX + meta; data = map.get(metaKey); @@ -673,7 +695,8 @@ } } } - } + }); + return names; } @@ -948,4 +971,44 @@ return candidates; } + + private static void generateZoneName() throws Exception { + Files.createDirectories(Paths.get(DESTINATION_DIR, "java", "time", "format")); + Files.write(Paths.get(DESTINATION_DIR, "java", "time", "format", "ZoneName.java"), + Files.lines(Paths.get(zoneNameTempFile)) + .flatMap(l -> { + if (l.equals("%%%%ZIDMAP%%%%")) { + return zidMapEntry(); + } else if (l.equals("%%%%MZONEMAP%%%%")) { + return handlerMetaZones.mzoneMapEntry(); + } else if (l.equals("%%%%DEPRECATED%%%%")) { + return handlerSupplMeta.deprecatedMap(); + } else { + return Stream.of(l); + } + }) + .collect(Collectors.toList()), + StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); + } + + private static Stream zidMapEntry() { + Map canonMap = new HashMap<>(); + handlerTimeZone.getData().entrySet().stream() + .forEach(e -> { + String[] ids = ((String)e.getValue()).split("\\s"); + for (int i = 1; i < ids.length; i++) { + canonMap.put(ids[i], ids[0]); + }}); + return ZoneId.getAvailableZoneIds().stream() + .map(id -> { + String canonId = canonMap.getOrDefault(id, id); + String meta = handlerMetaZones.get(canonId); + String zone001 = handlerMetaZones.zidMap().get(meta); + return zone001 == null ? "" : + String.format(" \"%s\", \"%s\", \"%s\",", + id, meta, zone001); + }) + .filter(s -> !s.isEmpty()) + .sorted(); + } } diff -r 6b46983d6fbe -r 6a6ee36037ac make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java --- a/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java Wed Apr 11 10:19:37 2018 +0100 +++ b/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java Wed Apr 11 09:14:47 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,9 @@ import java.io.File; import java.io.IOException; +import java.util.*; +import java.util.stream.*; + import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -34,6 +37,10 @@ class MetaZonesParseHandler extends AbstractLDMLHandler { private String tzid, metazone; + // for java.time.format.ZoneNames.java + private List mzoneMapEntryList = new ArrayList<>(); + private Map zones = new HashMap<>(); + MetaZonesParseHandler() { } @@ -64,6 +71,19 @@ pushIgnoredContainer(qName); break; + case "mapZone": + String territory = attributes.getValue("territory"); + if (territory.equals("001")) { + zones.put(attributes.getValue("other"), attributes.getValue("type")); + } else { + mzoneMapEntryList.add(String.format(" \"%s\", \"%s\", \"%s\",", + attributes.getValue("other"), + territory, + attributes.getValue("type"))); + } + pushIgnoredContainer(qName); + break; + case "version": case "generation": pushIgnoredContainer(qName); @@ -89,4 +109,12 @@ } currentContainer = currentContainer.getParent(); } + + public Map zidMap() { + return zones; + } + + public Stream mzoneMapEntry() { + return mzoneMapEntryList.stream(); + } } diff -r 6b46983d6fbe -r 6a6ee36037ac make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java Wed Apr 11 09:14:47 2018 -0700 @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package build.tools.cldrconverter; + +import java.io.File; +import java.io.IOException; +import java.util.stream.Stream; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * Handles parsing of files in Locale Data Markup Language for + * SupplementalMetadata.xml + */ + +class SupplementalMetadataParseHandler extends AbstractLDMLHandler { + @Override + public InputSource resolveEntity(String publicID, String systemID) throws IOException, SAXException { + // avoid HTTP traffic to unicode.org + if (systemID.startsWith(CLDRConverter.SPPL_LDML_DTD_SYSTEM_ID)) { + return new InputSource((new File(CLDRConverter.LOCAL_SPPL_LDML_DTD)).toURI().toString()); + } + return null; + } + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + switch (qName) { + case "zoneAlias": + String reason = attributes.getValue("reason"); + if ("deprecated".equals(reason)) { + put(attributes.getValue("type"), attributes.getValue("replacement")); + } + pushIgnoredContainer(qName); + break; + default: + // treat anything else as a container + pushContainer(qName, attributes); + break; + } + } + + public Stream deprecatedMap() { + return keySet().stream() + .map(k -> String.format(" \"%s\", \"%s\",", k, get(k))) + .sorted(); + } +} diff -r 6b46983d6fbe -r 6a6ee36037ac src/java.base/share/classes/java/time/format/ZoneName.java --- a/src/java.base/share/classes/java/time/format/ZoneName.java Wed Apr 11 10:19:37 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,798 +0,0 @@ -/* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package java.time.format; - -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -/** - * A helper class to map a zone name to metazone and back to the - * appropriate zone id for the particular locale. - *

- * The zid<->metazone mappings are based on CLDR metaZones.xml. - * The alias mappings are based on Link entries in tzdb data files. - */ -class ZoneName { - - public static String toZid(String zid, Locale locale) { - String mzone = zidToMzone.get(zid); - if (mzone == null && aliases.containsKey(zid)) { - zid = aliases.get(zid); - mzone = zidToMzone.get(zid); - } - if (mzone != null) { - Map map = mzoneToZidL.get(mzone); - if (map != null && map.containsKey(locale.getCountry())) { - zid = map.get(locale.getCountry()); - } else { - zid = mzoneToZid.get(mzone); - } - } - return toZid(zid); - } - - public static String toZid(String zid) { - if (aliases.containsKey(zid)) { - return aliases.get(zid); - } - return zid; - } - - private static final String[] zidMap = new String[] { - "Pacific/Rarotonga", "Cook", "Pacific/Rarotonga", - "Europe/Tirane", "Europe_Central", "Europe/Paris", - "America/Recife", "Brasilia", "America/Sao_Paulo", - "America/Argentina/San_Juan", "Argentina", "America/Buenos_Aires", - "Asia/Kolkata", "India", "Asia/Calcutta", - "America/Guayaquil", "Ecuador", "America/Guayaquil", - "Europe/Samara", "Moscow", "Europe/Moscow", - "Indian/Antananarivo", "Africa_Eastern", "Africa/Nairobi", - "America/Santa_Isabel", "America_Pacific", "America/Los_Angeles", - "America/Montserrat", "Atlantic", "America/Halifax", - "Pacific/Port_Moresby", "Papua_New_Guinea", "Pacific/Port_Moresby", - "Europe/Paris", "Europe_Central", "Europe/Paris", - "America/Argentina/Salta", "Argentina", "America/Buenos_Aires", - "Asia/Omsk", "Omsk", "Asia/Omsk", - "Africa/Ceuta", "Europe_Central", "Europe/Paris", - "America/Argentina/San_Luis", "Argentina_Western", "America/Argentina/San_Luis", - "America/Atikokan", "America_Eastern", "America/New_York", - "Asia/Vladivostok", "Vladivostok", "Asia/Vladivostok", - "America/Argentina/Jujuy", "Argentina", "America/Buenos_Aires", - "Asia/Almaty", "Kazakhstan_Eastern", "Asia/Almaty", - "Atlantic/Canary", "Europe_Western", "Atlantic/Canary", - "Asia/Bangkok", "Indochina", "Asia/Saigon", - "America/Caracas", "Venezuela", "America/Caracas", - "Australia/Hobart", "Australia_Eastern", "Australia/Sydney", - "America/Havana", "Cuba", "America/Havana", - "Africa/Malabo", "Africa_Western", "Africa/Lagos", - "Australia/Lord_Howe", "Lord_Howe", "Australia/Lord_Howe", - "Pacific/Fakaofo", "Tokelau", "Pacific/Fakaofo", - "America/Matamoros", "America_Central", "America/Chicago", - "America/Guadeloupe", "Atlantic", "America/Halifax", - "Europe/Helsinki", "Europe_Eastern", "Europe/Bucharest", - "Asia/Calcutta", "India", "Asia/Calcutta", - "Africa/Kinshasa", "Africa_Western", "Africa/Lagos", - "America/Miquelon", "Pierre_Miquelon", "America/Miquelon", - "Europe/Athens", "Europe_Eastern", "Europe/Bucharest", - "Asia/Novosibirsk", "Novosibirsk", "Asia/Novosibirsk", - "Indian/Cocos", "Cocos", "Indian/Cocos", - "Africa/Bujumbura", "Africa_Central", "Africa/Maputo", - "Europe/Mariehamn", "Europe_Eastern", "Europe/Bucharest", - "America/Winnipeg", "America_Central", "America/Chicago", - "America/Buenos_Aires", "Argentina", "America/Buenos_Aires", - "America/Yellowknife", "America_Mountain", "America/Denver", - "Pacific/Midway", "Samoa", "Pacific/Apia", - "Africa/Dar_es_Salaam", "Africa_Eastern", "Africa/Nairobi", - "Pacific/Tahiti", "Tahiti", "Pacific/Tahiti", - "Asia/Gaza", "Europe_Eastern", "Europe/Bucharest", - "Australia/Lindeman", "Australia_Eastern", "Australia/Sydney", - "Europe/Kaliningrad", "Europe_Eastern", "Europe/Bucharest", - "Europe/Bucharest", "Europe_Eastern", "Europe/Bucharest", - "America/Lower_Princes", "Atlantic", "America/Halifax", - "Pacific/Chuuk", "Truk", "Pacific/Truk", - "America/Anchorage", "Alaska", "America/Juneau", - "America/Rankin_Inlet", "America_Central", "America/Chicago", - "America/Marigot", "Atlantic", "America/Halifax", - "Africa/Juba", "Africa_Eastern", "Africa/Nairobi", - "Africa/Algiers", "Europe_Central", "Europe/Paris", - "Europe/Kiev", "Europe_Eastern", "Europe/Bucharest", - "America/Santarem", "Brasilia", "America/Sao_Paulo", - "Africa/Brazzaville", "Africa_Western", "Africa/Lagos", - "Asia/Choibalsan", "Choibalsan", "Asia/Choibalsan", - "Indian/Christmas", "Christmas", "Indian/Christmas", - "America/Nassau", "America_Eastern", "America/New_York", - "Africa/Tunis", "Europe_Central", "Europe/Paris", - "Pacific/Noumea", "New_Caledonia", "Pacific/Noumea", - "Africa/El_Aaiun", "Europe_Western", "Atlantic/Canary", - "Europe/Sarajevo", "Europe_Central", "Europe/Paris", - "America/Campo_Grande", "Amazon", "America/Manaus", - "America/Puerto_Rico", "Atlantic", "America/Halifax", - "Antarctica/Mawson", "Mawson", "Antarctica/Mawson", - "Pacific/Galapagos", "Galapagos", "Pacific/Galapagos", - "Asia/Tehran", "Iran", "Asia/Tehran", - "America/Port-au-Prince", "America_Eastern", "America/New_York", - "America/Scoresbysund", "Greenland_Eastern", "America/Scoresbysund", - "Africa/Harare", "Africa_Central", "Africa/Maputo", - "America/Dominica", "Atlantic", "America/Halifax", - "Europe/Chisinau", "Europe_Eastern", "Europe/Bucharest", - "America/Chihuahua", "America_Mountain", "America/Denver", - "America/La_Paz", "Bolivia", "America/La_Paz", - "Indian/Chagos", "Indian_Ocean", "Indian/Chagos", - "Australia/Broken_Hill", "Australia_Central", "Australia/Adelaide", - "America/Grenada", "Atlantic", "America/Halifax", - "America/North_Dakota/New_Salem", "America_Central", "America/Chicago", - "Pacific/Majuro", "Marshall_Islands", "Pacific/Majuro", - "Australia/Adelaide", "Australia_Central", "Australia/Adelaide", - "Europe/Warsaw", "Europe_Central", "Europe/Paris", - "Europe/Vienna", "Europe_Central", "Europe/Paris", - "Atlantic/Cape_Verde", "Cape_Verde", "Atlantic/Cape_Verde", - "America/Mendoza", "Argentina", "America/Buenos_Aires", - "Pacific/Gambier", "Gambier", "Pacific/Gambier", - "Europe/Istanbul", "Europe_Eastern", "Europe/Bucharest", - "America/Kentucky/Monticello", "America_Eastern", "America/New_York", - "America/Chicago", "America_Central", "America/Chicago", - "Asia/Ulaanbaatar", "Mongolia", "Asia/Ulaanbaatar", - "Indian/Maldives", "Maldives", "Indian/Maldives", - "America/Mexico_City", "America_Central", "America/Chicago", - "Africa/Asmara", "Africa_Eastern", "Africa/Nairobi", - "Asia/Chongqing", "China", "Asia/Shanghai", - "America/Argentina/La_Rioja", "Argentina", "America/Buenos_Aires", - "America/Tijuana", "America_Pacific", "America/Los_Angeles", - "Asia/Harbin", "China", "Asia/Shanghai", - "Pacific/Honolulu", "Hawaii_Aleutian", "Pacific/Honolulu", - "Atlantic/Azores", "Azores", "Atlantic/Azores", - "Indian/Mayotte", "Africa_Eastern", "Africa/Nairobi", - "America/Guatemala", "America_Central", "America/Chicago", - "America/Indianapolis", "America_Eastern", "America/New_York", - "America/Halifax", "Atlantic", "America/Halifax", - "America/Resolute", "America_Central", "America/Chicago", - "Europe/London", "GMT", "Atlantic/Reykjavik", - "America/Hermosillo", "America_Mountain", "America/Denver", - "Atlantic/Madeira", "Europe_Western", "Atlantic/Canary", - "Europe/Zagreb", "Europe_Central", "Europe/Paris", - "America/Boa_Vista", "Amazon", "America/Manaus", - "America/Regina", "America_Central", "America/Chicago", - "America/Cordoba", "Argentina", "America/Buenos_Aires", - "America/Shiprock", "America_Mountain", "America/Denver", - "Europe/Luxembourg", "Europe_Central", "Europe/Paris", - "America/Cancun", "America_Central", "America/Chicago", - "Pacific/Enderbury", "Phoenix_Islands", "Pacific/Enderbury", - "Africa/Bissau", "GMT", "Atlantic/Reykjavik", - "Antarctica/Vostok", "Vostok", "Antarctica/Vostok", - "Pacific/Apia", "Samoa", "Pacific/Apia", - "Australia/Perth", "Australia_Western", "Australia/Perth", - "America/Juneau", "Alaska", "America/Juneau", - "Africa/Mbabane", "Africa_Southern", "Africa/Johannesburg", - "Pacific/Niue", "Niue", "Pacific/Niue", - "Europe/Zurich", "Europe_Central", "Europe/Paris", - "America/Rio_Branco", "Amazon", "America/Manaus", - "Africa/Ndjamena", "Africa_Western", "Africa/Lagos", - "Asia/Macau", "China", "Asia/Shanghai", - "America/Lima", "Peru", "America/Lima", - "Africa/Windhoek", "Africa_Central", "Africa/Maputo", - "America/Sitka", "Alaska", "America/Juneau", - "America/Mazatlan", "America_Mountain", "America/Denver", - "Asia/Saigon", "Indochina", "Asia/Saigon", - "Asia/Kamchatka", "Magadan", "Asia/Magadan", - "America/Menominee", "America_Central", "America/Chicago", - "America/Belize", "America_Central", "America/Chicago", - "America/Sao_Paulo", "Brasilia", "America/Sao_Paulo", - "America/Barbados", "Atlantic", "America/Halifax", - "America/Porto_Velho", "Amazon", "America/Manaus", - "America/Costa_Rica", "America_Central", "America/Chicago", - "Europe/Monaco", "Europe_Central", "Europe/Paris", - "Europe/Riga", "Europe_Eastern", "Europe/Bucharest", - "Europe/Vatican", "Europe_Central", "Europe/Paris", - "Europe/Madrid", "Europe_Central", "Europe/Paris", - "Africa/Dakar", "GMT", "Atlantic/Reykjavik", - "Asia/Damascus", "Europe_Eastern", "Europe/Bucharest", - "Asia/Hong_Kong", "Hong_Kong", "Asia/Hong_Kong", - "America/Adak", "Hawaii_Aleutian", "Pacific/Honolulu", - "Europe/Vilnius", "Europe_Eastern", "Europe/Bucharest", - "America/Indiana/Indianapolis", "America_Eastern", "America/New_York", - "Africa/Freetown", "GMT", "Atlantic/Reykjavik", - "Atlantic/Reykjavik", "GMT", "Atlantic/Reykjavik", - "Asia/Ho_Chi_Minh", "Indochina", "Asia/Saigon", - "America/St_Kitts", "Atlantic", "America/Halifax", - "America/Martinique", "Atlantic", "America/Halifax", - "America/Thule", "Atlantic", "America/Halifax", - "America/Asuncion", "Paraguay", "America/Asuncion", - "Africa/Luanda", "Africa_Western", "Africa/Lagos", - "America/Monterrey", "America_Central", "America/Chicago", - "Pacific/Fiji", "Fiji", "Pacific/Fiji", - "Africa/Banjul", "GMT", "Atlantic/Reykjavik", - "America/Grand_Turk", "America_Eastern", "America/New_York", - "Pacific/Pitcairn", "Pitcairn", "Pacific/Pitcairn", - "America/Montevideo", "Uruguay", "America/Montevideo", - "America/Bahia_Banderas", "America_Central", "America/Chicago", - "America/Cayman", "America_Eastern", "America/New_York", - "Pacific/Norfolk", "Norfolk", "Pacific/Norfolk", - "Africa/Ouagadougou", "GMT", "Atlantic/Reykjavik", - "America/Maceio", "Brasilia", "America/Sao_Paulo", - "Pacific/Guam", "Chamorro", "Pacific/Saipan", - "Africa/Monrovia", "GMT", "Atlantic/Reykjavik", - "Africa/Bamako", "GMT", "Atlantic/Reykjavik", - "Asia/Colombo", "India", "Asia/Calcutta", - "Asia/Urumqi", "China", "Asia/Shanghai", - "Asia/Kabul", "Afghanistan", "Asia/Kabul", - "America/Yakutat", "Alaska", "America/Juneau", - "America/Phoenix", "America_Mountain", "America/Denver", - "Asia/Nicosia", "Europe_Eastern", "Europe/Bucharest", - "Asia/Phnom_Penh", "Indochina", "Asia/Saigon", - "America/Rainy_River", "America_Central", "America/Chicago", - "Europe/Uzhgorod", "Europe_Eastern", "Europe/Bucharest", - "Pacific/Saipan", "Chamorro", "Pacific/Saipan", - "America/St_Vincent", "Atlantic", "America/Halifax", - "Europe/Rome", "Europe_Central", "Europe/Paris", - "America/Nome", "Alaska", "America/Juneau", - "Africa/Mogadishu", "Africa_Eastern", "Africa/Nairobi", - "Europe/Zaporozhye", "Europe_Eastern", "Europe/Bucharest", - "Pacific/Funafuti", "Tuvalu", "Pacific/Funafuti", - "Atlantic/South_Georgia", "South_Georgia", "Atlantic/South_Georgia", - "Europe/Skopje", "Europe_Central", "Europe/Paris", - "Asia/Yekaterinburg", "Yekaterinburg", "Asia/Yekaterinburg", - "Australia/Melbourne", "Australia_Eastern", "Australia/Sydney", - "America/Argentina/Cordoba", "Argentina", "America/Buenos_Aires", - "Africa/Kigali", "Africa_Central", "Africa/Maputo", - "Africa/Blantyre", "Africa_Central", "Africa/Maputo", - "Africa/Tripoli", "Europe_Eastern", "Europe/Bucharest", - "Africa/Gaborone", "Africa_Central", "Africa/Maputo", - "Asia/Kuching", "Malaysia", "Asia/Kuching", - "Pacific/Nauru", "Nauru", "Pacific/Nauru", - "America/Aruba", "Atlantic", "America/Halifax", - "America/Antigua", "Atlantic", "America/Halifax", - "Europe/Volgograd", "Volgograd", "Europe/Volgograd", - "Africa/Djibouti", "Africa_Eastern", "Africa/Nairobi", - "America/Catamarca", "Argentina", "America/Buenos_Aires", - "Asia/Manila", "Philippines", "Asia/Manila", - "Pacific/Kiritimati", "Line_Islands", "Pacific/Kiritimati", - "Asia/Shanghai", "China", "Asia/Shanghai", - "Pacific/Truk", "Truk", "Pacific/Truk", - "Pacific/Tarawa", "Gilbert_Islands", "Pacific/Tarawa", - "Africa/Conakry", "GMT", "Atlantic/Reykjavik", - "Asia/Bishkek", "Kyrgystan", "Asia/Bishkek", - "Europe/Gibraltar", "Europe_Central", "Europe/Paris", - "Asia/Rangoon", "Myanmar", "Asia/Rangoon", - "Asia/Baku", "Azerbaijan", "Asia/Baku", - "America/Santiago", "Chile", "America/Santiago", - "America/El_Salvador", "America_Central", "America/Chicago", - "America/Noronha", "Noronha", "America/Noronha", - "America/St_Thomas", "Atlantic", "America/Halifax", - "Atlantic/St_Helena", "GMT", "Atlantic/Reykjavik", - "Asia/Krasnoyarsk", "Krasnoyarsk", "Asia/Krasnoyarsk", - "America/Vancouver", "America_Pacific", "America/Los_Angeles", - "Europe/Belgrade", "Europe_Central", "Europe/Paris", - "America/St_Barthelemy", "Atlantic", "America/Halifax", - "Asia/Pontianak", "Indonesia_Western", "Asia/Jakarta", - "Africa/Lusaka", "Africa_Central", "Africa/Maputo", - "America/Godthab", "Greenland_Western", "America/Godthab", - "Asia/Dhaka", "Bangladesh", "Asia/Dhaka", - "Asia/Dubai", "Gulf", "Asia/Dubai", - "Europe/Moscow", "Moscow", "Europe/Moscow", - "America/Louisville", "America_Eastern", "America/New_York", - "Australia/Darwin", "Australia_Central", "Australia/Adelaide", - "America/Santo_Domingo", "Atlantic", "America/Halifax", - "America/Argentina/Ushuaia", "Argentina", "America/Buenos_Aires", - "America/Tegucigalpa", "America_Central", "America/Chicago", - "Asia/Aden", "Arabian", "Asia/Riyadh", - "America/Inuvik", "America_Mountain", "America/Denver", - "Asia/Beirut", "Europe_Eastern", "Europe/Bucharest", - "Asia/Qatar", "Arabian", "Asia/Riyadh", - "Europe/Oslo", "Europe_Central", "Europe/Paris", - "Asia/Anadyr", "Magadan", "Asia/Magadan", - "Pacific/Palau", "Palau", "Pacific/Palau", - "Arctic/Longyearbyen", "Europe_Central", "Europe/Paris", - "America/Anguilla", "Atlantic", "America/Halifax", - "Asia/Aqtau", "Kazakhstan_Western", "Asia/Aqtobe", - "Asia/Yerevan", "Armenia", "Asia/Yerevan", - "Africa/Lagos", "Africa_Western", "Africa/Lagos", - "America/Denver", "America_Mountain", "America/Denver", - "Antarctica/Palmer", "Chile", "America/Santiago", - "Europe/Stockholm", "Europe_Central", "Europe/Paris", - "America/Bahia", "Brasilia", "America/Sao_Paulo", - "America/Danmarkshavn", "GMT", "Atlantic/Reykjavik", - "Indian/Mauritius", "Mauritius", "Indian/Mauritius", - "Pacific/Chatham", "Chatham", "Pacific/Chatham", - "Europe/Prague", "Europe_Central", "Europe/Paris", - "America/Blanc-Sablon", "Atlantic", "America/Halifax", - "America/Bogota", "Colombia", "America/Bogota", - "America/Managua", "America_Central", "America/Chicago", - "Pacific/Auckland", "New_Zealand", "Pacific/Auckland", - "Atlantic/Faroe", "Europe_Western", "Atlantic/Canary", - "America/Cambridge_Bay", "America_Mountain", "America/Denver", - "America/Los_Angeles", "America_Pacific", "America/Los_Angeles", - "Africa/Khartoum", "Africa_Central", "Africa/Maputo", - "Europe/Simferopol", "Europe_Eastern", "Europe/Bucharest", - "Australia/Currie", "Australia_Eastern", "Australia/Sydney", - "Europe/Guernsey", "GMT", "Atlantic/Reykjavik", - "Asia/Thimphu", "Bhutan", "Asia/Thimphu", - "America/Eirunepe", "Amazon", "America/Manaus", - "Africa/Nairobi", "Africa_Eastern", "Africa/Nairobi", - "Asia/Yakutsk", "Yakutsk", "Asia/Yakutsk", - "Asia/Yangon", "Myanmar", "Asia/Rangoon", - "America/Goose_Bay", "Atlantic", "America/Halifax", - "Africa/Maseru", "Africa_Southern", "Africa/Johannesburg", - "America/Swift_Current", "America_Central", "America/Chicago", - "America/Guyana", "Guyana", "America/Guyana", - "Asia/Tokyo", "Japan", "Asia/Tokyo", - "Indian/Kerguelen", "French_Southern", "Indian/Kerguelen", - "America/Belem", "Brasilia", "America/Sao_Paulo", - "Pacific/Wallis", "Wallis", "Pacific/Wallis", - "America/Whitehorse", "America_Pacific", "America/Los_Angeles", - "America/North_Dakota/Beulah", "America_Central", "America/Chicago", - "Asia/Jerusalem", "Israel", "Asia/Jerusalem", - "Antarctica/Syowa", "Syowa", "Antarctica/Syowa", - "America/Thunder_Bay", "America_Eastern", "America/New_York", - "Asia/Brunei", "Brunei", "Asia/Brunei", - "America/Metlakatla", "America_Pacific", "America/Los_Angeles", - "Asia/Dushanbe", "Tajikistan", "Asia/Dushanbe", - "Pacific/Kosrae", "Kosrae", "Pacific/Kosrae", - "America/Coral_Harbour", "America_Eastern", "America/New_York", - "America/Tortola", "Atlantic", "America/Halifax", - "Asia/Karachi", "Pakistan", "Asia/Karachi", - "Indian/Reunion", "Reunion", "Indian/Reunion", - "America/Detroit", "America_Eastern", "America/New_York", - "Australia/Eucla", "Australia_CentralWestern", "Australia/Eucla", - "Asia/Seoul", "Korea", "Asia/Seoul", - "Asia/Singapore", "Singapore", "Asia/Singapore", - "Africa/Casablanca", "Europe_Western", "Atlantic/Canary", - "Asia/Dili", "East_Timor", "Asia/Dili", - "America/Indiana/Vincennes", "America_Eastern", "America/New_York", - "Europe/Dublin", "GMT", "Atlantic/Reykjavik", - "America/St_Johns", "Newfoundland", "America/St_Johns", - "Antarctica/Macquarie", "Macquarie", "Antarctica/Macquarie", - "America/Port_of_Spain", "Atlantic", "America/Halifax", - "Europe/Budapest", "Europe_Central", "Europe/Paris", - "America/Fortaleza", "Brasilia", "America/Sao_Paulo", - "Australia/Brisbane", "Australia_Eastern", "Australia/Sydney", - "Atlantic/Bermuda", "Atlantic", "America/Halifax", - "Asia/Amman", "Europe_Eastern", "Europe/Bucharest", - "Asia/Tashkent", "Uzbekistan", "Asia/Tashkent", - "Antarctica/DumontDUrville", "DumontDUrville", "Antarctica/DumontDUrville", - "Antarctica/Casey", "Australia_Western", "Australia/Perth", - "Asia/Vientiane", "Indochina", "Asia/Saigon", - "Pacific/Johnston", "Hawaii_Aleutian", "Pacific/Honolulu", - "America/Jamaica", "America_Eastern", "America/New_York", - "Africa/Addis_Ababa", "Africa_Eastern", "Africa/Nairobi", - "Pacific/Ponape", "Ponape", "Pacific/Ponape", - "Europe/Jersey", "GMT", "Atlantic/Reykjavik", - "Africa/Lome", "GMT", "Atlantic/Reykjavik", - "America/Manaus", "Amazon", "America/Manaus", - "Africa/Niamey", "Africa_Western", "Africa/Lagos", - "Asia/Kashgar", "China", "Asia/Shanghai", - "Pacific/Tongatapu", "Tonga", "Pacific/Tongatapu", - "Europe/Minsk", "Europe_Eastern", "Europe/Bucharest", - "America/Edmonton", "America_Mountain", "America/Denver", - "Asia/Baghdad", "Arabian", "Asia/Riyadh", - "Asia/Kathmandu", "Nepal", "Asia/Katmandu", - "America/Ojinaga", "America_Mountain", "America/Denver", - "Africa/Abidjan", "GMT", "Atlantic/Reykjavik", - "America/Indiana/Winamac", "America_Eastern", "America/New_York", - "Asia/Qyzylorda", "Kazakhstan_Eastern", "Asia/Almaty", - "Australia/Sydney", "Australia_Eastern", "Australia/Sydney", - "Asia/Ashgabat", "Turkmenistan", "Asia/Ashgabat", - "Europe/Amsterdam", "Europe_Central", "Europe/Paris", - "America/Dawson_Creek", "America_Mountain", "America/Denver", - "Africa/Cairo", "Europe_Eastern", "Europe/Bucharest", - "Asia/Pyongyang", "Korea", "Asia/Seoul", - "Africa/Kampala", "Africa_Eastern", "Africa/Nairobi", - "America/Araguaina", "Brasilia", "America/Sao_Paulo", - "Asia/Novokuznetsk", "Novosibirsk", "Asia/Novosibirsk", - "Pacific/Kwajalein", "Marshall_Islands", "Pacific/Majuro", - "Africa/Lubumbashi", "Africa_Central", "Africa/Maputo", - "Asia/Sakhalin", "Sakhalin", "Asia/Sakhalin", - "America/Indiana/Vevay", "America_Eastern", "America/New_York", - "Africa/Maputo", "Africa_Central", "Africa/Maputo", - "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary", - "America/North_Dakota/Center", "America_Central", "America/Chicago", - "Pacific/Wake", "Wake", "Pacific/Wake", - "Pacific/Pago_Pago", "Samoa", "Pacific/Apia", - "America/Moncton", "Atlantic", "America/Halifax", - "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos", - "America/Glace_Bay", "Atlantic", "America/Halifax", - "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta", - "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi", - "Europe/Lisbon", "Europe_Western", "Atlantic/Canary", - "America/Dawson", "America_Pacific", "America/Los_Angeles", - "America/Cayenne", "French_Guiana", "America/Cayenne", - "Asia/Bahrain", "Arabian", "Asia/Riyadh", - "Europe/Malta", "Europe_Central", "Europe/Paris", - "America/Indiana/Tell_City", "America_Central", "America/Chicago", - "America/Indiana/Petersburg", "America_Eastern", "America/New_York", - "Antarctica/Rothera", "Rothera", "Antarctica/Rothera", - "Asia/Aqtobe", "Kazakhstan_Western", "Asia/Aqtobe", - "Europe/Vaduz", "Europe_Central", "Europe/Paris", - "America/Indiana/Marengo", "America_Eastern", "America/New_York", - "Europe/Brussels", "Europe_Central", "Europe/Paris", - "Europe/Andorra", "Europe_Central", "Europe/Paris", - "America/Indiana/Knox", "America_Central", "America/Chicago", - "Pacific/Easter", "Easter", "Pacific/Easter", - "America/Argentina/Rio_Gallegos", "Argentina", "America/Buenos_Aires", - "Asia/Oral", "Kazakhstan_Western", "Asia/Aqtobe", - "Europe/Copenhagen", "Europe_Central", "Europe/Paris", - "Africa/Johannesburg", "Africa_Southern", "Africa/Johannesburg", - "Pacific/Pohnpei", "Ponape", "Pacific/Ponape", - "America/Argentina/Tucuman", "Argentina", "America/Buenos_Aires", - "America/Toronto", "America_Eastern", "America/New_York", - "Asia/Makassar", "Indonesia_Central", "Asia/Makassar", - "Europe/Berlin", "Europe_Central", "Europe/Paris", - "America/Argentina/Mendoza", "Argentina", "America/Buenos_Aires", - "America/Cuiaba", "Amazon", "America/Manaus", - "America/Creston", "America_Mountain", "America/Denver", - "Asia/Samarkand", "Uzbekistan", "Asia/Tashkent", - "Asia/Hovd", "Hovd", "Asia/Hovd", - "Europe/Bratislava", "Europe_Central", "Europe/Paris", - "Africa/Accra", "GMT", "Atlantic/Reykjavik", - "Africa/Douala", "Africa_Western", "Africa/Lagos", - "Africa/Nouakchott", "GMT", "Atlantic/Reykjavik", - "Europe/Sofia", "Europe_Eastern", "Europe/Bucharest", - "Antarctica/Davis", "Davis", "Antarctica/Davis", - "Antarctica/McMurdo", "New_Zealand", "Pacific/Auckland", - "Europe/San_Marino", "Europe_Central", "Europe/Paris", - "Africa/Porto-Novo", "Africa_Western", "Africa/Lagos", - "Asia/Jayapura", "Indonesia_Eastern", "Asia/Jayapura", - "America/St_Lucia", "Atlantic", "America/Halifax", - "America/Nipigon", "America_Eastern", "America/New_York", - "America/Argentina/Catamarca", "Argentina", "America/Buenos_Aires", - "Europe/Isle_of_Man", "GMT", "Atlantic/Reykjavik", - "America/Kentucky/Louisville", "America_Eastern", "America/New_York", - "America/Merida", "America_Central", "America/Chicago", - "Pacific/Marquesas", "Marquesas", "Pacific/Marquesas", - "Asia/Magadan", "Magadan", "Asia/Magadan", - "Africa/Libreville", "Africa_Western", "Africa/Lagos", - "Pacific/Efate", "Vanuatu", "Pacific/Efate", - "Asia/Kuala_Lumpur", "Malaysia", "Asia/Kuching", - "America/Iqaluit", "America_Eastern", "America/New_York", - "Indian/Comoro", "Africa_Eastern", "Africa/Nairobi", - "America/Panama", "America_Eastern", "America/New_York", - "Asia/Hebron", "Europe_Eastern", "Europe/Bucharest", - "America/Jujuy", "Argentina", "America/Buenos_Aires", - "America/Pangnirtung", "America_Eastern", "America/New_York", - "Asia/Tbilisi", "Georgia", "Asia/Tbilisi", - "Europe/Podgorica", "Europe_Central", "Europe/Paris", - "America/Boise", "America_Mountain", "America/Denver", - "Asia/Muscat", "Gulf", "Asia/Dubai", - "Indian/Mahe", "Seychelles", "Indian/Mahe", - "America/Montreal", "America_Eastern", "America/New_York", - "Africa/Bangui", "Africa_Western", "Africa/Lagos", - "America/Curacao", "Atlantic", "America/Halifax", - "Asia/Taipei", "Taipei", "Asia/Taipei", - "Europe/Ljubljana", "Europe_Central", "Europe/Paris", - "Atlantic/Stanley", "Falkland", "Atlantic/Stanley", - "Pacific/Guadalcanal", "Solomon", "Pacific/Guadalcanal", - "Asia/Kuwait", "Arabian", "Asia/Riyadh", - "Asia/Riyadh", "Arabian", "Asia/Riyadh", - "Europe/Tallinn", "Europe_Eastern", "Europe/Bucharest", - "America/New_York", "America_Eastern", "America/New_York", - "America/Paramaribo", "Suriname", "America/Paramaribo", - "America/Argentina/Buenos_Aires", "Argentina", "America/Buenos_Aires", - "Asia/Irkutsk", "Irkutsk", "Asia/Irkutsk", - "Asia/Katmandu", "Nepal", "Asia/Katmandu", - "America/Kralendijk", "Atlantic", "America/Halifax", - }; - private static final String[] mzoneMap = new String[] { - "GMT", "ML", "Africa/Bamako", - "GMT", "IE", "Europe/Dublin", - "GMT", "SN", "Africa/Dakar", - "GMT", "GH", "Africa/Accra", - "GMT", "CI", "Africa/Abidjan", - "GMT", "BF", "Africa/Ouagadougou", - "GMT", "MR", "Africa/Nouakchott", - "GMT", "GM", "Africa/Banjul", - "GMT", "SL", "Africa/Freetown", - "GMT", "GN", "Africa/Conakry", - "GMT", "SH", "Atlantic/St_Helena", - "GMT", "GB", "Europe/London", - "GMT", "LR", "Africa/Monrovia", - "GMT", "TG", "Africa/Lome", - "Africa_Western", "ST", "Africa/Sao_Tome", - "Africa_Western", "CF", "Africa/Bangui", - "Africa_Western", "NE", "Africa/Niamey", - "Africa_Western", "CM", "Africa/Douala", - "Africa_Western", "CD", "Africa/Kinshasa", - "Africa_Western", "CG", "Africa/Brazzaville", - "Africa_Western", "GA", "Africa/Libreville", - "Africa_Western", "TD", "Africa/Ndjamena", - "Africa_Western", "AO", "Africa/Luanda", - "Africa_Western", "GQ", "Africa/Malabo", - "Africa_Eastern", "YT", "Indian/Mayotte", - "Africa_Eastern", "UG", "Africa/Kampala", - "Africa_Eastern", "ET", "Africa/Addis_Ababa", - "Africa_Eastern", "MG", "Indian/Antananarivo", - "Africa_Eastern", "TZ", "Africa/Dar_es_Salaam", - "Africa_Eastern", "SO", "Africa/Mogadishu", - "Africa_Eastern", "ER", "Africa/Asmera", - "Africa_Eastern", "KM", "Indian/Comoro", - "Africa_Eastern", "DJ", "Africa/Djibouti", - "Europe_Central", "GI", "Europe/Gibraltar", - "Europe_Central", "DK", "Europe/Copenhagen", - "Europe_Central", "SE", "Europe/Stockholm", - "Europe_Central", "CH", "Europe/Zurich", - "Europe_Central", "AL", "Europe/Tirane", - "Europe_Central", "RS", "Europe/Belgrade", - "Europe_Central", "HU", "Europe/Budapest", - "Europe_Central", "MT", "Europe/Malta", - "Europe_Central", "PL", "Europe/Warsaw", - "Europe_Central", "ME", "Europe/Podgorica", - "Europe_Central", "ES", "Europe/Madrid", - "Europe_Central", "CZ", "Europe/Prague", - "Europe_Central", "IT", "Europe/Rome", - "Europe_Central", "SI", "Europe/Ljubljana", - "Europe_Central", "LI", "Europe/Vaduz", - "Europe_Central", "AT", "Europe/Vienna", - "Europe_Central", "VA", "Europe/Vatican", - "Europe_Central", "DE", "Europe/Berlin", - "Europe_Central", "NO", "Europe/Oslo", - "Europe_Central", "SK", "Europe/Bratislava", - "Europe_Central", "AD", "Europe/Andorra", - "Europe_Central", "SM", "Europe/San_Marino", - "Europe_Central", "MK", "Europe/Skopje", - "Europe_Central", "TN", "Africa/Tunis", - "Europe_Central", "HR", "Europe/Zagreb", - "Europe_Central", "NL", "Europe/Amsterdam", - "Europe_Central", "BE", "Europe/Brussels", - "Europe_Central", "MC", "Europe/Monaco", - "Europe_Central", "LU", "Europe/Luxembourg", - "Europe_Central", "BA", "Europe/Sarajevo", - "China", "MO", "Asia/Macau", - "America_Pacific", "MX", "America/Tijuana", - "America_Pacific", "CA", "America/Vancouver", - "Indochina", "LA", "Asia/Vientiane", - "Indochina", "KH", "Asia/Phnom_Penh", - "Indochina", "TH", "Asia/Bangkok", - "Korea", "KP", "Asia/Pyongyang", - "America_Mountain", "MX", "America/Hermosillo", - "America_Mountain", "CA", "America/Edmonton", - "Africa_Southern", "LS", "Africa/Maseru", - "Africa_Southern", "SZ", "Africa/Mbabane", - "Chile", "AQ", "Antarctica/Palmer", - "New_Zealand", "AQ", "Antarctica/McMurdo", - "Gulf", "OM", "Asia/Muscat", - "Europe_Western", "FO", "Atlantic/Faeroe", - "America_Eastern", "TC", "America/Grand_Turk", - "America_Eastern", "CA", "America/Toronto", - "America_Eastern", "BS", "America/Nassau", - "America_Eastern", "PA", "America/Panama", - "America_Eastern", "JM", "America/Jamaica", - "America_Eastern", "KY", "America/Cayman", - "Africa_Central", "BI", "Africa/Bujumbura", - "Africa_Central", "ZM", "Africa/Lusaka", - "Africa_Central", "ZW", "Africa/Harare", - "Africa_Central", "CD", "Africa/Lubumbashi", - "Africa_Central", "BW", "Africa/Gaborone", - "Africa_Central", "RW", "Africa/Kigali", - "Africa_Central", "MW", "Africa/Blantyre", - "America_Central", "MX", "America/Mexico_City", - "America_Central", "HN", "America/Tegucigalpa", - "America_Central", "CA", "America/Winnipeg", - "America_Central", "GT", "America/Guatemala", - "America_Central", "SV", "America/El_Salvador", - "America_Central", "CR", "America/Costa_Rica", - "America_Central", "BZ", "America/Belize", - "Atlantic", "MS", "America/Montserrat", - "Atlantic", "AG", "America/Antigua", - "Atlantic", "TT", "America/Port_of_Spain", - "Atlantic", "MQ", "America/Martinique", - "Atlantic", "DM", "America/Dominica", - "Atlantic", "KN", "America/St_Kitts", - "Atlantic", "BM", "Atlantic/Bermuda", - "Atlantic", "PR", "America/Puerto_Rico", - "Atlantic", "AW", "America/Aruba", - "Atlantic", "VG", "America/Tortola", - "Atlantic", "GD", "America/Grenada", - "Atlantic", "GL", "America/Thule", - "Atlantic", "BB", "America/Barbados", - "Atlantic", "BQ", "America/Kralendijk", - "Atlantic", "SX", "America/Lower_Princes", - "Atlantic", "VI", "America/St_Thomas", - "Atlantic", "MF", "America/Marigot", - "Atlantic", "AI", "America/Anguilla", - "Atlantic", "AN", "America/Curacao", - "Atlantic", "LC", "America/St_Lucia", - "Atlantic", "GP", "America/Guadeloupe", - "Atlantic", "VC", "America/St_Vincent", - "Arabian", "QA", "Asia/Qatar", - "Arabian", "YE", "Asia/Aden", - "Arabian", "KW", "Asia/Kuwait", - "Arabian", "BH", "Asia/Bahrain", - "Arabian", "IQ", "Asia/Baghdad", - "India", "LK", "Asia/Colombo", - "Europe_Eastern", "SY", "Asia/Damascus", - "Europe_Eastern", "BG", "Europe/Sofia", - "Europe_Eastern", "GR", "Europe/Athens", - "Europe_Eastern", "JO", "Asia/Amman", - "Europe_Eastern", "CY", "Asia/Nicosia", - "Europe_Eastern", "AX", "Europe/Mariehamn", - "Europe_Eastern", "LB", "Asia/Beirut", - "Europe_Eastern", "FI", "Europe/Helsinki", - "Europe_Eastern", "EG", "Africa/Cairo", - "Chamorro", "GU", "Pacific/Guam", - }; - private static final String[] aliasMap = new String[] { - "Brazil/Acre", "America/Rio_Branco", - "US/Indiana-Starke", "America/Indiana/Knox", - "America/Atka", "America/Adak", - "America/St_Barthelemy", "America/Guadeloupe", - "Australia/North", "Australia/Darwin", - "Europe/Zagreb", "Europe/Belgrade", - "Etc/Universal", "Etc/UTC", - "NZ-CHAT", "Pacific/Chatham", - "Asia/Macao", "Asia/Macau", - "Pacific/Yap", "Pacific/Chuuk", - "Egypt", "Africa/Cairo", - "US/Central", "America/Chicago", - "Canada/Atlantic", "America/Halifax", - "Brazil/East", "America/Sao_Paulo", - "America/Cordoba", "America/Argentina/Cordoba", - "US/Hawaii", "Pacific/Honolulu", - "America/Louisville", "America/Kentucky/Louisville", - "America/Shiprock", "America/Denver", - "Australia/Canberra", "Australia/Sydney", - "Asia/Chungking", "Asia/Chongqing", - "Universal", "Etc/UTC", - "US/Alaska", "America/Anchorage", - "Asia/Ujung_Pandang", "Asia/Makassar", - "Japan", "Asia/Tokyo", - "Atlantic/Faeroe", "Atlantic/Faroe", - "Asia/Istanbul", "Europe/Istanbul", - "US/Pacific", "America/Los_Angeles", - "Mexico/General", "America/Mexico_City", - "Poland", "Europe/Warsaw", - "Africa/Asmera", "Africa/Asmara", - "Asia/Saigon", "Asia/Ho_Chi_Minh", - "US/Michigan", "America/Detroit", - "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca", - "W-SU", "Europe/Moscow", - "Australia/ACT", "Australia/Sydney", - "Asia/Calcutta", "Asia/Kolkata", - "Arctic/Longyearbyen", "Europe/Oslo", - "America/Knox_IN", "America/Indiana/Knox", - "ROC", "Asia/Taipei", - "Zulu", "Etc/UTC", - "Australia/Yancowinna", "Australia/Broken_Hill", - "Australia/West", "Australia/Perth", - "Singapore", "Asia/Singapore", - "Europe/Mariehamn", "Europe/Helsinki", - "ROK", "Asia/Seoul", - "America/Porto_Acre", "America/Rio_Branco", - "Etc/Zulu", "Etc/UTC", - "Canada/Yukon", "America/Whitehorse", - "Europe/Vatican", "Europe/Rome", - "Africa/Timbuktu", "Africa/Bamako", - "America/Buenos_Aires", "America/Argentina/Buenos_Aires", - "Canada/Pacific", "America/Vancouver", - "US/Pacific-New", "America/Los_Angeles", - "Mexico/BajaNorte", "America/Tijuana", - "Europe/Guernsey", "Europe/London", - "Asia/Tel_Aviv", "Asia/Jerusalem", - "Chile/Continental", "America/Santiago", - "Jamaica", "America/Jamaica", - "Mexico/BajaSur", "America/Mazatlan", - "Canada/Eastern", "America/Toronto", - "Australia/Tasmania", "Australia/Hobart", - "NZ", "Pacific/Auckland", - "America/Lower_Princes", "America/Curacao", - "GMT-", "Etc/GMT", - "America/Rosario", "America/Argentina/Cordoba", - "Libya", "Africa/Tripoli", - "Asia/Ashkhabad", "Asia/Ashgabat", - "Australia/NSW", "Australia/Sydney", - "America/Marigot", "America/Guadeloupe", - "Europe/Bratislava", "Europe/Prague", - "Portugal", "Europe/Lisbon", - "Etc/GMT-", "Etc/GMT", - "Europe/San_Marino", "Europe/Rome", - "Europe/Sarajevo", "Europe/Belgrade", - "Antarctica/South_Pole", "Antarctica/McMurdo", - "Canada/Central", "America/Winnipeg", - "Etc/GMT", "Etc/GMT", - "Europe/Isle_of_Man", "Europe/London", - "America/Fort_Wayne", "America/Indiana/Indianapolis", - "Eire", "Europe/Dublin", - "America/Coral_Harbour", "America/Atikokan", - "Europe/Nicosia", "Asia/Nicosia", - "US/Samoa", "Pacific/Pago_Pago", - "Hongkong", "Asia/Hong_Kong", - "Canada/Saskatchewan", "America/Regina", - "Asia/Thimbu", "Asia/Thimphu", - "Kwajalein", "Pacific/Kwajalein", - "GB", "Europe/London", - "Chile/EasterIsland", "Pacific/Easter", - "US/East-Indiana", "America/Indiana/Indianapolis", - "Australia/LHI", "Australia/Lord_Howe", - "Cuba", "America/Havana", - "America/Jujuy", "America/Argentina/Jujuy", - "US/Mountain", "America/Denver", - "Atlantic/Jan_Mayen", "Europe/Oslo", - "Europe/Tiraspol", "Europe/Chisinau", - "Europe/Podgorica", "Europe/Belgrade", - "US/Arizona", "America/Phoenix", - "Navajo", "America/Denver", - "Etc/Greenwich", "Etc/GMT", - "Canada/Mountain", "America/Edmonton", - "Iceland", "Atlantic/Reykjavik", - "Australia/Victoria", "Australia/Melbourne", - "Australia/South", "Australia/Adelaide", - "Brazil/West", "America/Manaus", - "Pacific/Ponape", "Pacific/Pohnpei", - "Europe/Ljubljana", "Europe/Belgrade", - "Europe/Jersey", "Europe/London", - "Australia/Queensland", "Australia/Brisbane", - "UTC", "Etc/UTC", - "Canada/Newfoundland", "America/St_Johns", - "Europe/Skopje", "Europe/Belgrade", - "PRC", "Asia/Shanghai", - "UCT", "Etc/UCT", - "America/Mendoza", "America/Argentina/Mendoza", - "Israel", "Asia/Jerusalem", - "US/Eastern", "America/New_York", - "Asia/Ulan_Bator", "Asia/Ulaanbaatar", - "Turkey", "Europe/Istanbul", - "GMT", "Etc/GMT", - "US/Aleutian", "America/Adak", - "Brazil/DeNoronha", "America/Noronha", - "GB-Eire", "Europe/London", - "Asia/Dacca", "Asia/Dhaka", - "America/Ensenada", "America/Tijuana", - "America/Catamarca", "America/Argentina/Catamarca", - "Iran", "Asia/Tehran", - "Greenwich", "Etc/GMT", - "Pacific/Truk", "Pacific/Chuuk", - "Pacific/Samoa", "Pacific/Pago_Pago", - "America/Virgin", "America/St_Thomas", - "Asia/Katmandu", "Asia/Kathmandu", - "America/Indianapolis", "America/Indiana/Indianapolis", - "Europe/Belfast", "Europe/London", - "America/Kralendijk", "America/Curacao", - "Asia/Rangoon", "Asia/Yangon", - }; - - private static final Map zidToMzone = new HashMap<>(); - private static final Map mzoneToZid = new HashMap<>(); - private static final Map> mzoneToZidL = new HashMap<>(); - private static final Map aliases = new HashMap<>(); - - static { - for (int i = 0; i < zidMap.length; i += 3) { - zidToMzone.put(zidMap[i], zidMap[i + 1]); - mzoneToZid.put(zidMap[i + 1], zidMap[i + 2]); - } - - for (int i = 0; i < mzoneMap.length; i += 3) { - String mzone = mzoneMap[i]; - Map map = mzoneToZidL.get(mzone); - if (map == null) { - map = new HashMap<>(); - mzoneToZidL.put(mzone, map); - } - map.put(mzoneMap[i + 1], mzoneMap[i + 2]); - } - - for (int i = 0; i < aliasMap.length; i += 2) { - aliases.put(aliasMap[i], aliasMap[i + 1]); - } - } -} diff -r 6b46983d6fbe -r 6a6ee36037ac src/java.base/share/classes/java/time/format/ZoneName.java.template --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.base/share/classes/java/time/format/ZoneName.java.template Wed Apr 11 09:14:47 2018 -0700 @@ -0,0 +1,249 @@ +/* + * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.time.format; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +/** + * A helper class to map a zone name to metazone and back to the + * appropriate zone id for the particular locale. + *

+ * The zid<->metazone mappings are based on CLDR metaZones.xml. + * The alias mappings are based on Link entries in tzdb data files and + * CLDR's supplementalMetadata.xml. + */ +class ZoneName { + + public static String toZid(String zid, Locale locale) { + String mzone = zidToMzone.get(zid); + if (mzone == null && aliases.containsKey(zid)) { + zid = aliases.get(zid); + mzone = zidToMzone.get(zid); + } + if (mzone != null) { + Map map = mzoneToZidL.get(mzone); + if (map != null && map.containsKey(locale.getCountry())) { + zid = map.get(locale.getCountry()); + } else { + zid = mzoneToZid.get(mzone); + } + } + return toZid(zid); + } + + public static String toZid(String zid) { + if (aliases.containsKey(zid)) { + return aliases.get(zid); + } + return zid; + } + + private static final String[] zidMap = new String[] { + // From metaZones.xml +%%%%ZIDMAP%%%% + + // From tzdb + "Africa/Khartoum", "Africa_Central", "Africa/Maputo", // tzdata2017c + "Africa/Windhoek", "Africa_Central", "Africa/Maputo", // tzdata2017c + "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos", // tzdata2018c + }; + private static final String[] mzoneMap = new String[] { + // From metaZones.xml +%%%%MZONEMAP%%%% + + // From tzdb + "Africa_Western", "ST", "Africa/Sao_Tome", // tzdata2018c + }; + private static final String[] aliasMap = new String[] { + // From supplementalMetadata.xml +%%%%DEPRECATED%%%% + + // From tzdb + "Brazil/Acre", "America/Rio_Branco", + "US/Indiana-Starke", "America/Indiana/Knox", + "America/Atka", "America/Adak", + "America/St_Barthelemy", "America/Guadeloupe", + "Australia/North", "Australia/Darwin", + "Europe/Zagreb", "Europe/Belgrade", + "Etc/Universal", "Etc/UTC", + "NZ-CHAT", "Pacific/Chatham", + "Asia/Macao", "Asia/Macau", + "Pacific/Yap", "Pacific/Chuuk", + "Egypt", "Africa/Cairo", + "US/Central", "America/Chicago", + "Canada/Atlantic", "America/Halifax", + "Brazil/East", "America/Sao_Paulo", + "America/Cordoba", "America/Argentina/Cordoba", + "US/Hawaii", "Pacific/Honolulu", + "America/Louisville", "America/Kentucky/Louisville", + "America/Shiprock", "America/Denver", + "Australia/Canberra", "Australia/Sydney", + "Asia/Chungking", "Asia/Chongqing", + "Universal", "Etc/UTC", + "US/Alaska", "America/Anchorage", + "Asia/Ujung_Pandang", "Asia/Makassar", + "Japan", "Asia/Tokyo", + "Atlantic/Faeroe", "Atlantic/Faroe", + "Asia/Istanbul", "Europe/Istanbul", + "US/Pacific", "America/Los_Angeles", + "Mexico/General", "America/Mexico_City", + "Poland", "Europe/Warsaw", + "Africa/Asmera", "Africa/Asmara", + "Asia/Saigon", "Asia/Ho_Chi_Minh", + "US/Michigan", "America/Detroit", + "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca", + "W-SU", "Europe/Moscow", + "Australia/ACT", "Australia/Sydney", + "Asia/Calcutta", "Asia/Kolkata", + "Arctic/Longyearbyen", "Europe/Oslo", + "America/Knox_IN", "America/Indiana/Knox", + "ROC", "Asia/Taipei", + "Zulu", "Etc/UTC", + "Australia/Yancowinna", "Australia/Broken_Hill", + "Australia/West", "Australia/Perth", + "Singapore", "Asia/Singapore", + "Europe/Mariehamn", "Europe/Helsinki", + "ROK", "Asia/Seoul", + "America/Porto_Acre", "America/Rio_Branco", + "Etc/Zulu", "Etc/UTC", + "Canada/Yukon", "America/Whitehorse", + "Europe/Vatican", "Europe/Rome", + "Africa/Timbuktu", "Africa/Bamako", + "America/Buenos_Aires", "America/Argentina/Buenos_Aires", + "Canada/Pacific", "America/Vancouver", + "US/Pacific-New", "America/Los_Angeles", + "Mexico/BajaNorte", "America/Tijuana", + "Europe/Guernsey", "Europe/London", + "Asia/Tel_Aviv", "Asia/Jerusalem", + "Chile/Continental", "America/Santiago", + "Jamaica", "America/Jamaica", + "Mexico/BajaSur", "America/Mazatlan", + "Canada/Eastern", "America/Toronto", + "Australia/Tasmania", "Australia/Hobart", + "NZ", "Pacific/Auckland", + "America/Lower_Princes", "America/Curacao", + "GMT-", "Etc/GMT", + "America/Rosario", "America/Argentina/Cordoba", + "Libya", "Africa/Tripoli", + "Asia/Ashkhabad", "Asia/Ashgabat", + "Australia/NSW", "Australia/Sydney", + "America/Marigot", "America/Guadeloupe", + "Europe/Bratislava", "Europe/Prague", + "Portugal", "Europe/Lisbon", + "Etc/GMT-", "Etc/GMT", + "Europe/San_Marino", "Europe/Rome", + "Europe/Sarajevo", "Europe/Belgrade", + "Antarctica/South_Pole", "Antarctica/McMurdo", + "Canada/Central", "America/Winnipeg", + "Etc/GMT", "Etc/GMT", + "Europe/Isle_of_Man", "Europe/London", + "America/Fort_Wayne", "America/Indiana/Indianapolis", + "Eire", "Europe/Dublin", + "America/Coral_Harbour", "America/Atikokan", + "Europe/Nicosia", "Asia/Nicosia", + "US/Samoa", "Pacific/Pago_Pago", + "Hongkong", "Asia/Hong_Kong", + "Canada/Saskatchewan", "America/Regina", + "Asia/Thimbu", "Asia/Thimphu", + "Kwajalein", "Pacific/Kwajalein", + "GB", "Europe/London", + "Chile/EasterIsland", "Pacific/Easter", + "US/East-Indiana", "America/Indiana/Indianapolis", + "Australia/LHI", "Australia/Lord_Howe", + "Cuba", "America/Havana", + "America/Jujuy", "America/Argentina/Jujuy", + "US/Mountain", "America/Denver", + "Atlantic/Jan_Mayen", "Europe/Oslo", + "Europe/Tiraspol", "Europe/Chisinau", + "Europe/Podgorica", "Europe/Belgrade", + "US/Arizona", "America/Phoenix", + "Navajo", "America/Denver", + "Etc/Greenwich", "Etc/GMT", + "Canada/Mountain", "America/Edmonton", + "Iceland", "Atlantic/Reykjavik", + "Australia/Victoria", "Australia/Melbourne", + "Australia/South", "Australia/Adelaide", + "Brazil/West", "America/Manaus", + "Pacific/Ponape", "Pacific/Pohnpei", + "Europe/Ljubljana", "Europe/Belgrade", + "Europe/Jersey", "Europe/London", + "Australia/Queensland", "Australia/Brisbane", + "UTC", "Etc/UTC", + "Canada/Newfoundland", "America/St_Johns", + "Europe/Skopje", "Europe/Belgrade", + "PRC", "Asia/Shanghai", + "UCT", "Etc/UCT", + "America/Mendoza", "America/Argentina/Mendoza", + "Israel", "Asia/Jerusalem", + "US/Eastern", "America/New_York", + "Asia/Ulan_Bator", "Asia/Ulaanbaatar", + "Turkey", "Europe/Istanbul", + "GMT", "Etc/GMT", + "US/Aleutian", "America/Adak", + "Brazil/DeNoronha", "America/Noronha", + "GB-Eire", "Europe/London", + "Asia/Dacca", "Asia/Dhaka", + "America/Ensenada", "America/Tijuana", + "America/Catamarca", "America/Argentina/Catamarca", + "Iran", "Asia/Tehran", + "Greenwich", "Etc/GMT", + "Pacific/Truk", "Pacific/Chuuk", + "Pacific/Samoa", "Pacific/Pago_Pago", + "America/Virgin", "America/St_Thomas", + "Asia/Katmandu", "Asia/Kathmandu", + "America/Indianapolis", "America/Indiana/Indianapolis", + "Europe/Belfast", "Europe/London", + "America/Kralendijk", "America/Curacao", + "Asia/Rangoon", "Asia/Yangon", + }; + + private static final Map zidToMzone = new HashMap<>(); + private static final Map mzoneToZid = new HashMap<>(); + private static final Map> mzoneToZidL = new HashMap<>(); + private static final Map aliases = new HashMap<>(); + + static { + for (int i = 0; i < zidMap.length; i += 3) { + zidToMzone.put(zidMap[i], zidMap[i + 1]); + mzoneToZid.put(zidMap[i + 1], zidMap[i + 2]); + } + + for (int i = 0; i < mzoneMap.length; i += 3) { + String mzone = mzoneMap[i]; + Map map = mzoneToZidL.get(mzone); + if (map == null) { + map = new HashMap<>(); + mzoneToZidL.put(mzone, map); + } + map.put(mzoneMap[i + 1], mzoneMap[i + 2]); + } + + for (int i = 0; i < aliasMap.length; i += 2) { + aliases.put(aliasMap[i], aliasMap[i + 1]); + } + } +} diff -r 6b46983d6fbe -r 6a6ee36037ac test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java --- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java Wed Apr 11 10:19:37 2018 +0100 +++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java Wed Apr 11 09:14:47 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,7 @@ /* * @test - * @bug 8081022 8151876 8166875 + * @bug 8081022 8151876 8166875 8189784 * @key randomness */ @@ -158,6 +158,10 @@ {"Australia/South", "ACST", preferred_s, Locale.ENGLISH, TextStyle.SHORT}, {"America/Chicago", "CDT", none, Locale.ENGLISH, TextStyle.SHORT}, {"Asia/Shanghai", "CDT", preferred_s, Locale.ENGLISH, TextStyle.SHORT}, + {"America/Juneau", "AKST", none, Locale.ENGLISH, TextStyle.SHORT}, + {"America/Juneau", "AKDT", none, Locale.ENGLISH, TextStyle.SHORT}, + {"Pacific/Honolulu", "HST", none, Locale.ENGLISH, TextStyle.SHORT}, + {"America/Halifax", "AST", none, Locale.ENGLISH, TextStyle.SHORT}, }; } diff -r 6b46983d6fbe -r 6a6ee36037ac test/jdk/java/time/test/java/time/format/ZoneName.java --- a/test/jdk/java/time/test/java/time/format/ZoneName.java Wed Apr 11 10:19:37 2018 +0100 +++ b/test/jdk/java/time/test/java/time/format/ZoneName.java Wed Apr 11 09:14:47 2018 -0700 @@ -20,13 +20,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ - package test.java.time.format; import java.util.HashMap; import java.util.Locale; import java.util.Map; +/** + * A helper class to map a zone name to metazone and back to the + * appropriate zone id for the particular locale. + *

+ * The zid<->metazone mappings are based on CLDR metaZones.xml. + * The alias mappings are based on Link entries in tzdb data files and + * CLDR's supplementalMetadata.xml. + */ class ZoneName { public static String toZid(String zid, Locale locale) { @@ -54,699 +61,850 @@ } private static final String[] zidMap = new String[] { - "Asia/Bangkok", "Indochina", "Asia/Saigon", - "Pacific/Pago_Pago", "Samoa", "Pacific/Apia", - "Africa/Blantyre", "Africa_Central", "Africa/Maputo", - "America/Argentina/San_Juan", "Argentina", "America/Buenos_Aires", - "America/Cancun", "America_Central", "America/Chicago", - "Pacific/Nauru", "Nauru", "Pacific/Nauru", - "America/Atikokan", "America_Eastern", "America/New_York", + // From metaZones.xml + "Africa/Abidjan", "GMT", "Atlantic/Reykjavik", + "Africa/Accra", "GMT", "Atlantic/Reykjavik", + "Africa/Addis_Ababa", "Africa_Eastern", "Africa/Nairobi", + "Africa/Algiers", "Europe_Central", "Europe/Paris", "Africa/Asmara", "Africa_Eastern", "Africa/Nairobi", - "Europe/Berlin", "Europe_Central", "Europe/Paris", - "Asia/Kolkata", "India", "Asia/Calcutta", - "Australia/Darwin", "Australia_Central", "Australia/Adelaide", - "America/Guayaquil", "Ecuador", "America/Guayaquil", - "Europe/Vienna", "Europe_Central", "Europe/Paris", - "Atlantic/St_Helena", "GMT", "Atlantic/Reykjavik", - "Europe/London", "GMT", "Atlantic/Reykjavik", - "Europe/Moscow", "Moscow", "Europe/Moscow", - "America/St_Vincent", "Atlantic", "America/Halifax", - "America/Bogota", "Colombia", "America/Bogota", - "America/Marigot", "Atlantic", "America/Halifax", - "Europe/Sarajevo", "Europe_Central", "Europe/Paris", - "America/Hermosillo", "America_Mountain", "America/Denver", - "America/Winnipeg", "America_Central", "America/Chicago", - "America/Rainy_River", "America_Central", "America/Chicago", - "Indian/Mahe", "Seychelles", "Indian/Mahe", + "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi", + "Africa/Bamako", "GMT", "Atlantic/Reykjavik", + "Africa/Bangui", "Africa_Western", "Africa/Lagos", + "Africa/Banjul", "GMT", "Atlantic/Reykjavik", + "Africa/Bissau", "GMT", "Atlantic/Reykjavik", + "Africa/Blantyre", "Africa_Central", "Africa/Maputo", + "Africa/Brazzaville", "Africa_Western", "Africa/Lagos", + "Africa/Bujumbura", "Africa_Central", "Africa/Maputo", + "Africa/Cairo", "Europe_Eastern", "Europe/Bucharest", + "Africa/Casablanca", "Europe_Western", "Atlantic/Canary", + "Africa/Ceuta", "Europe_Central", "Europe/Paris", + "Africa/Conakry", "GMT", "Atlantic/Reykjavik", + "Africa/Dakar", "GMT", "Atlantic/Reykjavik", + "Africa/Dar_es_Salaam", "Africa_Eastern", "Africa/Nairobi", + "Africa/Djibouti", "Africa_Eastern", "Africa/Nairobi", + "Africa/Douala", "Africa_Western", "Africa/Lagos", + "Africa/El_Aaiun", "Europe_Western", "Atlantic/Canary", "Africa/Freetown", "GMT", "Atlantic/Reykjavik", - "America/Grand_Turk", "America_Eastern", "America/New_York", - "America/Argentina/Ushuaia", "Argentina", "America/Buenos_Aires", - "Atlantic/Azores", "Azores", "Atlantic/Azores", - "Asia/Harbin", "China", "Asia/Shanghai", - "America/Cuiaba", "Amazon", "America/Manaus", - "Asia/Bahrain", "Arabian", "Asia/Riyadh", - "Asia/Katmandu", "Nepal", "Asia/Katmandu", - "Pacific/Galapagos", "Galapagos", "Pacific/Galapagos", - "Asia/Brunei", "Brunei", "Asia/Brunei", + "Africa/Gaborone", "Africa_Central", "Africa/Maputo", + "Africa/Harare", "Africa_Central", "Africa/Maputo", + "Africa/Johannesburg", "Africa_Southern", "Africa/Johannesburg", + "Africa/Juba", "Africa_Eastern", "Africa/Nairobi", + "Africa/Kampala", "Africa_Eastern", "Africa/Nairobi", + "Africa/Khartoum", "Africa_Eastern", "Africa/Nairobi", "Africa/Kigali", "Africa_Central", "Africa/Maputo", - "Asia/Makassar", "Indonesia_Central", "Asia/Makassar", + "Africa/Kinshasa", "Africa_Western", "Africa/Lagos", + "Africa/Lagos", "Africa_Western", "Africa/Lagos", + "Africa/Libreville", "Africa_Western", "Africa/Lagos", + "Africa/Lome", "GMT", "Atlantic/Reykjavik", + "Africa/Luanda", "Africa_Western", "Africa/Lagos", + "Africa/Lubumbashi", "Africa_Central", "Africa/Maputo", + "Africa/Lusaka", "Africa_Central", "Africa/Maputo", + "Africa/Malabo", "Africa_Western", "Africa/Lagos", "Africa/Maputo", "Africa_Central", "Africa/Maputo", - "Asia/Kamchatka", "Magadan", "Asia/Magadan", - "Atlantic/Faroe", "Europe_Western", "Atlantic/Canary", - "America/El_Salvador", "America_Central", "America/Chicago", - "Asia/Saigon", "Indochina", "Asia/Saigon", - "Africa/Kinshasa", "Africa_Western", "Africa/Lagos", - "Europe/Oslo", "Europe_Central", "Europe/Paris", - "Asia/Hong_Kong", "Hong_Kong", "Asia/Hong_Kong", - "Pacific/Midway", "Samoa", "Pacific/Apia", - "Africa/Douala", "Africa_Western", "Africa/Lagos", - "Europe/San_Marino", "Europe_Central", "Europe/Paris", - "Pacific/Chuuk", "Truk", "Pacific/Truk", - "Africa/Gaborone", "Africa_Central", "Africa/Maputo", + "Africa/Maseru", "Africa_Southern", "Africa/Johannesburg", + "Africa/Mbabane", "Africa_Southern", "Africa/Johannesburg", + "Africa/Mogadishu", "Africa_Eastern", "Africa/Nairobi", + "Africa/Monrovia", "GMT", "Atlantic/Reykjavik", + "Africa/Nairobi", "Africa_Eastern", "Africa/Nairobi", + "Africa/Ndjamena", "Africa_Western", "Africa/Lagos", + "Africa/Niamey", "Africa_Western", "Africa/Lagos", + "Africa/Nouakchott", "GMT", "Atlantic/Reykjavik", + "Africa/Ouagadougou", "GMT", "Atlantic/Reykjavik", + "Africa/Porto-Novo", "Africa_Western", "Africa/Lagos", + "Africa/Sao_Tome", "GMT", "Atlantic/Reykjavik", + "Africa/Timbuktu", "GMT", "Atlantic/Reykjavik", + "Africa/Tripoli", "Europe_Eastern", "Europe/Bucharest", "Africa/Tunis", "Europe_Central", "Europe/Paris", - "Africa/Khartoum", "Africa_Central", "Africa/Maputo", - "Europe/Isle_of_Man", "GMT", "Atlantic/Reykjavik", - "Europe/Skopje", "Europe_Central", "Europe/Paris", - "America/Merida", "America_Central", "America/Chicago", - "Antarctica/DumontDUrville", "DumontDUrville", "Antarctica/DumontDUrville", - "Atlantic/Reykjavik", "GMT", "Atlantic/Reykjavik", - "Indian/Mauritius", "Mauritius", "Indian/Mauritius", - "Africa/Malabo", "Africa_Western", "Africa/Lagos", - "Africa/Juba", "Africa_Eastern", "Africa/Nairobi", - "America/Resolute", "America_Central", "America/Chicago", - "Africa/Abidjan", "GMT", "Atlantic/Reykjavik", - "Antarctica/McMurdo", "New_Zealand", "Pacific/Auckland", - "Asia/Thimphu", "Bhutan", "Asia/Thimphu", - "Europe/Zaporozhye", "Europe_Eastern", "Europe/Bucharest", - "Antarctica/Davis", "Davis", "Antarctica/Davis", - "Indian/Antananarivo", "Africa_Eastern", "Africa/Nairobi", - "Africa/Harare", "Africa_Central", "Africa/Maputo", - "Pacific/Marquesas", "Marquesas", "Pacific/Marquesas", - "Africa/Tripoli", "Europe_Eastern", "Europe/Bucharest", - "America/North_Dakota/Beulah", "America_Central", "America/Chicago", + "Africa/Windhoek", "Africa_Western", "Africa/Lagos", + "America/Adak", "Hawaii_Aleutian", "Pacific/Honolulu", + "America/Anchorage", "Alaska", "America/Juneau", + "America/Anguilla", "Atlantic", "America/Halifax", + "America/Antigua", "Atlantic", "America/Halifax", + "America/Araguaina", "Brasilia", "America/Sao_Paulo", + "America/Argentina/Buenos_Aires", "Argentina", "America/Buenos_Aires", + "America/Argentina/Catamarca", "Argentina", "America/Buenos_Aires", + "America/Argentina/ComodRivadavia", "Argentina", "America/Buenos_Aires", + "America/Argentina/Cordoba", "Argentina", "America/Buenos_Aires", + "America/Argentina/Jujuy", "Argentina", "America/Buenos_Aires", + "America/Argentina/La_Rioja", "Argentina", "America/Buenos_Aires", + "America/Argentina/Mendoza", "Argentina", "America/Buenos_Aires", + "America/Argentina/Rio_Gallegos", "Argentina", "America/Buenos_Aires", + "America/Argentina/Salta", "Argentina", "America/Buenos_Aires", + "America/Argentina/San_Juan", "Argentina", "America/Buenos_Aires", + "America/Argentina/San_Luis", "Argentina_Western", "America/Argentina/San_Luis", + "America/Argentina/Tucuman", "Argentina", "America/Buenos_Aires", + "America/Argentina/Ushuaia", "Argentina", "America/Buenos_Aires", + "America/Aruba", "Atlantic", "America/Halifax", + "America/Asuncion", "Paraguay", "America/Asuncion", + "America/Atikokan", "America_Eastern", "America/New_York", + "America/Atka", "Hawaii_Aleutian", "Pacific/Honolulu", + "America/Bahia", "Brasilia", "America/Sao_Paulo", + "America/Bahia_Banderas", "America_Central", "America/Chicago", + "America/Barbados", "Atlantic", "America/Halifax", + "America/Belem", "Brasilia", "America/Sao_Paulo", + "America/Belize", "America_Central", "America/Chicago", + "America/Blanc-Sablon", "Atlantic", "America/Halifax", + "America/Boa_Vista", "Amazon", "America/Manaus", + "America/Bogota", "Colombia", "America/Bogota", + "America/Boise", "America_Mountain", "America/Denver", "America/Buenos_Aires", "Argentina", "America/Buenos_Aires", - "America/Tortola", "Atlantic", "America/Halifax", - "Asia/Kuwait", "Arabian", "Asia/Riyadh", - "Europe/Rome", "Europe_Central", "Europe/Paris", - "America/Eirunepe", "Amazon", "America/Manaus", - "Australia/Hobart", "Australia_Eastern", "Australia/Sydney", - "America/Thule", "Atlantic", "America/Halifax", - "Asia/Beirut", "Europe_Eastern", "Europe/Bucharest", - "America/Bahia_Banderas", "America_Central", "America/Chicago", - "Africa/Dar_es_Salaam", "Africa_Eastern", "Africa/Nairobi", - "America/Argentina/Tucuman", "Argentina", "America/Buenos_Aires", - "America/Paramaribo", "Suriname", "America/Paramaribo", - "Africa/Kampala", "Africa_Eastern", "Africa/Nairobi", - "Pacific/Port_Moresby", "Papua_New_Guinea", "Pacific/Port_Moresby", - "America/Mendoza", "Argentina", "America/Buenos_Aires", - "Asia/Dushanbe", "Tajikistan", "Asia/Dushanbe", - "Asia/Qyzylorda", "Kazakhstan_Eastern", "Asia/Almaty", - "Antarctica/Vostok", "Vostok", "Antarctica/Vostok", - "Pacific/Majuro", "Marshall_Islands", "Pacific/Majuro", - "Asia/Tehran", "Iran", "Asia/Tehran", - "Asia/Hovd", "Hovd", "Asia/Hovd", - "Antarctica/Rothera", "Rothera", "Antarctica/Rothera", - "Africa/Brazzaville", "Africa_Western", "Africa/Lagos", - "Europe/Tirane", "Europe_Central", "Europe/Paris", - "Asia/Urumqi", "China", "Asia/Shanghai", - "Asia/Krasnoyarsk", "Krasnoyarsk", "Asia/Krasnoyarsk", - "America/Tegucigalpa", "America_Central", "America/Chicago", - "Asia/Vientiane", "Indochina", "Asia/Saigon", - "Asia/Pontianak", "Indonesia_Western", "Asia/Jakarta", - "America/Bahia", "Brasilia", "America/Sao_Paulo", - "Asia/Choibalsan", "Choibalsan", "Asia/Choibalsan", - "America/Regina", "America_Central", "America/Chicago", - "Africa/Cairo", "Europe_Eastern", "Europe/Bucharest", - "Asia/Irkutsk", "Irkutsk", "Asia/Irkutsk", - "Europe/Luxembourg", "Europe_Central", "Europe/Paris", - "America/St_Kitts", "Atlantic", "America/Halifax", + "America/Cambridge_Bay", "America_Mountain", "America/Denver", + "America/Campo_Grande", "Amazon", "America/Manaus", + "America/Cancun", "America_Eastern", "America/New_York", + "America/Caracas", "Venezuela", "America/Caracas", + "America/Catamarca", "Argentina", "America/Buenos_Aires", + "America/Cayenne", "French_Guiana", "America/Cayenne", + "America/Cayman", "America_Eastern", "America/New_York", + "America/Chicago", "America_Central", "America/Chicago", + "America/Chihuahua", "Mexico_Pacific", "America/Mazatlan", + "America/Coral_Harbour", "America_Eastern", "America/New_York", + "America/Cordoba", "Argentina", "America/Buenos_Aires", + "America/Costa_Rica", "America_Central", "America/Chicago", + "America/Creston", "America_Mountain", "America/Denver", + "America/Cuiaba", "Amazon", "America/Manaus", + "America/Curacao", "Atlantic", "America/Halifax", + "America/Danmarkshavn", "GMT", "Atlantic/Reykjavik", + "America/Dawson", "America_Pacific", "America/Los_Angeles", + "America/Dawson_Creek", "America_Mountain", "America/Denver", + "America/Denver", "America_Mountain", "America/Denver", + "America/Detroit", "America_Eastern", "America/New_York", + "America/Dominica", "Atlantic", "America/Halifax", + "America/Edmonton", "America_Mountain", "America/Denver", + "America/Eirunepe", "Acre", "America/Rio_Branco", + "America/El_Salvador", "America_Central", "America/Chicago", + "America/Ensenada", "America_Pacific", "America/Los_Angeles", + "America/Fort_Nelson", "America_Mountain", "America/Denver", + "America/Fort_Wayne", "America_Eastern", "America/New_York", + "America/Fortaleza", "Brasilia", "America/Sao_Paulo", + "America/Glace_Bay", "Atlantic", "America/Halifax", + "America/Godthab", "Greenland_Western", "America/Godthab", + "America/Goose_Bay", "Atlantic", "America/Halifax", + "America/Grand_Turk", "Atlantic", "America/Halifax", + "America/Grenada", "Atlantic", "America/Halifax", + "America/Guadeloupe", "Atlantic", "America/Halifax", + "America/Guatemala", "America_Central", "America/Chicago", + "America/Guayaquil", "Ecuador", "America/Guayaquil", + "America/Guyana", "Guyana", "America/Guyana", + "America/Halifax", "Atlantic", "America/Halifax", + "America/Havana", "Cuba", "America/Havana", + "America/Hermosillo", "Mexico_Pacific", "America/Mazatlan", + "America/Indiana/Indianapolis", "America_Eastern", "America/New_York", + "America/Indiana/Knox", "America_Central", "America/Chicago", + "America/Indiana/Marengo", "America_Eastern", "America/New_York", + "America/Indiana/Petersburg", "America_Eastern", "America/New_York", + "America/Indiana/Tell_City", "America_Central", "America/Chicago", + "America/Indiana/Vevay", "America_Eastern", "America/New_York", + "America/Indiana/Vincennes", "America_Eastern", "America/New_York", + "America/Indiana/Winamac", "America_Eastern", "America/New_York", + "America/Indianapolis", "America_Eastern", "America/New_York", + "America/Inuvik", "America_Mountain", "America/Denver", + "America/Iqaluit", "America_Eastern", "America/New_York", + "America/Jamaica", "America_Eastern", "America/New_York", + "America/Jujuy", "Argentina", "America/Buenos_Aires", + "America/Juneau", "Alaska", "America/Juneau", + "America/Kentucky/Louisville", "America_Eastern", "America/New_York", + "America/Kentucky/Monticello", "America_Eastern", "America/New_York", + "America/Knox_IN", "America_Central", "America/Chicago", + "America/Kralendijk", "Atlantic", "America/Halifax", + "America/La_Paz", "Bolivia", "America/La_Paz", + "America/Lima", "Peru", "America/Lima", + "America/Los_Angeles", "America_Pacific", "America/Los_Angeles", + "America/Louisville", "America_Eastern", "America/New_York", + "America/Lower_Princes", "Atlantic", "America/Halifax", + "America/Maceio", "Brasilia", "America/Sao_Paulo", + "America/Managua", "America_Central", "America/Chicago", "America/Manaus", "Amazon", "America/Manaus", - "America/Noronha", "Noronha", "America/Noronha", - "Pacific/Gambier", "Gambier", "Pacific/Gambier", - "America/Edmonton", "America_Mountain", "America/Denver", - "Pacific/Palau", "Palau", "Pacific/Palau", - "America/Lower_Princes", "Atlantic", "America/Halifax", - "Africa/Ouagadougou", "GMT", "Atlantic/Reykjavik", - "Asia/Yerevan", "Armenia", "Asia/Yerevan", - "America/Montevideo", "Uruguay", "America/Montevideo", - "Europe/Minsk", "Europe_Eastern", "Europe/Bucharest", - "Europe/Amsterdam", "Europe_Central", "Europe/Paris", - "Pacific/Efate", "Vanuatu", "Pacific/Efate", - "Asia/Manila", "Philippines", "Asia/Manila", - "America/Dawson", "America_Pacific", "America/Los_Angeles", - "America/Argentina/Cordoba", "Argentina", "America/Buenos_Aires", - "Australia/Melbourne", "Australia_Eastern", "Australia/Sydney", - "Asia/Rangoon", "Myanmar", "Asia/Rangoon", - "America/Los_Angeles", "America_Pacific", "America/Los_Angeles", - "Africa/Casablanca", "Europe_Western", "Atlantic/Canary", - "Africa/Porto-Novo", "Africa_Western", "Africa/Lagos", - "Asia/Macau", "China", "Asia/Shanghai", - "America/Boa_Vista", "Amazon", "America/Manaus", - "Europe/Guernsey", "GMT", "Atlantic/Reykjavik", - "Africa/Monrovia", "GMT", "Atlantic/Reykjavik", - "America/Godthab", "Greenland_Western", "America/Godthab", - "Africa/Ceuta", "Europe_Central", "Europe/Paris", - "Asia/Oral", "Kazakhstan_Western", "Asia/Aqtobe", - "America/Yakutat", "Alaska", "America/Juneau", - "Indian/Mayotte", "Africa_Eastern", "Africa/Nairobi", - "America/Denver", "America_Mountain", "America/Denver", - "America/New_York", "America_Eastern", "America/New_York", - "Pacific/Rarotonga", "Cook", "Pacific/Rarotonga", - "America/Louisville", "America_Eastern", "America/New_York", - "Africa/El_Aaiun", "Europe_Western", "Atlantic/Canary", - "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos", - "Pacific/Fiji", "Fiji", "Pacific/Fiji", - "Asia/Damascus", "Europe_Eastern", "Europe/Bucharest", - "Asia/Ulaanbaatar", "Mongolia", "Asia/Ulaanbaatar", - "America/Cayman", "America_Eastern", "America/New_York", - "America/Tijuana", "America_Pacific", "America/Los_Angeles", - "Atlantic/Bermuda", "Atlantic", "America/Halifax", - "Australia/Sydney", "Australia_Eastern", "Australia/Sydney", - "Asia/Aden", "Arabian", "Asia/Riyadh", - "Australia/Eucla", "Australia_CentralWestern", "Australia/Eucla", - "America/Indiana/Petersburg", "America_Eastern", "America/New_York", - "America/Panama", "America_Eastern", "America/New_York", - "Europe/Istanbul", "Europe_Eastern", "Europe/Bucharest", - "America/Kralendijk", "Atlantic", "America/Halifax", - "America/Catamarca", "Argentina", "America/Buenos_Aires", - "America/Nassau", "America_Eastern", "America/New_York", - "Europe/Paris", "Europe_Central", "Europe/Paris", - "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta", - "Australia/Lindeman", "Australia_Eastern", "Australia/Sydney", - "America/Sao_Paulo", "Brasilia", "America/Sao_Paulo", - "America/Juneau", "Alaska", "America/Juneau", - "America/Grenada", "Atlantic", "America/Halifax", - "America/Cayenne", "French_Guiana", "America/Cayenne", - "Antarctica/Casey", "Australia_Western", "Australia/Perth", - "Africa/Algiers", "Europe_Central", "Europe/Paris", + "America/Marigot", "Atlantic", "America/Halifax", + "America/Martinique", "Atlantic", "America/Halifax", + "America/Matamoros", "America_Central", "America/Chicago", + "America/Mazatlan", "Mexico_Pacific", "America/Mazatlan", + "America/Mendoza", "Argentina", "America/Buenos_Aires", + "America/Menominee", "America_Central", "America/Chicago", + "America/Merida", "America_Central", "America/Chicago", + "America/Metlakatla", "Alaska", "America/Juneau", + "America/Mexico_City", "America_Central", "America/Chicago", "America/Miquelon", "Pierre_Miquelon", "America/Miquelon", - "Asia/Tokyo", "Japan", "Asia/Tokyo", - "Africa/Windhoek", "Africa_Central", "Africa/Maputo", - "Africa/Bujumbura", "Africa_Central", "Africa/Maputo", - "America/Guatemala", "America_Central", "America/Chicago", - "Africa/Dakar", "GMT", "Atlantic/Reykjavik", - "Asia/Bishkek", "Kyrgystan", "Asia/Bishkek", - "America/Guadeloupe", "Atlantic", "America/Halifax", - "Africa/Ndjamena", "Africa_Western", "Africa/Lagos", - "Europe/Simferopol", "Europe_Eastern", "Europe/Bucharest", - "America/Santa_Isabel", "America_Pacific", "America/Los_Angeles", - "Asia/Dubai", "Gulf", "Asia/Dubai", - "America/Maceio", "Brasilia", "America/Sao_Paulo", - "America/Anchorage", "Alaska", "America/Juneau", - "Australia/Currie", "Australia_Eastern", "Australia/Sydney", - "Africa/Djibouti", "Africa_Eastern", "Africa/Nairobi", - "Europe/Budapest", "Europe_Central", "Europe/Paris", - "America/Argentina/Salta", "Argentina", "America/Buenos_Aires", - "Asia/Calcutta", "India", "Asia/Calcutta", - "America/Indiana/Winamac", "America_Eastern", "America/New_York", - "Asia/Yekaterinburg", "Yekaterinburg", "Asia/Yekaterinburg", - "America/Santiago", "Chile", "America/Santiago", - "Asia/Aqtobe", "Kazakhstan_Western", "Asia/Aqtobe", - "Asia/Dili", "East_Timor", "Asia/Dili", - "America/Detroit", "America_Eastern", "America/New_York", - "Africa/Libreville", "Africa_Western", "Africa/Lagos", - "Pacific/Ponape", "Ponape", "Pacific/Ponape", - "Pacific/Wallis", "Wallis", "Pacific/Wallis", - "Asia/Vladivostok", "Vladivostok", "Asia/Vladivostok", - "Africa/Lubumbashi", "Africa_Central", "Africa/Maputo", - "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi", - "Pacific/Guam", "Chamorro", "Pacific/Saipan", - "America/Chicago", "America_Central", "America/Chicago", - "America/Swift_Current", "America_Central", "America/Chicago", - "America/Coral_Harbour", "America_Eastern", "America/New_York", - "America/Cambridge_Bay", "America_Mountain", "America/Denver", - "America/Costa_Rica", "America_Central", "America/Chicago", - "America/Curacao", "Atlantic", "America/Halifax", - "America/Recife", "Brasilia", "America/Sao_Paulo", - "Africa/Bangui", "Africa_Western", "Africa/Lagos", - "America/Cordoba", "Argentina", "America/Buenos_Aires", - "Asia/Baghdad", "Arabian", "Asia/Riyadh", - "America/Shiprock", "America_Mountain", "America/Denver", - "America/Glace_Bay", "Atlantic", "America/Halifax", - "America/North_Dakota/Center", "America_Central", "America/Chicago", - "Europe/Stockholm", "Europe_Central", "Europe/Paris", - "America/Halifax", "Atlantic", "America/Halifax", - "Atlantic/Canary", "Europe_Western", "Atlantic/Canary", - "Europe/Volgograd", "Volgograd", "Europe/Volgograd", "America/Moncton", "Atlantic", "America/Halifax", - "Pacific/Tongatapu", "Tonga", "Pacific/Tongatapu", - "America/Argentina/Buenos_Aires", "Argentina", "America/Buenos_Aires", - "Asia/Samarkand", "Uzbekistan", "Asia/Tashkent", - "Pacific/Apia", "Samoa", "Pacific/Apia", - "America/Sitka", "Alaska", "America/Juneau", - "Europe/Warsaw", "Europe_Central", "Europe/Paris", - "Africa/Accra", "GMT", "Atlantic/Reykjavik", - "Europe/Bratislava", "Europe_Central", "Europe/Paris", - "Europe/Zurich", "Europe_Central", "Europe/Paris", - "Indian/Reunion", "Reunion", "Indian/Reunion", - "America/Mazatlan", "America_Mountain", "America/Denver", - "Pacific/Tarawa", "Gilbert_Islands", "Pacific/Tarawa", - "America/Indiana/Knox", "America_Central", "America/Chicago", - "Asia/Tbilisi", "Georgia", "Asia/Tbilisi", - "Asia/Novosibirsk", "Novosibirsk", "Asia/Novosibirsk", - "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary", - "Africa/Bissau", "GMT", "Atlantic/Reykjavik", - "Asia/Amman", "Europe_Eastern", "Europe/Bucharest", - "Africa/Lagos", "Africa_Western", "Africa/Lagos", - "Africa/Banjul", "GMT", "Atlantic/Reykjavik", - "America/Araguaina", "Brasilia", "America/Sao_Paulo", - "America/Nipigon", "America_Eastern", "America/New_York", - "Europe/Vilnius", "Europe_Eastern", "Europe/Bucharest", + "America/Monterrey", "America_Central", "America/Chicago", + "America/Montevideo", "Uruguay", "America/Montevideo", "America/Montserrat", "Atlantic", "America/Halifax", - "Asia/Baku", "Azerbaijan", "Asia/Baku", - "Africa/Lusaka", "Africa_Central", "Africa/Maputo", - "Europe/Uzhgorod", "Europe_Eastern", "Europe/Bucharest", - "America/Argentina/Rio_Gallegos", "Argentina", "America/Buenos_Aires", - "America/Blanc-Sablon", "Atlantic", "America/Halifax", - "Asia/Kabul", "Afghanistan", "Asia/Kabul", - "America/Jamaica", "America_Eastern", "America/New_York", - "Europe/Vatican", "Europe_Central", "Europe/Paris", - "Africa/Nouakchott", "GMT", "Atlantic/Reykjavik", - "Africa/Addis_Ababa", "Africa_Eastern", "Africa/Nairobi", - "Europe/Athens", "Europe_Eastern", "Europe/Bucharest", - "Atlantic/Madeira", "Europe_Western", "Atlantic/Canary", - "America/Thunder_Bay", "America_Eastern", "America/New_York", - "Europe/Brussels", "Europe_Central", "Europe/Paris", - "Africa/Luanda", "Africa_Western", "Africa/Lagos", - "Africa/Mogadishu", "Africa_Eastern", "Africa/Nairobi", - "America/Matamoros", "America_Central", "America/Chicago", - "Pacific/Norfolk", "Norfolk", "Pacific/Norfolk", - "America/Scoresbysund", "Greenland_Eastern", "America/Scoresbysund", - "America/Indianapolis", "America_Eastern", "America/New_York", - "Pacific/Pitcairn", "Pitcairn", "Pacific/Pitcairn", - "Asia/Singapore", "Singapore", "Asia/Singapore", - "America/Port-au-Prince", "America_Eastern", "America/New_York", - "Pacific/Honolulu", "Hawaii_Aleutian", "Pacific/Honolulu", - "Antarctica/Syowa", "Syowa", "Antarctica/Syowa", - "Atlantic/Cape_Verde", "Cape_Verde", "Atlantic/Cape_Verde", - "America/Asuncion", "Paraguay", "America/Asuncion", - "America/Martinique", "Atlantic", "America/Halifax", - "Europe/Gibraltar", "Europe_Central", "Europe/Paris", - "Africa/Lome", "GMT", "Atlantic/Reykjavik", - "Australia/Lord_Howe", "Lord_Howe", "Australia/Lord_Howe", - "America/Argentina/La_Rioja", "Argentina", "America/Buenos_Aires", - "Europe/Jersey", "GMT", "Atlantic/Reykjavik", - "America/Kentucky/Louisville", "America_Eastern", "America/New_York", - "America/Monterrey", "America_Central", "America/Chicago", - "Europe/Belgrade", "Europe_Central", "Europe/Paris", - "Asia/Gaza", "Europe_Eastern", "Europe/Bucharest", - "Asia/Ho_Chi_Minh", "Indochina", "Asia/Saigon", - "Europe/Prague", "Europe_Central", "Europe/Paris", - "Indian/Christmas", "Christmas", "Indian/Christmas", - "Pacific/Fakaofo", "Tokelau", "Pacific/Fakaofo", - "America/Dominica", "Atlantic", "America/Halifax", - "America/Ojinaga", "America_Mountain", "America/Denver", - "Asia/Colombo", "India", "Asia/Calcutta", - "Asia/Nicosia", "Europe_Eastern", "Europe/Bucharest", - "Europe/Copenhagen", "Europe_Central", "Europe/Paris", - "America/Creston", "America_Mountain", "America/Denver", - "Asia/Ashgabat", "Turkmenistan", "Asia/Ashgabat", - "Asia/Shanghai", "China", "Asia/Shanghai", - "Pacific/Easter", "Easter", "Pacific/Easter", - "Africa/Maseru", "Africa_Southern", "Africa/Johannesburg", - "America/La_Paz", "Bolivia", "America/La_Paz", - "Pacific/Truk", "Truk", "Pacific/Truk", - "America/Inuvik", "America_Mountain", "America/Denver", - "America/Belem", "Brasilia", "America/Sao_Paulo", - "Asia/Hebron", "Europe_Eastern", "Europe/Bucharest", - "Asia/Jerusalem", "Israel", "Asia/Jerusalem", - "America/Belize", "America_Central", "America/Chicago", - "America/Rio_Branco", "Amazon", "America/Manaus", - "America/Dawson_Creek", "America_Mountain", "America/Denver", - "America/Anguilla", "Atlantic", "America/Halifax", - "America/Port_of_Spain", "Atlantic", "America/Halifax", - "America/St_Barthelemy", "Atlantic", "America/Halifax", - "America/Indiana/Marengo", "America_Eastern", "America/New_York", - "America/St_Johns", "Newfoundland", "America/St_Johns", - "Asia/Jayapura", "Indonesia_Eastern", "Asia/Jayapura", - "Europe/Riga", "Europe_Eastern", "Europe/Bucharest", - "America/Phoenix", "America_Mountain", "America/Denver", - "America/Boise", "America_Mountain", "America/Denver", - "Pacific/Kiritimati", "Line_Islands", "Pacific/Kiritimati", - "Africa/Johannesburg", "Africa_Southern", "Africa/Johannesburg", - "America/Pangnirtung", "America_Eastern", "America/New_York", - "America/Toronto", "America_Eastern", "America/New_York", - "Australia/Brisbane", "Australia_Eastern", "Australia/Sydney", - "Asia/Aqtau", "Kazakhstan_Western", "Asia/Aqtobe", - "America/Vancouver", "America_Pacific", "America/Los_Angeles", - "Africa/Mbabane", "Africa_Southern", "Africa/Johannesburg", - "Europe/Vaduz", "Europe_Central", "Europe/Paris", - "Asia/Karachi", "Pakistan", "Asia/Karachi", - "Asia/Riyadh", "Arabian", "Asia/Riyadh", - "Indian/Maldives", "Maldives", "Indian/Maldives", - "Asia/Anadyr", "Magadan", "Asia/Magadan", - "Europe/Helsinki", "Europe_Eastern", "Europe/Bucharest", + "America/Nassau", "America_Eastern", "America/New_York", + "America/New_York", "America_Eastern", "America/New_York", + "America/Nipigon", "America_Eastern", "America/New_York", "America/Nome", "Alaska", "America/Juneau", - "Asia/Yakutsk", "Yakutsk", "Asia/Yakutsk", - "Asia/Yangon", "Myanmar", "Asia/Rangoon", - "Africa/Conakry", "GMT", "Atlantic/Reykjavik", - "Asia/Seoul", "Korea", "Asia/Seoul", - "America/Antigua", "Atlantic", "America/Halifax", - "Asia/Almaty", "Kazakhstan_Eastern", "Asia/Almaty", - "America/Fortaleza", "Brasilia", "America/Sao_Paulo", - "Pacific/Tahiti", "Tahiti", "Pacific/Tahiti", - "Asia/Kashgar", "China", "Asia/Shanghai", - "America/Whitehorse", "America_Pacific", "America/Los_Angeles", - "Europe/Kaliningrad", "Europe_Eastern", "Europe/Bucharest", - "Pacific/Enderbury", "Phoenix_Islands", "Pacific/Enderbury", + "America/Noronha", "Noronha", "America/Noronha", + "America/North_Dakota/Beulah", "America_Central", "America/Chicago", + "America/North_Dakota/Center", "America_Central", "America/Chicago", + "America/North_Dakota/New_Salem", "America_Central", "America/Chicago", + "America/Ojinaga", "America_Mountain", "America/Denver", + "America/Panama", "America_Eastern", "America/New_York", + "America/Pangnirtung", "America_Eastern", "America/New_York", + "America/Paramaribo", "Suriname", "America/Paramaribo", + "America/Phoenix", "America_Mountain", "America/Denver", + "America/Port-au-Prince", "America_Eastern", "America/New_York", + "America/Port_of_Spain", "Atlantic", "America/Halifax", + "America/Porto_Acre", "Acre", "America/Rio_Branco", + "America/Porto_Velho", "Amazon", "America/Manaus", + "America/Puerto_Rico", "Atlantic", "America/Halifax", + "America/Rainy_River", "America_Central", "America/Chicago", + "America/Rankin_Inlet", "America_Central", "America/Chicago", + "America/Recife", "Brasilia", "America/Sao_Paulo", + "America/Regina", "America_Central", "America/Chicago", + "America/Resolute", "America_Central", "America/Chicago", + "America/Rio_Branco", "Acre", "America/Rio_Branco", + "America/Rosario", "Argentina", "America/Buenos_Aires", + "America/Santa_Isabel", "Mexico_Northwest", "America/Santa_Isabel", + "America/Santarem", "Brasilia", "America/Sao_Paulo", + "America/Santiago", "Chile", "America/Santiago", + "America/Santo_Domingo", "Atlantic", "America/Halifax", + "America/Sao_Paulo", "Brasilia", "America/Sao_Paulo", + "America/Scoresbysund", "Greenland_Eastern", "America/Scoresbysund", + "America/Shiprock", "America_Mountain", "America/Denver", + "America/Sitka", "Alaska", "America/Juneau", + "America/St_Barthelemy", "Atlantic", "America/Halifax", + "America/St_Johns", "Newfoundland", "America/St_Johns", + "America/St_Kitts", "Atlantic", "America/Halifax", "America/St_Lucia", "Atlantic", "America/Halifax", - "Atlantic/Stanley", "Falkland", "Atlantic/Stanley", - "Asia/Omsk", "Omsk", "Asia/Omsk", - "America/Menominee", "America_Central", "America/Chicago", - "Asia/Novokuznetsk", "Novosibirsk", "Asia/Novosibirsk", - "Asia/Sakhalin", "Sakhalin", "Asia/Sakhalin", + "America/St_Thomas", "Atlantic", "America/Halifax", + "America/St_Vincent", "Atlantic", "America/Halifax", + "America/Swift_Current", "America_Central", "America/Chicago", + "America/Tegucigalpa", "America_Central", "America/Chicago", + "America/Thule", "Atlantic", "America/Halifax", + "America/Thunder_Bay", "America_Eastern", "America/New_York", + "America/Tijuana", "America_Pacific", "America/Los_Angeles", + "America/Toronto", "America_Eastern", "America/New_York", + "America/Tortola", "Atlantic", "America/Halifax", + "America/Vancouver", "America_Pacific", "America/Los_Angeles", + "America/Virgin", "Atlantic", "America/Halifax", + "America/Whitehorse", "America_Pacific", "America/Los_Angeles", + "America/Winnipeg", "America_Central", "America/Chicago", + "America/Yakutat", "Alaska", "America/Juneau", + "America/Yellowknife", "America_Mountain", "America/Denver", + "Antarctica/Casey", "Australia_Western", "Australia/Perth", + "Antarctica/Davis", "Davis", "Antarctica/Davis", + "Antarctica/DumontDUrville", "DumontDUrville", "Antarctica/DumontDUrville", + "Antarctica/Macquarie", "Macquarie", "Antarctica/Macquarie", + "Antarctica/Mawson", "Mawson", "Antarctica/Mawson", + "Antarctica/McMurdo", "New_Zealand", "Pacific/Auckland", + "Antarctica/Palmer", "Chile", "America/Santiago", + "Antarctica/Rothera", "Rothera", "Antarctica/Rothera", + "Antarctica/South_Pole", "New_Zealand", "Pacific/Auckland", + "Antarctica/Syowa", "Syowa", "Antarctica/Syowa", + "Antarctica/Troll", "GMT", "Atlantic/Reykjavik", + "Antarctica/Vostok", "Vostok", "Antarctica/Vostok", + "Arctic/Longyearbyen", "Europe_Central", "Europe/Paris", + "Asia/Aden", "Arabian", "Asia/Riyadh", + "Asia/Almaty", "Kazakhstan_Eastern", "Asia/Almaty", + "Asia/Amman", "Europe_Eastern", "Europe/Bucharest", + "Asia/Anadyr", "Magadan", "Asia/Magadan", + "Asia/Aqtau", "Kazakhstan_Western", "Asia/Aqtobe", + "Asia/Aqtobe", "Kazakhstan_Western", "Asia/Aqtobe", + "Asia/Ashgabat", "Turkmenistan", "Asia/Ashgabat", + "Asia/Ashkhabad", "Turkmenistan", "Asia/Ashgabat", + "Asia/Baghdad", "Arabian", "Asia/Riyadh", + "Asia/Bahrain", "Arabian", "Asia/Riyadh", + "Asia/Baku", "Azerbaijan", "Asia/Baku", + "Asia/Bangkok", "Indochina", "Asia/Bangkok", + "Asia/Beirut", "Europe_Eastern", "Europe/Bucharest", + "Asia/Bishkek", "Kyrgystan", "Asia/Bishkek", + "Asia/Brunei", "Brunei", "Asia/Brunei", + "Asia/Calcutta", "India", "Asia/Calcutta", + "Asia/Chita", "Yakutsk", "Asia/Yakutsk", + "Asia/Choibalsan", "Choibalsan", "Asia/Choibalsan", + "Asia/Chongqing", "China", "Asia/Shanghai", + "Asia/Chungking", "China", "Asia/Shanghai", + "Asia/Colombo", "India", "Asia/Calcutta", + "Asia/Dacca", "Bangladesh", "Asia/Dhaka", + "Asia/Damascus", "Europe_Eastern", "Europe/Bucharest", + "Asia/Dhaka", "Bangladesh", "Asia/Dhaka", + "Asia/Dili", "East_Timor", "Asia/Dili", + "Asia/Dubai", "Gulf", "Asia/Dubai", + "Asia/Dushanbe", "Tajikistan", "Asia/Dushanbe", + "Asia/Gaza", "Europe_Eastern", "Europe/Bucharest", + "Asia/Harbin", "China", "Asia/Shanghai", + "Asia/Hebron", "Europe_Eastern", "Europe/Bucharest", + "Asia/Ho_Chi_Minh", "Indochina", "Asia/Bangkok", + "Asia/Hong_Kong", "Hong_Kong", "Asia/Hong_Kong", + "Asia/Hovd", "Hovd", "Asia/Hovd", + "Asia/Irkutsk", "Irkutsk", "Asia/Irkutsk", + "Asia/Istanbul", "Europe_Eastern", "Europe/Bucharest", + "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta", + "Asia/Jayapura", "Indonesia_Eastern", "Asia/Jayapura", + "Asia/Jerusalem", "Israel", "Asia/Jerusalem", + "Asia/Kabul", "Afghanistan", "Asia/Kabul", + "Asia/Kamchatka", "Kamchatka", "Asia/Kamchatka", + "Asia/Karachi", "Pakistan", "Asia/Karachi", + "Asia/Kashgar", "Urumqi", "Asia/Urumqi", + "Asia/Kathmandu", "Nepal", "Asia/Katmandu", + "Asia/Katmandu", "Nepal", "Asia/Katmandu", + "Asia/Khandyga", "Yakutsk", "Asia/Yakutsk", + "Asia/Kolkata", "India", "Asia/Calcutta", + "Asia/Krasnoyarsk", "Krasnoyarsk", "Asia/Krasnoyarsk", + "Asia/Kuala_Lumpur", "Malaysia", "Asia/Kuching", + "Asia/Kuching", "Malaysia", "Asia/Kuching", + "Asia/Kuwait", "Arabian", "Asia/Riyadh", + "Asia/Macao", "China", "Asia/Shanghai", + "Asia/Macau", "China", "Asia/Shanghai", + "Asia/Magadan", "Magadan", "Asia/Magadan", + "Asia/Makassar", "Indonesia_Central", "Asia/Makassar", + "Asia/Manila", "Philippines", "Asia/Manila", "Asia/Muscat", "Gulf", "Asia/Dubai", - "Pacific/Noumea", "New_Caledonia", "Pacific/Noumea", - "Asia/Phnom_Penh", "Indochina", "Asia/Saigon", - "Antarctica/Mawson", "Mawson", "Antarctica/Mawson", - "Indian/Cocos", "Cocos", "Indian/Cocos", - "Europe/Tallinn", "Europe_Eastern", "Europe/Bucharest", - "Africa/Nairobi", "Africa_Eastern", "Africa/Nairobi", + "Asia/Nicosia", "Europe_Eastern", "Europe/Bucharest", + "Asia/Novokuznetsk", "Krasnoyarsk", "Asia/Krasnoyarsk", + "Asia/Novosibirsk", "Novosibirsk", "Asia/Novosibirsk", + "Asia/Omsk", "Omsk", "Asia/Omsk", + "Asia/Oral", "Kazakhstan_Western", "Asia/Aqtobe", + "Asia/Phnom_Penh", "Indochina", "Asia/Bangkok", + "Asia/Pontianak", "Indonesia_Western", "Asia/Jakarta", + "Asia/Pyongyang", "Pyongyang", "Asia/Pyongyang", + "Asia/Qatar", "Arabian", "Asia/Riyadh", + "Asia/Qyzylorda", "Kazakhstan_Eastern", "Asia/Almaty", + "Asia/Rangoon", "Myanmar", "Asia/Rangoon", + "Asia/Riyadh", "Arabian", "Asia/Riyadh", + "Asia/Saigon", "Indochina", "Asia/Bangkok", + "Asia/Sakhalin", "Sakhalin", "Asia/Sakhalin", + "Asia/Samarkand", "Uzbekistan", "Asia/Tashkent", + "Asia/Seoul", "Korea", "Asia/Seoul", + "Asia/Shanghai", "China", "Asia/Shanghai", + "Asia/Singapore", "Singapore", "Asia/Singapore", + "Asia/Srednekolymsk", "Singapore", "Asia/Singapore", + "Asia/Taipei", "Taipei", "Asia/Taipei", + "Asia/Tashkent", "Uzbekistan", "Asia/Tashkent", + "Asia/Tbilisi", "Georgia", "Asia/Tbilisi", + "Asia/Tehran", "Iran", "Asia/Tehran", + "Asia/Tel_Aviv", "Israel", "Asia/Jerusalem", + "Asia/Thimbu", "Bhutan", "Asia/Thimphu", + "Asia/Thimphu", "Bhutan", "Asia/Thimphu", + "Asia/Tokyo", "Japan", "Asia/Tokyo", + "Asia/Ujung_Pandang", "Indonesia_Central", "Asia/Makassar", + "Asia/Ulaanbaatar", "Mongolia", "Asia/Ulaanbaatar", + "Asia/Ulan_Bator", "Mongolia", "Asia/Ulaanbaatar", + "Asia/Urumqi", "Urumqi", "Asia/Urumqi", + "Asia/Ust-Nera", "Vladivostok", "Asia/Vladivostok", + "Asia/Vientiane", "Indochina", "Asia/Bangkok", + "Asia/Vladivostok", "Vladivostok", "Asia/Vladivostok", + "Asia/Yakutsk", "Yakutsk", "Asia/Yakutsk", + "Asia/Yekaterinburg", "Yekaterinburg", "Asia/Yekaterinburg", + "Asia/Yerevan", "Armenia", "Asia/Yerevan", + "Atlantic/Azores", "Azores", "Atlantic/Azores", + "Atlantic/Bermuda", "Atlantic", "America/Halifax", + "Atlantic/Canary", "Europe_Western", "Atlantic/Canary", + "Atlantic/Cape_Verde", "Cape_Verde", "Atlantic/Cape_Verde", + "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary", + "Atlantic/Faroe", "Europe_Western", "Atlantic/Canary", + "Atlantic/Jan_Mayen", "Europe_Central", "Europe/Paris", + "Atlantic/Madeira", "Europe_Western", "Atlantic/Canary", + "Atlantic/Reykjavik", "GMT", "Atlantic/Reykjavik", + "Atlantic/South_Georgia", "South_Georgia", "Atlantic/South_Georgia", + "Atlantic/St_Helena", "GMT", "Atlantic/Reykjavik", + "Atlantic/Stanley", "Falkland", "Atlantic/Stanley", + "Australia/ACT", "Australia_Eastern", "Australia/Sydney", + "Australia/Adelaide", "Australia_Central", "Australia/Adelaide", + "Australia/Brisbane", "Australia_Eastern", "Australia/Sydney", + "Australia/Broken_Hill", "Australia_Central", "Australia/Adelaide", + "Australia/Canberra", "Australia_Eastern", "Australia/Sydney", + "Australia/Currie", "Australia_Eastern", "Australia/Sydney", + "Australia/Darwin", "Australia_Central", "Australia/Adelaide", + "Australia/Eucla", "Australia_CentralWestern", "Australia/Eucla", + "Australia/Hobart", "Australia_Eastern", "Australia/Sydney", + "Australia/LHI", "Lord_Howe", "Australia/Lord_Howe", + "Australia/Lindeman", "Australia_Eastern", "Australia/Sydney", + "Australia/Lord_Howe", "Lord_Howe", "Australia/Lord_Howe", + "Australia/Melbourne", "Australia_Eastern", "Australia/Sydney", + "Australia/NSW", "Australia_Eastern", "Australia/Sydney", + "Australia/North", "Australia_Central", "Australia/Adelaide", + "Australia/Perth", "Australia_Western", "Australia/Perth", + "Australia/Queensland", "Australia_Eastern", "Australia/Sydney", + "Australia/South", "Australia_Central", "Australia/Adelaide", + "Australia/Sydney", "Australia_Eastern", "Australia/Sydney", + "Australia/Tasmania", "Australia_Eastern", "Australia/Sydney", + "Australia/Victoria", "Australia_Eastern", "Australia/Sydney", + "Australia/West", "Australia_Western", "Australia/Perth", + "Australia/Yancowinna", "Australia_Central", "Australia/Adelaide", + "Brazil/Acre", "Acre", "America/Rio_Branco", + "Brazil/DeNoronha", "Noronha", "America/Noronha", + "Brazil/East", "Brasilia", "America/Sao_Paulo", + "Brazil/West", "Amazon", "America/Manaus", + "CST6CDT", "America_Central", "America/Chicago", + "Canada/Atlantic", "Atlantic", "America/Halifax", + "Canada/Central", "America_Central", "America/Chicago", + "Canada/East-Saskatchewan", "America_Central", "America/Chicago", + "Canada/Eastern", "America_Eastern", "America/New_York", + "Canada/Mountain", "America_Mountain", "America/Denver", + "Canada/Newfoundland", "Newfoundland", "America/St_Johns", + "Canada/Pacific", "America_Pacific", "America/Los_Angeles", + "Canada/Saskatchewan", "America_Central", "America/Chicago", + "Canada/Yukon", "America_Pacific", "America/Los_Angeles", + "Chile/Continental", "Chile", "America/Santiago", + "Chile/EasterIsland", "Easter", "Pacific/Easter", + "Cuba", "Cuba", "America/Havana", + "EST5EDT", "America_Eastern", "America/New_York", + "Egypt", "Europe_Eastern", "Europe/Bucharest", + "Eire", "GMT", "Atlantic/Reykjavik", + "Europe/Amsterdam", "Europe_Central", "Europe/Paris", + "Europe/Andorra", "Europe_Central", "Europe/Paris", + "Europe/Athens", "Europe_Eastern", "Europe/Bucharest", + "Europe/Belfast", "GMT", "Atlantic/Reykjavik", + "Europe/Belgrade", "Europe_Central", "Europe/Paris", + "Europe/Berlin", "Europe_Central", "Europe/Paris", + "Europe/Bratislava", "Europe_Central", "Europe/Paris", + "Europe/Brussels", "Europe_Central", "Europe/Paris", + "Europe/Bucharest", "Europe_Eastern", "Europe/Bucharest", + "Europe/Budapest", "Europe_Central", "Europe/Paris", + "Europe/Busingen", "Europe_Central", "Europe/Paris", + "Europe/Chisinau", "Europe_Eastern", "Europe/Bucharest", + "Europe/Copenhagen", "Europe_Central", "Europe/Paris", + "Europe/Dublin", "GMT", "Atlantic/Reykjavik", + "Europe/Gibraltar", "Europe_Central", "Europe/Paris", + "Europe/Guernsey", "GMT", "Atlantic/Reykjavik", + "Europe/Helsinki", "Europe_Eastern", "Europe/Bucharest", + "Europe/Isle_of_Man", "GMT", "Atlantic/Reykjavik", + "Europe/Istanbul", "Europe_Eastern", "Europe/Bucharest", + "Europe/Jersey", "GMT", "Atlantic/Reykjavik", + "Europe/Kaliningrad", "Europe_Eastern", "Europe/Bucharest", + "Europe/Kiev", "Europe_Eastern", "Europe/Bucharest", + "Europe/Lisbon", "Europe_Western", "Atlantic/Canary", "Europe/Ljubljana", "Europe_Central", "Europe/Paris", - "America/Montreal", "America_Eastern", "America/New_York", - "Asia/Kuala_Lumpur", "Malaysia", "Asia/Kuching", - "Asia/Magadan", "Magadan", "Asia/Magadan", - "Africa/Bamako", "GMT", "Atlantic/Reykjavik", - "Australia/Broken_Hill", "Australia_Central", "Australia/Adelaide", - "America/Indiana/Indianapolis", "America_Eastern", "America/New_York", - "Asia/Taipei", "Taipei", "Asia/Taipei", - "Europe/Samara", "Moscow", "Europe/Moscow", - "America/Indiana/Vevay", "America_Eastern", "America/New_York", - "Atlantic/South_Georgia", "South_Georgia", "Atlantic/South_Georgia", - "Pacific/Wake", "Wake", "Pacific/Wake", - "Asia/Tashkent", "Uzbekistan", "Asia/Tashkent", - "America/St_Thomas", "Atlantic", "America/Halifax", - "America/Argentina/San_Luis", "Argentina_Western", "America/Argentina/San_Luis", - "Arctic/Longyearbyen", "Europe_Central", "Europe/Paris", - "Asia/Chongqing", "China", "Asia/Shanghai", + "Europe/London", "GMT", "Atlantic/Reykjavik", + "Europe/Luxembourg", "Europe_Central", "Europe/Paris", + "Europe/Madrid", "Europe_Central", "Europe/Paris", + "Europe/Malta", "Europe_Central", "Europe/Paris", + "Europe/Mariehamn", "Europe_Eastern", "Europe/Bucharest", + "Europe/Minsk", "Europe_Further_Eastern", "Europe/Minsk", "Europe/Monaco", "Europe_Central", "Europe/Paris", - "Asia/Qatar", "Arabian", "Asia/Riyadh", - "America/Chihuahua", "America_Mountain", "America/Denver", - "America/Havana", "Cuba", "America/Havana", - "Pacific/Auckland", "New_Zealand", "Pacific/Auckland", - "America/Jujuy", "Argentina", "America/Buenos_Aires", - "America/Goose_Bay", "Atlantic", "America/Halifax", - "Africa/Niamey", "Africa_Western", "Africa/Lagos", - "Asia/Kathmandu", "Nepal", "Asia/Katmandu", - "America/Caracas", "Venezuela", "America/Caracas", + "Europe/Moscow", "Moscow", "Europe/Moscow", + "Europe/Nicosia", "Europe_Eastern", "Europe/Bucharest", + "Europe/Oslo", "Europe_Central", "Europe/Paris", + "Europe/Paris", "Europe_Central", "Europe/Paris", + "Europe/Podgorica", "Europe_Central", "Europe/Paris", + "Europe/Prague", "Europe_Central", "Europe/Paris", + "Europe/Riga", "Europe_Eastern", "Europe/Bucharest", + "Europe/Rome", "Europe_Central", "Europe/Paris", + "Europe/Samara", "Samara", "Europe/Samara", + "Europe/San_Marino", "Europe_Central", "Europe/Paris", + "Europe/Sarajevo", "Europe_Central", "Europe/Paris", + "Europe/Simferopol", "Moscow", "Europe/Moscow", + "Europe/Skopje", "Europe_Central", "Europe/Paris", + "Europe/Sofia", "Europe_Eastern", "Europe/Bucharest", + "Europe/Stockholm", "Europe_Central", "Europe/Paris", + "Europe/Tallinn", "Europe_Eastern", "Europe/Bucharest", + "Europe/Tirane", "Europe_Central", "Europe/Paris", + "Europe/Tiraspol", "Europe_Eastern", "Europe/Bucharest", + "Europe/Uzhgorod", "Europe_Eastern", "Europe/Bucharest", + "Europe/Vaduz", "Europe_Central", "Europe/Paris", + "Europe/Vatican", "Europe_Central", "Europe/Paris", + "Europe/Vienna", "Europe_Central", "Europe/Paris", + "Europe/Vilnius", "Europe_Eastern", "Europe/Bucharest", + "Europe/Volgograd", "Moscow", "Europe/Moscow", + "Europe/Warsaw", "Europe_Central", "Europe/Paris", + "Europe/Zagreb", "Europe_Central", "Europe/Paris", + "Europe/Zaporozhye", "Europe_Eastern", "Europe/Bucharest", + "Europe/Zurich", "Europe_Central", "Europe/Paris", + "GB", "GMT", "Atlantic/Reykjavik", + "GB-Eire", "GMT", "Atlantic/Reykjavik", + "Hongkong", "Hong_Kong", "Asia/Hong_Kong", + "Iceland", "GMT", "Atlantic/Reykjavik", + "Indian/Antananarivo", "Africa_Eastern", "Africa/Nairobi", + "Indian/Chagos", "Indian_Ocean", "Indian/Chagos", + "Indian/Christmas", "Christmas", "Indian/Christmas", + "Indian/Cocos", "Cocos", "Indian/Cocos", "Indian/Comoro", "Africa_Eastern", "Africa/Nairobi", - "America/Argentina/Jujuy", "Argentina", "America/Buenos_Aires", - "America/Guyana", "Guyana", "America/Guyana", - "America/Indiana/Tell_City", "America_Central", "America/Chicago", - "America/Metlakatla", "America_Pacific", "America/Los_Angeles", - "Europe/Mariehamn", "Europe_Eastern", "Europe/Bucharest", - "Europe/Dublin", "GMT", "Atlantic/Reykjavik", - "Europe/Lisbon", "Europe_Western", "Atlantic/Canary", - "America/Puerto_Rico", "Atlantic", "America/Halifax", - "Asia/Pyongyang", "Korea", "Asia/Seoul", - "America/North_Dakota/New_Salem", "America_Central", "America/Chicago", - "Asia/Dhaka", "Bangladesh", "Asia/Dhaka", - "America/Rankin_Inlet", "America_Central", "America/Chicago", - "America/Adak", "Hawaii_Aleutian", "Pacific/Honolulu", - "America/Campo_Grande", "Amazon", "America/Manaus", - "Europe/Chisinau", "Europe_Eastern", "Europe/Bucharest", - "Pacific/Saipan", "Chamorro", "Pacific/Saipan", - "Pacific/Niue", "Niue", "Pacific/Niue", - "Europe/Madrid", "Europe_Central", "Europe/Paris", + "Indian/Kerguelen", "French_Southern", "Indian/Kerguelen", + "Indian/Mahe", "Seychelles", "Indian/Mahe", + "Indian/Maldives", "Maldives", "Indian/Maldives", + "Indian/Mauritius", "Mauritius", "Indian/Mauritius", + "Indian/Mayotte", "Africa_Eastern", "Africa/Nairobi", + "Indian/Reunion", "Reunion", "Indian/Reunion", + "Iran", "Iran", "Asia/Tehran", + "Israel", "Israel", "Asia/Jerusalem", + "Jamaica", "America_Eastern", "America/New_York", + "Japan", "Japan", "Asia/Tokyo", + "Kwajalein", "Marshall_Islands", "Pacific/Majuro", + "Libya", "Europe_Eastern", "Europe/Bucharest", + "MST7MDT", "America_Mountain", "America/Denver", + "Mexico/BajaNorte", "America_Pacific", "America/Los_Angeles", + "Mexico/BajaSur", "Mexico_Pacific", "America/Mazatlan", + "Mexico/General", "America_Central", "America/Chicago", + "NZ", "New_Zealand", "Pacific/Auckland", + "NZ-CHAT", "Chatham", "Pacific/Chatham", + "Navajo", "America_Mountain", "America/Denver", + "PRC", "China", "Asia/Shanghai", + "PST8PDT", "America_Pacific", "America/Los_Angeles", + "Pacific/Apia", "Apia", "Pacific/Apia", + "Pacific/Auckland", "New_Zealand", "Pacific/Auckland", + "Pacific/Bougainville", "New_Zealand", "Pacific/Auckland", + "Pacific/Chatham", "Chatham", "Pacific/Chatham", + "Pacific/Chuuk", "Truk", "Pacific/Truk", + "Pacific/Easter", "Easter", "Pacific/Easter", + "Pacific/Efate", "Vanuatu", "Pacific/Efate", + "Pacific/Enderbury", "Phoenix_Islands", "Pacific/Enderbury", + "Pacific/Fakaofo", "Tokelau", "Pacific/Fakaofo", + "Pacific/Fiji", "Fiji", "Pacific/Fiji", + "Pacific/Funafuti", "Tuvalu", "Pacific/Funafuti", + "Pacific/Galapagos", "Galapagos", "Pacific/Galapagos", + "Pacific/Gambier", "Gambier", "Pacific/Gambier", + "Pacific/Guadalcanal", "Solomon", "Pacific/Guadalcanal", + "Pacific/Guam", "Chamorro", "Pacific/Saipan", + "Pacific/Honolulu", "Hawaii_Aleutian", "Pacific/Honolulu", + "Pacific/Johnston", "Hawaii_Aleutian", "Pacific/Honolulu", + "Pacific/Kiritimati", "Line_Islands", "Pacific/Kiritimati", + "Pacific/Kosrae", "Kosrae", "Pacific/Kosrae", "Pacific/Kwajalein", "Marshall_Islands", "Pacific/Majuro", - "America/Porto_Velho", "Amazon", "America/Manaus", - "Indian/Kerguelen", "French_Southern", "Indian/Kerguelen", - "America/Santarem", "Brasilia", "America/Sao_Paulo", - "Asia/Kuching", "Malaysia", "Asia/Kuching", - "Australia/Adelaide", "Australia_Central", "Australia/Adelaide", - "Europe/Bucharest", "Europe_Eastern", "Europe/Bucharest", - "Australia/Perth", "Australia_Western", "Australia/Perth", - "Europe/Sofia", "Europe_Eastern", "Europe/Bucharest", - "Indian/Chagos", "Indian_Ocean", "Indian/Chagos", - "America/Yellowknife", "America_Mountain", "America/Denver", - "America/Managua", "America_Central", "America/Chicago", - "America/Iqaluit", "America_Eastern", "America/New_York", - "Pacific/Kosrae", "Kosrae", "Pacific/Kosrae", - "Pacific/Guadalcanal", "Solomon", "Pacific/Guadalcanal", - "America/Barbados", "Atlantic", "America/Halifax", - "America/Aruba", "Atlantic", "America/Halifax", - "Europe/Andorra", "Europe_Central", "Europe/Paris", - "Pacific/Chatham", "Chatham", "Pacific/Chatham", - "America/Santo_Domingo", "Atlantic", "America/Halifax", - "America/Indiana/Vincennes", "America_Eastern", "America/New_York", - "Europe/Kiev", "Europe_Eastern", "Europe/Bucharest", - "Pacific/Funafuti", "Tuvalu", "Pacific/Funafuti", - "America/Mexico_City", "America_Central", "America/Chicago", - "America/Kentucky/Monticello", "America_Eastern", "America/New_York", - "America/Argentina/Catamarca", "Argentina", "America/Buenos_Aires", - "Pacific/Johnston", "Hawaii_Aleutian", "Pacific/Honolulu", - "Europe/Podgorica", "Europe_Central", "Europe/Paris", - "Europe/Zagreb", "Europe_Central", "Europe/Paris", + "Pacific/Majuro", "Marshall_Islands", "Pacific/Majuro", + "Pacific/Marquesas", "Marquesas", "Pacific/Marquesas", + "Pacific/Midway", "Samoa", "Pacific/Pago_Pago", + "Pacific/Nauru", "Nauru", "Pacific/Nauru", + "Pacific/Niue", "Niue", "Pacific/Niue", + "Pacific/Norfolk", "Norfolk", "Pacific/Norfolk", + "Pacific/Noumea", "New_Caledonia", "Pacific/Noumea", + "Pacific/Pago_Pago", "Samoa", "Pacific/Pago_Pago", + "Pacific/Palau", "Palau", "Pacific/Palau", + "Pacific/Pitcairn", "Pitcairn", "Pacific/Pitcairn", "Pacific/Pohnpei", "Ponape", "Pacific/Ponape", - "Antarctica/Palmer", "Chile", "America/Santiago", - "America/Argentina/Mendoza", "Argentina", "America/Buenos_Aires", - "America/Lima", "Peru", "America/Lima", - "Antarctica/Macquarie", "Macquarie", "Antarctica/Macquarie", - "Europe/Malta", "Europe_Central", "Europe/Paris", - "America/Danmarkshavn", "GMT", "Atlantic/Reykjavik", + "Pacific/Ponape", "Ponape", "Pacific/Ponape", + "Pacific/Port_Moresby", "Papua_New_Guinea", "Pacific/Port_Moresby", + "Pacific/Rarotonga", "Cook", "Pacific/Rarotonga", + "Pacific/Saipan", "Chamorro", "Pacific/Saipan", + "Pacific/Samoa", "Samoa", "Pacific/Pago_Pago", + "Pacific/Tahiti", "Tahiti", "Pacific/Tahiti", + "Pacific/Tarawa", "Gilbert_Islands", "Pacific/Tarawa", + "Pacific/Tongatapu", "Tonga", "Pacific/Tongatapu", + "Pacific/Truk", "Truk", "Pacific/Truk", + "Pacific/Wake", "Wake", "Pacific/Wake", + "Pacific/Wallis", "Wallis", "Pacific/Wallis", + "Pacific/Yap", "Truk", "Pacific/Truk", + "Poland", "Europe_Central", "Europe/Paris", + "Portugal", "Europe_Western", "Atlantic/Canary", + "ROK", "Korea", "Asia/Seoul", + "Singapore", "Singapore", "Asia/Singapore", + "Turkey", "Europe_Eastern", "Europe/Bucharest", + "US/Alaska", "Alaska", "America/Juneau", + "US/Aleutian", "Hawaii_Aleutian", "Pacific/Honolulu", + "US/Arizona", "America_Mountain", "America/Denver", + "US/Central", "America_Central", "America/Chicago", + "US/East-Indiana", "America_Eastern", "America/New_York", + "US/Eastern", "America_Eastern", "America/New_York", + "US/Hawaii", "Hawaii_Aleutian", "Pacific/Honolulu", + "US/Indiana-Starke", "America_Central", "America/Chicago", + "US/Michigan", "America_Eastern", "America/New_York", + "US/Mountain", "America_Mountain", "America/Denver", + "US/Pacific", "America_Pacific", "America/Los_Angeles", + "US/Pacific-New", "America_Pacific", "America/Los_Angeles", + "US/Samoa", "Samoa", "Pacific/Pago_Pago", + "W-SU", "Moscow", "Europe/Moscow", + + // From tzdb + "Africa/Khartoum", "Africa_Central", "Africa/Maputo", // tzdata2017c + "Africa/Windhoek", "Africa_Central", "Africa/Maputo", // tzdata2017c + "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos", // tzdata2018c }; private static final String[] mzoneMap = new String[] { - "America_Eastern", "TC", "America/Grand_Turk", - "America_Eastern", "BS", "America/Nassau", - "America_Eastern", "CA", "America/Toronto", - "America_Eastern", "KY", "America/Cayman", - "America_Eastern", "PA", "America/Panama", - "America_Eastern", "JM", "America/Jamaica", - "America_Pacific", "CA", "America/Vancouver", - "America_Pacific", "MX", "America/Tijuana", - "Europe_Western", "FO", "Atlantic/Faeroe", - "Arabian", "YE", "Asia/Aden", - "Arabian", "BH", "Asia/Bahrain", - "Arabian", "KW", "Asia/Kuwait", - "Arabian", "QA", "Asia/Qatar", - "Arabian", "IQ", "Asia/Baghdad", - "Korea", "KP", "Asia/Pyongyang", - "Africa_Central", "ZW", "Africa/Harare", - "Africa_Central", "ZM", "Africa/Lusaka", - "Africa_Central", "MW", "Africa/Blantyre", + // From metaZones.xml + "Africa_Central", "BI", "Africa/Bujumbura", "Africa_Central", "BW", "Africa/Gaborone", "Africa_Central", "CD", "Africa/Lubumbashi", - "Africa_Central", "BI", "Africa/Bujumbura", + "Africa_Central", "MW", "Africa/Blantyre", "Africa_Central", "RW", "Africa/Kigali", - "Africa_Western", "ST", "Africa/Sao_Tome", - "Africa_Western", "CF", "Africa/Bangui", + "Africa_Central", "ZM", "Africa/Lusaka", + "Africa_Central", "ZW", "Africa/Harare", + "Africa_Eastern", "DJ", "Africa/Djibouti", + "Africa_Eastern", "ER", "Africa/Asmera", + "Africa_Eastern", "ET", "Africa/Addis_Ababa", + "Africa_Eastern", "KM", "Indian/Comoro", + "Africa_Eastern", "MG", "Indian/Antananarivo", + "Africa_Eastern", "SO", "Africa/Mogadishu", + "Africa_Eastern", "TZ", "Africa/Dar_es_Salaam", + "Africa_Eastern", "UG", "Africa/Kampala", + "Africa_Eastern", "YT", "Indian/Mayotte", + "Africa_Southern", "LS", "Africa/Maseru", + "Africa_Southern", "SZ", "Africa/Mbabane", "Africa_Western", "AO", "Africa/Luanda", - "Africa_Western", "NE", "Africa/Niamey", + "Africa_Western", "BJ", "Africa/Porto-Novo", "Africa_Western", "CD", "Africa/Kinshasa", + "Africa_Western", "CF", "Africa/Bangui", + "Africa_Western", "CG", "Africa/Brazzaville", "Africa_Western", "CM", "Africa/Douala", - "Africa_Western", "CG", "Africa/Brazzaville", - "Africa_Western", "GQ", "Africa/Malabo", - "Africa_Western", "TD", "Africa/Ndjamena", "Africa_Western", "GA", "Africa/Libreville", - "Atlantic", "PR", "America/Puerto_Rico", - "Atlantic", "AN", "America/Curacao", - "Atlantic", "VI", "America/St_Thomas", - "Atlantic", "GP", "America/Guadeloupe", - "Atlantic", "TT", "America/Port_of_Spain", + "Africa_Western", "GQ", "Africa/Malabo", + "Africa_Western", "NE", "Africa/Niamey", + "Africa_Western", "TD", "Africa/Ndjamena", + "America_Central", "BZ", "America/Belize", + "America_Central", "CA", "America/Winnipeg", + "America_Central", "CR", "America/Costa_Rica", + "America_Central", "GT", "America/Guatemala", + "America_Central", "HN", "America/Tegucigalpa", + "America_Central", "MX", "America/Mexico_City", + "America_Central", "SV", "America/El_Salvador", + "America_Eastern", "BS", "America/Nassau", + "America_Eastern", "CA", "America/Toronto", + "America_Eastern", "HT", "America/Port-au-Prince", + "America_Eastern", "JM", "America/Jamaica", + "America_Eastern", "KY", "America/Cayman", + "America_Eastern", "PA", "America/Panama", + "America_Mountain", "CA", "America/Edmonton", + "America_Mountain", "MX", "America/Hermosillo", + "America_Pacific", "CA", "America/Vancouver", + "America_Pacific", "MX", "America/Tijuana", + "Arabian", "BH", "Asia/Bahrain", + "Arabian", "IQ", "Asia/Baghdad", + "Arabian", "KW", "Asia/Kuwait", + "Arabian", "QA", "Asia/Qatar", + "Arabian", "YE", "Asia/Aden", "Atlantic", "AG", "America/Antigua", - "Atlantic", "MF", "America/Marigot", - "Atlantic", "DM", "America/Dominica", - "Atlantic", "VG", "America/Tortola", - "Atlantic", "MQ", "America/Martinique", - "Atlantic", "GL", "America/Thule", "Atlantic", "AI", "America/Anguilla", + "Atlantic", "AN", "America/Curacao", + "Atlantic", "AW", "America/Aruba", "Atlantic", "BB", "America/Barbados", "Atlantic", "BM", "Atlantic/Bermuda", "Atlantic", "BQ", "America/Kralendijk", - "Atlantic", "LC", "America/St_Lucia", - "Atlantic", "MS", "America/Montserrat", - "Atlantic", "SX", "America/Lower_Princes", + "Atlantic", "DM", "America/Dominica", "Atlantic", "GD", "America/Grenada", - "Atlantic", "VC", "America/St_Vincent", + "Atlantic", "GL", "America/Thule", + "Atlantic", "GP", "America/Guadeloupe", "Atlantic", "KN", "America/St_Kitts", - "Atlantic", "AW", "America/Aruba", - "GMT", "GM", "Africa/Banjul", - "GMT", "LR", "Africa/Monrovia", - "GMT", "ML", "Africa/Bamako", - "GMT", "SH", "Atlantic/St_Helena", - "GMT", "TG", "Africa/Lome", - "GMT", "GB", "Europe/London", - "GMT", "MR", "Africa/Nouakchott", - "GMT", "GN", "Africa/Conakry", - "GMT", "SL", "Africa/Freetown", - "GMT", "BF", "Africa/Ouagadougou", - "GMT", "SN", "Africa/Dakar", - "GMT", "CI", "Africa/Abidjan", - "GMT", "IE", "Europe/Dublin", - "GMT", "GH", "Africa/Accra", + "Atlantic", "LC", "America/St_Lucia", + "Atlantic", "MF", "America/Marigot", + "Atlantic", "MQ", "America/Martinique", + "Atlantic", "MS", "America/Montserrat", + "Atlantic", "PR", "America/Puerto_Rico", + "Atlantic", "SX", "America/Lower_Princes", + "Atlantic", "TT", "America/Port_of_Spain", + "Atlantic", "VC", "America/St_Vincent", + "Atlantic", "VG", "America/Tortola", + "Atlantic", "VI", "America/St_Thomas", + "Chamorro", "GU", "Pacific/Guam", "Chile", "AQ", "Antarctica/Palmer", - "America_Central", "CR", "America/Costa_Rica", - "America_Central", "HN", "America/Tegucigalpa", - "America_Central", "CA", "America/Winnipeg", - "America_Central", "SV", "America/El_Salvador", - "America_Central", "MX", "America/Mexico_City", - "America_Central", "BZ", "America/Belize", - "America_Central", "GT", "America/Guatemala", - "America_Mountain", "CA", "America/Edmonton", - "America_Mountain", "MX", "America/Hermosillo", - "New_Zealand", "AQ", "Antarctica/McMurdo", - "India", "LK", "Asia/Colombo", - "Gulf", "OM", "Asia/Muscat", - "China", "MO", "Asia/Macau", - "Africa_Eastern", "ER", "Africa/Asmera", - "Africa_Eastern", "TZ", "Africa/Dar_es_Salaam", - "Africa_Eastern", "SO", "Africa/Mogadishu", - "Africa_Eastern", "DJ", "Africa/Djibouti", - "Africa_Eastern", "MG", "Indian/Antananarivo", - "Africa_Eastern", "KM", "Indian/Comoro", - "Africa_Eastern", "UG", "Africa/Kampala", - "Africa_Eastern", "YT", "Indian/Mayotte", - "Africa_Eastern", "ET", "Africa/Addis_Ababa", - "Chamorro", "GU", "Pacific/Guam", - "Africa_Southern", "LS", "Africa/Maseru", - "Africa_Southern", "SZ", "Africa/Mbabane", - "Indochina", "KH", "Asia/Phnom_Penh", - "Indochina", "TH", "Asia/Bangkok", - "Indochina", "LA", "Asia/Vientiane", + "Europe_Central", "AD", "Europe/Andorra", + "Europe_Central", "AL", "Europe/Tirane", "Europe_Central", "AT", "Europe/Vienna", - "Europe_Central", "SK", "Europe/Bratislava", "Europe_Central", "BA", "Europe/Sarajevo", + "Europe_Central", "BE", "Europe/Brussels", + "Europe_Central", "CH", "Europe/Zurich", "Europe_Central", "CZ", "Europe/Prague", - "Europe_Central", "BE", "Europe/Brussels", + "Europe_Central", "DE", "Europe/Berlin", + "Europe_Central", "DK", "Europe/Copenhagen", + "Europe_Central", "ES", "Europe/Madrid", + "Europe_Central", "GI", "Europe/Gibraltar", + "Europe_Central", "HR", "Europe/Zagreb", + "Europe_Central", "HU", "Europe/Budapest", + "Europe_Central", "IT", "Europe/Rome", + "Europe_Central", "LI", "Europe/Vaduz", + "Europe_Central", "LU", "Europe/Luxembourg", + "Europe_Central", "MC", "Europe/Monaco", + "Europe_Central", "ME", "Europe/Podgorica", + "Europe_Central", "MK", "Europe/Skopje", + "Europe_Central", "MT", "Europe/Malta", + "Europe_Central", "NL", "Europe/Amsterdam", + "Europe_Central", "NO", "Europe/Oslo", + "Europe_Central", "PL", "Europe/Warsaw", "Europe_Central", "RS", "Europe/Belgrade", "Europe_Central", "SE", "Europe/Stockholm", - "Europe_Central", "MT", "Europe/Malta", - "Europe_Central", "IT", "Europe/Rome", - "Europe_Central", "LU", "Europe/Luxembourg", - "Europe_Central", "HU", "Europe/Budapest", - "Europe_Central", "NO", "Europe/Oslo", - "Europe_Central", "ME", "Europe/Podgorica", - "Europe_Central", "MK", "Europe/Skopje", - "Europe_Central", "NL", "Europe/Amsterdam", - "Europe_Central", "LI", "Europe/Vaduz", - "Europe_Central", "PL", "Europe/Warsaw", - "Europe_Central", "ES", "Europe/Madrid", + "Europe_Central", "SI", "Europe/Ljubljana", + "Europe_Central", "SK", "Europe/Bratislava", + "Europe_Central", "SM", "Europe/San_Marino", "Europe_Central", "TN", "Africa/Tunis", - "Europe_Central", "SI", "Europe/Ljubljana", - "Europe_Central", "DE", "Europe/Berlin", - "Europe_Central", "GI", "Europe/Gibraltar", - "Europe_Central", "CH", "Europe/Zurich", - "Europe_Central", "MC", "Europe/Monaco", "Europe_Central", "VA", "Europe/Vatican", - "Europe_Central", "HR", "Europe/Zagreb", - "Europe_Central", "AL", "Europe/Tirane", - "Europe_Central", "AD", "Europe/Andorra", - "Europe_Central", "DK", "Europe/Copenhagen", - "Europe_Central", "SM", "Europe/San_Marino", - "Europe_Eastern", "SY", "Asia/Damascus", - "Europe_Eastern", "FI", "Europe/Helsinki", + "Europe_Central", "XK", "Europe/Belgrade", "Europe_Eastern", "AX", "Europe/Mariehamn", "Europe_Eastern", "BG", "Europe/Sofia", + "Europe_Eastern", "CY", "Asia/Nicosia", "Europe_Eastern", "EG", "Africa/Cairo", - "Europe_Eastern", "LB", "Asia/Beirut", + "Europe_Eastern", "FI", "Europe/Helsinki", "Europe_Eastern", "GR", "Europe/Athens", "Europe_Eastern", "JO", "Asia/Amman", - "Europe_Eastern", "CY", "Asia/Nicosia", + "Europe_Eastern", "LB", "Asia/Beirut", + "Europe_Eastern", "SY", "Asia/Damascus", + "Europe_Further_Eastern", "RU", "Europe/Kaliningrad", + "Europe_Western", "FO", "Atlantic/Faeroe", + "GMT", "BF", "Africa/Ouagadougou", + "GMT", "CI", "Africa/Abidjan", + "GMT", "GB", "Europe/London", + "GMT", "GH", "Africa/Accra", + "GMT", "GM", "Africa/Banjul", + "GMT", "GN", "Africa/Conakry", + "GMT", "IE", "Europe/Dublin", + "GMT", "ML", "Africa/Bamako", + "GMT", "MR", "Africa/Nouakchott", + "GMT", "SH", "Atlantic/St_Helena", + "GMT", "SL", "Africa/Freetown", + "GMT", "SN", "Africa/Dakar", + "GMT", "ST", "Africa/Sao_Tome", + "GMT", "TG", "Africa/Lome", + "Gulf", "OM", "Asia/Muscat", + "India", "LK", "Asia/Colombo", + "Indochina", "KH", "Asia/Phnom_Penh", + "Indochina", "LA", "Asia/Vientiane", + "Korea", "KP", "Asia/Pyongyang", + "New_Zealand", "AQ", "Antarctica/McMurdo", + + // From tzdb + "Africa_Western", "ST", "Africa/Sao_Tome", // tzdata2018c }; private static final String[] aliasMap = new String[] { - "Mexico/BajaNorte", "America/Tijuana", - "Antarctica/South_Pole", "Antarctica/McMurdo", - "US/Michigan", "America/Detroit", - "America/Porto_Acre", "America/Rio_Branco", + // From supplementalMetadata.xml + "Africa/Timbuktu", "Africa/Bamako", + "America/Montreal", "America/Toronto", + "America/Shiprock", "America/Denver", + "Antarctica/South_Pole", "Pacific/Auckland", + "Asia/Chongqing", "Asia/Shanghai", + "Asia/Harbin", "Asia/Shanghai", + "Asia/Kashgar", "Asia/Urumqi", + "Atlantic/Jan_Mayen", "Europe/Oslo", + "EST", "America/Indianapolis", + "Europe/Belfast", "Europe/London", + "HST", "Pacific/Honolulu", + "MST", "America/Phoenix", + "Pacific/Yap", "Pacific/Truk", + "SystemV/AST4", "America/Puerto_Rico", + "SystemV/AST4ADT", "America/Halifax", + "SystemV/CST6", "America/Regina", + "SystemV/CST6CDT", "America/Chicago", + "SystemV/EST5", "America/Indianapolis", + "SystemV/EST5EDT", "America/New_York", + "SystemV/HST10", "Pacific/Honolulu", + "SystemV/MST7", "America/Phoenix", + "SystemV/MST7MDT", "America/Denver", + "SystemV/PST8", "Pacific/Pitcairn", + "SystemV/PST8PDT", "America/Los_Angeles", + "SystemV/YST9", "Pacific/Gambier", + "SystemV/YST9YDT", "America/Anchorage", + + // From tzdb + "Brazil/Acre", "America/Rio_Branco", + "US/Indiana-Starke", "America/Indiana/Knox", + "America/Atka", "America/Adak", + "America/St_Barthelemy", "America/Guadeloupe", + "Australia/North", "Australia/Darwin", + "Europe/Zagreb", "Europe/Belgrade", + "Etc/Universal", "Etc/UTC", + "NZ-CHAT", "Pacific/Chatham", + "Asia/Macao", "Asia/Macau", + "Pacific/Yap", "Pacific/Chuuk", + "Egypt", "Africa/Cairo", + "US/Central", "America/Chicago", + "Canada/Atlantic", "America/Halifax", + "Brazil/East", "America/Sao_Paulo", + "America/Cordoba", "America/Argentina/Cordoba", + "US/Hawaii", "Pacific/Honolulu", + "America/Louisville", "America/Kentucky/Louisville", + "America/Shiprock", "America/Denver", + "Australia/Canberra", "Australia/Sydney", + "Asia/Chungking", "Asia/Chongqing", + "Universal", "Etc/UTC", "US/Alaska", "America/Anchorage", "Asia/Ujung_Pandang", "Asia/Makassar", - "Canada/Atlantic", "America/Halifax", + "Japan", "Asia/Tokyo", + "Atlantic/Faeroe", "Atlantic/Faroe", + "Asia/Istanbul", "Europe/Istanbul", + "US/Pacific", "America/Los_Angeles", + "Mexico/General", "America/Mexico_City", + "Poland", "Europe/Warsaw", + "Africa/Asmera", "Africa/Asmara", + "Asia/Saigon", "Asia/Ho_Chi_Minh", + "US/Michigan", "America/Detroit", + "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca", "W-SU", "Europe/Moscow", + "Australia/ACT", "Australia/Sydney", + "Asia/Calcutta", "Asia/Kolkata", + "Arctic/Longyearbyen", "Europe/Oslo", + "America/Knox_IN", "America/Indiana/Knox", + "ROC", "Asia/Taipei", + "Zulu", "Etc/UTC", + "Australia/Yancowinna", "Australia/Broken_Hill", + "Australia/West", "Australia/Perth", + "Singapore", "Asia/Singapore", + "Europe/Mariehamn", "Europe/Helsinki", + "ROK", "Asia/Seoul", + "America/Porto_Acre", "America/Rio_Branco", + "Etc/Zulu", "Etc/UTC", + "Canada/Yukon", "America/Whitehorse", + "Europe/Vatican", "Europe/Rome", + "Africa/Timbuktu", "Africa/Bamako", + "America/Buenos_Aires", "America/Argentina/Buenos_Aires", + "Canada/Pacific", "America/Vancouver", + "US/Pacific-New", "America/Los_Angeles", + "Mexico/BajaNorte", "America/Tijuana", + "Europe/Guernsey", "Europe/London", + "Asia/Tel_Aviv", "Asia/Jerusalem", + "Chile/Continental", "America/Santiago", + "Jamaica", "America/Jamaica", + "Mexico/BajaSur", "America/Mazatlan", + "Canada/Eastern", "America/Toronto", + "Australia/Tasmania", "Australia/Hobart", + "NZ", "Pacific/Auckland", + "America/Lower_Princes", "America/Curacao", + "GMT-", "Etc/GMT", + "America/Rosario", "America/Argentina/Cordoba", + "Libya", "Africa/Tripoli", + "Asia/Ashkhabad", "Asia/Ashgabat", + "Australia/NSW", "Australia/Sydney", + "America/Marigot", "America/Guadeloupe", + "Europe/Bratislava", "Europe/Prague", + "Portugal", "Europe/Lisbon", + "Etc/GMT-", "Etc/GMT", + "Europe/San_Marino", "Europe/Rome", + "Europe/Sarajevo", "Europe/Belgrade", + "Antarctica/South_Pole", "Antarctica/McMurdo", + "Canada/Central", "America/Winnipeg", + "Etc/GMT", "Etc/GMT", + "Europe/Isle_of_Man", "Europe/London", + "America/Fort_Wayne", "America/Indiana/Indianapolis", + "Eire", "Europe/Dublin", + "America/Coral_Harbour", "America/Atikokan", + "Europe/Nicosia", "Asia/Nicosia", + "US/Samoa", "Pacific/Pago_Pago", + "Hongkong", "Asia/Hong_Kong", + "Canada/Saskatchewan", "America/Regina", + "Asia/Thimbu", "Asia/Thimphu", "Kwajalein", "Pacific/Kwajalein", - "Europe/Bratislava", "Europe/Prague", - "Canada/Central", "America/Winnipeg", + "GB", "Europe/London", + "Chile/EasterIsland", "Pacific/Easter", + "US/East-Indiana", "America/Indiana/Indianapolis", + "Australia/LHI", "Australia/Lord_Howe", + "Cuba", "America/Havana", + "America/Jujuy", "America/Argentina/Jujuy", + "US/Mountain", "America/Denver", + "Atlantic/Jan_Mayen", "Europe/Oslo", + "Europe/Tiraspol", "Europe/Chisinau", + "Europe/Podgorica", "Europe/Belgrade", + "US/Arizona", "America/Phoenix", + "Navajo", "America/Denver", + "Etc/Greenwich", "Etc/GMT", "Canada/Mountain", "America/Edmonton", "Iceland", "Atlantic/Reykjavik", - "Asia/Ulan_Bator", "Asia/Ulaanbaatar", + "Australia/Victoria", "Australia/Melbourne", + "Australia/South", "Australia/Adelaide", + "Brazil/West", "America/Manaus", + "Pacific/Ponape", "Pacific/Pohnpei", + "Europe/Ljubljana", "Europe/Belgrade", + "Europe/Jersey", "Europe/London", + "Australia/Queensland", "Australia/Brisbane", "UTC", "Etc/UTC", - "Europe/Guernsey", "Europe/London", - "Singapore", "Asia/Singapore", - "Atlantic/Faeroe", "Atlantic/Faroe", - "Greenwich", "Etc/GMT", - "America/Fort_Wayne", "America/Indiana/Indianapolis", - "Etc/Universal", "Etc/UTC", - "Chile/EasterIsland", "Pacific/Easter", - "Pacific/Samoa", "Pacific/Pago_Pago", - "Europe/Nicosia", "Asia/Nicosia", - "Etc/Zulu", "Etc/UTC", - "Asia/Ashkhabad", "Asia/Ashgabat", - "America/Louisville", "America/Kentucky/Louisville", - "Australia/North", "Australia/Darwin", - "America/Atka", "America/Adak", - "America/Marigot", "America/Guadeloupe", - "Brazil/DeNoronha", "America/Noronha", - "Turkey", "Europe/Istanbul", - "Zulu", "Etc/UTC", - "Europe/Vatican", "Europe/Rome", + "Canada/Newfoundland", "America/St_Johns", + "Europe/Skopje", "Europe/Belgrade", + "PRC", "Asia/Shanghai", + "UCT", "Etc/UCT", + "America/Mendoza", "America/Argentina/Mendoza", "Israel", "Asia/Jerusalem", - "America/Rosario", "America/Argentina/Cordoba", - "Jamaica", "America/Jamaica", - "Asia/Katmandu", "Asia/Kathmandu", - "ROK", "Asia/Seoul", - "Asia/Macao", "Asia/Macau", - "Australia/South", "Australia/Adelaide", - "US/Arizona", "America/Phoenix", - "Australia/Yancowinna", "Australia/Broken_Hill", - "Canada/Pacific", "America/Vancouver", - "Libya", "Africa/Tripoli", - "Japan", "Asia/Tokyo", - "Arctic/Longyearbyen", "Europe/Oslo", - "Africa/Timbuktu", "Africa/Bamako", - "America/Indianapolis", "America/Indiana/Indianapolis", - "Etc/Greenwich", "Etc/GMT", - "Australia/ACT", "Australia/Sydney", + "US/Eastern", "America/New_York", + "Asia/Ulan_Bator", "Asia/Ulaanbaatar", + "Turkey", "Europe/Istanbul", "GMT", "Etc/GMT", - "Mexico/BajaSur", "America/Mazatlan", - "Cuba", "America/Havana", - "Brazil/West", "America/Manaus", - "Asia/Saigon", "Asia/Ho_Chi_Minh", - "America/Jujuy", "America/Argentina/Jujuy", - "Australia/Victoria", "Australia/Melbourne", - "America/Catamarca", "America/Argentina/Catamarca", + "US/Aleutian", "America/Adak", + "Brazil/DeNoronha", "America/Noronha", + "GB-Eire", "Europe/London", + "Asia/Dacca", "Asia/Dhaka", "America/Ensenada", "America/Tijuana", - "Europe/San_Marino", "Europe/Rome", - "Europe/Isle_of_Man", "Europe/London", - "Mexico/General", "America/Mexico_City", - "US/Hawaii", "Pacific/Honolulu", - "Europe/Mariehamn", "Europe/Helsinki", - "US/Indiana-Starke", "America/Indiana/Knox", - "Australia/NSW", "Australia/Sydney", - "Australia/West", "Australia/Perth", - "Brazil/Acre", "America/Rio_Branco", - "Australia/Tasmania", "Australia/Hobart", - "Atlantic/Jan_Mayen", "Europe/Oslo", - "America/Buenos_Aires", "America/Argentina/Buenos_Aires", - "Europe/Jersey", "Europe/London", - "Brazil/East", "America/Sao_Paulo", - "America/Virgin", "America/St_Thomas", - "Navajo", "America/Denver", - "GB", "Europe/London", - "Poland", "Europe/Warsaw", - "Pacific/Yap", "Pacific/Chuuk", - "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca", - "Asia/Calcutta", "Asia/Kolkata", - "America/Mendoza", "America/Argentina/Mendoza", - "Universal", "Etc/UTC", - "Australia/Queensland", "Australia/Brisbane", - "Asia/Dacca", "Asia/Dhaka", - "US/Pacific", "America/Los_Angeles", - "Asia/Chungking", "Asia/Chongqing", + "America/Catamarca", "America/Argentina/Catamarca", + "Iran", "Asia/Tehran", + "Greenwich", "Etc/GMT", "Pacific/Truk", "Pacific/Chuuk", - "ROC", "Asia/Taipei", - "US/Aleutian", "America/Adak", - "Pacific/Ponape", "Pacific/Pohnpei", - "Canada/Yukon", "America/Whitehorse", - "PRC", "Asia/Shanghai", - "Africa/Asmera", "Africa/Asmara", - "GB-Eire", "Europe/London", - "America/St_Barthelemy", "America/Guadeloupe", - "US/Central", "America/Chicago", - "Egypt", "Africa/Cairo", - "Chile/Continental", "America/Santiago", - "Portugal", "Europe/Lisbon", - "Europe/Tiraspol", "Europe/Chisinau", - "America/Coral_Harbour", "America/Atikokan", + "Pacific/Samoa", "Pacific/Pago_Pago", + "America/Virgin", "America/St_Thomas", + "Asia/Katmandu", "Asia/Kathmandu", + "America/Indianapolis", "America/Indiana/Indianapolis", "Europe/Belfast", "Europe/London", - "America/Cordoba", "America/Argentina/Cordoba", - "America/Shiprock", "America/Denver", - "NZ-CHAT", "Pacific/Chatham", - "Eire", "Europe/Dublin", - "US/East-Indiana", "America/Indiana/Indianapolis", - "Australia/Canberra", "Australia/Sydney", - "Canada/Newfoundland", "America/St_Johns", - "UCT", "Etc/UCT", - "Australia/LHI", "Australia/Lord_Howe", - "Iran", "Asia/Tehran", - "US/Eastern", "America/New_York", - "Canada/Eastern", "America/Toronto", - "US/Samoa", "Pacific/Pago_Pago", - "America/Knox_IN", "America/Indiana/Knox", - "Canada/Saskatchewan", "America/Regina", - "Asia/Thimbu", "Asia/Thimphu", - "US/Mountain", "America/Denver", - "NZ", "Pacific/Auckland", - "Asia/Tel_Aviv", "Asia/Jerusalem", - "Hongkong", "Asia/Hong_Kong", + "America/Kralendijk", "America/Curacao", "Asia/Rangoon", "Asia/Yangon", };