From b855ec0b3476724853477fe04ef80957f5116e50 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Mon, 18 Nov 2024 09:57:50 +0000 Subject: [PATCH] Upstream metadata changes from Google for v8.13.50 - Updated phone metadata for region code(s): AR, BJ, BL, FI, GE, GP, HR, MF, PL, SG - Updated short number metadata for region code(s): BJ, FI - Updated carrier data for country calling code(s): 48 (en), 65 (en), 229 (en), 385 (en), 590 (en), 995 (en) --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/229.php | 29 ++++ src/carrier/data/en/385.php | 1 + src/carrier/data/en/48.php | 15 +- src/carrier/data/en/590.php | 5 + src/carrier/data/en/65.php | 7 +- src/carrier/data/en/995.php | 2 + src/data/PhoneNumberMetadata_AR.php | 4 +- src/data/PhoneNumberMetadata_BJ.php | 31 +++- src/data/PhoneNumberMetadata_BL.php | 4 +- src/data/PhoneNumberMetadata_FI.php | 6 +- src/data/PhoneNumberMetadata_GE.php | 2 +- src/data/PhoneNumberMetadata_GP.php | 6 +- src/data/PhoneNumberMetadata_HR.php | 2 +- src/data/PhoneNumberMetadata_MF.php | 4 +- src/data/PhoneNumberMetadata_PL.php | 2 +- src/data/PhoneNumberMetadata_SG.php | 2 +- src/data/ShortNumberMetadata_BJ.php | 12 +- src/data/ShortNumberMetadata_FI.php | 4 +- src/geocoding/data/Map.php | 251 ++++++++++++++-------------- src/geocoding/data/en/372.php | 32 ---- 21 files changed, 221 insertions(+), 202 deletions(-) delete mode 100644 src/geocoding/data/en/372.php diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 7e11cf02..566d579c 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.49 +v8.13.50 diff --git a/src/carrier/data/en/229.php b/src/carrier/data/en/229.php index 9568b669..580658a6 100644 --- a/src/carrier/data/en/229.php +++ b/src/carrier/data/en/229.php @@ -11,6 +11,35 @@ */ return [ + 2290140 => 'SBIN', + 2290141 => 'SBIN', + 2290142 => 'MTN', + 2290143 => 'SBIN', + 2290144 => 'SBIN', + 2290145 => 'Moov', + 2290146 => 'MTN', + 2290147 => 'SBIN', + 229015 => 'MTN', + 2290155 => 'Moov', + 2290158 => 'Moov', + 2290160 => 'Moov', + 2290161 => 'MTN', + 2290162 => 'MTN', + 2290163 => 'Moov', + 2290164 => 'Moov', + 2290165 => 'Moov', + 2290166 => 'MTN', + 2290167 => 'MTN', + 2290168 => 'Moov', + 2290169 => 'MTN', + 2290190 => 'MTN', + 2290191 => 'MTN', + 2290194 => 'Moov', + 2290195 => 'Moov', + 2290196 => 'MTN', + 2290197 => 'MTN', + 2290198 => 'Moov', + 2290199 => 'Moov', 2294 => 'Celtiis', 22942 => 'MTN', 22946 => 'MTN', diff --git a/src/carrier/data/en/385.php b/src/carrier/data/en/385.php index 4a85f4cd..c4b166d0 100644 --- a/src/carrier/data/en/385.php +++ b/src/carrier/data/en/385.php @@ -24,6 +24,7 @@ 38597595 => 'YATECO', 38597596 => 'Altavox', 38597597 => 'INNOVAC', + 38597599 => 'Digicom', 385976 => 'Hrvatski Telekom', 385977 => 'Hrvatski Telekom', 385979 => 'Hrvatski Telekom', diff --git a/src/carrier/data/en/48.php b/src/carrier/data/en/48.php index 33adc595..e622ee64 100644 --- a/src/carrier/data/en/48.php +++ b/src/carrier/data/en/48.php @@ -26,6 +26,7 @@ 482114 => 'Plus', 482115 => 'Plus', 48212 => 'Orange', + 48213 => 'Plus', 48450 => 'Play', 48454 => 'Orange', 484590 => 'Play', @@ -107,8 +108,8 @@ 4857975 => 'UPC Polska', 4857976 => 'TELENABLER', 4857977 => 'IM Consulting Izabela', - 4857978 => 'EZ PHONE MOBILE', - 4857979 => 'EZ PHONE MOBILE', + 4857978 => 'Plus', + 4857979 => 'Plus', 485798 => 'Play', 485799 => 'Play', 48600 => 'T-Mobile', @@ -242,16 +243,9 @@ 48783 => 'Plus', 48784 => 'T-Mobile', 48785 => 'Plus', - 4878600 => 'JMDI', - 4878601 => 'Plus', - 4878602 => 'Plus', - 4878603 => 'Plus', - 4878604 => 'Plus', - 4878605 => 'Plus', - 4878606 => 'Plus', + 487860 => 'Plus', 4878607 => 'Play', 4878608 => 'Play', - 4878609 => 'Plus', 487861 => 'Play', 487862 => 'Play', 487863 => 'Orange', @@ -311,6 +305,7 @@ 4888444 => 'CARITAS', 4888446 => 'Plus', 4888447 => 'Plus', + 4888448 => 'Plus', 4888449 => 'Plus', 488845 => 'Plus', 488846 => 'Play', diff --git a/src/carrier/data/en/590.php b/src/carrier/data/en/590.php index b6cf87f0..9bfdd51f 100644 --- a/src/carrier/data/en/590.php +++ b/src/carrier/data/en/590.php @@ -65,4 +65,9 @@ 59069135 => 'Orange', 590694 => 'Digicel', 590696 => 'Digicel', + 59070900 => 'Free Caraïbe', + 59070901 => 'Outremer Telecom', + 59070902 => 'Digicel', + 59070903 => 'Orange', + 59070904 => 'Dauphin Telecom', ]; diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php index 39bb9134..6f03816c 100644 --- a/src/carrier/data/en/65.php +++ b/src/carrier/data/en/65.php @@ -60,6 +60,7 @@ 658094 => 'M1', 658095 => 'SingTel', 658096 => 'Simba', + 658097 => 'CUniq', 658098 => 'Simba', 658099 => 'SingTel', 6581 => 'StarHub', @@ -391,7 +392,11 @@ 658950 => 'M1', 658951 => 'M1', 658952 => 'M1', - 65896 => 'Simba', + 658960 => 'Simba', + 658961 => 'Simba', + 658962 => 'Simba', + 658963 => 'SingTel', + 658964 => 'SingTel', 659001 => 'StarHub', 659002 => 'StarHub', 659003 => 'StarHub', diff --git a/src/carrier/data/en/995.php b/src/carrier/data/en/995.php index 4e0ad3a0..0af262b9 100644 --- a/src/carrier/data/en/995.php +++ b/src/carrier/data/en/995.php @@ -80,6 +80,8 @@ 995551 => 'MagtiCom', 9955520 => 'Premium Net International SRL', 9955522 => 'Asanet', + 995553 => 'Silknet', + 995554 => 'Silknet', 995555 => 'Silknet', 995557 => 'Silknet', 995558 => 'Silknet', diff --git a/src/data/PhoneNumberMetadata_AR.php b/src/data/PhoneNumberMetadata_AR.php index 9a891be2..a858f072 100644 --- a/src/data/PhoneNumberMetadata_AR.php +++ b/src/data/PhoneNumberMetadata_AR.php @@ -20,7 +20,7 @@ ], ], 'fixedLine' => [ - 'NationalNumberPattern' => '3(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:(?:11[1-8]|670)\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[25][4-6]|3[3-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|5[3-6]|8[3-68])))\\d{6}|2(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|35|5[17])))[3-6]\\d{5}|(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[14]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', + 'NationalNumberPattern' => '3(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:(?:11[1-8]|670)\\d|2(?:21[2-6]|(?:3[06]|49)4|6(?:04|1[2-8])|9[17][4-6])|3(?:(?:36|64)4|4(?:1[2-8]|[25][4-6]|84)|5(?:1[2-9]|[38][4-6])|8(?:[17][2-6]|3[4-6]|8[3-68])))\\d{6}|(?:2(?:23|64|99)|3(?:43|85))[3-6]\\d{6}|(?:2(?:657|9(?:54|66))|3(?:487|7(?:55|77)|865))[2-8]\\d{5}|(?:2(?:[28]0|37|6[36]|9[48])|3(?:62|7[069]|80))[45]\\d{6}|(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|47[35]|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|(?:2(?:2(?:62|81)|320|622|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:2(?:284|3(?:02|23)|477|920)|3(?:4(?:46|[89]2)|541|878))[2-7]\\d{5}|2(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|(?:2(?:257|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|35|5[17])))[3-6]\\d{5}|(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[14]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', 'ExampleNumber' => '1123456789', 'PossibleLength' => [ 10, @@ -32,7 +32,7 @@ ], ], 'mobile' => [ - 'NationalNumberPattern' => '93(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|9(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|9(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|9(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|9(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:675\\d|9(?:11[1-8]\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[25][4-6]|3[3-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|5[3-6]|8[3-68]))))\\d{6}|92(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|9(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|35|5[17])))[3-6]\\d{5}|9(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[14]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', + 'NationalNumberPattern' => '93(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:675\\d|9(?:11[1-8]\\d|2(?:21[2-6]|(?:3[06]|49)4|6(?:04|1[2-8])|9[17][4-6])|3(?:(?:36|64)4|4(?:1[2-8]|[25][4-6]|84)|5(?:1[2-9]|[38][4-6])|8(?:[17][2-6]|3[4-6]|8[3-68]))))\\d{6}|9(?:2(?:23|64|99)|3(?:43|85))[3-6]\\d{6}|9(?:2(?:657|9(?:54|66))|3(?:487|7(?:55|77)|865))[2-8]\\d{5}|9(?:2(?:[28]0|37|6[36]|9[48])|3(?:62|7[069]|80))[45]\\d{6}|9(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|47[35]|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|9(?:2(?:2(?:62|81)|320|622|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|9(?:2(?:284|3(?:02|23)|477|920)|3(?:4(?:46|[89]2)|541|878))[2-7]\\d{5}|92(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|9(?:2(?:257|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|35|5[17])))[3-6]\\d{5}|9(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[14]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', 'ExampleNumber' => '91123456789', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [ diff --git a/src/data/PhoneNumberMetadata_BJ.php b/src/data/PhoneNumberMetadata_BJ.php index c3bc6fe3..2013ffbe 100644 --- a/src/data/PhoneNumberMetadata_BJ.php +++ b/src/data/PhoneNumberMetadata_BJ.php @@ -8,21 +8,22 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '[24-689]\\d{7}', + 'NationalNumberPattern' => '(?:01\\d|[24-689])\\d{7}', 'PossibleLength' => [ 8, + 10, ], 'PossibleLengthLocalOnly' => [], ], 'fixedLine' => [ - 'NationalNumberPattern' => '2090\\d{4}|2(?:02|1[037]|2[45]|3[68]|4\\d)\\d{5}', - 'ExampleNumber' => '20211234', + 'NationalNumberPattern' => '2090\\d{4}|(?:012\\d\\d|2(?:02|1[037]|2[45]|3[68]|4\\d))\\d{5}', + 'ExampleNumber' => '0120211234', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '(?:4[0-8]|[56]\\d|9[013-9])\\d{6}', - 'ExampleNumber' => '90011234', + 'NationalNumberPattern' => '(?:01(?:2[5-9]|[4-69]\\d)|4[0-8]|[56]\\d|9[013-9])\\d{6}', + 'ExampleNumber' => '0195123456', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], @@ -53,7 +54,9 @@ 'voip' => [ 'NationalNumberPattern' => '857[58]\\d{4}', 'ExampleNumber' => '85751234', - 'PossibleLength' => [], + 'PossibleLength' => [ + 8, + ], 'PossibleLengthLocalOnly' => [], ], 'pager' => [ @@ -65,7 +68,9 @@ 'uan' => [ 'NationalNumberPattern' => '81\\d{6}', 'ExampleNumber' => '81123456', - 'PossibleLength' => [], + 'PossibleLength' => [ + 8, + ], 'PossibleLengthLocalOnly' => [], ], 'voicemail' => [ @@ -95,8 +100,18 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ], + [ + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4 $5', + 'leadingDigitsPatterns' => [ + '0', + ], + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ], ], 'intlNumberFormat' => [], 'mainCountryForCode' => false, - 'mobileNumberPortableRegion' => false, + 'mobileNumberPortableRegion' => true, ]; diff --git a/src/data/PhoneNumberMetadata_BL.php b/src/data/PhoneNumberMetadata_BL.php index d46b5852..c934682e 100644 --- a/src/data/PhoneNumberMetadata_BL.php +++ b/src/data/PhoneNumberMetadata_BL.php @@ -8,7 +8,7 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}', + 'NationalNumberPattern' => '(?:590\\d|7090)\\d{5}|(?:69|80|9\\d)\\d{7}', 'PossibleLength' => [ 9, ], @@ -21,7 +21,7 @@ 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}', + 'NationalNumberPattern' => '(?:69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))|7090[0-4])\\d{4}', 'ExampleNumber' => '690001234', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], diff --git a/src/data/PhoneNumberMetadata_FI.php b/src/data/PhoneNumberMetadata_FI.php index fa46641b..52b2bad7 100644 --- a/src/data/PhoneNumberMetadata_FI.php +++ b/src/data/PhoneNumberMetadata_FI.php @@ -22,7 +22,7 @@ 'PossibleLengthLocalOnly' => [], ], 'fixedLine' => [ - 'NationalNumberPattern' => '1[35-7][1-8]\\d{3,6}|(?:1[49][1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}', + 'NationalNumberPattern' => '1[3-7][1-8]\\d{3,6}|(?:19[1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}', 'ExampleNumber' => '131234567', 'PossibleLength' => [ 5, @@ -177,7 +177,7 @@ 'pattern' => '(\\d)(\\d{4,9})', 'format' => '$1 $2', 'leadingDigitsPatterns' => [ - '(?:1[49]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9', + '(?:19|[2568])[1-8]|3(?:0[1-9]|[1-9])|9', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -229,7 +229,7 @@ 'pattern' => '(\\d)(\\d{4,9})', 'format' => '$1 $2', 'leadingDigitsPatterns' => [ - '(?:1[49]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9', + '(?:19|[2568])[1-8]|3(?:0[1-9]|[1-9])|9', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_GE.php b/src/data/PhoneNumberMetadata_GE.php index 27c54a0f..70c88c10 100644 --- a/src/data/PhoneNumberMetadata_GE.php +++ b/src/data/PhoneNumberMetadata_GE.php @@ -27,7 +27,7 @@ ], ], 'mobile' => [ - 'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d|5[2-6]|7[0-4])|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}', + 'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d|5[2-6]|7[0-4])|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200|333|444)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}', 'ExampleNumber' => '555123456', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], diff --git a/src/data/PhoneNumberMetadata_GP.php b/src/data/PhoneNumberMetadata_GP.php index 70aa9917..45acccf6 100644 --- a/src/data/PhoneNumberMetadata_GP.php +++ b/src/data/PhoneNumberMetadata_GP.php @@ -8,7 +8,7 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}', + 'NationalNumberPattern' => '(?:590\\d|7090)\\d{5}|(?:69|80|9\\d)\\d{7}', 'PossibleLength' => [ 9, ], @@ -21,7 +21,7 @@ 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}', + 'NationalNumberPattern' => '(?:69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))|7090[0-4])\\d{4}', 'ExampleNumber' => '690001234', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], @@ -91,7 +91,7 @@ 'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => [ - '[569]', + '[5-79]', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_HR.php b/src/data/PhoneNumberMetadata_HR.php index 7776718c..53c6e207 100644 --- a/src/data/PhoneNumberMetadata_HR.php +++ b/src/data/PhoneNumberMetadata_HR.php @@ -30,7 +30,7 @@ ], ], 'mobile' => [ - 'NationalNumberPattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|55|77|9[5-7])))\\d{4}|98\\d{6}', + 'NationalNumberPattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|55|77|9[5-79])))\\d{4}|98\\d{6}', 'ExampleNumber' => '921234567', 'PossibleLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_MF.php b/src/data/PhoneNumberMetadata_MF.php index 7d07dec6..d27cc848 100644 --- a/src/data/PhoneNumberMetadata_MF.php +++ b/src/data/PhoneNumberMetadata_MF.php @@ -8,7 +8,7 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}', + 'NationalNumberPattern' => '(?:590\\d|7090)\\d{5}|(?:69|80|9\\d)\\d{7}', 'PossibleLength' => [ 9, ], @@ -21,7 +21,7 @@ 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}', + 'NationalNumberPattern' => '(?:69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))|7090[0-4])\\d{4}', 'ExampleNumber' => '690001234', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], diff --git a/src/data/PhoneNumberMetadata_PL.php b/src/data/PhoneNumberMetadata_PL.php index ada36832..e33795d1 100644 --- a/src/data/PhoneNumberMetadata_PL.php +++ b/src/data/PhoneNumberMetadata_PL.php @@ -28,7 +28,7 @@ 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '21(?:1[013-5]|2\\d)\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}', + 'NationalNumberPattern' => '21(?:1[013-5]|2\\d|3[4-9])\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}', 'ExampleNumber' => '512345678', 'PossibleLength' => [ 9, diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index 40b8da20..e15805d5 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -25,7 +25,7 @@ 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '8(?:09[0-689]|96[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-5])|9[0-8]\\d)\\d{5}', + 'NationalNumberPattern' => '896[0-4]\\d{4}|(?:8(?:0[1-9]|[1-8]\\d|9[0-5])|9[0-8]\\d)\\d{5}', 'ExampleNumber' => '81234567', 'PossibleLength' => [ 8, diff --git a/src/data/ShortNumberMetadata_BJ.php b/src/data/ShortNumberMetadata_BJ.php index 038c9784..e8fc5633 100644 --- a/src/data/ShortNumberMetadata_BJ.php +++ b/src/data/ShortNumberMetadata_BJ.php @@ -16,8 +16,8 @@ 'PossibleLengthLocalOnly' => [], ], 'tollFree' => [ - 'NationalNumberPattern' => '11[78]|7[3-5]\\d\\d', - 'ExampleNumber' => '117', + 'NationalNumberPattern' => '1(?:1[246-8]|3[68]|6[06])|7[3-5]\\d\\d', + 'ExampleNumber' => '112', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], @@ -28,16 +28,16 @@ 'PossibleLengthLocalOnly' => [], ], 'emergency' => [ - 'NationalNumberPattern' => '11[78]', - 'ExampleNumber' => '117', + 'NationalNumberPattern' => '11[246-8]', + 'ExampleNumber' => '112', 'PossibleLength' => [ 3, ], 'PossibleLengthLocalOnly' => [], ], 'shortCode' => [ - 'NationalNumberPattern' => '1(?:1[78]|2[02-5]|60)|7[0-5]\\d\\d', - 'ExampleNumber' => '117', + 'NationalNumberPattern' => '1(?:05|1[24-8]|2[02-5]|3[126-8]|5[05]|6[06]|89)|7[0-5]\\d\\d', + 'ExampleNumber' => '105', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], diff --git a/src/data/ShortNumberMetadata_FI.php b/src/data/ShortNumberMetadata_FI.php index 835fea37..8b138e16 100644 --- a/src/data/ShortNumberMetadata_FI.php +++ b/src/data/ShortNumberMetadata_FI.php @@ -40,13 +40,13 @@ 'PossibleLengthLocalOnly' => [], ], 'shortCode' => [ - 'NationalNumberPattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|(?:1[235-8]\\d|75[12])\\d\\d', + 'NationalNumberPattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|(?:1[2-8]\\d|75[12])\\d\\d', 'ExampleNumber' => '112', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], 'standardRate' => [ - 'NationalNumberPattern' => '1[235-8]\\d{3}', + 'NationalNumberPattern' => '1[2-8]\\d{3}', 'ExampleNumber' => '12000', 'PossibleLength' => [ 5, diff --git a/src/geocoding/data/Map.php b/src/geocoding/data/Map.php index 6e1e5a3a..b7b9b932 100644 --- a/src/geocoding/data/Map.php +++ b/src/geocoding/data/Map.php @@ -111,132 +111,131 @@ 67 => 359, 68 => 36, 69 => 370, - 70 => 372, - 71 => 373, - 72 => 374, - 73 => 375, - 74 => 380, - 75 => 381, - 76 => 382, - 77 => 383, - 78 => 385, - 79 => 386, - 80 => 387, - 81 => 389, - 82 => 39, - 83 => 40, - 84 => 41, - 85 => 420, - 86 => 421, - 87 => 43, - 88 => 44, - 89 => 46, - 90 => 47, - 91 => 48, - 92 => 49, - 93 => 501, - 94 => 504, - 95 => 51, - 96 => 52, - 97 => 53, - 98 => 54, - 99 => 55, - 100 => 56, - 101 => 57, - 102 => 58, - 103 => 592, - 104 => 593, - 105 => 595, - 106 => 598, - 107 => 599, - 108 => 61, - 109 => 62, - 110 => 63, - 111 => 64, - 112 => 66, - 113 => 670, - 114 => 672, - 115 => 673, - 116 => 675, - 117 => 676, - 118 => 678, - 119 => 679, - 120 => 680, - 121 => 682, - 122 => 685, - 123 => 686, - 124 => 688, - 125 => 689, - 126 => 690, - 127 => 7, - 128 => 81, - 129 => 82, - 130 => 84, - 131 => 850, - 132 => 8610, - 133 => 86130, - 134 => 86131, - 135 => 86132, - 136 => 86133, - 137 => 86134, - 138 => 86135, - 139 => 86136, - 140 => 86137, - 141 => 86138, - 142 => 86139, - 143 => 86145, - 144 => 86147, - 145 => 86150, - 146 => 86151, - 147 => 86152, - 148 => 86153, - 149 => 86155, - 150 => 86156, - 151 => 86157, - 152 => 86158, - 153 => 86159, - 154 => 86170, - 155 => 86173, - 156 => 86176, - 157 => 86177, - 158 => 86178, - 159 => 86180, - 160 => 86181, - 161 => 86182, - 162 => 86183, - 163 => 86184, - 164 => 86185, - 165 => 86186, - 166 => 86187, - 167 => 86188, - 168 => 86189, - 169 => 86, - 170 => 880, - 171 => 886, - 172 => 90, - 173 => 91, - 174 => 92, - 175 => 93, - 176 => 94, - 177 => 95, - 178 => 960, - 179 => 961, - 180 => 962, - 181 => 963, - 182 => 966, - 183 => 967, - 184 => 968, - 185 => 970, - 186 => 971, - 187 => 972, - 188 => 975, - 189 => 976, - 190 => 98, - 191 => 992, - 192 => 993, - 193 => 994, - 194 => 995, - 195 => 996, + 70 => 373, + 71 => 374, + 72 => 375, + 73 => 380, + 74 => 381, + 75 => 382, + 76 => 383, + 77 => 385, + 78 => 386, + 79 => 387, + 80 => 389, + 81 => 39, + 82 => 40, + 83 => 41, + 84 => 420, + 85 => 421, + 86 => 43, + 87 => 44, + 88 => 46, + 89 => 47, + 90 => 48, + 91 => 49, + 92 => 501, + 93 => 504, + 94 => 51, + 95 => 52, + 96 => 53, + 97 => 54, + 98 => 55, + 99 => 56, + 100 => 57, + 101 => 58, + 102 => 592, + 103 => 593, + 104 => 595, + 105 => 598, + 106 => 599, + 107 => 61, + 108 => 62, + 109 => 63, + 110 => 64, + 111 => 66, + 112 => 670, + 113 => 672, + 114 => 673, + 115 => 675, + 116 => 676, + 117 => 678, + 118 => 679, + 119 => 680, + 120 => 682, + 121 => 685, + 122 => 686, + 123 => 688, + 124 => 689, + 125 => 690, + 126 => 7, + 127 => 81, + 128 => 82, + 129 => 84, + 130 => 850, + 131 => 8610, + 132 => 86130, + 133 => 86131, + 134 => 86132, + 135 => 86133, + 136 => 86134, + 137 => 86135, + 138 => 86136, + 139 => 86137, + 140 => 86138, + 141 => 86139, + 142 => 86145, + 143 => 86147, + 144 => 86150, + 145 => 86151, + 146 => 86152, + 147 => 86153, + 148 => 86155, + 149 => 86156, + 150 => 86157, + 151 => 86158, + 152 => 86159, + 153 => 86170, + 154 => 86173, + 155 => 86176, + 156 => 86177, + 157 => 86178, + 158 => 86180, + 159 => 86181, + 160 => 86182, + 161 => 86183, + 162 => 86184, + 163 => 86185, + 164 => 86186, + 165 => 86187, + 166 => 86188, + 167 => 86189, + 168 => 86, + 169 => 880, + 170 => 886, + 171 => 90, + 172 => 91, + 173 => 92, + 174 => 93, + 175 => 94, + 176 => 95, + 177 => 960, + 178 => 961, + 179 => 962, + 180 => 963, + 181 => 966, + 182 => 967, + 183 => 968, + 184 => 970, + 185 => 971, + 186 => 972, + 187 => 975, + 188 => 976, + 189 => 98, + 190 => 992, + 191 => 993, + 192 => 994, + 193 => 995, + 194 => 996, ], 'es' => [ diff --git a/src/geocoding/data/en/372.php b/src/geocoding/data/en/372.php deleted file mode 100644 index 64157b0d..00000000 --- a/src/geocoding/data/en/372.php +++ /dev/null @@ -1,32 +0,0 @@ - 'Rakvere', - 37233 => 'Kohtla-Järve', - 37235 => 'Narva/Sillamäe', - 37238 => 'Paide', - 37243 => 'Viljandi', - 37244 => 'Pärnu', - 37245 => 'Kuressaare', - 37246 => 'Kärdla', - 37247 => 'Haapsalu', - 37248 => 'Rapla', - 3726 => 'Tallinn/Harju County', - 37273 => 'Tartu', - 37274 => 'Tartu', - 37275 => 'Tartu', - 37276 => 'Valga', - 37277 => 'Jõgeva', - 37278 => 'Võru', - 37279 => 'Põlva', -];