Merge pull request #382 from giggsey/upstream-8.12.4

Upstream metadata changes from Google for v8.12.4

METADATA-VERSION.txt

@@ -2,4 +2,4 @@
 # It can be a commit, branch or tag of the https://github.com/google/libphonenumber project
 #
 # For more information, look at the phing tasks in build.xml
-v8.12.3
+v8.12.4

src/carrier/data/en/216.php

@@ -19,6 +19,7 @@
   21644 => 'Tunisie Telecom',
   21645 => 'Watany Ettisalat',
   21646 => 'Ooredoo',
+  21647 => 'Tunisie Telecom',
   2165 => 'Orange',
   2169 => 'Tunisie Telecom',
 );

src/carrier/data/en/61.php

@@ -106,6 +106,7 @@
   61484 => 'Telstra',
   61485 => 'TravelSIM',
   614858 => 'Pivotel Satellite',
+  61486 => 'Telstra',
   61487 => 'Telstra',
   61488 => 'Telstra',
   614888 => 'My Number',

src/carrier/data/en/63.php

@@ -47,6 +47,7 @@
   63960 => 'Smart',
   63961 => 'Smart',
   63962 => 'Smart',
+  63963 => 'Smart',
   63965 => 'Globe',
   63966 => 'Globe',
   63967 => 'Globe',

src/carrier/data/en/852.php

@@ -19,6 +19,7 @@
   8524614 => 'Sun Mobile',
   8524615 => 'China Unicom',
   8524616 => 'China Unicom',
+  852462 => 'SmarTone',
   8524640 => 'China Mobile',
   8524641 => 'SmarTone',
   8524642 => 'SmarTone',
@@ -243,6 +244,11 @@
   85270 => 'SmarTone',
   8528480 => 'Handy',
   8528481 => 'Sun Mobile',
+  8528485 => 'SmarTone',
+  8528486 => 'SmarTone',
+  8528487 => 'SmarTone',
+  8528488 => 'SmarTone',
+  8528489 => 'SmarTone',
   852901 => 'SmarTone',
   852902 => 'HKT',
   852903 => 'HKT',

src/carrier/data/en/95.php

@@ -23,12 +23,8 @@
   95949 => 'MPT',
   9595 => 'MPT',
   9596 => 'Mytel',
+  9597 => 'Telenor',
   95973 => 'MPT',
-  95975 => 'Telenor',
-  95976 => 'Telenor',
-  95977 => 'Telenor',
-  95978 => 'Telenor',
-  95979 => 'Telenor',
   95981 => 'MPT',
   95983 => 'MPT',
   95984 => 'MPT',

src/carrier/data/zh/852.php

@@ -19,6 +19,7 @@
   8524614 => '新移动通讯',
   8524615 => '中国联通',
   8524616 => '中国联通',
+  852462 => '数码通',
   8524640 => '中国移动',
   8524641 => '数码通',
   8524642 => '数码通',
@@ -203,6 +204,11 @@
   852699 => '中国移动',
   85270 => '数码通',
   8528481 => '新移动通讯',
+  8528485 => '数码通',
+  8528486 => '数码通',
+  8528487 => '数码通',
+  8528488 => '数码通',
+  8528489 => '数码通',
   852901 => '数码通',
   852902 => '香港移动通讯',
   852903 => '香港移动通讯',

src/data/PhoneNumberMetadata_AU.php

@@ -43,7 +43,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '4(?:83[0-38]|93[01])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-2457-9]|9[0-27-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:83[0-38]|93[0-4])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-24-9]|9[0-27-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_BR.php

@@ -158,7 +158,7 @@
   'countryCode' => 55,
   'internationalPrefix' => '00(?:1[245]|2[1-35]|31|4[13]|[56]5|99)',
   'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0(?:(1[245]|2[1-35]|31|4[13]|[56]5|99)(\\d{10,11}))?',
+  'nationalPrefixForParsing' => '(?:0|90)(?:(1[245]|2[1-35]|31|4[13]|[56]5|99)(\\d{10,11}))?',
   'nationalPrefixTransformRule' => '$2',
   'sameMobileAndFixedLinePattern' => false,
   'numberFormat' => 

src/data/PhoneNumberMetadata_CC.php

@@ -42,7 +42,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '4(?:83[0-38]|93[01])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-2457-9]|9[0-27-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:83[0-38]|93[0-4])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-24-9]|9[0-27-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_CX.php

@@ -42,7 +42,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '4(?:83[0-38]|93[01])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-2457-9]|9[0-27-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:83[0-38]|93[0-4])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[06-9]|7[02-9]|8[0-24-9]|9[0-27-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_HK.php

@@ -42,7 +42,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:46(?:[01][0-6]|4[0-57-9])|5730|(?:626|848)[01]|707[1-5]|929[03-9])\\d{4}|(?:5(?:[1-59][0-46-9]|6[0-4689]|7[0-2469])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:46(?:[01][0-6]|2[5-9]|4[0-57-9])|5730|626[01]|707[1-5]|848[015-9]|929[03-9])\\d{4}|(?:5(?:[1-59][0-46-9]|6[0-4689]|7[0-2469])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
     'ExampleNumber' => '51234567',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_MM.php

@@ -46,7 +46,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:17[01]|9(?:2[0-4]|(?:3[0-36]|(?:6\\d|8[89]|98)\\d)\\d|4(?:[1379]\\d|88)|5[0-6])\\d)\\d{4}|9(?:[69]1|73)\\d{6}|9(?:[68]\\d|9[089])\\d{5}|9(?:2[56]|34|4[0245]|7[5-9]|9[4-7])\\d{7}',
+    'NationalNumberPattern' => '(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|8[89]|9[4-8])\\d|7(?:3|40|[5-9]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}',
     'ExampleNumber' => '92123456',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_PH.php

@@ -52,7 +52,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:81[37]|9(?:0[5-9]|1[0-24-9]|2[0-35-9]|[35]\\d|4[235-9]|6[0-25-8]|7[1-9]|8[189]|9[4-9]))\\d{7}',
+    'NationalNumberPattern' => '(?:81[37]|9(?:0[5-9]|1[0-24-9]|2[0-35-9]|[35]\\d|4[235-9]|6[0-35-8]|7[1-9]|8[189]|9[4-9]))\\d{7}',
     'ExampleNumber' => '9051234567',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_PL.php

@@ -14,13 +14,14 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[1-57-9]\\d{6}(?:\\d{2})?|6\\d{5,8}',
+    'NationalNumberPattern' => '6\\d{5}(?:\\d{2})?|8\\d{9}|[1-9]\\d{6}(?:\\d{2})?',
     'PossibleLength' => 
     array (
       0 => 6,
       1 => 7,
       2 => 8,
       3 => 9,
+      4 => 10,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -53,11 +54,12 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '800\\d{6}',
+    'NationalNumberPattern' => '800\\d{6,7}',
     'ExampleNumber' => '800123456',
     'PossibleLength' => 
     array (
       0 => 9,
+      1 => 10,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -115,6 +117,10 @@
     'ExampleNumber' => '641234567',
     'PossibleLength' => 
     array (
+      0 => 6,
+      1 => 7,
+      2 => 8,
+      3 => 9,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -213,7 +219,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '39|45|5[0137]|6[0469]|7[02389]|8[08]',
+        0 => '39|45|5[0137]|6[0469]|7[02389]|8(?:0[14]|8)',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
@@ -225,7 +231,19 @@
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (
-        0 => '1[2-8]|[2-8]|9[145]',
+        0 => '1[2-8]|[2-7]|8[1-79]|9[145]',
+      ),
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ),
+    6 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '8',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',

src/data/PhoneNumberMetadata_TN.php

@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '3(?:001|[12]40)\\d{4}|(?:(?:[259]\\d|4[0-6])\\d|3(?:1[1-35]|6[0-4]|91))\\d{5}',
+    'NationalNumberPattern' => '3(?:001|[12]40)\\d{4}|(?:(?:[259]\\d|4[0-7])\\d|3(?:1[1-35]|6[0-4]|91))\\d{5}',
     'ExampleNumber' => '20123456',
     'PossibleLength' => 
     array (

src/data/ShortNumberMetadata_FI.php

@@ -62,7 +62,7 @@
   ),
   'shortCode' => 
   array (
-    'NationalNumberPattern' => '11(?:2|6111)|75[12]\\d\\d',
+    'NationalNumberPattern' => '11(?:2|611[17])|75[12]\\d\\d',
     'ExampleNumber' => '112',
     'PossibleLength' => 
     array (

src/data/ShortNumberMetadata_GB.php

@@ -28,7 +28,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '1(?:05|1(?:2|6\\d{3})|7[56]\\d|8000)|2(?:20\\d|48)|4444|999',
+    'NationalNumberPattern' => '1(?:05|1(?:[29]|6\\d{3})|7[56]\\d|8000)|2(?:20\\d|48)|4444|999',
     'ExampleNumber' => '105',
     'PossibleLength' => 
     array (
@@ -61,7 +61,7 @@
   ),
   'shortCode' => 
   array (
-    'NationalNumberPattern' => '1(?:0[015]|1(?:[12]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[1-3]|50)|33|4(?:1|7\\d)|571|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:0202|1300|2(?:02|11)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|(?:[68]\\d|7[089])\\d{3}|15\\d|2[02]2|650|789|9(?:01|99)',
+    'NationalNumberPattern' => '1(?:0[015]|1(?:[129]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[1-3]|50)|33|4(?:1|7\\d)|571|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:0202|1300|2(?:02|11)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|(?:[68]\\d|7[089])\\d{3}|15\\d|2[02]2|650|789|9(?:01|99)',
     'ExampleNumber' => '100',
     'PossibleLength' => 
     array (

src/data/ShortNumberMetadata_TH.php

@@ -60,7 +60,7 @@
   ),
   'shortCode' => 
   array (
-    'NationalNumberPattern' => '1(?:0[0-2]|1(?:0[03]|1[1-35]|2[0358]|3[03-79]|4[02-489]|5[04-9]|6[04-79]|7[03-9]|8[027-9]|9[02-79])|2(?:22|3[89]|66)|3(?:18|2[23]|3[013]|5[56]|6[45]|73)|477|5(?:0\\d|4[0-37-9]|5[1-8]|6[01679]|7[12568]|8[0-24589]|9[013589])|6(?:0[0-29]|2[03]|4[3-6]|6[1-9]|7[0257-9]|8[0158]|9[014-9])|7(?:[14]9|7[27]|90)|888|9[19])',
+    'NationalNumberPattern' => '1(?:0[0-2]|1(?:0[03]|1[1-35]|2[0358]|3[03-79]|4[02-489]|5[04-9]|6[04-79]|7[03-9]|8[027-9]|9[02-9])|2(?:22|3[89]|66)|3(?:18|2[23]|3[013]|5[56]|6[45]|73)|477|5(?:0\\d|4[0-37-9]|5[1-8]|6[01679]|7[12568]|8[0-24589]|9[013589])|6(?:0[0-29]|2[03]|4[3-6]|6[1-9]|7[0257-9]|8[0158]|9[014-9])|7(?:[14]9|7[27]|90)|888|9[19])',
     'ExampleNumber' => '100',
     'PossibleLength' => 
     array (
@@ -71,7 +71,7 @@
   ),
   'standardRate' => 
   array (
-    'NationalNumberPattern' => '1(?:1(?:03|1[15]|2[58]|3[056]|4[02-49]|5[046-9]|7[03-589]|9[579])|5(?:0[0-8]|4[0-378]|5[1-478]|7[156])|6(?:20|4[356]|6[1-68]|7[057-9]|8[015]|9[0457-9]))|1(?:1[68]|26|3[1-35]|5[689]|60|7[17])\\d',
+    'NationalNumberPattern' => '1(?:1(?:03|1[15]|2[58]|3[056]|4[02-49]|5[046-9]|7[03-589]|9[57-9])|5(?:0[0-8]|4[0-378]|5[1-478]|7[156])|6(?:20|4[356]|6[1-68]|7[057-9]|8[015]|9[0457-9]))|1(?:1[68]|26|3[1-35]|5[689]|60|7[17])\\d',
     'ExampleNumber' => '1103',
     'PossibleLength' => 
     array (

src/geocoding/data/en/12.php

@@ -2511,7 +2511,6 @@
   1242369 => 'Andros',
   1242373 => 'Grand Bahama',
   1242374 => 'Grand Bahama',
-  1242376 => 'Grand Bahama',
   1242377 => 'New Providence',
   124238 => 'New Providence',
   1242392 => 'New Providence',

src/geocoding/data/en/18.php

@@ -3780,7 +3780,7 @@
   1867 => 'Northwest Territories/Nunavut/Yukon',
   1867393 => 'Whitehorse, YT',
   1867456 => 'Whitehorse, YT',
-  1867536 => 'Watson Lake Hospital',
+  1867536 => 'Watson Lake',
   1867633 => 'Whitehorse, YT',
   1867645 => 'Rankin Inlet, NU',
   1867667 => 'Whitehorse, YT',