From 17305091e3fdfe0b94478d50ac1781210b672e62 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Thu, 6 Dec 2018 09:43:56 +0000 Subject: [PATCH] Upstream metadata changes from Google for v8.10.2 - Updated phone metadata for region code(s): 882, AE, AL, AR, BD, BR, CN, ID, IN, JM, LK, MG, MU, MX, OM, SI, UA, ZW - Updated short number metadata for region code(s): IN, MG, MX, SI - Updated geocoding data for country calling code(s): 52 (en, es), 261 (en) - Updated carrier data for country calling code(s): 66 (en), 91 (en), 386 (en), 968 (en) - Updated / refreshed time zone meta data. --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/386.php | 14 +- src/carrier/data/en/66.php | 24 +- src/carrier/data/en/91.php | 1 + src/carrier/data/en/968.php | 1 + src/data/PhoneNumberMetadata_882.php | 3 +- src/data/PhoneNumberMetadata_AE.php | 3 +- src/data/PhoneNumberMetadata_AL.php | 3 +- src/data/PhoneNumberMetadata_AR.php | 22 +- src/data/PhoneNumberMetadata_BD.php | 2 +- src/data/PhoneNumberMetadata_BR.php | 4 +- src/data/PhoneNumberMetadata_CN.php | 16 +- src/data/PhoneNumberMetadata_ID.php | 4 +- src/data/PhoneNumberMetadata_IN.php | 39 +- src/data/PhoneNumberMetadata_JM.php | 6 +- src/data/PhoneNumberMetadata_LK.php | 5 +- src/data/PhoneNumberMetadata_MG.php | 4 +- src/data/PhoneNumberMetadata_MU.php | 2 +- src/data/PhoneNumberMetadata_MX.php | 47 +- src/data/PhoneNumberMetadata_OM.php | 2 +- src/data/PhoneNumberMetadata_SI.php | 13 +- src/data/PhoneNumberMetadata_UA.php | 6 +- src/data/PhoneNumberMetadata_ZW.php | 2 +- src/data/ShortNumberMetadata_IN.php | 2 +- src/data/ShortNumberMetadata_MG.php | 11 +- src/data/ShortNumberMetadata_MX.php | 18 +- src/data/ShortNumberMetadata_SI.php | 10 +- src/geocoding/data/en/261.php | 2 - src/geocoding/data/en/52.php | 38 +- src/geocoding/data/es/52.php | 10 +- src/timezone/data/map_data.php | 683 +++------------------------ 31 files changed, 204 insertions(+), 795 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index dc8e93adc..badf77b59 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/googlei18n/libphonenumber project # # For more information, look at the phing tasks in build.xml -v8.10.1 +v8.10.2 diff --git a/src/carrier/data/en/386.php b/src/carrier/data/en/386.php index 32ee15d20..ec76721b8 100644 --- a/src/carrier/data/en/386.php +++ b/src/carrier/data/en/386.php @@ -20,13 +20,13 @@ 38651 => 'Telekom Slovenije', 38664 => 'T-2', 386651 => 'SŽ - Infrastruktura', - 3866555 => 'Telekom Slovenije', - 3866560 => 'Telekom Slovenije', - 3866570 => 'Novatel', - 386681 => 'A1', - 386686 => 'A1', - 386689 => 'A1', - 38669 => 'HoT', + 386655 => 'Telekom Slovenije', + 386656 => 'Telekom Slovenije', + 386657 => 'Novatel', + 38668 => 'A1', + 386691 => 'Compatel', + 386696 => 'HoT', + 386699 => 'HoT', 38670 => 'Telemach', 38671 => 'Telekom Slovenije', ); diff --git a/src/carrier/data/en/66.php b/src/carrier/data/en/66.php index ac00961a8..ba23388cf 100644 --- a/src/carrier/data/en/66.php +++ b/src/carrier/data/en/66.php @@ -12,6 +12,8 @@ return array ( 6661 => 'AIS', + 6662 => 'AIS', + 6663 => 'AIS', 6664 => 'Penguin SIM', 6665 => 'AIS', 6666 => 'DTAC', @@ -38,6 +40,24 @@ 6689 => 'DTAC', 6690 => 'DTAC', 66901 => 'AIS', - 66909 => 'True Move', - 6691 => 'DTAC', + 66909 => 'True Move/AIS', + 6691 => 'True Move', + 6692 => 'AIS', + 6693 => 'True Move/AIS', + 66931 => 'AIS', + 66935 => 'AIS', + 66936 => 'AIS', + 6694 => 'True Move/DTAC', + 66940 => 'True Move', + 66941 => 'True Move', + 669422 => 'True Move', + 669423 => 'True Move', + 6695 => 'True Move/DTAC/AIS', + 66956 => 'True Move', + 66958 => 'True Move', + 6696 => 'True Move', + 6697 => 'True Move/AIS', + 6698 => 'AIS', + 6699 => 'True Move/AIS', + 66995 => 'True Move', ); diff --git a/src/carrier/data/en/91.php b/src/carrier/data/en/91.php index f2c85c6ee..f8990a964 100644 --- a/src/carrier/data/en/91.php +++ b/src/carrier/data/en/91.php @@ -2605,6 +2605,7 @@ 919138 => 'Airtel', 919139 => 'Aircel', 919140 => 'Reliance Jio', + 919141 => 'BSNL MOBILE', 919144 => 'Idea', 919145 => 'Vodafone', 919146 => 'Idea', diff --git a/src/carrier/data/en/968.php b/src/carrier/data/en/968.php index aaf01f22b..60aea3adb 100644 --- a/src/carrier/data/en/968.php +++ b/src/carrier/data/en/968.php @@ -12,6 +12,7 @@ return array ( 96871 => 'Omantel', + 96872 => 'Omantel', 96879 => 'Ooredoo', 968901 => 'Omantel', 968902 => 'Omantel', diff --git a/src/data/PhoneNumberMetadata_882.php b/src/data/PhoneNumberMetadata_882.php index 49328a863..328311abb 100644 --- a/src/data/PhoneNumberMetadata_882.php +++ b/src/data/PhoneNumberMetadata_882.php @@ -40,13 +40,14 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '3(?:(?:2\\d|37)\\d\\d|4(?:2|7\\d{3}))\\d{4}', + 'NationalNumberPattern' => '3(?:(?:(?:2|7\\d{3})\\d|37)\\d\\d|4(?:2|7\\d{3}))\\d{4}', 'ExampleNumber' => '3421234', 'PossibleLength' => array ( 0 => 7, 1 => 9, 2 => 10, + 3 => 12, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/PhoneNumberMetadata_AE.php b/src/data/PhoneNumberMetadata_AE.php index 6fac2212c..9f068f32b 100644 --- a/src/data/PhoneNumberMetadata_AE.php +++ b/src/data/PhoneNumberMetadata_AE.php @@ -166,8 +166,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[68]00', - 1 => '600[25]|800', + 0 => '60|8', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_AL.php b/src/data/PhoneNumberMetadata_AL.php index 6d97b3204..dc14cc11c 100644 --- a/src/data/PhoneNumberMetadata_AL.php +++ b/src/data/PhoneNumberMetadata_AL.php @@ -166,8 +166,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '80[08]|900', - 1 => '80(?:0|8[1-9])|900[1-9]', + 0 => '80|9', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_AR.php b/src/data/PhoneNumberMetadata_AR.php index bdee6e5d2..50ce170c3 100644 --- a/src/data/PhoneNumberMetadata_AR.php +++ b/src/data/PhoneNumberMetadata_AR.php @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '675\\d{7}|9(?:11[2-9]\\d{7}|(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578]))[2-9]\\d{6}|\\d{4}[2-9]\\d{5})', + 'NationalNumberPattern' => '675\\d{7}|9(?:11[2-9]\\d{7}|(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))[2-9]\\d{6}|(?:2(?:2(?:02|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8])|47[3-578]|6(?:2[24-6]|4[6-8]|5[15-8])|9(?:0[1-3]|2\\d|3[1-6]|4[02568]|5[2-4]|6[2-46]|72|8[23]))|3(?:3(?:2[79]|8[2578])|4(?:0[0-24-9]|4[24-7]|6[02-9]|7[126]|9[1-36-8])|5(?:2[1245]|3[237]|4[1-46-9]|6[2-4]|7[1-6]|8[2-5])|7(?:1[1568]|2[15]|3[145]|4[13]|5[14-8]|7[2-57]|8[126])|8(?:2[15-7]|3[2578]|4[13-6]|5[4-8]|6[1-357-9]|9[124])))[2-9]\\d{5})', 'ExampleNumber' => '91123456789', 'PossibleLength' => array ( @@ -164,7 +164,7 @@ array ( 0 => array ( - 'pattern' => '([68]\\d{2})(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( @@ -212,7 +212,7 @@ ), 4 => array ( - 'pattern' => '(9)(11)(\\d{4})(\\d{4})', + 'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})', 'format' => '$2 15-$3-$4', 'leadingDigitsPatterns' => array ( @@ -224,7 +224,7 @@ ), 5 => array ( - 'pattern' => '(9)(\\d{3})(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})', 'format' => '$2 15-$3-$4', 'leadingDigitsPatterns' => array ( @@ -239,7 +239,7 @@ ), 6 => array ( - 'pattern' => '(9)(\\d{4})(\\d{2})(\\d{4})', + 'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})', 'format' => '$2 15-$3-$4', 'leadingDigitsPatterns' => array ( @@ -251,7 +251,7 @@ ), 7 => array ( - 'pattern' => '(11)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2-$3', 'leadingDigitsPatterns' => array ( @@ -304,7 +304,7 @@ array ( 0 => array ( - 'pattern' => '([68]\\d{2})(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( @@ -316,7 +316,7 @@ ), 1 => array ( - 'pattern' => '(9)(11)(\\d{4})(\\d{4})', + 'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2 $3-$4', 'leadingDigitsPatterns' => array ( @@ -325,7 +325,7 @@ ), 2 => array ( - 'pattern' => '(9)(\\d{3})(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3-$4', 'leadingDigitsPatterns' => array ( @@ -337,7 +337,7 @@ ), 3 => array ( - 'pattern' => '(9)(\\d{4})(\\d{2})(\\d{4})', + 'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})', 'format' => '$1 $2 $3-$4', 'leadingDigitsPatterns' => array ( @@ -346,7 +346,7 @@ ), 4 => array ( - 'pattern' => '(11)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2-$3', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_BD.php b/src/data/PhoneNumberMetadata_BD.php index 0252dc30f..92f2dde52 100644 --- a/src/data/PhoneNumberMetadata_BD.php +++ b/src/data/PhoneNumberMetadata_BD.php @@ -94,7 +94,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '96(?:0[469]|1[0-4]|3[389]|6[69]|7[78])\\d{6}', + 'NationalNumberPattern' => '96(?:0[469]|1[0-47]|3[389]|6[69]|7[78])\\d{6}', 'ExampleNumber' => '9604123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_BR.php b/src/data/PhoneNumberMetadata_BR.php index 82b6c8da9..3e1b8cd46 100644 --- a/src/data/PhoneNumberMetadata_BR.php +++ b/src/data/PhoneNumberMetadata_BR.php @@ -177,7 +177,7 @@ ), 1 => array ( - 'pattern' => '([3589]00)(\\d{2,3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{2,3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -265,7 +265,7 @@ ), 1 => array ( - 'pattern' => '([3589]00)(\\d{2,3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{2,3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_CN.php b/src/data/PhoneNumberMetadata_CN.php index ca20f2208..2c94106e6 100644 --- a/src/data/PhoneNumberMetadata_CN.php +++ b/src/data/PhoneNumberMetadata_CN.php @@ -172,7 +172,7 @@ array ( 0 => array ( - 'pattern' => '([48]00)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -236,7 +236,7 @@ ), 5 => array ( - 'pattern' => '(21)(\\d{4})(\\d{4,6})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4,6})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -248,7 +248,7 @@ ), 6 => array ( - 'pattern' => '([12]\\d)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -311,7 +311,7 @@ ), 11 => array ( - 'pattern' => '(10800)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{5})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -340,7 +340,7 @@ array ( 0 => array ( - 'pattern' => '([48]00)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -380,7 +380,7 @@ ), 3 => array ( - 'pattern' => '(21)(\\d{4})(\\d{4,6})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4,6})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -392,7 +392,7 @@ ), 4 => array ( - 'pattern' => '([12]\\d)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -455,7 +455,7 @@ ), 9 => array ( - 'pattern' => '(10800)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{5})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_ID.php b/src/data/PhoneNumberMetadata_ID.php index 060389e1b..ff6306683 100644 --- a/src/data/PhoneNumberMetadata_ID.php +++ b/src/data/PhoneNumberMetadata_ID.php @@ -188,7 +188,7 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{5,8})', + 'pattern' => '(\\d{2})(\\d{5,9})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( @@ -216,7 +216,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2-579]|6[2-5]', + 0 => '[2-79]', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_IN.php b/src/data/PhoneNumberMetadata_IN.php index ab9bee212..be79b5182 100644 --- a/src/data/PhoneNumberMetadata_IN.php +++ b/src/data/PhoneNumberMetadata_IN.php @@ -242,18 +242,6 @@ 'nationalPrefixOptionalWhenFormatting' => true, ), 6 => - array ( - 'pattern' => '(\\d{4})(\\d{2})(\\d{4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '16', - ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => true, - ), - 7 => array ( 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -265,33 +253,20 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => true, ), - 8 => + 7 => array ( 'pattern' => '(\\d{4})(\\d{2,4})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '180', - 1 => '1800', - ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => true, - ), - 9 => - array ( - 'pattern' => '(\\d{4})(\\d{3,4})(\\d{4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '186', - 1 => '1860', + 0 => '1(?:6|8[06])', + 1 => '1(?:6|8[06]0)', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => true, ), - 10 => + 8 => array ( 'pattern' => '(\\d{2})(\\d{3})(\\d{4})(\\d{3})', 'format' => '$1 $2 $3 $4', @@ -303,7 +278,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => true, ), - 11 => + 9 => array ( 'pattern' => '(\\d{4})(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3 $4', @@ -415,8 +390,8 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '180', - 1 => '1800', + 0 => '1(?:6|8[06])', + 1 => '1(?:6|8[06]0)', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_JM.php b/src/data/PhoneNumberMetadata_JM.php index 709abf7e3..fc11b7600 100644 --- a/src/data/PhoneNumberMetadata_JM.php +++ b/src/data/PhoneNumberMetadata_JM.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:[58]\\d\\d|900)\\d{7}', + 'NationalNumberPattern' => '(?:[58]\\d\\d|658|900)\\d{7}', 'PossibleLength' => array ( 0 => 10, @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '876(?:5(?:0[12]|1[0-468]|2[35]|63)|6(?:0[1-3579]|1[0237-9]|[23]\\d|40|5[06]|6[2-589]|7[05]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468]))\\d{4}', + 'NationalNumberPattern' => '(?:658[2-9]\\d\\d|876(?:5(?:0[12]|1[0-468]|2[35]|63)|6(?:0[1-3579]|1[0237-9]|[23]\\d|40|5[06]|6[2-589]|7[05]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468])))\\d{4}', 'ExampleNumber' => '8765230123', 'PossibleLength' => array ( @@ -154,7 +154,7 @@ array ( ), 'mainCountryForCode' => false, - 'leadingDigits' => '876', + 'leadingDigits' => '658|876', 'leadingZeroPossible' => false, 'mobileNumberPortableRegion' => true, ); diff --git a/src/data/PhoneNumberMetadata_LK.php b/src/data/PhoneNumberMetadata_LK.php index 5a28b2597..b7a99116c 100644 --- a/src/data/PhoneNumberMetadata_LK.php +++ b/src/data/PhoneNumberMetadata_LK.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:1[2-57]\\d|973)|(?:2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7]|[89]1)[2-57]\\d)\\d{5}', + 'NationalNumberPattern' => '(?:[189]1|2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7])[2-57]\\d{6}', 'ExampleNumber' => '112345678', 'PossibleLength' => array ( @@ -109,9 +109,10 @@ ), 'uan' => array ( + 'NationalNumberPattern' => '1973\\d{5}', + 'ExampleNumber' => '197312345', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/PhoneNumberMetadata_MG.php b/src/data/PhoneNumberMetadata_MG.php index 7757d86b3..8609b1741 100644 --- a/src/data/PhoneNumberMetadata_MG.php +++ b/src/data/PhoneNumberMetadata_MG.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '20(?:2\\d{2}|4[47]\\d|5[3467]\\d|6[279]\\d|7(?:2[29]|[35]\\d)|8[268]\\d|9[245]\\d)\\d{4}', + 'NationalNumberPattern' => '20(?:(?:2\\d|4[47]|5[3467]|6[279]|8[268]|9[245])\\d|7(?:2[29]|[35]\\d))\\d{4}', 'ExampleNumber' => '202123456', 'PossibleLength' => array ( @@ -148,7 +148,7 @@ array ( 0 => array ( - 'pattern' => '([23]\\d)(\\d{2})(\\d{3})(\\d{2})', + 'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{2})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_MU.php b/src/data/PhoneNumberMetadata_MU.php index 1e8f3e517..82d795301 100644 --- a/src/data/PhoneNumberMetadata_MU.php +++ b/src/data/PhoneNumberMetadata_MU.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2(?:[03478]\\d|1[0-7]|6[1-79])|4(?:[013568]\\d|2[4-7])|54(?:4\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}', + 'NationalNumberPattern' => '(?:2(?:[03478]\\d|1[0-7]|6[0-79])|4(?:[013568]\\d|2[4-7])|54(?:4\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}', 'ExampleNumber' => '54480123', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MX.php b/src/data/PhoneNumberMetadata_MX.php index 75264e918..bbd5cef18 100644 --- a/src/data/PhoneNumberMetadata_MX.php +++ b/src/data/PhoneNumberMetadata_MX.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:33|55|81)\\d{8}|(?:2(?:0[01]|2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-6][1-9]|[37][1-8]|8[1-35-9]|9[2-689])|5(?:88|9[1-79])|6(?:1[2-68]|[234][1-9]|5[1-3689]|6[12457-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2[1-9]|5[13-9]|8[1-69]|9[17])|8(?:2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7}', + 'NationalNumberPattern' => '(?:2(?:0[01]|2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7}', 'ExampleNumber' => '2221234567', 'PossibleLength' => array ( @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '1(?:(?:33|55|81)\\d{8}|(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-6][1-9]|[37][1-8]|8[1-35-9]|9[2-689])|5(?:88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[12457-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2[1-9]|5[13-9]|8[1-69]|9[17])|8(?:2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7})', + 'NationalNumberPattern' => '1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7}', 'ExampleNumber' => '12221234567', 'PossibleLength' => array ( @@ -153,19 +153,20 @@ 'id' => 'MX', 'countryCode' => 52, 'internationalPrefix' => '0[09]', + 'preferredInternationalPrefix' => '00', 'nationalPrefix' => '01', - 'nationalPrefixForParsing' => '0[12]|04[45](\\d{10})', + 'nationalPrefixForParsing' => '0[12]|04[45]([2-9]\\d{9})$', 'nationalPrefixTransformRule' => '1$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( 0 => array ( - 'pattern' => '([358]\\d)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '33|55|81', + 0 => '33|5[56]|81', ), 'nationalPrefixFormattingRule' => '01 $1', 'domesticCarrierCodeFormattingRule' => '', @@ -177,7 +178,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2467]|3[0-2457-9]|5[089]|8[02-9]|9[0-35-9]', + 0 => '[2-9]', ), 'nationalPrefixFormattingRule' => '01 $1', 'domesticCarrierCodeFormattingRule' => '', @@ -185,38 +186,38 @@ ), 2 => array ( - 'pattern' => '(1)([358]\\d)(\\d{4})(\\d{4})', - 'format' => '044 $2 $3 $4', + 'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})', + 'format' => '$2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '1(?:33|55|81)', + 0 => '1(?:33|5[56]|81)', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '044 $1', 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => true, + 'nationalPrefixOptionalWhenFormatting' => false, ), 3 => array ( - 'pattern' => '(1)(\\d{3})(\\d{3})(\\d{4})', - 'format' => '044 $2 $3 $4', + 'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})', + 'format' => '$2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '1(?:[2467]|3[0-2457-9]|5[089]|8[2-9]|9[1-35-9])', + 0 => '1', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '044 $1', 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => true, + 'nationalPrefixOptionalWhenFormatting' => false, ), ), 'intlNumberFormat' => array ( 0 => array ( - 'pattern' => '([358]\\d)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '33|55|81', + 0 => '33|5[56]|81', ), 'nationalPrefixFormattingRule' => '01 $1', 'domesticCarrierCodeFormattingRule' => '', @@ -228,7 +229,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2467]|3[0-2457-9]|5[089]|8[02-9]|9[0-35-9]', + 0 => '[2-9]', ), 'nationalPrefixFormattingRule' => '01 $1', 'domesticCarrierCodeFormattingRule' => '', @@ -236,20 +237,20 @@ ), 2 => array ( - 'pattern' => '(1)([358]\\d)(\\d{4})(\\d{4})', + 'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '1(?:33|55|81)', + 0 => '1(?:33|5[56]|81)', ), ), 3 => array ( - 'pattern' => '(1)(\\d{3})(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '1(?:[2467]|3[0-2457-9]|5[089]|8[2-9]|9[1-35-9])', + 0 => '1', ), ), ), diff --git a/src/data/PhoneNumberMetadata_OM.php b/src/data/PhoneNumberMetadata_OM.php index b78e099f8..7cafe34d3 100644 --- a/src/data/PhoneNumberMetadata_OM.php +++ b/src/data/PhoneNumberMetadata_OM.php @@ -39,7 +39,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:7(?:[19]\\d|22)|9(?:0[1-9]|[1-9]\\d))\\d{5}', + 'NationalNumberPattern' => '(?:7[129]\\d|9(?:0[1-9]|[1-9]\\d))\\d{5}', 'ExampleNumber' => '92123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_SI.php b/src/data/PhoneNumberMetadata_SI.php index c79247f26..082a9f11d 100644 --- a/src/data/PhoneNumberMetadata_SI.php +++ b/src/data/PhoneNumberMetadata_SI.php @@ -28,8 +28,8 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1\\d|[25][2-8]|[34][24-8]|7[3-8])\\d{6}', - 'ExampleNumber' => '11234567', + 'NationalNumberPattern' => '(?:[1-357][2-8]|4[24-8])\\d{6}', + 'ExampleNumber' => '12345678', 'PossibleLength' => array ( 0 => 8, @@ -41,7 +41,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:(?:[37][01]|4[0139]|51)\\d|6(?:[48]\\d|5[15-7]|9[69]))\\d{5}', + 'NationalNumberPattern' => '(?:(?:[37][01]|4[0139]|51)\\d\\d|6(?:[48]\\d\\d|5(?:1\\d|55|[67]0)|9(?:10|[69]\\d)))\\d{4}', 'ExampleNumber' => '31234567', 'PossibleLength' => array ( @@ -98,7 +98,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '(?:59|8[1-3])\\d{6}', + 'NationalNumberPattern' => '(?:59\\d\\d|8(?:1(?:[67]\\d|8[01389])|2(?:0\\d|2[0378]|8[0-2489])|3[389]\\d))\\d{4}', 'ExampleNumber' => '59012345', 'PossibleLength' => array ( @@ -150,7 +150,8 @@ ), 'id' => 'SI', 'countryCode' => 386, - 'internationalPrefix' => '00', + 'internationalPrefix' => '00|10(?:22|66|88|99)', + 'preferredInternationalPrefix' => '00', 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0', 'sameMobileAndFixedLinePattern' => false, @@ -174,7 +175,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '[12]|[34][24-8]|5[2-8]|7[3-8]', + 0 => '[12]|[357][2-8]|4[24-8]', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_UA.php b/src/data/PhoneNumberMetadata_UA.php index 553d233bc..0841e5fdb 100644 --- a/src/data/PhoneNumberMetadata_UA.php +++ b/src/data/PhoneNumberMetadata_UA.php @@ -172,8 +172,8 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6[0135689]|7[4-6])|6[12459]', - 1 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6(?:[015689]|3[02389])|7[4-6])|6[12459]', + 0 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6[0135689]|7[4-6])|6(?:[12][3-7]|[459])', + 1 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6(?:[015689]|3[02389])|7[4-6])|6(?:[12][3-7]|[459])', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -185,7 +185,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[35-9]|4(?:[45]|87)', + 0 => '[3-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_ZW.php b/src/data/PhoneNumberMetadata_ZW.php index 69cb63ade..7d6880c43 100644 --- a/src/data/PhoneNumberMetadata_ZW.php +++ b/src/data/PhoneNumberMetadata_ZW.php @@ -250,7 +250,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[136]|2(?:[0-256]|9[0-79])|5[0-35-9]', + 0 => '[16]|2(?:[0-256]|9[0-79])|3(?:[09][0-79]|1[0-689]|[24-6]|3[0-69])|5[0-35-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/ShortNumberMetadata_IN.php b/src/data/ShortNumberMetadata_IN.php index 0fe89da5f..e9515d89a 100644 --- a/src/data/ShortNumberMetadata_IN.php +++ b/src/data/ShortNumberMetadata_IN.php @@ -72,7 +72,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0(?:[0-248]|3[39]|5(?:010|6|[79]\\d\\d)|6[3468]|7(?:[01357]|[28]0?|4[01])|9[0135-9])|1(?:00|[289]|[67][0-2]\\d{3})|2(?:1|98)|3(?:11|2[0-2]|63|[89])|4[01]|5(?:1(?:0[0-36]|[127])|5(?:[23]\\d\\d|4))|6(?:1|6[01]?)|7000|8(?:02\\d{3}|[12])|9(?:0[013-59]|12|25|4[4-9]\\d?|50|6[1347]|[89]))|2611|5(?:0(?:0(?:(?:0\\d|1)(?:\\d{2})?|20?)|325|40\\d\\d?|5(?:0\\d{1,4}|[1-79]\\d{3,5}))|1(?:(?:0[12]|4[2-4])\\d|234|555|717|818|96[49])|2(?:0(?:0[01]|[14]0)|151|[23]1\\d{4})|3(?:0(?:[01]0|[34]\\d{4})|131|3[23]\\d{1,4}|553|(?:66|77)6)|4(?:(?:04|4[04]|99)\\d|1[04]\\d\\d?|2(?:0\\d\\d?|4\\d)|3(?:0\\d\\d?|2\\d(?:\\d(?:\\d{3})?)?)|64\\d{1,3})|5(?:(?:1[25]|4[45]|93)\\d|3(?:[16]\\d\\d?|5\\d)|5[05]\\d{1,3}|6(?:5\\d|7\\d\\d?))|6(?:0(?:6\\d\\d?|70)|16\\d{4}|3[68]|43|[67]\\d{2,3})|7(?:17\\d(?:\\d{3})?|(?:[27]7|57\\d\\d)\\d|8(?:7\\d\\d?|8\\d))|8(?:(?:3[4-69]|4[01]|5[58]|99)\\d|8(?:0\\d\\d?|8(?:8\\d\\d|9)\\d))|9(?:(?:00|55|77|88)\\d|6(?:4\\d\\d?|[67]\\d)|90\\d\\d?))|777|800|5(?:051\\d\\d|2(?:2(?:[0267]\\d\\d?|1\\d{1,3}|[3589]\\d)|3(?:[16]\\d\\d?|2\\d)|(?:4[04]|7[78])\\d|555|666|888|9(?:06|99\\d?))|303\\d{1,3})', + 'NationalNumberPattern' => '1(?:0(?:[0-248]|3[39]|5(?:010|6|[79]\\d\\d)|6[3468]|7(?:[01357]|[28]0?|4[01])|9[0135-9])|1(?:00|[289]|[67][0-2]\\d{3})|2(?:1|98)|3(?:11|2[0-2]|63|[89])|4[01]|5(?:1(?:0[0-36]|[127])|5(?:[23]\\d\\d|4))|6(?:1|6[01]?)|7000|8(?:02\\d{3}|[12])|9(?:0[013-59]|12|25|4[4-9]\\d?|50|6[1347]|[89]))|2611|5(?:0(?:0(?:(?:0\\d|1)(?:\\d{2})?|20?)|325|40\\d\\d?|5(?:0\\d{1,4}|[1-79]\\d{3,5}))|1(?:(?:0[12]|4[2-4])\\d|234|555|717|818|96[49])|2(?:0(?:0[01]|[14]0)|151|[23]1\\d{4})|3(?:0(?:[01]0|[34]\\d{4})|131|3[23]\\d{1,4}|553|(?:66|77)6)|4(?:(?:04|4[04]|99)\\d|1[04]\\d\\d?|2(?:0\\d\\d?|4\\d)|3(?:0\\d\\d?|2\\d(?:\\d(?:\\d{3})?)?)|64\\d{1,3})|5(?:(?:1[25]|4[45]|93)\\d|3(?:[16]\\d\\d?|5\\d)|5[05]\\d{1,3}|6(?:5\\d|7\\d\\d?))|6(?:0(?:6\\d\\d?|70)|16\\d{4}|3[68]|43|[67]\\d{2,3})|7(?:17\\d(?:\\d{3})?|(?:[27]7|57\\d\\d)\\d|8(?:7\\d\\d?|8\\d))|8(?:(?:3[4-69]|4[01]|5[58]|99)\\d|8(?:0\\d\\d?|8(?:8\\d\\d|9)\\d))|9(?:(?:0(?:0|2\\d{3})|55|77|88)\\d|6(?:4\\d\\d?|[67]\\d)|90\\d\\d?))|777|800|5(?:051\\d\\d|2(?:2(?:[0267]\\d\\d?|1\\d{1,3}|[3589]\\d)|3(?:[16]\\d\\d?|2\\d)|(?:4[04]|7[78])\\d|555|666|888|9(?:06|99\\d?))|303\\d{1,3})', 'ExampleNumber' => '100', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_MG.php b/src/data/ShortNumberMetadata_MG.php index 7c80e71c3..49f0a8b68 100644 --- a/src/data/ShortNumberMetadata_MG.php +++ b/src/data/ShortNumberMetadata_MG.php @@ -26,9 +26,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:1[78]|[78])', + 'ExampleNumber' => '17', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,8 +47,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '11?[78]', - 'ExampleNumber' => '117', + 'NationalNumberPattern' => '1(?:1[78]|[78])', + 'ExampleNumber' => '17', 'PossibleLength' => array ( ), @@ -57,8 +58,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '11?[78]', - 'ExampleNumber' => '117', + 'NationalNumberPattern' => '1(?:1[78]|[78])', + 'ExampleNumber' => '17', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_MX.php b/src/data/ShortNumberMetadata_MX.php index 3bf8405b9..500870d8e 100644 --- a/src/data/ShortNumberMetadata_MX.php +++ b/src/data/ShortNumberMetadata_MX.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '0(?:6[0568]|80)|911', + 'ExampleNumber' => '060', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -37,8 +39,8 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '53053|7766', - 'ExampleNumber' => '7766', + 'NationalNumberPattern' => '(?:530\\d|776)\\d', + 'ExampleNumber' => '7760', 'PossibleLength' => array ( 0 => 4, @@ -51,7 +53,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '0(?:6[0568]|80)|911', - 'ExampleNumber' => '066', + 'ExampleNumber' => '060', 'PossibleLength' => array ( 0 => 3, @@ -62,8 +64,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '0(?:[249]0|3[01]|5[015]|6[01568]|7[0-578]|8[089])|53053|7766|911', - 'ExampleNumber' => '030', + 'NationalNumberPattern' => '0[1-9]\\d|53053|7766|911', + 'ExampleNumber' => '010', 'PossibleLength' => array ( ), @@ -83,9 +85,11 @@ ), 'carrierSpecific' => array ( + 'NationalNumberPattern' => '0(?:[249]0|[35][01])', + 'ExampleNumber' => '020', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_SI.php b/src/data/ShortNumberMetadata_SI.php index 24f2ddaa1..09b495259 100644 --- a/src/data/ShortNumberMetadata_SI.php +++ b/src/data/ShortNumberMetadata_SI.php @@ -14,11 +14,13 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '1\\d\\d(?:\\d{3})?', + 'NationalNumberPattern' => '1\\d{2,5}', 'PossibleLength' => array ( 0 => 3, - 1 => 6, + 1 => 4, + 2 => 5, + 3 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -26,7 +28,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '11(?:[23]|6\\d{3})', + 'NationalNumberPattern' => '11(?:(?:[08]|6\\d)\\d\\d|[23])|118\\d', 'ExampleNumber' => '112', 'PossibleLength' => array ( @@ -59,7 +61,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '11(?:[23]|6(?:000|1(?:11|23)))', + 'NationalNumberPattern' => '1(?:1(?:00[146]|[23]|6(?:000|1(?:11|23))|8(?:[08]|99))|9(?:0(?:59|8[09])|1(?:0[12]|16)|5|70|8(?:1[09]|7)|9(?:00|[149])))', 'ExampleNumber' => '112', 'PossibleLength' => array ( diff --git a/src/geocoding/data/en/261.php b/src/geocoding/data/en/261.php index 71ee3cc2b..bc23dd154 100644 --- a/src/geocoding/data/en/261.php +++ b/src/geocoding/data/en/261.php @@ -12,10 +12,8 @@ return array ( 2612022 => 'Antananarivo', - 2612042 => 'Ambatolampy', 2612044 => 'Antsirabe', 2612047 => 'Ambositra', - 2612048 => 'Mid-West Madagascar', 2612053 => 'Toamasina', 2612054 => 'Ambatondrazaka', 2612056 => 'Moramanga', diff --git a/src/geocoding/data/en/52.php b/src/geocoding/data/en/52.php index b7c8fb8b1..b89317928 100644 --- a/src/geocoding/data/en/52.php +++ b/src/geocoding/data/en/52.php @@ -60,7 +60,6 @@ 52315 => 'Jalisco', 52316 => 'Jalisco', 52317 => 'Autlan/El Chante, JAL', - 52318 => 'Colima/Jalisco', 52319 => 'Nayarit', 52321 => 'El Grullo/El Limon, JAL', 52322 => 'Jalisco', @@ -89,15 +88,9 @@ 52356 => 'Tanhuato/Yurecuaro, MICH', 52357 => 'Jalisco', 52358 => 'Tamazula/Zapoltitic, JAL', - 52371 => 'Jalisco', - 52372 => 'Jalisco', - 52373 => 'Jalisco', - 52374 => 'Jalisco', + 5237 => 'Jalisco', 52375 => 'Ameca, JAL', - 52376 => 'Jalisco', 52377 => 'Cocula/Estipac, JAL', - 52378 => 'Jalisco', - 52379 => 'Jalisco/Michoacan', 52381 => 'Cojumatlan/San Jose de Gracia, MICH', 52382 => 'Jalisco', 52383 => 'Michoacan', @@ -171,14 +164,8 @@ 52476 => 'San Francisco Del Rincon, GTO', 52477 => 'Leon, GTO', 52478 => 'Calera Victor Rosales, ZAC', + 5248 => 'San Luis Potosi', 52481 => 'Ciudad Valles, SLP', - 52482 => 'San Luis Potosi', - 52483 => 'San Luis Potosi', - 52485 => 'San Luis Potosi', - 52486 => 'San Luis Potosi', - 52487 => 'San Luis Potosi', - 52488 => 'San Luis Potosi', - 52489 => 'San Luis Potosi', 52492 => 'Zacatecas', 52493 => 'Fresnillo, ZAC', 52494 => 'Jerez de Garcia Salinas, ZAC', @@ -187,10 +174,7 @@ 52498 => 'Zacatecas', 52499 => 'Jalisco/Zacatecas', 5255 => 'Mexico City, FD', - 52586 => 'Tlalmanalco, MEX', - 52587 => 'Amecameca, MEX', - 52588 => 'Estado de Mexico', - 52589 => 'Juchitepec/Ozumba, MEX', + 5258 => 'Estado de Mexico', 52591 => 'Estado de Mexico', 52592 => 'Estado de Mexico', 52593 => 'Estado de Mexico', @@ -240,7 +224,6 @@ 52661 => 'Primo Tapia/Rosarito, BCN', 52662 => 'Sonora', 52665 => 'Tecate, BCN', - 52666 => 'Tijuana, BCN', 52667 => 'Sinaloa', 52668 => 'Sinaloa', 52669 => 'Sinaloa', @@ -253,11 +236,7 @@ 52677 => 'Durango', 52686 => 'Baja California', 52687 => 'Sinaloa', - 52694 => 'Sinaloa', - 52695 => 'Sinaloa', - 52696 => 'Sinaloa', - 52697 => 'Sinaloa', - 52698 => 'Sinaloa', + 5269 => 'Sinaloa', 52711 => 'Mexico/Michoacan', 52712 => 'Estado de Mexico', 52713 => 'Santiago Tianguistenco, MEX', @@ -295,7 +274,6 @@ 52748 => 'Hidalgo', 52749 => 'Calpulalpan, TLAX', 52751 => 'Morelos', - 52752 => 'Morelos', 52753 => 'Michoacan', 52754 => 'Guerrero', 52755 => 'Ixtapa/Zihuatanejo, GRO', @@ -336,7 +314,6 @@ 52824 => 'Sabinas Hidalgo, NL', 52825 => 'Nuevo Leon', 52826 => 'Nuevo Leon', - 52827 => 'Santiago, NL', 52828 => 'Cadereyta, NL', 52829 => 'Nuevo Leon', 52831 => 'Ciudad Mante/Los Aztecas, TAMPS', @@ -384,14 +361,9 @@ 52937 => 'Cardenas, TAB', 52938 => 'Ciudad Del Carmen, CAMP', 5295 => 'Oaxaca', - 52961 => 'Chiapas', - 52962 => 'Chiapas', - 52963 => 'Chiapas', - 52964 => 'Chiapas', - 52965 => 'Chiapas', + 5296 => 'Chiapas', 52966 => 'Arriaga/Tonala, CHIS', 52967 => 'San Cristobal de las Casas, CHIS', - 52968 => 'Chiapas', 52969 => 'Flamboyanes/Yucalpeten, YUC', 5297 => 'Oaxaca', 52981 => 'Campeche, CAMP', diff --git a/src/geocoding/data/es/52.php b/src/geocoding/data/es/52.php index e17179689..d67f67113 100644 --- a/src/geocoding/data/es/52.php +++ b/src/geocoding/data/es/52.php @@ -26,7 +26,6 @@ 52355 => 'Michoacán', 52356 => 'Tanhuato/Yurécuaro, MICH', 52358 => 'Tamazula/Zapotiltic, JAL', - 52379 => 'Jalisco/Michoacán', 52383 => 'Michoacán', 52392 => 'Jamay/Ocotlán, JAL', 52418 => 'Dolores Hidalgo/San Diego de la Unión, GTO', @@ -55,13 +54,8 @@ 52475 => 'Bajío de San José/Encarnación de Diaz, JAL', 52476 => 'San Francisco del Rincón, GTO', 52477 => 'León, GTO', - 52482 => 'San Luis Potosí', - 52483 => 'San Luis Potosí', - 52485 => 'San Luis Potosí', - 52486 => 'San Luis Potosí', - 52487 => 'San Luis Potosí', - 52488 => 'San Luis Potosí', - 52489 => 'San Luis Potosí', + 5248 => 'San Luis Potosí', + 52481 => '', 52494 => 'Jerez de García Salinas, ZAC', 5255 => 'Ciudad de México, CDMX', 52632 => 'Ímuris/Magdalena, SON', diff --git a/src/timezone/data/map_data.php b/src/timezone/data/map_data.php index 18bbf5bfc..768c65967 100644 --- a/src/timezone/data/map_data.php +++ b/src/timezone/data/map_data.php @@ -1166,6 +1166,7 @@ 1650 => 'America/Los_Angeles', 1651 => 'America/Chicago', 1657 => 'America/Los_Angeles', + 1658 => 'America/Jamaica', 1660 => 'America/Chicago', 1661 => 'America/Los_Angeles', 1662 => 'America/Chicago', @@ -2224,56 +2225,10 @@ 508 => 'America/Miquelon', 509 => 'America/Port-au-Prince', 51 => 'America/Lima', - 52 => 'America/Hermosillo&America/Mazatlan&America/Mexico_City&America/New_York&America/Santa_Isabel&America/Tijuana', - 521221 => 'America/Mexico_City', - 521222 => 'America/Mexico_City', - 521223 => 'America/Mexico_City', - 521224 => 'America/Mexico_City', - 521225 => 'America/Mexico_City', - 521226 => 'America/Mexico_City', - 521227 => 'America/Mexico_City', - 521228 => 'America/Mexico_City', - 521229 => 'America/Mexico_City', - 521231 => 'America/Mexico_City', - 521232 => 'America/Mexico_City', - 521233 => 'America/Mexico_City', - 521235 => 'America/Mexico_City', - 521236 => 'America/Mexico_City', - 521237 => 'America/Mexico_City', - 521238 => 'America/Mexico_City', - 521241 => 'America/Mexico_City', - 521243 => 'America/Mexico_City', - 521244 => 'America/Mexico_City', - 521245 => 'America/Mexico_City', - 521246 => 'America/Mexico_City', - 521247 => 'America/Mexico_City', - 521248 => 'America/Mexico_City', - 521249 => 'America/Mexico_City', - 521271 => 'America/Mexico_City', - 521272 => 'America/Mexico_City', - 521273 => 'America/Mexico_City', - 521274 => 'America/Mexico_City', - 521275 => 'America/Mexico_City', - 521276 => 'America/Mexico_City', - 521278 => 'America/Mexico_City', - 521279 => 'America/Mexico_City', - 521281 => 'America/Mexico_City', - 521282 => 'America/Mexico_City', - 521283 => 'America/Mexico_City', - 521284 => 'America/Mexico_City', - 521285 => 'America/Mexico_City', - 521287 => 'America/Mexico_City', - 521288 => 'America/Mexico_City', - 521294 => 'America/Mexico_City', - 521296 => 'America/Mexico_City', - 521297 => 'America/Mexico_City', + 52 => 'America/Hermosillo&America/Mazatlan&America/Mexico_City&America/New_York&America/Tijuana', + 5212 => 'America/Mexico_City', + 52131 => 'America/Mexico_City', 521311 => 'America/Mazatlan', - 521312 => 'America/Mexico_City', - 521313 => 'America/Mexico_City', - 521314 => 'America/Mexico_City', - 521315 => 'America/Mexico_City', - 521316 => 'America/Mexico_City', - 521317 => 'America/Mexico_City', 521319 => 'America/Mazatlan', 521321 => 'America/Mexico_City', 521322 => 'America/Mexico_City', @@ -2292,15 +2247,7 @@ 521346 => 'America/Mexico_City', 521347 => 'America/Mexico_City', 521348 => 'America/Mexico_City', - 521351 => 'America/Mexico_City', - 521352 => 'America/Mexico_City', - 521353 => 'America/Mexico_City', - 521354 => 'America/Mexico_City', - 521355 => 'America/Mexico_City', - 521356 => 'America/Mexico_City', - 521357 => 'America/Mexico_City', - 521358 => 'America/Mexico_City', - 521359 => 'America/Mexico_City', + 52135 => 'America/Mexico_City', 521371 => 'America/Mexico_City', 521373 => 'America/Mexico_City', 521374 => 'America/Mexico_City', @@ -2316,36 +2263,10 @@ 521387 => 'America/Mexico_City', 521388 => 'America/Mexico_City', 521389 => 'America/Mazatlan', - 521391 => 'America/Mexico_City', - 521392 => 'America/Mexico_City', - 521393 => 'America/Mexico_City', - 521394 => 'America/Mexico_City', - 521395 => 'America/Mexico_City', - 521411 => 'America/Mexico_City', - 521412 => 'America/Mexico_City', - 521413 => 'America/Mexico_City', - 521414 => 'America/Mexico_City', - 521415 => 'America/Mexico_City', - 521417 => 'America/Mexico_City', - 521418 => 'America/Mexico_City', - 521419 => 'America/Mexico_City', - 521421 => 'America/Mexico_City', - 521422 => 'America/Mexico_City', - 521423 => 'America/Mexico_City', - 521424 => 'America/Mexico_City', - 521425 => 'America/Mexico_City', - 521426 => 'America/Mexico_City', - 521427 => 'America/Mexico_City', - 521428 => 'America/Mexico_City', - 521429 => 'America/Mexico_City', - 521431 => 'America/Mexico_City', - 521432 => 'America/Mexico_City', - 521433 => 'America/Mexico_City', - 521434 => 'America/Mexico_City', - 521435 => 'America/Mexico_City', - 521436 => 'America/Mexico_City', - 521437 => 'America/Mexico_City', - 521438 => 'America/Mexico_City', + 52139 => 'America/Mexico_City', + 52141 => 'America/Mexico_City', + 52142 => 'America/Mexico_City', + 52143 => 'America/Mexico_City', 521441 => 'America/Mexico_City', 521442 => 'America/Mexico_City', 521443 => 'America/Mexico_City', @@ -2354,56 +2275,14 @@ 521447 => 'America/Mexico_City', 521448 => 'America/Mexico_City', 521449 => 'America/Mexico_City', - 521451 => 'America/Mexico_City', - 521452 => 'America/Mexico_City', - 521453 => 'America/Mexico_City', - 521454 => 'America/Mexico_City', - 521455 => 'America/Mexico_City', - 521456 => 'America/Mexico_City', - 521457 => 'America/Mexico_City', - 521458 => 'America/Mexico_City', - 521459 => 'America/Mexico_City', - 521461 => 'America/Mexico_City', - 521462 => 'America/Mexico_City', - 521463 => 'America/Mexico_City', - 521464 => 'America/Mexico_City', - 521465 => 'America/Mexico_City', - 521466 => 'America/Mexico_City', - 521467 => 'America/Mexico_City', - 521468 => 'America/Mexico_City', - 521469 => 'America/Mexico_City', - 521471 => 'America/Mexico_City', - 521472 => 'America/Mexico_City', - 521473 => 'America/Mexico_City', - 521474 => 'America/Mexico_City', - 521475 => 'America/Mexico_City', - 521476 => 'America/Mexico_City', - 521477 => 'America/Mexico_City', - 521478 => 'America/Mexico_City', - 521481 => 'America/Mexico_City', - 521482 => 'America/Mexico_City', - 521483 => 'America/Mexico_City', - 521485 => 'America/Mexico_City', - 521486 => 'America/Mexico_City', - 521487 => 'America/Mexico_City', - 521488 => 'America/Mexico_City', - 521489 => 'America/Mexico_City', - 521492 => 'America/Mexico_City', - 521493 => 'America/Mexico_City', - 521494 => 'America/Mexico_City', - 521495 => 'America/Mexico_City', - 521496 => 'America/Mexico_City', - 521498 => 'America/Mexico_City', - 521499 => 'America/Mexico_City', + 52145 => 'America/Mexico_City', + 52146 => 'America/Mexico_City', + 52147 => 'America/Mexico_City', + 52148 => 'America/Mexico_City', + 52149 => 'America/Mexico_City', 52155 => 'America/Mexico_City', - 521591 => 'America/Mexico_City', - 521592 => 'America/Mexico_City', - 521593 => 'America/Mexico_City', - 521594 => 'America/Mexico_City', - 521595 => 'America/Mexico_City', - 521596 => 'America/Mexico_City', - 521597 => 'America/Mexico_City', - 521599 => 'America/Mexico_City', + 52156 => 'America/Mexico_City', + 52159 => 'America/Mexico_City', 521612 => 'America/Mazatlan', 521613 => 'America/Mazatlan', 521614 => 'America/Mazatlan', @@ -2418,24 +2297,11 @@ 521626 => 'America/Hermosillo&America/Tijuana', 521627 => 'America/Mazatlan', 521628 => 'America/Mazatlan', - 521631 => 'America/Mazatlan', - 521632 => 'America/Mazatlan', - 521633 => 'America/Mazatlan', - 521634 => 'America/Mazatlan', - 521635 => 'America/Mazatlan', + 52163 => 'America/Mazatlan', 521636 => 'America/Hermosillo&America/Mazatlan', - 521637 => 'America/Mazatlan', - 521638 => 'America/Mazatlan', - 521639 => 'America/Mazatlan', - 521641 => 'America/Mazatlan', - 521642 => 'America/Mazatlan', - 521643 => 'America/Mazatlan', - 521644 => 'America/Mazatlan', - 521645 => 'America/Mazatlan', + 52164 => 'America/Mazatlan', 521646 => 'America/Tijuana', 521647 => 'America/Mazatlan&America/Tijuana', - 521648 => 'America/Mazatlan', - 521649 => 'America/Mazatlan', 521651 => 'America/Mazatlan', 521652 => 'America/Mazatlan', 521653 => 'America/Mazatlan', @@ -2444,6 +2310,7 @@ 521659 => 'America/Mazatlan', 521661 => 'America/Tijuana', 521662 => 'America/Mazatlan', + 521663 => 'America/Mazatlan', 521664 => 'America/Tijuana', 521665 => 'America/Tijuana', 521667 => 'America/Mazatlan', @@ -2458,11 +2325,7 @@ 521677 => 'America/Mexico_City', 521686 => 'America/Tijuana', 521687 => 'America/Mazatlan', - 521694 => 'America/Mazatlan', - 521695 => 'America/Mazatlan', - 521696 => 'America/Mazatlan', - 521697 => 'America/Mazatlan', - 521698 => 'America/Mazatlan', + 52169 => 'America/Mazatlan', 521711 => 'America/Mexico_City', 521712 => 'America/Mexico_City', 521713 => 'America/Mexico_City', @@ -2479,59 +2342,13 @@ 521726 => 'America/Mexico_City', 521727 => 'America/Mexico_City', 521728 => 'America/Mexico_City', - 521731 => 'America/Mexico_City', - 521732 => 'America/Mexico_City', - 521733 => 'America/Mexico_City', - 521734 => 'America/Mexico_City', - 521735 => 'America/Mexico_City', - 521736 => 'America/Mexico_City', - 521737 => 'America/Mexico_City', - 521738 => 'America/Mexico_City', - 521739 => 'America/Mexico_City', - 521741 => 'America/Mexico_City', - 521742 => 'America/Mexico_City', - 521743 => 'America/Mexico_City', - 521744 => 'America/Mexico_City', - 521745 => 'America/Mexico_City', - 521746 => 'America/Mexico_City', - 521747 => 'America/Mexico_City', - 521748 => 'America/Mexico_City', - 521749 => 'America/Mexico_City', - 521751 => 'America/Mexico_City', - 521753 => 'America/Mexico_City', - 521754 => 'America/Mexico_City', - 521755 => 'America/Mexico_City', - 521756 => 'America/Mexico_City', - 521757 => 'America/Mexico_City', - 521758 => 'America/Mexico_City', - 521759 => 'America/Mexico_City', - 521761 => 'America/Mexico_City', - 521762 => 'America/Mexico_City', - 521763 => 'America/Mexico_City', - 521764 => 'America/Mexico_City', - 521765 => 'America/Mexico_City', - 521766 => 'America/Mexico_City', - 521767 => 'America/Mexico_City', - 521768 => 'America/Mexico_City', - 521769 => 'America/Mexico_City', - 521771 => 'America/Mexico_City', - 521772 => 'America/Mexico_City', - 521773 => 'America/Mexico_City', - 521774 => 'America/Mexico_City', - 521775 => 'America/Mexico_City', - 521776 => 'America/Mexico_City', - 521777 => 'America/Mexico_City', - 521778 => 'America/Mexico_City', - 521779 => 'America/Mexico_City', - 521781 => 'America/Mexico_City', - 521782 => 'America/Mexico_City', - 521783 => 'America/Mexico_City', - 521784 => 'America/Mexico_City', - 521785 => 'America/Mexico_City', - 521786 => 'America/Mexico_City', - 521789 => 'America/Mexico_City', - 521791 => 'America/Mexico_City', - 521797 => 'America/Mexico_City', + 52173 => 'America/Mexico_City', + 52174 => 'America/Mexico_City', + 52175 => 'America/Mexico_City', + 52176 => 'America/Mexico_City', + 52177 => 'America/Mexico_City', + 52178 => 'America/Mexico_City', + 52179 => 'America/Mexico_City', 52181 => 'America/Mexico_City', 521821 => 'America/Mexico_City', 521823 => 'America/Mexico_City', @@ -2539,133 +2356,25 @@ 521825 => 'America/Mexico_City', 521826 => 'America/Mexico_City', 521828 => 'America/Mexico_City', - 521831 => 'America/Mexico_City', - 521832 => 'America/Mexico_City', - 521833 => 'America/Mexico_City', - 521834 => 'America/Mexico_City', - 521835 => 'America/Mexico_City', - 521836 => 'America/Mexico_City', - 521841 => 'America/Mexico_City', - 521842 => 'America/Mexico_City', - 521844 => 'America/Mexico_City', - 521845 => 'America/Mexico_City', - 521846 => 'America/Mexico_City', - 521861 => 'America/Mexico_City', - 521862 => 'America/Mexico_City', - 521864 => 'America/Mexico_City', - 521866 => 'America/Mexico_City', - 521867 => 'America/Mexico_City', - 521868 => 'America/Mexico_City', - 521869 => 'America/Mexico_City', + 52183 => 'America/Mexico_City', + 52184 => 'America/Mexico_City', + 52186 => 'America/Mexico_City', 521871 => 'America/Mexico_City', 521872 => 'America/Mexico_City', 521873 => 'America/Mexico_City', 521877 => 'America/Mexico_City&America/Tijuana', 521878 => 'America/Mexico_City', - 521891 => 'America/Mexico_City', - 521892 => 'America/Mexico_City', - 521894 => 'America/Mexico_City', - 521897 => 'America/Mexico_City', - 521899 => 'America/Mexico_City', - 521913 => 'America/Mexico_City', - 521914 => 'America/Mexico_City', - 521916 => 'America/Mexico_City', - 521917 => 'America/Mexico_City', - 521918 => 'America/Mexico_City', - 521919 => 'America/Mexico_City', - 521921 => 'America/Mexico_City', - 521922 => 'America/Mexico_City', - 521923 => 'America/Mexico_City', - 521924 => 'America/Mexico_City', - 521932 => 'America/Mexico_City', - 521933 => 'America/Mexico_City', - 521934 => 'America/Mexico_City', - 521936 => 'America/Mexico_City', - 521937 => 'America/Mexico_City', - 521938 => 'America/Mexico_City', - 521951 => 'America/Mexico_City', - 521953 => 'America/Mexico_City', - 521954 => 'America/Mexico_City', - 521958 => 'America/Mexico_City', - 521961 => 'America/Mexico_City', - 521962 => 'America/Mexico_City', - 521963 => 'America/Mexico_City', - 521964 => 'America/Mexico_City', - 521965 => 'America/Mexico_City', - 521966 => 'America/Mexico_City', - 521967 => 'America/Mexico_City', - 521968 => 'America/Mexico_City', - 521969 => 'America/Mexico_City', - 521971 => 'America/Mexico_City', - 521972 => 'America/Mexico_City', - 521981 => 'America/Mexico_City', - 521982 => 'America/Mexico_City', + 52189 => 'America/Mexico_City', + 5219 => 'America/Mexico_City', 521983 => 'America/New_York', 521984 => 'America/New_York', - 521985 => 'America/Mexico_City', - 521986 => 'America/Mexico_City', 521987 => 'America/New_York', - 521988 => 'America/Mexico_City', - 521991 => 'America/Mexico_City', - 521992 => 'America/Mexico_City', - 521993 => 'America/Mexico_City', - 521994 => 'America/Mexico_City', - 521995 => 'America/Mexico_City', - 521996 => 'America/Mexico_City', - 521997 => 'America/Mexico_City', 521998 => 'America/New_York', - 521999 => 'America/Mexico_City', + 522 => 'America/Mexico_City', 52200 => 'America/Mexico_City&America/Tijuana', 52201 => 'America/Mexico_City&America/New_York', - 52221 => 'America/Mexico_City', - 52222 => 'America/Mexico_City', - 52223 => 'America/Mexico_City', - 52224 => 'America/Mexico_City', - 52225 => 'America/Mexico_City', - 52226 => 'America/Mexico_City', - 52227 => 'America/Mexico_City', - 52228 => 'America/Mexico_City', - 52229 => 'America/Mexico_City', - 52231 => 'America/Mexico_City', - 52232 => 'America/Mexico_City', - 52233 => 'America/Mexico_City', - 52235 => 'America/Mexico_City', - 52236 => 'America/Mexico_City', - 52237 => 'America/Mexico_City', - 52238 => 'America/Mexico_City', - 52241 => 'America/Mexico_City', - 52243 => 'America/Mexico_City', - 52244 => 'America/Mexico_City', - 52245 => 'America/Mexico_City', - 52246 => 'America/Mexico_City', - 52247 => 'America/Mexico_City', - 52248 => 'America/Mexico_City', - 52249 => 'America/Mexico_City', - 52271 => 'America/Mexico_City', - 52272 => 'America/Mexico_City', - 52273 => 'America/Mexico_City', - 52274 => 'America/Mexico_City', - 52275 => 'America/Mexico_City', - 52276 => 'America/Mexico_City', - 52278 => 'America/Mexico_City', - 52279 => 'America/Mexico_City', - 52281 => 'America/Mexico_City', - 52282 => 'America/Mexico_City', - 52283 => 'America/Mexico_City', - 52284 => 'America/Mexico_City', - 52285 => 'America/Mexico_City', - 52287 => 'America/Mexico_City', - 52288 => 'America/Mexico_City', - 52294 => 'America/Mexico_City', - 52296 => 'America/Mexico_City', - 52297 => 'America/Mexico_City', + 5231 => 'America/Mexico_City', 52311 => 'America/Mazatlan', - 52312 => 'America/Mexico_City', - 52313 => 'America/Mexico_City', - 52314 => 'America/Mexico_City', - 52315 => 'America/Mexico_City', - 52316 => 'America/Mexico_City', - 52317 => 'America/Mexico_City', 52319 => 'America/Mazatlan', 52321 => 'America/Mexico_City', 52322 => 'America/Mexico_City', @@ -2677,163 +2386,28 @@ 52328 => 'America/Mexico_City', 52329 => 'America/Mexico_City', 5233 => 'America/Mexico_City', - 52341 => 'America/Mexico_City', - 52342 => 'America/Mexico_City', - 52343 => 'America/Mexico_City', - 52344 => 'America/Mexico_City', - 52345 => 'America/Mexico_City', - 52346 => 'America/Mexico_City', - 52347 => 'America/Mexico_City', - 52348 => 'America/Mexico_City', - 52349 => 'America/Mexico_City', - 52351 => 'America/Mexico_City', - 52352 => 'America/Mexico_City', - 52353 => 'America/Mexico_City', - 52354 => 'America/Mexico_City', - 52355 => 'America/Mexico_City', - 52356 => 'America/Mexico_City', - 52357 => 'America/Mexico_City', - 52358 => 'America/Mexico_City', - 52359 => 'America/Mexico_City', - 52371 => 'America/Mexico_City', - 52372 => 'America/Mexico_City', - 52373 => 'America/Mexico_City', - 52374 => 'America/Mexico_City', - 52375 => 'America/Mexico_City', - 52376 => 'America/Mexico_City', - 52377 => 'America/Mexico_City', - 52378 => 'America/Mexico_City', - 52381 => 'America/Mexico_City', - 52382 => 'America/Mexico_City', - 52383 => 'America/Mexico_City', - 52384 => 'America/Mexico_City', - 52385 => 'America/Mexico_City', - 52386 => 'America/Mexico_City', - 52387 => 'America/Mexico_City', - 52388 => 'America/Mexico_City', + 5234 => 'America/Mexico_City', + 5235 => 'America/Mexico_City', + 5237 => 'America/Mexico_City', + 5238 => 'America/Mexico_City', 52389 => 'America/Mazatlan', - 52391 => 'America/Mexico_City', - 52392 => 'America/Mexico_City', - 52393 => 'America/Mexico_City', - 52394 => 'America/Mexico_City', - 52395 => 'America/Mexico_City', - 52411 => 'America/Mexico_City', - 52412 => 'America/Mexico_City', - 52413 => 'America/Mexico_City', - 52414 => 'America/Mexico_City', - 52415 => 'America/Mexico_City', - 52417 => 'America/Mexico_City', - 52418 => 'America/Mexico_City', - 52419 => 'America/Mexico_City', - 52421 => 'America/Mexico_City', - 52422 => 'America/Mexico_City', - 52423 => 'America/Mexico_City', - 52424 => 'America/Mexico_City', - 52425 => 'America/Mexico_City', - 52426 => 'America/Mexico_City', - 52427 => 'America/Mexico_City', - 52428 => 'America/Mexico_City', - 52429 => 'America/Mexico_City', - 52431 => 'America/Mexico_City', - 52432 => 'America/Mexico_City', - 52433 => 'America/Mexico_City', - 52434 => 'America/Mexico_City', - 52435 => 'America/Mexico_City', - 52436 => 'America/Mexico_City', - 52437 => 'America/Mexico_City', - 52438 => 'America/Mexico_City', - 52441 => 'America/Mexico_City', - 52442 => 'America/Mexico_City', - 52443 => 'America/Mexico_City', - 52444 => 'America/Mexico_City', - 52445 => 'America/Mexico_City', - 52446 => 'America/Mexico_City', - 52447 => 'America/Mexico_City', - 52448 => 'America/Mexico_City', - 52449 => 'America/Mexico_City', - 52451 => 'America/Mexico_City', - 52452 => 'America/Mexico_City', - 52453 => 'America/Mexico_City', - 52454 => 'America/Mexico_City', - 52455 => 'America/Mexico_City', - 52456 => 'America/Mexico_City', - 52457 => 'America/Mexico_City', - 52458 => 'America/Mexico_City', - 52459 => 'America/Mexico_City', - 52461 => 'America/Mexico_City', - 52462 => 'America/Mexico_City', - 52463 => 'America/Mexico_City', - 52464 => 'America/Mexico_City', - 52465 => 'America/Mexico_City', - 52466 => 'America/Mexico_City', - 52467 => 'America/Mexico_City', - 52468 => 'America/Mexico_City', - 52469 => 'America/Mexico_City', - 52471 => 'America/Mexico_City', - 52472 => 'America/Mexico_City', - 52473 => 'America/Mexico_City', - 52474 => 'America/Mexico_City', - 52475 => 'America/Mexico_City', - 52476 => 'America/Mexico_City', - 52477 => 'America/Mexico_City', - 52478 => 'America/Mexico_City', - 52481 => 'America/Mexico_City', - 52482 => 'America/Mexico_City', - 52483 => 'America/Mexico_City', - 52485 => 'America/Mexico_City', - 52486 => 'America/Mexico_City', - 52487 => 'America/Mexico_City', - 52488 => 'America/Mexico_City', - 52489 => 'America/Mexico_City', - 52492 => 'America/Mexico_City', - 52493 => 'America/Mexico_City', - 52494 => 'America/Mexico_City', - 52495 => 'America/Mexico_City', - 52496 => 'America/Mexico_City', - 52498 => 'America/Mexico_City', - 52499 => 'America/Mexico_City', + 5239 => 'America/Mexico_City', + 524 => 'America/Mexico_City', 5255 => 'America/Mexico_City', - 52588 => 'America/Mexico_City', - 52591 => 'America/Mexico_City', - 52592 => 'America/Mexico_City', - 52593 => 'America/Mexico_City', - 52594 => 'America/Mexico_City', - 52595 => 'America/Mexico_City', - 52596 => 'America/Mexico_City', - 52597 => 'America/Mexico_City', - 52599 => 'America/Mexico_City', + 5256 => 'America/Mexico_City', + 5258 => 'America/Mexico_City', + 5259 => 'America/Mexico_City', 52612 => 'America/Mazatlan', 52613 => 'America/Mazatlan', 52614 => 'America/Mazatlan', 52615 => 'America/Mazatlan', 52616 => 'America/Tijuana', 52618 => 'America/Mexico_City', - 52621 => 'America/Mazatlan', - 52622 => 'America/Mazatlan', - 52623 => 'America/Mazatlan', - 52624 => 'America/Mazatlan', - 52625 => 'America/Mazatlan', + 5262 => 'America/Mazatlan', 52626 => 'America/Hermosillo', - 52627 => 'America/Mazatlan', - 52628 => 'America/Mazatlan', - 52629 => 'America/Mazatlan', - 52631 => 'America/Mazatlan', - 52632 => 'America/Mazatlan', - 52633 => 'America/Mazatlan', - 52634 => 'America/Mazatlan', - 52635 => 'America/Mazatlan', - 52636 => 'America/Mazatlan', - 52637 => 'America/Mazatlan', - 52638 => 'America/Mazatlan', - 52639 => 'America/Mazatlan', - 52641 => 'America/Mazatlan', - 52642 => 'America/Mazatlan', - 52643 => 'America/Mazatlan', - 52644 => 'America/Mazatlan', - 52645 => 'America/Mazatlan', + 5263 => 'America/Mazatlan', + 5264 => 'America/Mazatlan', 52646 => 'America/Tijuana', - 52647 => 'America/Mazatlan', - 52648 => 'America/Mazatlan', 52649 => 'America/Mazatlan&America/Mexico_City', 52651 => 'America/Mazatlan', 52652 => 'America/Mazatlan', @@ -2857,149 +2431,21 @@ 52677 => 'America/Mexico_City', 52686 => 'America/Tijuana', 52687 => 'America/Mazatlan', - 52694 => 'America/Mazatlan', - 52695 => 'America/Mazatlan', - 52696 => 'America/Mazatlan', - 52697 => 'America/Mazatlan', - 52698 => 'America/Mazatlan', - 52711 => 'America/Mexico_City', - 52712 => 'America/Mexico_City', - 52713 => 'America/Mexico_City', - 52714 => 'America/Mexico_City', - 52715 => 'America/Mexico_City', - 52716 => 'America/Mexico_City', - 52717 => 'America/Mexico_City', - 52718 => 'America/Mexico_City', - 52719 => 'America/Mexico_City', - 52721 => 'America/Mexico_City', - 52722 => 'America/Mexico_City', - 52723 => 'America/Mexico_City', - 52724 => 'America/Mexico_City', - 52725 => 'America/Mexico_City', - 52726 => 'America/Mexico_City', - 52727 => 'America/Mexico_City', - 52728 => 'America/Mexico_City', - 52729 => 'America/Mexico_City', - 52731 => 'America/Mexico_City', - 52732 => 'America/Mexico_City', - 52733 => 'America/Mexico_City', - 52734 => 'America/Mexico_City', - 52735 => 'America/Mexico_City', - 52736 => 'America/Mexico_City', - 52737 => 'America/Mexico_City', - 52738 => 'America/Mexico_City', - 52739 => 'America/Mexico_City', - 52741 => 'America/Mexico_City', - 52742 => 'America/Mexico_City', - 52743 => 'America/Mexico_City', - 52744 => 'America/Mexico_City', - 52745 => 'America/Mexico_City', - 52746 => 'America/Mexico_City', - 52747 => 'America/Mexico_City', - 52748 => 'America/Mexico_City', - 52749 => 'America/Mexico_City', - 52751 => 'America/Mexico_City', - 52753 => 'America/Mexico_City', - 52754 => 'America/Mexico_City', - 52755 => 'America/Mexico_City', - 52756 => 'America/Mexico_City', - 52757 => 'America/Mexico_City', - 52758 => 'America/Mexico_City', - 52759 => 'America/Mexico_City', - 52761 => 'America/Mexico_City', - 52762 => 'America/Mexico_City', - 52763 => 'America/Mexico_City', - 52764 => 'America/Mexico_City', - 52765 => 'America/Mexico_City', - 52766 => 'America/Mexico_City', - 52767 => 'America/Mexico_City', - 52768 => 'America/Mexico_City', - 52769 => 'America/Mexico_City', - 52771 => 'America/Mexico_City', - 52772 => 'America/Mexico_City', - 52773 => 'America/Mexico_City', - 52774 => 'America/Mexico_City', - 52775 => 'America/Mexico_City', - 52776 => 'America/Mexico_City', - 52777 => 'America/Mexico_City', - 52778 => 'America/Mexico_City', - 52779 => 'America/Mexico_City', - 52781 => 'America/Mexico_City', - 52782 => 'America/Mexico_City', - 52783 => 'America/Mexico_City', - 52784 => 'America/Mexico_City', - 52785 => 'America/Mexico_City', - 52786 => 'America/Mexico_City', - 52789 => 'America/Mexico_City', - 52791 => 'America/Mexico_City', - 52797 => 'America/Mexico_City', + 5269 => 'America/Mazatlan', + 527 => 'America/Mexico_City', 5281 => 'America/Mexico_City', - 52821 => 'America/Mexico_City', - 52823 => 'America/Mexico_City', - 52824 => 'America/Mexico_City', - 52825 => 'America/Mexico_City', - 52826 => 'America/Mexico_City', - 52828 => 'America/Mexico_City', - 52829 => 'America/Mexico_City', - 52831 => 'America/Mexico_City', - 52832 => 'America/Mexico_City', - 52833 => 'America/Mexico_City', - 52834 => 'America/Mexico_City', - 52835 => 'America/Mexico_City', - 52836 => 'America/Mexico_City', - 52841 => 'America/Mexico_City', - 52842 => 'America/Mexico_City', - 52844 => 'America/Mexico_City', - 52845 => 'America/Mexico_City', - 52846 => 'America/Mexico_City', - 52861 => 'America/Mexico_City', - 52862 => 'America/Mexico_City', - 52864 => 'America/Mexico_City', - 52866 => 'America/Mexico_City', - 52867 => 'America/Mexico_City', - 52868 => 'America/Mexico_City', - 52869 => 'America/Mexico_City', - 52871 => 'America/Mexico_City', - 52872 => 'America/Mexico_City', - 52873 => 'America/Mexico_City', - 52877 => 'America/Mexico_City', - 52878 => 'America/Mexico_City', - 52891 => 'America/Mexico_City', - 52892 => 'America/Mexico_City', - 52894 => 'America/Mexico_City', - 52897 => 'America/Mexico_City', - 52899 => 'America/Mexico_City', - 52913 => 'America/Mexico_City', - 52914 => 'America/Mexico_City', - 52916 => 'America/Mexico_City', - 52917 => 'America/Mexico_City', - 52918 => 'America/Mexico_City', - 52919 => 'America/Mexico_City', - 52921 => 'America/Mexico_City', - 52922 => 'America/Mexico_City', - 52923 => 'America/Mexico_City', - 52924 => 'America/Mexico_City', - 52932 => 'America/Mexico_City', - 52933 => 'America/Mexico_City', - 52934 => 'America/Mexico_City', - 52936 => 'America/Mexico_City', - 52937 => 'America/Mexico_City', - 52938 => 'America/Mexico_City', - 52951 => 'America/Mexico_City', - 52953 => 'America/Mexico_City', - 52954 => 'America/Mexico_City', - 52958 => 'America/Mexico_City', - 52961 => 'America/Mexico_City', - 52962 => 'America/Mexico_City', - 52963 => 'America/Mexico_City', - 52964 => 'America/Mexico_City', - 52965 => 'America/Mexico_City', - 52966 => 'America/Mexico_City', - 52967 => 'America/Mexico_City', - 52968 => 'America/Mexico_City', - 52969 => 'America/Mexico_City', - 52971 => 'America/Mexico_City', - 52972 => 'America/Mexico_City', + 5282 => 'America/Mexico_City', + 5283 => 'America/Mexico_City', + 5284 => 'America/Mexico_City', + 5286 => 'America/Mexico_City', + 5287 => 'America/Mexico_City', + 5289 => 'America/Mexico_City', + 5291 => 'America/Mexico_City', + 5292 => 'America/Mexico_City', + 5293 => 'America/Mexico_City', + 5295 => 'America/Mexico_City', + 5296 => 'America/Mexico_City', + 5297 => 'America/Mexico_City', 52981 => 'America/Mexico_City', 52982 => 'America/Mexico_City', 52983 => 'America/New_York', @@ -3008,15 +2454,8 @@ 52986 => 'America/Mexico_City', 52987 => 'America/New_York', 52988 => 'America/Mexico_City', - 52991 => 'America/Mexico_City', - 52992 => 'America/Mexico_City', - 52993 => 'America/Mexico_City', - 52994 => 'America/Mexico_City', - 52995 => 'America/Mexico_City', - 52996 => 'America/Mexico_City', - 52997 => 'America/Mexico_City', + 5299 => 'America/Mexico_City', 52998 => 'America/New_York', - 52999 => 'America/Mexico_City', 53 => 'America/Havana', 54 => 'America/Buenos_Aires', 55 => 'America/Manaus&America/Noronha&America/Rio_Branco&America/Sao_Paulo',