Merge pull request #430 from giggsey/upstream-8.12.18

Upstream metadata changes from Google for v8.12.18
giggsey · Feb 8, 2021 · 2d50e0a · 2d50e0a
2 parents d914436 + 255cf40
commit 2d50e0a
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 35 deletions.
diff --git 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.12.17
+v8.12.18
diff --git a/src/carrier/data/en/225.php b/src/carrier/data/en/225.php
@@ -21,7 +21,7 @@
   22508 => 'Orange',
   22509 => 'Orange',
   225208 => 'Moov',
-  225218 => 'Moov',
+  2252180 => 'Moov',
   225228 => 'Moov',
   225238 => 'Moov',
   22540 => 'Moov',

diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php
@@ -25,6 +25,8 @@
   658033 => 'TPG',
   658034 => 'TPG',
   658035 => 'TPG',
+  658036 => 'SingTel',
+  658037 => 'SingTel',
   6581 => 'StarHub',
   65810 => 'M1',
   65812 => 'SingTel',

diff --git a/src/carrier/data/en/676.php b/src/carrier/data/en/676.php
@@ -26,4 +26,5 @@
   67687 => 'Digicel',
   67688 => 'Digicel',
   67689 => 'Digicel',
+  6769 => 'Digicel',
 );
diff --git a/src/data/PhoneNumberAlternateFormats_676.php b/src/data/PhoneNumberAlternateFormats_676.php
@@ -24,7 +24,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[5-8]',
+        0 => '[5-9]',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',

diff --git a/src/data/PhoneNumberMetadata_CI.php b/src/data/PhoneNumberMetadata_CI.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:2(?:0[023]|12[0-3]8|[23][045]|4[03-5]|5(?:2[0-4]|3[0-6])0|7(?:2(?:0[23]|1[2357]|[23][45]|4[3-5])|3(?:06|1[69]|[2-6]7)))|3(?:0[06]|1[069]|[2-4][07]|5[09]|6[08]))\\d{5}|21[02357]\\d{5}',
+    'NationalNumberPattern' => '(?:2(?:0[023]|[15]\\d{3}|7(?:2(?:0[23]|1[2357]|[23][45]|4[3-5])|3(?:06|1[69]|[2-6]7)))|3(?:0[06]|1[069]|[2-4][07]|5[09]|6[08]))\\d{5}|2(?:1[02357]|[23][045]|4[03-5])\\d{5}',
     'ExampleNumber' => '21234567',
     'PossibleLength' => 
     array (
@@ -37,7 +37,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:(?:0(?:1(?:0[1-3]|[457][0-3])|5[04-9][4-6]|7(?:[04-8][7-9]|9[78]))|[457]\\d|6[014-9]|8[4-9]|9[4-8])\\d\\d|2[0-3]80)\\d{4}|0[1-9]\\d{6}',
+    'NationalNumberPattern' => '(?:(?:0(?:[15]\\d\\d|7(?:[04-8][7-9]|9[78]))|[457]\\d|6[014-9]|8[4-9]|9[4-8])\\d\\d|2[0-3]80)\\d{4}|0[1-9]\\d{6}',
     'ExampleNumber' => '01234567',
     'PossibleLength' => 
     array (
@@ -148,7 +148,8 @@
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[03-9]|2[0-4]',
+        0 => '[03-9]|2(?:[02-4]|1[023578])',
+        1 => '[03-9]|2(?:[02-4]|1(?:[02357]|80))',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',

diff --git a/src/data/PhoneNumberMetadata_IR.php b/src/data/PhoneNumberMetadata_IR.php
@@ -47,7 +47,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '99(?:5[15]0|888|9(?:0[013]|21|77|88))\\d{5}|9(?:0(?:[1-35]\\d|4[4-6])|(?:[13]\\d|2[0-3])\\d|9(?:[0-2]\\d|3[01]|4[45]|81|9[19]))\\d{6}',
+    'NationalNumberPattern' => '99(?:5[15]0|888|9(?:0[013]|21|77|88))\\d{5}|9(?:0(?:[1-35]\\d|4[4-6])|(?:[13]\\d|2[0-3])\\d|9(?:[0-2]\\d|3[01]|4[0145]|81|9[19]))\\d{6}',
     'ExampleNumber' => '9123456789',
     'PossibleLength' => 
     array (

diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php
@@ -39,7 +39,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:8(?:0(?:1\\d|2[0147-9]|3[013-5])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-2]))|9[0-8]\\d\\d)\\d{4}',
+    'NationalNumberPattern' => '(?:8(?:0(?:1\\d|2[0147-9]|3[013-7])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-2]))|9[0-8]\\d\\d)\\d{4}',
     'ExampleNumber' => '81234567',
     'PossibleLength' => 
     array (

diff --git a/src/data/PhoneNumberMetadata_TO.php b/src/data/PhoneNumberMetadata_TO.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:0800|[5-8]\\d{3})\\d{3}|[2-8]\\d{4}',
+    'NationalNumberPattern' => '(?:0800|(?:[5-8]\\d\\d|999)\\d)\\d{3}|[2-8]\\d{4}',
     'PossibleLength' => 
     array (
       0 => 5,
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '6(?:3[02]|8[5-9])\\d{4}|(?:6[09]|7\\d|8[46-9])\\d{5}',
+    'NationalNumberPattern' => '(?:6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
     'ExampleNumber' => '7715123',
     'PossibleLength' => 
     array (
@@ -178,7 +178,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[5-8]',
+        0 => '[5-9]',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',

diff --git a/src/geocoding/data/en/225.php b/src/geocoding/data/en/225.php
@@ -26,18 +26,18 @@
   225234 => 'Banco, Abidjan',
   225235 => 'Banco, Abidjan',
   22524 => 'Abobo, Abidjan',
-  2252520 => 'Plateau, Abidjan',
-  2252521 => 'Abidjan (southeast)',
-  2252522 => 'Cocody, Abidjan',
-  2252523 => 'Banco, Abidjan',
-  2252524 => 'Abobo, Abidjan',
-  2252530 => 'Yamoussoukro',
-  2252531 => 'Bouaké',
-  2252532 => 'Daloa',
-  2252533 => 'Man',
-  2252534 => 'San-Pédro',
-  2252535 => 'Abengourou',
-  2252536 => 'Korhogo',
+  22525200 => 'Plateau, Abidjan',
+  22525210 => 'Abidjan (southeast)',
+  22525220 => 'Cocody, Abidjan',
+  22525230 => 'Banco, Abidjan',
+  22525240 => 'Abobo, Abidjan',
+  22525300 => 'Yamoussoukro',
+  22525310 => 'Bouaké',
+  22525320 => 'Daloa',
+  22525330 => 'Man',
+  22525340 => 'San-Pédro',
+  22525350 => 'Abengourou',
+  22525360 => 'Korhogo',
   2252720 => 'Plateau, Abidjan',
   2252721 => 'Abidjan (southeast)',
   2252722 => 'Cocody, Abidjan',

diff --git a/src/geocoding/data/fr/225.php b/src/geocoding/data/fr/225.php
@@ -26,18 +26,18 @@
   225234 => 'Banco, Abidjan',
   225235 => 'Banco, Abidjan',
   22524 => 'Abobo, Abidjan',
-  2252520 => 'Plateau, Abidjan',
-  2252521 => 'Abidjan (southeast)',
-  2252522 => 'Cocody, Abidjan',
-  2252523 => 'Banco, Abidjan',
-  2252524 => 'Abobo, Abidjan',
-  2252530 => 'Yamoussoukro',
-  2252531 => 'Bouaké',
-  2252532 => 'Daloa',
-  2252533 => 'Man',
-  2252534 => 'San-Pédro',
-  2252535 => 'Abengourou',
-  2252536 => 'Korhogo',
+  22525200 => 'Plateau, Abidjan',
+  22525210 => 'Abidjan (southeast)',
+  22525220 => 'Cocody, Abidjan',
+  22525230 => 'Banco, Abidjan',
+  22525240 => 'Abobo, Abidjan',
+  22525300 => 'Yamoussoukro',
+  22525310 => 'Bouaké',
+  22525320 => 'Daloa',
+  22525330 => 'Man',
+  22525340 => 'San-Pédro',
+  22525350 => 'Abengourou',
+  22525360 => 'Korhogo',
   2252720 => 'Plateau, Abidjan',
   2252721 => 'Abidjan (southeast)',
   2252722 => 'Cocody, Abidjan',