From 82dbb587f2682ed389295293f1a511e2e778cbcf Mon Sep 17 00:00:00 2001
From: Joshua Gigg <giggsey@gmail.com>
Date: Tue, 25 Nov 2014 13:22:15 +0000
Subject: [PATCH] Upstream changes from Google (r729)

* Metadata changes:
 - New alternate formatting data for country calling code(s): 676
 - Updated phone metadata for region code(s):
   BI, CM, ID, IR, KR, LA, NP, TG, TH, TO
 - New geocoding data for country calling code(s): 237 (en)
 - Updated geocoding data for country calling code(s): 98 (en, fa)
 - Updated carrier data for country calling code(s):
   237 (en), 257 (en), 856 (en), 977 (en)
---
 .../AlternateFormatsCountryCodeSet.php        |  11 +-
 src/libphonenumber/carrier/data/en/237.php    |  15 +-
 src/libphonenumber/carrier/data/en/257.php    |   1 +
 src/libphonenumber/carrier/data/en/856.php    |   2 +
 src/libphonenumber/carrier/data/en/977.php    |  12 +-
 .../data/PhoneNumberAlternateFormats_676.php  | 110 +++
 .../data/PhoneNumberMetadata_BI.php           |   6 +-
 .../data/PhoneNumberMetadata_CM.php           |  35 +-
 .../data/PhoneNumberMetadata_ID.php           |   9 +-
 .../data/PhoneNumberMetadata_IR.php           | 138 +--
 .../data/PhoneNumberMetadata_KR.php           |  15 +-
 .../data/PhoneNumberMetadata_LA.php           |   2 +-
 .../data/PhoneNumberMetadata_NP.php           |  28 +-
 .../data/PhoneNumberMetadata_TG.php           |   2 +-
 .../data/PhoneNumberMetadata_TH.php           |  12 +-
 .../data/PhoneNumberMetadata_TO.php           |   4 +-
 src/libphonenumber/geocoding/data/Map.php     | 881 +++++++++---------
 src/libphonenumber/geocoding/data/en/237.php  | 119 +++
 src/libphonenumber/geocoding/data/en/98.php   | 165 +---
 src/libphonenumber/geocoding/data/fa/98.php   | 173 +---
 20 files changed, 854 insertions(+), 886 deletions(-)
 create mode 100644 src/libphonenumber/data/PhoneNumberAlternateFormats_676.php
 create mode 100644 src/libphonenumber/geocoding/data/en/237.php

diff --git a/src/libphonenumber/AlternateFormatsCountryCodeSet.php b/src/libphonenumber/AlternateFormatsCountryCodeSet.php
index 453df8ed4..081ed0b35 100644
--- a/src/libphonenumber/AlternateFormatsCountryCodeSet.php
+++ b/src/libphonenumber/AlternateFormatsCountryCodeSet.php
@@ -48,11 +48,12 @@ class AlternateFormatsCountryCodeSet {
   34 => 506,
   35 => 595,
   36 => 675,
-  37 => 679,
-  38 => 855,
-  39 => 971,
-  40 => 972,
-  41 => 995,
+  37 => 676,
+  38 => 679,
+  39 => 855,
+  40 => 971,
+  41 => 972,
+  42 => 995,
 );
 
 }
diff --git a/src/libphonenumber/carrier/data/en/237.php b/src/libphonenumber/carrier/data/en/237.php
index 2d5f7e815..0dfeea8fd 100644
--- a/src/libphonenumber/carrier/data/en/237.php
+++ b/src/libphonenumber/carrier/data/en/237.php
@@ -5,6 +5,17 @@
  */
 
 return array (
-  2377 => 'MTN Cameroon',
-  2379 => 'Orange',
+  237650 => 'MTN Cameroon',
+  237651 => 'MTN Cameroon',
+  237652 => 'MTN Cameroon',
+  237653 => 'MTN Cameroon',
+  237654 => 'MTN Cameroon',
+  237655 => 'Orange',
+  237656 => 'Orange',
+  237657 => 'Orange',
+  237658 => 'Orange',
+  237659 => 'Orange',
+  23766 => 'NEXTTEL',
+  23767 => 'MTN Cameroon',
+  23769 => 'Orange',
 );
diff --git a/src/libphonenumber/carrier/data/en/257.php b/src/libphonenumber/carrier/data/en/257.php
index d9d1c2f04..566f2846e 100644
--- a/src/libphonenumber/carrier/data/en/257.php
+++ b/src/libphonenumber/carrier/data/en/257.php
@@ -6,6 +6,7 @@
 
 return array (
   25729 => 'Leo',
+  25769 => 'Viettel',
   25771 => 'Leo',
   25775 => 'Smart Mobile',
   25776 => 'Econet',
diff --git a/src/libphonenumber/carrier/data/en/856.php b/src/libphonenumber/carrier/data/en/856.php
index b11564ade..3449e2ab1 100644
--- a/src/libphonenumber/carrier/data/en/856.php
+++ b/src/libphonenumber/carrier/data/en/856.php
@@ -6,5 +6,7 @@
 
 return array (
   856202 => 'ETL',
+  856205 => 'Lao Telecom',
   856207 => 'Beeline',
+  856209 => 'Unitel',
 );
diff --git a/src/libphonenumber/carrier/data/en/977.php b/src/libphonenumber/carrier/data/en/977.php
index 859f1f168..09535127e 100644
--- a/src/libphonenumber/carrier/data/en/977.php
+++ b/src/libphonenumber/carrier/data/en/977.php
@@ -5,5 +5,15 @@
  */
 
 return array (
-  97798 => 'Namaste / NT Mobile',
+  977960 => 'STM Telecom',
+  977961 => 'Smart Telecom',
+  977963 => 'NSTPL',
+  977972 => 'UTL',
+  977974 => 'NDCL',
+  977975 => 'NDCL',
+  977980 => 'NCell',
+  977981 => 'NCell',
+  977984 => 'Nepal Telecom',
+  977985 => 'Nepal Telecom',
+  977986 => 'Nepal Telecom',
 );
diff --git a/src/libphonenumber/data/PhoneNumberAlternateFormats_676.php b/src/libphonenumber/data/PhoneNumberAlternateFormats_676.php
new file mode 100644
index 000000000..8cd92f391
--- /dev/null
+++ b/src/libphonenumber/data/PhoneNumberAlternateFormats_676.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * This file is automatically @generated by {@link BuildMetadataPHPFromXml}.
+ * Please don't modify it directly.
+ */
+
+
+return array (
+  'generalDesc' => 
+  array (
+  ),
+  'fixedLine' => 
+  array (
+  ),
+  'mobile' => 
+  array (
+  ),
+  'tollFree' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'premiumRate' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'sharedCost' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'personalNumber' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'voip' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'pager' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'uan' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'emergency' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'voicemail' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'shortCode' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'standardRate' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'carrierSpecific' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'noInternationalDialling' => 
+  array (
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
+  ),
+  'id' => '',
+  'countryCode' => 676,
+  'internationalPrefix' => '',
+  'sameMobileAndFixedLinePattern' => true,
+  'numberFormat' => 
+  array (
+    0 => 
+    array (
+      'pattern' => '(\\d{2})(\\d{5})',
+      'format' => '$1 $2',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            7[5-9]|
+            8[47-9]
+          ',
+      ),
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+    ),
+  ),
+  'intlNumberFormat' => 
+  array (
+  ),
+  'mainCountryForCode' => false,
+  'leadingZeroPossible' => false,
+  'mobileNumberPortableRegion' => false,
+);
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BI.php b/src/libphonenumber/data/PhoneNumberMetadata_BI.php
index d35842787..8e1517016 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_BI.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_BI.php
@@ -8,7 +8,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[27]\\d{7}',
+    'NationalNumberPattern' => '[267]\\d{7}',
     'PossibleNumberPattern' => '\\d{8}',
   ),
   'fixedLine' => 
@@ -26,7 +26,7 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            29|
+            [26]9|
             7[14-9]
           )\\d{6}
         ',
@@ -106,7 +106,7 @@
   array (
     0 => 
     array (
-      'pattern' => '([27]\\d)(\\d{2})(\\d{2})(\\d{2})',
+      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CM.php b/src/libphonenumber/data/PhoneNumberMetadata_CM.php
index 6fb03519d..ec06294b4 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_CM.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_CM.php
@@ -8,25 +8,33 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[2357-9]\\d{7}',
-    'PossibleNumberPattern' => '\\d{8}',
+    'NationalNumberPattern' => '[235-9]\\d{7,8}',
+    'PossibleNumberPattern' => '\\d{8,9}',
   ),
   'fixedLine' => 
   array (
     'NationalNumberPattern' => '
+          2(?:
+             22|
+             33|
+             4[23]
+          )\\d{6}|
           (?:
             22|
             33
           )\\d{6}
         ',
-    'PossibleNumberPattern' => '\\d{8}',
-    'ExampleNumber' => '22123456',
+    'PossibleNumberPattern' => '\\d{8,9}',
+    'ExampleNumber' => '222123456',
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '[579]\\d{7}',
-    'PossibleNumberPattern' => '\\d{8}',
-    'ExampleNumber' => '71234567',
+    'NationalNumberPattern' => '
+          6[5-79]\\d{7}|
+          [579]\\d{7}
+        ',
+    'PossibleNumberPattern' => '\\d{8,9}',
+    'ExampleNumber' => '671234567',
   ),
   'tollFree' => 
   array (
@@ -102,6 +110,17 @@
   'numberFormat' => 
   array (
     0 => 
+    array (
+      'pattern' => '([26])(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+      'format' => '$1 $2 $3 $4 $5',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '[26]',
+      ),
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+    ),
+    1 => 
     array (
       'pattern' => '([2357-9]\\d)(\\d{2})(\\d{2})(\\d{2})',
       'format' => '$1 $2 $3 $4',
@@ -115,7 +134,7 @@
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    1 => 
+    2 => 
     array (
       'pattern' => '(800)(\\d{2})(\\d{3})',
       'format' => '$1 $2 $3',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_ID.php b/src/libphonenumber/data/PhoneNumberMetadata_ID.php
index 817f37aa7..43bdad58b 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_ID.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_ID.php
@@ -21,7 +21,8 @@
               500\\d{3}|
               9\\d{6}
             )|
-            [24]\\d{7,8}
+            2\\d{6,8}|
+            4\\d{7,8}
           )|
           (?:
             2(?:
@@ -66,7 +67,7 @@
               4[1-6]
             )|
             7(?:
-              1[1-46-9]|
+              1[1-9]|
               2[14-9]|
               [36]\\d|
               4[1-8]|
@@ -84,7 +85,7 @@
             )
           )\\d{5,8}
         ',
-    'PossibleNumberPattern' => '\\d{5,10}',
+    'PossibleNumberPattern' => '\\d{5,11}',
     'ExampleNumber' => '612345678',
   ),
   'mobile' => 
@@ -265,7 +266,7 @@
     ),
     1 => 
     array (
-      'pattern' => '(\\d{3})(\\d{5,7})',
+      'pattern' => '(\\d{3})(\\d{5,8})',
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_IR.php b/src/libphonenumber/data/PhoneNumberMetadata_IR.php
index 133c86bdf..2ae700434 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_IR.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_IR.php
@@ -9,8 +9,7 @@
   'generalDesc' => 
   array (
     'NationalNumberPattern' => '
-          [14-8]\\d{6,9}|
-          [23]\\d{4,9}|
+          [1-8]\\d{9}|
           9(?:
             [0-4]\\d{8}|
             9\\d{2,8}
@@ -21,86 +20,18 @@
   'fixedLine' => 
   array (
     'NationalNumberPattern' => '
-          1(?:
-            [13-589][12]|
-            [27][1-4]
-          )\\d{7}|
-          2(?:
-            1\\d{3,8}|
-            3[12]\\d{7}|
-            4(?:
-              1\\d{4,7}|
-              2\\d{7}
-            )|
-            53\\d{7}|
-            6\\d{8}|
-            7[34]\\d{7}|
-            [89][12]\\d{7}
-          )|
-          3(?:
-            1[2-5]\\d{7}|
-            2[1-4]\\d{7}|
-            3(?:
-              [125]\\d{7}|
-              4\\d{6,7}
-            )|
-            4(?:
-              1\\d{6,7}
-              [24-9]\\d{7}
-            )|
-            5(?:
-              1\\d{4,7}|
-              [23]\\d{7}
-            )|
-            [6-9][12]\\d{7}
-          )|
-          4(?:
-            [135-9][12]\\d{7}|
-            2[1-467]\\d{7}|
-            4(?:
-              1\\d{4,7}|
-              [2-4]\\d{7}
-            )
-          )|
-          5(?:
-            1[2-5]\\d{7}|
-            2[89]\\d{7}|
-            3[1-5]\\d{7}|
-            4(?:
-              1\\d{4,7}|
-              [2-8]\\d{7}
-            )|
-            [5-7][12]\\d{7}|
-            8[1245]\\d{7}
-          )|
-          6(?:
-            1(?:
-              1\\d{6,7}|
-              2\\d{7}
-            )|
-            [347-9][12]\\d{7}|
-            5(?:
-              1\\d{7}|
-              2\\d{6,7}
-            )|
-            6[1-6]\\d{7}
-          )|
-          7(?:
-            1[2-5]|
-            2[1289]|
-            [3589][12]|
-            4[1-4]|
-            6[1-6]|
-            7[1-3]
-          )\\d{7}|
-          8(?:
-            [145][12]|
-            3[124578]|
-            6[2-6]|
-            7[1245]
-          )\\d{7}
+          (?:
+            1[137]|
+            2[13-68]|
+            3[1458]|
+            4[145]|
+            5[146-8]|
+            6[146]|
+            7[1467]|
+            8[13467]
+          )\\d{8}
         ',
-    'PossibleNumberPattern' => '\\d{5,10}',
+    'PossibleNumberPattern' => '\\d{10}',
     'ExampleNumber' => '2123456789',
   ),
   'mobile' => 
@@ -207,76 +138,45 @@
       'domesticCarrierCodeFormattingRule' => '',
     ),
     1 => 
-    array (
-      'pattern' => '(2[15])(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' => 
-      array (
-        0 => '
-            2(?:
-              1|
-              5[0-47-9]
-            )
-          ',
-      ),
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-    ),
-    2 => 
     array (
       'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '
-            2[156]|
-            31|
-            51|
-            71|
-            86
-          ',
+        0 => '[1-8]',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    3 => 
+    2 => 
     array (
       'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '
-            [13-9]|
-            2[02-47-9]
-          ',
+        0 => '9',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    4 => 
+    3 => 
     array (
       'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '
-            [13-9]|
-            2[02-47-9]
-          ',
+        0 => '9',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    5 => 
+    4 => 
     array (
       'pattern' => '(\\d{3})(\\d{3})',
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '
-            [13-9]|
-            2[02-47-9]
-          ',
+        0 => '9',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_KR.php b/src/libphonenumber/data/PhoneNumberMetadata_KR.php
index fdbc72482..73b2546ac 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_KR.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_KR.php
@@ -88,6 +88,12 @@
               6[16]|
               70|
               88
+            )|
+            8(?:
+              00|
+              55|
+              77|
+              99
             )
           )\\d{4}
         ',
@@ -288,7 +294,8 @@
         0 => '
             1(?:
               5[46-9]|
-              6[04678]
+              6[04678]|
+              8[0579]
             )
           ',
         1 => '
@@ -306,6 +313,12 @@
                 6[16]|
                 70|
                 88
+              )|
+              8(?:
+                00|
+                55|
+                77|
+                99
               )
             )
           ',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_LA.php b/src/libphonenumber/data/PhoneNumberMetadata_LA.php
index eaf7aa255..904f40f72 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_LA.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_LA.php
@@ -35,7 +35,7 @@
             2[2389]|
             5[4-689]|
             7[6-8]|
-            9[57-9]
+            9[15-9]
           )\\d{6}
         ',
     'PossibleNumberPattern' => '\\d{10}',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_NP.php b/src/libphonenumber/data/PhoneNumberMetadata_NP.php
index ba41e56a2..55d5edc5f 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_NP.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_NP.php
@@ -11,7 +11,7 @@
     'NationalNumberPattern' => '
           [1-8]\\d{7}|
           9(?:
-            [1-69]\\d{6}|
+            [1-69]\\d{6,8}|
             7[2-6]\\d{5,7}|
             8\\d{8}
           )
@@ -22,16 +22,16 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            1[0124-6]|
-            2[13-79]|
-            3[135-8]|
-            4[146-9]|
-            5[135-7]|
-            6[13-9]|
-            7[15-9]|
-            8[1-46-9]|
-            9[1-79]
-          )\\d{6}
+            1[0-6]\\d|
+            2[13-79][2-6]|
+            3[135-8][2-6]|
+            4[146-9][2-6]|
+            5[135-7][2-6]|
+            6[13-9][2-6]|
+            7[15-9][2-6]|
+            8[1-46-9][2-6]|
+            9[1-79][2-6]
+          )\\d{5}
         ',
     'PossibleNumberPattern' => '\\d{6,8}',
     'ExampleNumber' => '14567890',
@@ -40,7 +40,8 @@
   array (
     'NationalNumberPattern' => '
           9(?:
-            7[45]|
+            6[013]|
+            7[245]|
             8[01456]
           )\\d{7}
         ',
@@ -157,7 +158,8 @@
       array (
         0 => '
             9(?:
-              7[45]|
+              6[013]|
+              7[245]|
               8
             )
             ',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_TG.php b/src/libphonenumber/data/PhoneNumberMetadata_TG.php
index f24993649..a937f7370 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_TG.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_TG.php
@@ -28,7 +28,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '9[0-289]\\d{6}',
+    'NationalNumberPattern' => '9[0-389]\\d{6}',
     'PossibleNumberPattern' => '\\d{8}',
     'ExampleNumber' => '90112345',
   ),
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_TH.php b/src/libphonenumber/data/PhoneNumberMetadata_TH.php
index 3a8779813..1ff9e197e 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_TH.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_TH.php
@@ -10,7 +10,7 @@
   array (
     'NationalNumberPattern' => '
           [2-9]\\d{7,8}|
-          1\\d{3}(?:\\d{6})?
+          1\\d{3}(?:\\d{5,6})?
         ',
     'PossibleNumberPattern' => '\\d{4}|\\d{8,10}',
   ),
@@ -32,7 +32,8 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            61|
+            14|
+            6[1-3]|
             [89]\\d
           )\\d{7}
         ',
@@ -130,11 +131,14 @@
     ),
     1 => 
     array (
-      'pattern' => '([3-9]\\d)(\\d{3})(\\d{3,4})',
+      'pattern' => '([13-9]\\d)(\\d{3})(\\d{3,4})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[3-9]',
+        0 => '
+            14|
+            [3-9]
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_TO.php b/src/libphonenumber/data/PhoneNumberMetadata_TO.php
index 7bb9b350b..a977f463a 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_TO.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_TO.php
@@ -31,7 +31,7 @@
     'NationalNumberPattern' => '
           (?:
             7[578]|
-            8[7-9]
+            8[47-9]
           )\\d{5}
         ',
     'PossibleNumberPattern' => '\\d{7}',
@@ -132,7 +132,7 @@
       array (
         0 => '
             7[5-9]|
-            8[7-9]
+            8[47-9]
           ',
       ),
       'nationalPrefixFormattingRule' => '',
diff --git a/src/libphonenumber/geocoding/data/Map.php b/src/libphonenumber/geocoding/data/Map.php
index 5ab48923a..8bc3dbb44 100644
--- a/src/libphonenumber/geocoding/data/Map.php
+++ b/src/libphonenumber/geocoding/data/Map.php
@@ -386,446 +386,447 @@
     343 => 232,
     344 => 233,
     345 => 234,
-    346 => 238,
-    347 => 239,
-    348 => 241,
-    349 => 242,
-    350 => 243,
-    351 => 244,
-    352 => 245,
-    353 => 247,
-    354 => 249,
-    355 => 251,
-    356 => 252,
-    357 => 254,
-    358 => 256,
-    359 => 257,
-    360 => 258,
-    361 => 260,
-    362 => 261,
-    363 => 263,
-    364 => 264,
-    365 => 266,
-    366 => 267,
-    367 => 268,
-    368 => 269,
-    369 => 27,
-    370 => 290,
-    371 => 299,
-    372 => 30,
-    373 => 31,
-    374 => 32,
-    375 => 33,
-    376 => 34,
-    377 => 351,
-    378 => 352,
-    379 => 353,
-    380 => 354,
-    381 => 355,
-    382 => 358,
-    383 => 359,
-    384 => 36,
-    385 => 370,
-    386 => 371,
-    387 => 372,
-    388 => 373,
-    389 => 374,
-    390 => 375,
-    391 => 381,
-    392 => 389,
-    393 => 39,
-    394 => 40,
-    395 => 41,
-    396 => 420,
-    397 => 421,
-    398 => 43,
-    399 => 44,
-    400 => 46,
-    401 => 47,
-    402 => 48,
-    403 => 49,
-    404 => 51,
-    405 => 53,
-    406 => 54,
-    407 => 55,
-    408 => 56,
-    409 => 57,
-    410 => 58,
-    411 => 599,
-    412 => 62,
-    413 => 66,
-    414 => 686,
-    415 => 7,
-    416 => 81,
-    417 => 82,
-    418 => 84,
-    419 => 8610,
-    420 => 86130,
-    421 => 86131,
-    422 => 86132,
-    423 => 86133,
-    424 => 86134,
-    425 => 86135,
-    426 => 86136,
-    427 => 86137,
-    428 => 86138,
-    429 => 86139,
-    430 => 86145,
-    431 => 86147,
-    432 => 86150,
-    433 => 86151,
-    434 => 86152,
-    435 => 86153,
-    436 => 86155,
-    437 => 86156,
-    438 => 86157,
-    439 => 86158,
-    440 => 86159,
-    441 => 86170,
-    442 => 86176,
-    443 => 86177,
-    444 => 86180,
-    445 => 86181,
-    446 => 86182,
-    447 => 86183,
-    448 => 86184,
-    449 => 86185,
-    450 => 86186,
-    451 => 86187,
-    452 => 86188,
-    453 => 86189,
-    454 => 8620,
-    455 => 8621,
-    456 => 8622,
-    457 => 8623,
-    458 => 8624,
-    459 => 8625,
-    460 => 8627,
-    461 => 8628,
-    462 => 8629,
-    463 => 86310,
-    464 => 86311,
-    465 => 86312,
-    466 => 86313,
-    467 => 86314,
-    468 => 86315,
-    469 => 86316,
-    470 => 86317,
-    471 => 86318,
-    472 => 86319,
-    473 => 86335,
-    474 => 86349,
-    475 => 86350,
-    476 => 86351,
-    477 => 86352,
-    478 => 86353,
-    479 => 86354,
-    480 => 86355,
-    481 => 86356,
-    482 => 86357,
-    483 => 86358,
-    484 => 86359,
-    485 => 86370,
-    486 => 86371,
-    487 => 86372,
-    488 => 86373,
-    489 => 86374,
-    490 => 86375,
-    491 => 86376,
-    492 => 86377,
-    493 => 86378,
-    494 => 86379,
-    495 => 86391,
-    496 => 86392,
-    497 => 86393,
-    498 => 86394,
-    499 => 86395,
-    500 => 86396,
-    501 => 86398,
-    502 => 86410,
-    503 => 86411,
-    504 => 86412,
-    505 => 86413,
-    506 => 86414,
-    507 => 86415,
-    508 => 86416,
-    509 => 86417,
-    510 => 86418,
-    511 => 86419,
-    512 => 86421,
-    513 => 86427,
-    514 => 86429,
-    515 => 86431,
-    516 => 86432,
-    517 => 86433,
-    518 => 86434,
-    519 => 86435,
-    520 => 86436,
-    521 => 86437,
-    522 => 86438,
-    523 => 86451,
-    524 => 86452,
-    525 => 86453,
-    526 => 86454,
-    527 => 86455,
-    528 => 86456,
-    529 => 86457,
-    530 => 86458,
-    531 => 86459,
-    532 => 86464,
-    533 => 86467,
-    534 => 86468,
-    535 => 86469,
-    536 => 86470,
-    537 => 86471,
-    538 => 86472,
-    539 => 86473,
-    540 => 86474,
-    541 => 86475,
-    542 => 86476,
-    543 => 86477,
-    544 => 86478,
-    545 => 86479,
-    546 => 86482,
-    547 => 86483,
-    548 => 86510,
-    549 => 86511,
-    550 => 86512,
-    551 => 86513,
-    552 => 86514,
-    553 => 86515,
-    554 => 86516,
-    555 => 86517,
-    556 => 86518,
-    557 => 86519,
-    558 => 86523,
-    559 => 86527,
-    560 => 86530,
-    561 => 86531,
-    562 => 86532,
-    563 => 86533,
-    564 => 86534,
-    565 => 86535,
-    566 => 86536,
-    567 => 86537,
-    568 => 86538,
-    569 => 86539,
-    570 => 86543,
-    571 => 86546,
-    572 => 86550,
-    573 => 86551,
-    574 => 86552,
-    575 => 86553,
-    576 => 86554,
-    577 => 86555,
-    578 => 86556,
-    579 => 86557,
-    580 => 86558,
-    581 => 86559,
-    582 => 86561,
-    583 => 86562,
-    584 => 86563,
-    585 => 86564,
-    586 => 86566,
-    587 => 86570,
-    588 => 86571,
-    589 => 86572,
-    590 => 86573,
-    591 => 86574,
-    592 => 86575,
-    593 => 86576,
-    594 => 86577,
-    595 => 86578,
-    596 => 86579,
-    597 => 86580,
-    598 => 86591,
-    599 => 86592,
-    600 => 86593,
-    601 => 86594,
-    602 => 86595,
-    603 => 86596,
-    604 => 86597,
-    605 => 86598,
-    606 => 86599,
-    607 => 86631,
-    608 => 86632,
-    609 => 86633,
-    610 => 86634,
-    611 => 86635,
-    612 => 86660,
-    613 => 86662,
-    614 => 86663,
-    615 => 86668,
-    616 => 86691,
-    617 => 86692,
-    618 => 86701,
-    619 => 86710,
-    620 => 86711,
-    621 => 86712,
-    622 => 86713,
-    623 => 86714,
-    624 => 86715,
-    625 => 86716,
-    626 => 86717,
-    627 => 86718,
-    628 => 86719,
-    629 => 86722,
-    630 => 86724,
-    631 => 86728,
-    632 => 86730,
-    633 => 86731,
-    634 => 86734,
-    635 => 86735,
-    636 => 86736,
-    637 => 86737,
-    638 => 86738,
-    639 => 86739,
-    640 => 86743,
-    641 => 86744,
-    642 => 86745,
-    643 => 86746,
-    644 => 86750,
-    645 => 86751,
-    646 => 86752,
-    647 => 86753,
-    648 => 86754,
-    649 => 86755,
-    650 => 86756,
-    651 => 86757,
-    652 => 86758,
-    653 => 86759,
-    654 => 86760,
-    655 => 86762,
-    656 => 86763,
-    657 => 86766,
-    658 => 86768,
-    659 => 86769,
-    660 => 86770,
-    661 => 86771,
-    662 => 86772,
-    663 => 86773,
-    664 => 86774,
-    665 => 86775,
-    666 => 86776,
-    667 => 86777,
-    668 => 86778,
-    669 => 86779,
-    670 => 86790,
-    671 => 86791,
-    672 => 86792,
-    673 => 86793,
-    674 => 86794,
-    675 => 86795,
-    676 => 86796,
-    677 => 86797,
-    678 => 86798,
-    679 => 86799,
-    680 => 86812,
-    681 => 86813,
-    682 => 86816,
-    683 => 86817,
-    684 => 86818,
-    685 => 86825,
-    686 => 86826,
-    687 => 86827,
-    688 => 86830,
-    689 => 86831,
-    690 => 86832,
-    691 => 86833,
-    692 => 86834,
-    693 => 86835,
-    694 => 86836,
-    695 => 86837,
-    696 => 86838,
-    697 => 86839,
-    698 => 86851,
-    699 => 86852,
-    700 => 86853,
-    701 => 86854,
-    702 => 86855,
-    703 => 86856,
-    704 => 86857,
-    705 => 86858,
-    706 => 86859,
-    707 => 86870,
-    708 => 86871,
-    709 => 86872,
-    710 => 86873,
-    711 => 86874,
-    712 => 86875,
-    713 => 86876,
-    714 => 86877,
-    715 => 86878,
-    716 => 86879,
-    717 => 86883,
-    718 => 86886,
-    719 => 86887,
-    720 => 86888,
-    721 => 86891,
-    722 => 86892,
-    723 => 86893,
-    724 => 86894,
-    725 => 86895,
-    726 => 86896,
-    727 => 86897,
-    728 => 86898,
-    729 => 86901,
-    730 => 86902,
-    731 => 86903,
-    732 => 86906,
-    733 => 86908,
-    734 => 86909,
-    735 => 86911,
-    736 => 86912,
-    737 => 86913,
-    738 => 86914,
-    739 => 86915,
-    740 => 86916,
-    741 => 86917,
-    742 => 86919,
-    743 => 86930,
-    744 => 86931,
-    745 => 86932,
-    746 => 86933,
-    747 => 86934,
-    748 => 86935,
-    749 => 86936,
-    750 => 86937,
-    751 => 86938,
-    752 => 86939,
-    753 => 86941,
-    754 => 86943,
-    755 => 86951,
-    756 => 86952,
-    757 => 86953,
-    758 => 86954,
-    759 => 86955,
-    760 => 86970,
-    761 => 86971,
-    762 => 86972,
-    763 => 86973,
-    764 => 86974,
-    765 => 86975,
-    766 => 86976,
-    767 => 86977,
-    768 => 86979,
-    769 => 86990,
-    770 => 86991,
-    771 => 86992,
-    772 => 86993,
-    773 => 86994,
-    774 => 86995,
-    775 => 86996,
-    776 => 86997,
-    777 => 86998,
-    778 => 86999,
-    779 => 886,
-    780 => 90,
-    781 => 91,
-    782 => 94,
-    783 => 962,
-    784 => 966,
-    785 => 98,
+    346 => 237,
+    347 => 238,
+    348 => 239,
+    349 => 241,
+    350 => 242,
+    351 => 243,
+    352 => 244,
+    353 => 245,
+    354 => 247,
+    355 => 249,
+    356 => 251,
+    357 => 252,
+    358 => 254,
+    359 => 256,
+    360 => 257,
+    361 => 258,
+    362 => 260,
+    363 => 261,
+    364 => 263,
+    365 => 264,
+    366 => 266,
+    367 => 267,
+    368 => 268,
+    369 => 269,
+    370 => 27,
+    371 => 290,
+    372 => 299,
+    373 => 30,
+    374 => 31,
+    375 => 32,
+    376 => 33,
+    377 => 34,
+    378 => 351,
+    379 => 352,
+    380 => 353,
+    381 => 354,
+    382 => 355,
+    383 => 358,
+    384 => 359,
+    385 => 36,
+    386 => 370,
+    387 => 371,
+    388 => 372,
+    389 => 373,
+    390 => 374,
+    391 => 375,
+    392 => 381,
+    393 => 389,
+    394 => 39,
+    395 => 40,
+    396 => 41,
+    397 => 420,
+    398 => 421,
+    399 => 43,
+    400 => 44,
+    401 => 46,
+    402 => 47,
+    403 => 48,
+    404 => 49,
+    405 => 51,
+    406 => 53,
+    407 => 54,
+    408 => 55,
+    409 => 56,
+    410 => 57,
+    411 => 58,
+    412 => 599,
+    413 => 62,
+    414 => 66,
+    415 => 686,
+    416 => 7,
+    417 => 81,
+    418 => 82,
+    419 => 84,
+    420 => 8610,
+    421 => 86130,
+    422 => 86131,
+    423 => 86132,
+    424 => 86133,
+    425 => 86134,
+    426 => 86135,
+    427 => 86136,
+    428 => 86137,
+    429 => 86138,
+    430 => 86139,
+    431 => 86145,
+    432 => 86147,
+    433 => 86150,
+    434 => 86151,
+    435 => 86152,
+    436 => 86153,
+    437 => 86155,
+    438 => 86156,
+    439 => 86157,
+    440 => 86158,
+    441 => 86159,
+    442 => 86170,
+    443 => 86176,
+    444 => 86177,
+    445 => 86180,
+    446 => 86181,
+    447 => 86182,
+    448 => 86183,
+    449 => 86184,
+    450 => 86185,
+    451 => 86186,
+    452 => 86187,
+    453 => 86188,
+    454 => 86189,
+    455 => 8620,
+    456 => 8621,
+    457 => 8622,
+    458 => 8623,
+    459 => 8624,
+    460 => 8625,
+    461 => 8627,
+    462 => 8628,
+    463 => 8629,
+    464 => 86310,
+    465 => 86311,
+    466 => 86312,
+    467 => 86313,
+    468 => 86314,
+    469 => 86315,
+    470 => 86316,
+    471 => 86317,
+    472 => 86318,
+    473 => 86319,
+    474 => 86335,
+    475 => 86349,
+    476 => 86350,
+    477 => 86351,
+    478 => 86352,
+    479 => 86353,
+    480 => 86354,
+    481 => 86355,
+    482 => 86356,
+    483 => 86357,
+    484 => 86358,
+    485 => 86359,
+    486 => 86370,
+    487 => 86371,
+    488 => 86372,
+    489 => 86373,
+    490 => 86374,
+    491 => 86375,
+    492 => 86376,
+    493 => 86377,
+    494 => 86378,
+    495 => 86379,
+    496 => 86391,
+    497 => 86392,
+    498 => 86393,
+    499 => 86394,
+    500 => 86395,
+    501 => 86396,
+    502 => 86398,
+    503 => 86410,
+    504 => 86411,
+    505 => 86412,
+    506 => 86413,
+    507 => 86414,
+    508 => 86415,
+    509 => 86416,
+    510 => 86417,
+    511 => 86418,
+    512 => 86419,
+    513 => 86421,
+    514 => 86427,
+    515 => 86429,
+    516 => 86431,
+    517 => 86432,
+    518 => 86433,
+    519 => 86434,
+    520 => 86435,
+    521 => 86436,
+    522 => 86437,
+    523 => 86438,
+    524 => 86451,
+    525 => 86452,
+    526 => 86453,
+    527 => 86454,
+    528 => 86455,
+    529 => 86456,
+    530 => 86457,
+    531 => 86458,
+    532 => 86459,
+    533 => 86464,
+    534 => 86467,
+    535 => 86468,
+    536 => 86469,
+    537 => 86470,
+    538 => 86471,
+    539 => 86472,
+    540 => 86473,
+    541 => 86474,
+    542 => 86475,
+    543 => 86476,
+    544 => 86477,
+    545 => 86478,
+    546 => 86479,
+    547 => 86482,
+    548 => 86483,
+    549 => 86510,
+    550 => 86511,
+    551 => 86512,
+    552 => 86513,
+    553 => 86514,
+    554 => 86515,
+    555 => 86516,
+    556 => 86517,
+    557 => 86518,
+    558 => 86519,
+    559 => 86523,
+    560 => 86527,
+    561 => 86530,
+    562 => 86531,
+    563 => 86532,
+    564 => 86533,
+    565 => 86534,
+    566 => 86535,
+    567 => 86536,
+    568 => 86537,
+    569 => 86538,
+    570 => 86539,
+    571 => 86543,
+    572 => 86546,
+    573 => 86550,
+    574 => 86551,
+    575 => 86552,
+    576 => 86553,
+    577 => 86554,
+    578 => 86555,
+    579 => 86556,
+    580 => 86557,
+    581 => 86558,
+    582 => 86559,
+    583 => 86561,
+    584 => 86562,
+    585 => 86563,
+    586 => 86564,
+    587 => 86566,
+    588 => 86570,
+    589 => 86571,
+    590 => 86572,
+    591 => 86573,
+    592 => 86574,
+    593 => 86575,
+    594 => 86576,
+    595 => 86577,
+    596 => 86578,
+    597 => 86579,
+    598 => 86580,
+    599 => 86591,
+    600 => 86592,
+    601 => 86593,
+    602 => 86594,
+    603 => 86595,
+    604 => 86596,
+    605 => 86597,
+    606 => 86598,
+    607 => 86599,
+    608 => 86631,
+    609 => 86632,
+    610 => 86633,
+    611 => 86634,
+    612 => 86635,
+    613 => 86660,
+    614 => 86662,
+    615 => 86663,
+    616 => 86668,
+    617 => 86691,
+    618 => 86692,
+    619 => 86701,
+    620 => 86710,
+    621 => 86711,
+    622 => 86712,
+    623 => 86713,
+    624 => 86714,
+    625 => 86715,
+    626 => 86716,
+    627 => 86717,
+    628 => 86718,
+    629 => 86719,
+    630 => 86722,
+    631 => 86724,
+    632 => 86728,
+    633 => 86730,
+    634 => 86731,
+    635 => 86734,
+    636 => 86735,
+    637 => 86736,
+    638 => 86737,
+    639 => 86738,
+    640 => 86739,
+    641 => 86743,
+    642 => 86744,
+    643 => 86745,
+    644 => 86746,
+    645 => 86750,
+    646 => 86751,
+    647 => 86752,
+    648 => 86753,
+    649 => 86754,
+    650 => 86755,
+    651 => 86756,
+    652 => 86757,
+    653 => 86758,
+    654 => 86759,
+    655 => 86760,
+    656 => 86762,
+    657 => 86763,
+    658 => 86766,
+    659 => 86768,
+    660 => 86769,
+    661 => 86770,
+    662 => 86771,
+    663 => 86772,
+    664 => 86773,
+    665 => 86774,
+    666 => 86775,
+    667 => 86776,
+    668 => 86777,
+    669 => 86778,
+    670 => 86779,
+    671 => 86790,
+    672 => 86791,
+    673 => 86792,
+    674 => 86793,
+    675 => 86794,
+    676 => 86795,
+    677 => 86796,
+    678 => 86797,
+    679 => 86798,
+    680 => 86799,
+    681 => 86812,
+    682 => 86813,
+    683 => 86816,
+    684 => 86817,
+    685 => 86818,
+    686 => 86825,
+    687 => 86826,
+    688 => 86827,
+    689 => 86830,
+    690 => 86831,
+    691 => 86832,
+    692 => 86833,
+    693 => 86834,
+    694 => 86835,
+    695 => 86836,
+    696 => 86837,
+    697 => 86838,
+    698 => 86839,
+    699 => 86851,
+    700 => 86852,
+    701 => 86853,
+    702 => 86854,
+    703 => 86855,
+    704 => 86856,
+    705 => 86857,
+    706 => 86858,
+    707 => 86859,
+    708 => 86870,
+    709 => 86871,
+    710 => 86872,
+    711 => 86873,
+    712 => 86874,
+    713 => 86875,
+    714 => 86876,
+    715 => 86877,
+    716 => 86878,
+    717 => 86879,
+    718 => 86883,
+    719 => 86886,
+    720 => 86887,
+    721 => 86888,
+    722 => 86891,
+    723 => 86892,
+    724 => 86893,
+    725 => 86894,
+    726 => 86895,
+    727 => 86896,
+    728 => 86897,
+    729 => 86898,
+    730 => 86901,
+    731 => 86902,
+    732 => 86903,
+    733 => 86906,
+    734 => 86908,
+    735 => 86909,
+    736 => 86911,
+    737 => 86912,
+    738 => 86913,
+    739 => 86914,
+    740 => 86915,
+    741 => 86916,
+    742 => 86917,
+    743 => 86919,
+    744 => 86930,
+    745 => 86931,
+    746 => 86932,
+    747 => 86933,
+    748 => 86934,
+    749 => 86935,
+    750 => 86936,
+    751 => 86937,
+    752 => 86938,
+    753 => 86939,
+    754 => 86941,
+    755 => 86943,
+    756 => 86951,
+    757 => 86952,
+    758 => 86953,
+    759 => 86954,
+    760 => 86955,
+    761 => 86970,
+    762 => 86971,
+    763 => 86972,
+    764 => 86973,
+    765 => 86974,
+    766 => 86975,
+    767 => 86976,
+    768 => 86977,
+    769 => 86979,
+    770 => 86990,
+    771 => 86991,
+    772 => 86992,
+    773 => 86993,
+    774 => 86994,
+    775 => 86995,
+    776 => 86996,
+    777 => 86997,
+    778 => 86998,
+    779 => 86999,
+    780 => 886,
+    781 => 90,
+    782 => 91,
+    783 => 94,
+    784 => 962,
+    785 => 966,
+    786 => 98,
   ),
   'es' => 
   array (
diff --git a/src/libphonenumber/geocoding/data/en/237.php b/src/libphonenumber/geocoding/data/en/237.php
new file mode 100644
index 000000000..8557f7546
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/en/237.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  237222111 => 'Mbalmayo',
+  237222120 => 'Akonolinga',
+  237222121 => 'Ayos',
+  237222136 => 'Eséka/Mboumnyebel',
+  237222144 => 'Ngoumou',
+  237222180 => 'Obala',
+  237222182 => 'Monatélé',
+  237222185 => 'Bafia',
+  237222195 => 'Nanga Eboko',
+  23722220 => 'Jamot',
+  23722221 => 'Jamot',
+  23722222 => 'Yaounde',
+  23722223 => 'Yaounde',
+  237222241 => 'Bertoua',
+  237222242 => 'Bertoua',
+  237222250 => 'N\'Gaoundéré',
+  237222251 => 'N\'Gaoundéré',
+  237222252 => 'N\'Gaoundéré',
+  237222253 => 'N\'Gaoundéré',
+  237222254 => 'Dang',
+  237222256 => 'Beelel/Mbé',
+  237222262 => 'Batouri',
+  237222264 => 'Belabo',
+  23722227 => 'Garoua',
+  237222282 => 'Mengong',
+  237222283 => 'Ebolowa',
+  237222284 => 'Ebolowa',
+  23722229 => 'Maroua',
+  23722230 => 'Nkomo',
+  23722231 => 'Biyem Assi',
+  237222321 => 'Mfou',
+  237222322 => 'Soa',
+  237222335 => 'Abong-Bang',
+  237222347 => 'N\'Gaoundal',
+  237222348 => 'Tibati',
+  237222354 => 'Galim Tignère',
+  237222355 => 'Tignère',
+  237222369 => 'Banyo',
+  237222371 => 'Meiganga',
+  237222395 => 'Guider',
+  237222397 => 'Figuil',
+  237222414 => 'Kousseri',
+  237222426 => 'Yagoua',
+  237222447 => 'Mora',
+  237222455 => 'Mokolo',
+  237222461 => 'Kribi',
+  237222462 => 'Kribi',
+  237222463 => 'Lolodorf',
+  237222464 => 'Lolodorf',
+  237222478 => 'Sangmelima',
+  237222479 => 'Meyomessala/Efoulan',
+  237222482 => 'Kye-Ossie/Ambam',
+  237233205 => 'Wum',
+  237233215 => 'Nkambe',
+  237233221 => 'Kumbo',
+  237233262 => 'Foumban',
+  237233263 => 'Foumban',
+  237233267 => 'Foumbot',
+  237233277 => 'Bandjoun',
+  237233296 => 'Bafang',
+  237233297 => 'Bafang',
+  237233305 => 'Mbouda',
+  237233313 => 'Yabassi',
+  237233321 => 'Muyuka',
+  237233322 => 'Buéa',
+  237233323 => 'Buéa',
+  237233324 => 'Buéa',
+  237233325 => 'Buéa',
+  237233326 => 'Buéa',
+  237233327 => 'Buéa',
+  237233328 => 'Buéa',
+  237233329 => 'Buéa',
+  237233331 => 'Tiko',
+  237233332 => 'Limbé',
+  237233333 => 'Limbé',
+  237233334 => 'Limbé',
+  237233335 => 'Limbé',
+  237233336 => 'Limbé',
+  237233337 => 'Limbé',
+  237233338 => 'Limbé',
+  237233339 => 'Limbé',
+  237233341 => 'Manfé',
+  237233354 => 'Kumba',
+  237233355 => 'Kumba',
+  237233360 => 'Bamenda',
+  237233361 => 'Bamenda',
+  237233362 => 'Bamenda',
+  237233363 => 'Bamenda',
+  237233364 => 'Bamenda',
+  237233366 => 'Mbambili',
+  23723337 => 'Bassa',
+  23723339 => 'Bonabéri',
+  23723340 => 'Bepanda',
+  23723341 => 'Bepanda',
+  23723342 => 'Akwa Centre',
+  23723343 => 'Akwa Centre',
+  23723344 => 'Bafoussam',
+  237233451 => 'Dschang',
+  237233452 => 'Dschang',
+  237233464 => 'Edéa',
+  23723347 => 'Akwa North',
+  237233484 => 'Bangangté',
+  237233489 => 'Bangangté',
+  237233490 => 'Nkongsamba',
+  237233491 => 'Nkongsamba',
+  237233492 => 'Nkongsamba',
+  237233493 => 'Nkongsamba',
+  237233494 => 'Nkongsamba',
+  237233495 => 'Nkongsamba',
+  237233496 => 'Nkongsamba',
+  237233497 => 'Loum/Mbanga',
+);
diff --git a/src/libphonenumber/geocoding/data/en/98.php b/src/libphonenumber/geocoding/data/en/98.php
index 55bb60079..fcb302bf4 100644
--- a/src/libphonenumber/geocoding/data/en/98.php
+++ b/src/libphonenumber/geocoding/data/en/98.php
@@ -5,150 +5,37 @@
  */
 
 return array (
-  98111 => 'Babol',
-  98112 => 'Babol suburbs',
-  98121 => 'Amol',
-  98122 => 'Amol suburbs',
-  98123 => 'Ghaemshahr',
-  98124 => 'Ghaemshahr suburbs',
-  98131 => 'Rasht',
-  98132 => 'Rasht suburbs',
-  98141 => 'Lahijan',
-  98142 => 'Lahijan suburbs',
-  98151 => 'Sari',
-  98152 => 'Sari suburbs',
-  98171 => 'Gorgan',
-  98172 => 'Gonbad Kavos',
-  98173 => 'Gorgan suburbs',
-  98174 => 'Gonbad Kavos suburbs',
-  98181 => 'Bandar Anzali',
-  98182 => 'Bandar Anzali suburbs',
-  98191 => 'Chalus',
-  98192 => 'Chalus suburbs',
+  9811 => 'Mazandaran',
+  9813 => 'Gilan',
+  9817 => 'Golestan',
   9821 => 'Tehran province',
-  98231 => 'Semnan',
-  98232 => 'Semnan suburbs',
-  98241 => 'Zanjan',
-  98242 => 'Zanjan suburbs',
+  9823 => 'Semnan province',
+  9824 => 'Zanjan province',
   9825 => 'Qom province',
   9826 => 'Alborz',
-  98273 => 'Shahroud',
-  98274 => 'Shahroud suburbs',
-  98281 => 'Qazvin',
-  98282 => 'Qazvin suburbs',
+  9828 => 'Qazvin province',
   9831 => 'Isfahan province',
-  98341 => 'Kerman',
-  98342 => 'Kerman suburbs',
-  98344 => 'Bam',
-  98345 => 'Sirjan',
-  98346 => 'Bam suburbs',
-  98347 => 'Sirjan suburbs',
-  98348 => 'Jiroft',
-  98349 => 'Jiroft suburbs',
-  98351 => 'Yazd',
-  98352 => 'Yazd suburbs',
-  98353 => 'Yazd suburbs',
-  98381 => 'Shahrekord',
-  98382 => 'Shahrekord suburbs',
-  98391 => 'Rafsanjan',
-  98392 => 'Rafsanjan suburbs',
-  98411 => 'Tabriz',
-  98412 => 'Tabriz suburbs',
-  98421 => 'Maragheh',
-  98422 => 'Maragheh suburbs',
-  98423 => 'Miyaneh',
-  98424 => 'Miyaneh suburbs',
-  98426 => 'Ahar',
-  98427 => 'Ahar suburbs',
-  98431 => 'Sarab',
-  98432 => 'Sarab suburbs',
-  98441 => 'Orumieh',
-  98442 => 'Mahabad',
-  98443 => 'Orumieh suburbs',
-  98444 => 'Mahabad suburbs',
-  98451 => 'Ardabil',
-  98452 => 'Ardabil suburbs',
-  98461 => 'Khoy',
-  98462 => 'Khoy suburbs',
-  98471 => 'Shabestar',
-  98472 => 'Shabestar suburbs',
-  98481 => 'Myandoab',
-  98482 => 'Myandoab suburbs',
-  98491 => 'Marand',
-  98492 => 'Marand suburbs',
+  9834 => 'Kerman province',
+  9835 => 'Yazd province',
+  9838 => 'Chahar-mahal and Bakhtiari',
+  9841 => 'East Azarbaijan',
+  9844 => 'West Azarbaijan',
+  9845 => 'Ardabil province',
   9851 => 'Razavi Khorasan',
-  98534 => 'Ferdows',
-  98535 => 'Ferdows suburbs',
-  98541 => 'Zahedan',
-  98542 => 'Zabol',
-  98543 => 'Zahedan suburbs',
-  98544 => 'Zabol suburbs',
-  98545 => 'Chabahar',
-  98546 => 'Chabahar suburbs',
-  98547 => 'Iranshahr',
-  98548 => 'Iranshahr suburbs',
-  98551 => 'Neyshabur',
-  98552 => 'Neyshabur suburbs',
-  98561 => 'Birjand',
-  98562 => 'Birjand suburbs',
-  98571 => 'Sabzevar',
-  98572 => 'Sabzevar suburbs',
-  98581 => 'Quchan',
-  98582 => 'Quchan suburbs',
-  98584 => 'Bojnord',
-  98585 => 'Bojnord suburbs',
-  98611 => 'Ahwaz',
-  98612 => 'Ahwaz suburbs',
-  98631 => 'Abadan',
-  98632 => 'Abadan suburbs',
-  98641 => 'Dezful',
-  98642 => 'Dezful suburbs',
-  98651 => 'Sarbandar',
-  98652 => 'Sarbandar suburbs',
-  98661 => 'Khorramabad',
-  98662 => 'Borujerd',
-  98663 => 'Khoramabad suburbs',
-  98664 => 'Aligudarz',
-  98665 => 'Borujerd suburbs',
-  98666 => 'Aligudarz suburbs',
-  98671 => 'Behbahan',
-  98672 => 'Behbahan suburbs',
-  98681 => 'Masjed Soleiman',
-  98682 => 'Masjed Soleiman suburbs',
-  98691 => 'Ramhormoz',
-  98692 => 'Ramhormoz suburbs',
+  9854 => 'Sistan and Baluchestan',
+  9856 => 'South Khorasan',
+  9857 => 'North Khorasan',
+  9858 => 'North Khorasan',
+  9861 => 'Khuzestan',
+  9864 => 'North Khorasan',
+  9866 => 'Lorestan',
   9871 => 'Fars',
-  98713 => 'Shiraz',
-  98714 => 'Kazeroon/Marvdasht/Abadeh',
-  98715 => 'Lar/Fasa/Jahrom',
-  98741 => 'Yasooj',
-  98742 => 'Dogonbadan',
-  98743 => 'Yasooj suburbs',
-  98744 => 'Dogonbadan suburbs',
-  98761 => 'Bandar Abbas',
-  98762 => 'Bandar Lengeh',
-  98763 => 'Bandar Abbas suburbs',
-  98764 => 'Bandar Lengeh suburbs',
-  98765 => 'Minab',
-  98766 => 'Minab suburbs',
-  98771 => 'Bushehr',
-  98772 => 'Bushehr suburbs',
-  98773 => 'Bushehr suburbs',
-  98811 => 'Hamedan',
-  98812 => 'Hamedan suburbs',
-  98831 => 'Kermanshah',
-  98832 => 'Kermanshah suburbs',
-  98834 => 'Sarpole Zahab',
-  98835 => 'Sarpole Zahab suburbs',
-  98837 => 'Kangavar',
-  98838 => 'Kangavar suburbs',
-  98841 => 'Ilam',
-  98842 => 'Ilam suburbs',
-  98851 => 'Malayer',
-  98852 => 'Malayer suburbs',
+  9874 => 'Kohgiluyeh and Boyer-Ahmad',
+  9876 => 'Hormozgan',
+  9877 => 'Bushehr province',
+  9881 => 'Hamadan province',
+  9883 => 'Kermanshah province',
+  9884 => 'Ilam province',
   9886 => 'Markazi',
-  98871 => 'Sanandaj',
-  98872 => 'Sanandaj suburbs',
-  98874 => 'Saqqez',
-  98875 => 'Saqqez suburbs',
+  9887 => 'Kurdistan',
 );
diff --git a/src/libphonenumber/geocoding/data/fa/98.php b/src/libphonenumber/geocoding/data/fa/98.php
index e9af59a33..e08fda267 100644
--- a/src/libphonenumber/geocoding/data/fa/98.php
+++ b/src/libphonenumber/geocoding/data/fa/98.php
@@ -5,150 +5,37 @@
  */
 
 return array (
-  98111 => 'بابل',
-  98112 => 'حومهٔ بابل',
-  98121 => 'آمل',
-  98122 => 'حومهٔ آمل',
-  98123 => 'قائم‌شهر',
-  98124 => 'حومهٔ قائم شهر',
-  98131 => 'رشت',
-  98132 => 'حومهٔ رشت',
-  98141 => 'لاهیجان',
-  98142 => 'حومهٔ لاهیجان',
-  98151 => 'ساری',
-  98152 => 'حومهٔ ساری',
-  98171 => 'گرگان',
-  98172 => 'گنبد کاووس',
-  98173 => 'حومهٔ گرگان',
-  98174 => 'حومهٔ گنبد کاووس',
-  98181 => 'بندر انزلی',
-  98182 => 'حومهٔ بندر انزلی',
-  98191 => 'چالوس',
-  98192 => 'حومهٔ چالوس',
+  9811 => 'مازندران',
+  9813 => 'گیلان',
+  9817 => 'گلستان',
   9821 => 'استان تهران',
-  98231 => 'سمنان',
-  98232 => 'حومهٔ سمنان',
-  98241 => 'زنجان',
-  98242 => 'حومهٔ زنجان',
+  9823 => 'استان سمنان',
+  9824 => 'استان زنجان',
   9825 => 'استان قم',
-  9826 => 'استان البرز',
-  98273 => 'شاهرود',
-  98274 => 'حومهٔ شاهرود',
-  98281 => 'قزوین',
-  98282 => 'حومهٔ قزوین',
+  9826 => 'البرز',
+  9828 => 'استان قزوین',
   9831 => 'استان اصفهان',
-  98341 => 'کرمان',
-  98342 => 'حومهٔ کرمان',
-  98344 => 'بم',
-  98345 => 'سیرجان',
-  98346 => 'حومهٔ بم',
-  98347 => 'حومهٔ سیرجان',
-  98348 => 'جیرفت',
-  98349 => 'حومهٔ جیرفت',
-  98351 => 'یزد',
-  98352 => 'حومهٔ یزد',
-  98353 => 'حومهٔ یزد',
-  98381 => 'شهرکرد',
-  98382 => 'حومهٔ شهرکرد',
-  98391 => 'رفسنجان',
-  98392 => 'حومهٔ رفسنجان',
-  98411 => 'تبریز',
-  98412 => 'حومهٔ تبریز',
-  98421 => 'مراغه',
-  98422 => 'حومهٔ مراغه',
-  98423 => 'میانه',
-  98424 => 'حومهٔ میانه',
-  98426 => 'اهر',
-  98427 => 'حومهٔ اهر',
-  98431 => 'سراب',
-  98432 => 'حومهٔ سراب',
-  98441 => 'ارومیه',
-  98442 => 'مهاباد',
-  98443 => 'حومهٔ ارومیه',
-  98444 => 'حومهٔ مهاباد',
-  98451 => 'اردبیل',
-  98452 => 'حومهٔ اردبیل',
-  98461 => 'خوی',
-  98462 => 'حومهٔ خوی',
-  98471 => 'شبستر',
-  98472 => 'حومهٔ شبستر',
-  98481 => 'میاندوآب',
-  98482 => 'حومهٔ میاندوآب',
-  98491 => 'مرند',
-  98492 => 'حومهٔ مرند',
-  9851 => 'استان خراسان رضوی',
-  98534 => 'فردوس',
-  98535 => 'حومهٔ فردوس',
-  98541 => 'زاهدان',
-  98542 => 'زابل',
-  98543 => 'حومهٔ زاهدان',
-  98544 => 'حومهٔ زابل',
-  98545 => 'چابهار',
-  98546 => 'حومهٔ چابهار',
-  98547 => 'ایرانشهر',
-  98548 => 'حومهٔ ایرانشهر',
-  98551 => 'نیشابور',
-  98552 => 'حومهٔ نیشابور',
-  98561 => 'بیرجند',
-  98562 => 'حومهٔ بیرجند',
-  98571 => 'سبزوار',
-  98572 => 'حومهٔ سبزوار',
-  98581 => 'قوچان',
-  98582 => 'حومهٔ قوچان',
-  98584 => 'بجنورد',
-  98585 => 'حومهٔ بجنورد',
-  98611 => 'اهواز',
-  98612 => 'حومهٔ اهواز',
-  98631 => 'آبادان',
-  98632 => 'حومهٔ آبادان',
-  98641 => 'دزفول',
-  98642 => 'حومهٔ دزفول',
-  98651 => 'سربندر',
-  98652 => 'حومهٔ سربندر',
-  98661 => 'خرم‌آباد',
-  98662 => 'بروجرد',
-  98663 => 'حومهٔ خرم‌آباد',
-  98664 => 'الیگودرز',
-  98665 => 'حومهٔ بروجرد',
-  98666 => 'حومهٔ اليگودرز',
-  98671 => 'بهبهان',
-  98672 => 'حومهٔ بهبهان',
-  98681 => 'مسجد سلیمان',
-  98682 => 'حومهٔ مسجد سلیمان',
-  98691 => 'رامهرمز',
-  98692 => 'حومهٔ رامهرمز',
-  9871 => 'استان فارس',
-  98713 => 'شیراز',
-  98714 => 'کازرون/مرودشت/آباده',
-  98715 => 'لار/فسا/جهرم',
-  98741 => 'یاسوج',
-  98742 => 'دوگنبدان',
-  98743 => 'حومهٔ یاسوج',
-  98744 => 'حومهٔ دوگنبدان',
-  98761 => 'بندرعباس',
-  98762 => 'بندر لنگه',
-  98763 => 'حومهٔ بندرعباس',
-  98764 => 'حومهٔ بندر لنگه',
-  98765 => 'میناب',
-  98766 => 'حومهٔ میناب',
-  98771 => 'بوشهر',
-  98772 => 'حومهٔ بوشهر',
-  98773 => 'حومهٔ بوشهر',
-  98811 => 'همدان',
-  98812 => 'حومهٔ همدان',
-  98831 => 'کرمانشاه',
-  98832 => 'حومهٔ کرمانشاه',
-  98834 => 'سرپل ذهاب',
-  98835 => 'حومهٔ سرپل ذهاب',
-  98837 => 'کنگاور',
-  98838 => 'حومهٔ کنگاور',
-  98841 => 'ایلام',
-  98842 => 'حومهٔ ایلام',
-  98851 => 'ملایر',
-  98852 => 'حومهٔ ملایر',
-  9886 => 'استان مرکزی',
-  98871 => 'سنندج',
-  98872 => 'حومهٔ سنندج',
-  98874 => 'سقز',
-  98875 => 'حومهٔ سقز',
+  9834 => 'استان کرمان',
+  9835 => 'استان یزد',
+  9838 => 'چهارمحال و بختیاری',
+  9841 => 'آذربایجان شرقی',
+  9844 => 'آذربایجان غربی',
+  9845 => 'استان اردبیل',
+  9851 => 'خراسان رضوی',
+  9854 => 'سیستان و بلوچستان',
+  9856 => 'خراسان جنوبی',
+  9857 => 'خراسان شمالی',
+  9858 => 'خراسان شمالی',
+  9861 => 'خوزستان',
+  9864 => 'خراسان شمالی',
+  9866 => 'لرستان',
+  9871 => 'فارس',
+  9874 => 'کهگیلویه و بویراحمد',
+  9876 => 'هرمزگان',
+  9877 => 'استان بوشهر',
+  9881 => 'استان همدان',
+  9883 => 'استان کرمانشاه',
+  9884 => 'استان ایلام',
+  9886 => 'مرکزی',
+  9887 => 'کردستان',
 );