Metadata updates for release 8.7.0 (#1858)

cpp/CMakeLists.txt

@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 2.8)
 
 project (libphonenumber)
 set (libphonenumber_VERSION_MAJOR 8)
-set (libphonenumber_VERSION_MINOR 6)
+set (libphonenumber_VERSION_MINOR 7)
 
 # Helper functions dealing with finding libraries and programs this library
 # depends on.

java/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java

@@ -26,9 +26,9 @@
 public class AlternateFormatsCountryCodeSet {
   // A set of all country codes for which data is available.
   static Set<Integer> getCountryCodeSet() {
-    // The capacity is set to 61 as there are 46 different entries,
+    // The capacity is set to 62 as there are 47 different entries,
     // and this offers a load factor of roughly 0.75.
-    Set<Integer> countryCodeSet = new HashSet<Integer>(61);
+    Set<Integer> countryCodeSet = new HashSet<Integer>(62);
 
     countryCodeSet.add(7);
     countryCodeSet.add(27);
@@ -73,6 +73,7 @@ static Set<Integer> getCountryCodeSet() {
     countryCodeSet.add(676);
     countryCodeSet.add(679);
     countryCodeSet.add(855);
+    countryCodeSet.add(856);
     countryCodeSet.add(971);
     countryCodeSet.add(972);
     countryCodeSet.add(995);

java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java

@@ -26,9 +26,9 @@
 public class ShortNumbersRegionCodeSet {
   // A set of all region codes for which data is available.
   static Set<String> getRegionCodeSet() {
-    // The capacity is set to 317 as there are 238 different entries,
+    // The capacity is set to 318 as there are 239 different entries,
     // and this offers a load factor of roughly 0.75.
-    Set<String> regionCodeSet = new HashSet<String>(317);
+    Set<String> regionCodeSet = new HashSet<String>(318);
 
     regionCodeSet.add("AC");
     regionCodeSet.add("AD");
@@ -205,6 +205,7 @@ static Set<String> getRegionCodeSet() {
     regionCodeSet.add("PK");
     regionCodeSet.add("PL");
     regionCodeSet.add("PM");
+    regionCodeSet.add("PS");
     regionCodeSet.add("PR");
     regionCodeSet.add("PT");
     regionCodeSet.add("PW");

javascript/i18n/phonenumbers/metadata.js

@@ -887,7 +887,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"BF":[,[,,"[25-7]\\d{7}",,,,,,,[8]
 ]
 ,[,,"2(?:0(?:49|5[23]|6[56]|9[016-9])|4(?:4[569]|5[4-6]|6[56]|7[0179])|5(?:[34]\\d|50|6[5-7]))\\d{4}",,,,"20491234"]
-,[,,"(?:5[156]\\d|[67]\\d{2})\\d{5}",,,,"70123456"]
+,[,,"(?:5[1568]\\d|[67]\\d{2})\\d{5}",,,,"70123456"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -2402,26 +2402,26 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"FI",358,"00|99(?:[02469]|5(?:11|33|5[59]|88|9[09]))","0",,,"0",,"00",,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[16-8]0|300)"]
+,"FI",358,"00|99(?:[02469]|5(?:11|33|5[59]|88|9[09]))","0",,,"0",,"00",,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[1-3]00|[6-8]0)"]
 ,"0$1"]
 ,[,"(116\\d{3})","$1",["116"]
 ,"$1"]
-,[,"(\\d{2})(\\d{3,9})","$1 $2",["1[3-9]|2[09]|4|50|7(?:[13]|5[03-9])"]
+,[,"(\\d{2})(\\d{3,9})","$1 $2",["1(?:0[1-9]|[3-9])|2(?:0[1-9]|9)|30[1-9]|4|50|7(?:[13]|5[03-9])"]
 ,"0$1"]
 ,[,"(75\\d{3})","$1",["75[12]"]
 ,"0$1"]
-,[,"(\\d)(\\d{5,9})","$1 $2",["[25689][1-8]|3(?:0[1-9]|[1-8])"]
+,[,"(\\d)(\\d{5,9})","$1 $2",["[235689][1-8]"]
 ,"0$1"]
 ,[,"(39\\d)(\\d{3})(\\d{3})","$1 $2 $3",["39"]
 ,"0$1"]
 ]
-,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[16-8]0|300)"]
+,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[1-3]00|[6-8]0)"]
 ,"0$1"]
 ,[,"(116\\d{3})","$1",["116"]
 ,"$1"]
-,[,"(\\d{2})(\\d{3,9})","$1 $2",["1[3-9]|2[09]|4|50|7(?:[13]|5[03-9])"]
+,[,"(\\d{2})(\\d{3,9})","$1 $2",["1(?:0[1-9]|[3-9])|2(?:0[1-9]|9)|30[1-9]|4|50|7(?:[13]|5[03-9])"]
 ,"0$1"]
-,[,"(\\d)(\\d{5,9})","$1 $2",["[25689][1-8]|3(?:0[1-9]|[1-8])"]
+,[,"(\\d)(\\d{5,9})","$1 $2",["[235689][1-8]"]
 ,"0$1"]
 ,[,"(39\\d)(\\d{3})(\\d{3})","$1 $2 $3",["39"]
 ,"0$1"]
@@ -2735,7 +2735,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"56\\d{8}",,,,"5612345678",,,[10]
 ]
-,"GG",44,"00","0"," x",,"0",,,,,,[,,"76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}",,,,"7640123456",,,[10]
+,"GG",44,"00","0",,,"0",,,,,,[,,"76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}",,,,"7640123456",,,[10]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
@@ -3092,7 +3092,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,,[,,,,,,,,,[-1]
 ]
-,[,,,,,,,,,[-1]
+,[,,"30(?:0[1-9]|[15-7]\\d|2[047]|89)\\d{4}",,,,"30161234",,,[8]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
@@ -3369,7 +3369,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8(?:4(?:40[49]06|5624\\d)|70624\\d)\\d{3}",,,,"8456247890"]
 ,[,,"70\\d{8}",,,,"7012345678"]
 ,[,,"56\\d{8}",,,,"5612345678"]
-,"IM",44,"00","0"," x",,"0",,,,,,[,,"7624[01689]\\d{5}",,,,"7624012345"]
+,"IM",44,"00","0",,,"0",,,,,,[,,"7624[01689]\\d{5}",,,,"7624012345"]
 ,,,[,,,,,,,,,[-1]
 ]
 ,[,,"3(?:08162\\d|3\\d{5}|4(?:40[49]06|5624\\d)|7(?:0624\\d|2299\\d))\\d{3}|55\\d{8}",,,,"5512345678"]
@@ -3601,7 +3601,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8(?:4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|70002)\\d{4}",,,,"8447034567"]
 ,[,,"701511\\d{4}",,,,"7015115678"]
 ,[,,"56\\d{8}",,,,"5612345678"]
-,"JE",44,"00","0"," x",,"0",,,,,,[,,"76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}",,,,"7640123456"]
+,"JE",44,"00","0",,,"0",,,,,,[,,"76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}",,,,"7640123456"]
 ,,,[,,,,,,,,,[-1]
 ]
 ,[,,"3(?:0(?:07(?:35|81)|8901)|3\\d{4}|4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))\\d{4}|55\\d{8}",,,,"5512345678"]
@@ -3778,7 +3778,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:3(?:1(?:[256]\\d|3[1-9]|47)|2(?:22|3[0-479]|6[0-7])|4(?:22|5[6-9]|6\\d)|5(?:22|3[4-7]|59|6\\d)|6(?:22|5[35-7]|6\\d)|7(?:22|3[468]|4[1-9]|59|[67]\\d)|9(?:22|4[1-8]|6\\d))|6(?:09|12|2[2-4])\\d)\\d{5}",,,,"312123456",,,[9]
 ,[5,6]
 ]
-,[,,"(?:20[0-35]|5[124-7]\\d|7[07]\\d)\\d{6}",,,,"700123456",,,[9]
+,[,,"(?:20[0-35]|5[0-24-7]\\d|7[07]\\d)\\d{6}",,,,"700123456",,,[9]
 ]
 ,[,,"800\\d{6,7}",,,,"800123456"]
 ,[,,,,,,,,,[-1]
@@ -4091,7 +4091,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:2[13]|3(?:0\\d|[14])|[5-7][14]|41|8[1468])\\d{6}",,,,"21212862",,,[8,9]
 ,[6]
 ]
-,[,,"20(?:2[2389]|5[24-689]|7[6-8]|9[15-9])\\d{6}",,,,"2023123456",,,[10]
+,[,,"20(?:2[2389]|5[24-689]|7[6-8]|9[125-9])\\d{6}",,,,"2023123456",,,[10]
 ]
 ,[,,,,,,,,,[-1]
 ]
@@ -4967,7 +4967,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MX":[,[,,"[1-9]\\d{9,10}",,,,,,,[10,11]
 ,[7,8]
 ]
-,[,,"(?:33|55|81)\\d{8}|(?:2(?:0[01]|2[2-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-6][1-9]|[37][1-8]|8[1-35-9]|9[2-689])|5(?:88|9[1-79])|6(?:1[2-68]|[234][1-9]|5[1-3689]|6[12457-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2[1-8]|5[13-9]|8[1-69]|9[17])|8(?:2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7}",,,,"2221234567",,,[10]
+,[,,"(?:33|55|81)\\d{8}|(?:2(?:0[01]|2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-6][1-9]|[37][1-8]|8[1-35-9]|9[2-689])|5(?:88|9[1-79])|6(?:1[2-68]|[234][1-9]|5[1-3689]|6[12457-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2[1-8]|5[13-9]|8[1-69]|9[17])|8(?:2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7}",,,,"2221234567",,,[10]
 ,[7,8]
 ]
 ,[,,"1(?:(?:33|55|81)\\d{8}|(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-6][1-9]|[37][1-8]|8[1-35-9]|9[2-689])|5(?:88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[12457-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2[1-8]|5[13-9]|8[1-69]|9[17])|8(?:2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7})",,,,"12221234567",,,[11]
@@ -5015,7 +5015,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:3[2-9]\\d|[4-9][2-9])\\d{6}",,,,"323456789",,,[8,9]
 ,[6,7]
 ]
-,[,,"1(?:1[1-5]\\d{2}|[02-4679][2-9]\\d|59\\d{2}|8(?:1[23]|[2-9]\\d))\\d{5}",,,,"123456789",,,[9,10]
+,[,,"1(?:1[1-6]\\d{2}|[02-4679][2-9]\\d|59\\d{2}|8(?:1[23]|[2-9]\\d))\\d{5}",,,,"123456789",,,[9,10]
 ]
 ,[,,"1[378]00\\d{6}",,,,"1300123456",,,[10]
 ]
@@ -5770,7 +5770,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"PS":[,[,,"[24589]\\d{7,8}|1(?:[78]\\d{8}|[49]\\d{2,3})",,,,,,,[4,5,8,9,10]
+,"PS":[,[,,"1\\d{9}|[24589]\\d{7,8}",,,,,,,[8,9,10]
 ,[7]
 ]
 ,[,,"(?:22[234789]|42[45]|82[01458]|92[369])\\d{5}",,,,"22234567",,,[8]
@@ -5780,7 +5780,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"1800\\d{6}",,,,"1800123456",,,[10]
 ]
-,[,,"1(?:4|9\\d)\\d{2}",,,,"19123",,,[4,5]
+,[,,,,,,,,,[-1]
 ]
 ,[,,"1700\\d{6}",,,,"1700123456",,,[10]
 ]
@@ -5792,7 +5792,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1"]
 ,[,"(5[69]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["5"]
 ,"0$1"]
-,[,"(1[78]00)(\\d{3})(\\d{3})","$1 $2 $3",["1[78]"]
+,[,"(1[78]00)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
 ,"$1"]
 ]
 ,,[,,,,,,,,,[-1]
@@ -6083,7 +6083,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"11\\d{7}|1?(?:2[24-8]|3[35-8]|4[3-68]|6[2-5]|7[235-7])\\d{6}",,,,"112345678",,,[8,9]
 ,[7]
 ]
-,[,,"(?:5(?:[013-689]\\d|7[0-26-8])|811\\d)\\d{6}",,,,"512345678",,,[9,10]
+,[,,"(?:5(?:[013-689]\\d|7[0-36-8])|811\\d)\\d{6}",,,,"512345678",,,[9,10]
 ]
 ,[,,"800\\d{7}",,,,"8001234567",,,[10]
 ]
@@ -7455,7 +7455,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"VN":[,[,,"[167]\\d{6,9}|[2-59]\\d{7,9}|8\\d{6,8}",,,,,,,[7,8,9,10]
 ]
-,[,,"(?:2(?:0[3-9]|1[0-689]|2[0-25-9]|3[2-9]|[48][02-9]|5[124-9]?|6[0-39]?|7[0-7]?|9[0-4679])\\d|3(?:[0136]|[25][01])\\d|4\\d{2}|5(?:0[01]|[5-9])\\d|6(?:[0-46-8]|5[01])\\d|7(?:[02-79]|[18][01])\\d)\\d{6}|8(?:[2-5]\\d|6[236]|7[13])\\d{6}",,,,"2101234567",,,[9,10]
+,[,,"(?:2(?:0[3-9]|1[0-689]|2[0-25-9]|3[2-9]|[48][2-7]|5[124-9]|6[0-39]|7[0-7]|9[0-4679])|4\\d|5(?:0[01]|[5-9])|6(?:[0-46-8]|5[01])|7[0235])\\d{7}|8(?:[2-5]\\d|6[236]|7[13])\\d{6}",,,,"2101234567",,,[9,10]
 ]
 ,[,,"(?:9\\d|1(?:2\\d|6[2-9]|8[68]|99))\\d{7}|8(?:6[89]|8\\d|9[89])\\d{6}",,,,"912345678",,,[9,10]
 ]
@@ -7473,13 +7473,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1",,1]
 ,[,"([48])(\\d{4})(\\d{4})","$1 $2 $3",["4|8(?:[2-5]|6[236]|7[13])"]
 ,"0$1",,1]
-,[,"([235-7]\\d)(\\d{4})(\\d{3})","$1 $2 $3",["2[5-7]|3[0136]|5[5-9]|6[0-46-8]|7[02-79]"]
+,[,"(\\d{2})(\\d{4})(\\d{3,4})","$1 $2 $3",["2[48]|5[5-9]|6[0-46-8]|7[0235]"]
 ,"0$1",,1]
 ,[,"(80)(\\d{5})","$1 $2",["80"]
 ,"0$1",,1]
 ,[,"(69\\d)(\\d{4,5})","$1 $2",["69"]
 ,"0$1",,1]
-,[,"([235-7]\\d{2})(\\d{4})(\\d{3})","$1 $2 $3",["2(?:[0-489]|5[124-9]|6[0-39]|7[0-7])|3[25]|50|65|7[18]"]
+,[,"(\\d{3})(\\d{4})(\\d{3})","$1 $2 $3",["2[0-35-79]|50|65"]
 ,"0$1",,1]
 ,[,"([89]\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8(?:8|9[89])|9"]
 ,"0$1",,1]
@@ -7696,22 +7696,22 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"ZW":[,[,,"2(?:[0-2457-9]\\d{3,8}|6(?:[14]\\d{7}|\\d{4}))|[13-79]\\d{4,9}|8[06]\\d{8}",,,,,,,[5,6,7,8,9,10]
+,"ZW":[,[,,"2(?:[0-2457-9]\\d{3,8}|6(?:[14]\\d{7}|\\d{4}))|[13-79]\\d{4,9}|8[06]\\d{5,8}",,,,,,,[5,6,7,8,9,10]
 ,[3,4]
 ]
 ,[,,"(?:2(?:0(?:4\\d|5\\d{2})|2[278]\\d|48\\d|7(?:[1-7]\\d|[089]\\d{2})|8(?:[2-57-9]|[146]\\d{2})|98)|3(?:08|17|3[78]|7(?:[19]|[56]\\d)|8[37]|98)|5[15][78]|6(?:28\\d{2}|37|6[78]|75\\d|98|8(?:7\\d|8)))\\d{3}|(?:2(?:1[39]|2[0157]|31|[56][14]|7[35]|84)|329)\\d{7}|(?:1(?:3\\d{2}|[4-8]|9\\d)|2(?:0\\d{2}|12|292|[569]\\d)|3(?:[26]|[013459]\\d)|5(?:0|1[2-4]|26|[37]2|5\\d{2}|[689]\\d)|6(?:[39]|[01246]\\d|[78]\\d{2}))\\d{3}|(?:29\\d|39|54)\\d{6}|(?:(?:25|54)83\\d|2582\\d{2}|65[2-8])\\d{2}|(?:4\\d{6,7}|9[2-9]\\d{4,5})",,,,"1312345",,,,[3,4]
 ]
-,[,,"7[1378]\\d{7}",,,,"711234567",,,[9]
+,[,,"(?:7(?:1[2-8]|3[2-9]|7[1-9]|8[2-5])|8644)\\d{6}",,,,"712345678",,,[9,10]
 ]
-,[,,"800\\d{7}",,,,"8001234567",,,[10]
+,[,,"80(?:[01]\\d|20|8[0-8])\\d{3}",,,,"8001234",,,[7]
 ]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"86(?:1[12]|30|44|55|77|8[367]|99)\\d{6}",,,,"8686123456",,,[10]
+,[,,"86(?:1[12]|30|55|77|8[368])\\d{6}",,,,"8686123456",,,[10]
 ]
 ,"ZW",263,"00","0",,,"0",,,,[[,"([49])(\\d{3})(\\d{2,4})","$1 $2 $3",["4|9[2-9]"]
 ,"0$1"]
@@ -7731,7 +7731,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1"]
 ,[,"(8\\d{3})(\\d{6})","$1 $2",["86"]
 ,"0$1"]
-,[,"(80\\d)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
+,[,"(80\\d)(\\d{4})","$1 $2",["80"]
 ,"0$1"]
 ]
 ,,[,,,,,,,,,[-1]