Metadata updates for release 8.9.7 (#2210)

google · May 29, 2018 · 6bcb410 · 6bcb410
1 parent 276b234
commit 6bcb410
Show file tree

Hide file tree

Showing 54 changed files with 24,916 additions and 19,577 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/257_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_uk b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_uk
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/382_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/382_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_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/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
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_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA
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
@@ -721,7 +721,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"AX",358,"00|99(?:[02469]|5(?:11|33|5[59]|88|9[09]))","0",,,"0",,"00",,,,[,,,,,,,,,[-1]
+,"AX",358,"00|99(?:[01469]|5(?:11|3[23]|41|5[59]|77|88|9[09]))","0",,,"0",,"00",,,,[,,,,,,,,,[-1]
 ]
 ,,,[,,"[13]00\\d{3,7}|2(?:0(?:0\\d{3,7}|2[023]\\d{1,6}|9[89]\\d{1,6}))|60(?:[12]\\d{5,6}|6\\d{7})|7(?:1\\d{7}|3\\d{8}|5[03-9]\\d{3,7})",,,,"1001234",,,[5,6,7,8,9,10]
 ]
@@ -976,10 +976,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"BI":[,[,,"[267]\\d{7}",,,,,,,[8]
+,"BI":[,[,,"[2367]\\d{7}",,,,,,,[8]
 ]
 ,[,,"22\\d{6}",,,,"22201234"]
-,[,,"(?:29|6[189]|7[124-9])\\d{6}",,,,"79561234"]
+,[,,"(?:29|31|6[189]|7[125-9])\\d{6}",,,,"79561234"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -2392,7 +2392,7 @@ 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",["(?:[1-3]0|[6-8])0"]
+,"FI",358,"00|99(?:[01469]|5(?:11|3[23]|41|5[59]|77|88|9[09]))","0",,,"0",,"00",,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[1-3]0|[6-8])0"]
 ,"0$1"]
 ,[,"(75\\d{3})","$1",["75[12]"]
 ,"0$1"]
@@ -3045,7 +3045,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:2(?:[13-8]\\d|2[013-9]|9[0-24-9])\\d|3(?:[1569][0-24-9]\\d|4[0-246-9]\\d|7[0-24-69]\\d|8(?:4[04]|9\\d))|58(?:0[1-8]|1[2-9]))\\d{4}",,,,"21234567",,,[8]
 ]
-,[,,"(?:46(?:0[0-6]|4[0-57-9])|5(?:[1-59][0-46-9]\\d|6[0-4689]\\d|7(?:[0-2469]\\d|30))|6(?:0[1-9]\\d|[145]\\d{2}|2(?:[0-357-9]\\d|6[01])|[36][0-57-9]\\d|7[0-79]\\d|8[0-2457-9]\\d|9[0-579]\\d)|707[1-5]|8480|9(?:0[1-46-9]\\d|1[02-9]\\d|2(?:[0-8]\\d|9[03-9])|[358][0-8]\\d|[467]\\d{2}))\\d{4}",,,,"51234567",,,[8]
+,[,,"(?:46(?:0[0-6]|4[0-57-9])|5(?:[1-59][0-46-9]\\d|6[0-4689]\\d|7(?:[0-2469]\\d|30))|6(?:0[1-9]\\d|[1459]\\d{2}|2(?:[0-57-9]\\d|6[01])|[368][0-57-9]\\d|7[0-79]\\d)|707[1-5]|8480|9(?:0[1-9]\\d|1[02-9]\\d|2(?:[0-8]\\d|9[03-9])|[358][0-8]\\d|[467]\\d{2}))\\d{4}",,,,"51234567",,,[8]
 ]
 ,[,,"800\\d{6}",,,,"800123456",,,[9]
 ]
@@ -3479,7 +3479,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"(?:[2-6]0\\d|993)\\d{7}",,,,"9932123456",,,[10]
+,[,,"993\\d{7}",,,,"9932123456",,,[10]
 ]
 ,"IR",98,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["[1-8]"]
 ,"0$1"]
@@ -4470,27 +4470,32 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"ME":[,[,,"[2-9]\\d{7,8}",,,,,,,[8]
+,"ME":[,[,,"[2-9]\\d{7,8}",,,,,,,[8,9]
 ,[6]
 ]
-,[,,"(?:20[2-8]|3(?:0[2-7]|[12][235-7]|3[24-7])|4(?:0[2-467]|1[267])|5(?:0[2467]|1[267]|2[2367]))\\d{5}",,,,"30234567",,,,[6]
+,[,,"(?:20[2-8]|3(?:[0-2][2-7]|3[24-7])|4(?:0[2-467]|1[2467])|5(?:[01][2467]|2[2-467]))\\d{5}",,,,"30234567",,,[8]
+,[6]
+]
+,[,,"6(?:00\\d|3[024]\\d|6[0-25]\\d|[7-9]\\d{2})\\d{4}",,,,"67622901",,,[8]
+]
+,[,,"80(?:[0-2578]|9\\d)\\d{5}",,,,"80080002"]
+,[,,"(?:9(?:4[1568]|5[178]))\\d{5}",,,,"94515151",,,[8]
 ]
-,[,,"6(?:00\\d|3[024]\\d|6[0-25]\\d|[7-9]\\d{2})\\d{4}",,,,"67622901"]
-,[,,"80[0-258]\\d{5}",,,,"80080002"]
-,[,,"(?:9(?:4[1568]|5[178]))\\d{5}",,,,"94515151"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"78[1-49]\\d{5}",,,,"78108780"]
-,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[036-9]"]
+,[,,"78[1-49]\\d{5}",,,,"78108780",,,[8]
+]
+,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-57-9]|6[036-9]"]
 ,"0$1"]
 ]
 ,,[,,,,,,,,,[-1]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
-,[,,"77[1-9]\\d{5}",,,,"77273012"]
+,[,,"77[1-9]\\d{5}",,,,"77273012",,,[8]
+]
 ,,,[,,,,,,,,,[-1]
 ]
 ]
@@ -4712,7 +4717,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MO":[,[,,"[268]\\d{7}",,,,,,,[8]
 ]
 ,[,,"(?:28[2-57-9]|8(?:11|[2-57-9]\\d))\\d{5}",,,,"28212345"]
-,[,,"6(?:[2356]\\d|8[158])\\d{5}",,,,"66123456"]
+,[,,"6(?:[2356]\\d{2}|8(?:[02][5-9]|[1478]\\d|[356][0-4]))\\d{4}",,,,"66123456"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -5238,7 +5243,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"NL":[,[,,"1\\d{4,8}|[2-7]\\d{8}|[89]\\d{6,9}",,,,,,,[5,6,7,8,9,10]
 ]
-,[,,"(?:1(?:[035]\\d|1[13-578]|6[124-8]|7[24]|8[0-467])|2(?:[0346]\\d|2[2-46-9]|5[125]|9[479])|3(?:[03568]\\d|1[3-8]|2[01]|4[1-8])|4(?:[0356]\\d|1[1-368]|7[58]|8[15-8]|9[23579])|5(?:[0358]\\d|[19][1-9]|2[1-57-9]|4[13-8]|6[126]|7[0-3578])|7\\d{2}|8[478]\\d)\\d{6}",,,,"101234567",,,[9]
+,[,,"(?:1(?:[035]\\d|1[13-578]|6[124-8]|7[24]|8[0-467])|2(?:[0346]\\d|2[2-46-9]|5[125]|9[479])|3(?:[03568]\\d|1[3-8]|2[01]|4[1-8])|4(?:[0356]\\d|1[1-368]|7[58]|8[15-8]|9[23579])|5(?:[0358]\\d|[19][1-9]|2[1-57-9]|4[13-8]|6[126]|7[0-3578])|7\\d{2})\\d{6}",,,,"101234567",,,[9]
 ]
 ,[,,"6[1-58]\\d{7}",,,,"612345678",,,[9]
 ]
@@ -5269,7 +5274,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,,[,,"140(?:1(?:[035]|[16-8]\\d)|2(?:[0346]|[259]\\d)|3(?:[03568]|[124]\\d)|4(?:[0356]|[17-9]\\d)|5(?:[0358]|[124679]\\d)|7\\d|8[458])",,,,"14023",,,[5,6]
 ]
-,[,,"140(?:1(?:[035]|[16-8]\\d)|2(?:[0346]|[259]\\d)|3(?:[03568]|[124]\\d)|4(?:[0356]|[17-9]\\d)|5(?:[0358]|[124679]\\d)|7\\d|8[458])",,,,"14020",,,[5,6]
+,[,,"140(?:1(?:[035]|[16-8]\\d)|2(?:[0346]|[259]\\d)|3(?:[03568]|[124]\\d)|4(?:[0356]|[17-9]\\d)|5(?:[0358]|[124679]\\d)|7\\d|8[458])|8[478]\\d{7}",,,,"14020",,,[5,6,9]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
@@ -5906,7 +5911,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"RE":[,[,,"[268]\\d{8}",,,,,,,[9]
 ]
 ,[,,"262\\d{6}",,,,"262161234"]
-,[,,"69(?:2\\d{2}|3(?:0[0-46]|1[013]|2[0-2]|3[0139]|4[0-7]|5[05]|6[0-26]|7[0-27]|8[0-38]|9[0-479]))\\d{4}",,,,"692123456"]
+,[,,"69(?:2\\d{2}|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[05]|6[0-26]|7[0-27]|8[0-38]|9[0-479]))\\d{4}",,,,"692123456"]
 ,[,,"80\\d{7}",,,,"801234567"]
 ,[,,"89[1-37-9]\\d{6}",,,,"891123456"]
 ,[,,"8(?:1[019]|2[0156]|84|90)\\d{6}",,,,"810123456"]
@@ -7206,7 +7211,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"20(?:[0147]\\d{3}|2(?:40|[5-9]\\d)\\d|3(?:0[0-4]|[2367]\\d)\\d|5[0-4]\\d{2}|6(?:00[0-2]|30[0-4]|[5-9]\\d{2})|8[0-2]\\d{2})\\d{3}|[34]\\d{8}",,,,"312345678",,,,[5,6,7]
 ]
-,[,,"7(?:0[0-7]\\d|[1578]\\d{2}|2(?:[03]\\d|60)|30\\d|4[0-4]\\d|9(?:[0-6]\\d|74))\\d{5}",,,,"712345678"]
+,[,,"7(?:[09][0-7]\\d|[1578]\\d{2}|2(?:[03]\\d|60)|30\\d|4[0-4]\\d)\\d{5}",,,,"712345678"]
 ,[,,"800[123]\\d{5}",,,,"800123456"]
 ,[,,"90[123]\\d{6}",,,,"901123456"]
 ,[,,,,,,,,,[-1]
@@ -7631,7 +7636,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"YT":[,[,,"[268]\\d{8}",,,,,,,[9]
 ]
 ,[,,"269(?:0[67]|5[01]|6\\d|[78]0)\\d{4}",,,,"269601234"]
-,[,,"639(?:0[0-79]|1[019]|[26]\\d|3[09]|[45]0|7[06-9]|9[04-79])\\d{4}",,,,"639012345"]
+,[,,"639(?:0[0-79]|1[019]|[267]\\d|3[09]|[45]0|9[04-79])\\d{4}",,,,"639012345"]
 ,[,,"80\\d{7}",,,,"801234567"]
 ,[,,,,,,,,,[-1]
 ]

diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
@@ -721,7 +721,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"AX",358,"00|99(?:[02469]|5(?:11|33|5[59]|88|9[09]))","0",,,"0",,"00",,,,[,,,,,,,,,[-1]
+,"AX",358,"00|99(?:[01469]|5(?:11|3[23]|41|5[59]|77|88|9[09]))","0",,,"0",,"00",,,,[,,,,,,,,,[-1]
 ]
 ,,,[,,"[13]00\\d{3,7}|2(?:0(?:0\\d{3,7}|2[023]\\d{1,6}|9[89]\\d{1,6}))|60(?:[12]\\d{5,6}|6\\d{7})|7(?:1\\d{7}|3\\d{8}|5[03-9]\\d{3,7})",,,,,,,[5,6,7,8,9,10]
 ]
@@ -976,10 +976,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"BI":[,[,,"[267]\\d{7}",,,,,,,[8]
+,"BI":[,[,,"[2367]\\d{7}",,,,,,,[8]
 ]
 ,[,,"22\\d{6}"]
-,[,,"(?:29|6[189]|7[124-9])\\d{6}"]
+,[,,"(?:29|31|6[189]|7[125-9])\\d{6}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -2392,7 +2392,7 @@ 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",["(?:[1-3]0|[6-8])0"]
+,"FI",358,"00|99(?:[01469]|5(?:11|3[23]|41|5[59]|77|88|9[09]))","0",,,"0",,"00",,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[1-3]0|[6-8])0"]
 ,"0$1"]
 ,[,"(75\\d{3})","$1",["75[12]"]
 ,"0$1"]
@@ -3045,7 +3045,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:2(?:[13-8]\\d|2[013-9]|9[0-24-9])\\d|3(?:[1569][0-24-9]\\d|4[0-246-9]\\d|7[0-24-69]\\d|8(?:4[04]|9\\d))|58(?:0[1-8]|1[2-9]))\\d{4}",,,,,,,[8]
 ]
-,[,,"(?:46(?:0[0-6]|4[0-57-9])|5(?:[1-59][0-46-9]\\d|6[0-4689]\\d|7(?:[0-2469]\\d|30))|6(?:0[1-9]\\d|[145]\\d{2}|2(?:[0-357-9]\\d|6[01])|[36][0-57-9]\\d|7[0-79]\\d|8[0-2457-9]\\d|9[0-579]\\d)|707[1-5]|8480|9(?:0[1-46-9]\\d|1[02-9]\\d|2(?:[0-8]\\d|9[03-9])|[358][0-8]\\d|[467]\\d{2}))\\d{4}",,,,,,,[8]
+,[,,"(?:46(?:0[0-6]|4[0-57-9])|5(?:[1-59][0-46-9]\\d|6[0-4689]\\d|7(?:[0-2469]\\d|30))|6(?:0[1-9]\\d|[1459]\\d{2}|2(?:[0-57-9]\\d|6[01])|[368][0-57-9]\\d|7[0-79]\\d)|707[1-5]|8480|9(?:0[1-9]\\d|1[02-9]\\d|2(?:[0-8]\\d|9[03-9])|[358][0-8]\\d|[467]\\d{2}))\\d{4}",,,,,,,[8]
 ]
 ,[,,"800\\d{6}",,,,,,,[9]
 ]
@@ -3479,7 +3479,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"(?:[2-6]0\\d|993)\\d{7}",,,,,,,[10]
+,[,,"993\\d{7}",,,,,,,[10]
 ]
 ,"IR",98,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["[1-8]"]
 ,"0$1"]
@@ -4470,27 +4470,32 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"ME":[,[,,"[2-9]\\d{7,8}",,,,,,,[8]
+,"ME":[,[,,"[2-9]\\d{7,8}",,,,,,,[8,9]
 ,[6]
 ]
-,[,,"(?:20[2-8]|3(?:0[2-7]|[12][235-7]|3[24-7])|4(?:0[2-467]|1[267])|5(?:0[2467]|1[267]|2[2367]))\\d{5}",,,,,,,,[6]
+,[,,"(?:20[2-8]|3(?:[0-2][2-7]|3[24-7])|4(?:0[2-467]|1[2467])|5(?:[01][2467]|2[2-467]))\\d{5}",,,,,,,[8]
+,[6]
+]
+,[,,"6(?:00\\d|3[024]\\d|6[0-25]\\d|[7-9]\\d{2})\\d{4}",,,,,,,[8]
+]
+,[,,"80(?:[0-2578]|9\\d)\\d{5}"]
+,[,,"(?:9(?:4[1568]|5[178]))\\d{5}",,,,,,,[8]
 ]
-,[,,"6(?:00\\d|3[024]\\d|6[0-25]\\d|[7-9]\\d{2})\\d{4}"]
-,[,,"80[0-258]\\d{5}"]
-,[,,"(?:9(?:4[1568]|5[178]))\\d{5}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"78[1-49]\\d{5}"]
-,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[036-9]"]
+,[,,"78[1-49]\\d{5}",,,,,,,[8]
+]
+,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-57-9]|6[036-9]"]
 ,"0$1"]
 ]
 ,,[,,,,,,,,,[-1]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
-,[,,"77[1-9]\\d{5}"]
+,[,,"77[1-9]\\d{5}",,,,,,,[8]
+]
 ,,,[,,,,,,,,,[-1]
 ]
 ]
@@ -4712,7 +4717,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MO":[,[,,"[268]\\d{7}",,,,,,,[8]
 ]
 ,[,,"(?:28[2-57-9]|8(?:11|[2-57-9]\\d))\\d{5}"]
-,[,,"6(?:[2356]\\d|8[158])\\d{5}"]
+,[,,"6(?:[2356]\\d{2}|8(?:[02][5-9]|[1478]\\d|[356][0-4]))\\d{4}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -5238,7 +5243,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"NL":[,[,,"1\\d{4,8}|[2-7]\\d{8}|[89]\\d{6,9}",,,,,,,[5,6,7,8,9,10]
 ]
-,[,,"(?:1(?:[035]\\d|1[13-578]|6[124-8]|7[24]|8[0-467])|2(?:[0346]\\d|2[2-46-9]|5[125]|9[479])|3(?:[03568]\\d|1[3-8]|2[01]|4[1-8])|4(?:[0356]\\d|1[1-368]|7[58]|8[15-8]|9[23579])|5(?:[0358]\\d|[19][1-9]|2[1-57-9]|4[13-8]|6[126]|7[0-3578])|7\\d{2}|8[478]\\d)\\d{6}",,,,,,,[9]
+,[,,"(?:1(?:[035]\\d|1[13-578]|6[124-8]|7[24]|8[0-467])|2(?:[0346]\\d|2[2-46-9]|5[125]|9[479])|3(?:[03568]\\d|1[3-8]|2[01]|4[1-8])|4(?:[0356]\\d|1[1-368]|7[58]|8[15-8]|9[23579])|5(?:[0358]\\d|[19][1-9]|2[1-57-9]|4[13-8]|6[126]|7[0-3578])|7\\d{2})\\d{6}",,,,,,,[9]
 ]
 ,[,,"6[1-58]\\d{7}",,,,,,,[9]
 ]
@@ -5269,7 +5274,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,,[,,"140(?:1(?:[035]|[16-8]\\d)|2(?:[0346]|[259]\\d)|3(?:[03568]|[124]\\d)|4(?:[0356]|[17-9]\\d)|5(?:[0358]|[124679]\\d)|7\\d|8[458])",,,,,,,[5,6]
 ]
-,[,,"140(?:1(?:[035]|[16-8]\\d)|2(?:[0346]|[259]\\d)|3(?:[03568]|[124]\\d)|4(?:[0356]|[17-9]\\d)|5(?:[0358]|[124679]\\d)|7\\d|8[458])",,,,,,,[5,6]
+,[,,"140(?:1(?:[035]|[16-8]\\d)|2(?:[0346]|[259]\\d)|3(?:[03568]|[124]\\d)|4(?:[0356]|[17-9]\\d)|5(?:[0358]|[124679]\\d)|7\\d|8[458])|8[478]\\d{7}",,,,,,,[5,6,9]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
@@ -5906,7 +5911,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"RE":[,[,,"[268]\\d{8}",,,,,,,[9]
 ]
 ,[,,"262\\d{6}"]
-,[,,"69(?:2\\d{2}|3(?:0[0-46]|1[013]|2[0-2]|3[0139]|4[0-7]|5[05]|6[0-26]|7[0-27]|8[0-38]|9[0-479]))\\d{4}"]
+,[,,"69(?:2\\d{2}|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[05]|6[0-26]|7[0-27]|8[0-38]|9[0-479]))\\d{4}"]
 ,[,,"80\\d{7}"]
 ,[,,"89[1-37-9]\\d{6}"]
 ,[,,"8(?:1[019]|2[0156]|84|90)\\d{6}"]
@@ -7206,7 +7211,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"20(?:[0147]\\d{3}|2(?:40|[5-9]\\d)\\d|3(?:0[0-4]|[2367]\\d)\\d|5[0-4]\\d{2}|6(?:00[0-2]|30[0-4]|[5-9]\\d{2})|8[0-2]\\d{2})\\d{3}|[34]\\d{8}",,,,,,,,[5,6,7]
 ]
-,[,,"7(?:0[0-7]\\d|[1578]\\d{2}|2(?:[03]\\d|60)|30\\d|4[0-4]\\d|9(?:[0-6]\\d|74))\\d{5}"]
+,[,,"7(?:[09][0-7]\\d|[1578]\\d{2}|2(?:[03]\\d|60)|30\\d|4[0-4]\\d)\\d{5}"]
 ,[,,"800[123]\\d{5}"]
 ,[,,"90[123]\\d{6}"]
 ,[,,,,,,,,,[-1]
@@ -7631,7 +7636,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"YT":[,[,,"[268]\\d{8}",,,,,,,[9]
 ]
 ,[,,"269(?:0[67]|5[01]|6\\d|[78]0)\\d{4}"]
-,[,,"639(?:0[0-79]|1[019]|[26]\\d|3[09]|[45]0|7[06-9]|9[04-79])\\d{4}"]
+,[,,"639(?:0[0-79]|1[019]|[267]\\d|3[09]|[45]0|9[04-79])\\d{4}"]
 ,[,,"80\\d{7}"]
 ,[,,,,,,,,,[-1]
 ]

diff --git a/javascript/i18n/phonenumbers/shortnumbermetadata.js b/javascript/i18n/phonenumbers/shortnumbermetadata.js
@@ -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|911",,,,"89338",,,[3,5]
+,[,,"89338",,,,"89338",,,[3,5]
 ]
 ,,[,,"3372|89338",,,,"3372",,,[4,5]
 ]
@@ -2111,7 +2111,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ]
 ,,,,"ME",,,,,,,,,,,,,,,,,,[,,"1(?:12|2[234])",,,,"112",,,[3]
 ]
-,,[,,"1(?:[035]\\d{2}|1(?:[013-57-9]\\d|2|6\\d{3})|2\\d{1,2}|4\\d{2,3}|9\\d{3})",,,,"1011"]
+,,[,,"1(?:[03]\\d{2}|1(?:[013-57-9]\\d|2|6\\d{3})|2\\d{1,3}|4\\d{2,3}|5(?:\\d{2}|999)|60[06]|700|8(?:0[089]|1[0-8]|888)|9\\d{3})",,,,"1011"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -2722,18 +2722,19 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ,,[,,,,,,,,,[-1]
 ]
 ]
-,"PM":[,[,,"1\\d",,,,,,,[2]
+,"PM":[,[,,"1\\d|3103",,,,,,,[2,4]
 ]
 ,,,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
-,,,,"PM",,,,,,,,,,,,,,,,,,[,,"1[578]",,,,"17"]
-,,[,,"1[578]",,,,"17"]
-,[,,,,,,,,,[-1]
+,,,,"PM",,,,,,,,,,,,,,,,,,[,,"1[578]",,,,"17",,,[2]
 ]
+,,[,,"1[578]|3103",,,,"17"]
 ,[,,,,,,,,,[-1]
 ]
+,[,,"3103",,,,"3103",,,[4]
+]
 ,,[,,,,,,,,,[-1]
 ]
 ]
@@ -3697,7 +3698,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ,,[,,"1(?:0(?:1(?:11|77)|20|7)|1[12]|77(?:3[237]|[45]7|6[279]|9[26]))|[34]\\d{4}",,,,"10111"]
 ,[,,"3(?:078[23]|7(?:064|567)|8126)|4(?:2699|3(?:699|94[16])|7751|8837)",,,,"47751",,,[5]
 ]
-,[,,"1(?:07|11)",,,,"111",,,[3]
+,[,,"111",,,,"111",,,[3]
 ]
 ,,[,,"[34]\\d{4}",,,,"47751",,,[5]
 ]

diff --git a/release_notes.txt b/release_notes.txt
@@ -1,3 +1,14 @@
+May 29, 2018: v8.9.7
+Metadata changes:
+ - Updated phone metadata for region code(s):
+   AX, BI, FI, HK, IR, ME, MO, NL, RE, UG, YT
+ - Updated short number metadata for region code(s): AR, ME, PM, ZA
+ - New geocoding data for country calling code(s): 60 (en), 380 (uk), 382 (en)
+ - Updated geocoding data for country calling code(s):
+   267 (en), 380 (en), 504 (en)
+ - Updated carrier data for country calling code(s):
+   257 (en), 262 (en), 380 (en), 852 (en, zh, zh_Hant), 853 (en)
+
 May 15, 2018: v8.9.6
 Metadata changes:
  - Updated phone metadata for region code(s): IL, IN, NO, TR