From a3a908c26b917c38fbf90957408fad2334c2a717 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Wed, 3 Jun 2020 09:39:00 +0100 Subject: [PATCH] Upstream metadata changes from Google for v8.12.5 - Updated phone metadata for region code(s): ES, GB, GG, JE, KR, RE, TJ, UZ - Updated geocoding data for country calling code(s): 81 (en) - Updated carrier data for country calling code(s): 34 (en), 82 (en, ko), 262 (en), 992 (en), 998 (en) --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/262.php | 1 + src/carrier/data/en/34.php | 2 ++ src/carrier/data/en/82.php | 7 ++++++- src/carrier/data/en/992.php | 3 ++- src/carrier/data/en/998.php | 1 + src/carrier/data/ko/82.php | 7 ++++++- src/data/PhoneNumberMetadata_ES.php | 4 ++-- src/data/PhoneNumberMetadata_GB.php | 2 +- src/data/PhoneNumberMetadata_GG.php | 2 +- src/data/PhoneNumberMetadata_JE.php | 2 +- src/data/PhoneNumberMetadata_KR.php | 2 +- src/data/PhoneNumberMetadata_RE.php | 2 +- src/data/PhoneNumberMetadata_TJ.php | 7 ++++--- src/data/PhoneNumberMetadata_UZ.php | 6 +++--- src/geocoding/data/en/81.php | 2 +- 16 files changed, 34 insertions(+), 18 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 60bfff895..28f1bd2c9 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.12.4 +v8.12.5 diff --git a/src/carrier/data/en/262.php b/src/carrier/data/en/262.php index e0e8be430..c445f7fad 100644 --- a/src/carrier/data/en/262.php +++ b/src/carrier/data/en/262.php @@ -90,6 +90,7 @@ 26269360 => 'Only', 26269361 => 'ZEOP Mobile', 26269362 => 'ZEOP Mobile', + 26269363 => 'ZEOP Mobile', 26269366 => 'Orange', 26269370 => 'Only', 26269371 => 'Only', diff --git a/src/carrier/data/en/34.php b/src/carrier/data/en/34.php index a4ad6cdec..8506ab2eb 100644 --- a/src/carrier/data/en/34.php +++ b/src/carrier/data/en/34.php @@ -11,6 +11,8 @@ */ return array ( + 345901 => 'Movistar', + 345906 => 'Vodafone', 34600 => 'Vodafone', 34601 => 'Vodafone', 346016 => 'Orange', diff --git a/src/carrier/data/en/82.php b/src/carrier/data/en/82.php index e93751152..4582b6443 100644 --- a/src/carrier/data/en/82.php +++ b/src/carrier/data/en/82.php @@ -44,7 +44,12 @@ 821056 => 'LG U+', 821057 => 'LG U+', 821058 => 'LG U+', - 821059 => 'SKTellink', + 8210590 => 'SKTellink', + 8210591 => 'SKTellink', + 8210592 => 'SKTellink', + 8210593 => 'SKTellink', + 8210594 => 'SKTellink', + 8210595 => 'SKTellink', 821062 => 'SKTellink', 821063 => 'SKTellink', 821064 => 'SKTellink', diff --git a/src/carrier/data/en/992.php b/src/carrier/data/en/992.php index d2982c68f..0378b5b22 100644 --- a/src/carrier/data/en/992.php +++ b/src/carrier/data/en/992.php @@ -13,11 +13,12 @@ return array ( 9920 => 'Megafon', 9921 => 'Tcell', + 99240 => 'Tacom', 99241 => 'Megafon', 99250 => 'Tcell', 99255 => 'Megafon', 9927 => 'Tcell', - 9928 => 'Megafon', + 99288 => 'Megafon', 99290 => 'Megafon', 992911 => 'Tacom', 992915 => 'Tacom', diff --git a/src/carrier/data/en/998.php b/src/carrier/data/en/998.php index 68b3fe228..9773f01a0 100644 --- a/src/carrier/data/en/998.php +++ b/src/carrier/data/en/998.php @@ -11,6 +11,7 @@ */ return array ( + 9985 => 'Uzbektelecom', 99861220 => 'MTS', 99861221 => 'MTS', 9986129 => 'MTS', diff --git a/src/carrier/data/ko/82.php b/src/carrier/data/ko/82.php index 5b5badc01..0158e914f 100644 --- a/src/carrier/data/ko/82.php +++ b/src/carrier/data/ko/82.php @@ -34,7 +34,12 @@ 821056 => '데이콤', 821057 => '데이콤', 821058 => '데이콤', - 821059 => 'SK 텔링크', + 8210590 => 'SK 텔링크', + 8210591 => 'SK 텔링크', + 8210592 => 'SK 텔링크', + 8210593 => 'SK 텔링크', + 8210594 => 'SK 텔링크', + 8210595 => 'SK 텔링크', 821062 => 'SK 텔링크', 821063 => 'SK 텔링크', 821064 => 'SK 텔링크', diff --git a/src/data/PhoneNumberMetadata_ES.php b/src/data/PhoneNumberMetadata_ES.php index fa3043759..7056476e8 100644 --- a/src/data/PhoneNumberMetadata_ES.php +++ b/src/data/PhoneNumberMetadata_ES.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:51|[6-9]\\d)\\d{7}', + 'NationalNumberPattern' => '[5-9]\\d{8}', 'PossibleLength' => array ( 0 => 9, @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '9(?:6906(?:09|10)|7390\\d\\d)\\d\\d|(?:6\\d|7[1-48])\\d{7}', + 'NationalNumberPattern' => '(?:590[16]00\\d|9(?:6906(?:09|10)|7390\\d\\d))\\d\\d|(?:6\\d|7[1-48])\\d{7}', 'ExampleNumber' => '612345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GB.php b/src/data/PhoneNumberMetadata_GB.php index 5c7fa90f4..5d57bbbf5 100644 --- a/src/data/PhoneNumberMetadata_GB.php +++ b/src/data/PhoneNumberMetadata_GB.php @@ -119,7 +119,7 @@ ), 'pager' => array ( - 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|34|4[01347]|5[49]|6[0-369]|77|81|9[39])\\d{6}', + 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|34|4[01347]|5[49]|6[0-369]|77|81|9[139])\\d{6}', 'ExampleNumber' => '7640123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GG.php b/src/data/PhoneNumberMetadata_GG.php index 5fbf24c32..06c7fb61a 100644 --- a/src/data/PhoneNumberMetadata_GG.php +++ b/src/data/PhoneNumberMetadata_GG.php @@ -111,7 +111,7 @@ ), 'pager' => array ( - 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|34|4[01347]|5[49]|6[0-369]|77|81|9[39])\\d{6}', + 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|34|4[01347]|5[49]|6[0-369]|77|81|9[139])\\d{6}', 'ExampleNumber' => '7640123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_JE.php b/src/data/PhoneNumberMetadata_JE.php index 0154885e8..0cf756020 100644 --- a/src/data/PhoneNumberMetadata_JE.php +++ b/src/data/PhoneNumberMetadata_JE.php @@ -103,7 +103,7 @@ ), 'pager' => array ( - 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|34|4[01347]|5[49]|6[0-369]|77|81|9[39])\\d{6}', + 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|34|4[01347]|5[49]|6[0-369]|77|81|9[139])\\d{6}', 'ExampleNumber' => '7640123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_KR.php b/src/data/PhoneNumberMetadata_KR.php index 84b9fc305..b268fd97b 100644 --- a/src/data/PhoneNumberMetadata_KR.php +++ b/src/data/PhoneNumberMetadata_KR.php @@ -55,7 +55,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '1(?:05(?:[0-8]\\d|9[0-5])|22[13]\\d)\\d{4,5}|1(?:0[1-46-9]|[16-9]\\d|2[013-9])\\d{6,7}', + 'NationalNumberPattern' => '1(?:05(?:[0-8]\\d|9[0-6])|22[13]\\d)\\d{4,5}|1(?:0[1-46-9]|[16-9]\\d|2[013-9])\\d{6,7}', 'ExampleNumber' => '1020000000', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_RE.php b/src/data/PhoneNumberMetadata_RE.php index c32d2f821..c85899ee6 100644 --- a/src/data/PhoneNumberMetadata_RE.php +++ b/src/data/PhoneNumberMetadata_RE.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:69(?:2\\d\\d|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[05]|6[0-26]|7[0-27]|8[0-8]|9[0-479]))|9769\\d)\\d{4}', + 'NationalNumberPattern' => '(?:69(?:2\\d\\d|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[05]|6[0-36]|7[0-27]|8[0-8]|9[0-479]))|9769\\d)\\d{4}', 'ExampleNumber' => '692123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php index 8dce65c17..95d73d755 100644 --- a/src/data/PhoneNumberMetadata_TJ.php +++ b/src/data/PhoneNumberMetadata_TJ.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:00|11|[3-579]\\d|88)\\d{7}', + 'NationalNumberPattern' => '(?:00|11|[3-57-9]\\d)\\d{7}', 'PossibleLength' => array ( 0 => 9, @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '41[18]\\d{6}|(?:00|11|5[05]|7[07]|88|9\\d)\\d{7}', + 'NationalNumberPattern' => '41[18]\\d{6}|(?:[04]0|11|5[05]|7[07]|88|9\\d)\\d{7}', 'ExampleNumber' => '917123456', 'PossibleLength' => array ( @@ -55,9 +55,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '800\\d{6}', + 'ExampleNumber' => '800123456', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/PhoneNumberMetadata_UZ.php b/src/data/PhoneNumberMetadata_UZ.php index 3ae0aea10..2c40e706f 100644 --- a/src/data/PhoneNumberMetadata_UZ.php +++ b/src/data/PhoneNumberMetadata_UZ.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:[679]\\d|88)\\d{7}', + 'NationalNumberPattern' => '55501\\d{4}|(?:[679]\\d|88)\\d{7}', 'PossibleLength' => array ( 0 => 9, @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?: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])))|(?:88|9[0-57-9])\\d{3})\\d{4}', + 'NationalNumberPattern' => '(?:55501|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])))|(?:88|9[0-57-9])\\d{3})\\d{4}', 'ExampleNumber' => '912345678', 'PossibleLength' => array ( @@ -150,7 +150,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '[6-9]', + 0 => '[5-9]', ), 'nationalPrefixFormattingRule' => '8 $1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/geocoding/data/en/81.php b/src/geocoding/data/en/81.php index 6efb7e4c4..da1269966 100644 --- a/src/geocoding/data/en/81.php +++ b/src/geocoding/data/en/81.php @@ -1121,7 +1121,7 @@ 819556 => 'Karatsu, Saga', 819557 => 'Karatsu, Saga', 819558 => 'Karatsu, Saga', - 81956 => 'Sasebo, Japan', + 81956 => 'Sasebo, Nagasaki', 819572 => 'Isahaya, Nagasaki', 819573 => 'Isahaya, Nagasaki', 819574 => 'Isahaya, Nagasaki',