Metadata updates for release 8.9.9 (#2219)

google · Jun 27, 2018 · 0dd0f03 · 0dd0f03
1 parent a7f9d6c
commit 0dd0f03
Show file tree

Hide file tree

Showing 33 changed files with 13,679 additions and 14,761 deletions.
diff --git a/cpp/src/phonenumbers/lite_metadata.cc b/cpp/src/phonenumbers/lite_metadata.cc
diff --git a/cpp/src/phonenumbers/metadata.cc b/cpp/src/phonenumbers/metadata.cc
diff --git a/cpp/src/phonenumbers/short_metadata.cc b/cpp/src/phonenumbers/short_metadata.cc
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/58_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/58_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW
diff --git a/javascript/i18n/phonenumbers/demo-compiled.js b/javascript/i18n/phonenumbers/demo-compiled.js
diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js
@@ -3754,13 +3754,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"KG":[,[,,"[235-8]\\d{8,9}",,,,,,,[9,10]
+,"KG":[,[,,"[235-9]\\d{8,9}",,,,,,,[9,10]
 ,[5,6]
 ]
 ,[,,"(?: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]
 ]
-,[,,"(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|7(?:[07]\\d|55))\\d{6}",,,,"700123456",,,[9]
+,[,,"(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|7(?:[07]\\d|55)|99[69])\\d{6}",,,,"700123456",,,[9]
 ]
 ,[,,"800\\d{6,7}",,,,"800123456"]
 ,[,,,,,,,,,[-1]
@@ -3771,7 +3771,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"KG",996,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[25-7]|31[25]"]
+,"KG",996,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[25-79]|31[25]"]
 ,"0$1"]
 ,[,"(\\d{4})(\\d{5})","$1 $2",["3(?:1[36]|[2-9])"]
 ,"0$1"]
@@ -5366,10 +5366,12 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"NU":[,[,,"[1-5]\\d{3}",,,,,,,[4]
+,"NU":[,[,,"[478]\\d{3,7}",,,,,,,[4,7]
+]
+,[,,"[47]\\d{3}",,,,"7012",,,[4]
+]
+,[,,"888[4-9]\\d{3}",,,,"8884012",,,[7]
 ]
-,[,,"[34]\\d{3}",,,,"4002"]
-,[,,"[125]\\d{3}",,,,"1234"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -5380,7 +5382,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"NU",683,"00",,,,,,,,,,[,,,,,,,,,[-1]
+,"NU",683,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["888"]
+]
+]
+,,[,,,,,,,,,[-1]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
@@ -6192,13 +6197,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"SE",46,"00","0",,,"0",,,,[[,"(9[034]\\d)(\\d{4})","$1-$2",["9(?:00|39|44)"]
+,"SE",46,"00","0",,,"0",,,,[[,"([1-469]\\d)(\\d{3})(\\d{2})","$1-$2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
 ,"0$1"]
-,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1-$2 $3 $4",["8"]
+,[,"(9[034]\\d)(\\d{4})","$1-$2",["9(?:00|39|44)"]
 ,"0$1"]
-,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]"]
+,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1-$2 $3 $4",["8"]
 ,"0$1"]
-,[,"([1-469]\\d)(\\d{3})(\\d{2})","$1-$2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
+,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90"]
 ,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[0-5]|4[0-3])"]
 ,"0$1"]
@@ -6215,13 +6220,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1-$2 $3 $4 $5",["25[245]|67[3-6]"]
 ,"0$1"]
 ]
-,[[,"(9[034]\\d)(\\d{4})","$1 $2",["9(?:00|39|44)"]
+,[[,"([1-469]\\d)(\\d{3})(\\d{2})","$1 $2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
 ]
-,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1 $2 $3 $4",["8"]
+,[,"(9[034]\\d)(\\d{4})","$1 $2",["9(?:00|39|44)"]
 ]
-,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]"]
+,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1 $2 $3 $4",["8"]
 ]
-,[,"([1-469]\\d)(\\d{3})(\\d{2})","$1 $2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
+,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90"]
 ]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[0-5]|4[0-3])"]
 ]
@@ -7446,7 +7451,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:2(?:0[3-9]|1[0-689]|2[0-25-9]|3[2-9]|4[2-8]|5[124-9]|6[0-39]|7[0-7]|8[2-7]|9[0-4679])\\d|866)\\d{6}",,,,"2101234567",,,[9,10]
 ]
-,[,,"(?:9\\d|1(?:2\\d|6[2-9]|8[68]|99))\\d{7}|8(?:6[689]|8\\d|9[89])\\d{6}",,,,"912345678",,,[9,10]
+,[,,"(?:9(?:[0-8]\\d|9[013-9])|1(?:2\\d|6[2-9]|8[68]|99)\\d|8(?:6[689]|8\\d|9[89]))\\d{6}",,,,"912345678",,,[9,10]
 ]
 ,[,,"1800\\d{4,6}",,,,"1800123456",,,[8,9,10]
 ]
@@ -7456,7 +7461,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,,,,,,,,[-1]
+,[,,"992\\d{6}",,,,"992012345",,,[9]
 ]
 ,"VN",84,"00","0",,,"0",,,,[[,"([17]99)(\\d{4})","$1 $2",["[17]99"]
 ,"0$1",,1]

diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
@@ -3754,13 +3754,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"KG":[,[,,"[235-8]\\d{8,9}",,,,,,,[9,10]
+,"KG":[,[,,"[235-9]\\d{8,9}",,,,,,,[9,10]
 ,[5,6]
 ]
 ,[,,"(?: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}",,,,,,,[9]
 ,[5,6]
 ]
-,[,,"(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|7(?:[07]\\d|55))\\d{6}",,,,,,,[9]
+,[,,"(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|7(?:[07]\\d|55)|99[69])\\d{6}",,,,,,,[9]
 ]
 ,[,,"800\\d{6,7}"]
 ,[,,,,,,,,,[-1]
@@ -3771,7 +3771,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"KG",996,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[25-7]|31[25]"]
+,"KG",996,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[25-79]|31[25]"]
 ,"0$1"]
 ,[,"(\\d{4})(\\d{5})","$1 $2",["3(?:1[36]|[2-9])"]
 ,"0$1"]
@@ -5366,10 +5366,12 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"NU":[,[,,"[1-5]\\d{3}",,,,,,,[4]
+,"NU":[,[,,"[478]\\d{3,7}",,,,,,,[4,7]
+]
+,[,,"[47]\\d{3}",,,,,,,[4]
+]
+,[,,"888[4-9]\\d{3}",,,,,,,[7]
 ]
-,[,,"[34]\\d{3}"]
-,[,,"[125]\\d{3}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -5380,7 +5382,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"NU",683,"00",,,,,,,,,,[,,,,,,,,,[-1]
+,"NU",683,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["888"]
+]
+]
+,,[,,,,,,,,,[-1]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
@@ -6192,13 +6197,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"SE",46,"00","0",,,"0",,,,[[,"(9[034]\\d)(\\d{4})","$1-$2",["9(?:00|39|44)"]
+,"SE",46,"00","0",,,"0",,,,[[,"([1-469]\\d)(\\d{3})(\\d{2})","$1-$2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
 ,"0$1"]
-,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1-$2 $3 $4",["8"]
+,[,"(9[034]\\d)(\\d{4})","$1-$2",["9(?:00|39|44)"]
 ,"0$1"]
-,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]"]
+,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1-$2 $3 $4",["8"]
 ,"0$1"]
-,[,"([1-469]\\d)(\\d{3})(\\d{2})","$1-$2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
+,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90"]
 ,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[0-5]|4[0-3])"]
 ,"0$1"]
@@ -6215,13 +6220,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1-$2 $3 $4 $5",["25[245]|67[3-6]"]
 ,"0$1"]
 ]
-,[[,"(9[034]\\d)(\\d{4})","$1 $2",["9(?:00|39|44)"]
+,[[,"([1-469]\\d)(\\d{3})(\\d{2})","$1 $2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
 ]
-,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1 $2 $3 $4",["8"]
+,[,"(9[034]\\d)(\\d{4})","$1 $2",["9(?:00|39|44)"]
 ]
-,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]"]
+,[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1 $2 $3 $4",["8"]
 ]
-,[,"([1-469]\\d)(\\d{3})(\\d{2})","$1 $2 $3",["[12][136]|3[356]|4[0246]|6[03]|90[1-9]"]
+,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90"]
 ]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[0-5]|4[0-3])"]
 ]
@@ -7446,7 +7451,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:2(?:0[3-9]|1[0-689]|2[0-25-9]|3[2-9]|4[2-8]|5[124-9]|6[0-39]|7[0-7]|8[2-7]|9[0-4679])\\d|866)\\d{6}",,,,,,,[9,10]
 ]
-,[,,"(?:9\\d|1(?:2\\d|6[2-9]|8[68]|99))\\d{7}|8(?:6[689]|8\\d|9[89])\\d{6}",,,,,,,[9,10]
+,[,,"(?:9(?:[0-8]\\d|9[013-9])|1(?:2\\d|6[2-9]|8[68]|99)\\d|8(?:6[689]|8\\d|9[89]))\\d{6}",,,,,,,[9,10]
 ]
 ,[,,"1800\\d{4,6}",,,,,,,[8,9,10]
 ]
@@ -7456,7 +7461,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,,,,,,,,[-1]
+,[,,"992\\d{6}",,,,,,,[9]
 ]
 ,"VN",84,"00","0",,,"0",,,,[[,"([17]99)(\\d{4})","$1 $2",["[17]99"]
 ,"0$1",,1]

diff --git a/javascript/i18n/phonenumbers/shortnumbermetadata.js b/javascript/i18n/phonenumbers/shortnumbermetadata.js
@@ -127,7 +127,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ,[,,"176",,,,"176"]
 ,,[,,"176",,,,"176"]
 ]
-,"AL":[,[,,"[15]\\d{2,5}",,,,,,,[3,5,6]
+,"AL":[,[,,"[15]\\d{2,5}",,,,,,,[3,4,5,6]
 ]
 ,,,[,,"1(?:3[15]|41|16\\d{3})",,,,"116000",,,[3,6]
 ]
@@ -185,7 +185,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ,,[,,"000|1(?:0[0-35-7]|1[02-5]|2[15]|9)|3372|89338|911",,,,"121"]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"89338",,,,"89338",,,[3,5]
+,[,,"89338",,,,"89338",,,[5]
 ]
 ,,[,,"3372|89338",,,,"3372",,,[4,5]
 ]
@@ -994,7 +994,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ,"EE":[,[,,"1\\d{2,5}",,,,,,,[3,4,5,6]
 ]
 ,,,[,,"1(?:1(?:[02]|6(?:000|111))|2(?:0(?:16|5)|28|55[47])|3(?:014|24|3(?:21|5)|660)|492|5(?:1[03]|410|501|977)|6(?:112|333|644)|7(?:012|127|89)|8(?:10|8[57])|9(?:0(?:[134]|90)|14))",,,,"116000"]
-,[,,"1(?:18(?:[12458]|00)|2(?:0(?:[02-46-8]|1[0-36])|1(?:[0-4]|6[06])|2(?:[0-4]|5[25])|[367]|4(?:0[04]|[12]|4[24]|54)55[12457])|3(?:0(?:[02]|1[13578]|3[356])|1[1347]|2[02-5]|3(?:[01347]|2[023]|88)|4(?:[35]|4[34])|5(?:3[134]|5[035])|666)|4(?:2(?:00|4)|4(?:0[01358]|1[024]|50|7)|900)|5(?:0[0-35]|1(?:[1267]|5[0-7]|82)|2(?:[014-6]|22)|330|4(?:[35]|44)|5(?:00|[1-69])|9(?:[159]|[38]0|77))|6(?:1(?:00|1[19]|[356-9])|2(?:2[26]|[68])|3(?:22|36|6[36])|5|6(?:[0-359]|6[0-26])|7(?:00|55|7|8[89])|9(?:00|1|69))|7(?:0(?:[023]|1[0578])|1(?:00|2[034]|[4-9])|2(?:[07]|20|44)|7(?:[0-57]|9[79])|8(?:0[08]|2|8[0178])|9(?:00|97))|8(?:1[127]|8[1268]|9[269])|9(?:0(?:[02]|69|9[0269])|1[123689]|21))",,,,"1182",,,[3,4,5]
+,[,,"1(?:18(?:[12458]|00)|2(?:0(?:[02-46-8]|1[0-36])|1(?:[0-4]|6[06])|2(?:[0-4]|5[25])|[367]|4(?:0[04]|[12]|4[24]|54)|55[12457])|3(?:0(?:[02]|1[13578]|3[356])|1[1347]|2[02-5]|3(?:[01347]|2[023]|88)|4(?:[35]|4[34])|5(?:3[134]|5[035])|666)|4(?:2(?:00|4)|4(?:0[01358]|1[024]|50|7)|900)|5(?:0[0-35]|1(?:[1267]|5[0-7]|82)|2(?:[014-6]|22)|330|4(?:[35]|44)|5(?:00|[1-69])|9(?:[159]|[38]0|77))|6(?:1(?:00|1[19]|[356-9])|2(?:2[26]|[68])|3(?:22|36|6[36])|5|6(?:[0-359]|6[0-26])|7(?:00|55|7|8[89])|9(?:00|1|69))|7(?:0(?:[023]|1[0578])|1(?:00|2[034]|[4-9])|2(?:[07]|20|44)|7(?:[0-57]|9[79])|8(?:0[08]|2|8[0178])|9(?:00|97))|8(?:1[127]|8[1268]|9[269])|9(?:0(?:[02]|69|9[0269])|1[123689]|21))",,,,"1182",,,[3,4,5]
 ]
 ,,,,"EE",,,,,,,,,,,,,,,,,,[,,"11[02]",,,,"112",,,[3]
 ]
@@ -1003,7 +1003,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,,[,,"1(?:18[1258]2(?:0(?:1[036]|[46])|166|21|4(?:0[04]|1|5[47])|[67])|3(?:0(?:1[13-578]|2|3[56])|1[15]|2[045]|3(?:[13]|2[13])|43|5(?:00|3[34]|53))|44(?:0[0135]|14|50|7)|5(?:05|1(?:[12]|5[1246]|8[12])|2(?:[01]|22)|3(?:00|3[03])|4(?:15|5)|500|9(?:5|77|80))|6(?:1[35-8]|226|3(?:22|3[36]|66)|644|7(?:00|7|89)|9(?:00|69))|7(?:01[258]|1(?:00|[15])|2(?:44|7)|8(?:00|87|9))|8(?:1[128]|8[56]|9(?:[26]|77))|90(?:2|69|92))",,,,"13500",,,[4,5]
+,,[,,"1(?:18[1258]|2(?:0(?:1[036]|[46])|166|21|4(?:0[04]|1|5[47])|[67])|3(?:0(?:1[13-578]|2|3[56])|1[15]|2[045]|3(?:[13]|2[13])|43|5(?:00|3[34]|53))|44(?:0[0135]|14|50|7)|5(?:05|1(?:[12]|5[1246]|8[12])|2(?:[01]|22)|3(?:00|3[03])|4(?:15|5)|500|9(?:5|77|80))|6(?:1[35-8]|226|3(?:22|3[36]|66)|644|7(?:00|7|89)|9(?:00|69))|7(?:01[258]|1(?:00|[15])|2(?:44|7)|8(?:00|87|9))|8(?:1[128]|8[56]|9(?:[26]|77))|90(?:2|69|92))",,,,"13500",,,[4,5]
 ]
 ]
 ,"EG":[,[,,"[13]\\d{2,4}",,,,,,,[3,5]
@@ -1163,7 +1163,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ]
 ,,,[,,"1(?:0(?:07|13)|1(?:[0459]|[68]\\d{3})|9[167])|224|3(?:[01]\\d{2}|3700)|740",,,,"3010",,,[3,4,5,6]
 ]
-,[,,"36665|[4-8]\\d{4}",,,,"42000",,,[5,6]
+,[,,"36665|[4-8]\\d{4}",,,,"42000",,,[5]
 ]
 ,,,,"FR",,,,,,,,,,,,,,,,,,[,,"1(?:[578]|12)",,,,"112",,,[2,3]
 ]
@@ -2568,18 +2568,17 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ,,[,,,,,,,,,[-1]
 ]
 ]
-,"NU":[,[,,"9\\d{2}",,,,,,,[3]
+,"NU":[,[,,"[019]\\d{2}",,,,,,,[3]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
 ,,,,"NU",,,,,,,,,,,,,,,,,,[,,"999",,,,"999"]
-,,[,,"999",,,,"999"]
-,[,,,,,,,,,[-1]
-]
+,,[,,"01[05]|101|999",,,,"999"]
 ,[,,,,,,,,,[-1]
 ]
+,[,,"010",,,,"010"]
 ,,[,,,,,,,,,[-1]
 ]
 ]
@@ -3725,7 +3724,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ]
 ,,,,"ZW",,,,,,,,,,,,,,,,,,[,,"(?:11[24]|99[3-59])",,,,"999",,,[3]
 ]
-,,[,,"11[2469]|9(?:5[023]|6[0-25]|9[3-59])",,,,"999"]
+,,[,,"11[2469]|3\\d{4}|9(?:5[023]|6[0-25]|9[3-59])",,,,"999"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,"(?:114|9(?:5[023]|6[0-25]))",,,,"114",,,[3]

diff --git a/release_notes.txt b/release_notes.txt
@@ -1,3 +1,12 @@
+Jun 26, 2018: v8.9.9
+Metadata changes:
+ - Updated phone metadata for region code(s): KG, NU, SE, VN
+ - Updated short number metadata for region code(s): AL, AR, EE, FR, NU, ZW
+ - New geocoding data for country calling code(s): 996 (en)
+ - Updated geocoding data for country calling code(s): 52 (es)
+ - Updated carrier data for country calling code(s): 58 (en), 996 (en)
+ - Updated / refreshed time zone meta data.
+
 Jun 13, 2018: v8.9.8
 Metadata changes:
  - Updated phone metadata for region code(s):