Merge remote branch 'origin/master' into hhvm

* origin/master: Metadata updates from Google v5.9.4 (r648) Remove duplicates from inputOutputFile mappings Data update from Google (r657) Geocoding data update from Google (r646) Geocoding data update from Google (r645)
giggsey · Feb 12, 2014 · bf6ff68 · bf6ff68
2 parents 4440358 + d61d134
commit bf6ff68
Show file tree

Hide file tree

Showing 53 changed files with 282,483 additions and 1,381 deletions.
diff --git a/build/libphonenumber/buildtools/GeneratePhonePrefixData.php b/build/libphonenumber/buildtools/GeneratePhonePrefixData.php
@@ -104,7 +104,10 @@ private function createOutputFileNames($file, $countryCode, $language)
             $this->parseTextFile(
                 $this->getFilePathFromLanguageAndCountryCode($language, $countryCode),
                 function ($prefix, $location) use (&$phonePrefixes) {
-                    $phonePrefixes[] = substr($prefix, 0, 4);
+                    $shortPrefix = substr($prefix, 0, 4);
+                    if (!in_array($shortPrefix, $phonePrefixes)) {
+                        $phonePrefixes[] = $shortPrefix;
+                    }
                 }
             );
 

diff --git a/src/libphonenumber/carrier/data/Map.php b/src/libphonenumber/carrier/data/Map.php
@@ -14,163 +14,165 @@
     1 => 1246,
     2 => 1264,
     3 => 1441,
-    4 => 1649,
-    5 => 1671,
-    6 => 1767,
-    7 => 1787,
-    8 => 1809,
-    9 => 1868,
-    10 => 1939,
-    11 => 20,
-    12 => 211,
-    13 => 212,
-    14 => 213,
-    15 => 216,
-    16 => 220,
-    17 => 221,
-    18 => 222,
-    19 => 223,
-    20 => 224,
-    21 => 225,
-    22 => 226,
-    23 => 227,
-    24 => 228,
-    25 => 229,
-    26 => 230,
-    27 => 231,
-    28 => 232,
-    29 => 233,
-    30 => 234,
-    31 => 235,
-    32 => 236,
-    33 => 237,
-    34 => 238,
-    35 => 239,
-    36 => 240,
-    37 => 241,
-    38 => 242,
-    39 => 243,
-    40 => 244,
-    41 => 245,
-    42 => 248,
-    43 => 249,
-    44 => 250,
-    45 => 251,
-    46 => 252,
-    47 => 253,
-    48 => 254,
-    49 => 255,
-    50 => 256,
-    51 => 257,
-    52 => 258,
-    53 => 260,
-    54 => 261,
-    55 => 263,
-    56 => 265,
-    57 => 267,
-    58 => 268,
-    59 => 27,
-    60 => 297,
-    61 => 298,
-    62 => 299,
-    63 => 30,
-    64 => 31,
-    65 => 32,
-    66 => 33,
-    67 => 350,
-    68 => 351,
-    69 => 352,
-    70 => 353,
-    71 => 355,
-    72 => 356,
-    73 => 357,
-    74 => 358,
-    75 => 359,
-    76 => 36,
-    77 => 370,
-    78 => 372,
-    79 => 374,
-    80 => 375,
-    81 => 376,
-    82 => 380,
-    83 => 381,
-    84 => 385,
-    85 => 386,
-    86 => 387,
-    87 => 389,
-    88 => 39,
-    89 => 40,
-    90 => 41,
-    91 => 420,
-    92 => 421,
-    93 => 43,
-    94 => 45,
-    95 => 47,
-    96 => 48,
-    97 => 49,
-    98 => 501,
-    99 => 506,
-    100 => 51,
-    101 => 53,
-    102 => 54,
-    103 => 55,
-    104 => 56,
-    105 => 57,
-    106 => 58,
-    107 => 591,
-    108 => 595,
-    109 => 597,
-    110 => 598,
-    111 => 599,
-    112 => 60,
-    113 => 61,
-    114 => 62,
-    115 => 63,
-    116 => 64,
-    117 => 65,
-    118 => 66,
-    119 => 670,
-    120 => 673,
-    121 => 675,
-    122 => 676,
-    123 => 677,
-    124 => 678,
-    125 => 679,
-    126 => 685,
-    127 => 686,
-    128 => 7,
-    129 => 84,
-    130 => 852,
-    131 => 855,
-    132 => 856,
-    133 => 86,
-    134 => 880,
-    135 => 90,
-    136 => 91,
-    137 => 92,
-    138 => 93,
-    139 => 94,
-    140 => 960,
-    141 => 962,
-    142 => 964,
-    143 => 965,
-    144 => 966,
-    145 => 967,
-    146 => 968,
-    147 => 970,
-    148 => 971,
-    149 => 972,
-    150 => 973,
-    151 => 974,
-    152 => 975,
-    153 => 977,
-    154 => 98,
-    155 => 992,
-    156 => 993,
-    157 => 994,
-    158 => 995,
-    159 => 996,
-    160 => 998,
+    4 => 1473,
+    5 => 1649,
+    6 => 1671,
+    7 => 1767,
+    8 => 1787,
+    9 => 1809,
+    10 => 1868,
+    11 => 1939,
+    12 => 20,
+    13 => 211,
+    14 => 212,
+    15 => 213,
+    16 => 216,
+    17 => 220,
+    18 => 221,
+    19 => 222,
+    20 => 223,
+    21 => 224,
+    22 => 225,
+    23 => 226,
+    24 => 227,
+    25 => 228,
+    26 => 229,
+    27 => 230,
+    28 => 231,
+    29 => 232,
+    30 => 233,
+    31 => 234,
+    32 => 235,
+    33 => 236,
+    34 => 237,
+    35 => 238,
+    36 => 239,
+    37 => 240,
+    38 => 241,
+    39 => 242,
+    40 => 243,
+    41 => 244,
+    42 => 245,
+    43 => 248,
+    44 => 249,
+    45 => 250,
+    46 => 251,
+    47 => 252,
+    48 => 253,
+    49 => 254,
+    50 => 255,
+    51 => 256,
+    52 => 257,
+    53 => 258,
+    54 => 260,
+    55 => 261,
+    56 => 263,
+    57 => 265,
+    58 => 267,
+    59 => 268,
+    60 => 27,
+    61 => 297,
+    62 => 298,
+    63 => 299,
+    64 => 30,
+    65 => 31,
+    66 => 32,
+    67 => 33,
+    68 => 350,
+    69 => 351,
+    70 => 352,
+    71 => 353,
+    72 => 355,
+    73 => 356,
+    74 => 357,
+    75 => 358,
+    76 => 359,
+    77 => 36,
+    78 => 370,
+    79 => 372,
+    80 => 373,
+    81 => 374,
+    82 => 375,
+    83 => 376,
+    84 => 380,
+    85 => 381,
+    86 => 385,
+    87 => 386,
+    88 => 387,
+    89 => 389,
+    90 => 39,
+    91 => 40,
+    92 => 41,
+    93 => 420,
+    94 => 421,
+    95 => 43,
+    96 => 45,
+    97 => 47,
+    98 => 48,
+    99 => 49,
+    100 => 501,
+    101 => 506,
+    102 => 51,
+    103 => 53,
+    104 => 54,
+    105 => 55,
+    106 => 56,
+    107 => 57,
+    108 => 58,
+    109 => 591,
+    110 => 595,
+    111 => 597,
+    112 => 598,
+    113 => 599,
+    114 => 60,
+    115 => 61,
+    116 => 62,
+    117 => 63,
+    118 => 64,
+    119 => 65,
+    120 => 66,
+    121 => 670,
+    122 => 673,
+    123 => 675,
+    124 => 676,
+    125 => 677,
+    126 => 678,
+    127 => 679,
+    128 => 685,
+    129 => 686,
+    130 => 7,
+    131 => 84,
+    132 => 852,
+    133 => 855,
+    134 => 856,
+    135 => 86,
+    136 => 880,
+    137 => 90,
+    138 => 91,
+    139 => 92,
+    140 => 93,
+    141 => 94,
+    142 => 960,
+    143 => 962,
+    144 => 964,
+    145 => 965,
+    146 => 966,
+    147 => 967,
+    148 => 968,
+    149 => 970,
+    150 => 971,
+    151 => 972,
+    152 => 973,
+    153 => 974,
+    154 => 975,
+    155 => 977,
+    156 => 98,
+    157 => 992,
+    158 => 993,
+    159 => 994,
+    160 => 995,
+    161 => 996,
+    162 => 998,
   ),
   'ru' => 
   array (

diff --git a/src/libphonenumber/carrier/data/en/1473.php b/src/libphonenumber/carrier/data/en/1473.php
@@ -0,0 +1,5 @@
+<?php
+return array (
+  1473520 => 'Affordable Island Communications',
+  1473521 => 'Affordable Island Communications',
+);
diff --git a/src/libphonenumber/carrier/data/en/213.php b/src/libphonenumber/carrier/data/en/213.php
@@ -1,5 +1,6 @@
 <?php
 return array (
+  21354 => 'Nedjma',
   21355 => 'Nedjma',
   21356 => 'Nedjma',
   2136 => 'Mobilis',

diff --git a/src/libphonenumber/carrier/data/en/226.php b/src/libphonenumber/carrier/data/en/226.php
@@ -7,13 +7,9 @@
   22664 => 'Airtel',
   22665 => 'Airtel',
   22666 => 'Airtel',
-  226670 => 'Airtel',
-  226680 => 'Telecel Faso',
-  226681 => 'Telecel Faso',
-  226682 => 'Telecel Faso',
-  226683 => 'Telecel Faso',
-  226684 => 'Telecel Faso',
-  226685 => 'Telecel Faso',
+  22667 => 'Airtel',
+  22668 => 'Telecel Faso',
+  22669 => 'Telecel Faso',
   22670 => 'Telmob',
   22671 => 'Telmob',
   22672 => 'Telmob',

diff --git a/src/libphonenumber/carrier/data/en/229.php b/src/libphonenumber/carrier/data/en/229.php
@@ -1,6 +1,9 @@
 <?php
 return array (
+  22961 => 'MTN',
   22964 => 'Moov',
+  22966 => 'MTN',
+  22967 => 'MTN',
   22968 => 'Glo',
   22990 => 'Libercom',
   22993 => 'BLK',

diff --git a/src/libphonenumber/carrier/data/en/234.php b/src/libphonenumber/carrier/data/en/234.php
@@ -226,7 +226,8 @@
   2348885 => 'Starcomms',
   2348886 => 'Starcomms',
   2348887 => 'Starcomms',
-  2349091 => 'Etisalat',
+  234903 => 'MTN',
+  234909 => 'Etisalat',
   234980 => 'Starcomms',
   234987 => 'Starcomms',
 );
diff --git a/src/libphonenumber/carrier/data/en/267.php b/src/libphonenumber/carrier/data/en/267.php
@@ -31,4 +31,5 @@
   267767 => 'Mascom',
   267769 => 'Orange',
   267776 => 'Mascom',
+  267777 => 'Mascom',
 );