(AUTOMATIC) opensource update

PiperOrigin-RevId: 480803055

Author: battre

common/src/main/java/com/google/i18n/addressinput/common/RegionDataConstants.java

@@ -82,7 +82,7 @@ private static Map<String, String> createMap() {
     map.put("CL", "{\"name\":\"CHILE\",\"lang\":\"es\",\"languages\":\"es\",\"fmt\":\"%N%n%O%n%A%n%Z %C%n%S\"}");
     map.put("CM", "{\"name\":\"CAMEROON\"}");
     map.put("CN", "{\"name\":\"CHINA\",\"lang\":\"zh\",\"languages\":\"zh\",\"lfmt\":\"%N%n%O%n%A%n%D%n%C%n%S, %Z\",\"fmt\":\"%Z%n%S%C%D%n%A%n%O%n%N\",\"require\":\"ACSZ\",\"upper\":\"S\",\"sublocality_name_type\":\"district\",\"width_overrides\":\"%S:S%C:S%D:S\",\"label_overrides\":[{\"field\":\"C\",\"label\":\"市/自治州/地区/盟\",\"lang\":\"zh\"},{\"field\":\"S\",\"label\":\"省/自治区/直辖市\",\"lang\":\"zh\"},{\"field\":\"D\",\"label\":\"区/县/旗\",\"lang\":\"zh\"}]}");
-    map.put("CO", "{\"name\":\"COLOMBIA\",\"fmt\":\"%N%n%O%n%A%n%C, %S, %Z\",\"require\":\"AS\",\"state_name_type\":\"department\",\"label_overrides\":[{\"field\":\"LL\",\"label\":\"Vereda\"},{\"field\":\"A3\",\"label\":\"Corregimiento\"},{\"field\":\"A2\",\"label\":\"Municipio\"}]}");
+    map.put("CO", "{\"name\":\"COLOMBIA\",\"fmt\":\"%N%n%O%n%A%n%D%n%C, %S, %Z\",\"require\":\"AS\",\"state_name_type\":\"department\",\"label_overrides\":[{\"field\":\"LL\",\"label\":\"Vereda\"},{\"field\":\"A3\",\"label\":\"Corregimiento\"},{\"field\":\"A2\",\"label\":\"Municipio\"}]}");
     map.put("CR", "{\"name\":\"COSTA RICA\",\"fmt\":\"%N%n%O%n%A%n%S, %C%n%Z\",\"require\":\"ACS\"}");
     map.put("CU", "{\"name\":\"CUBA\",\"lang\":\"es\",\"languages\":\"es\",\"fmt\":\"%N%n%O%n%A%n%C %S%n%Z\"}");
     map.put("CV", "{\"name\":\"CAPE VERDE\",\"lang\":\"pt\",\"languages\":\"pt\",\"fmt\":\"%N%n%O%n%A%n%Z %C%n%S\",\"state_name_type\":\"island\"}");
@@ -97,7 +97,7 @@ private static Map<String, String> createMap() {
     map.put("DO", "{\"name\":\"DOMINICAN REP.\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("DZ", "{\"name\":\"ALGERIA\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("EC", "{\"name\":\"ECUADOR\",\"fmt\":\"%N%n%O%n%A%n%Z%n%C\",\"upper\":\"CZ\"}");
-    map.put("EE", "{\"name\":\"ESTONIA\",\"fmt\":\"%N%n%O%n%A%n%Z %C\",\"require\":\"ACZ\",\"label_overrides\":[{\"field\":\"C\",\"label\":\"Linn/vald\",\"lang\":\"et\"},{\"field\":\"C\",\"label\":\"City/Parish\",\"lang\":\"en\"}]}");
+    map.put("EE", "{\"name\":\"ESTONIA\",\"fmt\":\"%N%n%O%n%A%n%Z %C %S\",\"require\":\"ACZ\",\"label_overrides\":[{\"field\":\"C\",\"label\":\"Linn/vald\",\"lang\":\"et\"},{\"field\":\"C\",\"label\":\"City/Parish\",\"lang\":\"en\"},{\"field\":\"S\",\"label\":\"Maakond\",\"lang\":\"et\"},{\"field\":\"S\",\"label\":\"Region\",\"lang\":\"en\"}]}");
     map.put("EG", "{\"name\":\"EGYPT\",\"lang\":\"ar\",\"languages\":\"ar\",\"lfmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\",\"fmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\"}");
     map.put("EH", "{\"name\":\"WESTERN SAHARA\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("ER", "{\"name\":\"ERITREA\"}");
@@ -166,9 +166,9 @@ private static Map<String, String> createMap() {
     map.put("LK", "{\"name\":\"SRI LANKA\",\"fmt\":\"%N%n%O%n%A%n%C%n%Z\"}");
     map.put("LR", "{\"name\":\"LIBERIA\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("LS", "{\"name\":\"LESOTHO\",\"fmt\":\"%N%n%O%n%A%n%C %Z\"}");
-    map.put("LT", "{\"name\":\"LITHUANIA\",\"fmt\":\"%O%n%N%n%A%nLT-%Z %C\",\"require\":\"ACZ\",\"postprefix\":\"LT-\"}");
+    map.put("LT", "{\"name\":\"LITHUANIA\",\"fmt\":\"%O%n%N%n%A%nLT-%Z %C %S\",\"require\":\"ACZ\",\"postprefix\":\"LT-\"}");
     map.put("LU", "{\"name\":\"LUXEMBOURG\",\"fmt\":\"%O%n%N%n%A%nL-%Z %C\",\"require\":\"ACZ\",\"postprefix\":\"L-\"}");
-    map.put("LV", "{\"name\":\"LATVIA\",\"fmt\":\"%N%n%O%n%A%n%C, %Z\",\"require\":\"ACZ\"}");
+    map.put("LV", "{\"name\":\"LATVIA\",\"fmt\":\"%N%n%O%n%A%n%S%n%C, %Z\",\"require\":\"ACZ\",\"label_overrides\":[{\"field\":\"C\",\"label\":\"Novads\",\"lang\":\"lv\"},{\"field\":\"C\",\"label\":\"Municipality\",\"lang\":\"en\"},{\"field\":\"S\",\"label\":\"Pagasts/pilsēta\",\"lang\":\"lv\"},{\"field\":\"S\",\"label\":\"Parish/town\",\"lang\":\"en\"}]}");
     map.put("LY", "{\"name\":\"LIBYA\"}");
     map.put("MA", "{\"name\":\"MOROCCO\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("MC", "{\"name\":\"MONACO\",\"fmt\":\"%N%n%O%n%A%nMC-%Z %C %X\",\"postprefix\":\"MC-\"}");
@@ -211,7 +211,7 @@ private static Map<String, String> createMap() {
     map.put("PF", "{\"name\":\"FRENCH POLYNESIA\",\"fmt\":\"%N%n%O%n%A%n%Z %C %S\",\"require\":\"ACSZ\",\"upper\":\"CS\",\"state_name_type\":\"island\"}");
     map.put("PG", "{\"name\":\"PAPUA NEW GUINEA\",\"fmt\":\"%N%n%O%n%A%n%C %Z %S\",\"require\":\"ACS\"}");
     map.put("PH", "{\"name\":\"PHILIPPINES\",\"lang\":\"en\",\"languages\":\"en\",\"fmt\":\"%N%n%O%n%A%n%D, %C%n%Z %S\"}");
-    map.put("PK", "{\"name\":\"PAKISTAN\",\"fmt\":\"%N%n%O%n%A%n%C-%Z\"}");
+    map.put("PK", "{\"name\":\"PAKISTAN\",\"fmt\":\"%N%n%O%n%A%n%D%n%C-%Z\",\"label_overrides\":[{\"field\":\"D\",\"label\":\"Sector\",\"lang\":\"en\"}]}");
     map.put("PL", "{\"name\":\"POLAND\",\"fmt\":\"%N%n%O%n%A%n%Z %C\",\"require\":\"ACZ\"}");
     map.put("PM", "{\"name\":\"ST. PIERRE AND MIQUELON\",\"fmt\":\"%O%n%N%n%A%n%Z %C %X\",\"require\":\"ACZ\",\"upper\":\"ACX\"}");
     map.put("PN", "{\"name\":\"PITCAIRN\",\"fmt\":\"%N%n%O%n%A%n%C%n%Z\",\"require\":\"ACZ\",\"upper\":\"CZ\"}");
@@ -222,7 +222,7 @@ private static Map<String, String> createMap() {
     map.put("PY", "{\"name\":\"PARAGUAY\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("QA", "{\"name\":\"QATAR\",\"upper\":\"AC\"}");
     map.put("RE", "{\"name\":\"REUNION\",\"fmt\":\"%O%n%N%n%A%n%Z %C %X\",\"require\":\"ACZ\",\"upper\":\"ACX\"}");
-    map.put("RO", "{\"name\":\"ROMANIA\",\"fmt\":\"%N%n%O%n%A%n%Z %C\",\"require\":\"ACZ\",\"upper\":\"AC\"}");
+    map.put("RO", "{\"name\":\"ROMANIA\",\"fmt\":\"%N%n%O%n%A%n%Z %S %C\",\"require\":\"ACZ\",\"upper\":\"AC\",\"label_overrides\":[{\"field\":\"C\",\"label\":\"Județe/sectoare\",\"lang\":\"ro\"},{\"field\":\"C\",\"label\":\"County/sector\",\"lang\":\"en\"},{\"field\":\"S\",\"label\":\"Municipiu/oraș/comună\",\"lang\":\"ro\"},{\"field\":\"S\",\"label\":\"Municipality/city/town/commune\",\"lang\":\"en\"}]}");
     map.put("RS", "{\"name\":\"REPUBLIC OF SERBIA\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("RU", "{\"name\":\"RUSSIAN FEDERATION\",\"lang\":\"ru\",\"languages\":\"ru\",\"lfmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\",\"fmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\",\"require\":\"ACSZ\",\"upper\":\"AC\",\"state_name_type\":\"oblast\",\"label_overrides\":[{\"field\":\"CS\",\"message\":\"MSG_OFFICE_UNIT_NUMBER\"}]}");
     map.put("RW", "{\"name\":\"RWANDA\",\"upper\":\"AC\"}");
@@ -262,7 +262,7 @@ private static Map<String, String> createMap() {
     map.put("TR", "{\"name\":\"TURKEY\",\"lang\":\"tr\",\"languages\":\"tr\",\"fmt\":\"%N%n%O%n%A%n%Z %C/%S\",\"require\":\"ACZ\",\"locality_name_type\":\"district\",\"label_overrides\":[{\"field\":\"C\",\"label\":\"İlçe\",\"lang\":\"tr\"},{\"field\":\"S\",\"label\":\"İl\",\"lang\":\"tr\"},{\"field\":\"A4\",\"message\":\"MSG_NEIGHBORHOOD\"}]}");
     map.put("TT", "{\"name\":\"TRINIDAD AND TOBAGO\"}");
     map.put("TV", "{\"name\":\"TUVALU\",\"lang\":\"tyv\",\"languages\":\"tyv\",\"fmt\":\"%N%n%O%n%A%n%C%n%S\",\"upper\":\"ACS\",\"state_name_type\":\"island\"}");
-    map.put("TW", "{\"name\":\"TAIWAN\",\"lang\":\"zh-Hant\",\"languages\":\"zh-Hant\",\"lfmt\":\"%N%n%O%n%A%n%C, %S %Z\",\"fmt\":\"%Z%n%S%C%n%A%n%O%n%N\",\"require\":\"ACSZ\",\"state_name_type\":\"county\"}");
+    map.put("TW", "{\"name\":\"TAIWAN\",\"lang\":\"zh-Hant\",\"languages\":\"zh-Hant\",\"lfmt\":\"%N%n%O%n%A%n%C, %S %Z\",\"fmt\":\"%Z%n%S%C%n%A%n%O%n%N\",\"require\":\"ACSZ\",\"locality_name_type\":\"district\",\"state_name_type\":\"county\"}");
     map.put("TZ", "{\"name\":\"TANZANIA (UNITED REP.)\",\"fmt\":\"%N%n%O%n%A%n%Z %C\"}");
     map.put("UA", "{\"name\":\"UKRAINE\",\"lang\":\"uk\",\"languages\":\"uk\",\"lfmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\",\"fmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\",\"require\":\"ACZ\",\"state_name_type\":\"oblast\",\"label_overrides\":[{\"field\":\"CS\",\"message\":\"MSG_OFFICE_UNIT_NUMBER\"}]}");
     map.put("UG", "{\"name\":\"UGANDA\"}");

cpp/src/format_element.cc

@@ -18,6 +18,7 @@
 
 #include <cassert>
 #include <ostream>
+#include <string>
 
 namespace i18n {
 namespace addressinput {

cpp/src/region_data_constants.cc

@@ -276,7 +276,7 @@ const RegionData kRegionData[] = {
   {"CL", "{"
       R"("fmt":"%N%n%O%n%A%n%Z %C%n%S",)"
       R"("zipex":"8340457,8720019,1230000,8329100",)"
-      R"("posturl":"http://www.correos.cl/SitePages/home.aspx",)"
+      R"("posturl":"https://www.correos.cl/web/guest/codigo-postal",)"
       R"("languages":"es")"
       "}"},
   {"CM", "{"
@@ -292,7 +292,7 @@ const RegionData kRegionData[] = {
       R"("languages":"zh")"
       "}"},
   {"CO", "{"
-      R"("fmt":"%N%n%O%n%A%n%C, %S, %Z",)"
+      R"("fmt":"%N%n%O%n%A%n%D%n%C, %S, %Z",)"
       R"("require":"AS",)"
       R"("state_name_type":"department",)"
       R"("zipex":"111221,130001,760011",)"
@@ -303,7 +303,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%N%n%O%n%A%n%S, %C%n%Z",)"
       R"("require":"ACS",)"
       R"("zipex":"1000,2010,1001",)"
-      R"("posturl":"https://www.correos.go.cr/nosotros/codigopostal/busqueda.html",)"
+      R"("posturl":"https://correos.go.cr/codigo-postal/",)"
       R"("languages":"es")"
       "}"},
   {"CU", "{"
@@ -360,7 +360,7 @@ const RegionData kRegionData[] = {
   {"DO", "{"
       R"("fmt":"%N%n%O%n%A%n%Z %C",)"
       R"("zipex":"11903,10101",)"
-      R"("posturl":"http://inposdom.gob.do/codigo-postal/",)"
+      R"("posturl":"http://inposdom.gob.do/",)"
       R"("languages":"es")"
       "}"},
   {"DZ", "{"
@@ -375,7 +375,7 @@ const RegionData kRegionData[] = {
       R"("languages":"es~qu")"
       "}"},
   {"EE", "{"
-      R"("fmt":"%N%n%O%n%A%n%Z %C",)"
+      R"("fmt":"%N%n%O%n%A%n%Z %C %S",)"
       R"("require":"ACZ",)"
       R"("zipex":"69501,11212",)"
       R"("posturl":"https://www.omniva.ee/era/sihtnumbrite_otsing",)"
@@ -435,7 +435,7 @@ const RegionData kRegionData[] = {
   {"FO", "{"
       R"("fmt":"%N%n%O%n%A%nFO%Z %C",)"
       R"("zipex":"100",)"
-      R"("posturl":"http://www.postur.fo/",)"
+      R"("posturl":"https://www.posta.fo/fo/forsida/finn-postnr-stad/",)"
       R"("languages":"fo")"
       "}"},
   {"FR", "{"
@@ -454,7 +454,7 @@ const RegionData kRegionData[] = {
       R"("locality_name_type":"post_town",)"
       R"("zipex":"EC1Y 8SY,GIR 0AA,M2 5BQ,M34 4AB,CR0 2YR,DN16 9AA,W1A 4ZZ,EC1A 1HQ,OX14 4PG,BS18 8HF,NR25 7HG,RH6 0NP,BH23 6AA,B6 5BA,SO23 9AP,PO1 3AX,BFPO 61",)"
       R"("posturl":"http://www.royalmail.com/postcode-finder",)"
-      R"("languages":"en~cy~gd~ga")"
+      R"("languages":"en~cy~ga~gd")"
       "}"},
   {"GD", "{"
       R"("languages":"en")"
@@ -640,7 +640,7 @@ const RegionData kRegionData[] = {
   {"IS", "{"
       R"("fmt":"%N%n%O%n%A%n%Z %C",)"
       R"("zipex":"320,121,220,110",)"
-      R"("posturl":"http://www.postur.is/einstaklingar/posthus/postnumer/",)"
+      R"("posturl":"https://posturinn.is/",)"
       R"("languages":"is")"
       "}"},
   {"IT", "{"
@@ -777,7 +777,7 @@ const RegionData kRegionData[] = {
       R"("languages":"st~en")"
       "}"},
   {"LT", "{"
-      R"("fmt":"%O%n%N%n%A%nLT-%Z %C",)"
+      R"("fmt":"%O%n%N%n%A%nLT-%Z %C %S",)"
       R"("require":"ACZ",)"
       R"("zipex":"04340,03500",)"
       R"("posturl":"http://www.post.lt/lt/?id=316",)"
@@ -791,7 +791,7 @@ const RegionData kRegionData[] = {
       R"("languages":"fr~lb~de")"
       "}"},
   {"LV", "{"
-      R"("fmt":"%N%n%O%n%A%n%C, %Z",)"
+      R"("fmt":"%N%n%O%n%A%n%S%n%C, %Z",)"
       R"("require":"ACZ",)"
       R"("zipex":"LV-1073,LV-1000",)"
       R"("posturl":"http://www.pasts.lv/lv/uzzinas/nodalas/",)"
@@ -941,7 +941,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%O%n%N%n%A%n%Z %C %X",)"
       R"("require":"ACZ",)"
       R"("zipex":"98814,98800,98810",)"
-      R"("posturl":"http://poste.opt.nc/index.php?option=com_content&view=article&id=80&Itemid=131",)"
+      R"("posturl":"https://www.opt.nc/particuliers/courrier-et-colis/les-codes-postaux-de-nouvelle-caledonie",)"
       R"("languages":"fr")"
       "}"},
   {"NE", "{"
@@ -965,7 +965,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%N%n%O%n%A%n%Z%n%C, %S",)"
       R"("state_name_type":"department",)"
       R"("zipex":"52000",)"
-      R"("posturl":"http://www.correos.gob.ni/index.php/codigo-postal-2",)"
+      R"("posturl":"http://www.correos.gob.ni/codigo-postal/",)"
       R"("languages":"es")"
       "}"},
   {"NL", "{"
@@ -1018,7 +1018,7 @@ const RegionData kRegionData[] = {
       R"("fmt":"%N%n%O%n%A%n%C %Z%n%S",)"
       R"("locality_name_type":"district",)"
       R"("zipex":"LIMA 23,LIMA 42,CALLAO 2,02001",)"
-      R"("posturl":"http://www.serpost.com.pe/cpostal/codigo",)"
+      R"("posturl":"http://www.codigopostal.gob.pe/pages/invitado/consulta.jsf",)"
       R"("languages":"es")"
       "}"},
   {"PF", "{"
@@ -1041,7 +1041,7 @@ const RegionData kRegionData[] = {
       R"("languages":"en")"
       "}"},
   {"PK", "{"
-      R"("fmt":"%N%n%O%n%A%n%C-%Z",)"
+      R"("fmt":"%N%n%O%n%A%n%D%n%C-%Z",)"
       R"("zipex":"44000",)"
       R"("posturl":"http://www.pakpost.gov.pk/postcode.php",)"
       R"("languages":"ur~en")"
@@ -1108,7 +1108,7 @@ const RegionData kRegionData[] = {
       R"("languages":"fr")"
       "}"},
   {"RO", "{"
-      R"("fmt":"%N%n%O%n%A%n%Z %C",)"
+      R"("fmt":"%N%n%O%n%A%n%Z %S %C",)"
       R"("require":"ACZ",)"
       R"("zipex":"060274,061357,200716",)"
       R"("posturl":"http://www.posta-romana.ro/zip_codes",)"
@@ -1314,6 +1314,7 @@ const RegionData kRegionData[] = {
       R"("lfmt":"%N%n%O%n%A%n%C, %S %Z",)"
       R"("require":"ACSZ",)"
       R"("state_name_type":"county",)"
+      R"("locality_name_type":"district",)"
       R"("zipex":"104,106,10603,40867",)"
       R"("posturl":"http://www.post.gov.tw/post/internet/f_searchzone/index.jsp?ID=190102",)"
       R"("languages":"zh-Hant")"

cpp/src/validating_util.cc

@@ -84,8 +84,8 @@ bool UnwrapHeader(const char* header_prefix,
 void ValidatingUtil::Wrap(time_t timestamp, std::string* data) {
   assert(data != nullptr);
   char timestamp_string[2 + 3 * sizeof timestamp];
-  int size = std::snprintf(timestamp_string, sizeof(timestamp_string), "%ld",
-                           static_cast<long>(timestamp));
+  int size =
+      std::sprintf(timestamp_string, "%ld", static_cast<long>(timestamp));
   assert(size > 0);
   assert(size < sizeof timestamp_string);
   (void)size;

cpp/test/address_ui_test.cc

@@ -144,7 +144,7 @@ TEST_F(AddressUiTest, InvalidRegionCodeReturnsEmptyVector) {
 }
 
 // Verifies that BuildComponentsWithLiteras() does return literals. It uses "LV"
-// as an aribtrary short example that has exactly one literal and 3 new lines.
+// as an aribtrary short example that has exactly one literal and 4 new lines.
 TEST_F(AddressUiTest, ComponentsWithLiteralsReadsLiteralsForLV) {
   const std::vector<AddressUiComponent>& components =
       BuildComponentsWithLiterals("LV", localization_, kUiLanguageTag,
@@ -163,7 +163,7 @@ TEST_F(AddressUiTest, ComponentsWithLiteralsReadsLiteralsForLV) {
     }
   }
   EXPECT_EQ(", ", literal);
-  EXPECT_EQ(3, newlines_count);
+  EXPECT_EQ(4, newlines_count);
 }
 
 // Test data for determining the best language tag and whether the right format