Metadata updates for release 7.7.4 (#1428)

java/pending_code_changes.txt

@@ -1,26 +1 @@
-GitHub project changes:
- - Changed tag to vX.Y.Z from libphonenumber-X.Y.Z; this may affect ports and
-   derived projects.
-Metadata structure changes in XML file:
- - Mobile and Fixed-Line blocks are no longer assumed to inherit missing data
-   from the GeneralDesc, but are treated like every other phone number type.
-   This means that for the non-geographical country codes, like +800, the
-   example number has been moved from generalDesc to the relevant number types,
-   and the code in getExampleNumberForNonGeoEntity has been changed to look at
-   these sub-types for an example number.
-   This also means that the "NA" and "-1" blocks present in the metadata to
-   indicate that no mobile or fixed-line numbers appear for the entity have been
-   removed.
-   There should no longer be an exampleNumber at the generalDesc level, but it
-   should be present at every PhoneNumberDesc with data.
-Code changes:
- - Using new possibleLengthInfo to decide whether a short number is the right
-   length or not. This could result in more specific results; whereas before, a
-   number from length 3 to length 6 may have been deemed possible, now we may
-   exclude a number of length 5.
- - Add hash (#) as a diallable character. Numbers with # in them will no longer
-   have formatting applied in formatInOriginalFormat, and
-   normalizeDiallableCharsOnly now retains the # symbol.
- - getExampleNumberForNonGeoEntity has been changed to look at the specific
-   number types, not just the generalDesc, for the example numbers; this is a
-   necessary change after the metadata structure change detailed above.
+

java/release_notes.txt

@@ -1,3 +1,40 @@
+Nov 09, 2016: v7.7.4
+GitHub project changes:
+ - Changed tag to vX.Y.Z from libphonenumber-X.Y.Z; this may affect ports and
+   derived projects.
+Metadata structure changes in XML file:
+ - Mobile and Fixed-Line blocks are no longer assumed to inherit missing data
+   from the GeneralDesc, but are treated like every other phone number type.
+   This means that for the non-geographical country codes, like +800, the
+   example number has been moved from generalDesc to the relevant number types,
+   and the code in getExampleNumberForNonGeoEntity has been changed to look at
+   these sub-types for an example number.
+   This also means that the "NA" and "-1" blocks present in the metadata to
+   indicate that no mobile or fixed-line numbers appear for the entity have been
+   removed.
+   There should no longer be an exampleNumber at the generalDesc level, but it
+   should be present at every PhoneNumberDesc with data.
+Code changes:
+ - Using new possibleLengthInfo to decide whether a short number is the right
+   length or not. This could result in more specific results; whereas before, a
+   number from length 3 to length 6 may have been deemed possible, now we may
+   exclude a number of length 5.
+ - Add hash (#) as a diallable character. Numbers with # in them will no longer
+   have formatting applied in formatInOriginalFormat, and
+   normalizeDiallableCharsOnly now retains the # symbol.
+ - getExampleNumberForNonGeoEntity has been changed to look at the specific
+   number types, not just the generalDesc, for the example numbers; this is a
+   necessary change after the metadata structure change detailed above.
+Metadata changes:
+ - Updated phone metadata for region code(s): AD, AE, IN, IR, MU, MV, NG, PG
+ - Updated short number metadata for region code(s): NL, SN
+ - New geocoding data for country calling code(s):
+   960 (en), 1249 (en), 1343 (en), 1579 (en), 1581 (en)
+ - Updated geocoding data for country calling code(s):
+   1782 (en), 1867 (en), 1902 (en)
+ - Updated carrier data for country calling code(s):
+   91 (en), 234 (en), 971 (en)
+
 Oct 26, 2016: libphonenumber-7.7.3
 Internal changes:
  - Fixed Phonemetadata.java not to merge from a NumberFormat's unset bool

javascript/i18n/phonenumbers/metadata.js

@@ -277,30 +277,32 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA",,,,,,[-1]
 ]
 ]
-,"AD":[,[,,"(?:[346-9]|180)\\d{5}","\\d{6,8}",,,,,,[6,8]
+,"AD":[,[,,"[16]\\d{5,8}|[37-9]\\d{5}","\\d{6,9}",,,,,,[6,8,9]
 ]
 ,[,,"[78]\\d{5}","\\d{6}",,,"712345",,,[6]
 ]
-,[,,"[346]\\d{5}","\\d{6}",,,"312345",,,[6]
+,[,,"(?:3\\d|6(?:[0-8]|90\\d{2}))\\d{4}","\\d{6,9}",,,"312345",,,[6,9]
 ]
 ,[,,"180[02]\\d{4}","\\d{8}",,,"18001234",,,[8]
 ]
-,[,,"9\\d{5}","\\d{6}",,,"912345",,,[6]
+,[,,"[19]\\d{5}","\\d{6}",,,"912345",,,[6]
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
-,"AD",376,"00",,,,,,,,[[,"(\\d{3})(\\d{3})","$1 $2",["[346-9]"]
+,"AD",376,"00",,,,,,,,[[,"(\\d{3})(\\d{3})","$1 $2",["[137-9]|6[0-8]"]
 ]
-,[,"(180[02])(\\d{4})","$1 $2",["1"]
+,[,"(\\d{4})(\\d{4})","$1 $2",["180","180[02]"]
+]
+,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["690"]
 ]
 ]
 ,,[,,"NA","NA",,,,,,[-1]
 ]
-,,,[,,"NA","NA",,,,,,[-1]
+,,,[,,"1800\\d{4}","\\d{8}",,,"18000000",,,[8]
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
@@ -311,7 +313,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"[2-4679][2-8]\\d{6}","\\d{7,8}",,,"22345678",,,[8]
 ]
-,[,,"5[024-6]\\d{7}","\\d{9}",,,"501234567",,,[9]
+,[,,"5[024-68]\\d{7}","\\d{9}",,,"501234567",,,[9]
 ]
 ,[,,"400\\d{6}|800\\d{2,9}",,,,"800123456"]
 ,[,,"900[02]\\d{5}","\\d{9}",,,"900234567",,,[9]
@@ -3293,7 +3295,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:11|2[02]|33|4[04]|79)[2-7]\\d{7}|80[2-467]\\d{7}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|[36][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[13-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1-5]|4[25-8]|5[125689]|6[235-7]|7[157-9]|8[2-467])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|[57][2-689]|6[24-578]|8[1-6])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d|7(?:(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|9\\d)\\d|8(?:2[0-6]|[013-8]\\d)))[2-7]\\d{5}","\\d{6,10}",,,"1123456789",,,[10]
 ]
-,[,,"(?:7(?:0\\d{3}|2(?:[0235679]\\d{2}|[14][017-9]\\d|8(?:[0-59]\\d|6[089]|78)|9[389]\\d)|3(?:[05-8]\\d{2}|1(?:[089]\\d|7[5-8])|2(?:[5-8]\\d|[01][089])|3(?:07|[17-9]\\d)|4(?:[07-9]\\d|11)|9(?:[01689]\\d|59|70))|4(?:0[1-9]\\d|1(?:[015-9]\\d|2[089]|4[08])|2(?:09|[1-7][089]|[89]\\d)|3(?:[0-8][089]|9\\d)|4(?:[089]\\d|11|7[02-8])|5(?:0[089]|[59]9)|7(?:0[3-9]|11|7[02-8]|[89]\\d)|8(?:[0-24-7][089]|[389]\\d)|9(?:[0-6][089]|7[08]|[89]\\d))|5(?:[034678]\\d|2[03-9]|5[017-9]|9[7-9])\\d|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9]\\d)\\d|7(?:0[2-9]|[1-79]\\d|8[1-9])\\d|8(?:[0-79]\\d{2}|88[01])|99[4-9]\\d)|8(?:0(?:[01589]\\d|6[67])|1(?:[02-57-9]\\d|1[0135-9])|2(?:[236-9]\\d|5[1-9])|3(?:[0357-9]\\d|4[1-9])|[45]\\d{2}|6[02457-9]\\d|7(?:07|[1-69]\\d)|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))\\d|9\\d{4})\\d{5}","\\d{10}",,,"9987654321",,,[10]
+,[,,"(?:7(?:0\\d{3}|2(?:[0235679]\\d{2}|[14][017-9]\\d|8(?:[0-59]\\d|6[089]|78))|3(?:[05-8]\\d{2}|1(?:[089]\\d|7[5-8])|2(?:[0-49][089]|[5-8]\\d)|3[017-9]\\d|4(?:[07-9]\\d|11)|9(?:[016-9]\\d|[2-5][089]))|4(?:0\\d{2}|1(?:[015-9]\\d|[23][089]|4[08])|2(?:09|[1-7][089]|[89]\\d)|3(?:[0-8][089]|9\\d)|4(?:[089]\\d|11|7[02-8])|[56]\\d[089]|7(?:[089]\\d|11|7[02-8])|8(?:[0-24-7][089]|[389]\\d)|9(?:[0-6][089]|7[089]|[89]\\d))|5(?:[0346-8]\\d{2}|1(?:[09]\\d|11)|2(?:[04-9]\\d|[123][089])|5[017-9]\\d|9[0-6][089])|6(?:0(?:[0-47]\\d|[5689][089])|(?:1[0-257-9]|3[19]|5[4589]|[6-9]\\d)\\d|2(?:[0-4]\\d|50))|7(?:0(?:0[2-9]|10)|(?:[1-79]\\d|8[1-9])\\d)|8(?:[0-79]\\d{2}|8(?:[08]\\d|11|7[02-9]|9[012]))|9(?:0(?:0[01]|[3-8]\\d|90)|7(?:[26-8]\\d|9[07-9])|8[0246-9]\\d|9(?:[04-9]\\d|11|2[234])))|8(?:0(?:[01589]\\d{2}|6[67]\\d|7(?:[2-7]\\d|86|90))|1(?:[02-57-9]\\d{2}|1(?:[0135-9]\\d|22|44)|6[089]\\d)|2(?:0[08]|[236-9]\\d|5[1-9])\\d|3(?:[0357-9]\\d{2}|170|28[0-6]|4[1-9]\\d)|[45]\\d{3}|6(?:[02457-9]\\d{2}|6(?:[08]\\d|7[02-8]|9[01]))|7(?:0[07]|[1-69]\\d|70)\\d|8(?:[0-26-9]\\d|44|5[2-9])\\d|9(?:[035-9]\\d|19|2[2-9]|4[0-8])\\d)|9\\d{4})\\d{5}","\\d{10}",,,"9987654321",,,[10]
 ]
 ,[,,"00800\\d{7}|1(?:600\\d{6}|80(?:0\\d{4,9}|3\\d{9}))","\\d{8,13}",,,"1800123456"]
 ,[,,"186[12]\\d{9}","\\d{13}",,,"1861123456789",,,[13]
@@ -3304,9 +3306,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
-,"IN",91,"00","0",,,"0",,,,[[,"(\\d{5})(\\d{5})","$1 $2",["7(?:[023578]|4[0-57-9]|6[0-35-9]|99)|8(?:0[015689]|1[0-57-9]|2[2356-9]|3[0-57-9]|[45]|6[02457-9]|7[01-69]|8[0-24-9]|9[02-9])|9","7(?:[08]|2(?:[0235679]|[14][017-9]|8[0-79]|9[389])|3(?:[05-8]|1[07-9]|2[015-8]|[34][017-9]|9[015-9])|4(?:0[1-9]|1[0-24-9]|[2389]|[47][017-9]|5[059])|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|99[4-9])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9","7(?:0|2(?:[0235679]|[14][017-9]|8(?:[0-569]|78)|9[389])|3(?:[05-8]|1(?:[089]|7[5-9])|2(?:[5-8]|[01][089])|3[017-9]|4(?:[07-9]|11)|9(?:[01689]|59|70))|4(?:0[1-9]|1(?:[015-9]|2[089]|4[08])|2(?:09|[1-7][089]|[89])|3(?:[0-8][089]|9)|4(?:[089]|11|7[02-8])|5(?:0[089]|[59]9)|7(?:0[3-9]|11|7[02-8]|[89])|8(?:[0-24-7][089]|[389])|9(?:[0-6][089]|7[08]|[89]))|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|8(?:[0-79]|88[01])|99[4-9])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
+,"IN",91,"00","0",,,"0",,,,[[,"(\\d{5})(\\d{5})","$1 $2",["7(?:[02-578]|6[0-35-9]|9[07-9])|8(?:0[015-9]|2[02356-9]|3[0-57-9]|[1459]|6[02-9]|7[01-69]|8[0-24-9])|9","7(?:[08]|2(?:[0235679]|[14][017-9]|8[0-79]|9[389])|3(?:[025-9]|1[07-9]|[34][017-9])|4(?:[0-35689]|[47][017-9])|5(?:[02346-9]|1[019]|5[017-9])|6(?:[06-9]|1[0-257-9]|2[0-5]|3[19]|5[4589])|7(?:[0-79]|8[1-9])|9(?:0|7[2-9]|8[0246-9]|9[0-24-9]))|8(?:0(?:[01589]|6[67]|7[2-9])|1(?:[02-57-9]|1[0135-9]|6[089])|2(?:0[08]|[236-9]|5[1-9])|3(?:[0357-9]|17|28|4[1-9])|[45]|6(?:[02457-9]|6[07-9])|7(?:0[07]|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|19|2[2-9]|4[0-8]))|9","7(?:0|2(?:[0235679]|[14][017-9]|8(?:[0-569]|78)|9[389])|3(?:[05-8]|1(?:[089]|7[5-9])|2(?:[5-8]|[0-49][089])|3[017-9]|4(?:[07-9]|11)|9(?:[01689]|[2345][089]|40|7[0189]))|4(?:[056]|1(?:[0135-9]|[23][089]|2[089]|4[08])|2(?:09|[1-7][089]|[89])|3(?:[0-8][089]|9)|4(?:[089]|11|7[02-8])|7(?:[089]|11|7[02-8])|8(?:[0-24-7][089]|[389])|9(?:[0-7][089]|[89]))|5(?:[0346-9]|1[019]|2(?:[03-9]|[12][089])|5[017-9])|6(?:[06-9]|1[0-257-9]|2[0-5]|3[19]|5[4589])|7(?:0(?:[02-9]|10)|[1-79]|8[1-9])|8(?:[0-79]|8(?:0[0189]|11|8[013-9]|9[012]))|9(?:0|7(?:[2-8]|9[7-9])|8[0246-9]|9(?:[04-9]|11|2[234])))|8(?:0(?:[01589]|6[67]|7(?:[2-7]|86|90))|1(?:[02-57-9]|1(?:[0135-9]|22|44)|6[089])|2(?:0[08]|[236-9]|5[1-9])|3(?:[0357-9]|170|28[0-6]|4[1-9])|[45]|6(?:[02457-9]|6(?:[08]|7[02-8]|9[01]))|7(?:0[07]|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|19|2[2-9]|4[0-8]))|9"]
 ,"0$1",,1]
-,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79|80[2-46]"]
+,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79[1-9]|80[2-46]"]
 ,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1(?:2[0-249]|3[0-25]|4[145]|[569][14]|7[1257]|8[1346]|[68][1-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|[36][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)"]
 ,"0$1",,1]
@@ -3397,9 +3399,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"IR":[,[,,"[1-8]\\d{9}|9(?:[0-4]\\d{8}|9\\d{2,8})","\\d{4,10}",,,,,,[4,5,6,7,8,9,10]
 ]
-,[,,"(?:1[137]|2[13-68]|3[1458]|4[145]|5[146-8]|6[146]|7[1467]|8[13467])\\d{8}","\\d{10}",,,"2123456789",,,[10]
+,[,,"(?:(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])\\d{3}|94(?:000|2\\d{2}))\\d{5}","\\d{10}",,,"2123456789",,,[10]
 ]
-,[,,"9(?:0[1-3]|[13]\\d|2[0-2]|90)\\d{7}","\\d{10}",,,"9123456789",,,[10]
+,[,,"9(?:0[1-3]|[1-3]\\d|90)\\d{7}","\\d{10}",,,"9123456789",,,[10]
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
@@ -3415,11 +3417,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["[1-8]"]
 ,"0$1"]
-,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["9"]
+,[,"(\\d{3})(\\d{3})","$1 $2",["9"]
 ,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["9"]
 ,"0$1"]
-,[,"(\\d{3})(\\d{3})","$1 $2",["9"]
+,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["9"]
 ,"0$1"]
 ]
 ,,[,,"943\\d{7}","\\d{10}",,,"9432123456",,,[10]
@@ -4771,7 +4773,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MU":[,[,,"[2-9]\\d{6,7}","\\d{7,8}",,,,,,[7,8]
 ]
 ,[,,"(?:2(?:[03478]\\d|1[0-7]|6[1-69])|4(?:[013568]\\d|2[4-7])|5(?:44\\d|471)|6\\d{2}|8(?:14|3[129]))\\d{4}",,,,"2012345"]
-,[,,"5(?:2[59]\\d|4(?:2[1-389]|4\\d|7[1-9]|9\\d)|7\\d{2}|8(?:[0-25689]\\d|7[15-8])|9[0-8]\\d)\\d{4}","\\d{8}",,,"52512345",,,[8]
+,[,,"5(?:2[59]\\d|4(?:2[1-389]|4\\d|7[1-9]|9\\d)|7\\d{2}|8(?:[0-25689]\\d|4[47]|7[15-8])|9[0-8]\\d)\\d{4}","\\d{8}",,,"52512345",,,[8]
 ]
 ,[,,"80[012]\\d{4}","\\d{7}",,,"8001234",,,[7]
 ]
@@ -4797,13 +4799,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA",,,,,,[-1]
 ]
 ]
-,"MV":[,[,,"[3467]\\d{6}|9(?:00\\d{7}|\\d{6})","\\d{7,10}",,,,,,[7,10]
+,"MV":[,[,,"[346-8]\\d{6,9}|9(?:00\\d{7}|\\d{6})","\\d{7,10}",,,,,,[7,10]
 ]
-,[,,"(?:3(?:0[01]|3[0-59])|6(?:[567][02468]|8[024689]|90))\\d{4}","\\d{7}",,,"6701234",,,[7]
+,[,,"(?:3(?:0[0-3]|3[0-59])|6(?:[57][02468]|6[024568]|8[024689]|90))\\d{4}","\\d{7}",,,"6701234",,,[7]
 ]
 ,[,,"(?:46[46]|7[3-9]\\d|9[15-9]\\d)\\d{4}","\\d{7}",,,"7712345",,,[7]
 ]
-,[,,"NA","NA",,,,,,[-1]
+,[,,"800\\d{7}","\\d{10}",,,"8001234567",,,[10]
 ]
 ,[,,"900\\d{7}","\\d{10}",,,"9001234567",,,[10]
 ]
@@ -4815,14 +4817,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"MV",960,"0(?:0|19)",,,,,,"00",,[[,"(\\d{3})(\\d{4})","$1-$2",["[3467]|9(?:[1-9]|0[1-9])"]
 ]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["900"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[89]00"]
 ]
 ]
 ,,[,,"781\\d{4}","\\d{7}",,,"7812345",,,[7]
 ]
 ,,,[,,"NA","NA",,,,,,[-1]
 ]
-,[,,"NA","NA",,,,,,[-1]
+,[,,"4[05]0\\d{4}","\\d{7}",,,"4001234",,,[7]
 ]
 ,,,[,,"NA","NA",,,,,,[-1]
 ]
@@ -5088,7 +5090,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"[12]\\d{6,7}|9(?:0[3-9]|[1-9]\\d)\\d{5}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}","\\d{5,8}",,,"12345678",,,[7,8]
 ]
-,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70[1-689]\\d|8(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))|90[2357-9]\\d)\\d{6}","\\d{8,10}",,,"8021234567",,,[8,10]
+,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[1-689]\\d|7[0-3])|8(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))|90[2357-9]\\d)\\d{6}","\\d{8,10}",,,"8021234567",,,[8,10]
 ]
 ,[,,"800\\d{7,11}","\\d{10,14}",,,"80017591759",,,[10,11,12,13,14]
 ]
@@ -5102,10 +5104,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"NG",234,"009","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[12]|9(?:0[3-9]|[1-9])"]
 ,"0$1"]
-,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[2357-9]"]
-,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["[3-6]|7(?:[1-79]|0[1-9])|8[2-9]"]
 ,"0$1"]
+,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[2357-9]"]
+,"0$1"]
 ,[,"([78]00)(\\d{4})(\\d{4,5})","$1 $2 $3",["[78]00"]
 ,"0$1"]
 ,[,"([78]00)(\\d{5})(\\d{5,6})","$1 $2 $3",["[78]00"]
@@ -5470,7 +5472,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
-,[,,"275\\d{4}","\\d{7}",,,"2751234",,,[7]
+,[,,"27[568]\\d{4}","\\d{7}",,,"2751234",,,[7]
 ]
 ,"PG",675,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[13-689]|27"]
 ]