From 28eceb5d2aa9bf1a3c05441fee8607a8c36b4526 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Thu, 16 May 2024 09:58:48 +0100 Subject: [PATCH] Upstream metadata changes from Google for v8.13.37 - Updated phone metadata for region code(s): AU, BD, CC, CX, GA, GY, NE, RE, RO, UZ - Updated geocoding data for country calling code(s): 49 (en) - Updated carrier data for country calling code(s): 40 (en), 44 (en), 61 (en), 592 (en) --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/40.php | 1 + src/carrier/data/en/44.php | 10 ++++++++++ src/carrier/data/en/592.php | 7 ++++++- src/carrier/data/en/61.php | 8 ++------ src/data/PhoneNumberMetadata_AU.php | 2 +- src/data/PhoneNumberMetadata_BD.php | 2 +- src/data/PhoneNumberMetadata_CC.php | 2 +- src/data/PhoneNumberMetadata_CX.php | 2 +- src/data/PhoneNumberMetadata_GA.php | 3 +-- src/data/PhoneNumberMetadata_GY.php | 2 +- src/data/PhoneNumberMetadata_NE.php | 4 ++-- src/data/PhoneNumberMetadata_RE.php | 2 +- src/data/PhoneNumberMetadata_RO.php | 2 +- src/data/PhoneNumberMetadata_UZ.php | 7 ++----- src/geocoding/data/en/49.php | 5 +++++ 16 files changed, 37 insertions(+), 24 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 0a937501..2c5c217c 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.36 +v8.13.37 diff --git a/src/carrier/data/en/40.php b/src/carrier/data/en/40.php index 9da4564f..9f5aa1a5 100644 --- a/src/carrier/data/en/40.php +++ b/src/carrier/data/en/40.php @@ -13,6 +13,7 @@ return array ( 4060 => 'Telekom', 4062 => 'Vodafone', + 4063 => 'Digi Mobil', 4064 => 'Orange', 407000 => 'Enigma-System', 407013 => 'Lycamobile', diff --git a/src/carrier/data/en/44.php b/src/carrier/data/en/44.php index cc820f78..c4b26060 100644 --- a/src/carrier/data/en/44.php +++ b/src/carrier/data/en/44.php @@ -23,6 +23,13 @@ 447340 => 'Vodafone', 447341 => 'Vodafone', 447342 => 'Vodafone', + 447343 => 'Lebara', + 447349 => 'Vodafone', + 447350 => 'Vodafone', + 447351 => 'Vodafone', + 447352 => 'Vodafone', + 447353 => 'Vodafone', + 4473566 => 'Wireless Logic', 447360 => 'Three', 447361 => 'Three', 447362 => 'Three', @@ -38,7 +45,9 @@ 4473685 => 'Sky', 4473686 => 'Sky', 4473690 => 'Telet Research', + 4473691 => 'Telet Research', 4473692 => 'Sky', + 4473697 => 'Wave Mobile', 4473699 => 'Anywhere Sim', 447375 => 'EE', 447376 => 'EE', @@ -101,6 +110,7 @@ 4474080 => 'Truphone', 4474081 => 'Truphone', 4474082 => 'Truphone', + 4474086 => 'Truphone', 4474088 => 'Truphone', 4474089 => 'Truphone', 447409 => 'Orange', diff --git a/src/carrier/data/en/592.php b/src/carrier/data/en/592.php index 0aba7686..f997dbb9 100644 --- a/src/carrier/data/en/592.php +++ b/src/carrier/data/en/592.php @@ -54,6 +54,11 @@ 592722 => 'Digicel Guyana', 592725 => 'GTT', 592726 => 'GTT', + 592727 => 'GTT', + 592728 => 'GTT', 59273 => 'E-Networks', - 59274 => 'GTT', + 592740 => 'E-Networks', + 592741 => 'E-Networks', + 592742 => 'E-Networks', + 592749 => 'GTT', ); diff --git a/src/carrier/data/en/61.php b/src/carrier/data/en/61.php index 343c810a..6557d0f6 100644 --- a/src/carrier/data/en/61.php +++ b/src/carrier/data/en/61.php @@ -75,12 +75,8 @@ 61457 => 'Telstra', 61458 => 'Telstra', 61459 => 'Telstra', - 61460 => 'Telstra', - 61461 => 'Telstra', - 61462 => 'Telstra', - 61463 => 'Telstra', + 6146 => 'Telstra', 61466 => 'Optus', - 61467 => 'Telstra', 61468 => 'Optus', 61469 => 'Lycamobile', 614700 => 'Lycamobile', @@ -90,7 +86,7 @@ 614704 => 'Lycamobile', 614705 => 'Lycamobile', 614706 => 'Lycamobile', - 614707 => 'Lycamobile', + 614707 => 'Telstra', 61472 => 'Telstra', 61473 => 'Telstra', 61474 => 'Telstra', diff --git a/src/data/PhoneNumberMetadata_AU.php b/src/data/PhoneNumberMetadata_AU.php index 12d7b462..1f0c2265 100644 --- a/src/data/PhoneNumberMetadata_AU.php +++ b/src/data/PhoneNumberMetadata_AU.php @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}', + 'NationalNumberPattern' => '4(?:79[01]|83[0-389]|94[0-4])\\d{5}|4(?:[0-36]\\d|4[047-9]|5[0-25-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_BD.php b/src/data/PhoneNumberMetadata_BD.php index 45654f06..836f3cc8 100644 --- a/src/data/PhoneNumberMetadata_BD.php +++ b/src/data/PhoneNumberMetadata_BD.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:4(?:31\\d\\d|423)|5222)\\d{3}(?:\\d{2})?|8332[6-9]\\d\\d|(?:3(?:03[56]|224)|4(?:22[25]|653))\\d{3,4}|(?:3(?:42[47]|529|823)|4(?:027|525|65(?:28|8))|562|6257|7(?:1(?:5[3-5]|6[12]|7[156]|89)|22[589]56|32|42675|52(?:[25689](?:56|8)|[347]8)|71(?:6[1267]|75|89)|92374)|82(?:2[59]|32)56|9(?:03[23]56|23(?:256|373)|31|5(?:1|2[4589]56)))\\d{3}|(?:3(?:02[348]|22[35]|324|422)|4(?:22[67]|32[236-9]|6(?:2[46]|5[57])|953)|5526|6(?:024|6655)|81)\\d{4,5}|(?:2(?:7(?:1[0-267]|2[0-289]|3[0-29]|4[01]|5[1-3]|6[013]|7[0178]|91)|8(?:0[125]|1[1-6]|2[0157-9]|3[1-69]|41|6[1-35]|7[1-5]|8[1-8]|9[0-6])|9(?:0[0-2]|1[0-4]|2[568]|3[3-6]|5[5-7]|6[0136-9]|7[0-7]|8[014-9]))|3(?:0(?:2[025-79]|3[2-4])|181|22[12]|32[2356]|824)|4(?:02[09]|22[348]|32[045]|523|6(?:27|54))|666(?:22|53)|7(?:22[57-9]|42[56]|82[35])8|8(?:0[124-9]|2(?:181|2[02-4679]8)|4[12]|[5-7]2)|9(?:[04]2|2(?:2|328)|81))\\d{4}|(?:2(?:222|[45]\\d)\\d|3(?:1(?:2[5-7]|[5-7])|425|822)|4(?:033|1\\d|[257]1|332|4(?:2[246]|5[25])|6(?:2[35]|56|62)|8(?:23|54)|92[2-5])|5(?:02[03489]|22[457]|32[35-79]|42[46]|6(?:[18]|53)|724|826)|6(?:023|2(?:2[2-5]|5[3-5]|8)|32[3478]|42[34]|52[47]|6(?:[18]|6(?:2[34]|5[24]))|[78]2[2-5]|92[2-6])|7(?:02|21\\d|[3-589]1|6[12]|72[24])|8(?:217|3[12]|[5-7]1)|9[24]1)\\d{5}|(?:(?:3[2-8]|5[2-57-9]|6[03-589])1|4[4689][18])\\d{5}|[59]1\\d{5}', + 'NationalNumberPattern' => '(?:4(?:31\\d\\d|423)|5222)\\d{3}(?:\\d{2})?|8332[6-9]\\d\\d|(?:3(?:03[56]|224)|4(?:22[25]|653))\\d{3,4}|(?:3(?:42[47]|529|823)|4(?:027|525|65(?:28|8))|562|6257|7(?:1(?:5[3-5]|6[12]|7[156]|89)|22[589]56|32|42675|52(?:[25689](?:56|8)|[347]8)|71(?:6[1267]|75|89)|92374)|82(?:2[59]|32)56|9(?:03[23]56|23(?:256|373)|31|5(?:1|2[4589]56)))\\d{3}|(?:3(?:02[348]|22[35]|324|422)|4(?:22[67]|32[236-9]|6(?:2[46]|5[57])|953)|5526|6(?:024|6655)|81)\\d{4,5}|(?:2(?:7(?:1[0-267]|2[0-289]|3[0-29]|4[01]|5[1-3]|6[013]|7[0178]|91)|8(?:0[125]|1[1-6]|2[0157-9]|3[1-69]|41|6[1-35]|7[1-5]|8[1-8]|9[0-6])|9(?:0[0-2]|1[0-4]|2[568]|3[3-6]|5[5-7]|6[0136-9]|7[0-7]|8[014-9]))|3(?:0(?:2[025-79]|3[2-4])|181|22[12]|32[2356]|824)|4(?:02[09]|22[348]|32[045]|523|6(?:27|54))|666(?:22|53)|7(?:22[57-9]|42[56]|82[35])8|8(?:0[124-9]|2(?:181|2[02-4679]8)|4[12]|[5-7]2)|9(?:[04]2|2(?:2|328)|81))\\d{4}|(?:2(?:2\\d|[45])\\d\\d|3(?:1(?:2[5-7]|[5-7])|425|822)|4(?:033|1\\d|[257]1|332|4(?:2[246]|5[25])|6(?:2[35]|56|62)|8(?:23|54)|92[2-5])|5(?:02[03489]|22[457]|32[35-79]|42[46]|6(?:[18]|53)|724|826)|6(?:023|2(?:2[2-5]|5[3-5]|8)|32[3478]|42[34]|52[47]|6(?:[18]|6(?:2[34]|5[24]))|[78]2[2-5]|92[2-6])|7(?:02|21\\d|[3-589]1|6[12]|72[24])|8(?:217|3[12]|[5-7]1)|9[24]1)\\d{5}|(?:(?:3[2-8]|5[2-57-9]|6[03-589])1|4[4689][18])\\d{5}|[59]1\\d{5}', 'ExampleNumber' => '27111234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_CC.php b/src/data/PhoneNumberMetadata_CC.php index 90ac463b..ecd0fe4d 100644 --- a/src/data/PhoneNumberMetadata_CC.php +++ b/src/data/PhoneNumberMetadata_CC.php @@ -43,7 +43,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}', + 'NationalNumberPattern' => '4(?:79[01]|83[0-389]|94[0-4])\\d{5}|4(?:[0-36]\\d|4[047-9]|5[0-25-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_CX.php b/src/data/PhoneNumberMetadata_CX.php index 5dd91d7c..e268d7cb 100644 --- a/src/data/PhoneNumberMetadata_CX.php +++ b/src/data/PhoneNumberMetadata_CX.php @@ -43,7 +43,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}', + 'NationalNumberPattern' => '4(?:79[01]|83[0-389]|94[0-4])\\d{5}|4(?:[0-36]\\d|4[047-9]|5[0-25-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GA.php b/src/data/PhoneNumberMetadata_GA.php index 0ebc2697..d9dbcd67 100644 --- a/src/data/PhoneNumberMetadata_GA.php +++ b/src/data/PhoneNumberMetadata_GA.php @@ -140,7 +140,6 @@ 'id' => 'GA', 'countryCode' => 241, 'internationalPrefix' => '00', - 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0(11\\d{6}|60\\d{6}|61\\d{6}|6[256]\\d{6}|7[467]\\d{6})', 'nationalPrefixTransformRule' => '$1', 'sameMobileAndFixedLinePattern' => false, @@ -176,7 +175,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '[167]', + 0 => '11|[67]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php index ebfc56bf..48d0180a 100644 --- a/src/data/PhoneNumberMetadata_GY.php +++ b/src/data/PhoneNumberMetadata_GY.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[0-256]|3[0-2]|49))\\d{4}', + 'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[013]\\d|2[0-25-8]|4[0-29]))\\d{4}', 'ExampleNumber' => '6091234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_NE.php b/src/data/PhoneNumberMetadata_NE.php index ab24c7bb..c4ddfcc5 100644 --- a/src/data/PhoneNumberMetadata_NE.php +++ b/src/data/PhoneNumberMetadata_NE.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:23|7[047]|[89]\\d)\\d{6}', + 'NationalNumberPattern' => '(?:23|7[0467]|[89]\\d)\\d{6}', 'ExampleNumber' => '93123456', 'PossibleLength' => array ( @@ -161,7 +161,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '[089]|2[013]|7[047]', + 0 => '[089]|2[013]|7[0467]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_RE.php b/src/data/PhoneNumberMetadata_RE.php index 04af5a1e..4fce2620 100644 --- a/src/data/PhoneNumberMetadata_RE.php +++ b/src/data/PhoneNumberMetadata_RE.php @@ -90,7 +90,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '9(?:399[0-3]|479[0-5]|76(?:2[27]|3[0-37]))\\d{4}', + 'NationalNumberPattern' => '9(?:399[0-3]|479[0-5]|76(?:2[278]|3[0-37]))\\d{4}', 'ExampleNumber' => '939901234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_RO.php b/src/data/PhoneNumberMetadata_RO.php index f39554d3..78276899 100644 --- a/src/data/PhoneNumberMetadata_RO.php +++ b/src/data/PhoneNumberMetadata_RO.php @@ -37,7 +37,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7020\\d{5}|(?:6(?:[04]0|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', + 'NationalNumberPattern' => '(?:630|702)0\\d{5}|(?:6(?:[04]0|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', 'ExampleNumber' => '712034567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_UZ.php b/src/data/PhoneNumberMetadata_UZ.php index a7b2438f..cd9a4944 100644 --- a/src/data/PhoneNumberMetadata_UZ.php +++ b/src/data/PhoneNumberMetadata_UZ.php @@ -137,10 +137,7 @@ ), 'id' => 'UZ', 'countryCode' => 998, - 'internationalPrefix' => '810', - 'preferredInternationalPrefix' => '8~10', - 'nationalPrefix' => '8', - 'nationalPrefixForParsing' => '8', + 'internationalPrefix' => '00', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( @@ -152,7 +149,7 @@ array ( 0 => '[235-9]', ), - 'nationalPrefixFormattingRule' => '8 $1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/geocoding/data/en/49.php b/src/geocoding/data/en/49.php index 431e4f8e..abb28340 100644 --- a/src/geocoding/data/en/49.php +++ b/src/geocoding/data/en/49.php @@ -3254,6 +3254,11 @@ 496207 => 'Wald-Michelbach', 496209 => 'Mörlenbach', 49621 => 'Mannheim', + 496215 => 'Ludwigshafen', + 496216 => 'Ludwigshafen', + 4962195 => 'Ludwigshafen', + 4962196 => 'Ludwigshafen', + 4962199 => 'Ludwigshafen', 496220 => 'Wilhelmsfeld', 496221 => 'Heidelberg', 496222 => 'Wiesloch',