From 545f049e030fe70abf90f6936025f00d9116460f Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Mon, 9 Jan 2023 09:40:09 +0000 Subject: [PATCH] Upstream metadata changes from Google for v8.13.4 - Updated phone metadata for region code(s): BG, BJ, ET, GH, HT, LR, MG, QA, SI, UZ - Updated short number metadata for region code(s): FO - Updated geocoding data for country calling code(s): 251 (en) - Updated carrier data for country calling code(s): 45 (en), 48 (en), 231 (en), 233 (en), 261 (en), 298 (en), 383 (en), 386 (en), 509 (en), 974 (en), 998 (en) --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/231.php | 1 + src/carrier/data/en/233.php | 1 + src/carrier/data/en/261.php | 1 + src/carrier/data/en/298.php | 2 +- src/carrier/data/en/383.php | 10 +++++++++- src/carrier/data/en/386.php | 3 ++- src/carrier/data/en/45.php | 2 +- src/carrier/data/en/48.php | 1 + src/carrier/data/en/509.php | 12 +++++------- src/carrier/data/en/974.php | 2 -- src/carrier/data/en/998.php | 1 + src/data/PhoneNumberMetadata_BG.php | 6 ++++-- src/data/PhoneNumberMetadata_BJ.php | 4 ++-- src/data/PhoneNumberMetadata_ET.php | 2 +- src/data/PhoneNumberMetadata_GH.php | 2 +- src/data/PhoneNumberMetadata_HT.php | 6 +++--- src/data/PhoneNumberMetadata_LR.php | 6 +++--- src/data/PhoneNumberMetadata_MG.php | 2 +- src/data/PhoneNumberMetadata_QA.php | 12 ++++++------ src/data/PhoneNumberMetadata_SI.php | 2 +- src/data/PhoneNumberMetadata_UZ.php | 6 +++--- src/data/ShortNumberMetadata_FO.php | 5 ++--- src/geocoding/data/en/251.php | 1 + 24 files changed, 52 insertions(+), 40 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index a1d599a12..9a345ad2e 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.3 +v8.13.4 diff --git a/src/carrier/data/en/231.php b/src/carrier/data/en/231.php index 7744aabc0..f020e0c93 100644 --- a/src/carrier/data/en/231.php +++ b/src/carrier/data/en/231.php @@ -11,6 +11,7 @@ */ return array ( + 231220 => 'Liberia Telecom', 231330 => 'West Africa Telecom', 231555 => 'Lonestar Cell', 2316 => 'Lonestar Cell', diff --git a/src/carrier/data/en/233.php b/src/carrier/data/en/233.php index 93e512fb7..93fd480c8 100644 --- a/src/carrier/data/en/233.php +++ b/src/carrier/data/en/233.php @@ -20,6 +20,7 @@ 23328 => 'Expresso', 23329 => 'National Security', 23350 => 'Vodafone', + 23353 => 'MTN', 23354 => 'MTN', 23355 => 'MTN', 23356 => 'airteltiGO', diff --git a/src/carrier/data/en/261.php b/src/carrier/data/en/261.php index d5be2048b..fd2208d0b 100644 --- a/src/carrier/data/en/261.php +++ b/src/carrier/data/en/261.php @@ -14,6 +14,7 @@ 26132 => 'Orange', 26133 => 'Airtel', 26134 => 'Telma', + 26137 => 'Orange', 26138 => 'Telma', 26139 => 'Blueline', ); diff --git a/src/carrier/data/en/298.php b/src/carrier/data/en/298.php index c8bf91806..9c725284e 100644 --- a/src/carrier/data/en/298.php +++ b/src/carrier/data/en/298.php @@ -24,6 +24,6 @@ 2987 => 'Vodafone', 29878 => 'Faroese Telecom', 29879 => 'Faroese Telecom', - 29891 => 'Tosa', + 29891 => 'Faroese Telecom', 29896 => 'Faroese Telecom', ); diff --git a/src/carrier/data/en/383.php b/src/carrier/data/en/383.php index 0102f4587..a54a6bf96 100644 --- a/src/carrier/data/en/383.php +++ b/src/carrier/data/en/383.php @@ -22,7 +22,15 @@ 383457 => 'vala', 383458 => 'vala', 383459 => 'vala', - 383461 => 'Z Mobile', + 383461 => 'vala', + 383462 => 'vala', + 383463 => 'vala', + 383464 => 'vala', + 383465 => 'vala', + 383466 => 'vala', + 383467 => 'vala', + 383468 => 'vala', + 383469 => 'vala', 38347 => 'mts d.o.o.', 38348 => 'IPKO', 38349 => 'IPKO', diff --git a/src/carrier/data/en/386.php b/src/carrier/data/en/386.php index bec996484..0805ee20f 100644 --- a/src/carrier/data/en/386.php +++ b/src/carrier/data/en/386.php @@ -20,7 +20,8 @@ 38651 => 'Telekom Slovenije', 38664 => 'T-2', 386651 => 'SŽ - Infrastruktura', - 386655 => 'Telekom Slovenije', + 3866555 => 'Telekom Slovenije', + 3866556 => 'Sloexport', 386656 => 'SoftNet', 386657 => 'Novatel', 38668 => 'A1', diff --git a/src/carrier/data/en/45.php b/src/carrier/data/en/45.php index 75ece6dbc..33436ecbc 100644 --- a/src/carrier/data/en/45.php +++ b/src/carrier/data/en/45.php @@ -251,7 +251,7 @@ 45458 => 'telenor', 45459 => 'telenor', 45461 => 'telenor', - 45462 => 'telenor', + 454626 => 'Lancelot Telecom', 45463 => 'telenor', 45464 => 'telenor', 45465 => 'telenor', diff --git a/src/carrier/data/en/48.php b/src/carrier/data/en/48.php index 79dcf898a..9bd8b592b 100644 --- a/src/carrier/data/en/48.php +++ b/src/carrier/data/en/48.php @@ -242,6 +242,7 @@ 487864 => 'Orange', 487865 => 'Orange', 487866 => 'Orange', + 4878670 => 'Lancelot Telecom', 4878671 => 'Plus', 4878672 => 'Plus', 4878673 => 'Plus', diff --git a/src/carrier/data/en/509.php b/src/carrier/data/en/509.php index 122a26e8c..d230b3e5e 100644 --- a/src/carrier/data/en/509.php +++ b/src/carrier/data/en/509.php @@ -11,13 +11,10 @@ */ return array ( - 50930 => 'Digicel', - 50931 => 'Digicel', - 50934 => 'Digicel', - 50936 => 'Digicel', - 50937 => 'Digicel', - 50938 => 'Digicel', - 50939 => 'Digicel', + 5093 => 'Digicel', + 50932 => 'Natcom', + 50933 => 'Natcom', + 50935 => 'Natcom', 50940 => 'Natcom', 50941 => 'Natcom', 50942 => 'Natcom', @@ -27,4 +24,5 @@ 50947 => 'Digicel', 50948 => 'Digicel', 50949 => 'Digicel', + 5095 => 'Natcom', ); diff --git a/src/carrier/data/en/974.php b/src/carrier/data/en/974.php index cfb9aef42..aa5b03f35 100644 --- a/src/carrier/data/en/974.php +++ b/src/carrier/data/en/974.php @@ -11,8 +11,6 @@ */ return array ( - 97428 => 'ooredoo', - 97429 => 'Vodafone', 97430 => 'Vodafone', 974310 => 'Vodafone', 974311 => 'Vodafone', diff --git a/src/carrier/data/en/998.php b/src/carrier/data/en/998.php index 6d62b1dcd..fb6e8108d 100644 --- a/src/carrier/data/en/998.php +++ b/src/carrier/data/en/998.php @@ -12,6 +12,7 @@ return array ( 9983 => 'Uzbektelecom', + 99850 => 'Ucell', 998555 => 'Uzbektelecom', 99861220 => 'MobiUZ', 99861221 => 'MobiUZ', diff --git a/src/data/PhoneNumberMetadata_BG.php b/src/data/PhoneNumberMetadata_BG.php index 3f4334000..967efa0db 100644 --- a/src/data/PhoneNumberMetadata_BG.php +++ b/src/data/PhoneNumberMetadata_BG.php @@ -14,13 +14,14 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[2-7]\\d{6,7}|[89]\\d{6,8}|2\\d{5}', + 'NationalNumberPattern' => '00800\\d{7}|[2-7]\\d{6,7}|[89]\\d{6,8}|2\\d{5}', 'PossibleLength' => array ( 0 => 6, 1 => 7, 2 => 8, 3 => 9, + 4 => 12, ), 'PossibleLengthLocalOnly' => array ( @@ -59,11 +60,12 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '800\\d{5}', + 'NationalNumberPattern' => '(?:00800\\d\\d|800)\\d{5}', 'ExampleNumber' => '80012345', 'PossibleLength' => array ( 0 => 8, + 1 => 12, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/PhoneNumberMetadata_BJ.php b/src/data/PhoneNumberMetadata_BJ.php index 050ff5ea1..e52f17ec3 100644 --- a/src/data/PhoneNumberMetadata_BJ.php +++ b/src/data/PhoneNumberMetadata_BJ.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:[25689]\\d|40)\\d{6}', + 'NationalNumberPattern' => '[24-689]\\d{7}', 'PossibleLength' => array ( 0 => 8, @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:40|5[1-9]|6\\d|9[013-9])\\d{6}', + 'NationalNumberPattern' => '(?:4[01]|5[1-9]|6\\d|9[013-9])\\d{6}', 'ExampleNumber' => '90011234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_ET.php b/src/data/PhoneNumberMetadata_ET.php index 9db059356..8ea20bbcd 100644 --- a/src/data/PhoneNumberMetadata_ET.php +++ b/src/data/PhoneNumberMetadata_ET.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '11667[01]\\d{3}|(?:11(?:1(?:1[124]|2[2-7]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:1[578]|2[69]|39|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:119|22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}', + 'NationalNumberPattern' => '11667[01]\\d{3}|(?:11(?:1(?:1[124]|2[2-7]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:1[578]|2[69]|39|4[5-7]|5[0-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:119|22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}', 'ExampleNumber' => '111112345', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GH.php b/src/data/PhoneNumberMetadata_GH.php index 26103fb51..4fc075f9e 100644 --- a/src/data/PhoneNumberMetadata_GH.php +++ b/src/data/PhoneNumberMetadata_GH.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:2(?:[0346-9]\\d|5[67])|5(?:[04-7]\\d|9[1-9]))\\d{6}', + 'NationalNumberPattern' => '(?:2(?:[0346-9]\\d|5[67])|5(?:[03-7]\\d|9[1-9]))\\d{6}', 'ExampleNumber' => '231234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_HT.php b/src/data/PhoneNumberMetadata_HT.php index c43664205..473d11e11 100644 --- a/src/data/PhoneNumberMetadata_HT.php +++ b/src/data/PhoneNumberMetadata_HT.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[2-489]\\d{7}', + 'NationalNumberPattern' => '(?:[2-489]\\d|55)\\d{6}', 'PossibleLength' => array ( 0 => 8, @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '[34]\\d{7}', + 'NationalNumberPattern' => '(?:[34]\\d|55)\\d{6}', 'ExampleNumber' => '34101234', 'PossibleLength' => array ( @@ -149,7 +149,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2-489]', + 0 => '[2-589]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_LR.php b/src/data/PhoneNumberMetadata_LR.php index 09ee0da31..28fe9f8b7 100644 --- a/src/data/PhoneNumberMetadata_LR.php +++ b/src/data/PhoneNumberMetadata_LR.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:2|33|5\\d|77|88)\\d{7}|[4-6]\\d{6}', + 'NationalNumberPattern' => '(?:[25]\\d|33|77|88)\\d{7}|(?:2\\d|[4-6])\\d{6}', 'PossibleLength' => array ( 0 => 7, @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:(?:330|555|(?:77|88)\\d)\\d|4[67])\\d{5}|[56]\\d{6}', + 'NationalNumberPattern' => '(?:(?:(?:22|33)0|555|(?:77|88)\\d)\\d|4[67])\\d{5}|[56]\\d{6}', 'ExampleNumber' => '770123456', 'PossibleLength' => array ( @@ -181,7 +181,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[3578]', + 0 => '[23578]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_MG.php b/src/data/PhoneNumberMetadata_MG.php index 16bf363bc..297cbb64c 100644 --- a/src/data/PhoneNumberMetadata_MG.php +++ b/src/data/PhoneNumberMetadata_MG.php @@ -38,7 +38,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '3[2-489]\\d{7}', + 'NationalNumberPattern' => '3[2-47-9]\\d{7}', 'ExampleNumber' => '321234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_QA.php b/src/data/PhoneNumberMetadata_QA.php index 1b4aadffa..94e8fd622 100644 --- a/src/data/PhoneNumberMetadata_QA.php +++ b/src/data/PhoneNumberMetadata_QA.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:0080|[2-7])\\d{7}|800\\d{4}(?:\\d{2})?|2\\d{6}', + 'NationalNumberPattern' => '800\\d{4}|(?:2|800)\\d{6}|(?:0080|[3-7])\\d{7}', 'PossibleLength' => array ( 0 => 7, @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '4(?:1111|2022)\\d{3}|(?:23\\d\\d|4(?:[04]\\d\\d|14[0-6]|999))\\d{4}', + 'NationalNumberPattern' => '4(?:1111|2022)\\d{3}|4(?:[04]\\d\\d|14[0-6]|999)\\d{4}', 'ExampleNumber' => '44123456', 'PossibleLength' => array ( @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:2[89]|[35-7]\\d)\\d{6}', + 'NationalNumberPattern' => '[35-7]\\d{7}', 'ExampleNumber' => '33123456', 'PossibleLength' => array ( @@ -106,7 +106,7 @@ ), 'pager' => array ( - 'NationalNumberPattern' => '2(?:[12]\\d|61)\\d{4}', + 'NationalNumberPattern' => '2(?:1\\d|61)\\d{4}', 'ExampleNumber' => '2123456', 'PossibleLength' => array ( @@ -158,7 +158,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '2[126]|8', + 0 => '2[16]|8', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -170,7 +170,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2-7]', + 0 => '[3-7]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_SI.php b/src/data/PhoneNumberMetadata_SI.php index 26fa4c59e..17a809453 100644 --- a/src/data/PhoneNumberMetadata_SI.php +++ b/src/data/PhoneNumberMetadata_SI.php @@ -41,7 +41,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '65(?:1\\d|55|6[01]|70)\\d{4}|(?:[37][01]|4[0139]|51|6[489])\\d{6}', + 'NationalNumberPattern' => '65(?:1\\d|5[56]|6[01]|70)\\d{4}|(?:[37][01]|4[0139]|51|6[489])\\d{6}', 'ExampleNumber' => '31234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_UZ.php b/src/data/PhoneNumberMetadata_UZ.php index 22163591a..70d922e35 100644 --- a/src/data/PhoneNumberMetadata_UZ.php +++ b/src/data/PhoneNumberMetadata_UZ.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:33|55|[679]\\d|88)\\d{7}', + 'NationalNumberPattern' => '(?:33|[5-79]\\d|88)\\d{7}', 'PossibleLength' => array ( 0 => 9, @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?: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]|8\\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])|6(?:22|3[12457]|4[13-8])|9(?:22|5[1-9])))\\d{5}', + 'NationalNumberPattern' => '(?:5570|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]|8\\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])|6(?:22|3[12457]|4[13-8])|9(?:22|5[1-9])))\\d{5}', 'ExampleNumber' => '669050123', 'PossibleLength' => array ( @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:(?:33|88|9[0-57-9])\\d{3}|55(?:50[013]|90\\d)|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]))|6(?:2(?:2[1245]|4[2-4])|39\\d|41[179]|5(?:[349]\\d|5[0-2])|7(?:0[017]|[13]\\d|22|44|55|67|88))|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' => '(?:(?:33|88|9[0-57-9])\\d{3}|5(?:0\\d{3}|5(?:50[013]|90\\d))|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]))|6(?:2(?:2[1245]|4[2-4])|39\\d|41[179]|5(?:[349]\\d|5[0-2])|7(?:0[017]|[13]\\d|22|44|55|67|88))|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_FO.php b/src/data/ShortNumberMetadata_FO.php index c3b4fd7f9..75d989c65 100644 --- a/src/data/ShortNumberMetadata_FO.php +++ b/src/data/ShortNumberMetadata_FO.php @@ -26,11 +26,10 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '11[24]', + 'NationalNumberPattern' => '1(?:1[24]|81\\d)', 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -60,7 +59,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '11[248]|1(?:4[124]|71|8[7-9])\\d', + 'NationalNumberPattern' => '1(?:1[248]|819)|1(?:4[124]|71|8[7-9])\\d', 'ExampleNumber' => '112', 'PossibleLength' => array ( diff --git a/src/geocoding/data/en/251.php b/src/geocoding/data/en/251.php index e578dcda0..56d65db85 100644 --- a/src/geocoding/data/en/251.php +++ b/src/geocoding/data/en/251.php @@ -92,6 +92,7 @@ 25111645 => 'Yeka I, Addis Ababa', 25111646 => 'Yeka II, Addis Ababa', 25111647 => 'Yeka Rss III, Addis Ababa', + 25111650 => 'Addis Ababa', 25111651 => 'East Addis Ababa Zone', 25111652 => 'South Addis Ababa Zone', 25111653 => 'South-West Addis Ababa Zone',