Merge pull request #596 from giggsey/upstream-8.13.21

Upstream metadata changes from Google for v8.13.21

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.20
+v8.13.21

src/carrier/data/en/61.php

@@ -77,6 +77,7 @@
   61459 => 'Telstra',
   61460 => 'Telstra',
   61461 => 'Telstra',
+  61462 => 'Telstra',
   61466 => 'Optus',
   61467 => 'Telstra',
   61468 => 'Optus',
@@ -101,6 +102,9 @@
   614801 => 'Telstra',
   614803 => 'Telstra',
   614804 => 'Telstra',
+  614805 => 'Telstra',
+  614806 => 'Telstra',
+  614807 => 'Telstra',
   614808 => 'Pivotel Satellite',
   61481 => 'Optus',
   61482 => 'Optus',

src/data/PhoneNumberMetadata_AU.php

@@ -44,7 +44,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[016-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-26-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_CC.php

@@ -43,7 +43,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[016-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-26-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_CX.php

@@ -43,7 +43,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[016-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-26-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_MX.php

@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '1(?:(?:[27]2|44|99)[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-9]|8[1-79]|9[1-8])|[2-9]\\d)\\d{8}',
+    'NationalNumberPattern' => '1(?:(?:[27]2|44|87|99)[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-9]|8[1-69]|9[1-8])|[2-9]\\d)\\d{8}',
     'PossibleLength' => 
     array (
       0 => 10,
@@ -28,7 +28,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:0[01]|2\\d|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]|[25-7][1-9]|3[1-8]|4\\d|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(?:[13467][1-9]|2\\d|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]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
+    'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:0[01]|2\\d|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]|[25-7][1-9]|3[1-8]|4\\d|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(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
     'ExampleNumber' => '2001234567',
     'PossibleLength' => 
     array (
@@ -42,7 +42,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '657[12]\\d{6}|(?: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]))|2(?:2\\d|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]|[25-7][1-9]|3[1-8]|4\\d|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(?:[13467][1-9]|2\\d|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]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
+    'NationalNumberPattern' => '657[12]\\d{6}|(?: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]))|2(?:2\\d|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]|[25-7][1-9]|3[1-8]|4\\d|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(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
     'ExampleNumber' => '12221234567',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_UY.php

@@ -14,21 +14,25 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:0004|4)\\d{9}|[1249]\\d{7}|(?:[49]\\d|80)\\d{5}',
+    'NationalNumberPattern' => '0004\\d{2,9}|4\\d{9}|[1249]\\d{7}|(?:[49]\\d|80)\\d{5}',
     'PossibleLength' => 
     array (
-      0 => 7,
-      1 => 8,
-      2 => 10,
-      3 => 13,
+      0 => 6,
+      1 => 7,
+      2 => 8,
+      3 => 9,
+      4 => 10,
+      5 => 11,
+      6 => 12,
+      7 => 13,
     ),
     'PossibleLengthLocalOnly' => 
     array (
     ),
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:1(?:770|987)|(?:2\\d|4[2-7])\\d\\d)\\d{4}',
+    'NationalNumberPattern' => '(?:1(?:770|9(?:20|87))|(?:2\\d|4[2-7])\\d\\d)\\d{4}',
     'ExampleNumber' => '21231234',
     'PossibleLength' => 
     array (
@@ -53,13 +57,10 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '(?:(?:0004|4)\\d{5}|80[05])\\d{4}|405\\d{4}',
+    'NationalNumberPattern' => '0004\\d{2,9}|(?:4\\d{5}|80[05])\\d{4}|405\\d{4}',
     'ExampleNumber' => '8001234',
     'PossibleLength' => 
     array (
-      0 => 7,
-      1 => 10,
-      2 => 13,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -158,6 +159,18 @@
   'numberFormat' => 
   array (
     0 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{3,4})',
+      'format' => '$1 $2',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '0',
+      ),
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ),
+    1 => 
     array (
       'pattern' => '(\\d{3})(\\d{4})',
       'format' => '$1 $2',
@@ -169,7 +182,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ),
-    1 => 
+    2 => 
     array (
       'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
       'format' => '$1 $2 $3',
@@ -181,7 +194,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ),
-    2 => 
+    3 => 
     array (
       'pattern' => '(\\d{4})(\\d{4})',
       'format' => '$1 $2',
@@ -193,7 +206,19 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ),
-    3 => 
+    4 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{3})(\\d{2,4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '0',
+      ),
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ),
+    5 => 
     array (
       'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -205,9 +230,9 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ),
-    4 => 
+    6 => 
     array (
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{4})',
+      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{2,4})',
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (

src/geocoding/data/en/52.php

@@ -338,6 +338,7 @@
   52867 => 'Nuevo Laredo/Tamaulipas',
   52868 => 'Tamaulipas',
   52869 => 'Cuatro Cienegas/San Buenaventura, COAH',
+  52870 => 'Coahuila/Durango',
   52871 => 'Coahuila',
   52872 => 'Coahuila/Durango',
   52873 => 'Nuevo Leon',

src/geocoding/data/en/61.php

@@ -2982,7 +2982,7 @@
   61251187 => 'Uriarra Forest',
   61251188 => 'Yass',
   61251189 => 'Anembo',
-  61251190 => 'Binalong',
+  61251190 => 'Canberra',
   61251191 => 'Bungendore',
   61251192 => 'Burrinjuck',
   61251193 => 'Canberra',
@@ -2992,9 +2992,9 @@
   61251197 => 'Gundaroo',
   61251198 => 'Michelago',
   61251199 => 'Rye Park',
-  61251200 => 'The Mullion',
-  61251201 => 'Uriarra Forest',
-  61251202 => 'Yass',
+  61251200 => 'Binalong',
+  61251201 => 'Anembo',
+  61251202 => 'Bungendore',
   61251203 => 'Anembo',
   61251204 => 'Binalong',
   61251205 => 'Bungendore',
@@ -3009,16 +3009,16 @@
   61251214 => 'The Mullion',
   61251215 => 'Uriarra Forest',
   61251216 => 'Yass',
-  61251217 => 'Anembo',
+  61251217 => 'Burrinjuck',
   61251218 => 'Binalong',
-  61251219 => 'Bungendore',
+  61251219 => 'Canberra',
   6125122 => 'Canberra',
   6125123 => 'Canberra',
   6125124 => 'Canberra',
   6125125 => 'Canberra',
   6125126 => 'Canberra',
   6125127 => 'Canberra',
-  61251280 => 'Burrinjuck',
+  61251280 => 'Canberra',
   61251281 => 'Canberra',
   61251282 => 'Captains Flat',
   61251283 => 'Cavan',
@@ -3028,47 +3028,19 @@
   61251287 => 'Rye Park',
   61251288 => 'The Mullion',
   61251289 => 'Uriarra Forest',
-  61251290 => 'Yass',
+  61251290 => 'Captains Flat',
   61251291 => 'Canberra',
-  612530000 => 'Leadville',
-  612530001 => 'Leadville',
-  612530002 => 'Leadville',
-  612530003 => 'Leadville',
-  612530004 => 'Leadville/Baldry/Bathurst/Birriwa',
-  612530005 => 'Leadville/Baldry/Bathurst/Birriwa',
-  612530006 => 'Leadville',
-  612530007 => 'Baldry',
-  612530008 => 'Bathurst',
-  612530009 => 'Birriwa',
-  612530010 => 'Lue',
-  612530011 => 'Lue',
-  612530012 => 'Lue',
-  612530013 => 'Lue',
-  612530014 => 'Lue/Blayney/Boorowa/Bribbaree',
-  612530015 => 'Lue/Blayney/Boorowa/Bribbaree',
-  612530016 => 'Lue',
-  612530017 => 'Blayney',
-  612530018 => 'Boorowa',
-  612530019 => 'Bribbaree',
-  61253002 => 'Mudgee',
-  612530029 => 'Burraga',
-  612530030 => 'Twelve Mile',
-  612530031 => 'Twelve Mile',
-  612530032 => 'Twelve Mile',
-  612530033 => 'Twelve Mile',
-  612530034 => 'Twelve Mile/Bylong/Canowindra/Bathurst',
-  612530035 => 'Twelve Mile/Bylong/Canowindra/Bathurst',
-  612530036 => 'Twelve Mile',
-  612530037 => 'Bylong',
-  612530038 => 'Canowindra',
-  612530039 => 'Bathurst',
-  61253004 => 'Windeyer',
-  612530048 => 'Caragabal',
-  612530049 => 'Cassilis',
-  61253005 => 'Wollar',
-  612530055 => 'Lithgow',
-  612530056 => 'Orange',
-  612530059 => 'Coolah',
+  61251292 => 'Canberra',
+  612513 => 'Cavan/Canberra/Gearys Gap/Gundaroo/Bungendore/Michelago/Burrinjuck/Rye Park/The Mullion/Captains Flat/UriarraForest/Yass',
+  612514 => 'Canberra/Gearys Gap/Gundaroo/Michelago/Rye Park/The Mullion/Uriarra Forest/Yass/Anembo/Binalong/Bungendore/Burrinjuck/Captains Flat/Cavan',
+  612515 => 'Canberra',
+  612516 => 'Canberra',
+  61253000 => 'Leadville/Baldry/Bathurst/Birriwa',
+  61253001 => 'Lue/Blayney/Boorowa/Bribbaree/Birriwa',
+  61253002 => 'Boorowa/Bribbaree/Burraga/Mudgee',
+  61253003 => 'Bathurst/Burraga/Bylong/Canowindra/Twelve Mile',
+  61253004 => 'Canowindra/Caragabal/Cassilis/Windeyer',
+  61253005 => 'Cassilis/Coolah/Lithgow/Orange/Wollar',
   61253006 => 'Baldry',
   612530068 => 'Cowra',
   612530069 => 'Cudal',