diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index f76b458a1..7f6377c29 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.26 +v8.13.27 diff --git a/src/carrier/data/en/1.php b/src/carrier/data/en/1.php index e4d92d791..72120e622 100644 --- a/src/carrier/data/en/1.php +++ b/src/carrier/data/en/1.php @@ -485,10 +485,6 @@ 180999 => 'Tricom', 186825 => 'Digicel', 186826 => 'Digicel', - 1868266 => 'bmobile', - 1868267 => 'bmobile', - 1868268 => 'bmobile', - 1868269 => 'bmobile', 186827 => 'bmobile', 186828 => 'bmobile', 186829 => 'bmobile', diff --git a/src/carrier/data/en/358.php b/src/carrier/data/en/358.php index 1624d6d6b..3e0e94a33 100644 --- a/src/carrier/data/en/358.php +++ b/src/carrier/data/en/358.php @@ -20,6 +20,7 @@ 3584323 => 'Top Connect OU', 3584324 => 'Nord Connect SIA', 3584325 => 'NETTIA', + 3584326 => 'Lancelot', 358436 => 'DNA', 358438 => 'DNA', 35844 => 'DNA', diff --git a/src/carrier/data/en/40.php b/src/carrier/data/en/40.php index 81e473b00..9c1d105ac 100644 --- a/src/carrier/data/en/40.php +++ b/src/carrier/data/en/40.php @@ -11,7 +11,8 @@ */ return array ( - 406 => 'Vodafone', + 4062 => 'Vodafone', + 4064 => 'Orange', 407000 => 'Enigma-System', 407013 => 'Lycamobile', 407014 => 'Lycamobile', diff --git a/src/carrier/data/en/49.php b/src/carrier/data/en/49.php index f793fcc8a..4b3551f5e 100644 --- a/src/carrier/data/en/49.php +++ b/src/carrier/data/en/49.php @@ -11,6 +11,7 @@ */ return array ( + 4915019 => 'Tismi BV', 4915020 => 'Interactive digital media', 4915050 => 'NAKA AG', 4915080 => 'Easy World', @@ -22,7 +23,9 @@ 491525 => 'Vodafone', 491526 => 'Vodafone', 491529 => 'Vodafone/Truphone', - 4915555 => 'Tismi BV', + 491531 => 'Mtel', + 4915510 => 'LEBARA', + 4915511 => 'LEBARA', 491556 => '1&1 Mobilfunk', 4915630 => 'Multiconnect', 4915678 => 'Argon Networks', diff --git a/src/carrier/data/en/595.php b/src/carrier/data/en/595.php index df173a115..296878c25 100644 --- a/src/carrier/data/en/595.php +++ b/src/carrier/data/en/595.php @@ -20,5 +20,6 @@ 595984 => 'Tigo', 595985 => 'Tigo', 595986 => 'Tigo', + 595987 => 'Tigo', 59599 => 'Claro', ); diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php index db0b18812..8274ccfab 100644 --- a/src/carrier/data/en/65.php +++ b/src/carrier/data/en/65.php @@ -49,9 +49,9 @@ 65807 => 'Simba', 658070 => 'SingTel', 658071 => 'SingTel', - 658080 => 'Simba', - 658081 => 'Simba', + 65808 => 'Simba', 658083 => 'M1', + 658084 => 'SingTel', 6581 => 'StarHub', 65810 => 'M1', 65812 => 'SingTel', diff --git a/src/carrier/data/en/673.php b/src/carrier/data/en/673.php index e7f0d9580..98e80fdcb 100644 --- a/src/carrier/data/en/673.php +++ b/src/carrier/data/en/673.php @@ -16,6 +16,7 @@ 67371 => 'DSTCom', 67372 => 'DSTCom', 67373 => 'DSTCom', + 67374 => 'Imagine', 67377 => 'DSTCom', 67381 => 'Progresif Cellular', 67382 => 'Progresif Cellular', diff --git a/src/carrier/data/en/852.php b/src/carrier/data/en/852.php index 038e3dcee..06731240d 100644 --- a/src/carrier/data/en/852.php +++ b/src/carrier/data/en/852.php @@ -15,6 +15,7 @@ 852441 => 'HKT', 852444 => 'HKT', 852445 => 'HKT', + 852446 => 'Hutchison Telecom.', 852460 => 'China Unicom', 8524607 => 'Multibyte', 8524608 => 'HKT', @@ -287,6 +288,7 @@ 8527075 => 'SmarTone', 8527076 => 'China Mobile', 852708 => 'HKT', + 852709 => 'Hutchison Telecom.', 852840 => 'China Mobile', 8528480 => 'HKT', 8528481 => 'HKT', diff --git a/src/carrier/data/en/973.php b/src/carrier/data/en/973.php index f75a3fb20..c776d2f73 100644 --- a/src/carrier/data/en/973.php +++ b/src/carrier/data/en/973.php @@ -40,5 +40,7 @@ 9736674 => 'Batelco', 9736675 => 'Batelco', 9736676 => 'Batelco', + 9736678 => 'Batelco', + 9736679 => 'Batelco', 973669 => 'zain BH', ); diff --git a/src/carrier/data/en/995.php b/src/carrier/data/en/995.php index 678262b00..89f775993 100644 --- a/src/carrier/data/en/995.php +++ b/src/carrier/data/en/995.php @@ -11,9 +11,29 @@ */ return array ( - 995500 => 'Silknet', + 99550001 => 'Cellfie', + 995500050 => 'Silknet', + 995500051 => 'Silknet', + 995500052 => 'Silknet', + 995500053 => 'Silknet', + 995500054 => 'Silknet', + 995500055 => 'Cellfie', + 995500056 => 'Cellfie', + 995500057 => 'Cellfie', + 995500058 => 'Cellfie', + 995500059 => 'Cellfie', + 99550010 => 'Cellfie', + 99550011 => 'Silknet', + 9955002 => 'Silknet', + 9955003 => 'Silknet', + 9955004 => 'Silknet', 99550050 => 'MagtiCom', - 99550070 => 'MyPhone', + 99550055 => 'Silknet', + 99550070 => 'Cellfie', + 99550077 => 'Silknet', + 9955008 => 'Silknet', + 99550090 => 'Cellfie', + 99550099 => 'Silknet', 9955050 => 'Silknet', 9955055 => 'MagtiCom', 995510 => 'Silknet', @@ -55,27 +75,27 @@ 995559997 => 'DataHouse Global', 995559998 => 'DataHouse Global', 995559999 => 'DataHouse Global', - 99556 => 'Veon', + 99556 => 'Cellfie', 995570 => 'Silknet', - 995571 => 'Veon', - 995574 => 'Veon', + 995571 => 'Cellfie', + 995574 => 'Cellfie', 9955750 => 'Asanet', 9955755 => 'Silknet', 99557575 => 'Silknet', 99557577 => 'MagtiCom', 99557578 => 'MagtiCom', 995577 => 'Silknet', - 995579 => 'Veon', + 995579 => 'Cellfie', 995580 => 'Silknet', 995585 => 'MagtiCom', 995588 => 'Silknet', 995590 => 'Silknet', 995591 => 'MagtiCom', - 995592 => 'Veon', + 995592 => 'Cellfie', 995593 => 'Silknet', 995595 => 'MagtiCom', 995596 => 'MagtiCom', - 995597 => 'Veon', + 995597 => 'Cellfie', 995598 => 'MagtiCom', 995599 => 'MagtiCom', 99579 => 'MagtiCom', diff --git a/src/carrier/data/zh/852.php b/src/carrier/data/zh/852.php index cbc286dd7..891cf6a3d 100644 --- a/src/carrier/data/zh/852.php +++ b/src/carrier/data/zh/852.php @@ -15,6 +15,7 @@ 852441 => '香港移动通讯', 852444 => '香港移动通讯', 852445 => '香港移动通讯', + 852446 => '和記電話有限公司', 852460 => '中国联通', 8524607 => '', 8524608 => '香港移动通讯', @@ -251,6 +252,7 @@ 8527075 => '数码通', 8527076 => '中国移动', 852708 => '香港移动通讯', + 852709 => '和記電話有限公司', 852840 => '中国移动', 8528480 => '香港移动通讯', 8528481 => '香港移动通讯', diff --git a/src/data/PhoneNumberMetadata_AR.php b/src/data/PhoneNumberMetadata_AR.php index 8980a791c..7ed22a2df 100644 --- a/src/data/PhoneNumberMetadata_AR.php +++ b/src/data/PhoneNumberMetadata_AR.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '3888[013-9]\\d{5}|3(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:29(?: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)|657|920)|3(?:4(?:8[27]|92)|541|878))[2-7]\\d{5}|(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:[47]6|62|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]|[235][4-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]|[58][3-6])))\\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|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[145]|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' => '3888[013-9]\\d{5}|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]|[235][4-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]|[58][3-6])))\\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|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[145]|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' => array ( @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '93(?:7(?:1[15]|81)[46]|8(?:(?:21|4[16]|69|9[12])[46]|88[013-9]))\\d{5}|9(?:29(?: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)|657|920)|3(?:4(?:8[27]|92)|541|878))[2-7]\\d{5}|9(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:[47]6|62|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]|[235][4-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]|[58][3-6]))))\\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|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[145]|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)[46]|8(?:(?:21|4[16]|69|9[12])[46]|88[013-9]))\\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]|[235][4-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]|[58][3-6]))))\\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|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[145]|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' => array ( diff --git a/src/data/PhoneNumberMetadata_BH.php b/src/data/PhoneNumberMetadata_BH.php index 9c8f3bb88..6efc60946 100644 --- a/src/data/PhoneNumberMetadata_BH.php +++ b/src/data/PhoneNumberMetadata_BH.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:3(?:[0-79]\\d|8[0-57-9])\\d|6(?:3(?:00|33|6[16])|441|6(?:3[03-9]|[69]\\d|7[0-6])))\\d{4}', + 'NationalNumberPattern' => '(?:3(?:[0-79]\\d|8[0-57-9])\\d|6(?:3(?:00|33|6[16])|441|6(?:3[03-9]|[69]\\d|7[0-689])))\\d{4}', 'ExampleNumber' => '36001234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_DE.php b/src/data/PhoneNumberMetadata_DE.php index 77ab7fa45..45901a2bf 100644 --- a/src/data/PhoneNumberMetadata_DE.php +++ b/src/data/PhoneNumberMetadata_DE.php @@ -63,7 +63,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '15[0-25-9]\\d{8}|1(?:6[023]|7\\d)\\d{7,8}', + 'NationalNumberPattern' => '15(?:[0-25-9]\\d\\d|310)\\d{6}|1(?:6[023]|7\\d)\\d{7,8}', 'ExampleNumber' => '15123456789', 'PossibleLength' => array ( @@ -366,11 +366,11 @@ ), 12 => array ( - 'pattern' => '(\\d{5})(\\d{6})', + 'pattern' => '(\\d{4})(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '15[0568]', + 0 => '15[1279]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -378,11 +378,12 @@ ), 13 => array ( - 'pattern' => '(\\d{4})(\\d{7})', + 'pattern' => '(\\d{5})(\\d{6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '15[1279]', + 0 => '15[03568]', + 1 => '15(?:[0568]|31)', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_EE.php b/src/data/PhoneNumberMetadata_EE.php index 25d5e4912..e13ba88fa 100644 --- a/src/data/PhoneNumberMetadata_EE.php +++ b/src/data/PhoneNumberMetadata_EE.php @@ -39,7 +39,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[236]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:000|(?:19|[2-7]\\d)\\d)|(?:(?:[124-6]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}', + 'NationalNumberPattern' => '(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[236]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:0(?:00|4\\d)|(?:19|[2-7]\\d)\\d)|(?:(?:[124-6]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}', 'ExampleNumber' => '51234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_FI.php b/src/data/PhoneNumberMetadata_FI.php index a14c7e263..ea39a2225 100644 --- a/src/data/PhoneNumberMetadata_FI.php +++ b/src/data/PhoneNumberMetadata_FI.php @@ -32,7 +32,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1[3-79][1-8]|[235689][1-8]\\d)\\d{2,6}', + 'NationalNumberPattern' => '(?:1[3-79][1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}', 'ExampleNumber' => '131234567', 'PossibleLength' => array ( @@ -183,11 +183,11 @@ ), 1 => array ( - 'pattern' => '(\\d)(\\d{4,9})', - 'format' => '$1 $2', + 'pattern' => '(\\d{5})', + 'format' => '$1', 'leadingDigitsPatterns' => array ( - 0 => '[2568][1-8]|3(?:0[1-9]|[1-9])|9', + 0 => '20[2-59]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -211,7 +211,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[12]00|[368]|70[07-9]', + 0 => '(?:[1-3]0|[68])0|70[07-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -223,7 +223,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[1245]|7[135]', + 0 => '[14]|2[09]|50|7[135]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -241,16 +241,28 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), + 6 => + array ( + 'pattern' => '(\\d)(\\d{4,9})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), ), 'intlNumberFormat' => array ( 0 => array ( - 'pattern' => '(\\d)(\\d{4,9})', - 'format' => '$1 $2', + 'pattern' => '(\\d{5})', + 'format' => '$1', 'leadingDigitsPatterns' => array ( - 0 => '[2568][1-8]|3(?:0[1-9]|[1-9])|9', + 0 => '20[2-59]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -262,7 +274,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[12]00|[368]|70[07-9]', + 0 => '(?:[1-3]0|[68])0|70[07-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -274,7 +286,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[1245]|7[135]', + 0 => '[14]|2[09]|50|7[135]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -292,6 +304,18 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), + 4 => + array ( + 'pattern' => '(\\d)(\\d{4,9})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), ), 'mainCountryForCode' => true, 'leadingDigits' => '1[03-79]|[2-9]', diff --git a/src/data/PhoneNumberMetadata_GE.php b/src/data/PhoneNumberMetadata_GE.php index 35ced050f..3b8e86301 100644 --- a/src/data/PhoneNumberMetadata_GE.php +++ b/src/data/PhoneNumberMetadata_GE.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:00(?:0\\d|11|22|33|44|5[05]|77|88|99)|1(?:1(?:00|[124]\\d|3[01])|4\\d\\d)|(?:44|68)\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[89]|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:070|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}', + 'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:00(?:0\\d|11|22|33|44|5[05]|77|88|9[09])|1(?:1(?:00|[124]\\d|3[01])|4\\d\\d)|(?:44|68)\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[89]|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|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}', 'ExampleNumber' => '555123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php index 7b039aaa2..062eefa4b 100644 --- a/src/data/PhoneNumberMetadata_HK.php +++ b/src/data/PhoneNumberMetadata_HK.php @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:4(?:44[5-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-6]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[015]|6[02357-9])|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])|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', + 'NationalNumberPattern' => '(?:4(?:44[5-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-6]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0156]|6[02357-9])|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])|709|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', 'ExampleNumber' => '51234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_PY.php b/src/data/PhoneNumberMetadata_PY.php index 609719056..f85996ebd 100644 --- a/src/data/PhoneNumberMetadata_PY.php +++ b/src/data/PhoneNumberMetadata_PY.php @@ -47,7 +47,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '9(?:51|6[129]|[78][1-6]|9[1-5])\\d{6}', + 'NationalNumberPattern' => '9(?:51|6[129]|7[1-6]|8[1-7]|9[1-5])\\d{6}', 'ExampleNumber' => '961456789', 'PossibleLength' => array ( @@ -232,7 +232,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '9(?:[5-79]|8[1-6])', + 0 => '9(?:[5-79]|8[1-7])', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_RO.php b/src/data/PhoneNumberMetadata_RO.php index b56b55ec8..e25af3545 100644 --- a/src/data/PhoneNumberMetadata_RO.php +++ b/src/data/PhoneNumberMetadata_RO.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:[2378]\\d|62|90)\\d{7}|[23]\\d{5}', + 'NationalNumberPattern' => '(?:[236-8]\\d|90)\\d{7}|[23]\\d{5}', 'PossibleLength' => array ( 0 => 6, @@ -37,7 +37,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7020\\d{5}|(?:62\\d|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', + 'NationalNumberPattern' => '7020\\d{5}|(?:6(?:2\\d|40)|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_SG.php b/src/data/PhoneNumberMetadata_SG.php index f0666a859..4e48f5888 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -39,7 +39,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '8(?:08[013]|95[0-2])\\d{4}|(?:8(?:0[1-7]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', + 'NationalNumberPattern' => '8(?:08[013-9]|95[0-2])\\d{4}|(?:8(?:0[1-7]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', 'ExampleNumber' => '81234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php index 14048c397..e6b482e57 100644 --- a/src/data/PhoneNumberMetadata_US.php +++ b/src/data/PhoneNumberMetadata_US.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:4722|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', + 'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:472[24]|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', 'ExampleNumber' => '2015550123', 'PossibleLength' => array ( @@ -38,7 +38,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:4722|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', + 'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:472[24]|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', 'ExampleNumber' => '2015550123', 'PossibleLength' => array ( diff --git a/src/geocoding/data/en/358.php b/src/geocoding/data/en/358.php index d896a98ab..9e832c2ab 100644 --- a/src/geocoding/data/en/358.php +++ b/src/geocoding/data/en/358.php @@ -58,4 +58,5 @@ 35887 => 'Oulu', 35888 => 'Oulu', 3589 => 'Helsinki', + 35890 => 'Uusimaa', ); diff --git a/src/geocoding/data/en/54.php b/src/geocoding/data/en/54.php index 244f3612c..46688fa00 100644 --- a/src/geocoding/data/en/54.php +++ b/src/geocoding/data/en/54.php @@ -315,13 +315,7 @@ 543868 => 'Cafayate, Salta', 543869 => 'Ranchillos y San Miguel, Tucumán', 543872 => 'Salta, Salta', - 5438730 => 'Tartagal, Salta', - 5438731 => 'Tartagal, Salta', - 5438732 => 'Tartagal, Salta', - 5438733 => 'Tartagal, Salta', - 5438734 => 'Tartagal, Salta', - 5438735 => 'Tartagal, Salta', - 5438736 => 'Tartagal, Salta', + 543873 => 'Tartagal, Salta', 543874 => 'Salta, Salta', 543875 => 'Salta, Salta', 543876 => 'San José de Metán, Salta', diff --git a/src/geocoding/data/fi/358.php b/src/geocoding/data/fi/358.php index 3b8b28c16..aa72d9ce5 100644 --- a/src/geocoding/data/fi/358.php +++ b/src/geocoding/data/fi/358.php @@ -58,4 +58,5 @@ 35887 => 'Oulu', 35888 => 'Oulu', 3589 => 'Helsinki', + 35890 => 'Uusimaa', ); diff --git a/src/geocoding/data/sv/358.php b/src/geocoding/data/sv/358.php index 0d55f7799..1f9e2414e 100644 --- a/src/geocoding/data/sv/358.php +++ b/src/geocoding/data/sv/358.php @@ -58,4 +58,5 @@ 35887 => 'Uleåborg', 35888 => 'Uleåborg', 3589 => 'Helsingfors', + 35890 => 'Nyland', ); diff --git a/src/timezone/data/map_data.php b/src/timezone/data/map_data.php index 332b9e2b7..784fb2a90 100644 --- a/src/timezone/data/map_data.php +++ b/src/timezone/data/map_data.php @@ -2156,26 +2156,23 @@ 356 => 'Europe/Malta', 357 => 'Asia/Nicosia', 358 => 'Europe/Helsinki&Europe/Mariehamn', - 35813 => 'Europe/Helsinki', - 35814 => 'Europe/Helsinki', - 35815 => 'Europe/Helsinki', - 35816 => 'Europe/Helsinki', - 35817 => 'Europe/Helsinki', + 3581 => 'Europe/Helsinki', + 35810 => 'Europe/Helsinki&Europe/Mariehamn', 35818 => 'Europe/Mariehamn', - 35819 => 'Europe/Helsinki', 3582 => 'Europe/Helsinki', + 35820 => 'Europe/Helsinki&Europe/Mariehamn', + 35829 => 'Europe/Helsinki&Europe/Mariehamn', 3583 => 'Europe/Helsinki', + 35830 => 'Europe/Helsinki&Europe/Mariehamn', + 35839 => 'Europe/Helsinki&Europe/Mariehamn', + 3584 => 'Europe/Helsinki&Europe/Mariehamn', 3585 => 'Europe/Helsinki', + 35850 => 'Europe/Helsinki&Europe/Mariehamn', 3586 => 'Europe/Helsinki', - 358701 => 'Europe/Helsinki&Europe/Mariehamn', - 358702 => 'Europe/Helsinki&Europe/Mariehamn', - 358703 => 'Europe/Helsinki&Europe/Mariehamn', - 358704 => 'Europe/Helsinki&Europe/Mariehamn', - 358705 => 'Europe/Helsinki&Europe/Mariehamn', - 358707 => 'Europe/Helsinki&Europe/Mariehamn', - 358708 => 'Europe/Helsinki&Europe/Mariehamn', - 358709 => 'Europe/Helsinki&Europe/Mariehamn', + 35860 => 'Europe/Helsinki&Europe/Mariehamn', + 3587 => 'Europe/Helsinki&Europe/Mariehamn', 3588 => 'Europe/Helsinki', + 35880 => 'Europe/Helsinki&Europe/Mariehamn', 3589 => 'Europe/Helsinki', 359 => 'Europe/Sofia', 36 => 'Europe/Budapest',