From 3214f7d8da6270707d8489c9fe7e691a96fb1c20 Mon Sep 17 00:00:00 2001
From: Joshua Gigg <giggsey@gmail.com>
Date: Mon, 21 Mar 2016 15:20:21 +0000
Subject: [PATCH] Upstream metadata changes from Google for v7.2.8

Metadata changes:
 - Updated phone metadata for region code(s): CL, CN, FO, KE, SE, SO
 - Updated short number metadata for region code(s): FO
 - Updated geocoding data for country calling code(s): 86 (en, zh)
 - Updated carrier data for country calling code(s):
   86 (en), 252 (en), 254 (en)
---
 METADATA-VERSION.txt                          |    2 +-
 src/libphonenumber/carrier/data/Map.php       |  101 +-
 src/libphonenumber/carrier/data/en/252.php    |    1 +
 src/libphonenumber/carrier/data/en/254.php    |    3 +
 src/libphonenumber/carrier/data/en/86145.php  |    9 +
 src/libphonenumber/carrier/data/en/86147.php  |    9 +
 src/libphonenumber/carrier/data/en/86152.php  |    9 +
 src/libphonenumber/carrier/data/en/86155.php  |    9 +
 src/libphonenumber/carrier/data/en/86173.php  |    9 +
 src/libphonenumber/carrier/data/en/86181.php  |    9 +
 src/libphonenumber/carrier/data/en/86182.php  |    9 +
 src/libphonenumber/carrier/data/en/86183.php  |    9 +
 src/libphonenumber/carrier/data/en/86184.php  |    9 +
 .../data/PhoneNumberMetadata_CL.php           |    7 +-
 .../data/PhoneNumberMetadata_CN.php           |   49 +-
 .../data/PhoneNumberMetadata_FO.php           |    7 +-
 .../data/PhoneNumberMetadata_KE.php           |    2 +-
 .../data/PhoneNumberMetadata_SE.php           |   80 +-
 .../data/PhoneNumberMetadata_SO.php           |    2 +-
 .../data/ShortNumberMetadata_FO.php           |    2 +-
 src/libphonenumber/geocoding/data/Map.php     | 1050 +++++++++--------
 src/libphonenumber/geocoding/data/en/8624.php |    2 +-
 src/libphonenumber/geocoding/data/en/8628.php |    2 +-
 src/libphonenumber/geocoding/data/en/8629.php |    2 +-
 .../geocoding/data/en/86433.php               |    2 +-
 .../geocoding/data/en/86435.php               |    2 +-
 .../geocoding/data/en/86439.php               |    9 +
 .../geocoding/data/en/86551.php               |    2 +-
 .../geocoding/data/en/86710.php               |    2 +-
 .../geocoding/data/en/86731.php               |    2 +-
 .../geocoding/data/en/86754.php               |    2 +-
 .../geocoding/data/en/86757.php               |    2 +-
 .../geocoding/data/en/86807.php               |    9 +
 .../geocoding/data/en/86832.php               |    2 +-
 .../geocoding/data/en/86852.php               |    9 +
 .../geocoding/data/en/86853.php               |    9 +
 .../geocoding/data/en/86892.php               |    2 +-
 .../geocoding/data/en/86896.php               |    2 +-
 .../geocoding/data/en/86897.php               |    2 +-
 src/libphonenumber/geocoding/data/zh/8624.php |    2 +-
 src/libphonenumber/geocoding/data/zh/8628.php |    2 +-
 src/libphonenumber/geocoding/data/zh/8629.php |    2 +-
 .../geocoding/data/zh/86433.php               |    2 +-
 .../geocoding/data/zh/86435.php               |    2 +-
 .../geocoding/data/zh/86439.php               |    9 +
 .../geocoding/data/zh/86551.php               |    2 +-
 .../geocoding/data/zh/86710.php               |    2 +-
 .../geocoding/data/zh/86731.php               |    2 +-
 .../geocoding/data/zh/86754.php               |    2 +-
 .../geocoding/data/zh/86757.php               |    2 +-
 .../geocoding/data/zh/86807.php               |    9 +
 .../geocoding/data/zh/86832.php               |    2 +-
 .../geocoding/data/zh/86851.php               |    2 +-
 .../geocoding/data/zh/86892.php               |    2 +-
 .../geocoding/data/zh/86896.php               |    2 +-
 .../geocoding/data/zh/86897.php               |    2 +-
 56 files changed, 861 insertions(+), 638 deletions(-)
 create mode 100644 src/libphonenumber/carrier/data/en/86145.php
 create mode 100644 src/libphonenumber/carrier/data/en/86147.php
 create mode 100644 src/libphonenumber/carrier/data/en/86152.php
 create mode 100644 src/libphonenumber/carrier/data/en/86155.php
 create mode 100644 src/libphonenumber/carrier/data/en/86173.php
 create mode 100644 src/libphonenumber/carrier/data/en/86181.php
 create mode 100644 src/libphonenumber/carrier/data/en/86182.php
 create mode 100644 src/libphonenumber/carrier/data/en/86183.php
 create mode 100644 src/libphonenumber/carrier/data/en/86184.php
 create mode 100644 src/libphonenumber/geocoding/data/en/86439.php
 create mode 100644 src/libphonenumber/geocoding/data/en/86807.php
 create mode 100644 src/libphonenumber/geocoding/data/en/86852.php
 create mode 100644 src/libphonenumber/geocoding/data/en/86853.php
 create mode 100644 src/libphonenumber/geocoding/data/zh/86439.php
 create mode 100644 src/libphonenumber/geocoding/data/zh/86807.php

diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt
index 4ef7c7490..4a8446cd8 100644
--- 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/googlei18n/libphonenumber project
 #
 # For more information, look at the phing tasks in build.xml
-libphonenumber-7.2.7
+libphonenumber-7.2.8
diff --git a/src/libphonenumber/carrier/data/Map.php b/src/libphonenumber/carrier/data/Map.php
index 5d6820da4..079e8a505 100644
--- a/src/libphonenumber/carrier/data/Map.php
+++ b/src/libphonenumber/carrier/data/Map.php
@@ -172,52 +172,61 @@
     154 => 86137,
     155 => 86138,
     156 => 86139,
-    157 => 86150,
-    158 => 86151,
-    159 => 86153,
-    160 => 86156,
-    161 => 86157,
-    162 => 86158,
-    163 => 86159,
-    164 => 86176,
-    165 => 86177,
-    166 => 86178,
-    167 => 86180,
-    168 => 86185,
-    169 => 86186,
-    170 => 86187,
-    171 => 86188,
-    172 => 86189,
-    173 => 880,
-    174 => 90,
-    175 => 91,
-    176 => 92,
-    177 => 93,
-    178 => 94,
-    179 => 95,
-    180 => 960,
-    181 => 961,
-    182 => 962,
-    183 => 964,
-    184 => 965,
-    185 => 966,
-    186 => 967,
-    187 => 968,
-    188 => 970,
-    189 => 971,
-    190 => 972,
-    191 => 973,
-    192 => 974,
-    193 => 975,
-    194 => 976,
-    195 => 977,
-    196 => 98,
-    197 => 992,
-    198 => 993,
-    199 => 994,
-    200 => 995,
-    201 => 996,
-    202 => 998,
+    157 => 86145,
+    158 => 86147,
+    159 => 86150,
+    160 => 86151,
+    161 => 86152,
+    162 => 86153,
+    163 => 86155,
+    164 => 86156,
+    165 => 86157,
+    166 => 86158,
+    167 => 86159,
+    168 => 86173,
+    169 => 86176,
+    170 => 86177,
+    171 => 86178,
+    172 => 86180,
+    173 => 86181,
+    174 => 86182,
+    175 => 86183,
+    176 => 86184,
+    177 => 86185,
+    178 => 86186,
+    179 => 86187,
+    180 => 86188,
+    181 => 86189,
+    182 => 880,
+    183 => 90,
+    184 => 91,
+    185 => 92,
+    186 => 93,
+    187 => 94,
+    188 => 95,
+    189 => 960,
+    190 => 961,
+    191 => 962,
+    192 => 964,
+    193 => 965,
+    194 => 966,
+    195 => 967,
+    196 => 968,
+    197 => 970,
+    198 => 971,
+    199 => 972,
+    200 => 973,
+    201 => 974,
+    202 => 975,
+    203 => 976,
+    204 => 977,
+    205 => 98,
+    206 => 992,
+    207 => 993,
+    208 => 994,
+    209 => 995,
+    210 => 996,
+    211 => 998,
   ),
   'ru' => 
   array (
diff --git a/src/libphonenumber/carrier/data/en/252.php b/src/libphonenumber/carrier/data/en/252.php
index 428411b3a..aab31dc8b 100644
--- a/src/libphonenumber/carrier/data/en/252.php
+++ b/src/libphonenumber/carrier/data/en/252.php
@@ -15,6 +15,7 @@
   25268 => 'Nationlink',
   25269 => 'Nationlink',
   25279 => 'Somtel',
+  252906 => 'Golis Telecom',
   252907 => 'Golis Telecom',
   25292 => 'STG',
   25293 => 'STG',
diff --git a/src/libphonenumber/carrier/data/en/254.php b/src/libphonenumber/carrier/data/en/254.php
index 956e1d0e5..e76c0c0cb 100644
--- a/src/libphonenumber/carrier/data/en/254.php
+++ b/src/libphonenumber/carrier/data/en/254.php
@@ -34,4 +34,7 @@
   254790 => 'Safaricom',
   254791 => 'Safaricom',
   254792 => 'Safaricom',
+  254795 => 'Safaricom',
+  254796 => 'Safaricom',
+  254797 => 'Safaricom',
 );
diff --git a/src/libphonenumber/carrier/data/en/86145.php b/src/libphonenumber/carrier/data/en/86145.php
new file mode 100644
index 000000000..17522a096
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86145.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86145 => 'China Unicom',
+);
diff --git a/src/libphonenumber/carrier/data/en/86147.php b/src/libphonenumber/carrier/data/en/86147.php
new file mode 100644
index 000000000..d8312335c
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86147.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86147 => 'China Mobile',
+);
diff --git a/src/libphonenumber/carrier/data/en/86152.php b/src/libphonenumber/carrier/data/en/86152.php
new file mode 100644
index 000000000..c9d41a4e6
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86152.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86152 => 'China Mobile',
+);
diff --git a/src/libphonenumber/carrier/data/en/86155.php b/src/libphonenumber/carrier/data/en/86155.php
new file mode 100644
index 000000000..bf37a4f7d
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86155.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86155 => 'China Unicom',
+);
diff --git a/src/libphonenumber/carrier/data/en/86173.php b/src/libphonenumber/carrier/data/en/86173.php
new file mode 100644
index 000000000..8141f271b
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86173.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86173 => 'China Telecom',
+);
diff --git a/src/libphonenumber/carrier/data/en/86181.php b/src/libphonenumber/carrier/data/en/86181.php
new file mode 100644
index 000000000..321b60223
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86181.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86181 => 'China Telecom',
+);
diff --git a/src/libphonenumber/carrier/data/en/86182.php b/src/libphonenumber/carrier/data/en/86182.php
new file mode 100644
index 000000000..1319d9c74
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86182.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86182 => 'China Mobile',
+);
diff --git a/src/libphonenumber/carrier/data/en/86183.php b/src/libphonenumber/carrier/data/en/86183.php
new file mode 100644
index 000000000..e1ff16f7d
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86183.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86183 => 'China Mobile',
+);
diff --git a/src/libphonenumber/carrier/data/en/86184.php b/src/libphonenumber/carrier/data/en/86184.php
new file mode 100644
index 000000000..66f53a4a4
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/86184.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86184 => 'China Mobile',
+);
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CL.php b/src/libphonenumber/data/PhoneNumberMetadata_CL.php
index 33e76ceb1..7e0eb0c93 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_CL.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_CL.php
@@ -21,12 +21,9 @@
   array (
     'NationalNumberPattern' => '
           2(?:
+            1962\\d{4}|
             2\\d{7}|
-            3(?:
-              20|
-              22
-            )\\d{5}|
-            1962\\d{4}
+            32[0-2]\\d{5}
           )|
           (?:
             3[2-5]|
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CN.php b/src/libphonenumber/data/PhoneNumberMetadata_CN.php
index e128e5f32..09cc38e91 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_CN.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_CN.php
@@ -32,7 +32,7 @@
             )|
             4(?:
               [15]1|
-              3[12]
+              3[1-35]
             )|
             5(?:
               1\\d|
@@ -95,15 +95,16 @@
               2[248]|
               3[04-9]|
               4[3-6]|
-              5[0-3689]|
+              5[0-4689]|
               6[2368]|
               9[02-9]
             )|
             8(?:
+              078|
               1[236-8]|
               2[5-7]|
               3\\d|
-              5[4-9]|
+              5[1-9]|
               7[02-9]|
               8[3678]|
               9[1-7]
@@ -137,7 +138,7 @@
             [38]\\d|
             4[57]|
             5[0-35-9]|
-            7[06-8]
+            7[036-8]
           )\\d{8}
         ',
     'PossibleNumberPattern' => '\\d{11}',
@@ -476,7 +477,7 @@
               1[236-8]|
               2[5-7]|
               3|
-              5[4-9]|
+              5[1-9]|
               7[02-9]|
               8[3678]|
               9[1-7]
@@ -506,7 +507,7 @@
             )|
             4(?:
               [15]1|
-              3[12]
+              3[1-35]
             )|
             5(?:
               1|
@@ -532,6 +533,18 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
     ),
     10 => 
+    array (
+      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '807',
+        1 => '8078',
+      ),
+      'nationalPrefixFormattingRule' => '0$1',
+      'domesticCarrierCodeFormattingRule' => '$CC $1',
+    ),
+    11 => 
     array (
       'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -542,7 +555,7 @@
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '$CC $1',
     ),
-    11 => 
+    12 => 
     array (
       'pattern' => '(10800)(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -555,7 +568,7 @@
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    12 => 
+    13 => 
     array (
       'pattern' => '(\\d{3})(\\d{7,8})',
       'format' => '$1 $2',
@@ -731,7 +744,7 @@
               1[236-8]|
               2[5-7]|
               3|
-              5[4-9]|
+              5[1-9]|
               7[02-9]|
               8[3678]|
               9[1-7]
@@ -761,7 +774,7 @@
             )|
             4(?:
               [15]1|
-              3[12]
+              3[1-35]
             )|
             5(?:
               1|
@@ -787,6 +800,18 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
     ),
     8 => 
+    array (
+      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '807',
+        1 => '8078',
+      ),
+      'nationalPrefixFormattingRule' => '0$1',
+      'domesticCarrierCodeFormattingRule' => '$CC $1',
+    ),
+    9 => 
     array (
       'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -797,7 +822,7 @@
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '$CC $1',
     ),
-    9 => 
+    10 => 
     array (
       'pattern' => '(10800)(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -810,7 +835,7 @@
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    10 => 
+    11 => 
     array (
       'pattern' => '(\\d{3})(\\d{7,8})',
       'format' => '$1 $2',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_FO.php b/src/libphonenumber/data/PhoneNumberMetadata_FO.php
index 6f05c868e..8b6bd7fba 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_FO.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_FO.php
@@ -27,9 +27,8 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            2[1-9]|
-            5\\d|
-            7[1-79]
+            [27][1-9]|
+            5\\d
           )\\d{4}
         ',
     'PossibleNumberPattern' => '\\d{6}',
@@ -48,7 +47,7 @@
             [1345][15-7]|
             2[125-7]|
             99
-            )\\d{2}
+          )\\d{2}
         ',
     'PossibleNumberPattern' => '\\d{6}',
     'ExampleNumber' => '901123',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_KE.php b/src/libphonenumber/data/PhoneNumberMetadata_KE.php
index 9f950eecc..8c129445a 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_KE.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_KE.php
@@ -42,7 +42,7 @@
             5[0-6]|
             7[0-5]|
             8[0-25-9]|
-            9[0-4]
+            9[0-7]
           )\\d{6}
         ',
     'PossibleNumberPattern' => '\\d{9}',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SE.php b/src/libphonenumber/data/PhoneNumberMetadata_SE.php
index af98a4b86..5bc7992cf 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_SE.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_SE.php
@@ -237,16 +237,15 @@
     ),
     2 => 
     array (
-      'pattern' => '([1-69]\\d)(\\d{3})(\\d{2})',
+      'pattern' => '([1-469]\\d)(\\d{3})(\\d{2})',
       'format' => '$1-$2 $3',
       'leadingDigitsPatterns' => 
       array (
         0 => '
-            1[13689]|
+            1[136]|
             2[136]|
-            3[1356]|
+            3[356]|
             4[0246]|
-            54|
             6[03]|
             90
           ',
@@ -262,11 +261,17 @@
       array (
         0 => '
             1[2457]|
-            2[2457-9]|
+            2(?:
+              [247-9]|
+              5[0138]
+            )|
             3[0247-9]|
             4[1357-9]|
             5[0-35-9]|
-            6[124-9]|
+            6(?:
+              [124-689]|
+              7[0-2]
+            )|
             9(?:
               [125-8]|
               3[0-5]|
@@ -285,11 +290,17 @@
       array (
         0 => '
             1[2457]|
-            2[2457-9]|
+            2(?:
+              [247-9]|
+              5[0138]
+            )|
             3[0247-9]|
             4[1357-9]|
             5[0-35-9]|
-            6[124-9]|
+            6(?:
+              [124-689]|
+              7[0-2]
+            )|
             9(?:
               [125-8]|
               3[0-5]|
@@ -355,6 +366,20 @@
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
+    10 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+      'format' => '$1-$2 $3 $4 $5',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            25[245]|
+            67[3-6]
+          ',
+      ),
+      'nationalPrefixFormattingRule' => '0$1',
+      'domesticCarrierCodeFormattingRule' => '',
+    ),
   ),
   'intlNumberFormat' => 
   array (
@@ -386,16 +411,15 @@
     ),
     2 => 
     array (
-      'pattern' => '([1-69]\\d)(\\d{3})(\\d{2})',
+      'pattern' => '([1-469]\\d)(\\d{3})(\\d{2})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
         0 => '
-            1[13689]|
+            1[136]|
             2[136]|
-            3[1356]|
+            3[356]|
             4[0246]|
-            54|
             6[03]|
             90
           ',
@@ -409,11 +433,17 @@
       array (
         0 => '
             1[2457]|
-            2[2457-9]|
+            2(?:
+              [247-9]|
+              5[0138]
+            )|
             3[0247-9]|
             4[1357-9]|
             5[0-35-9]|
-            6[124-9]|
+            6(?:
+              [124-689]|
+              7[0-2]
+            )|
             9(?:
               [125-8]|
               3[0-5]|
@@ -430,11 +460,17 @@
       array (
         0 => '
             1[2457]|
-            2[2457-9]|
+            2(?:
+              [247-9]|
+              5[0138]
+            )|
             3[0247-9]|
             4[1357-9]|
             5[0-35-9]|
-            6[124-9]|
+            6(?:
+              [124-689]|
+              7[0-2]
+            )|
             9(?:
               [125-8]|
               3[0-5]|
@@ -488,6 +524,18 @@
         0 => '9[034]',
       ),
     ),
+    10 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+      'format' => '$1 $2 $3 $4 $5',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            25[245]|
+            67[3-6]
+          ',
+      ),
+    ),
   ),
   'mainCountryForCode' => false,
   'leadingZeroPossible' => false,
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SO.php b/src/libphonenumber/data/PhoneNumberMetadata_SO.php
index 55efc11ac..649445748 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_SO.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_SO.php
@@ -40,7 +40,7 @@
              99?\\d
             )|
             9(?:
-              07|
+              0[67]|
               [2-9]
             )\\d
           )\\d{5}
diff --git a/src/libphonenumber/data/ShortNumberMetadata_FO.php b/src/libphonenumber/data/ShortNumberMetadata_FO.php
index 6b434f3b8..2db8b2592 100644
--- a/src/libphonenumber/data/ShortNumberMetadata_FO.php
+++ b/src/libphonenumber/data/ShortNumberMetadata_FO.php
@@ -58,7 +58,7 @@
   ),
   'emergency' => 
   array (
-    'NationalNumberPattern' => '112',
+    'NationalNumberPattern' => '11[24]',
     'PossibleNumberPattern' => '\\d{3}',
     'ExampleNumber' => '112',
   ),
diff --git a/src/libphonenumber/geocoding/data/Map.php b/src/libphonenumber/geocoding/data/Map.php
index c7e4b14fc..4f1673cca 100644
--- a/src/libphonenumber/geocoding/data/Map.php
+++ b/src/libphonenumber/geocoding/data/Map.php
@@ -574,271 +574,275 @@
     531 => 86436,
     532 => 86437,
     533 => 86438,
-    534 => 86451,
-    535 => 86452,
-    536 => 86453,
-    537 => 86454,
-    538 => 86455,
-    539 => 86456,
-    540 => 86457,
-    541 => 86458,
-    542 => 86459,
-    543 => 86464,
-    544 => 86467,
-    545 => 86468,
-    546 => 86469,
-    547 => 86470,
-    548 => 86471,
-    549 => 86472,
-    550 => 86473,
-    551 => 86474,
-    552 => 86475,
-    553 => 86476,
-    554 => 86477,
-    555 => 86478,
-    556 => 86479,
-    557 => 86482,
-    558 => 86483,
-    559 => 86510,
-    560 => 86511,
-    561 => 86512,
-    562 => 86513,
-    563 => 86514,
-    564 => 86515,
-    565 => 86516,
-    566 => 86517,
-    567 => 86518,
-    568 => 86519,
-    569 => 86523,
-    570 => 86527,
-    571 => 86530,
-    572 => 86531,
-    573 => 86532,
-    574 => 86533,
-    575 => 86534,
-    576 => 86535,
-    577 => 86536,
-    578 => 86537,
-    579 => 86538,
-    580 => 86539,
-    581 => 86543,
-    582 => 86546,
-    583 => 86550,
-    584 => 86551,
-    585 => 86552,
-    586 => 86553,
-    587 => 86554,
-    588 => 86555,
-    589 => 86556,
-    590 => 86557,
-    591 => 86558,
-    592 => 86559,
-    593 => 86561,
-    594 => 86562,
-    595 => 86563,
-    596 => 86564,
-    597 => 86566,
-    598 => 86570,
-    599 => 86571,
-    600 => 86572,
-    601 => 86573,
-    602 => 86574,
-    603 => 86575,
-    604 => 86576,
-    605 => 86577,
-    606 => 86578,
-    607 => 86579,
-    608 => 86580,
-    609 => 86591,
-    610 => 86592,
-    611 => 86593,
-    612 => 86594,
-    613 => 86595,
-    614 => 86596,
-    615 => 86597,
-    616 => 86598,
-    617 => 86599,
-    618 => 86631,
-    619 => 86632,
-    620 => 86633,
-    621 => 86634,
-    622 => 86635,
-    623 => 86660,
-    624 => 86662,
-    625 => 86663,
-    626 => 86668,
-    627 => 86691,
-    628 => 86692,
-    629 => 86701,
-    630 => 86710,
-    631 => 86711,
-    632 => 86712,
-    633 => 86713,
-    634 => 86714,
-    635 => 86715,
-    636 => 86716,
-    637 => 86717,
-    638 => 86718,
-    639 => 86719,
-    640 => 86722,
-    641 => 86724,
-    642 => 86728,
-    643 => 86730,
-    644 => 86731,
-    645 => 86734,
-    646 => 86735,
-    647 => 86736,
-    648 => 86737,
-    649 => 86738,
-    650 => 86739,
-    651 => 86743,
-    652 => 86744,
-    653 => 86745,
-    654 => 86746,
-    655 => 86750,
-    656 => 86751,
-    657 => 86752,
-    658 => 86753,
-    659 => 86754,
-    660 => 86755,
-    661 => 86756,
-    662 => 86757,
-    663 => 86758,
-    664 => 86759,
-    665 => 86760,
-    666 => 86762,
-    667 => 86763,
-    668 => 86766,
-    669 => 86768,
-    670 => 86769,
-    671 => 86770,
-    672 => 86771,
-    673 => 86772,
-    674 => 86773,
-    675 => 86774,
-    676 => 86775,
-    677 => 86776,
-    678 => 86777,
-    679 => 86778,
-    680 => 86779,
-    681 => 86790,
-    682 => 86791,
-    683 => 86792,
-    684 => 86793,
-    685 => 86794,
-    686 => 86795,
-    687 => 86796,
-    688 => 86797,
-    689 => 86798,
-    690 => 86799,
-    691 => 86812,
-    692 => 86813,
-    693 => 86816,
-    694 => 86817,
-    695 => 86818,
-    696 => 86825,
-    697 => 86826,
-    698 => 86827,
-    699 => 86830,
-    700 => 86831,
-    701 => 86832,
-    702 => 86833,
-    703 => 86834,
-    704 => 86835,
-    705 => 86836,
-    706 => 86837,
-    707 => 86838,
-    708 => 86839,
-    709 => 86851,
-    710 => 86854,
-    711 => 86855,
-    712 => 86856,
-    713 => 86857,
-    714 => 86858,
-    715 => 86859,
-    716 => 86870,
-    717 => 86871,
-    718 => 86872,
-    719 => 86873,
-    720 => 86874,
-    721 => 86875,
-    722 => 86876,
-    723 => 86877,
-    724 => 86878,
-    725 => 86879,
-    726 => 86883,
-    727 => 86886,
-    728 => 86887,
-    729 => 86888,
-    730 => 86891,
-    731 => 86892,
-    732 => 86893,
-    733 => 86894,
-    734 => 86895,
-    735 => 86896,
-    736 => 86897,
-    737 => 86898,
-    738 => 86901,
-    739 => 86902,
-    740 => 86903,
-    741 => 86906,
-    742 => 86908,
-    743 => 86909,
-    744 => 86911,
-    745 => 86912,
-    746 => 86913,
-    747 => 86914,
-    748 => 86915,
-    749 => 86916,
-    750 => 86917,
-    751 => 86919,
-    752 => 86930,
-    753 => 86931,
-    754 => 86932,
-    755 => 86933,
-    756 => 86934,
-    757 => 86935,
-    758 => 86936,
-    759 => 86937,
-    760 => 86938,
-    761 => 86939,
-    762 => 86941,
-    763 => 86943,
-    764 => 86951,
-    765 => 86952,
-    766 => 86953,
-    767 => 86954,
-    768 => 86955,
-    769 => 86970,
-    770 => 86971,
-    771 => 86972,
-    772 => 86973,
-    773 => 86974,
-    774 => 86975,
-    775 => 86976,
-    776 => 86977,
-    777 => 86979,
-    778 => 86990,
-    779 => 86991,
-    780 => 86992,
-    781 => 86993,
-    782 => 86994,
-    783 => 86995,
-    784 => 86996,
-    785 => 86997,
-    786 => 86998,
-    787 => 86999,
-    788 => 886,
-    789 => 90,
-    790 => 91,
-    791 => 94,
-    792 => 95,
-    793 => 962,
-    794 => 966,
-    795 => 968,
-    796 => 972,
-    797 => 975,
-    798 => 98,
+    534 => 86439,
+    535 => 86451,
+    536 => 86452,
+    537 => 86453,
+    538 => 86454,
+    539 => 86455,
+    540 => 86456,
+    541 => 86457,
+    542 => 86458,
+    543 => 86459,
+    544 => 86464,
+    545 => 86467,
+    546 => 86468,
+    547 => 86469,
+    548 => 86470,
+    549 => 86471,
+    550 => 86472,
+    551 => 86473,
+    552 => 86474,
+    553 => 86475,
+    554 => 86476,
+    555 => 86477,
+    556 => 86478,
+    557 => 86479,
+    558 => 86482,
+    559 => 86483,
+    560 => 86510,
+    561 => 86511,
+    562 => 86512,
+    563 => 86513,
+    564 => 86514,
+    565 => 86515,
+    566 => 86516,
+    567 => 86517,
+    568 => 86518,
+    569 => 86519,
+    570 => 86523,
+    571 => 86527,
+    572 => 86530,
+    573 => 86531,
+    574 => 86532,
+    575 => 86533,
+    576 => 86534,
+    577 => 86535,
+    578 => 86536,
+    579 => 86537,
+    580 => 86538,
+    581 => 86539,
+    582 => 86543,
+    583 => 86546,
+    584 => 86550,
+    585 => 86551,
+    586 => 86552,
+    587 => 86553,
+    588 => 86554,
+    589 => 86555,
+    590 => 86556,
+    591 => 86557,
+    592 => 86558,
+    593 => 86559,
+    594 => 86561,
+    595 => 86562,
+    596 => 86563,
+    597 => 86564,
+    598 => 86566,
+    599 => 86570,
+    600 => 86571,
+    601 => 86572,
+    602 => 86573,
+    603 => 86574,
+    604 => 86575,
+    605 => 86576,
+    606 => 86577,
+    607 => 86578,
+    608 => 86579,
+    609 => 86580,
+    610 => 86591,
+    611 => 86592,
+    612 => 86593,
+    613 => 86594,
+    614 => 86595,
+    615 => 86596,
+    616 => 86597,
+    617 => 86598,
+    618 => 86599,
+    619 => 86631,
+    620 => 86632,
+    621 => 86633,
+    622 => 86634,
+    623 => 86635,
+    624 => 86660,
+    625 => 86662,
+    626 => 86663,
+    627 => 86668,
+    628 => 86691,
+    629 => 86692,
+    630 => 86701,
+    631 => 86710,
+    632 => 86711,
+    633 => 86712,
+    634 => 86713,
+    635 => 86714,
+    636 => 86715,
+    637 => 86716,
+    638 => 86717,
+    639 => 86718,
+    640 => 86719,
+    641 => 86722,
+    642 => 86724,
+    643 => 86728,
+    644 => 86730,
+    645 => 86731,
+    646 => 86734,
+    647 => 86735,
+    648 => 86736,
+    649 => 86737,
+    650 => 86738,
+    651 => 86739,
+    652 => 86743,
+    653 => 86744,
+    654 => 86745,
+    655 => 86746,
+    656 => 86750,
+    657 => 86751,
+    658 => 86752,
+    659 => 86753,
+    660 => 86754,
+    661 => 86755,
+    662 => 86756,
+    663 => 86757,
+    664 => 86758,
+    665 => 86759,
+    666 => 86760,
+    667 => 86762,
+    668 => 86763,
+    669 => 86766,
+    670 => 86768,
+    671 => 86769,
+    672 => 86770,
+    673 => 86771,
+    674 => 86772,
+    675 => 86773,
+    676 => 86774,
+    677 => 86775,
+    678 => 86776,
+    679 => 86777,
+    680 => 86778,
+    681 => 86779,
+    682 => 86790,
+    683 => 86791,
+    684 => 86792,
+    685 => 86793,
+    686 => 86794,
+    687 => 86795,
+    688 => 86796,
+    689 => 86797,
+    690 => 86798,
+    691 => 86799,
+    692 => 86807,
+    693 => 86812,
+    694 => 86813,
+    695 => 86816,
+    696 => 86817,
+    697 => 86818,
+    698 => 86825,
+    699 => 86826,
+    700 => 86827,
+    701 => 86830,
+    702 => 86831,
+    703 => 86832,
+    704 => 86833,
+    705 => 86834,
+    706 => 86835,
+    707 => 86836,
+    708 => 86837,
+    709 => 86838,
+    710 => 86839,
+    711 => 86851,
+    712 => 86852,
+    713 => 86853,
+    714 => 86854,
+    715 => 86855,
+    716 => 86856,
+    717 => 86857,
+    718 => 86858,
+    719 => 86859,
+    720 => 86870,
+    721 => 86871,
+    722 => 86872,
+    723 => 86873,
+    724 => 86874,
+    725 => 86875,
+    726 => 86876,
+    727 => 86877,
+    728 => 86878,
+    729 => 86879,
+    730 => 86883,
+    731 => 86886,
+    732 => 86887,
+    733 => 86888,
+    734 => 86891,
+    735 => 86892,
+    736 => 86893,
+    737 => 86894,
+    738 => 86895,
+    739 => 86896,
+    740 => 86897,
+    741 => 86898,
+    742 => 86901,
+    743 => 86902,
+    744 => 86903,
+    745 => 86906,
+    746 => 86908,
+    747 => 86909,
+    748 => 86911,
+    749 => 86912,
+    750 => 86913,
+    751 => 86914,
+    752 => 86915,
+    753 => 86916,
+    754 => 86917,
+    755 => 86919,
+    756 => 86930,
+    757 => 86931,
+    758 => 86932,
+    759 => 86933,
+    760 => 86934,
+    761 => 86935,
+    762 => 86936,
+    763 => 86937,
+    764 => 86938,
+    765 => 86939,
+    766 => 86941,
+    767 => 86943,
+    768 => 86951,
+    769 => 86952,
+    770 => 86953,
+    771 => 86954,
+    772 => 86955,
+    773 => 86970,
+    774 => 86971,
+    775 => 86972,
+    776 => 86973,
+    777 => 86974,
+    778 => 86975,
+    779 => 86976,
+    780 => 86977,
+    781 => 86979,
+    782 => 86990,
+    783 => 86991,
+    784 => 86992,
+    785 => 86993,
+    786 => 86994,
+    787 => 86995,
+    788 => 86996,
+    789 => 86997,
+    790 => 86998,
+    791 => 86999,
+    792 => 886,
+    793 => 90,
+    794 => 91,
+    795 => 94,
+    796 => 95,
+    797 => 962,
+    798 => 966,
+    799 => 968,
+    800 => 972,
+    801 => 975,
+    802 => 98,
   ),
   'es' => 
   array (
@@ -1058,263 +1062,265 @@
     103 => 86436,
     104 => 86437,
     105 => 86438,
-    106 => 86451,
-    107 => 86452,
-    108 => 86453,
-    109 => 86454,
-    110 => 86455,
-    111 => 86456,
-    112 => 86457,
-    113 => 86458,
-    114 => 86459,
-    115 => 86464,
-    116 => 86467,
-    117 => 86468,
-    118 => 86469,
-    119 => 86470,
-    120 => 86471,
-    121 => 86472,
-    122 => 86473,
-    123 => 86474,
-    124 => 86475,
-    125 => 86476,
-    126 => 86477,
-    127 => 86478,
-    128 => 86479,
-    129 => 86482,
-    130 => 86483,
-    131 => 86510,
-    132 => 86511,
-    133 => 86512,
-    134 => 86513,
-    135 => 86514,
-    136 => 86515,
-    137 => 86516,
-    138 => 86517,
-    139 => 86518,
-    140 => 86519,
-    141 => 86523,
-    142 => 86527,
-    143 => 86530,
-    144 => 86531,
-    145 => 86532,
-    146 => 86533,
-    147 => 86534,
-    148 => 86535,
-    149 => 86536,
-    150 => 86537,
-    151 => 86538,
-    152 => 86539,
-    153 => 86543,
-    154 => 86546,
-    155 => 86550,
-    156 => 86551,
-    157 => 86552,
-    158 => 86553,
-    159 => 86554,
-    160 => 86555,
-    161 => 86556,
-    162 => 86557,
-    163 => 86558,
-    164 => 86559,
-    165 => 86561,
-    166 => 86562,
-    167 => 86563,
-    168 => 86564,
-    169 => 86566,
-    170 => 86570,
-    171 => 86571,
-    172 => 86572,
-    173 => 86573,
-    174 => 86574,
-    175 => 86575,
-    176 => 86576,
-    177 => 86577,
-    178 => 86578,
-    179 => 86579,
-    180 => 86580,
-    181 => 86591,
-    182 => 86592,
-    183 => 86593,
-    184 => 86594,
-    185 => 86595,
-    186 => 86596,
-    187 => 86597,
-    188 => 86598,
-    189 => 86599,
-    190 => 86631,
-    191 => 86632,
-    192 => 86633,
-    193 => 86634,
-    194 => 86635,
-    195 => 86660,
-    196 => 86662,
-    197 => 86663,
-    198 => 86668,
-    199 => 86691,
-    200 => 86692,
-    201 => 86701,
-    202 => 86710,
-    203 => 86711,
-    204 => 86712,
-    205 => 86713,
-    206 => 86714,
-    207 => 86715,
-    208 => 86716,
-    209 => 86717,
-    210 => 86718,
-    211 => 86719,
-    212 => 86722,
-    213 => 86724,
-    214 => 86728,
-    215 => 86730,
-    216 => 86731,
-    217 => 86734,
-    218 => 86735,
-    219 => 86736,
-    220 => 86737,
-    221 => 86738,
-    222 => 86739,
-    223 => 86743,
-    224 => 86744,
-    225 => 86745,
-    226 => 86746,
-    227 => 86750,
-    228 => 86751,
-    229 => 86752,
-    230 => 86753,
-    231 => 86754,
-    232 => 86755,
-    233 => 86756,
-    234 => 86757,
-    235 => 86758,
-    236 => 86759,
-    237 => 86760,
-    238 => 86762,
-    239 => 86763,
-    240 => 86766,
-    241 => 86768,
-    242 => 86769,
-    243 => 86770,
-    244 => 86771,
-    245 => 86772,
-    246 => 86773,
-    247 => 86774,
-    248 => 86775,
-    249 => 86776,
-    250 => 86777,
-    251 => 86778,
-    252 => 86779,
-    253 => 86790,
-    254 => 86791,
-    255 => 86792,
-    256 => 86793,
-    257 => 86794,
-    258 => 86795,
-    259 => 86796,
-    260 => 86797,
-    261 => 86798,
-    262 => 86799,
-    263 => 86812,
-    264 => 86813,
-    265 => 86816,
-    266 => 86817,
-    267 => 86818,
-    268 => 86825,
-    269 => 86826,
-    270 => 86827,
-    271 => 86830,
-    272 => 86831,
-    273 => 86832,
-    274 => 86833,
-    275 => 86834,
-    276 => 86835,
-    277 => 86836,
-    278 => 86837,
-    279 => 86838,
-    280 => 86839,
-    281 => 86851,
-    282 => 86852,
-    283 => 86853,
-    284 => 86854,
-    285 => 86855,
-    286 => 86856,
-    287 => 86857,
-    288 => 86858,
-    289 => 86859,
-    290 => 86870,
-    291 => 86871,
-    292 => 86872,
-    293 => 86873,
-    294 => 86874,
-    295 => 86875,
-    296 => 86876,
-    297 => 86877,
-    298 => 86878,
-    299 => 86879,
-    300 => 86883,
-    301 => 86886,
-    302 => 86887,
-    303 => 86888,
-    304 => 86891,
-    305 => 86892,
-    306 => 86893,
-    307 => 86894,
-    308 => 86895,
-    309 => 86896,
-    310 => 86897,
-    311 => 86898,
-    312 => 86901,
-    313 => 86902,
-    314 => 86903,
-    315 => 86906,
-    316 => 86908,
-    317 => 86909,
-    318 => 86911,
-    319 => 86912,
-    320 => 86913,
-    321 => 86914,
-    322 => 86915,
-    323 => 86916,
-    324 => 86917,
-    325 => 86919,
-    326 => 86930,
-    327 => 86931,
-    328 => 86932,
-    329 => 86933,
-    330 => 86934,
-    331 => 86935,
-    332 => 86936,
-    333 => 86937,
-    334 => 86938,
-    335 => 86939,
-    336 => 86941,
-    337 => 86943,
-    338 => 86951,
-    339 => 86952,
-    340 => 86953,
-    341 => 86954,
-    342 => 86955,
-    343 => 86970,
-    344 => 86971,
-    345 => 86972,
-    346 => 86973,
-    347 => 86974,
-    348 => 86975,
-    349 => 86976,
-    350 => 86977,
-    351 => 86979,
-    352 => 86990,
-    353 => 86991,
-    354 => 86992,
-    355 => 86993,
-    356 => 86994,
-    357 => 86995,
-    358 => 86996,
-    359 => 86997,
-    360 => 86998,
-    361 => 86999,
-    362 => 886,
+    106 => 86439,
+    107 => 86451,
+    108 => 86452,
+    109 => 86453,
+    110 => 86454,
+    111 => 86455,
+    112 => 86456,
+    113 => 86457,
+    114 => 86458,
+    115 => 86459,
+    116 => 86464,
+    117 => 86467,
+    118 => 86468,
+    119 => 86469,
+    120 => 86470,
+    121 => 86471,
+    122 => 86472,
+    123 => 86473,
+    124 => 86474,
+    125 => 86475,
+    126 => 86476,
+    127 => 86477,
+    128 => 86478,
+    129 => 86479,
+    130 => 86482,
+    131 => 86483,
+    132 => 86510,
+    133 => 86511,
+    134 => 86512,
+    135 => 86513,
+    136 => 86514,
+    137 => 86515,
+    138 => 86516,
+    139 => 86517,
+    140 => 86518,
+    141 => 86519,
+    142 => 86523,
+    143 => 86527,
+    144 => 86530,
+    145 => 86531,
+    146 => 86532,
+    147 => 86533,
+    148 => 86534,
+    149 => 86535,
+    150 => 86536,
+    151 => 86537,
+    152 => 86538,
+    153 => 86539,
+    154 => 86543,
+    155 => 86546,
+    156 => 86550,
+    157 => 86551,
+    158 => 86552,
+    159 => 86553,
+    160 => 86554,
+    161 => 86555,
+    162 => 86556,
+    163 => 86557,
+    164 => 86558,
+    165 => 86559,
+    166 => 86561,
+    167 => 86562,
+    168 => 86563,
+    169 => 86564,
+    170 => 86566,
+    171 => 86570,
+    172 => 86571,
+    173 => 86572,
+    174 => 86573,
+    175 => 86574,
+    176 => 86575,
+    177 => 86576,
+    178 => 86577,
+    179 => 86578,
+    180 => 86579,
+    181 => 86580,
+    182 => 86591,
+    183 => 86592,
+    184 => 86593,
+    185 => 86594,
+    186 => 86595,
+    187 => 86596,
+    188 => 86597,
+    189 => 86598,
+    190 => 86599,
+    191 => 86631,
+    192 => 86632,
+    193 => 86633,
+    194 => 86634,
+    195 => 86635,
+    196 => 86660,
+    197 => 86662,
+    198 => 86663,
+    199 => 86668,
+    200 => 86691,
+    201 => 86692,
+    202 => 86701,
+    203 => 86710,
+    204 => 86711,
+    205 => 86712,
+    206 => 86713,
+    207 => 86714,
+    208 => 86715,
+    209 => 86716,
+    210 => 86717,
+    211 => 86718,
+    212 => 86719,
+    213 => 86722,
+    214 => 86724,
+    215 => 86728,
+    216 => 86730,
+    217 => 86731,
+    218 => 86734,
+    219 => 86735,
+    220 => 86736,
+    221 => 86737,
+    222 => 86738,
+    223 => 86739,
+    224 => 86743,
+    225 => 86744,
+    226 => 86745,
+    227 => 86746,
+    228 => 86750,
+    229 => 86751,
+    230 => 86752,
+    231 => 86753,
+    232 => 86754,
+    233 => 86755,
+    234 => 86756,
+    235 => 86757,
+    236 => 86758,
+    237 => 86759,
+    238 => 86760,
+    239 => 86762,
+    240 => 86763,
+    241 => 86766,
+    242 => 86768,
+    243 => 86769,
+    244 => 86770,
+    245 => 86771,
+    246 => 86772,
+    247 => 86773,
+    248 => 86774,
+    249 => 86775,
+    250 => 86776,
+    251 => 86777,
+    252 => 86778,
+    253 => 86779,
+    254 => 86790,
+    255 => 86791,
+    256 => 86792,
+    257 => 86793,
+    258 => 86794,
+    259 => 86795,
+    260 => 86796,
+    261 => 86797,
+    262 => 86798,
+    263 => 86799,
+    264 => 86807,
+    265 => 86812,
+    266 => 86813,
+    267 => 86816,
+    268 => 86817,
+    269 => 86818,
+    270 => 86825,
+    271 => 86826,
+    272 => 86827,
+    273 => 86830,
+    274 => 86831,
+    275 => 86832,
+    276 => 86833,
+    277 => 86834,
+    278 => 86835,
+    279 => 86836,
+    280 => 86837,
+    281 => 86838,
+    282 => 86839,
+    283 => 86851,
+    284 => 86852,
+    285 => 86853,
+    286 => 86854,
+    287 => 86855,
+    288 => 86856,
+    289 => 86857,
+    290 => 86858,
+    291 => 86859,
+    292 => 86870,
+    293 => 86871,
+    294 => 86872,
+    295 => 86873,
+    296 => 86874,
+    297 => 86875,
+    298 => 86876,
+    299 => 86877,
+    300 => 86878,
+    301 => 86879,
+    302 => 86883,
+    303 => 86886,
+    304 => 86887,
+    305 => 86888,
+    306 => 86891,
+    307 => 86892,
+    308 => 86893,
+    309 => 86894,
+    310 => 86895,
+    311 => 86896,
+    312 => 86897,
+    313 => 86898,
+    314 => 86901,
+    315 => 86902,
+    316 => 86903,
+    317 => 86906,
+    318 => 86908,
+    319 => 86909,
+    320 => 86911,
+    321 => 86912,
+    322 => 86913,
+    323 => 86914,
+    324 => 86915,
+    325 => 86916,
+    326 => 86917,
+    327 => 86919,
+    328 => 86930,
+    329 => 86931,
+    330 => 86932,
+    331 => 86933,
+    332 => 86934,
+    333 => 86935,
+    334 => 86936,
+    335 => 86937,
+    336 => 86938,
+    337 => 86939,
+    338 => 86941,
+    339 => 86943,
+    340 => 86951,
+    341 => 86952,
+    342 => 86953,
+    343 => 86954,
+    344 => 86955,
+    345 => 86970,
+    346 => 86971,
+    347 => 86972,
+    348 => 86973,
+    349 => 86974,
+    350 => 86975,
+    351 => 86976,
+    352 => 86977,
+    353 => 86979,
+    354 => 86990,
+    355 => 86991,
+    356 => 86992,
+    357 => 86993,
+    358 => 86994,
+    359 => 86995,
+    360 => 86996,
+    361 => 86997,
+    362 => 86998,
+    363 => 86999,
+    364 => 886,
   ),
   'zh_Hant' => 
   array (
diff --git a/src/libphonenumber/geocoding/data/en/8624.php b/src/libphonenumber/geocoding/data/en/8624.php
index 0a96c5f92..1bbe78b73 100644
--- a/src/libphonenumber/geocoding/data/en/8624.php
+++ b/src/libphonenumber/geocoding/data/en/8624.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  8624 => 'Shenyang, Liaoning',
+  8624 => 'Shenyang/Tieling/Fushun, Liaoning',
 );
diff --git a/src/libphonenumber/geocoding/data/en/8628.php b/src/libphonenumber/geocoding/data/en/8628.php
index 89f9613cb..a63c4e451 100644
--- a/src/libphonenumber/geocoding/data/en/8628.php
+++ b/src/libphonenumber/geocoding/data/en/8628.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  8628 => 'Chengdu, Sichuan',
+  8628 => 'Chengdu/Ziyang/Meishan, Sichuan',
 );
diff --git a/src/libphonenumber/geocoding/data/en/8629.php b/src/libphonenumber/geocoding/data/en/8629.php
index 856657547..b8aabad6d 100644
--- a/src/libphonenumber/geocoding/data/en/8629.php
+++ b/src/libphonenumber/geocoding/data/en/8629.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  8629 => 'XiAn, Shaanxi',
+  8629 => 'XiAn/Xianyang, Shaanxi',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86433.php b/src/libphonenumber/geocoding/data/en/86433.php
index db7325b1a..5cc1fbce2 100644
--- a/src/libphonenumber/geocoding/data/en/86433.php
+++ b/src/libphonenumber/geocoding/data/en/86433.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86433 => 'Yanbian Zhou, Jilin',
+  86433 => 'Yanbian Zhou/Hunchun/Yanji, Jilin',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86435.php b/src/libphonenumber/geocoding/data/en/86435.php
index 918b97a86..6f61551c2 100644
--- a/src/libphonenumber/geocoding/data/en/86435.php
+++ b/src/libphonenumber/geocoding/data/en/86435.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86435 => 'Tonghua, Jilin',
+  86435 => 'Tonghua/Meihekou, Jilin',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86439.php b/src/libphonenumber/geocoding/data/en/86439.php
new file mode 100644
index 000000000..e7299a44c
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/en/86439.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86439 => 'Baishan, Jilin',
+);
diff --git a/src/libphonenumber/geocoding/data/en/86551.php b/src/libphonenumber/geocoding/data/en/86551.php
index e4bf6c96e..b758bc26b 100644
--- a/src/libphonenumber/geocoding/data/en/86551.php
+++ b/src/libphonenumber/geocoding/data/en/86551.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86551 => 'Hefei, Anhui',
+  86551 => 'Hefei/Chaohu, Anhui',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86710.php b/src/libphonenumber/geocoding/data/en/86710.php
index 77d642bfb..8dbf0e972 100644
--- a/src/libphonenumber/geocoding/data/en/86710.php
+++ b/src/libphonenumber/geocoding/data/en/86710.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86710 => 'Xiangyang, Hubei',
+  86710 => 'Xiangyang/Xiangfan, Hubei',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86731.php b/src/libphonenumber/geocoding/data/en/86731.php
index e9d797139..7b1479e16 100644
--- a/src/libphonenumber/geocoding/data/en/86731.php
+++ b/src/libphonenumber/geocoding/data/en/86731.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86731 => 'Zhuzhou, Hunan',
+  86731 => 'Zhuzhou/Changsha/Xiangtan, Hunan',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86754.php b/src/libphonenumber/geocoding/data/en/86754.php
index c7eb3e249..9c598fcd8 100644
--- a/src/libphonenumber/geocoding/data/en/86754.php
+++ b/src/libphonenumber/geocoding/data/en/86754.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86754 => 'Shantou, Guangdong',
+  86754 => 'Shantou/Chaoyang, Guangdong',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86757.php b/src/libphonenumber/geocoding/data/en/86757.php
index 407816cc4..6d7da9b22 100644
--- a/src/libphonenumber/geocoding/data/en/86757.php
+++ b/src/libphonenumber/geocoding/data/en/86757.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86757 => 'Shunde, Guangdong',
+  86757 => 'Shunde/Foshan, Guangdong',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86807.php b/src/libphonenumber/geocoding/data/en/86807.php
new file mode 100644
index 000000000..e140aa547
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/en/86807.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  868078 => 'Suoxian, Tibet',
+);
diff --git a/src/libphonenumber/geocoding/data/en/86832.php b/src/libphonenumber/geocoding/data/en/86832.php
index aa9fc089d..23bb5959a 100644
--- a/src/libphonenumber/geocoding/data/en/86832.php
+++ b/src/libphonenumber/geocoding/data/en/86832.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86832 => 'Ziyang, Sichuan',
+  86832 => 'Ziyang/Neijiang, Sichuan',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86852.php b/src/libphonenumber/geocoding/data/en/86852.php
new file mode 100644
index 000000000..f9a1147a3
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/en/86852.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86852 => 'Zunyi, Guizhou',
+);
diff --git a/src/libphonenumber/geocoding/data/en/86853.php b/src/libphonenumber/geocoding/data/en/86853.php
new file mode 100644
index 000000000..50af51ff8
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/en/86853.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86853 => 'Anshun, Guizhou',
+);
diff --git a/src/libphonenumber/geocoding/data/en/86892.php b/src/libphonenumber/geocoding/data/en/86892.php
index 51e9cc3e6..95809a287 100644
--- a/src/libphonenumber/geocoding/data/en/86892.php
+++ b/src/libphonenumber/geocoding/data/en/86892.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86892 => 'Rikaze, Tibet',
+  86892 => 'Rikaze/Zhongba, Tibet',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86896.php b/src/libphonenumber/geocoding/data/en/86896.php
index 40fba3343..6d339ad1d 100644
--- a/src/libphonenumber/geocoding/data/en/86896.php
+++ b/src/libphonenumber/geocoding/data/en/86896.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86896 => 'Naqu, Tibet',
+  86896 => 'Naqu/Jiali/Nierong/Shenzha/Shuanghu/Bange/Nima, Tibet',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86897.php b/src/libphonenumber/geocoding/data/en/86897.php
index e2edb2976..ccd31b4d6 100644
--- a/src/libphonenumber/geocoding/data/en/86897.php
+++ b/src/libphonenumber/geocoding/data/en/86897.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86897 => 'GeEr, Tibet',
+  86897 => 'GeEr/Pulan/Zhada, Tibet',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/8624.php b/src/libphonenumber/geocoding/data/zh/8624.php
index 7f187d13d..e4017b415 100644
--- a/src/libphonenumber/geocoding/data/zh/8624.php
+++ b/src/libphonenumber/geocoding/data/zh/8624.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  8624 => '辽宁省沈阳市',
+  8624 => '辽宁省沈阳市、铁岭市、抚顺市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/8628.php b/src/libphonenumber/geocoding/data/zh/8628.php
index 9f6b243d2..fa6b13708 100644
--- a/src/libphonenumber/geocoding/data/zh/8628.php
+++ b/src/libphonenumber/geocoding/data/zh/8628.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  8628 => '四川省成都市',
+  8628 => '四川省成都市、资阳市、眉山市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/8629.php b/src/libphonenumber/geocoding/data/zh/8629.php
index 3d26be60d..035144265 100644
--- a/src/libphonenumber/geocoding/data/zh/8629.php
+++ b/src/libphonenumber/geocoding/data/zh/8629.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  8629 => '陕西省西安市',
+  8629 => '陕西省西安市、咸阳市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86433.php b/src/libphonenumber/geocoding/data/zh/86433.php
index eafe40582..d2af42cc7 100644
--- a/src/libphonenumber/geocoding/data/zh/86433.php
+++ b/src/libphonenumber/geocoding/data/zh/86433.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86433 => '吉林省延边朝鲜族自治州',
+  86433 => '吉林省延边朝鲜族自治州、珲春市、延吉市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86435.php b/src/libphonenumber/geocoding/data/zh/86435.php
index a752497c2..152d289a1 100644
--- a/src/libphonenumber/geocoding/data/zh/86435.php
+++ b/src/libphonenumber/geocoding/data/zh/86435.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86435 => '吉林省通化市',
+  86435 => '吉林省通化市、梅河口市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86439.php b/src/libphonenumber/geocoding/data/zh/86439.php
new file mode 100644
index 000000000..d4253dbe7
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/zh/86439.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  86439 => '吉林省白山市',
+);
diff --git a/src/libphonenumber/geocoding/data/zh/86551.php b/src/libphonenumber/geocoding/data/zh/86551.php
index 10349b00a..a0fdbf2b2 100644
--- a/src/libphonenumber/geocoding/data/zh/86551.php
+++ b/src/libphonenumber/geocoding/data/zh/86551.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86551 => '安徽省合肥市',
+  86551 => '安徽省合肥市、巢湖市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86710.php b/src/libphonenumber/geocoding/data/zh/86710.php
index dd83597b5..580716ebe 100644
--- a/src/libphonenumber/geocoding/data/zh/86710.php
+++ b/src/libphonenumber/geocoding/data/zh/86710.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86710 => '湖北省襄樊市',
+  86710 => '湖北省襄樊市、襄樊市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86731.php b/src/libphonenumber/geocoding/data/zh/86731.php
index 29dac7b75..2c507c4b9 100644
--- a/src/libphonenumber/geocoding/data/zh/86731.php
+++ b/src/libphonenumber/geocoding/data/zh/86731.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86731 => '湖南省长沙市',
+  86731 => '湖南省长沙市、湘潭市、株州市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86754.php b/src/libphonenumber/geocoding/data/zh/86754.php
index f4d64edc6..f1fe72e82 100644
--- a/src/libphonenumber/geocoding/data/zh/86754.php
+++ b/src/libphonenumber/geocoding/data/zh/86754.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86754 => '广东省汕头市',
+  86754 => '广东省汕头市、潮阳市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86757.php b/src/libphonenumber/geocoding/data/zh/86757.php
index 9820069af..130fd54ad 100644
--- a/src/libphonenumber/geocoding/data/zh/86757.php
+++ b/src/libphonenumber/geocoding/data/zh/86757.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86757 => '广东省佛山市',
+  86757 => '广东省佛山市、顺德市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86807.php b/src/libphonenumber/geocoding/data/zh/86807.php
new file mode 100644
index 000000000..fb18698a5
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/zh/86807.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  868078 => '西藏索县',
+);
diff --git a/src/libphonenumber/geocoding/data/zh/86832.php b/src/libphonenumber/geocoding/data/zh/86832.php
index d68d8895c..1d182886f 100644
--- a/src/libphonenumber/geocoding/data/zh/86832.php
+++ b/src/libphonenumber/geocoding/data/zh/86832.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86832 => '四川省内江市',
+  86832 => '四川省内江市、资阳市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86851.php b/src/libphonenumber/geocoding/data/zh/86851.php
index 2aa6e3666..2ee48dd5a 100644
--- a/src/libphonenumber/geocoding/data/zh/86851.php
+++ b/src/libphonenumber/geocoding/data/zh/86851.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86851 => '贵州省贵阳市',
+  86851 => '贵州省贵阳市、遵义市、安顺市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86892.php b/src/libphonenumber/geocoding/data/zh/86892.php
index 80ffc155c..6fb441654 100644
--- a/src/libphonenumber/geocoding/data/zh/86892.php
+++ b/src/libphonenumber/geocoding/data/zh/86892.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86892 => '西藏日喀则地区',
+  86892 => '西藏日喀则地区、仲巴县',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86896.php b/src/libphonenumber/geocoding/data/zh/86896.php
index 36903fb0e..98a297228 100644
--- a/src/libphonenumber/geocoding/data/zh/86896.php
+++ b/src/libphonenumber/geocoding/data/zh/86896.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86896 => '西藏那曲地区',
+  86896 => '西藏那曲地区、嘉黎县、聂荣县、申扎县、双湖、班戈县、尼玛县',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86897.php b/src/libphonenumber/geocoding/data/zh/86897.php
index e5a216171..bd359f0cf 100644
--- a/src/libphonenumber/geocoding/data/zh/86897.php
+++ b/src/libphonenumber/geocoding/data/zh/86897.php
@@ -5,5 +5,5 @@
  */
 
 return array (
-  86897 => '西藏阿里地区',
+  86897 => '西藏阿里地区、普兰县、扎达县',
 );