From c25b27eb9847f16b6b31c06ce2a45aca490ae913 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Wed, 25 Sep 2024 09:45:35 +0100 Subject: [PATCH] Upstream metadata changes from Google for v8.13.46 - Updated phone metadata for region code(s): CO, HK, PA, PE, SG, SN, UZ - Updated short number metadata for region code(s): UY - Updated geocoding data for country calling code(s): 51 (en) - Updated carrier data for country calling code(s): 44 (en), 57 (en), 65 (en), 221 (en), 852 (en, zh), 972 (en), 998 (en) --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/221.php | 1 + src/carrier/data/en/44.php | 7 ++++--- src/carrier/data/en/57.php | 2 +- src/carrier/data/en/65.php | 6 +++++- src/carrier/data/en/852.php | 4 +++- src/carrier/data/en/972.php | 1 + src/carrier/data/en/998.php | 8 -------- src/carrier/data/zh/852.php | 4 +++- src/data/PhoneNumberMetadata_CO.php | 9 ++++----- src/data/PhoneNumberMetadata_HK.php | 2 +- src/data/PhoneNumberMetadata_PA.php | 2 +- src/data/PhoneNumberMetadata_PE.php | 2 +- src/data/PhoneNumberMetadata_SG.php | 2 +- src/data/PhoneNumberMetadata_SN.php | 2 +- src/data/PhoneNumberMetadata_UZ.php | 4 ++-- src/data/ShortNumberMetadata_UY.php | 5 +++-- src/geocoding/data/en/51.php | 2 ++ 18 files changed, 35 insertions(+), 30 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 184b3c17b..84afa9b9e 100644 --- a/METADATA-VERSION.txt +++ b/METADATA-VERSION.txt @@ -2,4 +2,4 @@ # It can be a commit, branch or tag of the https://github.com/google/libphonenumber project # # For more information, look at the phing tasks in build.xml -v8.13.45 +v8.13.46 diff --git a/src/carrier/data/en/221.php b/src/carrier/data/en/221.php index d4ac9e388..d3bb302f0 100644 --- a/src/carrier/data/en/221.php +++ b/src/carrier/data/en/221.php @@ -12,6 +12,7 @@ return array ( 22170 => 'Expresso', + 22171 => 'Orange', 22172 => 'HAYO', 22175 => 'Promobile', 221757 => 'Origines', diff --git a/src/carrier/data/en/44.php b/src/carrier/data/en/44.php index 245586e21..5ff0ecb35 100644 --- a/src/carrier/data/en/44.php +++ b/src/carrier/data/en/44.php @@ -30,6 +30,7 @@ 447352 => 'Vodafone', 447353 => 'Vodafone', 4473566 => 'Wireless Logic', + 4473568 => 'TATA Communications', 447360 => 'Three', 447361 => 'Three', 447362 => 'Three', @@ -38,7 +39,7 @@ 447365 => 'Three', 447366 => 'Three', 447367 => 'Three', - 4473680 => 'Teleena', + 4473680 => 'TATA Communications', 4473682 => 'Sky', 4473683 => 'Sky', 4473684 => 'Sky', @@ -135,8 +136,8 @@ 4474184 => 'Manx Telecom', 4474185 => 'Telna', 4474186 => 'Ace Call', - 4474187 => 'Teleena', - 4474189 => 'Teleena', + 4474187 => 'TATA Communications', + 4474189 => 'TATA Communications', 447419 => 'Orange', 447420 => 'Orange', 447421 => 'Orange', diff --git a/src/carrier/data/en/57.php b/src/carrier/data/en/57.php index 838fd276e..d073aae49 100644 --- a/src/carrier/data/en/57.php +++ b/src/carrier/data/en/57.php @@ -288,5 +288,5 @@ 573507 => 'Avantel', 573508 => 'Avantel', 57351 => 'Avantel', - 579 => 'Movistar', + 5791 => 'Movistar', ); diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php index 774301481..afc1479a0 100644 --- a/src/carrier/data/en/65.php +++ b/src/carrier/data/en/65.php @@ -387,7 +387,11 @@ 658947 => 'Simba', 658948 => 'Simba', 658949 => 'M1', - 65895 => 'M1', + 658950 => 'M1', + 658951 => 'M1', + 658952 => 'M1', + 658953 => 'Simba', + 65896 => 'Simba', 659001 => 'StarHub', 659002 => 'StarHub', 659003 => 'StarHub', diff --git a/src/carrier/data/en/852.php b/src/carrier/data/en/852.php index d73c39b14..3b4753828 100644 --- a/src/carrier/data/en/852.php +++ b/src/carrier/data/en/852.php @@ -72,7 +72,8 @@ 852468 => 'China Mobile', 852469 => 'China Mobile', 8524699 => 'South China Telecommunications', - 85247 => 'Hutchison Telecom', + 852470 => 'Hutchison Telecom', + 852474 => 'China Mobile', 852510 => 'China Mobile', 852511 => 'HKT', 852512 => 'China Mobile', @@ -306,6 +307,7 @@ 852841 => 'Hutchison Telecom', 852842 => 'HKT', 852843 => 'Hutchison Telecom', + 852844 => 'China Mobile', 8528480 => 'HKT', 8528481 => 'HKT', 8528482 => 'HKT', diff --git a/src/carrier/data/en/972.php b/src/carrier/data/en/972.php index 3456ab551..a5e842f41 100644 --- a/src/carrier/data/en/972.php +++ b/src/carrier/data/en/972.php @@ -32,6 +32,7 @@ 9725544 => 'Cellran Cellular Communications', 97255440 => 'Merkaziya', 97255442 => 'Xphone', + 97255443 => 'Yossi', 9725550 => 'Annatel', 9725551 => 'Annatel', 9725552 => 'Annatel', diff --git a/src/carrier/data/en/998.php b/src/carrier/data/en/998.php index 53ca5a5a1..2445a5c01 100644 --- a/src/carrier/data/en/998.php +++ b/src/carrier/data/en/998.php @@ -94,14 +94,6 @@ 99867790 => 'MobiUZ', 99867797 => 'MobiUZ', 998679 => 'MobiUZ', - 9986921 => 'MobiUZ', - 9986923 => 'MobiUZ', - 9986925 => 'MobiUZ', - 9986927 => 'MobiUZ', - 998695 => 'MobiUZ', - 9986962 => 'MobiUZ', - 9986968 => 'MobiUZ', - 998697 => 'MobiUZ', 99870 => 'MobiUZ', 99872227 => 'MobiUZ', 99872229 => 'MobiUZ', diff --git a/src/carrier/data/zh/852.php b/src/carrier/data/zh/852.php index 5219dfbd5..0b3e7bfe1 100644 --- a/src/carrier/data/zh/852.php +++ b/src/carrier/data/zh/852.php @@ -71,7 +71,8 @@ 852468 => '中国移动', 852469 => '中国移动', 8524699 => '中國南方電信(香港)有限公司', - 85247 => '和記電話有限公司', + 852470 => '和記電話有限公司', + 852474 => '中国移动', 852510 => '中国移动', 852511 => '香港移动通讯', 852512 => '中国移动', @@ -270,6 +271,7 @@ 852841 => '和記電話有限公司', 852842 => '香港移动通讯', 852843 => '和記電話有限公司', + 852844 => '中国移动', 8528480 => '香港移动通讯', 8528481 => '香港移动通讯', 8528482 => '香港移动通讯', diff --git a/src/data/PhoneNumberMetadata_CO.php b/src/data/PhoneNumberMetadata_CO.php index 39bd705c6..7416239bb 100644 --- a/src/data/PhoneNumberMetadata_CO.php +++ b/src/data/PhoneNumberMetadata_CO.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:60\\d\\d|9101)\\d{6}|(?:1\\d|3)\\d{9}', + 'NationalNumberPattern' => '60\\d{8}|(?:1\\d|[39])\\d{9}', 'PossibleLength' => array ( 0 => 10, @@ -64,11 +64,10 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '19(?:0[01]|4[78])\\d{7}', + 'NationalNumberPattern' => '(?:19(?:0[01]|4[78])|901)\\d{7}', 'ExampleNumber' => '19001234567', 'PossibleLength' => array ( - 0 => 11, ), 'PossibleLengthLocalOnly' => array ( @@ -158,7 +157,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '6', + 0 => '6|90', ), 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', @@ -197,7 +196,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '6', + 0 => '6|90', ), 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php index a3bbc2030..fb251e19e 100644 --- a/src/data/PhoneNumberMetadata_HK.php +++ b/src/data/PhoneNumberMetadata_HK.php @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|70)|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-39]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', + 'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|74[0-2])|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|70)|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-39]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', 'ExampleNumber' => '51234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_PA.php b/src/data/PhoneNumberMetadata_PA.php index c8577d2bf..e88440b0a 100644 --- a/src/data/PhoneNumberMetadata_PA.php +++ b/src/data/PhoneNumberMetadata_PA.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[089]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068]|7[0-8])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}', + 'NationalNumberPattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[07-9]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}', 'ExampleNumber' => '2001234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_PE.php b/src/data/PhoneNumberMetadata_PE.php index ef890a01a..885e1569a 100644 --- a/src/data/PhoneNumberMetadata_PE.php +++ b/src/data/PhoneNumberMetadata_PE.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:(?:4[34]|5[14])[0-8]\\d|7(?:173|3[0-8]\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}', + 'NationalNumberPattern' => '(?:(?:(?:4[34]|5[14])[0-8]|687)\\d|7(?:173|(?:3[0-8]|55)\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[0569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}', 'ExampleNumber' => '11234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index 662118400..e5610919c 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -39,7 +39,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '8(?:09[0-689]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', + 'NationalNumberPattern' => '(?:8(?:0(?:[1-8]\\d|9[0-689])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-3]|62))|9[0-8]\\d\\d)\\d{4}', 'ExampleNumber' => '81234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_SN.php b/src/data/PhoneNumberMetadata_SN.php index 013deae95..2e64f6a3f 100644 --- a/src/data/PhoneNumberMetadata_SN.php +++ b/src/data/PhoneNumberMetadata_SN.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', + 'NationalNumberPattern' => '7(?:(?:[06-8]\\d|[19]0|21)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', 'ExampleNumber' => '701234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_UZ.php b/src/data/PhoneNumberMetadata_UZ.php index cd9a4944a..23c1a8381 100644 --- a/src/data/PhoneNumberMetadata_UZ.php +++ b/src/data/PhoneNumberMetadata_UZ.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d\\d|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}', + 'NationalNumberPattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|[69]\\d\\d|7(?:[23]\\d|7[69]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}', 'ExampleNumber' => '669050123', 'PossibleLength' => array ( @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}', + 'NationalNumberPattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079])))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}', 'ExampleNumber' => '912345678', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_UY.php b/src/data/ShortNumberMetadata_UY.php index 7961dc603..e2f2ec117 100644 --- a/src/data/ShortNumberMetadata_UY.php +++ b/src/data/ShortNumberMetadata_UY.php @@ -14,11 +14,12 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[19]\\d{2,3}', + 'NationalNumberPattern' => '[129]\\d{2,4}', 'PossibleLength' => array ( 0 => 3, 1 => 4, + 2 => 5, ), 'PossibleLengthLocalOnly' => array ( @@ -60,7 +61,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787)|911', + 'NationalNumberPattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787|997\\d?)|21997|911', 'ExampleNumber' => '104', 'PossibleLength' => array ( diff --git a/src/geocoding/data/en/51.php b/src/geocoding/data/en/51.php index aaa9174a2..6afb16e24 100644 --- a/src/geocoding/data/en/51.php +++ b/src/geocoding/data/en/51.php @@ -28,9 +28,11 @@ 5165 => 'Loreto', 5166 => 'Ayacucho', 5167 => 'Huancavelica', + 5168 => 'Lima', 5172 => 'Tumbes', 5173 => 'Piura', 5174 => 'Lambayeque', + 5175 => 'Lima', 5176 => 'Cajamarca', 5182 => 'Madre de Dios', 5183 => 'Apurímac',