Skip to content

Commit 394eff4

Browse files
btangmubtangmu
authored
CLDR-17990 Update GenerateSubdivisions (#4940)
1 parent 9490a7d commit 394eff4

File tree

6 files changed

+68
-126
lines changed

6 files changed

+68
-126
lines changed

‎common/subdivisions/en.xml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3-
<!-- Copyright © 1991-2024 Unicode, Inc.
3+
<!-- Copyright © 1991-2025 Unicode, Inc.
44
For terms of use, see http://www.unicode.org/copyright.html
55
SPDX-License-Identifier: Unicode-3.0
66
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -839,6 +839,9 @@ Generated by tool: SubdivisionNode
839839
<subdivision type="cmou">West</subdivision>
840840
<subdivision type="cmsu">South</subdivision>
841841
<subdivision type="cmsw">Southwest</subdivision>
842+
<subdivision type="cn71">Taiwan</subdivision> <!-- deprecated -->
843+
<subdivision type="cn91">Hong Kong SAR China</subdivision> <!-- deprecated -->
844+
<subdivision type="cn92">Macao SAR China</subdivision> <!-- deprecated -->
842845
<subdivision type="cnah">Anhui</subdivision>
843846
<subdivision type="cnbj">Beijing</subdivision>
844847
<subdivision type="cncq">Chongqing</subdivision>
@@ -1475,6 +1478,7 @@ Generated by tool: SubdivisionNode
14751478
<subdivision type="etso">Somali</subdivision>
14761479
<subdivision type="etsw">Southwest Ethiopia Peoples</subdivision>
14771480
<subdivision type="etti">Tigray</subdivision>
1481+
<subdivision type="fi01">Åland Islands</subdivision>
14781482
<subdivision type="fi02">South Karelia</subdivision>
14791483
<subdivision type="fi03">Southern Ostrobothnia</subdivision>
14801484
<subdivision type="fi04">Southern Savonia</subdivision>
@@ -1629,17 +1633,33 @@ Generated by tool: SubdivisionNode
16291633
-->
16301634
<subdivision type="frara">Auvergne-Rhône-Alpes</subdivision>
16311635
<subdivision type="frbfc">Burgundy-Franche-Comté</subdivision>
1636+
<subdivision type="frbl">St. Barthélemy</subdivision>
16321637
<subdivision type="frbre">Brittany</subdivision>
16331638
<subdivision type="frcor">Corsica</subdivision>
1639+
<subdivision type="frcp">Clipperton Island</subdivision>
16341640
<subdivision type="frcvl">Centre-Val de Loire</subdivision>
16351641
<subdivision type="frges">Grand-Est</subdivision>
1642+
<subdivision type="frgf">French Guiana</subdivision> <!-- deprecated -->
1643+
<subdivision type="frgp">Guadeloupe</subdivision> <!-- deprecated -->
1644+
<subdivision type="frgua">Guadeloupe</subdivision> <!-- deprecated -->
16361645
<subdivision type="frhdf">Hauts-de-France</subdivision>
16371646
<subdivision type="fridf">Île-de-France²</subdivision>
1647+
<subdivision type="frlre">Réunion</subdivision> <!-- deprecated -->
1648+
<subdivision type="frmay">Mayotte</subdivision> <!-- deprecated -->
1649+
<subdivision type="frmf">St. Martin</subdivision>
1650+
<subdivision type="frmq">Martinique</subdivision> <!-- deprecated -->
16381651
<subdivision type="frnaq">Nouvelle-Aquitaine</subdivision>
1652+
<subdivision type="frnc">New Caledonia</subdivision>
16391653
<subdivision type="frnor">Normandie</subdivision>
16401654
<subdivision type="frocc">Occitanie</subdivision>
16411655
<subdivision type="frpac">Provence-Alpes-Côte-d’Azur</subdivision>
16421656
<subdivision type="frpdl">Pays-de-la-Loire</subdivision>
1657+
<subdivision type="frpf">French Polynesia</subdivision>
1658+
<subdivision type="frpm">St. Pierre &amp; Miquelon</subdivision>
1659+
<subdivision type="frre">Réunion</subdivision> <!-- deprecated -->
1660+
<subdivision type="frtf">French Southern Territories</subdivision>
1661+
<subdivision type="frwf">Wallis &amp; Futuna</subdivision>
1662+
<subdivision type="fryt">Mayotte</subdivision> <!-- deprecated -->
16431663
<!-- GA : Gabon -->
16441664
<subdivision type="ga1">Estuaire</subdivision>
16451665
<subdivision type="ga2">Haut-Ogooué</subdivision>
@@ -3926,9 +3946,11 @@ Generated by tool: SubdivisionNode
39263946
<subdivision type="nins">Nueva Segovia</subdivision>
39273947
<subdivision type="niri">Rivas</subdivision>
39283948
<subdivision type="nisj">Río San Juan</subdivision>
3949+
<subdivision type="nlaw">Aruba</subdivision>
39293950
<subdivision type="nlbq1">Bonaire</subdivision>
39303951
<subdivision type="nlbq2">Saba</subdivision>
39313952
<subdivision type="nlbq3">Sint Eustatius</subdivision>
3953+
<subdivision type="nlcw">Curaçao</subdivision>
39323954
<subdivision type="nldr">Drenthe</subdivision>
39333955
<subdivision type="nlfl">Flevoland</subdivision>
39343956
<subdivision type="nlfr">Friesland</subdivision>
@@ -3938,6 +3960,7 @@ Generated by tool: SubdivisionNode
39383960
<subdivision type="nlnb">North Brabant</subdivision>
39393961
<subdivision type="nlnh">North Holland</subdivision>
39403962
<subdivision type="nlov">Overijssel</subdivision>
3963+
<subdivision type="nlsx">Sint Maarten</subdivision>
39413964
<subdivision type="nlut">Utrecht</subdivision>
39423965
<subdivision type="nlze">Zeeland</subdivision>
39433966
<subdivision type="nlzh">South Holland</subdivision>
@@ -4600,6 +4623,7 @@ Generated by tool: SubdivisionNode
46004623
<!-- SH : St. Helena -->
46014624
<subdivision type="shac">Ascension Island</subdivision>
46024625
<subdivision type="shhl">Saint Helena</subdivision>
4626+
<subdivision type="shta">Tristan da Cunha</subdivision>
46034627
<!-- SI : Slovenia -->
46044628
<subdivision type="si001">Ajdovščina</subdivision>
46054629
<subdivision type="si002">Beltinci</subdivision>
@@ -5465,6 +5489,7 @@ Generated by tool: SubdivisionNode
54655489
<subdivision type="usak">Alaska</subdivision>
54665490
<subdivision type="usal">Alabama</subdivision>
54675491
<subdivision type="usar">Arkansas</subdivision>
5492+
<subdivision type="usas">American Samoa</subdivision>
54685493
<subdivision type="usaz">Arizona</subdivision>
54695494
<subdivision type="usca">California</subdivision>
54705495
<subdivision type="usco">Colorado</subdivision>
@@ -5473,6 +5498,7 @@ Generated by tool: SubdivisionNode
54735498
<subdivision type="usde">Delaware</subdivision>
54745499
<subdivision type="usfl">Florida</subdivision>
54755500
<subdivision type="usga">Georgia</subdivision>
5501+
<subdivision type="usgu">Guam</subdivision>
54765502
<subdivision type="ushi">Hawaii</subdivision>
54775503
<subdivision type="usia">Iowa</subdivision>
54785504
<subdivision type="usid">Idaho</subdivision>
@@ -5487,6 +5513,7 @@ Generated by tool: SubdivisionNode
54875513
<subdivision type="usmi">Michigan</subdivision>
54885514
<subdivision type="usmn">Minnesota</subdivision>
54895515
<subdivision type="usmo">Missouri</subdivision>
5516+
<subdivision type="usmp">Northern Mariana Islands</subdivision>
54905517
<subdivision type="usms">Mississippi</subdivision>
54915518
<subdivision type="usmt">Montana</subdivision>
54925519
<subdivision type="usnc">North Carolina</subdivision>
@@ -5501,13 +5528,16 @@ Generated by tool: SubdivisionNode
55015528
<subdivision type="usok">Oklahoma</subdivision>
55025529
<subdivision type="usor">Oregon</subdivision>
55035530
<subdivision type="uspa">Pennsylvania</subdivision>
5531+
<subdivision type="uspr">Puerto Rico</subdivision>
55045532
<subdivision type="usri">Rhode Island</subdivision>
55055533
<subdivision type="ussc">South Carolina</subdivision>
55065534
<subdivision type="ussd">South Dakota</subdivision>
55075535
<subdivision type="ustn">Tennessee</subdivision>
55085536
<subdivision type="ustx">Texas</subdivision>
5537+
<subdivision type="usum">U.S. Outlying Islands</subdivision>
55095538
<subdivision type="usut">Utah</subdivision>
55105539
<subdivision type="usva">Virginia</subdivision>
5540+
<subdivision type="usvi">U.S. Virgin Islands</subdivision>
55115541
<subdivision type="usvt">Vermont</subdivision>
55125542
<subdivision type="uswa">Washington</subdivision>
55135543
<subdivision type="uswi">Wisconsin</subdivision>

‎common/supplemental/subdivisions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8' ?>
22
<!DOCTYPE supplementalData SYSTEM '../../common/dtd/ldmlSupplemental.dtd'>
33
<!--
4-
Copyright © 1991-2024 Unicode, Inc.
4+
Copyright © 1991-2025 Unicode, Inc.
55
For terms of use, see http://www.unicode.org/copyright.html
66
SPDX-License-Identifier: Unicode-3.0
77
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

‎common/supplemental/supplementalMetadata.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,6 +1530,7 @@ For terms of use, see http://www.unicode.org/copyright.html
15301530
<!-- <subdivisionAlias type="gtsu" replacement="gt?" reason="deprecated"/> <!- - Suchitepéquez => ?? -->
15311531
<!-- <subdivisionAlias type="gtto" replacement="gt?" reason="deprecated"/> <!- - Totonicapán => ?? -->
15321532
<!-- <subdivisionAlias type="gtza" replacement="gt?" reason="deprecated"/> <!- - Zacapa => ?? -->
1533+
<!-- <subdivisionAlias type="inct" replacement="in?" reason="deprecated"/> <!- - Chhattisgarh => ?? -->
15331534
<!-- <subdivisionAlias type="indd" replacement="in?" reason="deprecated"/> <!- - Daman and Diu => ?? -->
15341535
<!-- <subdivisionAlias type="indn" replacement="in?" reason="deprecated"/> <!- - Dadra and Nagar Haveli => ?? -->
15351536
<!-- <subdivisionAlias type="inor" replacement="in?" reason="deprecated"/> <!- - Odisha => ?? -->

‎tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRPaths.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public static final Path getDtd2MdDirectory() {
142142
CldrUtility.getPath(
143143
CldrUtility.getProperty(
144144
"CLDR_PRIVATE_DATA",
145-
CldrUtility.getPath(LOCAL_DIRECTORY, "../cldr-private/")));
145+
CldrUtility.getPath(LOCAL_DIRECTORY, "cldr-private/")));
146146
public static final String TMP_DIRECTORY =
147147
CldrUtility.getPath(
148148
CldrUtility.getProperty(

‎tools/cldr-rdf/src/main/java/org/unicode/cldr/tool/GenerateSubdivisions.java‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.unicode.cldr.util.Validity;
2424
import org.unicode.cldr.util.Validity.Status;
2525

26+
// Note: to see what files are generated by this tool, set the SHOW_FILES environment variable
27+
2628
public class GenerateSubdivisions {
2729
private static final String ISO_COUNTRY_CODES =
2830
CLDRPaths.CLDR_PRIVATE_DIRECTORY + "iso_country_codes/";
@@ -50,7 +52,7 @@ static final class SubdivisionInfo {
5052

5153
static final Relation<String, String> formerRegionToSubdivisions =
5254
Relation.of(
53-
new HashMap<String, Set<String>>(),
55+
new HashMap<>(),
5456
TreeSet.class,
5557
CLDRConfig.getInstance().getComparatorRoot());
5658

@@ -84,6 +86,7 @@ static final class SubdivisionInfo {
8486

8587
public static void main(String[] args) throws IOException {
8688
CLDRConfig.getInstance().getSupplementalDataInfo();
89+
String outputDirectoryName = CLDRPaths.GEN_DIRECTORY + "subdivision";
8790
// TODO Restructure so that this call is done first to process the iso data
8891
// then the extraction uses that data.
8992
// also restructure the SubdivisionInfo to not be static
@@ -111,8 +114,7 @@ public static void main(String[] args) throws IOException {
111114
+ source
112115
+ "/iso_country_codes.xml");
113116
try (PrintWriter pw =
114-
FileUtilities.openUTF8Writer(
115-
CLDRPaths.GEN_DIRECTORY, "subdivision/" + source + ".txt")) {
117+
FileUtilities.openUTF8Writer(outputDirectoryName, source + ".txt")) {
116118
sdset1.print(pw);
117119
}
118120
}
@@ -126,37 +128,28 @@ public static void main(String[] args) throws IOException {
126128
SubdivisionInfo.VALIDITY_FORMER,
127129
SubdivisionInfo.SUBDIVISION_ALIASES_FORMER,
128130
SubdivisionInfo.formerRegionToSubdivisions);
129-
130131
try (PrintWriter pw =
131-
FileUtilities.openUTF8Writer(
132-
CLDRPaths.GEN_DIRECTORY, "subdivision/subdivisions.xml")) {
132+
FileUtilities.openUTF8Writer(outputDirectoryName, "subdivisions.xml")) {
133133
sdset.printXml(pw);
134134
}
135135
try (PrintWriter pw =
136-
FileUtilities.openUTF8Writer(
137-
CLDRPaths.GEN_DIRECTORY, "subdivision/subdivisionAliases.txt")) {
136+
FileUtilities.openUTF8Writer(outputDirectoryName, "subdivisionAliases.txt")) {
138137
sdset.printAliases(pw);
139138
}
140-
try (PrintWriter pw =
141-
FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY, "subdivision/en.xml")) {
139+
try (PrintWriter pw = FileUtilities.openUTF8Writer(outputDirectoryName, "en.xml")) {
142140
sdset.printEnglish(pw);
143141
}
144-
try (PrintWriter pw =
145-
FileUtilities.openUTF8Writer(
146-
CLDRPaths.GEN_DIRECTORY, "subdivision/categories.txt")) {
142+
try (PrintWriter pw = FileUtilities.openUTF8Writer(outputDirectoryName, "categories.txt")) {
147143
sdset.printSamples(pw);
148144
}
149-
try (PrintWriter pw =
150-
FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY, "subdivision/en.txt")) {
145+
try (PrintWriter pw = FileUtilities.openUTF8Writer(outputDirectoryName, "en.txt")) {
151146
sdset.printEnglishComp(pw);
152147
}
153-
try (PrintWriter pw =
154-
FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY, "subdivision/en-full.txt")) {
148+
try (PrintWriter pw = FileUtilities.openUTF8Writer(outputDirectoryName, "en-full.txt")) {
155149
sdset.printEnglishCompFull(pw);
156150
}
157151
try (PrintWriter pw =
158-
FileUtilities.openUTF8Writer(
159-
CLDRPaths.GEN_DIRECTORY, "subdivision/missing-mid.txt")) {
152+
FileUtilities.openUTF8Writer(outputDirectoryName, "missing-mid.txt")) {
160153
sdset.printMissingMIDs(pw);
161154
}
162155
}

0 commit comments

Comments
 (0)