From c1c2ab9144479c4a67286d8f150d82770aca9400 Mon Sep 17 00:00:00 2001
From: Joshua Gigg <giggsey@gmail.com>
Date: Fri, 26 Jun 2015 08:56:20 +0100
Subject: [PATCH] Upsteam changes from Google for v7.0.7

Metadata changes:
 - Updated phone metadata for region code(s):
   AC, BF, BG, CG, CM, FR, IL, IN, JP, KW, LB, LI, SB, SD, SH, TT
 - Updated short number metadata for region code(s): GY, SB
 - New geocoding data for country calling code(s): 592 (en)
 - Updated geocoding data for country calling code(s):
   86 (en, zh), 226 (en), 290 (en, fr)
 - New carrier data for country calling code(s): 592 (en), 689 (en)
 - Updated carrier data for country calling code(s):
   7 (en), 60 (en), 91 (en), 237 (en), 242 (en), 249 (en), 359 (en), 961 (en),
   1868 (en)
 - Updated / refreshed time zone meta data.
---
 src/libphonenumber/carrier/data/Map.php       | 162 ++--
 src/libphonenumber/carrier/data/en/1868.php   |   1 +
 src/libphonenumber/carrier/data/en/237.php    |   1 +
 src/libphonenumber/carrier/data/en/242.php    |   7 +-
 src/libphonenumber/carrier/data/en/249.php    |   1 +
 src/libphonenumber/carrier/data/en/359.php    |   1 +
 src/libphonenumber/carrier/data/en/592.php    |   9 +
 src/libphonenumber/carrier/data/en/60.php     |  44 +-
 src/libphonenumber/carrier/data/en/689.php    |  10 +
 src/libphonenumber/carrier/data/en/7.php      |   1 +
 src/libphonenumber/carrier/data/en/91.php     |  40 +-
 src/libphonenumber/carrier/data/en/961.php    |  22 +-
 .../data/PhoneNumberMetadata_AC.php           |  22 +-
 .../data/PhoneNumberMetadata_AR.php           |   2 +-
 .../data/PhoneNumberMetadata_BF.php           |  10 +-
 .../data/PhoneNumberMetadata_BG.php           |  22 +-
 .../data/PhoneNumberMetadata_CG.php           |  10 +-
 .../data/PhoneNumberMetadata_CM.php           |  19 +-
 .../data/PhoneNumberMetadata_EG.php           |  14 +-
 .../data/PhoneNumberMetadata_FM.php           |   4 +-
 .../data/PhoneNumberMetadata_FR.php           |   5 +-
 .../data/PhoneNumberMetadata_IL.php           |   9 +-
 .../data/PhoneNumberMetadata_IN.php           | 428 ++++-----
 .../data/PhoneNumberMetadata_JP.php           |   2 +-
 .../data/PhoneNumberMetadata_KW.php           |   6 +-
 .../data/PhoneNumberMetadata_LB.php           |  31 +-
 .../data/PhoneNumberMetadata_LI.php           |   4 +-
 .../data/PhoneNumberMetadata_SB.php           |   2 +-
 .../data/PhoneNumberMetadata_SD.php           |   2 +-
 .../data/PhoneNumberMetadata_SH.php           |  24 +-
 .../data/PhoneNumberMetadata_TT.php           |   8 +-
 .../data/ShortNumberMetadata_GY.php           |  10 +-
 .../data/ShortNumberMetadata_SB.php           |  19 +-
 src/libphonenumber/geocoding/data/Map.php     | 751 +++++++--------
 src/libphonenumber/geocoding/data/en/226.php  |  42 +-
 src/libphonenumber/geocoding/data/en/290.php  |  10 +-
 src/libphonenumber/geocoding/data/en/592.php  |  75 ++
 .../geocoding/data/en/86131.php               |  70 +-
 .../geocoding/data/en/86132.php               |  34 +-
 .../geocoding/data/en/86145.php               |  31 +-
 .../geocoding/data/en/86153.php               |  10 +
 .../geocoding/data/en/86170.php               | 884 ++++++++++++++++++
 .../geocoding/data/en/86176.php               | 584 ++++++++++++
 .../geocoding/data/en/86177.php               | 710 +++++++++++++-
 .../geocoding/data/en/86178.php               |  50 +-
 .../geocoding/data/en/86181.php               |  10 +
 .../geocoding/data/en/86184.php               |  16 +-
 .../geocoding/data/en/86185.php               | 108 ++-
 .../geocoding/data/en/86186.php               |  44 +-
 src/libphonenumber/geocoding/data/fr/290.php  |  10 +-
 .../geocoding/data/zh/86131.php               |  70 +-
 .../geocoding/data/zh/86132.php               |  34 +-
 .../geocoding/data/zh/86145.php               |  31 +-
 .../geocoding/data/zh/86153.php               |  10 +
 .../geocoding/data/zh/86170.php               | 884 ++++++++++++++++++
 .../geocoding/data/zh/86176.php               | 584 ++++++++++++
 .../geocoding/data/zh/86177.php               | 710 +++++++++++++-
 .../geocoding/data/zh/86178.php               |  50 +-
 .../geocoding/data/zh/86181.php               |  10 +
 .../geocoding/data/zh/86184.php               |  16 +-
 .../geocoding/data/zh/86185.php               | 108 ++-
 .../geocoding/data/zh/86186.php               |  44 +-
 src/libphonenumber/timezone/data/map_data.php | 207 ++--
 63 files changed, 5958 insertions(+), 1191 deletions(-)
 create mode 100644 src/libphonenumber/carrier/data/en/592.php
 create mode 100644 src/libphonenumber/carrier/data/en/689.php
 create mode 100644 src/libphonenumber/geocoding/data/en/592.php

diff --git a/src/libphonenumber/carrier/data/Map.php b/src/libphonenumber/carrier/data/Map.php
index b10d3e92a..58bf7e429 100644
--- a/src/libphonenumber/carrier/data/Map.php
+++ b/src/libphonenumber/carrier/data/Map.php
@@ -133,86 +133,88 @@
     115 => 57,
     116 => 58,
     117 => 591,
-    118 => 595,
-    119 => 597,
-    120 => 598,
-    121 => 599,
-    122 => 60,
-    123 => 61,
-    124 => 62,
-    125 => 63,
-    126 => 64,
-    127 => 65,
-    128 => 66,
-    129 => 670,
-    130 => 673,
-    131 => 675,
-    132 => 676,
-    133 => 677,
-    134 => 678,
-    135 => 679,
-    136 => 685,
-    137 => 686,
-    138 => 7,
-    139 => 84,
-    140 => 852,
-    141 => 855,
-    142 => 856,
-    143 => 86130,
-    144 => 86131,
-    145 => 86132,
-    146 => 86133,
-    147 => 86134,
-    148 => 86135,
-    149 => 86136,
-    150 => 86137,
-    151 => 86138,
-    152 => 86139,
-    153 => 86150,
-    154 => 86151,
-    155 => 86153,
-    156 => 86156,
-    157 => 86157,
-    158 => 86158,
-    159 => 86159,
-    160 => 86176,
-    161 => 86177,
-    162 => 86178,
-    163 => 86180,
-    164 => 86185,
-    165 => 86186,
-    166 => 86187,
-    167 => 86188,
-    168 => 86189,
-    169 => 880,
-    170 => 90,
-    171 => 91,
-    172 => 92,
-    173 => 93,
-    174 => 94,
-    175 => 95,
-    176 => 960,
-    177 => 961,
-    178 => 962,
-    179 => 964,
-    180 => 965,
-    181 => 966,
-    182 => 967,
-    183 => 968,
-    184 => 970,
-    185 => 971,
-    186 => 972,
-    187 => 973,
-    188 => 974,
-    189 => 975,
-    190 => 977,
-    191 => 98,
-    192 => 992,
-    193 => 993,
-    194 => 994,
-    195 => 995,
-    196 => 996,
-    197 => 998,
+    118 => 592,
+    119 => 595,
+    120 => 597,
+    121 => 598,
+    122 => 599,
+    123 => 60,
+    124 => 61,
+    125 => 62,
+    126 => 63,
+    127 => 64,
+    128 => 65,
+    129 => 66,
+    130 => 670,
+    131 => 673,
+    132 => 675,
+    133 => 676,
+    134 => 677,
+    135 => 678,
+    136 => 679,
+    137 => 685,
+    138 => 686,
+    139 => 689,
+    140 => 7,
+    141 => 84,
+    142 => 852,
+    143 => 855,
+    144 => 856,
+    145 => 86130,
+    146 => 86131,
+    147 => 86132,
+    148 => 86133,
+    149 => 86134,
+    150 => 86135,
+    151 => 86136,
+    152 => 86137,
+    153 => 86138,
+    154 => 86139,
+    155 => 86150,
+    156 => 86151,
+    157 => 86153,
+    158 => 86156,
+    159 => 86157,
+    160 => 86158,
+    161 => 86159,
+    162 => 86176,
+    163 => 86177,
+    164 => 86178,
+    165 => 86180,
+    166 => 86185,
+    167 => 86186,
+    168 => 86187,
+    169 => 86188,
+    170 => 86189,
+    171 => 880,
+    172 => 90,
+    173 => 91,
+    174 => 92,
+    175 => 93,
+    176 => 94,
+    177 => 95,
+    178 => 960,
+    179 => 961,
+    180 => 962,
+    181 => 964,
+    182 => 965,
+    183 => 966,
+    184 => 967,
+    185 => 968,
+    186 => 970,
+    187 => 971,
+    188 => 972,
+    189 => 973,
+    190 => 974,
+    191 => 975,
+    192 => 977,
+    193 => 98,
+    194 => 992,
+    195 => 993,
+    196 => 994,
+    197 => 995,
+    198 => 996,
+    199 => 998,
   ),
   'ru' => 
   array (
diff --git a/src/libphonenumber/carrier/data/en/1868.php b/src/libphonenumber/carrier/data/en/1868.php
index 1f272357b..3cfb0c2ab 100644
--- a/src/libphonenumber/carrier/data/en/1868.php
+++ b/src/libphonenumber/carrier/data/en/1868.php
@@ -5,6 +5,7 @@
  */
 
 return array (
+  186827 => 'Digicel',
   186828 => 'Digicel',
   186829 => 'Digicel',
   18683 => 'Digicel',
diff --git a/src/libphonenumber/carrier/data/en/237.php b/src/libphonenumber/carrier/data/en/237.php
index 0dfeea8fd..4ef8515b1 100644
--- a/src/libphonenumber/carrier/data/en/237.php
+++ b/src/libphonenumber/carrier/data/en/237.php
@@ -17,5 +17,6 @@
   237659 => 'Orange',
   23766 => 'NEXTTEL',
   23767 => 'MTN Cameroon',
+  23768 => 'MTN Cameroon',
   23769 => 'Orange',
 );
diff --git a/src/libphonenumber/carrier/data/en/242.php b/src/libphonenumber/carrier/data/en/242.php
index 06d4320d5..d5cb2d1a5 100644
--- a/src/libphonenumber/carrier/data/en/242.php
+++ b/src/libphonenumber/carrier/data/en/242.php
@@ -5,6 +5,9 @@
  */
 
 return array (
-  24205 => 'Airtel',
-  24206 => 'Libertis Telecom',
+  24201 => 'Equateur Telecom',
+  24204 => 'Warid',
+  24205 => 'Celtel',
+  24206 => 'MTN',
+  2428001 => 'Hightech Pro',
 );
diff --git a/src/libphonenumber/carrier/data/en/249.php b/src/libphonenumber/carrier/data/en/249.php
index 3cd3da709..bb28981a6 100644
--- a/src/libphonenumber/carrier/data/en/249.php
+++ b/src/libphonenumber/carrier/data/en/249.php
@@ -7,6 +7,7 @@
 return array (
   24991 => 'Zain',
   24992 => 'MTN',
+  24993 => 'MTN',
   24995 => 'Network of The World Ltd',
   24996 => 'Zain',
   24999 => 'MTN',
diff --git a/src/libphonenumber/carrier/data/en/359.php b/src/libphonenumber/carrier/data/en/359.php
index 9181dd675..8adbcb72b 100644
--- a/src/libphonenumber/carrier/data/en/359.php
+++ b/src/libphonenumber/carrier/data/en/359.php
@@ -9,4 +9,5 @@
   35988 => 'M-Tel',
   35989 => 'GLOBUL',
   35998 => 'GLOBUL',
+  359999 => 'MAX',
 );
diff --git a/src/libphonenumber/carrier/data/en/592.php b/src/libphonenumber/carrier/data/en/592.php
new file mode 100644
index 000000000..1f23e5467
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/592.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  5926 => 'Digicel Guyana',
+);
diff --git a/src/libphonenumber/carrier/data/en/60.php b/src/libphonenumber/carrier/data/en/60.php
index f0a80c15d..51b735ff0 100644
--- a/src/libphonenumber/carrier/data/en/60.php
+++ b/src/libphonenumber/carrier/data/en/60.php
@@ -65,8 +65,48 @@
   601096 => 'DiGi',
   601097 => 'DiGi',
   601098 => 'DiGi',
-  601113 => 'Celcom',
-  601115 => 'Celcom',
+  6011100 => 'Packet One',
+  6011101 => 'Packet One',
+  6011102 => 'Packet One',
+  6011103 => 'Packet One',
+  6011104 => 'Packet One',
+  6011105 => 'REDtone',
+  6011106 => 'REDtone',
+  6011107 => 'REDtone',
+  6011108 => 'REDtone',
+  6011109 => 'REDtone',
+  601111 => 'U Mobile',
+  601112 => 'Maxis',
+  6011130 => 'XOX',
+  6011131 => 'XOX',
+  6011132 => 'XOX',
+  6011133 => 'XOX',
+  6011134 => 'XOX',
+  6011135 => 'Baraka',
+  6011136 => 'Baraka',
+  6011137 => 'Baraka',
+  6011138 => 'Baraka',
+  6011139 => 'Baraka',
+  6011140 => 'Maxis',
+  6011141 => 'Maxis',
+  6011142 => 'Maxis',
+  6011143 => 'Maxis',
+  6011144 => 'Maxis',
+  6011145 => 'Celcom',
+  6011146 => 'Celcom',
+  6011147 => 'Celcom',
+  6011148 => 'Celcom',
+  6011149 => 'Celcom',
+  6011150 => 'Tune Talk',
+  6011151 => 'Tune Talk',
+  6011152 => 'Tune Talk',
+  6011153 => 'Tune Talk',
+  6011154 => 'Tune Talk',
+  6011155 => 'Celcom',
+  6011156 => 'Celcom',
+  6011157 => 'Celcom',
+  6011158 => 'Celcom',
+  6011159 => 'Celcom',
   601116 => 'DiGi',
   6011170 => 'YTL',
   6011171 => 'YTL',
diff --git a/src/libphonenumber/carrier/data/en/689.php b/src/libphonenumber/carrier/data/en/689.php
new file mode 100644
index 000000000..2d2afa0ec
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/689.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  68987 => 'Vini',
+  68989 => 'Vodafone',
+);
diff --git a/src/libphonenumber/carrier/data/en/7.php b/src/libphonenumber/carrier/data/en/7.php
index 92caa897c..c0b86ccdd 100644
--- a/src/libphonenumber/carrier/data/en/7.php
+++ b/src/libphonenumber/carrier/data/en/7.php
@@ -8,6 +8,7 @@
   7701 => 'Kcell',
   7702 => 'Kcell',
   7705 => 'Beeline',
+  7707 => 'Tele2',
   7708 => 'Altel',
   7747 => 'Tele2',
   7771 => 'Beeline',
diff --git a/src/libphonenumber/carrier/data/en/91.php b/src/libphonenumber/carrier/data/en/91.php
index 292025ac6..3950650b6 100644
--- a/src/libphonenumber/carrier/data/en/91.php
+++ b/src/libphonenumber/carrier/data/en/91.php
@@ -61,6 +61,15 @@
   917207 => 'TATA DOCOMO',
   917208 => 'TATA DOCOMO',
   917209 => 'TATA DOCOMO',
+  9172199 => 'Aircel',
+  9172200 => 'Aircel',
+  9172208 => 'Aircel',
+  9172209 => 'Aircel',
+  9172210 => 'Aircel',
+  9172218 => 'Aircel',
+  9172219 => 'Aircel',
+  9172220 => 'Aircel',
+  9172228 => 'Aircel',
   917250 => 'AirTel',
   917259 => 'AirTel',
   917275 => 'TATA DOCOMO',
@@ -1146,7 +1155,14 @@
   919518 => 'ETISALAT',
   919519 => 'ETISALAT',
   919520 => 'ETISALAT',
-  919521 => 'ETISALAT',
+  9195210 => 'ETISALAT',
+  9195211 => 'ETISALAT',
+  9195212 => 'ETISALAT',
+  9195213 => 'ETISALAT',
+  9195214 => 'ETISALAT',
+  9195215 => 'ETISALAT',
+  9195216 => 'ETISALAT',
+  9195219 => 'Aircel',
   919522 => 'ETISALAT',
   919523 => 'ETISALAT',
   919524 => 'Aircel',
@@ -1155,26 +1171,8 @@
   919527 => 'Idea',
   919528 => 'Reliance',
   919529 => 'Reliance',
-  9195300 => 'CellOne',
-  9195301 => 'CellOne',
-  9195302 => 'CellOne',
-  9195303 => 'CellOne',
-  9195304 => 'CellOne',
-  9195305 => 'CellOne',
-  9195306 => 'CellOne',
-  9195307 => 'CellOne',
-  9195308 => 'CellOne',
-  9195309 => 'CellOne',
-  9195310 => 'CellOne',
-  9195311 => 'CellOne',
-  9195312 => 'CellOne',
-  9195313 => 'CellOne',
-  9195314 => 'CellOne',
-  9195315 => 'CellOne',
-  9195316 => 'CellOne',
-  9195317 => 'CellOne',
-  9195318 => 'CellOne',
-  9195319 => 'CellOne',
+  919530 => 'CellOne',
+  919531 => 'CellOne',
   919532 => 'CellOne',
   919533 => 'Reliance',
   919534 => 'Vodafone IN',
diff --git a/src/libphonenumber/carrier/data/en/961.php b/src/libphonenumber/carrier/data/en/961.php
index 4d3b534e9..8e21da878 100644
--- a/src/libphonenumber/carrier/data/en/961.php
+++ b/src/libphonenumber/carrier/data/en/961.php
@@ -5,12 +5,22 @@
  */
 
 return array (
-  961788 => 'MTC Touch',
-  9617890 => 'MTC Touch',
-  9617891 => 'MTC Touch',
-  9617892 => 'MTC Touch',
-  9617893 => 'MTC Touch',
-  9617894 => 'MTC Touch',
+  961788 => 'Touch',
+  9617890 => 'Touch',
+  9617891 => 'Touch',
+  9617892 => 'Touch',
+  9617893 => 'Touch',
+  9617894 => 'Touch',
   961791 => 'Alfa',
   961793 => 'Alfa',
+  961810 => 'Touch',
+  961811 => 'Alfa',
+  961812 => 'Alfa',
+  961813 => 'Alfa',
+  961814 => 'Alfa',
+  961815 => 'Alfa',
+  961816 => 'Touch',
+  961817 => 'Touch',
+  961818 => 'Touch',
+  961819 => 'Touch',
 );
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_AC.php b/src/libphonenumber/data/PhoneNumberMetadata_AC.php
index 2318449cb..6191d97ea 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_AC.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_AC.php
@@ -8,26 +8,31 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[2-7]\\d{3,5}',
+    'NationalNumberPattern' => '
+          [46]\\d{4}|
+          [2-467]\\d{3}|
+          [01589]\\d{5}
+        ',
     'PossibleNumberPattern' => '\\d{4,6}',
   ),
   'fixedLine' => 
   array (
     'NationalNumberPattern' => '
+          6[2-467]\\d{3}|
           (?:
             [267]\\d|
             3[0-5]|
             4[4-69]
           )\\d{2}
         ',
-    'PossibleNumberPattern' => '\\d{4}',
-    'ExampleNumber' => '6889',
+    'PossibleNumberPattern' => '\\d{4,5}',
+    'ExampleNumber' => '62889',
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '5\\d{5}',
-    'PossibleNumberPattern' => '\\d{6}',
-    'ExampleNumber' => '501234',
+    'NationalNumberPattern' => '4\\d{4}',
+    'PossibleNumberPattern' => '\\d{5}',
+    'ExampleNumber' => '40123',
   ),
   'tollFree' => 
   array (
@@ -61,8 +66,9 @@
   ),
   'uan' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '[01589]\\d{5}',
+    'PossibleNumberPattern' => '\\d{6}',
+    'ExampleNumber' => '542011',
   ),
   'emergency' => 
   array (
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_AR.php b/src/libphonenumber/data/PhoneNumberMetadata_AR.php
index 4f926c78c..7a29c4172 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_AR.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_AR.php
@@ -204,7 +204,7 @@
   'countryCode' => 54,
   'internationalPrefix' => '00',
   'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '          0?(?:(             11|             2(?:               2(?:                 02?|                 [13]|                 2[13-79]|                 4[1-6]|                 5[2457]|                 6[124-8]|                 7[1-4]|                 8[13-6]|                 9[1267]               )|               3(?:                 02?|                 1[467]|                 2[03-6]|                 3[13-8]|                 [49][2-6]|                 5[2-8]|                 [67]               )|               4(?:                 7[3-578]|                 9               )|               6(?:                 [0136]|                 2[24-6]|                 4[6-8]?|                 5[15-8]               )|               80|               9(?:                 0[1-3]|                 [19]|                 2\\d|                 3[1-6]|                 4[02568]?|                 5[2-4]|                 6[2-46]|                 72?|                 8[23]?               )            )|            3(?:              3(?:                2[79]|                6|                8[2578]              )|              4(?:                0[0-24-9]|                [12]|                3[5-8]?|                4[24-7]|                5[4-68]?|                6[02-9]|                7[126]|                8[2379]?|                9[1-36-8]              )|              5(?:                1|                2[1245]|                3[237]?|                4[1-46-9]|                6[2-4]|                7[1-6]|                8[2-5]?              )|              6[24]|              7(?:                [069]|                1[1568]|                2[15]|                3[145]|                4[13]|                5[14-8]|                7[2-57]|                8[126]              )|              8(?:                [01]|                2[15-7]|                3[2578]?|                4[13-6]|                5[4-8]?|                6[1-357-9]|                7[36-8]?|                8[5-8]?|                9[124]              )            )          )?15)?',
+  'nationalPrefixForParsing' => '                  0?(?:(                    11|                    2(?:                      2(?:                        02?|                        [13]|                        2[13-79]|                        4[1-6]|                        5[2457]|                        6[124-8]|                        7[1-4]|                        8[13-6]|                        9[1267]                      )|                      3(?:                        02?|                        1[467]|                        2[03-6]|                        3[13-8]|                        [49][2-6]|                        5[2-8]|                        [67]                      )|                      4(?:                        7[3-578]|                        9                      )|                      6(?:                        [0136]|                        2[24-6]|                        4[6-8]?|                        5[15-8]                      )|                      80|                      9(?:                        0[1-3]|                        [19]|                        2\\d|                        3[1-6]|                        4[02568]?|                        5[2-4]|                        6[2-46]|                        72?|                        8[23]?                      )                    )|                    3(?:                      3(?:                        2[79]|                        6|                        8[2578]                      )|                      4(?:                        0[0-24-9]|                        [12]|                        3[5-8]?|                        4[24-7]|                        5[4-68]?|                        6[02-9]|                        7[126]|                        8[2379]?|                        9[1-36-8]                      )|                      5(?:                        1|                        2[1245]|                        3[237]?|                        4[1-46-9]|                        6[2-4]|                        7[1-6]|                        8[2-5]?                      )|                      6[24]|                      7(?:                        [069]|                        1[1568]|                        2[15]|                        3[145]|                        4[13]|                        5[14-8]|                        7[2-57]|                        8[126]                      )|                      8(?:                        [01]|                        2[15-7]|                        3[2578]?|                        4[13-6]|                        5[4-8]?|                        6[1-357-9]|                        7[36-8]?|                        8[5-8]?|                        9[124]                      )                    )                  )?15)?',
   'nationalPrefixTransformRule' => '9$1',
   'sameMobileAndFixedLinePattern' => false,
   'numberFormat' => 
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BF.php b/src/libphonenumber/data/PhoneNumberMetadata_BF.php
index ce761c9f0..cd9e6d45c 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_BF.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_BF.php
@@ -8,24 +8,24 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[24-7]\\d{7}',
+    'NationalNumberPattern' => '[267]\\d{7}',
     'PossibleNumberPattern' => '\\d{8}',
   ),
   'fixedLine' => 
   array (
     'NationalNumberPattern' => '
-          (?:
-            20(?:
+          2(?:
+            0(?:
               49|
               5[23]|
               9[016-9]
             )|
-            40(?:
+            4(?:
               4[569]|
               5[4-6]|
               7[0179]
             )|
-            50(?:
+            5(?:
               [34]\\d|
               50
             )
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BG.php b/src/libphonenumber/data/PhoneNumberMetadata_BG.php
index 7a691420c..6cfb78e40 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_BG.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_BG.php
@@ -45,9 +45,12 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            8[7-9]|
-            98
-          )\\d{7}|
+            8[7-9]\\d|
+            9(?:
+              8\\d|
+              99
+            )
+          )\\d{6}|
           4(?:
             3[0789]|
             8\\d
@@ -194,6 +197,17 @@
       'domesticCarrierCodeFormattingRule' => '',
     ),
     5 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '999',
+      ),
+      'nationalPrefixFormattingRule' => '0$1',
+      'domesticCarrierCodeFormattingRule' => '',
+    ),
+    6 => 
     array (
       'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
       'format' => '$1 $2 $3',
@@ -210,7 +224,7 @@
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    6 => 
+    7 => 
     array (
       'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
       'format' => '$1 $2 $3',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CG.php b/src/libphonenumber/data/PhoneNumberMetadata_CG.php
index 963a46311..80dabc02f 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_CG.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_CG.php
@@ -25,14 +25,14 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '800\\d{6}',
-    'PossibleNumberPattern' => '\\d{9}',
-    'ExampleNumber' => '800123456',
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
   ),
   'premiumRate' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '800\\d{6}',
+    'PossibleNumberPattern' => '\\d{9}',
+    'ExampleNumber' => '800123456',
   ),
   'sharedCost' => 
   array (
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CM.php b/src/libphonenumber/data/PhoneNumberMetadata_CM.php
index ec06294b4..d811f6539 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_CM.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_CM.php
@@ -8,7 +8,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[235-9]\\d{7,8}',
+    'NationalNumberPattern' => '[2368]\\d{7,8}',
     'PossibleNumberPattern' => '\\d{8,9}',
   ),
   'fixedLine' => 
@@ -18,22 +18,15 @@
              22|
              33|
              4[23]
-          )\\d{6}|
-          (?:
-            22|
-            33
           )\\d{6}
         ',
-    'PossibleNumberPattern' => '\\d{8,9}',
+    'PossibleNumberPattern' => '\\d{9}',
     'ExampleNumber' => '222123456',
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '
-          6[5-79]\\d{7}|
-          [579]\\d{7}
-        ',
-    'PossibleNumberPattern' => '\\d{8,9}',
+    'NationalNumberPattern' => '6[5-9]\\d{7}',
+    'PossibleNumberPattern' => '\\d{9}',
     'ExampleNumber' => '671234567',
   ),
   'tollFree' => 
@@ -122,12 +115,12 @@
     ),
     1 => 
     array (
-      'pattern' => '([2357-9]\\d)(\\d{2})(\\d{2})(\\d{2})',
+      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (
         0 => '
-            [23579]|
+            [23]|
             88
           ',
       ),
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_EG.php b/src/libphonenumber/data/PhoneNumberMetadata_EG.php
index 8593dac28..dee614cea 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_EG.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_EG.php
@@ -163,9 +163,9 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             1[012]|
-             [89]00
-           ',
+            1[012]|
+            [89]00
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -177,10 +177,10 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             1[35]|
-             [4-6]|
-             [89][2-9]
-           ',
+            1[35]|
+            [4-6]|
+            [89][2-9]
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_FM.php b/src/libphonenumber/data/PhoneNumberMetadata_FM.php
index 9c33a64e9..1848daa26 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_FM.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_FM.php
@@ -14,8 +14,8 @@
   'fixedLine' => 
   array (
     'NationalNumberPattern' => '
-            3[2357]0[1-9]\\d{3}|
-            9[2-6]\\d{5}
+          3[2357]0[1-9]\\d{3}|
+          9[2-6]\\d{5}
         ',
     'PossibleNumberPattern' => '\\d{7}',
     'ExampleNumber' => '3201234',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_FR.php b/src/libphonenumber/data/PhoneNumberMetadata_FR.php
index ea23fd864..009fa18d9 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_FR.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_FR.php
@@ -21,7 +21,10 @@
   array (
     'NationalNumberPattern' => '
           6\\d{8}|
-          7[5-9]\\d{7}
+          7(?:
+            00\\d{6}|
+            [3-9]\\d{7}
+          )
         ',
     'PossibleNumberPattern' => '\\d{9}',
     'ExampleNumber' => '612345678',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_IL.php b/src/libphonenumber/data/PhoneNumberMetadata_IL.php
index 56f3ce5d6..75d3cf4da 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_IL.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_IL.php
@@ -25,7 +25,7 @@
   array (
     'NationalNumberPattern' => '
           5(?:
-            [02347-9]\\d{2}|
+            [02-47-9]\\d{2}|
             5(?:
               01|
               2[23]|
@@ -85,20 +85,23 @@
   array (
     'NationalNumberPattern' => '
           7(?:
+            18\\d|
             2[23]\\d|
             3[237]\\d|
             47\\d|
             6(?:
               5\\d|
-              8[068]
+              8[0168]
             )|
             7\\d{2}|
             8(?:
+              2\\d|
               33|
               55|
               77|
               81
-            )
+            )|
+            99\\d
           )\\d{5}
         ',
     'PossibleNumberPattern' => '\\d{9}',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_IN.php b/src/libphonenumber/data/PhoneNumberMetadata_IN.php
index 6335890d5..c2d8ff19a 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_IN.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_IN.php
@@ -64,7 +64,8 @@
               9[014-7]
             )|
             5(?:
-              [136][25]|
+              1[025]|
+              [36][25]|
               22|
               4[28]|
               5[12]|
@@ -202,6 +203,8 @@
               )|
               2(?:
                 0[04-9]|
+                19|
+                2[012]|
                 5[09]|
                 7[5-8]|
                 9[389]
@@ -388,112 +391,114 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             7(?:
-               0[2-9]|
-               2[0579]|
-               3[057-9]|
-               4[0-389]|
-               6[0-35-9]|
-               [57]|
-               8[0-79]
-             )|
-             8(?:
-               0[015689]|
-               1[0-57-9]|
-               2[2356-9]|
-               3[0-57-9]|
-               [45]|
-               6[02457-9]|
-               7[1-69]|
-               8[0124-9]|
-               9[02-9]
-             )|
-             9
-           ',
+            7(?:
+              0[2-9]|
+              2[012579]|
+              3[057-9]|
+              4[0-389]|
+              6[0-35-9]|
+              [57]|
+              8[0-79]
+            )|
+            8(?:
+              0[015689]|
+              1[0-57-9]|
+              2[2356-9]|
+              3[0-57-9]|
+              [45]|
+              6[02457-9]|
+              7[1-69]|
+              8[0124-9]|
+              9[02-9]
+            )|
+            9
+          ',
         1 => '
-             7(?:
-               0(?:
-                 2[2-9]|
-                 [3-8]|
-                 9[0-8]
-               )|
-               2(?:
-                 0[04-9]|
-                 5[09]|
-                 7[5-8]|
-                 9[389]
-               )|
-               3(?:
-                 0[1-9]|
-                 [58]|
-                 7[3679]|
-                 9[689]
-               )|
-               4(?:
-                 0[1-9]|
-                 1[15-9]|
-                 [29][89]|
-                 39|
-                 8[389]
-               )|
-               5(?:
-                 [034678]|
-                 2[03-9]|
-                 5[017-9]|
-                 9[7-9]
-               )|
-               6(?:
-                 0[0-27]|
-                 1[0-257-9]|
-                 2[0-4]|
-                 3[19]|
-                 5[4589]|
-                 [6-9]
-               )|
-               7(?:
-                 0[2-9]|
-                 [1-79]|
-                 8[1-9]
-               )|
-               8(?:
-                 [0-7]|
-                 9[013-9]
-               )
-             )|
-             8(?:
-               0(?:
-                 [01589]|
-                 6[67]
-               )|
-               1(?:
-                 [02-589]|
-                 1[0135-9]|
-                 7[0-79]
-               )|
-               2(?:
-                 [236-9]|
-                 5[1-9]
-               )|
-               3(?:
-                 [0357-9]|
-                 4[1-9]
-               )|
-               [45]|
-               6[02457-9]|
-               7[1-69]|
-               8(?:
-                 [0-26-9]|
-                 44|
-                 5[2-9]
-               )|
-               9(?:
-                 [035-9]|
-                 2[2-9]|
-                 4[0-8]
-               )
-             )|
-             9
-           ',
+            7(?:
+              0(?:
+                2[2-9]|
+                [3-8]|
+                9[0-8]
+              )|
+              2(?:
+                0[04-9]|
+                19|
+                2[012]|
+                5[09]|
+                7[5-8]|
+                9[389]
+              )|
+              3(?:
+                0[1-9]|
+                [58]|
+                7[3679]|
+                9[689]
+              )|
+              4(?:
+                0[1-9]|
+                1[15-9]|
+                [29][89]|
+                39|
+                8[389]
+              )|
+              5(?:
+                [034678]|
+                2[03-9]|
+                5[017-9]|
+                9[7-9]
+              )|
+              6(?:
+                0[0-27]|
+                1[0-257-9]|
+                2[0-4]|
+                3[19]|
+                5[4589]|
+                [6-9]
+              )|
+              7(?:
+                0[2-9]|
+                [1-79]|
+                8[1-9]
+              )|
+              8(?:
+                [0-7]|
+                9[013-9]
+              )
+            )|
+            8(?:
+              0(?:
+                [01589]|
+                6[67]
+              )|
+              1(?:
+                [02-589]|
+                1[0135-9]|
+                7[0-79]
+              )|
+              2(?:
+                [236-9]|
+                5[1-9]
+              )|
+              3(?:
+                [0357-9]|
+                4[1-9]
+              )|
+              [45]|
+              6[02457-9]|
+              7[1-69]|
+              8(?:
+                [0-26-9]|
+                44|
+                5[2-9]
+              )|
+              9(?:
+                [035-9]|
+                2[2-9]|
+                4[0-8]
+              )
+            )|
+            9
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -505,13 +510,13 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             11|
-             2[02]|
-             33|
-             4[04]|
-             79|
-             80[2-46]
-           ',
+            11|
+            2[02]|
+            33|
+            4[04]|
+            79|
+            80[2-46]
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -523,60 +528,61 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             1(?:
-               2[0-249]|
-               3[0-25]|
-               4[145]|
-               [569][14]|
-               7[1257]|
-               8[1346]|
-               [68][1-9]
-             )|
-             2(?:
-               1[257]|
-               3[013]|
-               4[01]|
-               5[0137]|
-               6[0158]|
-               78|
-               8[1568]|
-               9[14]
-             )|
-             3(?:
-               26|
-               4[1-3]|
-               5[34]|
-               6[01489]|
-               7[02-46]|
-               8[159]
-             )|
-             4(?:
-               1[36]|
-               2[1-47]|
-               3[15]|
-               5[12]|
-               6[0-26-9]|
-               7[0-24-9]|
-               8[013-57]|
-               9[014-7]
-             )|
-             5(?:
-               [136][25]|
-               22|
-               4[28]|
-               5[12]|
-               [78]1|
-               9[15]
-             )|
-             6(?:
-               12|
-               [2345]1|
-               57|
-               6[13]|
-               7[14]|
-               80
-             )
-           ',
+            1(?:
+              2[0-249]|
+              3[0-25]|
+              4[145]|
+              [569][14]|
+              7[1257]|
+              8[1346]|
+              [68][1-9]
+            )|
+            2(?:
+              1[257]|
+              3[013]|
+              4[01]|
+              5[0137]|
+              6[0158]|
+              78|
+              8[1568]|
+              9[14]
+            )|
+            3(?:
+              26|
+              4[1-3]|
+              5[34]|
+              6[01489]|
+              7[02-46]|
+              8[159]
+            )|
+            4(?:
+              1[36]|
+              2[1-47]|
+              3[15]|
+              5[12]|
+              6[0-26-9]|
+              7[0-24-9]|
+              8[013-57]|
+              9[014-7]
+            )|
+            5(?:
+              1[025]|
+              [36][25]|
+              22|
+              4[28]|
+              5[12]|
+              [78]1|
+              9[15]
+            )|
+            6(?:
+              12|
+              [2345]1|
+              57|
+              6[13]|
+              7[14]|
+              80
+            )
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -588,30 +594,30 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             7(?:
-               12|
-               2[14]|
-               3[134]|
-               4[47]|
-               5[15]|
-               [67]1|
-               88
-             )
-           ',
+            7(?:
+              12|
+              2[14]|
+              3[134]|
+              4[47]|
+              5[15]|
+              [67]1|
+              88
+            )
+          ',
         1 => '
-             7(?:
-               12|
-               2[14]|
-               3[134]|
-               4[47]|
-               5(?:
-                 1|
-                 5[2-6]
-               )|
-               [67]1|
-               88
-             )
-           ',
+            7(?:
+              12|
+              2[14]|
+              3[134]|
+              4[47]|
+              5(?:
+                1|
+                5[2-6]
+              )|
+              [67]1|
+              88
+            )
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -623,16 +629,16 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             8(?:
-               16|
-               2[014]|
-               3[126]|
-               6[136]|
-               7[078]|
-               8[34]|
-               91
-             )
-           ',
+            8(?:
+              16|
+              2[014]|
+              3[126]|
+              6[136]|
+              7[078]|
+              8[34]|
+              91
+            )
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -644,12 +650,12 @@
       'leadingDigitsPatterns' => 
       array (
         0 => '
-             1(?:
-               [23579]|
-               [468][1-9]
-             )|
-             [2-8]
-           ',
+            1(?:
+              [23579]|
+              [468][1-9]
+            )|
+            [2-8]
+          ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -709,11 +715,11 @@
       array (
         0 => '18[06]',
         1 => '
-             18(?:
-               0[03]|
-               6[12]
-             )
-           ',
+            18(?:
+              0[03]|
+              6[12]
+            )
+          ',
       ),
       'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_JP.php b/src/libphonenumber/data/PhoneNumberMetadata_JP.php
index 027d2dfeb..9df4e09b1 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_JP.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_JP.php
@@ -69,7 +69,7 @@
   array (
     'NationalNumberPattern' => '[7-9]0[1-9]\\d{7}',
     'PossibleNumberPattern' => '\\d{10}',
-    'ExampleNumber' => '7012345678',
+    'ExampleNumber' => '9012345678',
   ),
   'tollFree' => 
   array (
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_KW.php b/src/libphonenumber/data/PhoneNumberMetadata_KW.php
index 88dc1b331..88de93b0b 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_KW.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_KW.php
@@ -52,11 +52,11 @@
             9(?:
               0[09]|
               22|
-              4[049]|
+              4[01479]|
               55|
-              6[069]|
+              6[0679]|
               [79]\\d|
-              8[07-9]
+              8[057-9]
             )
           )\\d{5}
         ',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_LB.php b/src/libphonenumber/data/PhoneNumberMetadata_LB.php
index acc404e34..043796075 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_LB.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_LB.php
@@ -17,11 +17,13 @@
           (?:
             [14-6]\\d{2}|
             7(?:
-              [2-579]\\d|
+              [2-57]\\d|
               62|
-              8[0-7]
+              8[0-7]|
+              9[04-9]
             )|
-            [89][2-9]\\d
+            8[02-9]\\d|
+            9\\d{2}
           )\\d{4}
         ',
     'PossibleNumberPattern' => '\\d{7}',
@@ -33,10 +35,12 @@
           (?:
             3\\d|
             7(?:
-              [019]\\d|
+              [01]\\d|
               6[013-9]|
-              8[89]
-            )
+              8[89]|
+              9[1-3]
+            )|
+            81\\d
           )\\d{5}
         ',
     'PossibleNumberPattern' => '\\d{7,8}',
@@ -55,7 +59,7 @@
   ),
   'sharedCost' => 
   array (
-    'NationalNumberPattern' => '8[01]\\d{6}',
+    'NationalNumberPattern' => '80\\d{6}',
     'PossibleNumberPattern' => '\\d{8}',
     'ExampleNumber' => '80123456',
   ),
@@ -126,11 +130,13 @@
         0 => '
             [13-6]|
             7(?:
-              [2-579]|
+              [2-57]|
               62|
-              8[0-7]
+              8[0-7]|
+              9[04-9]
             )|
-            [89][2-9]
+            8[02-9]|
+            9
             ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
@@ -145,9 +151,10 @@
         0 => '
             [89][01]|
             7(?:
-              [019]|
+              [01]|
               6[013-9]|
-              8[89]
+              8[89]|
+              9[1-3]
             )
           ',
       ),
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_LI.php b/src/libphonenumber/data/PhoneNumberMetadata_LI.php
index 9e597b0d0..f6f0af96d 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_LI.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_LI.php
@@ -159,8 +159,8 @@
   array (
     0 => 
     array (
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
+      'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
+      'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
         0 => '[23789]',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SB.php b/src/libphonenumber/data/PhoneNumberMetadata_SB.php
index 660e7c741..86ef17909 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_SB.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_SB.php
@@ -17,7 +17,7 @@
           (?:
             1[4-79]|
             [23]\\d|
-            4[01]|
+            4[0-2]|
             5[03]|
             6[0-37]
           )\\d{3}
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SD.php b/src/libphonenumber/data/PhoneNumberMetadata_SD.php
index 0e7b0532f..e0b66edd5 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_SD.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_SD.php
@@ -24,7 +24,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '9[012569]\\d{7}',
+    'NationalNumberPattern' => '9[0-3569]\\d{7}',
     'PossibleNumberPattern' => '\\d{9}',
     'ExampleNumber' => '911231234',
   ),
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SH.php b/src/libphonenumber/data/PhoneNumberMetadata_SH.php
index d3e1a63b6..b48fa1859 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_SH.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_SH.php
@@ -8,7 +8,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[2-79]\\d{3,4}',
+    'NationalNumberPattern' => '[25]\\d{4}',
     'PossibleNumberPattern' => '\\d{4,5}',
   ),
   'fixedLine' => 
@@ -17,19 +17,15 @@
           2(?:
             [0-57-9]\\d|
             6[4-9]
-          )\\d{2}|
-          (?:
-            [2-46]\\d|
-            7[01]
           )\\d{2}
         ',
-    'PossibleNumberPattern' => '\\d{4,5}',
-    'ExampleNumber' => '2158',
+    'PossibleNumberPattern' => '\\d{5}',
+    'ExampleNumber' => '22158',
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '5\\d{4}',
+    'PossibleNumberPattern' => '\\d{4,5}',
   ),
   'tollFree' => 
   array (
@@ -38,14 +34,8 @@
   ),
   'premiumRate' => 
   array (
-    'NationalNumberPattern' => '
-          (?:
-            [59]\\d|
-            7[2-9]
-          )\\d{2}
-        ',
-    'PossibleNumberPattern' => '\\d{4,5}',
-    'ExampleNumber' => '5012',
+    'NationalNumberPattern' => 'NA',
+    'PossibleNumberPattern' => 'NA',
   ),
   'sharedCost' => 
   array (
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_TT.php b/src/libphonenumber/data/PhoneNumberMetadata_TT.php
index 9d116fa28..b7eb6b0fb 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_TT.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_TT.php
@@ -21,7 +21,7 @@
             )|
             6(?:
               0[79]|
-              1[02-9]|
+              1[02-8]|
               2[1-9]|
               [3-69]\\d|
               7[0-79]
@@ -37,7 +37,7 @@
     'NationalNumberPattern' => '
           868(?:
             2(?:
-              [89]\\d
+              [789]\\d
             )|
             3(?:
               0[1-9]|
@@ -122,8 +122,8 @@
   ),
   'voicemail' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '868619\\d{4}',
+    'PossibleNumberPattern' => '\\d{10}',
   ),
   'shortCode' => 
   array (
diff --git a/src/libphonenumber/data/ShortNumberMetadata_GY.php b/src/libphonenumber/data/ShortNumberMetadata_GY.php
index bb324062d..78e5e185e 100644
--- a/src/libphonenumber/data/ShortNumberMetadata_GY.php
+++ b/src/libphonenumber/data/ShortNumberMetadata_GY.php
@@ -74,14 +74,20 @@
             02|
             171|
             444|
-            7[67]7|
+            7(?:
+              [67]7|
+              9
+            )|
             801|
             9(?:
               0[78]|
               [2-47]
             )
           )|
-          1443|
+          1(?:
+            443|
+            5[568]
+          )|
           91[123]
        ',
     'PossibleNumberPattern' => '\\d{3,4}',
diff --git a/src/libphonenumber/data/ShortNumberMetadata_SB.php b/src/libphonenumber/data/ShortNumberMetadata_SB.php
index c2f5c7a9b..812c8d691 100644
--- a/src/libphonenumber/data/ShortNumberMetadata_SB.php
+++ b/src/libphonenumber/data/ShortNumberMetadata_SB.php
@@ -8,17 +8,17 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[19]\\d{2}',
+    'NationalNumberPattern' => '[127-9]\\d{2}',
     'PossibleNumberPattern' => '\\d{3}',
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '[19]\\d{2}',
+    'NationalNumberPattern' => '[127-9]\\d{2}',
     'PossibleNumberPattern' => '\\d{3}',
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '[19]\\d{2}',
+    'NationalNumberPattern' => '[127-9]\\d{2}',
     'PossibleNumberPattern' => '\\d{3}',
   ),
   'tollFree' => 
@@ -71,12 +71,17 @@
   array (
     'NationalNumberPattern' => '
           1(?:
-            0[02-79]|
+            [02]\\d|
             1[12]|
-            2[0-26]|
-            4[189]|
-            68
+            [35][01]|
+            [49][1-9]|
+            6[2-9]|
+            7[7-9]|
+            8[0-8]
           )|
+          269|
+          777|
+          835|
           9(?:
             [01]1|
             22|
diff --git a/src/libphonenumber/geocoding/data/Map.php b/src/libphonenumber/geocoding/data/Map.php
index c7d3a6022..0f1114b99 100644
--- a/src/libphonenumber/geocoding/data/Map.php
+++ b/src/libphonenumber/geocoding/data/Map.php
@@ -455,381 +455,382 @@
     412 => 56,
     413 => 57,
     414 => 58,
-    415 => 599,
-    416 => 62,
-    417 => 64,
-    418 => 66,
-    419 => 686,
-    420 => 7,
-    421 => 81,
-    422 => 82,
-    423 => 84,
-    424 => 8610,
-    425 => 86130,
-    426 => 86131,
-    427 => 86132,
-    428 => 86133,
-    429 => 86134,
-    430 => 86135,
-    431 => 86136,
-    432 => 86137,
-    433 => 86138,
-    434 => 86139,
-    435 => 86145,
-    436 => 86147,
-    437 => 86150,
-    438 => 86151,
-    439 => 86152,
-    440 => 86153,
-    441 => 86155,
-    442 => 86156,
-    443 => 86157,
-    444 => 86158,
-    445 => 86159,
-    446 => 86170,
-    447 => 86176,
-    448 => 86177,
-    449 => 86178,
-    450 => 86180,
-    451 => 86181,
-    452 => 86182,
-    453 => 86183,
-    454 => 86184,
-    455 => 86185,
-    456 => 86186,
-    457 => 86187,
-    458 => 86188,
-    459 => 86189,
-    460 => 8620,
-    461 => 8621,
-    462 => 8622,
-    463 => 8623,
-    464 => 8624,
-    465 => 8625,
-    466 => 8627,
-    467 => 8628,
-    468 => 8629,
-    469 => 86310,
-    470 => 86311,
-    471 => 86312,
-    472 => 86313,
-    473 => 86314,
-    474 => 86315,
-    475 => 86316,
-    476 => 86317,
-    477 => 86318,
-    478 => 86319,
-    479 => 86335,
-    480 => 86349,
-    481 => 86350,
-    482 => 86351,
-    483 => 86352,
-    484 => 86353,
-    485 => 86354,
-    486 => 86355,
-    487 => 86356,
-    488 => 86357,
-    489 => 86358,
-    490 => 86359,
-    491 => 86370,
-    492 => 86371,
-    493 => 86372,
-    494 => 86373,
-    495 => 86374,
-    496 => 86375,
-    497 => 86376,
-    498 => 86377,
-    499 => 86378,
-    500 => 86379,
-    501 => 86391,
-    502 => 86392,
-    503 => 86393,
-    504 => 86394,
-    505 => 86395,
-    506 => 86396,
-    507 => 86398,
-    508 => 86410,
-    509 => 86411,
-    510 => 86412,
-    511 => 86413,
-    512 => 86414,
-    513 => 86415,
-    514 => 86416,
-    515 => 86417,
-    516 => 86418,
-    517 => 86419,
-    518 => 86421,
-    519 => 86427,
-    520 => 86429,
-    521 => 86431,
-    522 => 86432,
-    523 => 86433,
-    524 => 86434,
-    525 => 86435,
-    526 => 86436,
-    527 => 86437,
-    528 => 86438,
-    529 => 86451,
-    530 => 86452,
-    531 => 86453,
-    532 => 86454,
-    533 => 86455,
-    534 => 86456,
-    535 => 86457,
-    536 => 86458,
-    537 => 86459,
-    538 => 86464,
-    539 => 86467,
-    540 => 86468,
-    541 => 86469,
-    542 => 86470,
-    543 => 86471,
-    544 => 86472,
-    545 => 86473,
-    546 => 86474,
-    547 => 86475,
-    548 => 86476,
-    549 => 86477,
-    550 => 86478,
-    551 => 86479,
-    552 => 86482,
-    553 => 86483,
-    554 => 86510,
-    555 => 86511,
-    556 => 86512,
-    557 => 86513,
-    558 => 86514,
-    559 => 86515,
-    560 => 86516,
-    561 => 86517,
-    562 => 86518,
-    563 => 86519,
-    564 => 86523,
-    565 => 86527,
-    566 => 86530,
-    567 => 86531,
-    568 => 86532,
-    569 => 86533,
-    570 => 86534,
-    571 => 86535,
-    572 => 86536,
-    573 => 86537,
-    574 => 86538,
-    575 => 86539,
-    576 => 86543,
-    577 => 86546,
-    578 => 86550,
-    579 => 86551,
-    580 => 86552,
-    581 => 86553,
-    582 => 86554,
-    583 => 86555,
-    584 => 86556,
-    585 => 86557,
-    586 => 86558,
-    587 => 86559,
-    588 => 86561,
-    589 => 86562,
-    590 => 86563,
-    591 => 86564,
-    592 => 86566,
-    593 => 86570,
-    594 => 86571,
-    595 => 86572,
-    596 => 86573,
-    597 => 86574,
-    598 => 86575,
-    599 => 86576,
-    600 => 86577,
-    601 => 86578,
-    602 => 86579,
-    603 => 86580,
-    604 => 86591,
-    605 => 86592,
-    606 => 86593,
-    607 => 86594,
-    608 => 86595,
-    609 => 86596,
-    610 => 86597,
-    611 => 86598,
-    612 => 86599,
-    613 => 86631,
-    614 => 86632,
-    615 => 86633,
-    616 => 86634,
-    617 => 86635,
-    618 => 86660,
-    619 => 86662,
-    620 => 86663,
-    621 => 86668,
-    622 => 86691,
-    623 => 86692,
-    624 => 86701,
-    625 => 86710,
-    626 => 86711,
-    627 => 86712,
-    628 => 86713,
-    629 => 86714,
-    630 => 86715,
-    631 => 86716,
-    632 => 86717,
-    633 => 86718,
-    634 => 86719,
-    635 => 86722,
-    636 => 86724,
-    637 => 86728,
-    638 => 86730,
-    639 => 86731,
-    640 => 86734,
-    641 => 86735,
-    642 => 86736,
-    643 => 86737,
-    644 => 86738,
-    645 => 86739,
-    646 => 86743,
-    647 => 86744,
-    648 => 86745,
-    649 => 86746,
-    650 => 86750,
-    651 => 86751,
-    652 => 86752,
-    653 => 86753,
-    654 => 86754,
-    655 => 86755,
-    656 => 86756,
-    657 => 86757,
-    658 => 86758,
-    659 => 86759,
-    660 => 86760,
-    661 => 86762,
-    662 => 86763,
-    663 => 86766,
-    664 => 86768,
-    665 => 86769,
-    666 => 86770,
-    667 => 86771,
-    668 => 86772,
-    669 => 86773,
-    670 => 86774,
-    671 => 86775,
-    672 => 86776,
-    673 => 86777,
-    674 => 86778,
-    675 => 86779,
-    676 => 86790,
-    677 => 86791,
-    678 => 86792,
-    679 => 86793,
-    680 => 86794,
-    681 => 86795,
-    682 => 86796,
-    683 => 86797,
-    684 => 86798,
-    685 => 86799,
-    686 => 86812,
-    687 => 86813,
-    688 => 86816,
-    689 => 86817,
-    690 => 86818,
-    691 => 86825,
-    692 => 86826,
-    693 => 86827,
-    694 => 86830,
-    695 => 86831,
-    696 => 86832,
-    697 => 86833,
-    698 => 86834,
-    699 => 86835,
-    700 => 86836,
-    701 => 86837,
-    702 => 86838,
-    703 => 86839,
-    704 => 86851,
-    705 => 86854,
-    706 => 86855,
-    707 => 86856,
-    708 => 86857,
-    709 => 86858,
-    710 => 86859,
-    711 => 86870,
-    712 => 86871,
-    713 => 86872,
-    714 => 86873,
-    715 => 86874,
-    716 => 86875,
-    717 => 86876,
-    718 => 86877,
-    719 => 86878,
-    720 => 86879,
-    721 => 86883,
-    722 => 86886,
-    723 => 86887,
-    724 => 86888,
-    725 => 86891,
-    726 => 86892,
-    727 => 86893,
-    728 => 86894,
-    729 => 86895,
-    730 => 86896,
-    731 => 86897,
-    732 => 86898,
-    733 => 86901,
-    734 => 86902,
-    735 => 86903,
-    736 => 86906,
-    737 => 86908,
-    738 => 86909,
-    739 => 86911,
-    740 => 86912,
-    741 => 86913,
-    742 => 86914,
-    743 => 86915,
-    744 => 86916,
-    745 => 86917,
-    746 => 86919,
-    747 => 86930,
-    748 => 86931,
-    749 => 86932,
-    750 => 86933,
-    751 => 86934,
-    752 => 86935,
-    753 => 86936,
-    754 => 86937,
-    755 => 86938,
-    756 => 86939,
-    757 => 86941,
-    758 => 86943,
-    759 => 86951,
-    760 => 86952,
-    761 => 86953,
-    762 => 86954,
-    763 => 86955,
-    764 => 86970,
-    765 => 86971,
-    766 => 86972,
-    767 => 86973,
-    768 => 86974,
-    769 => 86975,
-    770 => 86976,
-    771 => 86977,
-    772 => 86979,
-    773 => 86990,
-    774 => 86991,
-    775 => 86992,
-    776 => 86993,
-    777 => 86994,
-    778 => 86995,
-    779 => 86996,
-    780 => 86997,
-    781 => 86998,
-    782 => 86999,
-    783 => 886,
-    784 => 90,
-    785 => 91,
-    786 => 94,
-    787 => 962,
-    788 => 966,
-    789 => 98,
+    415 => 592,
+    416 => 599,
+    417 => 62,
+    418 => 64,
+    419 => 66,
+    420 => 686,
+    421 => 7,
+    422 => 81,
+    423 => 82,
+    424 => 84,
+    425 => 8610,
+    426 => 86130,
+    427 => 86131,
+    428 => 86132,
+    429 => 86133,
+    430 => 86134,
+    431 => 86135,
+    432 => 86136,
+    433 => 86137,
+    434 => 86138,
+    435 => 86139,
+    436 => 86145,
+    437 => 86147,
+    438 => 86150,
+    439 => 86151,
+    440 => 86152,
+    441 => 86153,
+    442 => 86155,
+    443 => 86156,
+    444 => 86157,
+    445 => 86158,
+    446 => 86159,
+    447 => 86170,
+    448 => 86176,
+    449 => 86177,
+    450 => 86178,
+    451 => 86180,
+    452 => 86181,
+    453 => 86182,
+    454 => 86183,
+    455 => 86184,
+    456 => 86185,
+    457 => 86186,
+    458 => 86187,
+    459 => 86188,
+    460 => 86189,
+    461 => 8620,
+    462 => 8621,
+    463 => 8622,
+    464 => 8623,
+    465 => 8624,
+    466 => 8625,
+    467 => 8627,
+    468 => 8628,
+    469 => 8629,
+    470 => 86310,
+    471 => 86311,
+    472 => 86312,
+    473 => 86313,
+    474 => 86314,
+    475 => 86315,
+    476 => 86316,
+    477 => 86317,
+    478 => 86318,
+    479 => 86319,
+    480 => 86335,
+    481 => 86349,
+    482 => 86350,
+    483 => 86351,
+    484 => 86352,
+    485 => 86353,
+    486 => 86354,
+    487 => 86355,
+    488 => 86356,
+    489 => 86357,
+    490 => 86358,
+    491 => 86359,
+    492 => 86370,
+    493 => 86371,
+    494 => 86372,
+    495 => 86373,
+    496 => 86374,
+    497 => 86375,
+    498 => 86376,
+    499 => 86377,
+    500 => 86378,
+    501 => 86379,
+    502 => 86391,
+    503 => 86392,
+    504 => 86393,
+    505 => 86394,
+    506 => 86395,
+    507 => 86396,
+    508 => 86398,
+    509 => 86410,
+    510 => 86411,
+    511 => 86412,
+    512 => 86413,
+    513 => 86414,
+    514 => 86415,
+    515 => 86416,
+    516 => 86417,
+    517 => 86418,
+    518 => 86419,
+    519 => 86421,
+    520 => 86427,
+    521 => 86429,
+    522 => 86431,
+    523 => 86432,
+    524 => 86433,
+    525 => 86434,
+    526 => 86435,
+    527 => 86436,
+    528 => 86437,
+    529 => 86438,
+    530 => 86451,
+    531 => 86452,
+    532 => 86453,
+    533 => 86454,
+    534 => 86455,
+    535 => 86456,
+    536 => 86457,
+    537 => 86458,
+    538 => 86459,
+    539 => 86464,
+    540 => 86467,
+    541 => 86468,
+    542 => 86469,
+    543 => 86470,
+    544 => 86471,
+    545 => 86472,
+    546 => 86473,
+    547 => 86474,
+    548 => 86475,
+    549 => 86476,
+    550 => 86477,
+    551 => 86478,
+    552 => 86479,
+    553 => 86482,
+    554 => 86483,
+    555 => 86510,
+    556 => 86511,
+    557 => 86512,
+    558 => 86513,
+    559 => 86514,
+    560 => 86515,
+    561 => 86516,
+    562 => 86517,
+    563 => 86518,
+    564 => 86519,
+    565 => 86523,
+    566 => 86527,
+    567 => 86530,
+    568 => 86531,
+    569 => 86532,
+    570 => 86533,
+    571 => 86534,
+    572 => 86535,
+    573 => 86536,
+    574 => 86537,
+    575 => 86538,
+    576 => 86539,
+    577 => 86543,
+    578 => 86546,
+    579 => 86550,
+    580 => 86551,
+    581 => 86552,
+    582 => 86553,
+    583 => 86554,
+    584 => 86555,
+    585 => 86556,
+    586 => 86557,
+    587 => 86558,
+    588 => 86559,
+    589 => 86561,
+    590 => 86562,
+    591 => 86563,
+    592 => 86564,
+    593 => 86566,
+    594 => 86570,
+    595 => 86571,
+    596 => 86572,
+    597 => 86573,
+    598 => 86574,
+    599 => 86575,
+    600 => 86576,
+    601 => 86577,
+    602 => 86578,
+    603 => 86579,
+    604 => 86580,
+    605 => 86591,
+    606 => 86592,
+    607 => 86593,
+    608 => 86594,
+    609 => 86595,
+    610 => 86596,
+    611 => 86597,
+    612 => 86598,
+    613 => 86599,
+    614 => 86631,
+    615 => 86632,
+    616 => 86633,
+    617 => 86634,
+    618 => 86635,
+    619 => 86660,
+    620 => 86662,
+    621 => 86663,
+    622 => 86668,
+    623 => 86691,
+    624 => 86692,
+    625 => 86701,
+    626 => 86710,
+    627 => 86711,
+    628 => 86712,
+    629 => 86713,
+    630 => 86714,
+    631 => 86715,
+    632 => 86716,
+    633 => 86717,
+    634 => 86718,
+    635 => 86719,
+    636 => 86722,
+    637 => 86724,
+    638 => 86728,
+    639 => 86730,
+    640 => 86731,
+    641 => 86734,
+    642 => 86735,
+    643 => 86736,
+    644 => 86737,
+    645 => 86738,
+    646 => 86739,
+    647 => 86743,
+    648 => 86744,
+    649 => 86745,
+    650 => 86746,
+    651 => 86750,
+    652 => 86751,
+    653 => 86752,
+    654 => 86753,
+    655 => 86754,
+    656 => 86755,
+    657 => 86756,
+    658 => 86757,
+    659 => 86758,
+    660 => 86759,
+    661 => 86760,
+    662 => 86762,
+    663 => 86763,
+    664 => 86766,
+    665 => 86768,
+    666 => 86769,
+    667 => 86770,
+    668 => 86771,
+    669 => 86772,
+    670 => 86773,
+    671 => 86774,
+    672 => 86775,
+    673 => 86776,
+    674 => 86777,
+    675 => 86778,
+    676 => 86779,
+    677 => 86790,
+    678 => 86791,
+    679 => 86792,
+    680 => 86793,
+    681 => 86794,
+    682 => 86795,
+    683 => 86796,
+    684 => 86797,
+    685 => 86798,
+    686 => 86799,
+    687 => 86812,
+    688 => 86813,
+    689 => 86816,
+    690 => 86817,
+    691 => 86818,
+    692 => 86825,
+    693 => 86826,
+    694 => 86827,
+    695 => 86830,
+    696 => 86831,
+    697 => 86832,
+    698 => 86833,
+    699 => 86834,
+    700 => 86835,
+    701 => 86836,
+    702 => 86837,
+    703 => 86838,
+    704 => 86839,
+    705 => 86851,
+    706 => 86854,
+    707 => 86855,
+    708 => 86856,
+    709 => 86857,
+    710 => 86858,
+    711 => 86859,
+    712 => 86870,
+    713 => 86871,
+    714 => 86872,
+    715 => 86873,
+    716 => 86874,
+    717 => 86875,
+    718 => 86876,
+    719 => 86877,
+    720 => 86878,
+    721 => 86879,
+    722 => 86883,
+    723 => 86886,
+    724 => 86887,
+    725 => 86888,
+    726 => 86891,
+    727 => 86892,
+    728 => 86893,
+    729 => 86894,
+    730 => 86895,
+    731 => 86896,
+    732 => 86897,
+    733 => 86898,
+    734 => 86901,
+    735 => 86902,
+    736 => 86903,
+    737 => 86906,
+    738 => 86908,
+    739 => 86909,
+    740 => 86911,
+    741 => 86912,
+    742 => 86913,
+    743 => 86914,
+    744 => 86915,
+    745 => 86916,
+    746 => 86917,
+    747 => 86919,
+    748 => 86930,
+    749 => 86931,
+    750 => 86932,
+    751 => 86933,
+    752 => 86934,
+    753 => 86935,
+    754 => 86936,
+    755 => 86937,
+    756 => 86938,
+    757 => 86939,
+    758 => 86941,
+    759 => 86943,
+    760 => 86951,
+    761 => 86952,
+    762 => 86953,
+    763 => 86954,
+    764 => 86955,
+    765 => 86970,
+    766 => 86971,
+    767 => 86972,
+    768 => 86973,
+    769 => 86974,
+    770 => 86975,
+    771 => 86976,
+    772 => 86977,
+    773 => 86979,
+    774 => 86990,
+    775 => 86991,
+    776 => 86992,
+    777 => 86993,
+    778 => 86994,
+    779 => 86995,
+    780 => 86996,
+    781 => 86997,
+    782 => 86998,
+    783 => 86999,
+    784 => 886,
+    785 => 90,
+    786 => 91,
+    787 => 94,
+    788 => 962,
+    789 => 966,
+    790 => 98,
   ),
   'es' => 
   array (
diff --git a/src/libphonenumber/geocoding/data/en/226.php b/src/libphonenumber/geocoding/data/en/226.php
index 4590c868b..4c271b9ba 100644
--- a/src/libphonenumber/geocoding/data/en/226.php
+++ b/src/libphonenumber/geocoding/data/en/226.php
@@ -14,25 +14,25 @@
   2262097 => 'Bobo-Dioulasso',
   2262098 => 'Bobo-Dioulasso',
   2262099 => 'Béréba/Fo/Houndé',
-  2264045 => 'Kaya',
-  2264046 => 'Falagountou/Dori',
-  2264049 => 'Falagountou/Dori',
-  2264054 => 'Yako',
-  2264055 => 'Ouahigouya',
-  2264056 => 'Djibo',
-  2264070 => 'Pouytenga/Koupéla',
-  2264071 => 'Tenkodogo',
-  2264077 => 'Fada/Diabo',
-  2264079 => 'Kantchari',
-  226503 => 'Ouagadougou',
-  2265040 => 'Pô/Kombissiri/Koubri',
-  2265041 => 'Léo/Sapouy',
-  2265042 => 'Ouagadougou',
-  2265043 => 'Ouagadougou',
-  2265044 => 'Koudougou',
-  2265045 => 'Ouagadougou',
-  2265046 => 'Ouagadougou',
-  2265047 => 'Ouagadougou',
-  2265048 => 'Ouagadougou',
-  2265049 => 'Ouagadougou',
+  2262445 => 'Kaya',
+  2262446 => 'Falagountou/Dori',
+  2262449 => 'Falagountou/Dori',
+  2262454 => 'Yako',
+  2262455 => 'Ouahigouya',
+  2262456 => 'Djibo',
+  2262470 => 'Pouytenga/Koupéla',
+  2262471 => 'Tenkodogo',
+  2262477 => 'Fada/Diabo',
+  2262479 => 'Kantchari',
+  226253 => 'Ouagadougou',
+  2262540 => 'Pô/Kombissiri/Koubri',
+  2262541 => 'Léo/Sapouy',
+  2262542 => 'Ouagadougou',
+  2262543 => 'Ouagadougou',
+  2262544 => 'Koudougou',
+  2262545 => 'Ouagadougou',
+  2262546 => 'Ouagadougou',
+  2262547 => 'Ouagadougou',
+  2262548 => 'Ouagadougou',
+  2262549 => 'Ouagadougou',
 );
diff --git a/src/libphonenumber/geocoding/data/en/290.php b/src/libphonenumber/geocoding/data/en/290.php
index f1ff0c713..43e66355c 100644
--- a/src/libphonenumber/geocoding/data/en/290.php
+++ b/src/libphonenumber/geocoding/data/en/290.php
@@ -5,10 +5,10 @@
  */
 
 return array (
-  2902 => 'Jamestown',
-  2903 => 'St. Helena',
-  2904 => 'St. Helena',
-  2906 => 'St. Helena',
-  2907 => 'St. Helena',
+  29022 => 'Jamestown',
+  29023 => 'St. Helena',
+  29024 => 'St. Helena',
+  29026 => 'St. Helena',
+  29027 => 'St. Helena',
   2908 => 'Tristan da Cunha',
 );
diff --git a/src/libphonenumber/geocoding/data/en/592.php b/src/libphonenumber/geocoding/data/en/592.php
new file mode 100644
index 000000000..88d863c6b
--- /dev/null
+++ b/src/libphonenumber/geocoding/data/en/592.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * This file is automatically @generated by {@link GeneratePhonePrefixData}.
+ * Please don't modify it directly.
+ */
+
+return array (
+  592216 => 'Diamond/Grove',
+  592217 => 'Mocha',
+  592218 => 'Georgetown (S/R/Veldt)',
+  592219 => 'Georgetown,Sophia',
+  592220 => 'B/V Central',
+  592221 => 'Mahaicony',
+  592222 => 'B/V West',
+  592223 => 'Georgetown',
+  592225 => 'Georgetown',
+  592226 => 'Georgetown',
+  592227 => 'Georgetown',
+  592228 => 'Mahaica/Belmont',
+  592229 => 'Enterprise/Cove & John',
+  592231 => 'Georgetown',
+  592232 => 'Novar/Catherine/Belladrum/Bush Lot',
+  592233 => 'Agricola/Houston/Eccles/Nandy Park',
+  592234 => 'B/V Central',
+  592253 => 'La Grange/Goed Fortuin',
+  592254 => 'New Road/Best',
+  592255 => 'Paradise/Golden Grove/Haslington',
+  592256 => 'Victoria/Hope West',
+  592257 => 'Cane Grove/Strangroen',
+  592258 => 'Planters Hall/Mortice',
+  592259 => 'Clonbrook/Unity',
+  592260 => 'Tuschen/Parika',
+  592261 => 'Timehri/Long Creek/Soesdyke',
+  592262 => 'Parika',
+  592264 => 'Vreed-en-Hoop',
+  592265 => 'Diamond',
+  592266 => 'New Hope/Friendship/Grove/Land of Canaan',
+  592267 => 'Wales',
+  592268 => 'Leonora',
+  592269 => 'Windsor Forest',
+  592270 => 'Melanie/Non Pariel/Enmore',
+  592271 => 'Canal No. 1/Canal No. 2',
+  592272 => 'B/V West',
+  592274 => 'Vigilance',
+  592275 => 'Met-en-Meer-Zorg',
+  592276 => 'Anna Catherina/ Cornelia Ida/Hague/Fellowship',
+  592277 => 'Zeeburg/Uitvlugt',
+  592279 => 'Good Hope/Stanleytown',
+  592322 => 'Kilcoy/Hampshire/Nigg',
+  592325 => 'Mibikuri/No: 34/Joppa/Brighton',
+  592326 => 'Adelphi/Fryish/No. 40',
+  592327 => 'Blairmont/Cumberland',
+  592328 => 'Cottage/Tempe/Onverwagt/Bath/Waterloo',
+  592329 => 'Willemstad/Fort Wellington/Ithaca',
+  592330 => 'Rosignol/Shieldstown',
+  592331 => 'Adventure/Joanna',
+  592332 => 'Sheet Anchor/Susannah',
+  592333 => 'New Amsterdam',
+  592334 => 'New Amsterdam',
+  592335 => 'Crabwood Creek/No: 76/Corentyne',
+  592336 => 'Edinburg/Port Mourant',
+  592337 => 'Whim/Bloomfield/Liverpool/Rose Hall',
+  592338 => 'Benab/No. 65 Village/Massiah',
+  592339 => 'No: 52/Skeldon',
+  592440 => 'Kwakwani',
+  592441 => 'Ituni',
+  592442 => 'Christianburg/Amelia’s Ward',
+  592444 => 'Linden/Canvas City/Wisroc',
+  592455 => 'Bartica',
+  592456 => 'Mahdia',
+  592772 => 'Lethem',
+  592773 => 'Aishalton',
+  592775 => 'Matthews Ridge',
+  592777 => 'Mabaruma/Port Kaituma',
+);
diff --git a/src/libphonenumber/geocoding/data/en/86131.php b/src/libphonenumber/geocoding/data/en/86131.php
index 65a41d20d..c38a44c41 100644
--- a/src/libphonenumber/geocoding/data/en/86131.php
+++ b/src/libphonenumber/geocoding/data/en/86131.php
@@ -1843,16 +1843,7 @@
   86131278 => 'Shanghai',
   86131279 => 'Shanghai',
   86131280 => 'Dongguan, Guangdong',
-  861312810 => 'Dongguan, Guangdong',
-  861312811 => 'Dongguan, Guangdong',
-  861312812 => 'Dongguan, Guangdong',
-  861312813 => 'Dongguan, Guangdong',
-  861312814 => 'Dongguan, Guangdong',
-  861312815 => 'Dongguan, Guangdong',
-  861312816 => 'Dongguan, Guangdong',
-  861312817 => 'Dongguan, Guangdong',
-  861312818 => 'Dongguan, Guangdong',
-  861312819 => 'Hong Kong',
+  86131281 => 'Dongguan, Guangdong',
   86131282 => 'Guangzhou, Guangdong',
   86131283 => 'Jieyang, Guangdong',
   861312840 => 'Chaozhou, Guangdong',
@@ -2810,26 +2801,8 @@
   861314368 => 'Guangzhou, Guangdong',
   861314369 => 'Guangzhou, Guangdong',
   86131437 => 'Guangzhou, Guangdong',
-  861314380 => 'Shenzhen, Guangdong',
-  861314381 => 'Hong Kong',
-  861314382 => 'Shenzhen, Guangdong',
-  861314383 => 'Shenzhen, Guangdong',
-  861314384 => 'Shenzhen, Guangdong',
-  861314385 => 'Hong Kong',
-  861314386 => 'Shenzhen, Guangdong',
-  861314387 => 'Hong Kong',
-  861314388 => 'Shenzhen, Guangdong',
-  861314389 => 'Hong Kong',
-  861314390 => 'Shenzhen, Guangdong',
-  861314391 => 'Shenzhen, Guangdong',
-  861314392 => 'Hong Kong',
-  861314393 => 'Shenzhen, Guangdong',
-  861314394 => 'Shenzhen, Guangdong',
-  861314395 => 'Hong Kong',
-  861314396 => 'Hong Kong',
-  861314397 => 'Hong Kong',
-  861314398 => 'Shenzhen, Guangdong',
-  861314399 => 'Hong Kong',
+  86131438 => 'Shenzhen, Guangdong',
+  86131439 => 'Shenzhen, Guangdong',
   861314400 => 'Zhongshan, Guangdong',
   861314401 => 'Zhongshan, Guangdong',
   861314402 => 'Zhongshan, Guangdong',
@@ -2991,16 +2964,7 @@
   861314729 => 'Xiaogan, Hubei',
   86131473 => 'Dongguan, Guangdong',
   86131474 => 'Shijiazhuang, Hebei',
-  861314750 => 'Hong Kong',
-  861314751 => 'Hong Kong',
-  861314752 => 'Hong Kong',
-  861314753 => 'Hong Kong',
-  861314754 => 'Hong Kong',
-  861314755 => 'Shenzhen, Guangdong',
-  861314756 => 'Shenzhen, Guangdong',
-  861314757 => 'Hong Kong',
-  861314758 => 'Hong Kong',
-  861314759 => 'Hong Kong',
+  86131475 => 'Shenzhen, Guangdong',
   861314760 => 'Baicheng, Jilin',
   861314761 => 'Baicheng, Jilin',
   861314762 => 'Baicheng, Jilin',
@@ -3141,16 +3105,7 @@
   861314987 => 'Dalian, Liaoning',
   861314988 => 'Dalian, Liaoning',
   861314989 => 'Dalian, Liaoning',
-  861314990 => 'Shenzhen, Guangdong',
-  861314991 => 'Shenzhen, Guangdong',
-  861314992 => 'Shenzhen, Guangdong',
-  861314993 => 'Shenzhen, Guangdong',
-  861314994 => 'Shenzhen, Guangdong',
-  861314995 => 'Hong Kong',
-  861314996 => 'Hong Kong',
-  861314997 => 'Shenzhen, Guangdong',
-  861314998 => 'Shenzhen, Guangdong',
-  861314999 => 'Hong Kong',
+  86131499 => 'Shenzhen, Guangdong',
   861315000 => 'Zhangye, Gansu',
   861315001 => 'Lanzhou, Gansu',
   861315002 => 'Lanzhou, Gansu',
@@ -4496,18 +4451,9 @@
   861317197 => 'Qinhuangdao, Hebei',
   861317198 => 'Cangzhou, Hebei',
   861317199 => 'Cangzhou, Hebei',
-  861317200 => 'Hong Kong',
-  861317201 => 'Guangzhou, Guangdong',
-  861317202 => 'Guangzhou, Guangdong',
-  861317203 => 'Guangzhou, Guangdong',
-  861317204 => 'Guangzhou, Guangdong',
-  861317205 => 'Guangzhou, Guangdong',
-  861317206 => 'Hong Kong',
-  861317207 => 'Guangzhou, Guangdong',
-  861317208 => 'Guangzhou, Guangdong',
-  861317209 => 'Guangzhou, Guangdong',
-  861317210 => 'Hong Kong',
-  861317211 => 'Hong Kong',
+  86131720 => 'Guangzhou, Guangdong',
+  861317210 => 'Guangzhou, Guangdong',
+  861317211 => 'Dongguan, Guangdong',
   861317212 => 'Langfang, Hebei',
   861317213 => 'Langfang, Hebei',
   861317214 => 'Langfang, Hebei',
diff --git a/src/libphonenumber/geocoding/data/en/86132.php b/src/libphonenumber/geocoding/data/en/86132.php
index 0e102d68c..5067ecf08 100644
--- a/src/libphonenumber/geocoding/data/en/86132.php
+++ b/src/libphonenumber/geocoding/data/en/86132.php
@@ -2128,7 +2128,7 @@
   861322993 => 'Guangzhou, Guangdong',
   861322994 => 'Guangzhou, Guangdong',
   861322995 => 'Guangzhou, Guangdong',
-  861322996 => 'Hong Kong',
+  861322996 => 'Guangzhou, Guangdong',
   861322997 => 'Guangzhou, Guangdong',
   861322998 => 'Guangzhou, Guangdong',
   861322999 => 'Guangzhou, Guangdong',
@@ -3399,16 +3399,7 @@
   861324957 => 'Shantou, Guangdong',
   861324958 => 'Shantou, Guangdong',
   861324959 => 'Shantou, Guangdong',
-  861324960 => 'Guangzhou, Guangdong',
-  861324961 => 'Guangzhou, Guangdong',
-  861324962 => 'Guangzhou, Guangdong',
-  861324963 => 'Guangzhou, Guangdong',
-  861324964 => 'Guangzhou, Guangdong',
-  861324965 => 'Guangzhou, Guangdong',
-  861324966 => 'Guangzhou, Guangdong',
-  861324967 => 'Hong Kong',
-  861324968 => 'Guangzhou, Guangdong',
-  861324969 => 'Hong Kong',
+  86132496 => 'Guangzhou, Guangdong',
   86132497 => 'Guangzhou, Guangdong',
   86132498 => 'Shenzhen, Guangdong',
   861324990 => 'Dongguan, Guangdong',
@@ -4285,12 +4276,12 @@
   86132668 => 'Shenzhen, Guangdong',
   861326690 => 'Shijiazhuang, Hebei',
   861326691 => 'Shijiazhuang, Hebei',
-  861326692 => 'Hong Kong',
-  861326693 => 'Hong Kong',
-  861326694 => 'Hong Kong',
-  861326695 => 'Hong Kong',
+  861326692 => 'Dongguan, Guangdong',
+  861326693 => 'Dongguan, Guangdong',
+  861326694 => 'Dongguan, Guangdong',
+  861326695 => 'Dongguan, Guangdong',
   861326696 => 'Shenzhen, Guangdong',
-  861326697 => 'Hong Kong',
+  861326697 => 'Dongguan, Guangdong',
   861326698 => 'Shenzhen, Guangdong',
   861326699 => 'Shenzhen, Guangdong',
   86132670 => 'Shenzhen, Guangdong',
@@ -4349,16 +4340,7 @@
   861326798 => 'Zhuhai, Guangdong',
   861326799 => 'Zhuhai, Guangdong',
   86132680 => 'Guangzhou, Guangdong',
-  861326810 => 'Guangzhou, Guangdong',
-  861326811 => 'Guangzhou, Guangdong',
-  861326812 => 'Guangzhou, Guangdong',
-  861326813 => 'Guangzhou, Guangdong',
-  861326814 => 'Guangzhou, Guangdong',
-  861326815 => 'Guangzhou, Guangdong',
-  861326816 => 'Hong Kong',
-  861326817 => 'Guangzhou, Guangdong',
-  861326818 => 'Hong Kong',
-  861326819 => 'Guangzhou, Guangdong',
+  86132681 => 'Guangzhou, Guangdong',
   86132682 => 'Guangzhou, Guangdong',
   86132683 => 'Guangzhou, Guangdong',
   86132684 => 'Dongguan, Guangdong',
diff --git a/src/libphonenumber/geocoding/data/en/86145.php b/src/libphonenumber/geocoding/data/en/86145.php
index a03b77629..f9aa92871 100644
--- a/src/libphonenumber/geocoding/data/en/86145.php
+++ b/src/libphonenumber/geocoding/data/en/86145.php
@@ -414,12 +414,7 @@
   861450997 => 'Aksu, Xinjiang',
   861450998 => 'Kashi, Xinjiang',
   861450999 => 'Ili, Xinjiang',
-  8614510 => 'Beijing',
-  8614511 => 'Beijing',
-  8614512 => 'Beijing',
-  8614513 => 'Beijing',
-  8614515 => 'Changzhou, Jiangsu',
-  8614516 => 'Nantong, Jiangsu',
+  861451 => 'Beijing',
   86145200 => 'Beijing',
   86145201 => 'Beijing',
   86145202 => 'Beijing',
@@ -3842,6 +3837,9 @@
   861459734 => 'Hengyang, Hunan',
   861459735 => 'Chenzhou, Hunan',
   861459736 => 'Changde, Hunan',
+  861459737 => 'Changsha, Hunan',
+  861459738 => 'Changsha, Hunan',
+  861459739 => 'Changsha, Hunan',
   861459770 => 'Karamay, Xinjiang',
   861459771 => 'Karamay, Xinjiang',
   861459772 => 'Urumchi, Xinjiang',
@@ -3872,4 +3870,25 @@
   861459797 => 'Bayingolin, Xinjiang',
   861459798 => 'Urumchi, Xinjiang',
   861459799 => 'Urumchi, Xinjiang',
+  861459800 => 'Xiangfan, Hubei',
+  861459801 => 'Huangshi, Hubei',
+  861459802 => 'Shiyan, Hubei',
+  861459803 => 'Shiyan, Hubei',
+  861459804 => 'Shiyan, Hubei',
+  861459805 => 'Shiyan, Hubei',
+  861459806 => 'Shiyan, Hubei',
+  861459807 => 'Shiyan, Hubei',
+  861459808 => 'Shiyan, Hubei',
+  861459809 => 'Shiyan, Hubei',
+  86145988 => 'Dongguan, Guangdong',
+  861459890 => 'Dongguan, Guangdong',
+  861459891 => 'Dongguan, Guangdong',
+  861459892 => 'Dongguan, Guangdong',
+  861459893 => 'Foshan, Guangdong',
+  861459894 => 'Foshan, Guangdong',
+  861459895 => 'Foshan, Guangdong',
+  861459896 => 'Foshan, Guangdong',
+  861459897 => 'Foshan, Guangdong',
+  861459898 => 'Foshan, Guangdong',
+  861459899 => 'Guangzhou, Guangdong',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86153.php b/src/libphonenumber/geocoding/data/en/86153.php
index 62836c155..edbdce9d6 100644
--- a/src/libphonenumber/geocoding/data/en/86153.php
+++ b/src/libphonenumber/geocoding/data/en/86153.php
@@ -4766,6 +4766,16 @@
   861537437 => 'Ganzhou, Jiangxi',
   861537438 => 'Shangrao, Jiangxi',
   861537439 => 'Yichun, Jiangxi',
+  861537440 => 'Linxia, Gansu',
+  861537441 => 'Baiyin, Gansu',
+  861537442 => 'Dingxi, Gansu',
+  861537443 => 'Pingliang, Gansu',
+  861537444 => 'Qingyang, Gansu',
+  861537445 => 'Wuwei, Gansu',
+  861537446 => 'Zhangye, Gansu',
+  861537447 => 'Gannan, Gansu',
+  861537448 => 'Tianshui, Gansu',
+  861537449 => 'Longnan, Gansu',
   861537450 => 'Ezhou, Hubei',
   861537451 => 'Huangshi, Hubei',
   861537452 => 'Huangshi, Hubei',
diff --git a/src/libphonenumber/geocoding/data/en/86170.php b/src/libphonenumber/geocoding/data/en/86170.php
index b919b86e9..a5b6c6e0e 100644
--- a/src/libphonenumber/geocoding/data/en/86170.php
+++ b/src/libphonenumber/geocoding/data/en/86170.php
@@ -1188,6 +1188,890 @@
   861705880 => 'Dongguan, Guangdong',
   861705882 => 'Foshan, Guangdong',
   861705883 => 'Zhongshan, Guangdong',
+  86170700 => 'Beijing',
+  86170701 => 'Beijing',
+  86170702 => 'Guangzhou, Guangdong',
+  86170703 => 'Guangzhou, Guangdong',
+  861707040 => 'Huzhou, Zhejiang',
+  861707041 => 'Huzhou, Zhejiang',
+  861707042 => 'Huzhou, Zhejiang',
+  861707043 => 'Taizhou, Zhejiang',
+  861707044 => 'Taizhou, Zhejiang',
+  861707045 => 'Jinhua, Zhejiang',
+  861707046 => 'Jinhua, Zhejiang',
+  861707047 => 'Quzhou, Zhejiang',
+  861707048 => 'Quzhou, Zhejiang',
+  861707049 => 'Quzhou, Zhejiang',
+  86170705 => 'Zhenjiang, Jiangsu',
+  861707060 => 'Anshan, Liaoning',
+  861707061 => 'Anshan, Liaoning',
+  861707062 => 'Anshan, Liaoning',
+  861707063 => 'Anshan, Liaoning',
+  861707064 => 'Anshan, Liaoning',
+  861707065 => 'Anshan, Liaoning',
+  861707066 => 'Anshan, Liaoning',
+  861707067 => 'Anshan, Liaoning',
+  861707068 => 'Shenyang, Liaoning',
+  861707069 => 'Shenyang, Liaoning',
+  86170707 => 'Nanning, Guangxi',
+  86170708 => 'Guangzhou, Guangdong',
+  86170709 => 'Shijiazhuang, Hebei',
+  86170710 => 'Beijing',
+  86170711 => 'Beijing',
+  86170712 => 'Tianjin',
+  86170713 => 'Shanghai',
+  86170714 => 'Beijing',
+  86170715 => 'Nanjing, Jiangsu',
+  861707160 => 'Nanyang, Henan',
+  861707161 => 'Jiaozuo, Henan',
+  861707162 => 'Zhoukou, Henan',
+  861707163 => 'Zhoukou, Henan',
+  861707164 => 'Hebi, Henan',
+  861707165 => 'Luoyang, Henan',
+  861707166 => 'Luohe, Henan',
+  861707167 => 'Sanmenxia, Henan',
+  861707168 => 'Zhengzhou, Henan',
+  861707169 => 'Zhengzhou, Henan',
+  861707170 => 'JiAn, Jiangxi',
+  861707171 => 'JiAn, Jiangxi',
+  861707172 => 'JiAn, Jiangxi',
+  861707173 => 'JiAn, Jiangxi',
+  861707174 => 'JiAn, Jiangxi',
+  861707175 => 'Yingtan, Jiangxi',
+  861707176 => 'Yingtan, Jiangxi',
+  861707177 => 'Yingtan, Jiangxi',
+  861707178 => 'Yingtan, Jiangxi',
+  861707179 => 'Yingtan, Jiangxi',
+  86170718 => 'Zhengzhou, Henan',
+  86170719 => 'Fuzhou, Fujian',
+  86170720 => 'Guangzhou, Guangdong',
+  86170721 => 'Shanghai',
+  86170722 => 'Tianjin',
+  86170723 => 'Chongqing',
+  86170724 => 'Shenyang, Liaoning',
+  86170725 => 'Nanjing, Jiangsu',
+  861707260 => 'Xianning, Hubei',
+  861707261 => 'Xianning, Hubei',
+  861707262 => 'Xianning, Hubei',
+  861707263 => 'Xianning, Hubei',
+  861707264 => 'Xiaogan, Hubei',
+  861707265 => 'Xiaogan, Hubei',
+  861707266 => 'Xiaogan, Hubei',
+  861707267 => 'Xiaogan, Hubei',
+  861707268 => 'Xiaogan, Hubei',
+  861707269 => 'Xiaogan, Hubei',
+  86170727 => 'Wuhan, Hubei',
+  86170728 => 'Chengdu, Sichuan',
+  86170729 => 'XiAn, Shaanxi',
+  86170730 => 'Taiyuan, Shanxi',
+  861707310 => 'Handan, Hebei',
+  861707311 => 'Shijiazhuang, Hebei',
+  861707312 => 'Baoding, Hebei',
+  861707313 => 'Baoding, Hebei',
+  861707314 => 'Baoding, Hebei',
+  861707315 => 'Tangshan, Hebei',
+  861707316 => 'Tangshan, Hebei',
+  861707317 => 'Cangzhou, Hebei',
+  861707318 => 'Shijiazhuang, Hebei',
+  861707319 => 'Shijiazhuang, Hebei',
+  861707320 => 'Baoding, Hebei',
+  861707321 => 'Baoding, Hebei',
+  861707322 => 'Baoding, Hebei',
+  861707323 => 'Baoding, Hebei',
+  861707324 => 'Baoding, Hebei',
+  861707325 => 'Baoding, Hebei',
+  861707326 => 'Baoding, Hebei',
+  861707327 => 'Baoding, Hebei',
+  861707328 => 'Shijiazhuang, Hebei',
+  861707329 => 'Shijiazhuang, Hebei',
+  86170733 => 'Tangshan, Hebei',
+  861707340 => 'Shijiazhuang, Hebei',
+  861707341 => 'Shijiazhuang, Hebei',
+  861707342 => 'Shijiazhuang, Hebei',
+  861707343 => 'Shijiazhuang, Hebei',
+  861707344 => 'Shijiazhuang, Hebei',
+  861707345 => 'Shijiazhuang, Hebei',
+  861707346 => 'Tangshan, Hebei',
+  861707347 => 'Tangshan, Hebei',
+  861707348 => 'Tangshan, Hebei',
+  861707349 => 'Tangshan, Hebei',
+  86170735 => 'Zhengzhou, Henan',
+  861707360 => 'Zhengzhou, Henan',
+  861707361 => 'Zhengzhou, Henan',
+  861707362 => 'Zhengzhou, Henan',
+  861707363 => 'Zhengzhou, Henan',
+  861707364 => 'Jiaozuo, Henan',
+  861707365 => 'Nanyang, Henan',
+  861707366 => 'Nanyang, Henan',
+  861707367 => 'Nanyang, Henan',
+  861707368 => 'Nanyang, Henan',
+  861707369 => 'Nanyang, Henan',
+  861707370 => 'Shangqiu, Henan',
+  861707371 => 'Zhengzhou, Henan',
+  861707372 => 'Anyang, Henan',
+  861707373 => 'Xinxiang, Henan',
+  861707374 => 'Xuchang, Henan',
+  861707375 => 'Pingdingshan, Henan',
+  861707376 => 'Xinyang, Henan',
+  861707377 => 'Nanyang, Henan',
+  861707378 => 'Zhengzhou, Henan',
+  861707379 => 'Luoyang, Henan',
+  861707380 => 'Zhengzhou, Henan',
+  861707381 => 'Zhengzhou, Henan',
+  861707382 => 'Luoyang, Henan',
+  861707383 => 'Shangqiu, Henan',
+  861707384 => 'Shangqiu, Henan',
+  861707385 => 'Xuchang, Henan',
+  861707386 => 'Xuchang, Henan',
+  861707387 => 'Xuchang, Henan',
+  861707388 => 'Pingdingshan, Henan',
+  861707389 => 'Pingdingshan, Henan',
+  861707390 => 'Jiaozuo, Henan',
+  861707391 => 'Jiaozuo, Henan',
+  861707392 => 'Hebi, Henan',
+  861707393 => 'Puyang, Henan',
+  861707394 => 'Zhoukou, Henan',
+  861707395 => 'Luohe, Henan',
+  861707396 => 'Zhumadian, Henan',
+  861707397 => 'Xinyang, Henan',
+  861707398 => 'Sanmenxia, Henan',
+  861707399 => 'Zhumadian, Henan',
+  86170740 => 'Shenyang, Liaoning',
+  86170741 => 'Dalian, Liaoning',
+  861707420 => 'Hangzhou, Zhejiang',
+  861707421 => 'Hangzhou, Zhejiang',
+  861707422 => 'Hangzhou, Zhejiang',
+  861707423 => 'Hangzhou, Zhejiang',
+  861707424 => 'Hangzhou, Zhejiang',
+  861707425 => 'Ningbo, Zhejiang',
+  861707426 => 'Ningbo, Zhejiang',
+  861707427 => 'Ningbo, Zhejiang',
+  861707428 => 'Ningbo, Zhejiang',
+  861707429 => 'Ningbo, Zhejiang',
+  86170743 => 'Changchun, Jilin',
+  861707440 => 'Wenzhou, Zhejiang',
+  861707441 => 'Wenzhou, Zhejiang',
+  861707442 => 'Wenzhou, Zhejiang',
+  861707443 => 'Wenzhou, Zhejiang',
+  861707444 => 'Jiaxing, Zhejiang',
+  861707445 => 'Zhoushan, Zhejiang',
+  861707446 => 'Lishui, Zhejiang',
+  861707447 => 'Shaoxing, Zhejiang',
+  861707448 => 'Shaoxing, Zhejiang',
+  861707449 => 'Shaoxing, Zhejiang',
+  86170745 => 'Harbin, Heilongjiang',
+  86170746 => 'Harbin, Heilongjiang',
+  86170747 => 'Hohhot, Inner Mongolia',
+  86170748 => 'Guangzhou, Guangdong',
+  86170749 => 'Fuzhou, Fujian',
+  86170750 => 'Nanjing, Jiangsu',
+  86170751 => 'Nanjing, Jiangsu',
+  86170752 => 'Nanjing, Jiangsu',
+  861707530 => 'Jinan, Shandong',
+  861707531 => 'Jinan, Shandong',
+  861707532 => 'Qingdao, Shandong',
+  861707533 => 'Yantai, Shandong',
+  861707534 => 'Yantai, Shandong',
+  861707535 => 'Yantai, Shandong',
+  861707536 => 'Weifang, Shandong',
+  861707537 => 'Jining, Shandong',
+  861707538 => 'Jining, Shandong',
+  861707539 => 'Linyi, Shandong',
+  861707540 => 'Xiamen, Fujian',
+  861707541 => 'Xiamen, Fujian',
+  861707542 => 'Zhangzhou, Fujian',
+  861707543 => 'Zhangzhou, Fujian',
+  861707544 => 'Putian, Fujian',
+  861707545 => 'Quanzhou, Fujian',
+  861707546 => 'Quanzhou, Fujian',
+  861707547 => 'Quanzhou, Fujian',
+  861707548 => 'Quanzhou, Fujian',
+  861707549 => 'Quanzhou, Fujian',
+  861707550 => 'Hefei, Anhui',
+  861707551 => 'Hefei, Anhui',
+  861707552 => 'Wuhu, Anhui',
+  861707553 => 'Wuhu, Anhui',
+  861707554 => 'Wuhu, Anhui',
+  861707555 => 'Wuhu, Anhui',
+  861707556 => 'Anqing, Anhui',
+  861707557 => 'Fuyang, Anhui',
+  861707558 => 'Fuyang, Anhui',
+  861707559 => 'Fuyang, Anhui',
+  861707560 => 'LuAn, Anhui',
+  861707561 => 'Wuhu, Anhui',
+  861707562 => 'Wuhu, Anhui',
+  861707563 => 'Wuhu, Anhui',
+  861707564 => 'LuAn, Anhui',
+  861707565 => 'Hefei, Anhui',
+  861707566 => 'Anqing, Anhui',
+  861707567 => 'Fuyang, Anhui',
+  861707568 => 'Fuyang, Anhui',
+  861707569 => 'Fuyang, Anhui',
+  86170757 => 'Hefei, Anhui',
+  86170758 => 'Hefei, Anhui',
+  861707590 => 'Quanzhou, Fujian',
+  861707591 => 'Quanzhou, Fujian',
+  861707592 => 'Quanzhou, Fujian',
+  861707593 => 'Quanzhou, Fujian',
+  861707594 => 'Quanzhou, Fujian',
+  861707595 => 'Fuzhou, Fujian',
+  861707596 => 'Fuzhou, Fujian',
+  861707597 => 'Fuzhou, Fujian',
+  861707598 => 'Putian, Fujian',
+  861707599 => 'Putian, Fujian',
+  86170760 => 'Jinan, Shandong',
+  86170761 => 'Jinan, Shandong',
+  861707620 => 'Jinan, Shandong',
+  861707621 => 'Jinan, Shandong',
+  861707622 => 'Jinan, Shandong',
+  861707623 => 'Jinan, Shandong',
+  861707624 => 'Jinan, Shandong',
+  861707625 => 'Jinan, Shandong',
+  861707626 => 'Jinan, Shandong',
+  861707627 => 'Jining, Shandong',
+  861707628 => 'Jining, Shandong',
+  861707629 => 'Jining, Shandong',
+  861707630 => 'Jining, Shandong',
+  861707631 => 'Jining, Shandong',
+  861707632 => 'Jining, Shandong',
+  861707633 => 'Jining, Shandong',
+  861707634 => 'Weifang, Shandong',
+  861707635 => 'Weifang, Shandong',
+  861707636 => 'Weifang, Shandong',
+  861707637 => 'Weifang, Shandong',
+  861707638 => 'Weifang, Shandong',
+  861707639 => 'Weifang, Shandong',
+  861707640 => 'Jinan, Shandong',
+  861707641 => 'Jinan, Shandong',
+  861707642 => 'Jinan, Shandong',
+  861707643 => 'Qingdao, Shandong',
+  861707644 => 'Qingdao, Shandong',
+  861707645 => 'Qingdao, Shandong',
+  861707646 => 'Weifang, Shandong',
+  861707647 => 'Jining, Shandong',
+  861707648 => 'Linyi, Shandong',
+  861707649 => 'Yantai, Shandong',
+  86170765 => 'Guangzhou, Guangdong',
+  86170766 => 'Guangzhou, Guangdong',
+  86170767 => 'Guangzhou, Guangdong',
+  86170768 => 'Guangzhou, Guangdong',
+  86170769 => 'Shenzhen, Guangdong',
+  86170770 => 'Nanning, Guangxi',
+  86170771 => 'Nanchang, Jiangxi',
+  861707720 => 'Ganzhou, Jiangxi',
+  861707721 => 'Ganzhou, Jiangxi',
+  861707722 => 'Ganzhou, Jiangxi',
+  861707723 => 'Ganzhou, Jiangxi',
+  861707724 => 'Ganzhou, Jiangxi',
+  861707725 => 'Ganzhou, Jiangxi',
+  861707726 => 'Ganzhou, Jiangxi',
+  861707727 => 'Ganzhou, Jiangxi',
+  861707728 => 'Yichun, Jiangxi',
+  861707729 => 'Yichun, Jiangxi',
+  861707730 => 'Yueyang, Hunan',
+  861707731 => 'Changsha, Hunan',
+  861707732 => 'Changsha, Hunan',
+  861707733 => 'Changsha, Hunan',
+  861707734 => 'Changsha, Hunan',
+  861707735 => 'Changsha, Hunan',
+  861707736 => 'Changsha, Hunan',
+  861707737 => 'Changsha, Hunan',
+  861707738 => 'Changsha, Hunan',
+  861707739 => 'Changsha, Hunan',
+  86170774 => 'Changsha, Hunan',
+  861707750 => 'Shangrao, Jiangxi',
+  861707751 => 'Shangrao, Jiangxi',
+  861707752 => 'Shangrao, Jiangxi',
+  861707753 => 'Shangrao, Jiangxi',
+  861707754 => 'Shangrao, Jiangxi',
+  861707755 => 'Shangrao, Jiangxi',
+  861707756 => 'Shangrao, Jiangxi',
+  861707757 => 'Jingdezhen, Jiangxi',
+  861707758 => 'Jingdezhen, Jiangxi',
+  861707759 => 'Jingdezhen, Jiangxi',
+  861707760 => 'Kunming, Yunnan',
+  861707761 => 'Kunming, Yunnan',
+  861707762 => 'Kunming, Yunnan',
+  861707763 => 'Kunming, Yunnan',
+  861707764 => 'Kunming, Yunnan',
+  861707765 => 'Yuxi, Yunnan',
+  861707766 => 'Yuxi, Yunnan',
+  861707767 => 'Yuxi, Yunnan',
+  861707768 => 'Yuxi, Yunnan',
+  861707769 => 'Yuxi, Yunnan',
+  86170777 => 'Shanghai',
+  86170778 => 'Ningbo, Zhejiang',
+  86170779 => 'Ningbo, Zhejiang',
+  86170780 => 'Chengdu, Sichuan',
+  86170781 => 'Chengdu, Sichuan',
+  86170782 => 'Haikou, Hainan',
+  861707830 => 'Zhaotong, Yunnan',
+  861707831 => 'Zhaotong, Yunnan',
+  861707832 => 'Zhaotong, Yunnan',
+  861707833 => 'Xishuangbanna, Yunnan',
+  861707834 => 'Zhaotong, Yunnan',
+  861707835 => 'Dali, Yunnan',
+  861707836 => 'Dali, Yunnan',
+  861707837 => 'Dali, Yunnan',
+  861707838 => 'Dali, Yunnan',
+  861707839 => 'Dali, Yunnan',
+  861707840 => 'Baoshan, Yunnan',
+  861707841 => 'Baoshan, Yunnan',
+  861707842 => 'Baoshan, Yunnan',
+  861707843 => 'Baoshan, Yunnan',
+  861707844 => 'Wenshan, Yunnan',
+  861707845 => 'Dehong, Yunnan',
+  861707846 => 'Dehong, Yunnan',
+  861707847 => 'Dehong, Yunnan',
+  861707848 => 'Wenshan, Yunnan',
+  861707849 => 'Wenshan, Yunnan',
+  86170785 => 'Guiyang, Guizhou',
+  861707860 => 'Qujing, Yunnan',
+  861707861 => 'Qujing, Yunnan',
+  861707862 => 'Qujing, Yunnan',
+  861707863 => 'Qujing, Yunnan',
+  861707864 => 'Qujing, Yunnan',
+  861707865 => 'Qujing, Yunnan',
+  861707866 => 'Chuxiong, Yunnan',
+  861707867 => 'Chuxiong, Yunnan',
+  861707868 => 'Chuxiong, Yunnan',
+  861707869 => 'Xishuangbanna, Yunnan',
+  861707870 => 'Honghe, Yunnan',
+  861707871 => 'Honghe, Yunnan',
+  861707872 => 'Honghe, Yunnan',
+  861707873 => 'Honghe, Yunnan',
+  861707874 => 'Honghe, Yunnan',
+  861707875 => 'Lijiang, Yunnan',
+  861707876 => 'Lijiang, Yunnan',
+  861707877 => 'Lijiang, Yunnan',
+  861707878 => 'Lijiang, Yunnan',
+  861707879 => 'Xishuangbanna, Yunnan',
+  86170788 => 'Hangzhou, Zhejiang',
+  86170789 => 'Wenzhou, Zhejiang',
+  86170790 => 'Hangzhou, Zhejiang',
+  861707910 => 'Ningbo, Zhejiang',
+  861707911 => 'Ningbo, Zhejiang',
+  861707912 => 'Ningbo, Zhejiang',
+  861707913 => 'Ningbo, Zhejiang',
+  861707914 => 'Ningbo, Zhejiang',
+  861707915 => 'Jinhua, Zhejiang',
+  861707916 => 'Jinhua, Zhejiang',
+  861707917 => 'Jinhua, Zhejiang',
+  861707918 => 'Jinhua, Zhejiang',
+  861707919 => 'Jinhua, Zhejiang',
+  861707920 => 'Lishui, Zhejiang',
+  861707921 => 'Lishui, Zhejiang',
+  861707922 => 'Jiaxing, Zhejiang',
+  861707923 => 'Jiaxing, Zhejiang',
+  861707924 => 'Jiaxing, Zhejiang',
+  861707925 => 'Zhoushan, Zhejiang',
+  861707926 => 'Zhoushan, Zhejiang',
+  861707927 => 'Zhoushan, Zhejiang',
+  861707928 => 'Zhoushan, Zhejiang',
+  861707929 => 'Zhoushan, Zhejiang',
+  86170793 => 'Lanzhou, Gansu',
+  861707940 => 'Luoyang, Henan',
+  861707941 => 'Luoyang, Henan',
+  861707942 => 'Luoyang, Henan',
+  861707943 => 'Zhumadian, Henan',
+  861707944 => 'Puyang, Henan',
+  861707945 => 'Zhengzhou, Henan',
+  861707946 => 'Zhengzhou, Henan',
+  861707947 => 'Zhengzhou, Henan',
+  861707948 => 'Zhengzhou, Henan',
+  861707949 => 'Anyang, Henan',
+  86170795 => 'Changzhou, Jiangsu',
+  861707960 => 'Taizhou, Zhejiang',
+  861707961 => 'Taizhou, Zhejiang',
+  861707962 => 'Taizhou, Zhejiang',
+  861707963 => 'Taizhou, Zhejiang',
+  861707964 => 'Taizhou, Zhejiang',
+  861707965 => 'Taizhou, Zhejiang',
+  861707966 => 'Taizhou, Zhejiang',
+  861707967 => 'Wenzhou, Zhejiang',
+  861707968 => 'Wenzhou, Zhejiang',
+  861707969 => 'Wenzhou, Zhejiang',
+  861707970 => 'Lishui, Zhejiang',
+  861707971 => 'Lishui, Zhejiang',
+  861707972 => 'Quzhou, Zhejiang',
+  861707973 => 'Quzhou, Zhejiang',
+  861707974 => 'Quzhou, Zhejiang',
+  861707975 => 'Quzhou, Zhejiang',
+  861707976 => 'Quzhou, Zhejiang',
+  861707977 => 'Quzhou, Zhejiang',
+  861707978 => 'Quzhou, Zhejiang',
+  861707979 => 'Quzhou, Zhejiang',
+  86170798 => 'Shaoxing, Zhejiang',
+  861707990 => 'Huzhou, Zhejiang',
+  861707991 => 'Huzhou, Zhejiang',
+  861707992 => 'Huzhou, Zhejiang',
+  861707993 => 'Huzhou, Zhejiang',
+  861707994 => 'Huzhou, Zhejiang',
+  861707995 => 'Huzhou, Zhejiang',
+  861707996 => 'Lishui, Zhejiang',
+  861707997 => 'Lishui, Zhejiang',
+  861707998 => 'Jiaxing, Zhejiang',
+  861707999 => 'Jiaxing, Zhejiang',
+  86170800 => 'Beijing',
+  86170801 => 'Beijing',
+  86170802 => 'Shenzhen, Guangdong',
+  86170803 => 'Shenzhen, Guangdong',
+  86170804 => 'Shenzhen, Guangdong',
+  86170805 => 'Nantong, Jiangsu',
+  86170806 => 'Shenzhen, Guangdong',
+  861708070 => 'Changsha, Hunan',
+  861708071 => 'Changsha, Hunan',
+  861708072 => 'Changsha, Hunan',
+  861708073 => 'Changsha, Hunan',
+  861708074 => 'Changsha, Hunan',
+  861708075 => 'Yueyang, Hunan',
+  861708076 => 'Yueyang, Hunan',
+  861708077 => 'Yueyang, Hunan',
+  861708078 => 'Yueyang, Hunan',
+  861708079 => 'Hengyang, Hunan',
+  86170808 => 'Shanghai',
+  861708090 => 'Shenzhen, Guangdong',
+  861708091 => 'Shenzhen, Guangdong',
+  861708092 => 'Shenzhen, Guangdong',
+  861708093 => 'Shenzhen, Guangdong',
+  861708094 => 'Shenzhen, Guangdong',
+  861708095 => 'Shenzhen, Guangdong',
+  861708096 => 'Shenzhen, Guangdong',
+  861708097 => 'Foshan, Guangdong',
+  861708098 => 'Foshan, Guangdong',
+  861708099 => 'Foshan, Guangdong',
+  86170810 => 'Beijing',
+  86170811 => 'Beijing',
+  86170812 => 'Tianjin',
+  86170813 => 'Shanghai',
+  86170814 => 'Shanghai',
+  86170815 => 'Wuxi, Jiangsu',
+  86170816 => 'Wuxi, Jiangsu',
+  86170817 => 'Shanghai',
+  86170818 => 'Dongguan, Guangdong',
+  861708190 => 'Xiamen, Fujian',
+  861708191 => 'Putian, Fujian',
+  861708192 => 'Putian, Fujian',
+  861708193 => 'Putian, Fujian',
+  861708194 => 'Xiamen, Fujian',
+  861708195 => 'Putian, Fujian',
+  861708196 => 'Zhangzhou, Fujian',
+  861708197 => 'Zhangzhou, Fujian',
+  861708198 => 'Zhangzhou, Fujian',
+  861708199 => 'Zhangzhou, Fujian',
+  86170820 => 'Dongguan, Guangdong',
+  86170821 => 'Shanghai',
+  86170822 => 'Tianjin',
+  86170823 => 'Chongqing',
+  86170824 => 'Shenyang, Liaoning',
+  861708250 => 'Nantong, Jiangsu',
+  861708251 => 'Nantong, Jiangsu',
+  861708252 => 'Nantong, Jiangsu',
+  861708253 => 'Nantong, Jiangsu',
+  861708254 => 'Nantong, Jiangsu',
+  861708255 => 'Nantong, Jiangsu',
+  861708256 => 'Nantong, Jiangsu',
+  861708257 => 'Nantong, Jiangsu',
+  861708258 => 'Nantong, Jiangsu',
+  861708259 => 'HuaiAn, Jiangsu',
+  861708260 => 'Xianning, Hubei',
+  861708261 => 'Jingmen, Hubei',
+  861708262 => 'Jingmen, Hubei',
+  861708263 => 'Jingmen, Hubei',
+  861708264 => 'Jingmen, Hubei',
+  861708265 => 'Jingmen, Hubei',
+  861708266 => 'Jingmen, Hubei',
+  861708267 => 'Wuhan, Hubei',
+  861708268 => 'Wuhan, Hubei',
+  861708269 => 'Wuhan, Hubei',
+  86170827 => 'Wuhan, Hubei',
+  86170828 => 'Chengdu, Sichuan',
+  86170829 => 'XiAn, Shaanxi',
+  861708300 => 'Handan, Hebei',
+  861708301 => 'Handan, Hebei',
+  861708302 => 'Handan, Hebei',
+  861708303 => 'Handan, Hebei',
+  861708304 => 'Handan, Hebei',
+  861708305 => 'Handan, Hebei',
+  861708306 => 'Shijiazhuang, Hebei',
+  861708307 => 'Shijiazhuang, Hebei',
+  861708308 => 'Shijiazhuang, Hebei',
+  861708309 => 'Shijiazhuang, Hebei',
+  861708310 => 'Handan, Hebei',
+  861708311 => 'Shijiazhuang, Hebei',
+  861708312 => 'Baoding, Hebei',
+  861708313 => 'Tangshan, Hebei',
+  861708314 => 'Tangshan, Hebei',
+  861708315 => 'Tangshan, Hebei',
+  861708316 => 'Cangzhou, Hebei',
+  861708317 => 'Cangzhou, Hebei',
+  861708318 => 'Cangzhou, Hebei',
+  861708319 => 'Cangzhou, Hebei',
+  861708320 => 'Baoding, Hebei',
+  861708321 => 'Baoding, Hebei',
+  861708322 => 'Baoding, Hebei',
+  861708323 => 'Baoding, Hebei',
+  861708324 => 'Baoding, Hebei',
+  861708325 => 'Baoding, Hebei',
+  861708326 => 'Baoding, Hebei',
+  861708327 => 'Cangzhou, Hebei',
+  861708328 => 'Cangzhou, Hebei',
+  861708329 => 'Cangzhou, Hebei',
+  861708330 => 'Tangshan, Hebei',
+  861708331 => 'Tangshan, Hebei',
+  861708332 => 'Tangshan, Hebei',
+  861708333 => 'Tangshan, Hebei',
+  861708334 => 'Tangshan, Hebei',
+  861708335 => 'Tangshan, Hebei',
+  861708336 => 'Shijiazhuang, Hebei',
+  861708337 => 'Shijiazhuang, Hebei',
+  861708338 => 'Shijiazhuang, Hebei',
+  861708339 => 'Shijiazhuang, Hebei',
+  861708340 => 'Datong, Shanxi',
+  861708341 => 'Datong, Shanxi',
+  861708342 => 'Datong, Shanxi',
+  861708343 => 'Datong, Shanxi',
+  861708344 => 'Datong, Shanxi',
+  861708345 => 'Changzhi, Shanxi',
+  861708346 => 'Changzhi, Shanxi',
+  861708347 => 'Changzhi, Shanxi',
+  861708348 => 'Changzhi, Shanxi',
+  861708349 => 'Changzhi, Shanxi',
+  861708350 => 'Datong, Shanxi',
+  861708351 => 'Taiyuan, Shanxi',
+  861708352 => 'Taiyuan, Shanxi',
+  861708353 => 'Taiyuan, Shanxi',
+  861708354 => 'Taiyuan, Shanxi',
+  861708355 => 'Taiyuan, Shanxi',
+  861708356 => 'Taiyuan, Shanxi',
+  861708357 => 'Taiyuan, Shanxi',
+  861708358 => 'Taiyuan, Shanxi',
+  861708359 => 'Taiyuan, Shanxi',
+  861708360 => 'Zhengzhou, Henan',
+  861708361 => 'Luoyang, Henan',
+  861708362 => 'Luoyang, Henan',
+  861708363 => 'Luoyang, Henan',
+  861708364 => 'Luoyang, Henan',
+  861708365 => 'Luoyang, Henan',
+  861708366 => 'Luoyang, Henan',
+  861708367 => 'Luoyang, Henan',
+  861708368 => 'Luoyang, Henan',
+  861708369 => 'Luoyang, Henan',
+  861708370 => 'Shangqiu, Henan',
+  861708371 => 'Zhengzhou, Henan',
+  861708372 => 'Anyang, Henan',
+  861708373 => 'Xinxiang, Henan',
+  861708374 => 'Xuchang, Henan',
+  861708375 => 'Pingdingshan, Henan',
+  861708376 => 'Xinyang, Henan',
+  861708377 => 'Nanyang, Henan',
+  861708378 => 'Zhengzhou, Henan',
+  861708379 => 'Luoyang, Henan',
+  861708380 => 'Xinxiang, Henan',
+  861708381 => 'Xinxiang, Henan',
+  861708382 => 'Xinxiang, Henan',
+  861708383 => 'Jiaozuo, Henan',
+  861708384 => 'Jiaozuo, Henan',
+  861708385 => 'Anyang, Henan',
+  861708386 => 'Zhengzhou, Henan',
+  861708387 => 'Hebi, Henan',
+  861708388 => 'Zhengzhou, Henan',
+  861708389 => 'Puyang, Henan',
+  861708390 => 'Jiaozuo, Henan',
+  861708391 => 'Jiaozuo, Henan',
+  861708392 => 'Hebi, Henan',
+  861708393 => 'Puyang, Henan',
+  861708394 => 'Zhoukou, Henan',
+  861708395 => 'Luohe, Henan',
+  861708396 => 'Zhumadian, Henan',
+  861708397 => 'Xinyang, Henan',
+  861708398 => 'Sanmenxia, Henan',
+  861708399 => 'Shangqiu, Henan',
+  86170840 => 'Dalian, Liaoning',
+  86170841 => 'Dalian, Liaoning',
+  861708420 => 'Lincang, Yunnan',
+  861708421 => 'Lincang, Yunnan',
+  861708422 => 'Lincang, Yunnan',
+  861708423 => 'Nujiang, Yunnan',
+  861708424 => 'Nujiang, Yunnan',
+  861708425 => 'Nujiang, Yunnan',
+  861708426 => 'Puer, Yunnan',
+  861708427 => 'Puer, Yunnan',
+  861708428 => 'Puer, Yunnan',
+  861708429 => 'Wenshan, Yunnan',
+  86170843 => 'Changchun, Jilin',
+  86170844 => 'Dongguan, Guangdong',
+  861708450 => 'Harbin, Heilongjiang',
+  861708451 => 'Harbin, Heilongjiang',
+  861708452 => 'Daqing, Heilongjiang',
+  861708453 => 'Daqing, Heilongjiang',
+  861708454 => 'Daqing, Heilongjiang',
+  861708455 => 'Daqing, Heilongjiang',
+  861708456 => 'Daqing, Heilongjiang',
+  861708457 => 'Daqing, Heilongjiang',
+  861708458 => 'Daqing, Heilongjiang',
+  861708459 => 'Daqing, Heilongjiang',
+  86170846 => 'Foshan, Guangdong',
+  861708470 => 'Hohhot, Inner Mongolia',
+  861708471 => 'Hohhot, Inner Mongolia',
+  861708472 => 'Hohhot, Inner Mongolia',
+  861708473 => 'Hohhot, Inner Mongolia',
+  861708474 => 'Hohhot, Inner Mongolia',
+  861708475 => 'Baotou, Inner Mongolia',
+  861708476 => 'Baotou, Inner Mongolia',
+  861708477 => 'Baotou, Inner Mongolia',
+  861708478 => 'Baotou, Inner Mongolia',
+  861708479 => 'Baotou, Inner Mongolia',
+  861708480 => 'Zhengzhou, Henan',
+  861708481 => 'Zhengzhou, Henan',
+  861708482 => 'Xinxiang, Henan',
+  861708483 => 'Xuchang, Henan',
+  861708484 => 'Pingdingshan, Henan',
+  861708485 => 'Luohe, Henan',
+  861708486 => 'Sanmenxia, Henan',
+  861708487 => 'Xinyang, Henan',
+  861708488 => 'Nanyang, Henan',
+  861708489 => 'Nanyang, Henan',
+  86170849 => 'Foshan, Guangdong',
+  86170850 => 'Suzhou, Jiangsu',
+  86170851 => 'Suzhou, Jiangsu',
+  86170852 => 'Suzhou, Jiangsu',
+  861708530 => 'Jinan, Shandong',
+  861708531 => 'Jinan, Shandong',
+  861708532 => 'Qingdao, Shandong',
+  861708533 => 'Yantai, Shandong',
+  861708534 => 'Yantai, Shandong',
+  861708535 => 'Yantai, Shandong',
+  861708536 => 'Weifang, Shandong',
+  861708537 => 'Jining, Shandong',
+  861708538 => 'Jining, Shandong',
+  861708539 => 'Linyi, Shandong',
+  86170854 => 'Hefei, Anhui',
+  861708550 => 'Hefei, Anhui',
+  861708551 => 'Hefei, Anhui',
+  861708552 => 'Hefei, Anhui',
+  861708553 => 'Wuhu, Anhui',
+  861708554 => 'Hefei, Anhui',
+  861708555 => 'Hefei, Anhui',
+  861708556 => 'Anqing, Anhui',
+  861708557 => 'Fuyang, Anhui',
+  861708558 => 'Fuyang, Anhui',
+  861708559 => 'Fuyang, Anhui',
+  861708560 => 'LuAn, Anhui',
+  861708561 => 'Hefei, Anhui',
+  861708562 => 'Hefei, Anhui',
+  861708563 => 'Anqing, Anhui',
+  861708564 => 'LuAn, Anhui',
+  861708565 => 'Anqing, Anhui',
+  861708566 => 'Anqing, Anhui',
+  861708567 => 'Fuyang, Anhui',
+  861708568 => 'Hefei, Anhui',
+  861708569 => 'Hefei, Anhui',
+  861708570 => 'Lianyungang, Jiangsu',
+  861708571 => 'Lianyungang, Jiangsu',
+  861708572 => 'Lianyungang, Jiangsu',
+  861708573 => 'Lianyungang, Jiangsu',
+  861708574 => 'Lianyungang, Jiangsu',
+  861708575 => 'Lianyungang, Jiangsu',
+  861708576 => 'Lianyungang, Jiangsu',
+  861708577 => 'HuaiAn, Jiangsu',
+  861708578 => 'HuaiAn, Jiangsu',
+  861708579 => 'HuaiAn, Jiangsu',
+  861708580 => 'Quanzhou, Fujian',
+  861708581 => 'Quanzhou, Fujian',
+  861708582 => 'Xiamen, Fujian',
+  861708583 => 'Xiamen, Fujian',
+  861708584 => 'Xiamen, Fujian',
+  861708585 => 'Xiamen, Fujian',
+  861708586 => 'Xiamen, Fujian',
+  861708587 => 'Xiamen, Fujian',
+  861708588 => 'Xiamen, Fujian',
+  861708589 => 'Xiamen, Fujian',
+  861708590 => 'Fuzhou, Fujian',
+  861708591 => 'Fuzhou, Fujian',
+  861708592 => 'Fuzhou, Fujian',
+  861708593 => 'Fuzhou, Fujian',
+  861708594 => 'Quanzhou, Fujian',
+  861708595 => 'Quanzhou, Fujian',
+  861708596 => 'Quanzhou, Fujian',
+  861708597 => 'Quanzhou, Fujian',
+  861708598 => 'Quanzhou, Fujian',
+  861708599 => 'Quanzhou, Fujian',
+  86170860 => 'Qingdao, Shandong',
+  86170861 => 'Qingdao, Shandong',
+  861708620 => 'Qingdao, Shandong',
+  861708621 => 'Qingdao, Shandong',
+  861708622 => 'Qingdao, Shandong',
+  861708623 => 'Qingdao, Shandong',
+  861708624 => 'Qingdao, Shandong',
+  861708625 => 'Qingdao, Shandong',
+  861708626 => 'Qingdao, Shandong',
+  861708627 => 'Linyi, Shandong',
+  861708628 => 'Linyi, Shandong',
+  861708629 => 'Linyi, Shandong',
+  86170863 => 'Linyi, Shandong',
+  861708640 => 'Wuxi, Jiangsu',
+  861708641 => 'Wuxi, Jiangsu',
+  861708642 => 'Wuxi, Jiangsu',
+  861708643 => 'Wuxi, Jiangsu',
+  861708644 => 'Wuxi, Jiangsu',
+  861708645 => 'Wuxi, Jiangsu',
+  861708646 => 'Yancheng, Jiangsu',
+  861708647 => 'Yancheng, Jiangsu',
+  861708648 => 'Changzhou, Jiangsu',
+  861708649 => 'Suzhou, Jiangsu',
+  861708650 => 'Weifang, Shandong',
+  861708651 => 'Weifang, Shandong',
+  861708652 => 'Weifang, Shandong',
+  861708653 => 'Weifang, Shandong',
+  861708654 => 'Weifang, Shandong',
+  861708655 => 'Weifang, Shandong',
+  861708656 => 'Weifang, Shandong',
+  861708657 => 'Weifang, Shandong',
+  861708658 => 'Yantai, Shandong',
+  861708659 => 'Yantai, Shandong',
+  86170866 => 'Yantai, Shandong',
+  86170867 => 'Huizhou, Guangdong',
+  86170868 => 'Huizhou, Guangdong',
+  86170869 => 'Jiangmen, Guangdong',
+  861708700 => 'Nanning, Guangxi',
+  861708701 => 'Nanning, Guangxi',
+  861708702 => 'Nanning, Guangxi',
+  861708703 => 'Guilin, Guangxi',
+  861708704 => 'Guilin, Guangxi',
+  861708705 => 'Guilin, Guangxi',
+  861708706 => 'Guilin, Guangxi',
+  861708707 => 'Guilin, Guangxi',
+  861708708 => 'Guilin, Guangxi',
+  861708709 => 'Guilin, Guangxi',
+  86170871 => 'Wuhan, Hubei',
+  861708720 => 'Jiujiang, Jiangxi',
+  861708721 => 'Jiujiang, Jiangxi',
+  861708722 => 'Jiujiang, Jiangxi',
+  861708723 => 'Jiujiang, Jiangxi',
+  861708724 => 'Jiujiang, Jiangxi',
+  861708725 => 'Jiujiang, Jiangxi',
+  861708726 => 'Jiujiang, Jiangxi',
+  861708727 => 'Yichun, Jiangxi',
+  861708728 => 'Yichun, Jiangxi',
+  861708729 => 'Yichun, Jiangxi',
+  86170873 => 'Changsha, Hunan',
+  861708740 => 'Hengyang, Hunan',
+  861708741 => 'Hengyang, Hunan',
+  861708742 => 'Hengyang, Hunan',
+  861708743 => 'Hengyang, Hunan',
+  861708744 => 'Hengyang, Hunan',
+  861708745 => 'Hengyang, Hunan',
+  861708746 => 'Shaoyang, Hunan',
+  861708747 => 'Shaoyang, Hunan',
+  861708748 => 'Shaoyang, Hunan',
+  861708749 => 'Shaoyang, Hunan',
+  861708750 => 'Fuzhou, Jiangxi',
+  861708751 => 'Fuzhou, Jiangxi',
+  861708752 => 'Fuzhou, Jiangxi',
+  861708753 => 'Fuzhou, Jiangxi',
+  861708754 => 'Fuzhou, Jiangxi',
+  861708755 => 'Nanchang, Jiangxi',
+  861708756 => 'Nanchang, Jiangxi',
+  861708757 => 'Nanchang, Jiangxi',
+  861708758 => 'Nanchang, Jiangxi',
+  861708759 => 'Nanchang, Jiangxi',
+  86170876 => 'Yangzhou, Jiangsu',
+  86170877 => 'Yancheng, Jiangsu',
+  86170878 => 'Xuzhou, Jiangsu',
+  861708790 => 'Taizhou, Jiangsu',
+  861708791 => 'Taizhou, Jiangsu',
+  861708792 => 'Taizhou, Jiangsu',
+  861708793 => 'Taizhou, Jiangsu',
+  861708794 => 'Taizhou, Jiangsu',
+  861708795 => 'Taizhou, Jiangsu',
+  861708796 => 'Taizhou, Jiangsu',
+  861708797 => 'Taizhou, Jiangsu',
+  861708798 => 'HuaiAn, Jiangsu',
+  861708799 => 'HuaiAn, Jiangsu',
+  861708800 => 'Chengdu, Sichuan',
+  861708801 => 'Chengdu, Sichuan',
+  861708802 => 'Chengdu, Sichuan',
+  861708803 => 'Chengdu, Sichuan',
+  861708804 => 'Leshan, Sichuan',
+  861708805 => 'Leshan, Sichuan',
+  861708806 => 'Leshan, Sichuan',
+  861708807 => 'Leshan, Sichuan',
+  861708808 => 'Leshan, Sichuan',
+  861708809 => 'Leshan, Sichuan',
+  86170881 => 'Chengdu, Sichuan',
+  86170882 => 'Haikou, Hainan',
+  86170883 => 'Chongqing',
+  861708840 => 'Pingxiang, Jiangxi',
+  861708841 => 'Pingxiang, Jiangxi',
+  861708842 => 'Pingxiang, Jiangxi',
+  861708843 => 'Pingxiang, Jiangxi',
+  861708844 => 'Xinyu, Jiangxi',
+  861708845 => 'Xinyu, Jiangxi',
+  861708846 => 'Xinyu, Jiangxi',
+  861708847 => 'Xinyu, Jiangxi',
+  861708848 => 'Jingdezhen, Jiangxi',
+  861708849 => 'Jingdezhen, Jiangxi',
+  86170885 => 'Guiyang, Guizhou',
+  86170886 => 'Kunming, Yunnan',
+  861708870 => 'Jiangmen, Guangdong',
+  861708871 => 'Jiangmen, Guangdong',
+  861708872 => 'Jiangmen, Guangdong',
+  861708873 => 'Jiangmen, Guangdong',
+  861708874 => 'Jiangmen, Guangdong',
+  861708875 => 'Maoming, Guangdong',
+  861708876 => 'Maoming, Guangdong',
+  861708877 => 'Maoming, Guangdong',
+  861708878 => 'Maoming, Guangdong',
+  861708879 => 'Maoming, Guangdong',
+  86170888 => 'Shantou, Guangdong',
+  86170889 => 'Shantou, Guangdong',
+  86170890 => 'Urumchi, Xinjiang',
+  861708910 => 'XiAn, Shaanxi',
+  861708911 => 'XiAn, Shaanxi',
+  861708912 => 'XiAn, Shaanxi',
+  861708913 => 'XiAn, Shaanxi',
+  861708914 => 'XiAn, Shaanxi',
+  861708915 => 'XiAn, Shaanxi',
+  861708916 => 'Yulin, Shaanxi',
+  861708917 => 'Yulin, Shaanxi',
+  861708918 => 'Yulin, Shaanxi',
+  861708919 => 'Yulin, Shaanxi',
+  861708920 => 'Maoming, Guangdong',
+  861708921 => 'Maoming, Guangdong',
+  861708922 => 'Shaoguan, Guangdong',
+  861708923 => 'Shaoguan, Guangdong',
+  861708924 => 'Shaoguan, Guangdong',
+  861708925 => 'Shaoguan, Guangdong',
+  861708926 => 'Shaoguan, Guangdong',
+  861708927 => 'Shaoguan, Guangdong',
+  861708928 => 'Zhanjiang, Guangdong',
+  861708929 => 'Zhanjiang, Guangdong',
+  861708930 => 'Zhanjiang, Guangdong',
+  861708931 => 'Zhanjiang, Guangdong',
+  861708932 => 'Zhanjiang, Guangdong',
+  861708933 => 'Zhanjiang, Guangdong',
+  861708934 => 'Zhanjiang, Guangdong',
+  861708935 => 'Zhaoqing, Guangdong',
+  861708936 => 'Zhaoqing, Guangdong',
+  861708937 => 'Zhaoqing, Guangdong',
+  861708938 => 'Zhaoqing, Guangdong',
+  861708939 => 'Zhaoqing, Guangdong',
+  861708940 => 'Zhaoqing, Guangdong',
+  861708941 => 'Zhaoqing, Guangdong',
+  861708942 => 'Zhongshan, Guangdong',
+  861708943 => 'Zhuhai, Guangdong',
+  861708944 => 'Zhuhai, Guangdong',
+  861708945 => 'Zhuhai, Guangdong',
+  861708946 => 'Zhuhai, Guangdong',
+  861708947 => 'Zhuhai, Guangdong',
+  861708948 => 'Zhuhai, Guangdong',
+  861708949 => 'Zhuhai, Guangdong',
+  86170895 => 'Yinchuan, Ningxia',
+  86170896 => 'Zhongshan, Guangdong',
+  86170897 => 'Zhongshan, Guangdong',
+  86170898 => 'Zhuhai, Guangdong',
+  86170899 => 'Zhuhai, Guangdong',
   86170900 => 'Beijing',
   86170901 => 'Beijing',
   86170902 => 'Huizhou, Guangdong',
diff --git a/src/libphonenumber/geocoding/data/en/86176.php b/src/libphonenumber/geocoding/data/en/86176.php
index 7dee0ba65..b71d8e605 100644
--- a/src/libphonenumber/geocoding/data/en/86176.php
+++ b/src/libphonenumber/geocoding/data/en/86176.php
@@ -641,11 +641,14 @@
   861760998 => 'Kashi, Xinjiang',
   861760999 => 'Ili, Xinjiang',
   8617610 => 'Beijing',
+  8617611 => 'Beijing',
+  86176120 => 'Guangzhou, Guangdong',
   86176121 => 'Shanghai',
   86176122 => 'Tianjin',
   86176123 => 'Chongqing',
   86176124 => 'Shenyang, Liaoning',
   86176125 => 'Nanjing, Jiangsu',
+  86176126 => 'Wuhan, Hubei',
   86176127 => 'Wuhan, Hubei',
   86176128 => 'Chengdu, Sichuan',
   861761290 => 'Xianyang, Shaanxi',
@@ -738,6 +741,16 @@
   861761477 => 'Ordos, Inner Mongolia',
   861761478 => 'Bayannur, Inner Mongolia',
   861761479 => 'Xilin, Inner Mongolia',
+  861761480 => 'Hohhot, Inner Mongolia',
+  861761481 => 'Hohhot, Inner Mongolia',
+  861761482 => 'Baotou, Inner Mongolia',
+  861761483 => 'Hohhot, Inner Mongolia',
+  861761484 => 'Ulanqab, Inner Mongolia',
+  861761485 => 'Tongliao, Inner Mongolia',
+  861761486 => 'Chifeng, Inner Mongolia',
+  861761487 => 'Chifeng, Inner Mongolia',
+  861761488 => 'Hohhot, Inner Mongolia',
+  861761489 => 'Hohhot, Inner Mongolia',
   8617615 => 'Dalian, Liaoning',
   8617617 => 'Beijing',
   86176200 => 'Guangzhou, Guangdong',
@@ -796,6 +809,426 @@
   861762549 => 'Changzhou, Jiangsu',
   86176255 => 'Suzhou, Jiangsu',
   86176256 => 'Suzhou, Jiangsu',
+  86176257 => 'Suzhou, Jiangsu',
+  861762580 => 'Suzhou, Jiangsu',
+  861762581 => 'Wuxi, Jiangsu',
+  861762582 => 'Wuxi, Jiangsu',
+  861762583 => 'Nantong, Jiangsu',
+  861762584 => 'Xuzhou, Jiangsu',
+  861762585 => 'Yangzhou, Jiangsu',
+  861762586 => 'Yangzhou, Jiangsu',
+  861762587 => 'Xuzhou, Jiangsu',
+  861762588 => 'Yancheng, Jiangsu',
+  861762589 => 'Changzhou, Jiangsu',
+  86176259 => 'Nanjing, Jiangsu',
+  8617628 => 'Chengdu, Sichuan',
+  8617629 => 'XiAn, Shaanxi',
+  861763300 => 'Tangshan, Hebei',
+  861763301 => 'Tangshan, Hebei',
+  861763302 => 'Tangshan, Hebei',
+  861763303 => 'Tangshan, Hebei',
+  861763304 => 'Tangshan, Hebei',
+  861763305 => 'Tangshan, Hebei',
+  861763306 => 'Langfang, Hebei',
+  861763307 => 'Handan, Hebei',
+  861763308 => 'Handan, Hebei',
+  861763309 => 'Handan, Hebei',
+  861763310 => 'Handan, Hebei',
+  861763311 => 'Shijiazhuang, Hebei',
+  861763312 => 'Baoding, Hebei',
+  861763313 => 'Zhangjiakou, Hebei',
+  861763314 => 'Chengde, Hebei',
+  861763315 => 'Tangshan, Hebei',
+  861763316 => 'Langfang, Hebei',
+  861763317 => 'Cangzhou, Hebei',
+  861763318 => 'Hengshui, Hebei',
+  861763319 => 'Xingtai, Hebei',
+  861763320 => 'Shijiazhuang, Hebei',
+  861763321 => 'Shijiazhuang, Hebei',
+  861763322 => 'Shijiazhuang, Hebei',
+  861763323 => 'Shijiazhuang, Hebei',
+  861763324 => 'Shijiazhuang, Hebei',
+  861763325 => 'Shijiazhuang, Hebei',
+  861763326 => 'Shijiazhuang, Hebei',
+  861763327 => 'Cangzhou, Hebei',
+  861763328 => 'Cangzhou, Hebei',
+  861763329 => 'Cangzhou, Hebei',
+  861763330 => 'Baoding, Hebei',
+  861763331 => 'Baoding, Hebei',
+  861763332 => 'Baoding, Hebei',
+  861763333 => 'Baoding, Hebei',
+  861763334 => 'Baoding, Hebei',
+  861763335 => 'Qinhuangdao, Hebei',
+  861763336 => 'Qinhuangdao, Hebei',
+  861763337 => 'Zhangjiakou, Hebei',
+  861763338 => 'Hengshui, Hebei',
+  861763339 => 'Handan, Hebei',
+  861763500 => 'Xinzhou, Shanxi',
+  861763501 => 'Xinzhou, Shanxi',
+  861763502 => 'Xinzhou, Shanxi',
+  861763503 => 'Xinzhou, Shanxi',
+  861763504 => 'Shuozhou, Shanxi',
+  861763505 => 'Shuozhou, Shanxi',
+  861763506 => 'Shuozhou, Shanxi',
+  861763507 => 'Jincheng, Shanxi',
+  861763508 => 'Jincheng, Shanxi',
+  861763509 => 'Jincheng, Shanxi',
+  86176351 => 'Taiyuan, Shanxi',
+  861763520 => 'Datong, Shanxi',
+  861763521 => 'Datong, Shanxi',
+  861763522 => 'Datong, Shanxi',
+  861763523 => 'Datong, Shanxi',
+  861763524 => 'Linfen, Shanxi',
+  861763525 => 'Linfen, Shanxi',
+  861763526 => 'Linfen, Shanxi',
+  861763527 => 'Linfen, Shanxi',
+  861763528 => 'Linfen, Shanxi',
+  861763529 => 'Yuncheng, Shanxi',
+  861763530 => 'Yangquan, Shanxi',
+  861763531 => 'Yangquan, Shanxi',
+  861763532 => 'Yangquan, Shanxi',
+  861763533 => 'Taiyuan, Shanxi',
+  861763534 => 'Taiyuan, Shanxi',
+  861763535 => 'Taiyuan, Shanxi',
+  861763536 => 'Taiyuan, Shanxi',
+  861763537 => 'Taiyuan, Shanxi',
+  861763538 => 'Taiyuan, Shanxi',
+  861763539 => 'Taiyuan, Shanxi',
+  861763540 => 'Jinzhong, Shanxi',
+  861763541 => 'Jinzhong, Shanxi',
+  861763542 => 'Jinzhong, Shanxi',
+  861763543 => 'Jinzhong, Shanxi',
+  861763544 => 'Jinzhong, Shanxi',
+  861763545 => 'Lüliang, Shanxi',
+  861763546 => 'Lüliang, Shanxi',
+  861763547 => 'Lüliang, Shanxi',
+  861763548 => 'Lüliang, Shanxi',
+  861763549 => 'Lüliang, Shanxi',
+  861763550 => 'Changzhi, Shanxi',
+  861763551 => 'Changzhi, Shanxi',
+  861763552 => 'Changzhi, Shanxi',
+  861763553 => 'Changzhi, Shanxi',
+  861763554 => 'Changzhi, Shanxi',
+  861763555 => 'Changzhi, Shanxi',
+  861763556 => 'Yuncheng, Shanxi',
+  861763557 => 'Yuncheng, Shanxi',
+  861763558 => 'Yuncheng, Shanxi',
+  861763559 => 'Yuncheng, Shanxi',
+  86176370 => 'Shangqiu, Henan',
+  86176371 => 'Zhengzhou, Henan',
+  86176372 => 'Anyang, Henan',
+  86176373 => 'Xinxiang, Henan',
+  86176375 => 'Pingdingshan, Henan',
+  86176376 => 'Xinyang, Henan',
+  86176377 => 'Nanyang, Henan',
+  86176378 => 'Zhengzhou, Henan',
+  8617638 => 'Zhengzhou, Henan',
+  86176390 => 'Xuchang, Henan',
+  86176391 => 'Jiaozuo, Henan',
+  86176392 => 'Hebi, Henan',
+  86176393 => 'Puyang, Henan',
+  86176395 => 'Luohe, Henan',
+  86176396 => 'Zhumadian, Henan',
+  86176397 => 'Zhoukou, Henan',
+  86176398 => 'Sanmenxia, Henan',
+  86176400 => 'Shenyang, Liaoning',
+  86176401 => 'Shenyang, Liaoning',
+  86176402 => 'Shenyang, Liaoning',
+  86176403 => 'Dalian, Liaoning',
+  861764040 => 'Dalian, Liaoning',
+  861764041 => 'Dalian, Liaoning',
+  861764042 => 'Dalian, Liaoning',
+  861764043 => 'Shenyang, Liaoning',
+  861764044 => 'Shenyang, Liaoning',
+  861764045 => 'Shenyang, Liaoning',
+  861764046 => 'Dandong, Liaoning',
+  861764047 => 'Dandong, Liaoning',
+  861764048 => 'Yingkou, Liaoning',
+  861764049 => 'Yingkou, Liaoning',
+  861764050 => 'Fuxin, Liaoning',
+  861764051 => 'Fuxin, Liaoning',
+  861764052 => 'Liaoyang, Liaoning',
+  861764053 => 'Liaoyang, Liaoning',
+  861764054 => 'Shenyang, Liaoning',
+  861764055 => 'Shenyang, Liaoning',
+  861764056 => 'Chaoyang, Liaoning',
+  861764057 => 'Chaoyang, Liaoning',
+  861764058 => 'Panjin, Liaoning',
+  861764059 => 'Panjin, Liaoning',
+  861764060 => 'Jinzhou, Liaoning',
+  861764061 => 'Jinzhou, Liaoning',
+  861764062 => 'Huludao, Liaoning',
+  861764063 => 'Huludao, Liaoning',
+  861764064 => 'Huludao, Liaoning',
+  861764065 => 'Anshan, Liaoning',
+  861764066 => 'Anshan, Liaoning',
+  861764067 => 'Anshan, Liaoning',
+  861764068 => 'Anshan, Liaoning',
+  861764069 => 'Anshan, Liaoning',
+  86176431 => 'Changchun, Jilin',
+  86176432 => 'Jilin, Jilin',
+  86176433 => 'Yanbian, Jilin',
+  86176434 => 'Siping, Jilin',
+  86176435 => 'Tonghua, Jilin',
+  86176450 => 'Harbin, Heilongjiang',
+  86176451 => 'Harbin, Heilongjiang',
+  861764520 => 'Qiqihar, Heilongjiang',
+  861764521 => 'Qiqihar, Heilongjiang',
+  861764522 => 'Qiqihar, Heilongjiang',
+  861764523 => 'Qiqihar, Heilongjiang',
+  861764524 => 'Qiqihar, Heilongjiang',
+  861764525 => 'Qiqihar, Heilongjiang',
+  861764526 => 'Shuangyashan, Heilongjiang',
+  861764527 => 'Shuangyashan, Heilongjiang',
+  861764528 => 'Shuangyashan, Heilongjiang',
+  861764529 => 'Shuangyashan, Heilongjiang',
+  861764530 => 'Mudanjiang, Heilongjiang',
+  861764531 => 'Mudanjiang, Heilongjiang',
+  861764532 => 'Mudanjiang, Heilongjiang',
+  861764533 => 'Mudanjiang, Heilongjiang',
+  861764534 => 'Qitaihe, Heilongjiang',
+  861764535 => 'Jixi, Heilongjiang',
+  861764536 => 'Jixi, Heilongjiang',
+  861764537 => 'Jixi, Heilongjiang',
+  861764538 => 'Hegang, Heilongjiang',
+  861764539 => 'Hegang, Heilongjiang',
+  861764540 => 'Jiamusi, Heilongjiang',
+  861764541 => 'Jiamusi, Heilongjiang',
+  861764542 => 'Jiamusi, Heilongjiang',
+  861764543 => 'Jiamusi, Heilongjiang',
+  861764544 => 'Jiamusi, Heilongjiang',
+  861764545 => 'Harbin, Heilongjiang',
+  861764546 => 'Daqing, Heilongjiang',
+  861764547 => 'Daqing, Heilongjiang',
+  861764548 => 'Daqing, Heilongjiang',
+  861764549 => 'Daqing, Heilongjiang',
+  861764550 => 'Suihua, Heilongjiang',
+  861764551 => 'Suihua, Heilongjiang',
+  861764552 => 'Suihua, Heilongjiang',
+  861764553 => 'Suihua, Heilongjiang',
+  861764554 => 'Harbin, Heilongjiang',
+  861764555 => 'Harbin, Heilongjiang',
+  861764556 => 'Heihe, Heilongjiang',
+  861764557 => 'Heihe, Heilongjiang',
+  861764558 => 'Yichun, Heilongjiang',
+  861764559 => 'Yichun, Heilongjiang',
+  86176600 => 'Jinan, Shandong',
+  861766010 => 'Jinan, Shandong',
+  861766011 => 'Jinan, Shandong',
+  861766012 => 'Jinan, Shandong',
+  861766013 => 'Jinan, Shandong',
+  861766014 => 'Jining, Shandong',
+  861766015 => 'Jining, Shandong',
+  861766016 => 'Jining, Shandong',
+  861766017 => 'Jining, Shandong',
+  861766018 => 'Jining, Shandong',
+  861766019 => 'Jining, Shandong',
+  861766020 => 'Laiwu, Shandong',
+  861766021 => 'Qingdao, Shandong',
+  861766022 => 'Qingdao, Shandong',
+  861766023 => 'Qingdao, Shandong',
+  861766024 => 'Qingdao, Shandong',
+  861766025 => 'TaiAn, Shandong',
+  861766026 => 'TaiAn, Shandong',
+  861766027 => 'Zibo, Shandong',
+  861766028 => 'Zibo, Shandong',
+  861766029 => 'Zibo, Shandong',
+  861766030 => 'Heze, Shandong',
+  861766031 => 'Heze, Shandong',
+  861766032 => 'Heze, Shandong',
+  861766033 => 'Heze, Shandong',
+  861766034 => 'Dongying, Shandong',
+  861766035 => 'Dongying, Shandong',
+  861766036 => 'Binzhou, Shandong',
+  861766037 => 'Binzhou, Shandong',
+  861766038 => 'Zaozhuang, Shandong',
+  861766039 => 'Zaozhuang, Shandong',
+  861766040 => 'Jinan, Shandong',
+  861766041 => 'Jinan, Shandong',
+  861766042 => 'Jinan, Shandong',
+  861766043 => 'Qingdao, Shandong',
+  861766044 => 'Qingdao, Shandong',
+  861766045 => 'Qingdao, Shandong',
+  861766046 => 'Yantai, Shandong',
+  861766047 => 'Yantai, Shandong',
+  861766048 => 'Weifang, Shandong',
+  861766049 => 'Linyi, Shandong',
+  861766050 => 'Rizhao, Shandong',
+  861766051 => 'Weihai, Shandong',
+  861766052 => 'Weihai, Shandong',
+  861766053 => 'TaiAn, Shandong',
+  861766054 => 'Linyi, Shandong',
+  861766055 => 'Linyi, Shandong',
+  861766056 => 'Linyi, Shandong',
+  861766057 => 'Linyi, Shandong',
+  861766058 => 'Linyi, Shandong',
+  861766059 => 'Linyi, Shandong',
+  86176606 => 'Qingdao, Shandong',
+  861766070 => 'Liaocheng, Shandong',
+  861766071 => 'Weifang, Shandong',
+  861766072 => 'Weifang, Shandong',
+  861766073 => 'Weifang, Shandong',
+  861766074 => 'Weifang, Shandong',
+  861766075 => 'Weifang, Shandong',
+  861766076 => 'Weifang, Shandong',
+  861766077 => 'Weifang, Shandong',
+  861766078 => 'Dongying, Shandong',
+  861766079 => 'Weihai, Shandong',
+  861766080 => 'Dezhou, Shandong',
+  861766081 => 'Dezhou, Shandong',
+  861766082 => 'Yantai, Shandong',
+  861766083 => 'Yantai, Shandong',
+  861766084 => 'Yantai, Shandong',
+  861766085 => 'Yantai, Shandong',
+  861766086 => 'Yantai, Shandong',
+  861766087 => 'Yantai, Shandong',
+  861766088 => 'Yantai, Shandong',
+  861766089 => 'Yantai, Shandong',
+  86176650 => 'Guangzhou, Guangdong',
+  86176651 => 'Guangzhou, Guangdong',
+  861766520 => 'Shenzhen, Guangdong',
+  861766521 => 'Shenzhen, Guangdong',
+  861766522 => 'Shenzhen, Guangdong',
+  861766523 => 'Shenzhen, Guangdong',
+  861766524 => 'Shenzhen, Guangdong',
+  861766525 => 'Shenzhen, Guangdong',
+  861766526 => 'Shenzhen, Guangdong',
+  861766527 => 'Shenzhen, Guangdong',
+  861766528 => 'Shenzhen, Guangdong',
+  861766529 => 'Zhanjiang, Guangdong',
+  86176653 => 'Shenzhen, Guangdong',
+  861766540 => 'Guangzhou, Guangdong',
+  861766541 => 'Guangzhou, Guangdong',
+  861766542 => 'Guangzhou, Guangdong',
+  861766543 => 'Guangzhou, Guangdong',
+  861766544 => 'Guangzhou, Guangdong',
+  861766545 => 'Guangzhou, Guangdong',
+  861766546 => 'Shenzhen, Guangdong',
+  861766547 => 'Shenzhen, Guangdong',
+  861766548 => 'Shenzhen, Guangdong',
+  861766549 => 'Shenzhen, Guangdong',
+  861766610 => 'Shenzhen, Guangdong',
+  861766611 => 'Shenzhen, Guangdong',
+  861766612 => 'Shenzhen, Guangdong',
+  861766613 => 'Shenzhen, Guangdong',
+  861766614 => 'Shenzhen, Guangdong',
+  861766615 => 'Foshan, Guangdong',
+  861766616 => 'Foshan, Guangdong',
+  861766617 => 'Foshan, Guangdong',
+  861766618 => 'Foshan, Guangdong',
+  861766619 => 'Foshan, Guangdong',
+  861766620 => 'Dongguan, Guangdong',
+  861766621 => 'Dongguan, Guangdong',
+  861766622 => 'Dongguan, Guangdong',
+  861766623 => 'Dongguan, Guangdong',
+  861766624 => 'Dongguan, Guangdong',
+  861766625 => 'Dongguan, Guangdong',
+  861766626 => 'Dongguan, Guangdong',
+  861766627 => 'Zhuhai, Guangdong',
+  861766628 => 'Huizhou, Guangdong',
+  861766629 => 'Shenzhen, Guangdong',
+  861766630 => 'Foshan, Guangdong',
+  861766631 => 'Foshan, Guangdong',
+  861766632 => 'Foshan, Guangdong',
+  861766633 => 'Foshan, Guangdong',
+  861766634 => 'Foshan, Guangdong',
+  861766635 => 'Foshan, Guangdong',
+  861766636 => 'Zhongshan, Guangdong',
+  861766637 => 'Zhongshan, Guangdong',
+  861766638 => 'Zhongshan, Guangdong',
+  861766639 => 'Jiangmen, Guangdong',
+  861766640 => 'Dongguan, Guangdong',
+  861766641 => 'Dongguan, Guangdong',
+  861766642 => 'Dongguan, Guangdong',
+  861766643 => 'Foshan, Guangdong',
+  861766644 => 'Foshan, Guangdong',
+  861766645 => 'Foshan, Guangdong',
+  861766646 => 'Foshan, Guangdong',
+  861766647 => 'Zhongshan, Guangdong',
+  861766648 => 'Zhongshan, Guangdong',
+  861766649 => 'Jiangmen, Guangdong',
+  861767100 => 'Wuhan, Hubei',
+  861767101 => 'Wuhan, Hubei',
+  861767102 => 'Wuhan, Hubei',
+  861767103 => 'Wuhan, Hubei',
+  861767104 => 'Huanggang, Hubei',
+  861767105 => 'Huanggang, Hubei',
+  861767106 => 'Huanggang, Hubei',
+  861767107 => 'Huanggang, Hubei',
+  861767108 => 'Huanggang, Hubei',
+  861767109 => 'Huanggang, Hubei',
+  861767110 => 'Huanggang, Hubei',
+  861767111 => 'Shiyan, Hubei',
+  861767112 => 'Shiyan, Hubei',
+  861767113 => 'Shiyan, Hubei',
+  861767114 => 'Shiyan, Hubei',
+  861767115 => 'Xiangfan, Hubei',
+  861767116 => 'Xiangfan, Hubei',
+  861767117 => 'Xiangfan, Hubei',
+  861767118 => 'Enshi, Hubei',
+  861767119 => 'Enshi, Hubei',
+  861767120 => 'Enshi, Hubei',
+  861767121 => 'Huangshi, Hubei',
+  861767122 => 'Huangshi, Hubei',
+  861767123 => 'Huangshi, Hubei',
+  861767124 => 'Huangshi, Hubei',
+  861767125 => 'Yichang, Hubei',
+  861767126 => 'Yichang, Hubei',
+  861767127 => 'Yichang, Hubei',
+  861767128 => 'Jingmen, Hubei',
+  861767129 => 'Jingmen, Hubei',
+  86176730 => 'Changsha, Hunan',
+  86176731 => 'Changsha, Hunan',
+  861767320 => 'Changsha, Hunan',
+  861767321 => 'Changsha, Hunan',
+  861767322 => 'Changsha, Hunan',
+  861767323 => 'Changsha, Hunan',
+  861767324 => 'Changsha, Hunan',
+  861767325 => 'Changsha, Hunan',
+  861767326 => 'Hengyang, Hunan',
+  861767327 => 'Hengyang, Hunan',
+  861767328 => 'Hengyang, Hunan',
+  861767329 => 'Hengyang, Hunan',
+  861767330 => 'Chenzhou, Hunan',
+  861767331 => 'Chenzhou, Hunan',
+  861767332 => 'Chenzhou, Hunan',
+  861767333 => 'Yiyang, Hunan',
+  861767334 => 'Yiyang, Hunan',
+  861767335 => 'Changde, Hunan',
+  861767336 => 'Changde, Hunan',
+  861767337 => 'Loudi, Hunan',
+  861767338 => 'Loudi, Hunan',
+  861767339 => 'Shaoyang, Hunan',
+  861767340 => 'Shaoyang, Hunan',
+  861767341 => 'Yongzhou, Hunan',
+  861767342 => 'Yongzhou, Hunan',
+  861767343 => 'Xiangxi, Hunan',
+  861767344 => 'Huaihua, Hunan',
+  861767345 => 'Yueyang, Hunan',
+  861767346 => 'Yueyang, Hunan',
+  861767347 => 'Yueyang, Hunan',
+  861767348 => 'Yueyang, Hunan',
+  861767349 => 'Yueyang, Hunan',
+  861767700 => 'Nanning, Guangxi',
+  861767701 => 'Nanning, Guangxi',
+  861767702 => 'Liuzhou, Guangxi',
+  861767703 => 'Guilin, Guangxi',
+  861767704 => 'Wuzhou, Guangxi',
+  861767705 => 'Yulin, Guangxi',
+  861767706 => 'Baise, Guangxi',
+  861767707 => 'Wuzhou, Guangxi',
+  861767708 => 'Hechi, Guangxi',
+  861767709 => 'Beihai, Guangxi',
+  861767900 => 'Nanchang, Jiangxi',
+  861767901 => 'Nanchang, Jiangxi',
+  861767902 => 'Jiujiang, Jiangxi',
+  861767903 => 'Shangrao, Jiangxi',
+  861767904 => 'Fuzhou, Jiangxi',
+  861767905 => 'Yichun, Jiangxi',
+  861767906 => 'JiAn, Jiangxi',
+  861767907 => 'Ganzhou, Jiangxi',
+  861767908 => 'Nanchang, Jiangxi',
+  861767909 => 'Shangrao, Jiangxi',
   86176800 => 'Changsha, Hunan',
   86176801 => 'Changsha, Hunan',
   861768020 => 'Changsha, Hunan',
@@ -912,6 +1345,36 @@
   861768197 => 'Wenzhou, Zhejiang',
   861768198 => 'Wenzhou, Zhejiang',
   861768199 => 'Ningbo, Zhejiang',
+  861768200 => 'Hefei, Anhui',
+  861768201 => 'Hefei, Anhui',
+  861768202 => 'Bengbu, Anhui',
+  861768203 => 'LuAn, Anhui',
+  861768204 => 'Hefei, Anhui',
+  861768205 => 'MaAnshan, Anhui',
+  861768206 => 'Anqing, Anhui',
+  861768207 => 'Fuyang, Anhui',
+  861768208 => 'Fuyang, Anhui',
+  861768209 => 'Fuyang, Anhui',
+  861768230 => 'Hangzhou, Zhejiang',
+  861768231 => 'Hangzhou, Zhejiang',
+  861768232 => 'Hangzhou, Zhejiang',
+  861768233 => 'Hangzhou, Zhejiang',
+  861768234 => 'Hangzhou, Zhejiang',
+  861768235 => 'Ningbo, Zhejiang',
+  861768236 => 'Ningbo, Zhejiang',
+  861768237 => 'Ningbo, Zhejiang',
+  861768238 => 'Ningbo, Zhejiang',
+  861768239 => 'Ningbo, Zhejiang',
+  861768240 => 'Taizhou, Zhejiang',
+  861768241 => 'Wenzhou, Zhejiang',
+  861768242 => 'Jinhua, Zhejiang',
+  861768243 => 'Huzhou, Zhejiang',
+  861768244 => 'Hangzhou, Zhejiang',
+  861768245 => 'Ningbo, Zhejiang',
+  861768246 => 'Ningbo, Zhejiang',
+  861768247 => 'Shaoxing, Zhejiang',
+  861768248 => 'Hangzhou, Zhejiang',
+  861768249 => 'Jiaxing, Zhejiang',
   861768300 => 'Luzhou, Sichuan',
   861768301 => 'Mianyang, Sichuan',
   861768302 => 'Neijiang, Sichuan',
@@ -932,6 +1395,16 @@
   861768317 => 'Nanchong, Sichuan',
   861768318 => 'Nanchong, Sichuan',
   861768319 => 'Dazhou, Sichuan',
+  861768320 => 'Dazhou, Sichuan',
+  861768321 => 'Nanchong, Sichuan',
+  861768322 => 'Nanchong, Sichuan',
+  861768323 => 'Nanchong, Sichuan',
+  861768324 => 'Chengdu, Sichuan',
+  861768325 => 'Mianyang, Sichuan',
+  861768326 => 'Mianyang, Sichuan',
+  861768327 => 'Mianyang, Sichuan',
+  861768328 => 'Chengdu, Sichuan',
+  861768329 => 'Dazhou, Sichuan',
   861768370 => 'Yichang, Hubei',
   861768371 => 'Yichang, Hubei',
   861768372 => 'Jingzhou, Hubei',
@@ -983,6 +1456,26 @@
   861768527 => 'Bijie, Guizhou',
   861768528 => 'Liupanshui, Guizhou',
   861768529 => 'Qianxinan, Guizhou',
+  861768530 => 'Guiyang, Guizhou',
+  861768531 => 'Guiyang, Guizhou',
+  861768532 => 'Zunyi, Guizhou',
+  861768533 => 'Qiannan, Guizhou',
+  861768534 => 'Guiyang, Guizhou',
+  861768535 => 'Qiandongnan, Guizhou',
+  861768536 => 'Tongren, Guizhou',
+  861768537 => 'Anshun, Guizhou',
+  861768538 => 'Qiannan, Guizhou',
+  861768539 => 'Tongren, Guizhou',
+  861768540 => 'Jinan, Shandong',
+  861768541 => 'Jinan, Shandong',
+  861768542 => 'Jinan, Shandong',
+  861768543 => 'Binzhou, Shandong',
+  861768544 => 'Qingdao, Shandong',
+  861768545 => 'Qingdao, Shandong',
+  861768546 => 'Dongying, Shandong',
+  861768547 => 'Qingdao, Shandong',
+  861768548 => 'Yantai, Shandong',
+  861768549 => 'Yantai, Shandong',
   86176855 => 'Qingdao, Shandong',
   86176856 => 'Zibo, Shandong',
   86176857 => 'Qingdao, Shandong',
@@ -1044,6 +1537,16 @@
   861768707 => 'Yuxi, Yunnan',
   861768708 => 'Chuxiong, Yunnan',
   861768709 => 'Puer, Yunnan',
+  861768710 => 'Kunming, Yunnan',
+  861768711 => 'Kunming, Yunnan',
+  861768712 => 'Kunming, Yunnan',
+  861768713 => 'Honghe, Yunnan',
+  861768714 => 'Qujing, Yunnan',
+  861768715 => 'Baoshan, Yunnan',
+  861768716 => 'Qujing, Yunnan',
+  861768717 => 'Kunming, Yunnan',
+  861768718 => 'Lijiang, Yunnan',
+  861768719 => 'Kunming, Yunnan',
   861768740 => 'Fangchenggang, Guangxi',
   861768741 => 'Nanning, Guangxi',
   861768742 => 'Liuzhou, Guangxi',
@@ -1180,7 +1683,38 @@
   861768947 => 'Quanzhou, Fujian',
   861768948 => 'Quanzhou, Fujian',
   861768949 => 'Quanzhou, Fujian',
+  861768950 => 'Lhasa, Tibet',
+  861768951 => 'Lhasa, Tibet',
+  861768952 => 'Xigaze, Tibet',
+  861768953 => 'Shannan, Tibet',
+  861768954 => 'Nyingchi, Tibet',
+  861768955 => 'Qamdo, Tibet',
+  861768956 => 'Nagqu, Tibet',
+  861768957 => 'Ngari, Tibet',
+  861768958 => 'Lhasa, Tibet',
+  861768959 => 'Lhasa, Tibet',
+  861768960 => 'Fuzhou, Fujian',
+  861768961 => 'Nanping, Fujian',
+  861768962 => 'Nanping, Fujian',
+  861768963 => 'Longyan, Fujian',
+  861768964 => 'Sanming, Fujian',
+  861768965 => 'Putian, Fujian',
+  861768966 => 'Ningde, Fujian',
+  861768967 => 'Quanzhou, Fujian',
+  861768968 => 'Quanzhou, Fujian',
+  861768969 => 'Quanzhou, Fujian',
+  86176897 => 'Haikou, Hainan',
   86176898 => 'Haikou, Hainan',
+  861768990 => 'Putian, Fujian',
+  861768991 => 'Ningde, Fujian',
+  861768992 => 'Zhangzhou, Fujian',
+  861768993 => 'Zhangzhou, Fujian',
+  861768994 => 'Xiamen, Fujian',
+  861768995 => 'Longyan, Fujian',
+  861768996 => 'Quanzhou, Fujian',
+  861768997 => 'Fuzhou, Fujian',
+  861768998 => 'Fuzhou, Fujian',
+  861768999 => 'Fuzhou, Fujian',
   86176910 => 'XiAn, Shaanxi',
   86176911 => 'XiAn, Shaanxi',
   861769120 => 'XiAn, Shaanxi',
@@ -1193,6 +1727,16 @@
   861769127 => 'Baoji, Shaanxi',
   861769128 => 'Shangluo, Shaanxi',
   861769129 => 'Tongchuan, Shaanxi',
+  861769130 => 'Yulin, Shaanxi',
+  861769131 => 'Yulin, Shaanxi',
+  861769132 => 'YanAn, Shaanxi',
+  861769133 => 'Weinan, Shaanxi',
+  861769134 => 'XiAn, Shaanxi',
+  861769135 => 'XiAn, Shaanxi',
+  861769136 => 'Shangluo, Shaanxi',
+  861769137 => 'Baoji, Shaanxi',
+  861769138 => 'Ankang, Shaanxi',
+  861769139 => 'XiAn, Shaanxi',
   861769200 => 'Handan, Hebei',
   861769201 => 'Handan, Hebei',
   861769202 => 'Handan, Hebei',
@@ -1257,6 +1801,16 @@
   861769308 => 'Tianshui, Gansu',
   861769309 => 'Longnan, Gansu',
   86176931 => 'Lanzhou, Gansu',
+  861769320 => 'Dingxi, Gansu',
+  861769321 => 'Lanzhou, Gansu',
+  861769322 => 'Lanzhou, Gansu',
+  861769323 => 'Lanzhou, Gansu',
+  861769324 => 'Lanzhou, Gansu',
+  861769325 => 'Lanzhou, Gansu',
+  861769326 => 'Zhangye, Gansu',
+  861769327 => 'Jiuquan, Gansu',
+  861769328 => 'Tianshui, Gansu',
+  861769329 => 'Lanzhou, Gansu',
   861769500 => 'Yinchuan, Ningxia',
   861769501 => 'Yinchuan, Ningxia',
   861769502 => 'Shizuishan, Ningxia',
@@ -1267,6 +1821,16 @@
   861769507 => 'Yinchuan, Ningxia',
   861769508 => 'Yinchuan, Ningxia',
   861769509 => 'Yinchuan, Ningxia',
+  861769510 => 'Yinchuan, Ningxia',
+  861769511 => 'Yinchuan, Ningxia',
+  861769512 => 'Shizuishan, Ningxia',
+  861769513 => 'Wuzhong, Ningxia',
+  861769514 => 'Guyuan, Ningxia',
+  861769515 => 'Zhongwei, Ningxia',
+  861769516 => 'Yinchuan, Ningxia',
+  861769517 => 'Yinchuan, Ningxia',
+  861769518 => 'Yinchuan, Ningxia',
+  861769519 => 'Yinchuan, Ningxia',
   86176960 => 'Taiyuan, Shanxi',
   861769610 => 'Taiyuan, Shanxi',
   861769611 => 'Taiyuan, Shanxi',
@@ -1298,6 +1862,16 @@
   861769707 => 'Haixi, Qinghai',
   861769708 => 'Xining, Qinghai',
   861769709 => 'Haixi, Qinghai',
+  861769710 => 'Xining, Qinghai',
+  861769711 => 'Xining, Qinghai',
+  861769712 => 'Haidong, Qinghai',
+  861769713 => 'Huangnan, Qinghai',
+  861769714 => 'Xining, Qinghai',
+  861769715 => 'Xining, Qinghai',
+  861769716 => 'Hainan, Qinghai',
+  861769717 => 'Xining, Qinghai',
+  861769718 => 'Xining, Qinghai',
+  861769719 => 'Haixi, Qinghai',
   861769800 => 'Xuchang, Henan',
   861769801 => 'Xuchang, Henan',
   861769802 => 'Xuchang, Henan',
@@ -1390,4 +1964,14 @@
   861769927 => 'Ili, Xinjiang',
   861769928 => 'Aksu, Xinjiang',
   861769929 => 'Aksu, Xinjiang',
+  861769930 => 'Kashi, Xinjiang',
+  861769931 => 'Kashi, Xinjiang',
+  861769932 => 'Hotan, Xinjiang',
+  861769933 => 'Urumchi, Xinjiang',
+  861769934 => 'Urumchi, Xinjiang',
+  861769935 => 'Changji, Xinjiang',
+  861769936 => 'Aksu, Xinjiang',
+  861769937 => 'Ili, Xinjiang',
+  861769938 => 'Ili, Xinjiang',
+  861769939 => 'Ili, Xinjiang',
 );
diff --git a/src/libphonenumber/geocoding/data/en/86177.php b/src/libphonenumber/geocoding/data/en/86177.php
index a7f500fe6..06e78c35d 100644
--- a/src/libphonenumber/geocoding/data/en/86177.php
+++ b/src/libphonenumber/geocoding/data/en/86177.php
@@ -695,6 +695,25 @@
   861770999 => 'Ili, Xinjiang',
   8617710 => 'Beijing',
   86177110 => 'Chengdu, Sichuan',
+  861771121 => 'Yibin, Sichuan',
+  861771122 => 'Yibin, Sichuan',
+  861771123 => 'Dazhou, Sichuan',
+  861771124 => 'Dazhou, Sichuan',
+  861771125 => 'Dazhou, Sichuan',
+  861771126 => 'Aba, Sichuan',
+  861771127 => 'Leshan, Sichuan',
+  861771128 => 'Chengdu, Sichuan',
+  861771129 => 'Chengdu, Sichuan',
+  861771130 => 'Chengdu, Sichuan',
+  861771131 => 'Chengdu, Sichuan',
+  861771132 => 'Chengdu, Sichuan',
+  861771133 => 'Bazhong, Sichuan',
+  861771134 => 'Chengdu, Sichuan',
+  861771135 => 'Chengdu, Sichuan',
+  861771136 => 'Chengdu, Sichuan',
+  861771137 => 'Chengdu, Sichuan',
+  861771138 => 'Chengdu, Sichuan',
+  861771139 => 'Chengdu, Sichuan',
   861771140 => 'Mianyang, Sichuan',
   861771141 => 'Nanchong, Sichuan',
   861771142 => 'Luzhou, Sichuan',
@@ -937,6 +956,16 @@
   861771428 => 'Suzhou, Jiangsu',
   861771429 => 'Suzhou, Jiangsu',
   86177143 => 'Nanjing, Jiangsu',
+  861771440 => 'Nanjing, Jiangsu',
+  861771441 => 'Nanjing, Jiangsu',
+  861771442 => 'Nanjing, Jiangsu',
+  861771443 => 'Suzhou, Jiangsu',
+  861771444 => 'Suzhou, Jiangsu',
+  861771445 => 'Suzhou, Jiangsu',
+  861771446 => 'Yancheng, Jiangsu',
+  861771447 => 'Wuxi, Jiangsu',
+  861771448 => 'Yangzhou, Jiangsu',
+  861771449 => 'Zhenjiang, Jiangsu',
   861771500 => 'Nantong, Jiangsu',
   861771501 => 'Nantong, Jiangsu',
   861771502 => 'Nantong, Jiangsu',
@@ -993,6 +1022,7 @@
   861771563 => 'HuaiAn, Jiangsu',
   861771564 => 'HuaiAn, Jiangsu',
   861771565 => 'HuaiAn, Jiangsu',
+  861771566 => 'Nanjing, Jiangsu',
   861771567 => 'Wuxi, Jiangsu',
   861771568 => 'Wuxi, Jiangsu',
   861771569 => 'Wuxi, Jiangsu',
@@ -1014,6 +1044,18 @@
   861771585 => 'Yangzhou, Jiangsu',
   861771586 => 'Yangzhou, Jiangsu',
   861771587 => 'Yangzhou, Jiangsu',
+  861771588 => 'Suzhou, Jiangsu',
+  861771589 => 'Suzhou, Jiangsu',
+  861771590 => 'Yancheng, Jiangsu',
+  861771591 => 'Yancheng, Jiangsu',
+  861771592 => 'Yancheng, Jiangsu',
+  861771593 => 'Yancheng, Jiangsu',
+  861771594 => 'Yancheng, Jiangsu',
+  861771595 => 'Changzhou, Jiangsu',
+  861771596 => 'Changzhou, Jiangsu',
+  861771597 => 'Zhenjiang, Jiangsu',
+  861771598 => 'Zhenjiang, Jiangsu',
+  861771599 => 'Zhenjiang, Jiangsu',
   861771610 => 'Chengdu, Sichuan',
   861771611 => 'Chengdu, Sichuan',
   861771612 => 'Chengdu, Sichuan',
@@ -1069,6 +1111,36 @@
   861771887 => 'Jiangmen, Guangdong',
   861771888 => 'Huizhou, Guangdong',
   861771889 => 'Huizhou, Guangdong',
+  861771900 => 'Shangqiu, Henan',
+  861771901 => 'Shangqiu, Henan',
+  861771902 => 'Shangqiu, Henan',
+  861771903 => 'Shangqiu, Henan',
+  861771904 => 'Shangqiu, Henan',
+  861771905 => 'Sanmenxia, Henan',
+  861771906 => 'Pingdingshan, Henan',
+  861771907 => 'Pingdingshan, Henan',
+  861771908 => 'Sanmenxia, Henan',
+  861771909 => 'Zhengzhou, Henan',
+  861771910 => 'Luohe, Henan',
+  861771911 => 'Zhoukou, Henan',
+  861771912 => 'Zhoukou, Henan',
+  861771913 => 'Luohe, Henan',
+  861771914 => 'Zhumadian, Henan',
+  861771915 => 'Zhumadian, Henan',
+  861771916 => 'Zhumadian, Henan',
+  861771917 => 'Zhumadian, Henan',
+  861771918 => 'Zhumadian, Henan',
+  861771919 => 'Zhumadian, Henan',
+  861771920 => 'Zhengzhou, Henan',
+  861771921 => 'Jiaozuo, Henan',
+  861771922 => 'Luoyang, Henan',
+  861771923 => 'Luoyang, Henan',
+  861771924 => 'Luoyang, Henan',
+  861771925 => 'Luoyang, Henan',
+  861771926 => 'Luoyang, Henan',
+  861771927 => 'Luoyang, Henan',
+  861771928 => 'Xinyang, Henan',
+  861771929 => 'Hebi, Henan',
   86177195 => 'XiAn, Shaanxi',
   861771960 => 'Baoji, Shaanxi',
   861771961 => 'Baoji, Shaanxi',
@@ -1101,7 +1173,69 @@
   861771997 => 'Shangqiu, Henan',
   861771998 => 'Jiaozuo, Henan',
   861771999 => 'Zhengzhou, Henan',
-  8617720 => 'Tianjin',
+  86177200 => 'Tianjin',
+  86177201 => 'Tianjin',
+  861772020 => 'Wuhan, Hubei',
+  861772021 => 'Wuhan, Hubei',
+  861772022 => 'Wuhan, Hubei',
+  861772023 => 'Ezhou, Hubei',
+  861772024 => 'Xiaogan, Hubei',
+  861772025 => 'Xiaogan, Hubei',
+  861772026 => 'Shiyan, Hubei',
+  861772027 => 'Suizhou, Hubei',
+  861772028 => 'Jingmen, Hubei',
+  861772029 => 'Huangshi, Hubei',
+  861772030 => 'Enshi, Hubei',
+  861772031 => 'Xianning, Hubei',
+  861772032 => 'Xianning, Hubei',
+  861772033 => 'Xianning, Hubei',
+  861772034 => 'Xianning, Hubei',
+  861772035 => 'Jingmen, Hubei',
+  861772036 => 'Jingmen, Hubei',
+  861772037 => 'Jingmen, Hubei',
+  861772038 => 'Jingmen, Hubei',
+  861772039 => 'Yichang, Hubei',
+  861772040 => 'Yichang, Hubei',
+  861772041 => 'Yichang, Hubei',
+  861772042 => 'Enshi, Hubei',
+  861772043 => 'Enshi, Hubei',
+  861772044 => 'Wuhan, Hubei',
+  861772045 => 'Ezhou, Hubei',
+  861772046 => 'Xiaogan, Hubei',
+  861772047 => 'Xiaogan, Hubei',
+  861772048 => 'Wuhan, Hubei',
+  861772049 => 'Wuhan, Hubei',
+  86177205 => 'Wuhan, Hubei',
+  861772060 => 'Quanzhou, Fujian',
+  861772061 => 'Quanzhou, Fujian',
+  861772062 => 'Quanzhou, Fujian',
+  861772063 => 'Quanzhou, Fujian',
+  861772064 => 'Quanzhou, Fujian',
+  861772065 => 'Quanzhou, Fujian',
+  861772066 => 'Ningde, Fujian',
+  861772067 => 'Ningde, Fujian',
+  861772068 => 'Nanping, Fujian',
+  861772069 => 'Nanping, Fujian',
+  861772070 => 'Nanping, Fujian',
+  861772071 => 'Fuzhou, Fujian',
+  861772072 => 'Fuzhou, Fujian',
+  861772073 => 'Fuzhou, Fujian',
+  861772074 => 'Fuzhou, Fujian',
+  861772075 => 'Fuzhou, Fujian',
+  861772076 => 'Fuzhou, Fujian',
+  861772077 => 'Fuzhou, Fujian',
+  861772078 => 'Fuzhou, Fujian',
+  861772079 => 'Fuzhou, Fujian',
+  861772080 => 'Fuzhou, Fujian',
+  861772081 => 'Fuzhou, Fujian',
+  861772082 => 'Putian, Fujian',
+  861772083 => 'Putian, Fujian',
+  861772084 => 'Putian, Fujian',
+  861772085 => 'Putian, Fujian',
+  861772086 => 'Xiamen, Fujian',
+  861772087 => 'Xiamen, Fujian',
+  861772088 => 'Xiamen, Fujian',
+  861772089 => 'Longyan, Fujian',
   86177210 => 'Shanghai',
   86177215 => 'Nanjing, Jiangsu',
   861772160 => 'Nantong, Jiangsu',
@@ -1124,6 +1258,26 @@
   861772177 => 'Xuzhou, Jiangsu',
   861772178 => 'Xuzhou, Jiangsu',
   861772179 => 'Xuzhou, Jiangsu',
+  861772180 => 'Nanchong, Sichuan',
+  861772181 => 'Nanchong, Sichuan',
+  861772182 => 'Nanchong, Sichuan',
+  861772183 => 'Chengdu, Sichuan',
+  861772184 => 'Chengdu, Sichuan',
+  861772185 => 'Deyang, Sichuan',
+  861772186 => 'Chengdu, Sichuan',
+  861772187 => 'Chengdu, Sichuan',
+  861772188 => 'Chengdu, Sichuan',
+  861772189 => 'Mianyang, Sichuan',
+  861772190 => 'Mianyang, Sichuan',
+  861772191 => 'Mianyang, Sichuan',
+  861772192 => 'Nanchong, Sichuan',
+  861772193 => 'Nanchong, Sichuan',
+  861772194 => 'Nanchong, Sichuan',
+  861772195 => 'Chengdu, Sichuan',
+  861772196 => 'Chengdu, Sichuan',
+  861772197 => 'Luzhou, Sichuan',
+  861772198 => 'Luzhou, Sichuan',
+  861772199 => 'Luzhou, Sichuan',
   861772200 => 'Yangjiang, Guangdong',
   861772201 => 'Meizhou, Guangdong',
   861772202 => 'Zhuhai, Guangdong',
@@ -1188,7 +1342,21 @@
   861772297 => 'Jieyang, Guangdong',
   861772298 => 'Yangjiang, Guangdong',
   861772299 => 'Heyuan, Guangdong',
-  8617723 => 'Chongqing',
+  86177230 => 'Chongqing',
+  86177231 => 'Chongqing',
+  86177232 => 'Chongqing',
+  861772340 => 'Bazhong, Sichuan',
+  861772341 => 'Bazhong, Sichuan',
+  861772342 => 'Dazhou, Sichuan',
+  861772343 => 'Guangyuan, Sichuan',
+  861772344 => 'Chengdu, Sichuan',
+  861772345 => 'Garze, Sichuan',
+  861772346 => 'Panzhihua, Sichuan',
+  861772347 => 'YaAn, Sichuan',
+  861772348 => 'YaAn, Sichuan',
+  861772349 => 'Chengdu, Sichuan',
+  86177235 => 'Chongqing',
+  86177236 => 'Chongqing',
   861772400 => 'Guangzhou, Guangdong',
   861772401 => 'Guangzhou, Guangdong',
   861772402 => 'Guangzhou, Guangdong',
@@ -1368,6 +1536,42 @@
   861772927 => 'Tongchuan, Shaanxi',
   861772928 => 'Yulin, Shaanxi',
   861772929 => 'XiAn, Shaanxi',
+  861772930 => 'Baoji, Shaanxi',
+  861772931 => 'Baoji, Shaanxi',
+  861772932 => 'Baoji, Shaanxi',
+  861772933 => 'Baoji, Shaanxi',
+  861772934 => 'Baoji, Shaanxi',
+  861772935 => 'Baoji, Shaanxi',
+  861772936 => 'Baoji, Shaanxi',
+  861772937 => 'Baoji, Shaanxi',
+  861772938 => 'XiAn, Shaanxi',
+  861772939 => 'XiAn, Shaanxi',
+  861772950 => 'XiAn, Shaanxi',
+  861772951 => 'XiAn, Shaanxi',
+  861772952 => 'Ankang, Shaanxi',
+  861772953 => 'YanAn, Shaanxi',
+  861772954 => 'YanAn, Shaanxi',
+  86177296 => 'Chongqing',
+  861772970 => 'Puyang, Henan',
+  861772971 => 'Puyang, Henan',
+  861772972 => 'Zhengzhou, Henan',
+  861772973 => 'Zhengzhou, Henan',
+  861772974 => 'Zhengzhou, Henan',
+  861772975 => 'Zhengzhou, Henan',
+  861772976 => 'Zhengzhou, Henan',
+  861772977 => 'Zhengzhou, Henan',
+  861772978 => 'Zhengzhou, Henan',
+  861772979 => 'Zhengzhou, Henan',
+  861772980 => 'Luzhou, Sichuan',
+  861772981 => 'Luzhou, Sichuan',
+  861772982 => 'Chengdu, Sichuan',
+  861772983 => 'Chengdu, Sichuan',
+  861772984 => 'Chengdu, Sichuan',
+  861772985 => 'Yibin, Sichuan',
+  861772986 => 'Nanchong, Sichuan',
+  861772987 => 'Chengdu, Sichuan',
+  861772988 => 'Nanchong, Sichuan',
+  861772989 => 'Deyang, Sichuan',
   861772990 => 'Huainan, Anhui',
   861772991 => 'Wuhu, Anhui',
   861772992 => 'Xuancheng, Anhui',
@@ -1379,6 +1583,11 @@
   861772998 => 'LuAn, Anhui',
   861772999 => 'Wuhu, Anhui',
   86177300 => 'Hefei, Anhui',
+  861773020 => 'Hefei, Anhui',
+  861773021 => 'Hefei, Anhui',
+  861773022 => 'Hefei, Anhui',
+  861773023 => 'Hefei, Anhui',
+  861773024 => 'Huaibei, Anhui',
   861773030 => 'Wuhu, Anhui',
   861773031 => 'Wuhu, Anhui',
   861773032 => 'Wuhu, Anhui',
@@ -1386,6 +1595,42 @@
   861773034 => 'Fuyang, Anhui',
   861773035 => 'Fuyang, Anhui',
   861773036 => 'Fuyang, Anhui',
+  861773040 => 'Wuhu, Anhui',
+  861773041 => 'Fuyang, Anhui',
+  861773042 => 'Suzhou, Anhui',
+  861773043 => 'MaAnshan, Anhui',
+  861773044 => 'Hefei, Anhui',
+  861773050 => 'Tangshan, Hebei',
+  861773051 => 'Tangshan, Hebei',
+  861773052 => 'Tangshan, Hebei',
+  861773053 => 'Cangzhou, Hebei',
+  861773054 => 'Tangshan, Hebei',
+  861773055 => 'Shijiazhuang, Hebei',
+  861773056 => 'Shijiazhuang, Hebei',
+  861773057 => 'Baoding, Hebei',
+  861773058 => 'Chengde, Hebei',
+  861773059 => 'Handan, Hebei',
+  86177306 => 'XiAn, Shaanxi',
+  861773070 => 'Weinan, Shaanxi',
+  861773071 => 'Weinan, Shaanxi',
+  861773072 => 'Weinan, Shaanxi',
+  861773073 => 'Weinan, Shaanxi',
+  861773074 => 'Hanzhong, Shaanxi',
+  861773075 => 'Hanzhong, Shaanxi',
+  861773076 => 'Hanzhong, Shaanxi',
+  861773077 => 'Hanzhong, Shaanxi',
+  861773078 => 'Yulin, Shaanxi',
+  861773079 => 'Yulin, Shaanxi',
+  861773080 => 'Anyang, Henan',
+  861773081 => 'Anyang, Henan',
+  861773082 => 'Pingdingshan, Henan',
+  861773083 => 'Xinyang, Henan',
+  861773084 => 'Xinyang, Henan',
+  861773085 => 'Xinyang, Henan',
+  861773086 => 'Xuchang, Henan',
+  861773087 => 'Xuchang, Henan',
+  861773088 => 'Xinxiang, Henan',
+  861773089 => 'Xinxiang, Henan',
   86177310 => 'Handan, Hebei',
   86177311 => 'Shijiazhuang, Hebei',
   86177312 => 'Baoding, Hebei',
@@ -1545,6 +1790,16 @@
   861773457 => 'Shijiazhuang, Hebei',
   861773458 => 'Shijiazhuang, Hebei',
   861773459 => 'Shijiazhuang, Hebei',
+  861773460 => 'Baoji, Shaanxi',
+  861773461 => 'Baoji, Shaanxi',
+  861773462 => 'XiAn, Shaanxi',
+  861773463 => 'XiAn, Shaanxi',
+  861773464 => 'Ankang, Shaanxi',
+  861773465 => 'Hanzhong, Shaanxi',
+  861773466 => 'Yulin, Shaanxi',
+  861773467 => 'Shangluo, Shaanxi',
+  861773468 => 'Weinan, Shaanxi',
+  861773469 => 'Weinan, Shaanxi',
   861773470 => 'Shangqiu, Henan',
   861773471 => 'Shangqiu, Henan',
   861773472 => 'Xuchang, Henan',
@@ -1783,7 +2038,69 @@
   861773977 => 'Zhengzhou, Henan',
   861773978 => 'Zhengzhou, Henan',
   861773979 => 'Zhengzhou, Henan',
-  8617740 => 'Shenyang, Liaoning',
+  86177398 => 'Lanzhou, Gansu',
+  86177399 => 'Lanzhou, Gansu',
+  86177400 => 'Shenyang, Liaoning',
+  861774010 => 'Suining, Sichuan',
+  861774011 => 'GuangAn, Sichuan',
+  861774012 => 'Luzhou, Sichuan',
+  861774013 => 'Mianyang, Sichuan',
+  861774014 => 'Mianyang, Sichuan',
+  861774015 => 'Nanchong, Sichuan',
+  861774016 => 'Nanchong, Sichuan',
+  861774017 => 'Chengdu, Sichuan',
+  861774018 => 'Chengdu, Sichuan',
+  861774019 => 'Chengdu, Sichuan',
+  861774020 => 'Chengdu, Sichuan',
+  861774021 => 'Chengdu, Sichuan',
+  861774022 => 'Chengdu, Sichuan',
+  861774023 => 'Leshan, Sichuan',
+  861774024 => 'Mianyang, Sichuan',
+  861774025 => 'Neijiang, Sichuan',
+  861774026 => 'Deyang, Sichuan',
+  861774027 => 'Nanchong, Sichuan',
+  861774028 => 'Yibin, Sichuan',
+  861774029 => 'Zigong, Sichuan',
+  861774030 => 'Xingtai, Hebei',
+  861774031 => 'Handan, Hebei',
+  861774032 => 'Handan, Hebei',
+  861774033 => 'Handan, Hebei',
+  861774034 => 'Handan, Hebei',
+  861774040 => 'Zhengzhou, Henan',
+  861774041 => 'Zhengzhou, Henan',
+  861774042 => 'Luoyang, Henan',
+  861774043 => 'Luoyang, Henan',
+  861774044 => 'Zhumadian, Henan',
+  861774045 => 'Zhoukou, Henan',
+  861774046 => 'Zhoukou, Henan',
+  861774047 => 'Shangqiu, Henan',
+  861774048 => 'Xinxiang, Henan',
+  861774049 => 'Anyang, Henan',
+  861774050 => 'Wuhan, Hubei',
+  861774051 => 'Wuhan, Hubei',
+  861774052 => 'Wuhan, Hubei',
+  861774053 => 'Wuhan, Hubei',
+  861774054 => 'Wuhan, Hubei',
+  861774055 => 'Enshi, Hubei',
+  861774056 => 'Xiangfan, Hubei',
+  861774057 => 'Xiangfan, Hubei',
+  861774058 => 'Xiangfan, Hubei',
+  861774059 => 'Xiangfan, Hubei',
+  861774060 => 'Jingmen, Hubei',
+  861774061 => 'Jingmen, Hubei',
+  861774062 => 'Huanggang, Hubei',
+  861774063 => 'Huanggang, Hubei',
+  861774064 => 'Huanggang, Hubei',
+  861774070 => 'Xigaze, Tibet',
+  861774071 => 'Lhasa, Tibet',
+  861774072 => 'Xigaze, Tibet',
+  861774073 => 'Shannan, Tibet',
+  861774074 => 'Nyingchi, Tibet',
+  861774075 => 'Qamdo, Tibet',
+  861774076 => 'Nagqu, Tibet',
+  861774077 => 'Ngari, Tibet',
+  861774078 => 'Lhasa, Tibet',
+  861774079 => 'Lhasa, Tibet',
   86177410 => 'Shenyang, Liaoning',
   86177411 => 'Dalian, Liaoning',
   86177412 => 'Anshan, Liaoning',
@@ -1807,6 +2124,16 @@
   861774247 => 'Ankang, Shaanxi',
   861774248 => 'Weinan, Shaanxi',
   861774249 => 'XiAn, Shaanxi',
+  861774250 => 'Yueyang, Hunan',
+  861774251 => 'Changsha, Hunan',
+  861774252 => 'Changsha, Hunan',
+  861774253 => 'Changsha, Hunan',
+  861774254 => 'Hengyang, Hunan',
+  861774255 => 'Chenzhou, Hunan',
+  861774256 => 'Changde, Hunan',
+  861774257 => 'Yiyang, Hunan',
+  861774258 => 'Loudi, Hunan',
+  861774259 => 'Shaoyang, Hunan',
   86177427 => 'Panjin, Liaoning',
   86177429 => 'Huludao, Liaoning',
   8617743 => 'Changchun, Jilin',
@@ -1830,6 +2157,7 @@
   861774437 => 'Deyang, Sichuan',
   861774438 => 'Leshan, Sichuan',
   861774439 => 'Liangshan, Sichuan',
+  86177445 => 'Beijing',
   86177451 => 'Harbin, Heilongjiang',
   861774550 => 'Suihua, Heilongjiang',
   861774551 => 'Suihua, Heilongjiang',
@@ -1842,7 +2170,27 @@
   861774558 => 'Daqing, Heilongjiang',
   861774559 => 'Daqing, Heilongjiang',
   86177456 => 'Harbin, Heilongjiang',
-  8617746 => 'Beijing',
+  861774600 => 'Quanzhou, Fujian',
+  861774601 => 'Quanzhou, Fujian',
+  861774602 => 'Quanzhou, Fujian',
+  861774603 => 'Ningde, Fujian',
+  861774604 => 'Xiamen, Fujian',
+  861774605 => 'Putian, Fujian',
+  861774606 => 'Nanping, Fujian',
+  861774607 => 'Fuzhou, Fujian',
+  861774608 => 'Fuzhou, Fujian',
+  861774609 => 'Fuzhou, Fujian',
+  86177465 => 'Beijing',
+  861774690 => 'Pingdingshan, Henan',
+  861774691 => 'Nanyang, Henan',
+  861774692 => 'Jiaozuo, Henan',
+  861774693 => 'Hebi, Henan',
+  861774694 => 'Sanmenxia, Henan',
+  861774695 => 'Puyang, Henan',
+  861774696 => 'Zhengzhou, Henan',
+  861774697 => 'Zhumadian, Henan',
+  861774698 => 'Luohe, Henan',
+  861774699 => 'Xuchang, Henan',
   86177470 => 'Hulun, Inner Mongolia',
   86177471 => 'Hohhot, Inner Mongolia',
   86177472 => 'Baotou, Inner Mongolia',
@@ -1915,6 +2263,7 @@
   861774927 => 'Baoji, Shaanxi',
   861774928 => 'XiAn, Shaanxi',
   861774929 => 'XiAn, Shaanxi',
+  86177493 => 'XiAn, Shaanxi',
   861774940 => 'Anyang, Henan',
   861774941 => 'Zhumadian, Henan',
   861774942 => 'Luohe, Henan',
@@ -1926,6 +2275,16 @@
   861774948 => 'Shangqiu, Henan',
   861774949 => 'Shangqiu, Henan',
   86177497 => 'Shanghai',
+  861774980 => 'Xingtai, Hebei',
+  861774981 => 'Shijiazhuang, Hebei',
+  861774982 => 'Shijiazhuang, Hebei',
+  861774983 => 'Cangzhou, Hebei',
+  861774984 => 'Tangshan, Hebei',
+  861774985 => 'Zhangjiakou, Hebei',
+  861774986 => 'Qinhuangdao, Hebei',
+  861774987 => 'Hengshui, Hebei',
+  861774988 => 'Baoding, Hebei',
+  861774989 => 'Baoding, Hebei',
   861775000 => 'Xiamen, Fujian',
   861775001 => 'Xiamen, Fujian',
   861775002 => 'Quanzhou, Fujian',
@@ -1989,6 +2348,7 @@
   861775069 => 'Zhangzhou, Fujian',
   86177507 => 'Quanzhou, Fujian',
   86177508 => 'Quanzhou, Fujian',
+  86177509 => 'Quanzhou, Fujian',
   861775100 => 'Nanjing, Jiangsu',
   861775101 => 'Nanjing, Jiangsu',
   861775102 => 'Nanjing, Jiangsu',
@@ -2062,6 +2422,56 @@
   861775197 => 'Xuzhou, Jiangsu',
   861775198 => 'Xuzhou, Jiangsu',
   861775199 => 'Xuzhou, Jiangsu',
+  861775200 => 'Dingxi, Gansu',
+  861775201 => 'Dingxi, Gansu',
+  861775202 => 'Dingxi, Gansu',
+  861775203 => 'Dingxi, Gansu',
+  861775204 => 'Pingliang, Gansu',
+  861775205 => 'Pingliang, Gansu',
+  861775206 => 'Pingliang, Gansu',
+  861775207 => 'Qingyang, Gansu',
+  861775208 => 'Qingyang, Gansu',
+  861775209 => 'Qingyang, Gansu',
+  861775260 => 'Xiangxi, Hunan',
+  861775261 => 'Xiangxi, Hunan',
+  861775262 => 'Xiangxi, Hunan',
+  861775263 => 'Xiangxi, Hunan',
+  861775264 => 'Zhangjiajie, Hunan',
+  861775265 => 'Zhangjiajie, Hunan',
+  861775266 => 'Shaoyang, Hunan',
+  861775267 => 'Shaoyang, Hunan',
+  861775268 => 'Loudi, Hunan',
+  861775269 => 'Loudi, Hunan',
+  861775270 => 'Yiyang, Hunan',
+  861775271 => 'Yiyang, Hunan',
+  861775272 => 'Changde, Hunan',
+  861775273 => 'Changde, Hunan',
+  861775274 => 'Chenzhou, Hunan',
+  861775275 => 'Chenzhou, Hunan',
+  861775276 => 'Hengyang, Hunan',
+  861775277 => 'Hengyang, Hunan',
+  861775278 => 'Changsha, Hunan',
+  861775279 => 'Changsha, Hunan',
+  861775280 => 'Changsha, Hunan',
+  861775281 => 'Changsha, Hunan',
+  861775282 => 'Yueyang, Hunan',
+  861775283 => 'Yueyang, Hunan',
+  861775284 => 'Changsha, Hunan',
+  861775285 => 'Changsha, Hunan',
+  861775286 => 'Changsha, Hunan',
+  861775287 => 'Changsha, Hunan',
+  861775288 => 'Changsha, Hunan',
+  861775289 => 'Changsha, Hunan',
+  861775290 => 'Handan, Hebei',
+  861775291 => 'Handan, Hebei',
+  861775292 => 'Handan, Hebei',
+  861775293 => 'Handan, Hebei',
+  861775294 => 'Handan, Hebei',
+  861775295 => 'Handan, Hebei',
+  861775296 => 'Handan, Hebei',
+  861775297 => 'Handan, Hebei',
+  861775298 => 'Handan, Hebei',
+  861775299 => 'Shijiazhuang, Hebei',
   86177530 => 'Heze, Shandong',
   86177531 => 'Jinan, Shandong',
   86177532 => 'Qingdao, Shandong',
@@ -2221,6 +2631,26 @@
   861776017 => 'Suining, Sichuan',
   861776018 => 'Chengdu, Sichuan',
   861776019 => 'Zigong, Sichuan',
+  861776080 => 'Suzhou, Anhui',
+  861776081 => 'Suzhou, Anhui',
+  861776082 => 'Bengbu, Anhui',
+  861776083 => 'Bengbu, Anhui',
+  861776084 => 'Bengbu, Anhui',
+  861776085 => 'Anqing, Anhui',
+  861776086 => 'Anqing, Anhui',
+  861776087 => 'Anqing, Anhui',
+  861776088 => 'Anqing, Anhui',
+  861776089 => 'Xuancheng, Anhui',
+  861776090 => 'YaAn, Sichuan',
+  861776091 => 'Panzhihua, Sichuan',
+  861776092 => 'Liangshan, Sichuan',
+  861776093 => 'Mianyang, Sichuan',
+  861776094 => 'Chengdu, Sichuan',
+  861776095 => 'Leshan, Sichuan',
+  861776096 => 'Chengdu, Sichuan',
+  861776097 => 'Deyang, Sichuan',
+  861776098 => 'Zigong, Sichuan',
+  861776099 => 'Chengdu, Sichuan',
   861776101 => 'Mianyang, Sichuan',
   861776102 => 'Mianyang, Sichuan',
   861776103 => 'Mianyang, Sichuan',
@@ -2258,7 +2688,32 @@
   861776147 => 'YaAn, Sichuan',
   861776148 => 'Bazhong, Sichuan',
   861776149 => 'Aba, Sichuan',
-  8617762 => 'Qingdao, Shandong',
+  861776160 => 'Nanyang, Henan',
+  861776161 => 'Nanyang, Henan',
+  861776162 => 'Nanyang, Henan',
+  861776163 => 'Hebi, Henan',
+  861776164 => 'Jiaozuo, Henan',
+  861776165 => 'Jiaozuo, Henan',
+  861776166 => 'Zhengzhou, Henan',
+  861776167 => 'Zhoukou, Henan',
+  861776168 => 'Jiaozuo, Henan',
+  861776169 => 'Puyang, Henan',
+  861776190 => 'Suzhou, Jiangsu',
+  861776191 => 'Suzhou, Jiangsu',
+  861776192 => 'Suzhou, Jiangsu',
+  861776193 => 'Suzhou, Jiangsu',
+  861776194 => 'Suzhou, Jiangsu',
+  861776195 => 'Nantong, Jiangsu',
+  861776196 => 'Nantong, Jiangsu',
+  861776197 => 'Yangzhou, Jiangsu',
+  861776198 => 'Yangzhou, Jiangsu',
+  861776199 => 'Yangzhou, Jiangsu',
+  86177620 => 'Qingdao, Shandong',
+  861776230 => 'Yichang, Hubei',
+  861776231 => 'Enshi, Hubei',
+  861776232 => 'Wuhan, Hubei',
+  861776233 => 'Wuhan, Hubei',
+  861776234 => 'Wuhan, Hubei',
   861776300 => 'Wuhan, Hubei',
   861776301 => 'Wuhan, Hubei',
   861776302 => 'Enshi, Hubei',
@@ -2275,7 +2730,28 @@
   861776412 => 'Wuhan, Hubei',
   861776413 => 'Shiyan, Hubei',
   861776414 => 'Jingzhou, Hubei',
+  861776430 => 'Fuyang, Anhui',
+  861776431 => 'Fuyang, Anhui',
+  861776432 => 'Wuhu, Anhui',
+  861776433 => 'Huangshan, Anhui',
+  861776434 => 'Anqing, Anhui',
+  861776435 => 'Xuancheng, Anhui',
+  861776436 => 'Tongling, Anhui',
+  861776437 => 'Chizhou, Anhui',
+  861776438 => 'Bengbu, Anhui',
+  861776439 => 'LuAn, Anhui',
   86177645 => 'Hangzhou, Zhejiang',
+  86177648 => 'Chongqing',
+  861776520 => 'Zhuhai, Guangdong',
+  861776521 => 'Zhuhai, Guangdong',
+  861776522 => 'Zhuhai, Guangdong',
+  861776523 => 'Zhuhai, Guangdong',
+  861776524 => 'Guangzhou, Guangdong',
+  861776525 => 'Guangzhou, Guangdong',
+  861776526 => 'Guangzhou, Guangdong',
+  861776527 => 'Guangzhou, Guangdong',
+  861776528 => 'Shenzhen, Guangdong',
+  861776529 => 'Shenzhen, Guangdong',
   861776560 => 'Foshan, Guangdong',
   861776561 => 'Foshan, Guangdong',
   861776562 => 'Foshan, Guangdong',
@@ -2296,6 +2772,38 @@
   861776577 => 'Jiangmen, Guangdong',
   861776578 => 'Jiangmen, Guangdong',
   861776579 => 'Jiangmen, Guangdong',
+  86177659 => 'Zhuhai, Guangdong',
+  861776600 => 'Yangzhou, Jiangsu',
+  861776601 => 'Taizhou, Jiangsu',
+  861776602 => 'Taizhou, Jiangsu',
+  861776603 => 'Taizhou, Jiangsu',
+  861776604 => 'Taizhou, Jiangsu',
+  861776605 => 'Nanjing, Jiangsu',
+  861776606 => 'Nanjing, Jiangsu',
+  861776607 => 'Nanjing, Jiangsu',
+  861776608 => 'Nanjing, Jiangsu',
+  861776609 => 'Nanjing, Jiangsu',
+  861776610 => 'Nanjing, Jiangsu',
+  861776611 => 'HuaiAn, Jiangsu',
+  861776612 => 'HuaiAn, Jiangsu',
+  861776613 => 'HuaiAn, Jiangsu',
+  861776614 => 'HuaiAn, Jiangsu',
+  861776615 => 'Suqian, Jiangsu',
+  861776616 => 'Wuxi, Jiangsu',
+  861776617 => 'Wuxi, Jiangsu',
+  861776618 => 'Wuxi, Jiangsu',
+  861776619 => 'Wuxi, Jiangsu',
+  86177666 => 'XiAn, Shaanxi',
+  861776670 => 'Dazhou, Sichuan',
+  861776671 => 'YaAn, Sichuan',
+  861776672 => 'Mianyang, Sichuan',
+  861776673 => 'Aba, Sichuan',
+  861776674 => 'Liangshan, Sichuan',
+  861776675 => 'Liangshan, Sichuan',
+  861776676 => 'Liangshan, Sichuan',
+  861776677 => 'Chengdu, Sichuan',
+  861776678 => 'Nanchong, Sichuan',
+  861776679 => 'Zigong, Sichuan',
   861776700 => 'Zhoushan, Zhejiang',
   861776701 => 'Zhoushan, Zhejiang',
   861776702 => 'Zhoushan, Zhejiang',
@@ -2307,6 +2815,26 @@
   861776708 => 'Hangzhou, Zhejiang',
   861776709 => 'Hangzhou, Zhejiang',
   86177671 => 'Hangzhou, Zhejiang',
+  861776720 => 'Hangzhou, Zhejiang',
+  861776721 => 'Hangzhou, Zhejiang',
+  861776722 => 'Hangzhou, Zhejiang',
+  861776723 => 'Hangzhou, Zhejiang',
+  861776724 => 'Hangzhou, Zhejiang',
+  861776725 => 'Hangzhou, Zhejiang',
+  861776726 => 'Hangzhou, Zhejiang',
+  861776727 => 'Hangzhou, Zhejiang',
+  861776728 => 'Lishui, Zhejiang',
+  861776729 => 'Lishui, Zhejiang',
+  861776730 => 'Ningbo, Zhejiang',
+  861776731 => 'Ningbo, Zhejiang',
+  861776732 => 'Ningbo, Zhejiang',
+  861776733 => 'Ningbo, Zhejiang',
+  861776734 => 'Ningbo, Zhejiang',
+  861776735 => 'Wenzhou, Zhejiang',
+  861776736 => 'Wenzhou, Zhejiang',
+  861776737 => 'Wenzhou, Zhejiang',
+  861776738 => 'Quzhou, Zhejiang',
+  861776739 => 'Quzhou, Zhejiang',
   861776740 => 'Urumchi, Xinjiang',
   861776741 => 'Urumchi, Xinjiang',
   861776742 => 'Hotan, Xinjiang',
@@ -2437,6 +2965,49 @@
   861776895 => 'Yancheng, Jiangsu',
   861776896 => 'Yancheng, Jiangsu',
   861776897 => 'Yancheng, Jiangsu',
+  861776898 => 'Xuzhou, Jiangsu',
+  861776899 => 'Lianyungang, Jiangsu',
+  86177690 => 'Shijiazhuang, Hebei',
+  861776920 => 'Zhangjiajie, Hunan',
+  861776921 => 'Zhangjiajie, Hunan',
+  861776922 => 'Huaihua, Hunan',
+  861776923 => 'Huaihua, Hunan',
+  861776924 => 'Huaihua, Hunan',
+  861776925 => 'Yongzhou, Hunan',
+  861776926 => 'Yongzhou, Hunan',
+  861776927 => 'Yongzhou, Hunan',
+  861776928 => 'Huaihua, Hunan',
+  861776929 => 'Yongzhou, Hunan',
+  861776930 => 'Yueyang, Hunan',
+  861776931 => 'Changsha, Hunan',
+  861776932 => 'Changsha, Hunan',
+  861776933 => 'Changsha, Hunan',
+  861776934 => 'Hengyang, Hunan',
+  861776935 => 'Chenzhou, Hunan',
+  861776936 => 'Changde, Hunan',
+  861776937 => 'Yiyang, Hunan',
+  861776938 => 'Loudi, Hunan',
+  861776939 => 'Shaoyang, Hunan',
+  861776960 => 'Jiaxing, Zhejiang',
+  861776961 => 'Jiaxing, Zhejiang',
+  861776962 => 'Jiaxing, Zhejiang',
+  861776963 => 'Jiaxing, Zhejiang',
+  861776964 => 'Jiaxing, Zhejiang',
+  861776965 => 'Huzhou, Zhejiang',
+  861776966 => 'Huzhou, Zhejiang',
+  861776967 => 'Huzhou, Zhejiang',
+  861776968 => 'Huzhou, Zhejiang',
+  861776969 => 'Zhoushan, Zhejiang',
+  861776970 => 'Shaoxing, Zhejiang',
+  861776971 => 'Shaoxing, Zhejiang',
+  861776972 => 'Shaoxing, Zhejiang',
+  861776973 => 'Shaoxing, Zhejiang',
+  861776974 => 'Shaoxing, Zhejiang',
+  861776975 => 'Jinhua, Zhejiang',
+  861776976 => 'Jinhua, Zhejiang',
+  861776977 => 'Taizhou, Zhejiang',
+  861776978 => 'Taizhou, Zhejiang',
+  861776979 => 'Zhoushan, Zhejiang',
   86177700 => 'Jiujiang, Jiangxi',
   861777010 => 'Ganzhou, Jiangxi',
   861777011 => 'Ganzhou, Jiangxi',
@@ -2453,6 +3024,7 @@
   86177704 => 'Fuzhou, Jiangxi',
   86177705 => 'Yichun, Jiangxi',
   86177706 => 'JiAn, Jiangxi',
+  86177708 => 'Nanchang, Jiangxi',
   861777100 => 'Xiangfan, Hubei',
   861777101 => 'Xiangfan, Hubei',
   861777102 => 'Xiangfan, Hubei',
@@ -2535,6 +3107,36 @@
   861777197 => 'Huanggang, Hubei',
   861777198 => 'Huanggang, Hubei',
   861777199 => 'Huanggang, Hubei',
+  861777200 => 'Liuzhou, Guangxi',
+  861777201 => 'Liuzhou, Guangxi',
+  861777202 => 'Liuzhou, Guangxi',
+  861777203 => 'Liuzhou, Guangxi',
+  861777204 => 'Qinzhou, Guangxi',
+  861777205 => 'Qinzhou, Guangxi',
+  861777206 => 'Qinzhou, Guangxi',
+  861777207 => 'Wuzhou, Guangxi',
+  861777208 => 'Wuzhou, Guangxi',
+  861777209 => 'Wuzhou, Guangxi',
+  861777250 => 'Baoding, Hebei',
+  861777251 => 'Baoding, Hebei',
+  861777252 => 'Baoding, Hebei',
+  861777253 => 'Baoding, Hebei',
+  861777254 => 'Qinhuangdao, Hebei',
+  861777255 => 'Qinhuangdao, Hebei',
+  861777256 => 'Qinhuangdao, Hebei',
+  861777257 => 'Qinhuangdao, Hebei',
+  861777258 => 'Qinhuangdao, Hebei',
+  861777259 => 'Qinhuangdao, Hebei',
+  861777260 => 'Xingtai, Hebei',
+  861777261 => 'Xingtai, Hebei',
+  861777262 => 'Xingtai, Hebei',
+  861777263 => 'Xingtai, Hebei',
+  861777264 => 'Cangzhou, Hebei',
+  861777265 => 'Cangzhou, Hebei',
+  861777266 => 'Langfang, Hebei',
+  861777267 => 'Cangzhou, Hebei',
+  861777268 => 'Cangzhou, Hebei',
+  861777269 => 'Cangzhou, Hebei',
   86177730 => 'Yueyang, Hunan',
   86177731 => 'Changsha, Hunan',
   86177732 => 'Changsha, Hunan',
@@ -2545,6 +3147,16 @@
   86177737 => 'Yiyang, Hunan',
   86177738 => 'Loudi, Hunan',
   86177739 => 'Shaoyang, Hunan',
+  861777400 => 'Hangzhou, Zhejiang',
+  861777401 => 'Hangzhou, Zhejiang',
+  861777402 => 'Wenzhou, Zhejiang',
+  861777403 => 'Wenzhou, Zhejiang',
+  861777404 => 'Huzhou, Zhejiang',
+  861777405 => 'Shaoxing, Zhejiang',
+  861777406 => 'Jinhua, Zhejiang',
+  861777407 => 'Jinhua, Zhejiang',
+  861777408 => 'Quzhou, Zhejiang',
+  861777409 => 'Taizhou, Zhejiang',
   86177743 => 'Xiangxi, Hunan',
   86177744 => 'Zhangjiajie, Hunan',
   86177745 => 'Huaihua, Hunan',
@@ -2559,6 +3171,36 @@
   861777477 => 'Qinzhou, Guangxi',
   861777478 => 'Hechi, Guangxi',
   861777479 => 'Beihai, Guangxi',
+  861777500 => 'Fuyang, Anhui',
+  861777501 => 'LuAn, Anhui',
+  861777502 => 'LuAn, Anhui',
+  861777503 => 'Hefei, Anhui',
+  861777504 => 'Hefei, Anhui',
+  861777505 => 'Hefei, Anhui',
+  861777506 => 'Suzhou, Anhui',
+  861777507 => 'Suzhou, Anhui',
+  861777508 => 'Suzhou, Anhui',
+  861777509 => 'Fuyang, Anhui',
+  861777520 => 'Huainan, Anhui',
+  861777521 => 'Huainan, Anhui',
+  861777522 => 'Huainan, Anhui',
+  861777523 => 'Chuzhou, Anhui',
+  861777524 => 'Chuzhou, Anhui',
+  861777525 => 'Wuhu, Anhui',
+  861777526 => 'Wuhu, Anhui',
+  861777527 => 'Wuhu, Anhui',
+  861777528 => 'Wuhu, Anhui',
+  861777529 => 'Wuhu, Anhui',
+  861777550 => 'Leshan, Sichuan',
+  861777551 => 'Guangyuan, Sichuan',
+  861777552 => 'Chengdu, Sichuan',
+  861777553 => 'GuangAn, Sichuan',
+  861777554 => 'Mianyang, Sichuan',
+  861777555 => 'Mianyang, Sichuan',
+  861777556 => 'Chengdu, Sichuan',
+  861777557 => 'Chengdu, Sichuan',
+  861777558 => 'Neijiang, Sichuan',
+  861777559 => 'Neijiang, Sichuan',
   86177758 => 'Changsha, Hunan',
   861777590 => 'Yueyang, Hunan',
   861777591 => 'Huaihua, Hunan',
@@ -2610,6 +3252,30 @@
   861777637 => 'Yulin, Guangxi',
   861777638 => 'Yulin, Guangxi',
   861777639 => 'Yulin, Guangxi',
+  861777640 => 'Hechi, Guangxi',
+  861777641 => 'Hechi, Guangxi',
+  861777642 => 'Yulin, Guangxi',
+  861777643 => 'Yulin, Guangxi',
+  861777644 => 'Liuzhou, Guangxi',
+  861777645 => 'Liuzhou, Guangxi',
+  861777646 => 'Guilin, Guangxi',
+  861777647 => 'Guilin, Guangxi',
+  861777648 => 'Nanning, Guangxi',
+  861777649 => 'Nanning, Guangxi',
+  861777650 => 'Guilin, Guangxi',
+  861777651 => 'Guilin, Guangxi',
+  861777652 => 'Guilin, Guangxi',
+  861777653 => 'Nanning, Guangxi',
+  861777654 => 'Nanning, Guangxi',
+  861777655 => 'Nanning, Guangxi',
+  861777656 => 'Nanning, Guangxi',
+  861777657 => 'Hechi, Guangxi',
+  861777658 => 'Hechi, Guangxi',
+  861777659 => 'Hechi, Guangxi',
+  86177766 => 'Nanning, Guangxi',
+  86177767 => 'Yulin, Guangxi',
+  86177768 => 'Haikou, Hainan',
+  86177769 => 'Haikou, Hainan',
   861777700 => 'Fangchenggang, Guangxi',
   861777701 => 'Fangchenggang, Guangxi',
   861777702 => 'Fangchenggang, Guangxi',
@@ -2621,6 +3287,8 @@
   86177774 => 'Wuzhou, Guangxi',
   86177775 => 'Yulin, Guangxi',
   86177776 => 'Baise, Guangxi',
+  86177777 => 'Beijing',
+  86177778 => 'Beijing',
   861777790 => 'Beihai, Guangxi',
   861777791 => 'Beihai, Guangxi',
   861777792 => 'Beihai, Guangxi',
@@ -2808,6 +3476,8 @@
   861778197 => 'Mianyang, Sichuan',
   861778198 => 'Mianyang, Sichuan',
   861778199 => 'Mianyang, Sichuan',
+  86177820 => 'Chongqing',
+  86177821 => 'Chongqing',
   86177822 => 'Chongqing',
   86177823 => 'Chongqing',
   86177824 => 'XiAn, Shaanxi',
@@ -2993,6 +3663,26 @@
   861778927 => 'Baoji, Shaanxi',
   861778928 => 'Baoji, Shaanxi',
   861778929 => 'Baoji, Shaanxi',
+  861778930 => 'Linxia, Gansu',
+  861778931 => 'Linxia, Gansu',
+  861778932 => 'Linxia, Gansu',
+  861778933 => 'Wuwei, Gansu',
+  861778934 => 'Wuwei, Gansu',
+  861778935 => 'Wuwei, Gansu',
+  861778936 => 'Zhangye, Gansu',
+  861778937 => 'Zhangye, Gansu',
+  861778938 => 'Zhangye, Gansu',
+  861778939 => 'Longnan, Gansu',
+  861778940 => 'Tianshui, Gansu',
+  861778941 => 'Gannan, Gansu',
+  861778942 => 'Baiyin, Gansu',
+  861778943 => 'Baiyin, Gansu',
+  861778944 => 'Baiyin, Gansu',
+  861778945 => 'Longnan, Gansu',
+  861778946 => 'Longnan, Gansu',
+  861778947 => 'Jiuquan, Gansu',
+  861778948 => 'Tianshui, Gansu',
+  861778949 => 'Tianshui, Gansu',
   861778950 => 'Linxia, Gansu',
   861778951 => 'Dingxi, Gansu',
   861778952 => 'Dingxi, Gansu',
@@ -3233,6 +3923,16 @@
   861779747 => 'Haixi, Qinghai',
   861779748 => 'Haixi, Qinghai',
   861779749 => 'Haixi, Qinghai',
+  861779770 => 'Xinxiang, Henan',
+  861779771 => 'Xuchang, Henan',
+  861779772 => 'Anyang, Henan',
+  861779773 => 'Zhengzhou, Henan',
+  861779774 => 'Zhengzhou, Henan',
+  861779775 => 'Zhengzhou, Henan',
+  861779776 => 'Zhengzhou, Henan',
+  861779777 => 'Zhengzhou, Henan',
+  861779778 => 'Shangqiu, Henan',
+  861779779 => 'Zhoukou, Henan',
   861779900 => 'Aksu, Xinjiang',
   861779901 => 'Tacheng, Xinjiang',
   861779902 => 'Hami, Xinjiang',
diff --git a/src/libphonenumber/geocoding/data/en/86178.php b/src/libphonenumber/geocoding/data/en/86178.php
index dfeb745d0..1cdb68976 100644
--- a/src/libphonenumber/geocoding/data/en/86178.php
+++ b/src/libphonenumber/geocoding/data/en/86178.php
@@ -318,7 +318,7 @@
   861780767 => 'Foshan, Guangdong',
   861780768 => 'Chaozhou, Guangdong',
   861780769 => 'Dongguan, Guangdong',
-  861780770 => 'Guilin, Guangxi',
+  861780770 => 'Baise, Guangxi',
   861780771 => 'Nanning, Guangxi',
   861780772 => 'Liuzhou, Guangxi',
   861780773 => 'Guilin, Guangxi',
@@ -658,6 +658,36 @@
   861782047 => 'Zhanjiang, Guangdong',
   861782048 => 'Meizhou, Guangdong',
   861782049 => 'Zhongshan, Guangdong',
+  861782050 => 'Guangzhou, Guangdong',
+  861782051 => 'Guangzhou, Guangdong',
+  861782052 => 'Guangzhou, Guangdong',
+  861782053 => 'Guangzhou, Guangdong',
+  861782054 => 'Guangzhou, Guangdong',
+  861782055 => 'Guangzhou, Guangdong',
+  861782056 => 'Guangzhou, Guangdong',
+  861782057 => 'Guangzhou, Guangdong',
+  861782058 => 'Shenzhen, Guangdong',
+  861782059 => 'Guangzhou, Guangdong',
+  861782060 => 'Shenzhen, Guangdong',
+  861782061 => 'Foshan, Guangdong',
+  861782062 => 'Shenzhen, Guangdong',
+  861782063 => 'Shenzhen, Guangdong',
+  861782064 => 'Shenzhen, Guangdong',
+  861782065 => 'Shenzhen, Guangdong',
+  861782066 => 'Shenzhen, Guangdong',
+  861782067 => 'Shenzhen, Guangdong',
+  861782068 => 'Guangzhou, Guangdong',
+  861782069 => 'Shenzhen, Guangdong',
+  861782070 => 'Guangzhou, Guangdong',
+  861782071 => 'Guangzhou, Guangdong',
+  861782072 => 'Guangzhou, Guangdong',
+  861782073 => 'Shenzhen, Guangdong',
+  861782074 => 'Shenzhen, Guangdong',
+  861782075 => 'Shantou, Guangdong',
+  861782076 => 'Huizhou, Guangdong',
+  861782077 => 'Huizhou, Guangdong',
+  861782078 => 'Shenzhen, Guangdong',
+  861782079 => 'Shenzhen, Guangdong',
   86178222 => 'Tianjin',
   861782280 => 'Qiandongnan, Guizhou',
   861782281 => 'Qiandongnan, Guizhou',
@@ -1444,15 +1474,15 @@
   86178780 => 'Yulin, Guangxi',
   86178781 => 'Yulin, Guangxi',
   86178782 => 'Liuzhou, Guangxi',
-  861787830 => 'Guilin, Guangxi',
+  861787830 => 'Hechi, Guangxi',
   861787831 => 'Wuzhou, Guangxi',
-  861787832 => 'Wuzhou, Guangxi',
-  861787833 => 'Wuzhou, Guangxi',
-  861787834 => 'Beihai, Guangxi',
-  861787835 => 'Beihai, Guangxi',
-  861787836 => 'Beihai, Guangxi',
-  861787837 => 'Beihai, Guangxi',
-  861787838 => 'Beihai, Guangxi',
+  861787832 => 'Yulin, Guangxi',
+  861787833 => 'Yulin, Guangxi',
+  861787834 => 'Yulin, Guangxi',
+  861787835 => 'Yulin, Guangxi',
+  861787836 => 'Yulin, Guangxi',
+  861787837 => 'Yulin, Guangxi',
+  861787838 => 'Yulin, Guangxi',
   861787839 => 'Beihai, Guangxi',
   861787840 => 'Wuzhou, Guangxi',
   861787841 => 'Wuzhou, Guangxi',
@@ -1477,7 +1507,7 @@
   861787896 => 'Beihai, Guangxi',
   861787897 => 'Beihai, Guangxi',
   861787898 => 'Beihai, Guangxi',
-  861787899 => 'Liuzhou, Guangxi',
+  861787899 => 'Wuzhou, Guangxi',
   86178793 => 'Shangrao, Jiangxi',
   86178794 => 'Nanchang, Jiangxi',
   86178795 => 'Yichun, Jiangxi',
diff --git a/src/libphonenumber/geocoding/data/en/86181.php b/src/libphonenumber/geocoding/data/en/86181.php
index b9f3159c8..86ee5845a 100644
--- a/src/libphonenumber/geocoding/data/en/86181.php
+++ b/src/libphonenumber/geocoding/data/en/86181.php
@@ -2666,6 +2666,16 @@
   861814317 => 'Liaoyuan, Jilin',
   861814318 => 'Songyuan, Jilin',
   861814319 => 'Baishan, Jilin',
+  861814320 => 'Xigaze, Tibet',
+  861814321 => 'Lhasa, Tibet',
+  861814322 => 'Xigaze, Tibet',
+  861814323 => 'Shannan, Tibet',
+  861814324 => 'Nyingchi, Tibet',
+  861814325 => 'Qamdo, Tibet',
+  861814326 => 'Nagqu, Tibet',
+  861814327 => 'Nagqu, Tibet',
+  861814328 => 'Lhasa, Tibet',
+  861814329 => 'Lhasa, Tibet',
   861814330 => 'Zhangjiajie, Hunan',
   861814331 => 'Yongzhou, Hunan',
   861814332 => 'Loudi, Hunan',
diff --git a/src/libphonenumber/geocoding/data/en/86184.php b/src/libphonenumber/geocoding/data/en/86184.php
index 3b0752eb3..aa59d4fa3 100644
--- a/src/libphonenumber/geocoding/data/en/86184.php
+++ b/src/libphonenumber/geocoding/data/en/86184.php
@@ -629,7 +629,10 @@
   861840999 => 'Ili, Xinjiang',
   8618410 => 'Beijing',
   8618411 => 'Beijing',
-  8618413 => 'Hangzhou, Zhejiang',
+  86184136 => 'Quzhou, Zhejiang',
+  86184137 => 'Hangzhou, Zhejiang',
+  86184138 => 'Hangzhou, Zhejiang',
+  86184139 => 'Hangzhou, Zhejiang',
   86184140 => 'Hangzhou, Zhejiang',
   86184141 => 'Hangzhou, Zhejiang',
   86184142 => 'Hangzhou, Zhejiang',
@@ -1638,7 +1641,16 @@
   861845897 => 'Shaoxing, Zhejiang',
   861845898 => 'Shaoxing, Zhejiang',
   861845899 => 'Shaoxing, Zhejiang',
-  86184590 => 'Quanzhou, Fujian',
+  861845900 => 'Quanzhou, Fujian',
+  861845901 => 'Fuzhou, Fujian',
+  861845902 => 'Quanzhou, Fujian',
+  861845903 => 'Quanzhou, Fujian',
+  861845904 => 'Quanzhou, Fujian',
+  861845905 => 'Fuzhou, Fujian',
+  861845906 => 'Quanzhou, Fujian',
+  861845907 => 'Quanzhou, Fujian',
+  861845908 => 'Quanzhou, Fujian',
+  861845909 => 'Quanzhou, Fujian',
   86184591 => 'Fuzhou, Fujian',
   86184592 => 'Xiamen, Fujian',
   86184593 => 'Ningde, Fujian',
diff --git a/src/libphonenumber/geocoding/data/en/86185.php b/src/libphonenumber/geocoding/data/en/86185.php
index 947344722..d622a6b55 100644
--- a/src/libphonenumber/geocoding/data/en/86185.php
+++ b/src/libphonenumber/geocoding/data/en/86185.php
@@ -806,6 +806,9 @@
   861852574 => 'Huludao, Liaoning',
   861852575 => 'Huludao, Liaoning',
   861852576 => 'Huludao, Liaoning',
+  861852577 => 'Anshan, Liaoning',
+  861852578 => 'Anshan, Liaoning',
+  861852579 => 'Anshan, Liaoning',
   8618526 => 'Tianjin',
   86185270 => 'Wuhan, Hubei',
   861852710 => 'Wuhan, Hubei',
@@ -838,6 +841,7 @@
   861852737 => 'Huanggang, Hubei',
   861852738 => 'Huanggang, Hubei',
   861852739 => 'Huanggang, Hubei',
+  8618528 => 'Beijing',
   861852900 => 'Jieyang, Guangdong',
   861852901 => 'Jieyang, Guangdong',
   861852902 => 'Jieyang, Guangdong',
@@ -853,6 +857,16 @@
   86185293 => 'Guangzhou, Guangdong',
   86185294 => 'Guangzhou, Guangdong',
   86185295 => 'Shenzhen, Guangdong',
+  861852960 => 'Zhuhai, Guangdong',
+  861852961 => 'Zhuhai, Guangdong',
+  861852962 => 'Zhuhai, Guangdong',
+  861852963 => 'Zhuhai, Guangdong',
+  861852964 => 'Zhuhai, Guangdong',
+  861852965 => 'Zhuhai, Guangdong',
+  861852966 => 'Zhuhai, Guangdong',
+  861852967 => 'Jieyang, Guangdong',
+  861852968 => 'Jieyang, Guangdong',
+  861852969 => 'Jieyang, Guangdong',
   86185300 => 'Zhengzhou, Henan',
   861853010 => 'Kaifeng, Henan',
   861853011 => 'Kaifeng, Henan',
@@ -1023,7 +1037,16 @@
   861853397 => 'Tangshan, Hebei',
   861853398 => 'Tangshan, Hebei',
   861853399 => 'Tangshan, Hebei',
-  86185340 => 'Taiyuan, Shanxi',
+  861853400 => 'Taiyuan, Shanxi',
+  861853401 => 'Shuozhou, Shanxi',
+  861853402 => 'Shuozhou, Shanxi',
+  861853403 => 'Changzhi, Shanxi',
+  861853404 => 'Changzhi, Shanxi',
+  861853405 => 'Changzhi, Shanxi',
+  861853406 => 'Changzhi, Shanxi',
+  861853407 => 'Changzhi, Shanxi',
+  861853408 => 'Changzhi, Shanxi',
+  861853409 => 'Linfen, Shanxi',
   861853410 => 'Changzhi, Shanxi',
   861853411 => 'Changzhi, Shanxi',
   861853412 => 'Changzhi, Shanxi',
@@ -1106,6 +1129,7 @@
   86185357 => 'Linfen, Shanxi',
   86185358 => 'Lüliang, Shanxi',
   86185359 => 'Yuncheng, Shanxi',
+  86185360 => 'Linfen, Shanxi',
   861853650 => 'Shuozhou, Shanxi',
   861853651 => 'Jinzhong, Shanxi',
   861853652 => 'Jinzhong, Shanxi',
@@ -1268,6 +1292,9 @@
   861854007 => 'Shenyang, Liaoning',
   861854008 => 'Benxi, Liaoning',
   861854009 => 'Shenyang, Liaoning',
+  86185401 => 'Shenyang, Liaoning',
+  86185402 => 'Shenyang, Liaoning',
+  86185403 => 'Shenyang, Liaoning',
   861854300 => 'Changchun, Jilin',
   861854301 => 'Changchun, Jilin',
   861854302 => 'Tonghua, Jilin',
@@ -1367,8 +1394,20 @@
   861854653 => 'Harbin, Heilongjiang',
   861854654 => 'Harbin, Heilongjiang',
   861854655 => 'Harbin, Heilongjiang',
+  861854656 => 'Heihe, Heilongjiang',
+  861854657 => 'Heihe, Heilongjiang',
+  861854658 => 'Daqing, Heilongjiang',
+  861854659 => 'Daqing, Heilongjiang',
   861854660 => 'Hegang, Heilongjiang',
   861854661 => 'Harbin, Heilongjiang',
+  861854662 => 'Harbin, Heilongjiang',
+  861854663 => 'Harbin, Heilongjiang',
+  861854664 => 'Daqing, Heilongjiang',
+  861854665 => 'Daqing, Heilongjiang',
+  861854666 => 'Daqing, Heilongjiang',
+  861854667 => 'Daqing, Heilongjiang',
+  861854668 => 'Daqing, Heilongjiang',
+  861854669 => 'Daqing, Heilongjiang',
   86185467 => 'Qitaihe, Heilongjiang',
   861854690 => 'Shuangyashan, Heilongjiang',
   861854691 => 'Heihe, Heilongjiang',
@@ -1766,6 +1805,26 @@
   861855617 => 'HuaiAn, Jiangsu',
   861855618 => 'Nanjing, Jiangsu',
   861855619 => 'Nanjing, Jiangsu',
+  861855620 => 'Yangzhou, Jiangsu',
+  861855621 => 'Yangzhou, Jiangsu',
+  861855622 => 'Yangzhou, Jiangsu',
+  861855623 => 'Yangzhou, Jiangsu',
+  861855624 => 'Suqian, Jiangsu',
+  861855625 => 'Suqian, Jiangsu',
+  861855626 => 'Suqian, Jiangsu',
+  861855627 => 'Suqian, Jiangsu',
+  861855628 => 'Yangzhou, Jiangsu',
+  861855629 => 'Yangzhou, Jiangsu',
+  861855630 => 'Wuhu, Anhui',
+  861855631 => 'Wuhu, Anhui',
+  861855632 => 'Wuhu, Anhui',
+  861855633 => 'Wuhu, Anhui',
+  861855634 => 'Hefei, Anhui',
+  861855635 => 'Hefei, Anhui',
+  861855636 => 'Hefei, Anhui',
+  861855637 => 'Hefei, Anhui',
+  861855638 => 'Hefei, Anhui',
+  861855639 => 'Hefei, Anhui',
   861855650 => 'Hefei, Anhui',
   861855651 => 'Hefei, Anhui',
   861855652 => 'Hefei, Anhui',
@@ -2948,6 +3007,16 @@
   861857932 => 'Shangrao, Jiangxi',
   861857933 => 'Shangrao, Jiangxi',
   861857934 => 'Yichun, Jiangxi',
+  861857940 => 'Liuzhou, Guangxi',
+  861857941 => 'Liuzhou, Guangxi',
+  861857942 => 'Liuzhou, Guangxi',
+  861857943 => 'Guilin, Guangxi',
+  861857944 => 'Guilin, Guangxi',
+  861857945 => 'Nanning, Guangxi',
+  861857946 => 'Nanning, Guangxi',
+  861857947 => 'Nanning, Guangxi',
+  861857948 => 'Nanning, Guangxi',
+  861857949 => 'Nanning, Guangxi',
   86185795 => 'Yongzhou, Hunan',
   861857960 => 'JiAn, Jiangxi',
   861857961 => 'JiAn, Jiangxi',
@@ -3442,6 +3511,12 @@
   861858941 => 'Nagqu, Tibet',
   861858942 => 'Ngari, Tibet',
   861858943 => 'Shannan, Tibet',
+  861858944 => 'Nyingchi, Tibet',
+  861858945 => 'Qamdo, Tibet',
+  861858946 => 'Nagqu, Tibet',
+  861858947 => 'Ngari, Tibet',
+  861858948 => 'Lhasa, Tibet',
+  861858949 => 'Lhasa, Tibet',
   86185895 => 'Haikou, Hainan',
   86185896 => 'Haikou, Hainan',
   86185897 => 'Chongqing',
@@ -3605,6 +3680,27 @@
   861859317 => 'Qujing, Yunnan',
   861859318 => 'Qujing, Yunnan',
   861859319 => 'Qujing, Yunnan',
+  861859320 => 'Yulin, Guangxi',
+  861859321 => 'Yulin, Guangxi',
+  861859322 => 'Liuzhou, Guangxi',
+  861859323 => 'Guilin, Guangxi',
+  861859324 => 'Nanning, Guangxi',
+  861859325 => 'Nanning, Guangxi',
+  861859326 => 'Liuzhou, Guangxi',
+  861859327 => 'Guilin, Guangxi',
+  861859328 => 'Guilin, Guangxi',
+  861859329 => 'Guilin, Guangxi',
+  86185933 => 'Changsha, Hunan',
+  861859340 => 'Changsha, Hunan',
+  861859341 => 'Hengyang, Hunan',
+  861859342 => 'Hengyang, Hunan',
+  861859343 => 'Hengyang, Hunan',
+  861859344 => 'Hengyang, Hunan',
+  861859345 => 'Hengyang, Hunan',
+  861859346 => 'Hengyang, Hunan',
+  861859347 => 'Shaoyang, Hunan',
+  861859348 => 'Shaoyang, Hunan',
+  861859349 => 'Shaoyang, Hunan',
   861859350 => 'Putian, Fujian',
   861859351 => 'Ningde, Fujian',
   861859352 => 'Ningde, Fujian',
@@ -3959,6 +4055,16 @@
   861859947 => 'Bayingolin, Xinjiang',
   861859948 => 'Kashi, Xinjiang',
   861859949 => 'Ili, Xinjiang',
+  861859950 => 'Sanming, Fujian',
+  861859951 => 'Nanping, Fujian',
+  861859952 => 'Nanping, Fujian',
+  861859953 => 'Fuzhou, Fujian',
+  861859954 => 'Quanzhou, Fujian',
+  861859955 => 'Quanzhou, Fujian',
+  861859956 => 'Zhangzhou, Fujian',
+  861859957 => 'Putian, Fujian',
+  861859958 => 'Putian, Fujian',
+  861859959 => 'Ningde, Fujian',
   861859990 => 'Mianyang, Sichuan',
   861859991 => 'Nanchong, Sichuan',
   861859992 => 'Bazhong, Sichuan',
diff --git a/src/libphonenumber/geocoding/data/en/86186.php b/src/libphonenumber/geocoding/data/en/86186.php
index 643a08690..275026adb 100644
--- a/src/libphonenumber/geocoding/data/en/86186.php
+++ b/src/libphonenumber/geocoding/data/en/86186.php
@@ -806,6 +806,18 @@
   86186141 => 'Beijing',
   86186142 => 'Beijing',
   86186143 => 'Beijing',
+  86186144 => 'Beijing',
+  861861450 => 'Harbin, Heilongjiang',
+  861861451 => 'Harbin, Heilongjiang',
+  861861452 => 'Suihua, Heilongjiang',
+  861861453 => 'Suihua, Heilongjiang',
+  861861454 => 'Suihua, Heilongjiang',
+  861861455 => 'Suihua, Heilongjiang',
+  861861456 => 'Suihua, Heilongjiang',
+  861861457 => 'Suihua, Heilongjiang',
+  861861458 => 'Suihua, Heilongjiang',
+  861861459 => 'Suihua, Heilongjiang',
+  86186146 => 'Beijing',
   861861470 => 'Hulun, Inner Mongolia',
   861861471 => 'Hohhot, Inner Mongolia',
   861861472 => 'Baotou, Inner Mongolia',
@@ -898,6 +910,7 @@
   861861577 => 'Chengdu, Sichuan',
   861861578 => 'Chengdu, Sichuan',
   861861579 => 'Chengdu, Sichuan',
+  86186158 => 'Beijing',
   861861590 => 'Weifang, Shandong',
   861861591 => 'Weifang, Shandong',
   861861592 => 'Jining, Shandong',
@@ -1906,6 +1919,16 @@
   86186444 => 'Shanghai',
   86186445 => 'Shanghai',
   86186446 => 'Shanghai',
+  861864480 => 'Siping, Jilin',
+  861864481 => 'Siping, Jilin',
+  861864482 => 'Siping, Jilin',
+  861864483 => 'Siping, Jilin',
+  861864484 => 'Siping, Jilin',
+  861864485 => 'Siping, Jilin',
+  861864486 => 'Tonghua, Jilin',
+  861864487 => 'Tonghua, Jilin',
+  861864488 => 'Tonghua, Jilin',
+  861864489 => 'Tonghua, Jilin',
   861864490 => 'Siping, Jilin',
   861864491 => 'Siping, Jilin',
   861864492 => 'Changchun, Jilin',
@@ -2079,6 +2102,16 @@
   861864867 => 'Ordos, Inner Mongolia',
   861864868 => 'Ordos, Inner Mongolia',
   861864869 => 'Ordos, Inner Mongolia',
+  861864870 => 'Hohhot, Inner Mongolia',
+  861864871 => 'Hohhot, Inner Mongolia',
+  861864872 => 'Hohhot, Inner Mongolia',
+  861864873 => 'Hohhot, Inner Mongolia',
+  861864874 => 'Bayannur, Inner Mongolia',
+  861864875 => 'Bayannur, Inner Mongolia',
+  861864876 => 'Bayannur, Inner Mongolia',
+  861864877 => 'Bayannur, Inner Mongolia',
+  861864878 => 'Bayannur, Inner Mongolia',
+  861864879 => 'Bayannur, Inner Mongolia',
   861864880 => 'Nanning, Guangxi',
   861864881 => 'Nanning, Guangxi',
   861864882 => 'Laibin, Guangxi',
@@ -4538,7 +4571,16 @@
   861869458 => 'Hangzhou, Zhejiang',
   861869459 => 'Hangzhou, Zhejiang',
   86186946 => 'Fuyang, Anhui',
-  86186947 => 'Quanzhou, Fujian',
+  861869470 => 'Quanzhou, Fujian',
+  861869471 => 'Quanzhou, Fujian',
+  861869472 => 'Quanzhou, Fujian',
+  861869473 => 'Quanzhou, Fujian',
+  861869474 => 'Quanzhou, Fujian',
+  861869475 => 'Quanzhou, Fujian',
+  861869476 => 'Zhangzhou, Fujian',
+  861869477 => 'Sanming, Fujian',
+  861869478 => 'Nanping, Fujian',
+  861869479 => 'Nanping, Fujian',
   861869480 => 'Hangzhou, Zhejiang',
   861869481 => 'Hangzhou, Zhejiang',
   861869482 => 'Hangzhou, Zhejiang',
diff --git a/src/libphonenumber/geocoding/data/fr/290.php b/src/libphonenumber/geocoding/data/fr/290.php
index 63908e613..1411c6799 100644
--- a/src/libphonenumber/geocoding/data/fr/290.php
+++ b/src/libphonenumber/geocoding/data/fr/290.php
@@ -5,10 +5,10 @@
  */
 
 return array (
-  2902 => 'Jamestown',
-  2903 => 'Sainte-Hélène',
-  2904 => 'Sainte-Hélène',
-  2906 => 'Sainte-Hélène',
-  2907 => 'Sainte-Hélène',
+  29022 => 'Jamestown',
+  29023 => 'Sainte-Hélène',
+  29024 => 'Sainte-Hélène',
+  29026 => 'Sainte-Hélène',
+  29027 => 'Sainte-Hélène',
   2908 => 'Tristan da Cunha',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86131.php b/src/libphonenumber/geocoding/data/zh/86131.php
index 234caa94d..199eab8f4 100644
--- a/src/libphonenumber/geocoding/data/zh/86131.php
+++ b/src/libphonenumber/geocoding/data/zh/86131.php
@@ -1843,16 +1843,7 @@
   86131278 => '上海市',
   86131279 => '上海市',
   86131280 => '广东省东莞市',
-  861312810 => '广东省东莞市',
-  861312811 => '广东省东莞市',
-  861312812 => '广东省东莞市',
-  861312813 => '广东省东莞市',
-  861312814 => '广东省东莞市',
-  861312815 => '广东省东莞市',
-  861312816 => '广东省东莞市',
-  861312817 => '广东省东莞市',
-  861312818 => '广东省东莞市',
-  861312819 => '香港',
+  86131281 => '广东省东莞市',
   86131282 => '广东省广州市',
   86131283 => '广东省揭阳市',
   861312840 => '广东省潮州市',
@@ -2810,26 +2801,8 @@
   861314368 => '广东省广州市',
   861314369 => '广东省广州市',
   86131437 => '广东省广州市',
-  861314380 => '广东省深圳市',
-  861314381 => '香港',
-  861314382 => '广东省深圳市',
-  861314383 => '广东省深圳市',
-  861314384 => '广东省深圳市',
-  861314385 => '香港',
-  861314386 => '广东省深圳市',
-  861314387 => '香港',
-  861314388 => '广东省深圳市',
-  861314389 => '香港',
-  861314390 => '广东省深圳市',
-  861314391 => '广东省深圳市',
-  861314392 => '香港',
-  861314393 => '广东省深圳市',
-  861314394 => '广东省深圳市',
-  861314395 => '香港',
-  861314396 => '香港',
-  861314397 => '香港',
-  861314398 => '广东省深圳市',
-  861314399 => '香港',
+  86131438 => '广东省深圳市',
+  86131439 => '广东省深圳市',
   861314400 => '广东省中山市',
   861314401 => '广东省中山市',
   861314402 => '广东省中山市',
@@ -2991,16 +2964,7 @@
   861314729 => '湖北省孝感市',
   86131473 => '广东省东莞市',
   86131474 => '河北省石家庄市',
-  861314750 => '香港',
-  861314751 => '香港',
-  861314752 => '香港',
-  861314753 => '香港',
-  861314754 => '香港',
-  861314755 => '广东省深圳市',
-  861314756 => '广东省深圳市',
-  861314757 => '香港',
-  861314758 => '香港',
-  861314759 => '香港',
+  86131475 => '广东省深圳市',
   861314760 => '吉林省白城市',
   861314761 => '吉林省白城市',
   861314762 => '吉林省白城市',
@@ -3141,16 +3105,7 @@
   861314987 => '辽宁省大连市',
   861314988 => '辽宁省大连市',
   861314989 => '辽宁省大连市',
-  861314990 => '广东省深圳市',
-  861314991 => '广东省深圳市',
-  861314992 => '广东省深圳市',
-  861314993 => '广东省深圳市',
-  861314994 => '广东省深圳市',
-  861314995 => '香港',
-  861314996 => '香港',
-  861314997 => '广东省深圳市',
-  861314998 => '广东省深圳市',
-  861314999 => '香港',
+  86131499 => '广东省深圳市',
   861315000 => '甘肃省张掖市',
   861315001 => '甘肃省兰州市',
   861315002 => '甘肃省兰州市',
@@ -4496,18 +4451,9 @@
   861317197 => '河北省秦皇岛市',
   861317198 => '河北省沧州市',
   861317199 => '河北省沧州市',
-  861317200 => '香港',
-  861317201 => '广东省广州市',
-  861317202 => '广东省广州市',
-  861317203 => '广东省广州市',
-  861317204 => '广东省广州市',
-  861317205 => '广东省广州市',
-  861317206 => '香港',
-  861317207 => '广东省广州市',
-  861317208 => '广东省广州市',
-  861317209 => '广东省广州市',
-  861317210 => '香港',
-  861317211 => '香港',
+  86131720 => '广东省广州市',
+  861317210 => '广东省广州市',
+  861317211 => '广东省东莞市',
   861317212 => '河北省廊坊市',
   861317213 => '河北省廊坊市',
   861317214 => '河北省廊坊市',
diff --git a/src/libphonenumber/geocoding/data/zh/86132.php b/src/libphonenumber/geocoding/data/zh/86132.php
index e6246aadb..40781bc33 100644
--- a/src/libphonenumber/geocoding/data/zh/86132.php
+++ b/src/libphonenumber/geocoding/data/zh/86132.php
@@ -2128,7 +2128,7 @@
   861322993 => '广东省广州市',
   861322994 => '广东省广州市',
   861322995 => '广东省广州市',
-  861322996 => '香港',
+  861322996 => '广东省广州市',
   861322997 => '广东省广州市',
   861322998 => '广东省广州市',
   861322999 => '广东省广州市',
@@ -3399,16 +3399,7 @@
   861324957 => '广东省汕头市',
   861324958 => '广东省汕头市',
   861324959 => '广东省汕头市',
-  861324960 => '广东省广州市',
-  861324961 => '广东省广州市',
-  861324962 => '广东省广州市',
-  861324963 => '广东省广州市',
-  861324964 => '广东省广州市',
-  861324965 => '广东省广州市',
-  861324966 => '广东省广州市',
-  861324967 => '香港',
-  861324968 => '广东省广州市',
-  861324969 => '香港',
+  86132496 => '广东省广州市',
   86132497 => '广东省广州市',
   86132498 => '广东省深圳市',
   861324990 => '广东省东莞市',
@@ -4285,12 +4276,12 @@
   86132668 => '广东省深圳市',
   861326690 => '河北省石家庄市',
   861326691 => '河北省石家庄市',
-  861326692 => '香港',
-  861326693 => '香港',
-  861326694 => '香港',
-  861326695 => '香港',
+  861326692 => '广东省东莞市',
+  861326693 => '广东省东莞市',
+  861326694 => '广东省东莞市',
+  861326695 => '广东省东莞市',
   861326696 => '广东省深圳市',
-  861326697 => '香港',
+  861326697 => '广东省东莞市',
   861326698 => '广东省深圳市',
   861326699 => '广东省深圳市',
   86132670 => '广东省深圳市',
@@ -4349,16 +4340,7 @@
   861326798 => '广东省珠海市',
   861326799 => '广东省珠海市',
   86132680 => '广东省广州市',
-  861326810 => '广东省广州市',
-  861326811 => '广东省广州市',
-  861326812 => '广东省广州市',
-  861326813 => '广东省广州市',
-  861326814 => '广东省广州市',
-  861326815 => '广东省广州市',
-  861326816 => '香港',
-  861326817 => '广东省广州市',
-  861326818 => '香港',
-  861326819 => '广东省广州市',
+  86132681 => '广东省广州市',
   86132682 => '广东省广州市',
   86132683 => '广东省广州市',
   86132684 => '广东省东莞市',
diff --git a/src/libphonenumber/geocoding/data/zh/86145.php b/src/libphonenumber/geocoding/data/zh/86145.php
index 76b79d3e0..0fb7d86da 100644
--- a/src/libphonenumber/geocoding/data/zh/86145.php
+++ b/src/libphonenumber/geocoding/data/zh/86145.php
@@ -414,12 +414,7 @@
   861450997 => '新疆阿克苏地区',
   861450998 => '新疆喀什地区',
   861450999 => '新疆伊犁哈萨克自治州',
-  8614510 => '北京市',
-  8614511 => '北京市',
-  8614512 => '北京市',
-  8614513 => '北京市',
-  8614515 => '江苏省常州市',
-  8614516 => '江苏省南通市',
+  861451 => '北京市',
   86145200 => '北京市',
   86145201 => '北京市',
   86145202 => '北京市',
@@ -3842,6 +3837,9 @@
   861459734 => '湖南省衡阳市',
   861459735 => '湖南省郴州市',
   861459736 => '湖南省常德市',
+  861459737 => '湖南省长沙市',
+  861459738 => '湖南省长沙市',
+  861459739 => '湖南省长沙市',
   861459770 => '新疆克拉玛依市',
   861459771 => '新疆克拉玛依市',
   861459772 => '新疆乌鲁木齐市',
@@ -3872,4 +3870,25 @@
   861459797 => '新疆巴音郭楞蒙古自治州',
   861459798 => '新疆乌鲁木齐市',
   861459799 => '新疆乌鲁木齐市',
+  861459800 => '湖北省襄樊市',
+  861459801 => '湖北省黄石市',
+  861459802 => '湖北省十堰市',
+  861459803 => '湖北省十堰市',
+  861459804 => '湖北省十堰市',
+  861459805 => '湖北省十堰市',
+  861459806 => '湖北省十堰市',
+  861459807 => '湖北省十堰市',
+  861459808 => '湖北省十堰市',
+  861459809 => '湖北省十堰市',
+  86145988 => '广东省东莞市',
+  861459890 => '广东省东莞市',
+  861459891 => '广东省东莞市',
+  861459892 => '广东省东莞市',
+  861459893 => '广东省佛山市',
+  861459894 => '广东省佛山市',
+  861459895 => '广东省佛山市',
+  861459896 => '广东省佛山市',
+  861459897 => '广东省佛山市',
+  861459898 => '广东省佛山市',
+  861459899 => '广东省广州市',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86153.php b/src/libphonenumber/geocoding/data/zh/86153.php
index 8f8d6e744..5bd33f5ee 100644
--- a/src/libphonenumber/geocoding/data/zh/86153.php
+++ b/src/libphonenumber/geocoding/data/zh/86153.php
@@ -4766,6 +4766,16 @@
   861537437 => '江西省赣州市',
   861537438 => '江西省上饶市',
   861537439 => '江西省宜春市',
+  861537440 => '甘肃省临夏回族自治州',
+  861537441 => '甘肃省白银市',
+  861537442 => '甘肃省定西市',
+  861537443 => '甘肃省平凉市',
+  861537444 => '甘肃省庆阳市',
+  861537445 => '甘肃省武威市',
+  861537446 => '甘肃省张掖市',
+  861537447 => '甘肃省甘南藏族自治州',
+  861537448 => '甘肃省天水市',
+  861537449 => '甘肃省陇南市',
   861537450 => '湖北省鄂州市',
   861537451 => '湖北省黄石市',
   861537452 => '湖北省黄石市',
diff --git a/src/libphonenumber/geocoding/data/zh/86170.php b/src/libphonenumber/geocoding/data/zh/86170.php
index f4bf813bb..c8627ae53 100644
--- a/src/libphonenumber/geocoding/data/zh/86170.php
+++ b/src/libphonenumber/geocoding/data/zh/86170.php
@@ -1188,6 +1188,890 @@
   861705880 => '广东省东莞市',
   861705882 => '广东省佛山市',
   861705883 => '广东省中山市',
+  86170700 => '北京市',
+  86170701 => '北京市',
+  86170702 => '广东省广州市',
+  86170703 => '广东省广州市',
+  861707040 => '浙江省湖州市',
+  861707041 => '浙江省湖州市',
+  861707042 => '浙江省湖州市',
+  861707043 => '浙江省台州市',
+  861707044 => '浙江省台州市',
+  861707045 => '浙江省金华市',
+  861707046 => '浙江省金华市',
+  861707047 => '浙江省衢州市',
+  861707048 => '浙江省衢州市',
+  861707049 => '浙江省衢州市',
+  86170705 => '江苏省镇江市',
+  861707060 => '辽宁省鞍山市',
+  861707061 => '辽宁省鞍山市',
+  861707062 => '辽宁省鞍山市',
+  861707063 => '辽宁省鞍山市',
+  861707064 => '辽宁省鞍山市',
+  861707065 => '辽宁省鞍山市',
+  861707066 => '辽宁省鞍山市',
+  861707067 => '辽宁省鞍山市',
+  861707068 => '辽宁省沈阳市',
+  861707069 => '辽宁省沈阳市',
+  86170707 => '广西南宁市',
+  86170708 => '广东省广州市',
+  86170709 => '河北省石家庄市',
+  86170710 => '北京市',
+  86170711 => '北京市',
+  86170712 => '天津市',
+  86170713 => '上海市',
+  86170714 => '北京市',
+  86170715 => '江苏省南京市',
+  861707160 => '河南省南阳市',
+  861707161 => '河南省焦作市',
+  861707162 => '河南省周口市',
+  861707163 => '河南省周口市',
+  861707164 => '河南省鹤壁市',
+  861707165 => '河南省洛阳市',
+  861707166 => '河南省漯河市',
+  861707167 => '河南省三门峡市',
+  861707168 => '河南省郑州市',
+  861707169 => '河南省郑州市',
+  861707170 => '江西省吉安市',
+  861707171 => '江西省吉安市',
+  861707172 => '江西省吉安市',
+  861707173 => '江西省吉安市',
+  861707174 => '江西省吉安市',
+  861707175 => '江西省鹰潭市',
+  861707176 => '江西省鹰潭市',
+  861707177 => '江西省鹰潭市',
+  861707178 => '江西省鹰潭市',
+  861707179 => '江西省鹰潭市',
+  86170718 => '河南省郑州市',
+  86170719 => '福建省福州市',
+  86170720 => '广东省广州市',
+  86170721 => '上海市',
+  86170722 => '天津市',
+  86170723 => '重庆市',
+  86170724 => '辽宁省沈阳市',
+  86170725 => '江苏省南京市',
+  861707260 => '湖北省咸宁市',
+  861707261 => '湖北省咸宁市',
+  861707262 => '湖北省咸宁市',
+  861707263 => '湖北省咸宁市',
+  861707264 => '湖北省孝感市',
+  861707265 => '湖北省孝感市',
+  861707266 => '湖北省孝感市',
+  861707267 => '湖北省孝感市',
+  861707268 => '湖北省孝感市',
+  861707269 => '湖北省孝感市',
+  86170727 => '湖北省武汉市',
+  86170728 => '四川省成都市',
+  86170729 => '陕西省西安市',
+  86170730 => '山西省太原市',
+  861707310 => '河北省邯郸市',
+  861707311 => '河北省石家庄市',
+  861707312 => '河北省保定市',
+  861707313 => '河北省保定市',
+  861707314 => '河北省保定市',
+  861707315 => '河北省唐山市',
+  861707316 => '河北省唐山市',
+  861707317 => '河北省沧州市',
+  861707318 => '河北省石家庄市',
+  861707319 => '河北省石家庄市',
+  861707320 => '河北省保定市',
+  861707321 => '河北省保定市',
+  861707322 => '河北省保定市',
+  861707323 => '河北省保定市',
+  861707324 => '河北省保定市',
+  861707325 => '河北省保定市',
+  861707326 => '河北省保定市',
+  861707327 => '河北省保定市',
+  861707328 => '河北省石家庄市',
+  861707329 => '河北省石家庄市',
+  86170733 => '河北省唐山市',
+  861707340 => '河北省石家庄市',
+  861707341 => '河北省石家庄市',
+  861707342 => '河北省石家庄市',
+  861707343 => '河北省石家庄市',
+  861707344 => '河北省石家庄市',
+  861707345 => '河北省石家庄市',
+  861707346 => '河北省唐山市',
+  861707347 => '河北省唐山市',
+  861707348 => '河北省唐山市',
+  861707349 => '河北省唐山市',
+  86170735 => '河南省郑州市',
+  861707360 => '河南省郑州市',
+  861707361 => '河南省郑州市',
+  861707362 => '河南省郑州市',
+  861707363 => '河南省郑州市',
+  861707364 => '河南省焦作市',
+  861707365 => '河南省南阳市',
+  861707366 => '河南省南阳市',
+  861707367 => '河南省南阳市',
+  861707368 => '河南省南阳市',
+  861707369 => '河南省南阳市',
+  861707370 => '河南省商丘市',
+  861707371 => '河南省郑州市',
+  861707372 => '河南省安阳市',
+  861707373 => '河南省新乡市',
+  861707374 => '河南省许昌市',
+  861707375 => '河南省平顶山市',
+  861707376 => '河南省信阳市',
+  861707377 => '河南省南阳市',
+  861707378 => '河南省郑州市',
+  861707379 => '河南省洛阳市',
+  861707380 => '河南省郑州市',
+  861707381 => '河南省郑州市',
+  861707382 => '河南省洛阳市',
+  861707383 => '河南省商丘市',
+  861707384 => '河南省商丘市',
+  861707385 => '河南省许昌市',
+  861707386 => '河南省许昌市',
+  861707387 => '河南省许昌市',
+  861707388 => '河南省平顶山市',
+  861707389 => '河南省平顶山市',
+  861707390 => '河南省焦作市',
+  861707391 => '河南省焦作市',
+  861707392 => '河南省鹤壁市',
+  861707393 => '河南省濮阳市',
+  861707394 => '河南省周口市',
+  861707395 => '河南省漯河市',
+  861707396 => '河南省驻马店市',
+  861707397 => '河南省信阳市',
+  861707398 => '河南省三门峡市',
+  861707399 => '河南省驻马店市',
+  86170740 => '辽宁省沈阳市',
+  86170741 => '辽宁省大连市',
+  861707420 => '浙江省杭州市',
+  861707421 => '浙江省杭州市',
+  861707422 => '浙江省杭州市',
+  861707423 => '浙江省杭州市',
+  861707424 => '浙江省杭州市',
+  861707425 => '浙江省宁波市',
+  861707426 => '浙江省宁波市',
+  861707427 => '浙江省宁波市',
+  861707428 => '浙江省宁波市',
+  861707429 => '浙江省宁波市',
+  86170743 => '吉林省长春市',
+  861707440 => '浙江省温州市',
+  861707441 => '浙江省温州市',
+  861707442 => '浙江省温州市',
+  861707443 => '浙江省温州市',
+  861707444 => '浙江省嘉兴市',
+  861707445 => '浙江省舟山市',
+  861707446 => '浙江省丽水市',
+  861707447 => '浙江省绍兴市',
+  861707448 => '浙江省绍兴市',
+  861707449 => '浙江省绍兴市',
+  86170745 => '黑龙江省哈尔滨市',
+  86170746 => '黑龙江省哈尔滨市',
+  86170747 => '内蒙古呼和浩特市',
+  86170748 => '广东省广州市',
+  86170749 => '福建省福州市',
+  86170750 => '江苏省南京市',
+  86170751 => '江苏省南京市',
+  86170752 => '江苏省南京市',
+  861707530 => '山东省济南市',
+  861707531 => '山东省济南市',
+  861707532 => '山东省青岛市',
+  861707533 => '山东省烟台市',
+  861707534 => '山东省烟台市',
+  861707535 => '山东省烟台市',
+  861707536 => '山东省潍坊市',
+  861707537 => '山东省济宁市',
+  861707538 => '山东省济宁市',
+  861707539 => '山东省临沂市',
+  861707540 => '福建省厦门市',
+  861707541 => '福建省厦门市',
+  861707542 => '福建省漳州市',
+  861707543 => '福建省漳州市',
+  861707544 => '福建省莆田市',
+  861707545 => '福建省泉州市',
+  861707546 => '福建省泉州市',
+  861707547 => '福建省泉州市',
+  861707548 => '福建省泉州市',
+  861707549 => '福建省泉州市',
+  861707550 => '安徽省合肥市',
+  861707551 => '安徽省合肥市',
+  861707552 => '安徽省芜湖市',
+  861707553 => '安徽省芜湖市',
+  861707554 => '安徽省芜湖市',
+  861707555 => '安徽省芜湖市',
+  861707556 => '安徽省安庆市',
+  861707557 => '安徽省阜阳市',
+  861707558 => '安徽省阜阳市',
+  861707559 => '安徽省阜阳市',
+  861707560 => '安徽省六安市',
+  861707561 => '安徽省芜湖市',
+  861707562 => '安徽省芜湖市',
+  861707563 => '安徽省芜湖市',
+  861707564 => '安徽省六安市',
+  861707565 => '安徽省合肥市',
+  861707566 => '安徽省安庆市',
+  861707567 => '安徽省阜阳市',
+  861707568 => '安徽省阜阳市',
+  861707569 => '安徽省阜阳市',
+  86170757 => '安徽省合肥市',
+  86170758 => '安徽省合肥市',
+  861707590 => '福建省泉州市',
+  861707591 => '福建省泉州市',
+  861707592 => '福建省泉州市',
+  861707593 => '福建省泉州市',
+  861707594 => '福建省泉州市',
+  861707595 => '福建省福州市',
+  861707596 => '福建省福州市',
+  861707597 => '福建省福州市',
+  861707598 => '福建省莆田市',
+  861707599 => '福建省莆田市',
+  86170760 => '山东省济南市',
+  86170761 => '山东省济南市',
+  861707620 => '山东省济南市',
+  861707621 => '山东省济南市',
+  861707622 => '山东省济南市',
+  861707623 => '山东省济南市',
+  861707624 => '山东省济南市',
+  861707625 => '山东省济南市',
+  861707626 => '山东省济南市',
+  861707627 => '山东省济宁市',
+  861707628 => '山东省济宁市',
+  861707629 => '山东省济宁市',
+  861707630 => '山东省济宁市',
+  861707631 => '山东省济宁市',
+  861707632 => '山东省济宁市',
+  861707633 => '山东省济宁市',
+  861707634 => '山东省潍坊市',
+  861707635 => '山东省潍坊市',
+  861707636 => '山东省潍坊市',
+  861707637 => '山东省潍坊市',
+  861707638 => '山东省潍坊市',
+  861707639 => '山东省潍坊市',
+  861707640 => '山东省济南市',
+  861707641 => '山东省济南市',
+  861707642 => '山东省济南市',
+  861707643 => '山东省青岛市',
+  861707644 => '山东省青岛市',
+  861707645 => '山东省青岛市',
+  861707646 => '山东省潍坊市',
+  861707647 => '山东省济宁市',
+  861707648 => '山东省临沂市',
+  861707649 => '山东省烟台市',
+  86170765 => '广东省广州市',
+  86170766 => '广东省广州市',
+  86170767 => '广东省广州市',
+  86170768 => '广东省广州市',
+  86170769 => '广东省深圳市',
+  86170770 => '广西南宁市',
+  86170771 => '江西省南昌市',
+  861707720 => '江西省赣州市',
+  861707721 => '江西省赣州市',
+  861707722 => '江西省赣州市',
+  861707723 => '江西省赣州市',
+  861707724 => '江西省赣州市',
+  861707725 => '江西省赣州市',
+  861707726 => '江西省赣州市',
+  861707727 => '江西省赣州市',
+  861707728 => '江西省宜春市',
+  861707729 => '江西省宜春市',
+  861707730 => '湖南省岳阳市',
+  861707731 => '湖南省长沙市',
+  861707732 => '湖南省长沙市',
+  861707733 => '湖南省长沙市',
+  861707734 => '湖南省长沙市',
+  861707735 => '湖南省长沙市',
+  861707736 => '湖南省长沙市',
+  861707737 => '湖南省长沙市',
+  861707738 => '湖南省长沙市',
+  861707739 => '湖南省长沙市',
+  86170774 => '湖南省长沙市',
+  861707750 => '江西省上饶市',
+  861707751 => '江西省上饶市',
+  861707752 => '江西省上饶市',
+  861707753 => '江西省上饶市',
+  861707754 => '江西省上饶市',
+  861707755 => '江西省上饶市',
+  861707756 => '江西省上饶市',
+  861707757 => '江西省景德镇市',
+  861707758 => '江西省景德镇市',
+  861707759 => '江西省景德镇市',
+  861707760 => '云南省昆明市',
+  861707761 => '云南省昆明市',
+  861707762 => '云南省昆明市',
+  861707763 => '云南省昆明市',
+  861707764 => '云南省昆明市',
+  861707765 => '云南省玉溪市',
+  861707766 => '云南省玉溪市',
+  861707767 => '云南省玉溪市',
+  861707768 => '云南省玉溪市',
+  861707769 => '云南省玉溪市',
+  86170777 => '上海市',
+  86170778 => '浙江省宁波市',
+  86170779 => '浙江省宁波市',
+  86170780 => '四川省成都市',
+  86170781 => '四川省成都市',
+  86170782 => '海南省海口市',
+  861707830 => '云南省昭通市',
+  861707831 => '云南省昭通市',
+  861707832 => '云南省昭通市',
+  861707833 => '云南省西双版纳傣族自治州',
+  861707834 => '云南省昭通市',
+  861707835 => '云南省大理白族自治州',
+  861707836 => '云南省大理白族自治州',
+  861707837 => '云南省大理白族自治州',
+  861707838 => '云南省大理白族自治州',
+  861707839 => '云南省大理白族自治州',
+  861707840 => '云南省保山市',
+  861707841 => '云南省保山市',
+  861707842 => '云南省保山市',
+  861707843 => '云南省保山市',
+  861707844 => '云南省文山壮族苗族自治州',
+  861707845 => '云南省德宏傣族景颇族自治州',
+  861707846 => '云南省德宏傣族景颇族自治州',
+  861707847 => '云南省德宏傣族景颇族自治州',
+  861707848 => '云南省文山壮族苗族自治州',
+  861707849 => '云南省文山壮族苗族自治州',
+  86170785 => '贵州省贵阳市',
+  861707860 => '云南省曲靖市',
+  861707861 => '云南省曲靖市',
+  861707862 => '云南省曲靖市',
+  861707863 => '云南省曲靖市',
+  861707864 => '云南省曲靖市',
+  861707865 => '云南省曲靖市',
+  861707866 => '云南省楚雄彝族自治州',
+  861707867 => '云南省楚雄彝族自治州',
+  861707868 => '云南省楚雄彝族自治州',
+  861707869 => '云南省西双版纳傣族自治州',
+  861707870 => '云南省红河哈尼族彝族自治州',
+  861707871 => '云南省红河哈尼族彝族自治州',
+  861707872 => '云南省红河哈尼族彝族自治州',
+  861707873 => '云南省红河哈尼族彝族自治州',
+  861707874 => '云南省红河哈尼族彝族自治州',
+  861707875 => '云南省丽江市',
+  861707876 => '云南省丽江市',
+  861707877 => '云南省丽江市',
+  861707878 => '云南省丽江市',
+  861707879 => '云南省西双版纳傣族自治州',
+  86170788 => '浙江省杭州市',
+  86170789 => '浙江省温州市',
+  86170790 => '浙江省杭州市',
+  861707910 => '浙江省宁波市',
+  861707911 => '浙江省宁波市',
+  861707912 => '浙江省宁波市',
+  861707913 => '浙江省宁波市',
+  861707914 => '浙江省宁波市',
+  861707915 => '浙江省金华市',
+  861707916 => '浙江省金华市',
+  861707917 => '浙江省金华市',
+  861707918 => '浙江省金华市',
+  861707919 => '浙江省金华市',
+  861707920 => '浙江省丽水市',
+  861707921 => '浙江省丽水市',
+  861707922 => '浙江省嘉兴市',
+  861707923 => '浙江省嘉兴市',
+  861707924 => '浙江省嘉兴市',
+  861707925 => '浙江省舟山市',
+  861707926 => '浙江省舟山市',
+  861707927 => '浙江省舟山市',
+  861707928 => '浙江省舟山市',
+  861707929 => '浙江省舟山市',
+  86170793 => '甘肃省兰州市',
+  861707940 => '河南省洛阳市',
+  861707941 => '河南省洛阳市',
+  861707942 => '河南省洛阳市',
+  861707943 => '河南省驻马店市',
+  861707944 => '河南省濮阳市',
+  861707945 => '河南省郑州市',
+  861707946 => '河南省郑州市',
+  861707947 => '河南省郑州市',
+  861707948 => '河南省郑州市',
+  861707949 => '河南省安阳市',
+  86170795 => '江苏省常州市',
+  861707960 => '浙江省台州市',
+  861707961 => '浙江省台州市',
+  861707962 => '浙江省台州市',
+  861707963 => '浙江省台州市',
+  861707964 => '浙江省台州市',
+  861707965 => '浙江省台州市',
+  861707966 => '浙江省台州市',
+  861707967 => '浙江省温州市',
+  861707968 => '浙江省温州市',
+  861707969 => '浙江省温州市',
+  861707970 => '浙江省丽水市',
+  861707971 => '浙江省丽水市',
+  861707972 => '浙江省衢州市',
+  861707973 => '浙江省衢州市',
+  861707974 => '浙江省衢州市',
+  861707975 => '浙江省衢州市',
+  861707976 => '浙江省衢州市',
+  861707977 => '浙江省衢州市',
+  861707978 => '浙江省衢州市',
+  861707979 => '浙江省衢州市',
+  86170798 => '浙江省绍兴市',
+  861707990 => '浙江省湖州市',
+  861707991 => '浙江省湖州市',
+  861707992 => '浙江省湖州市',
+  861707993 => '浙江省湖州市',
+  861707994 => '浙江省湖州市',
+  861707995 => '浙江省湖州市',
+  861707996 => '浙江省丽水市',
+  861707997 => '浙江省丽水市',
+  861707998 => '浙江省嘉兴市',
+  861707999 => '浙江省嘉兴市',
+  86170800 => '北京市',
+  86170801 => '北京市',
+  86170802 => '广东省深圳市',
+  86170803 => '广东省深圳市',
+  86170804 => '广东省深圳市',
+  86170805 => '江苏省南通市',
+  86170806 => '广东省深圳市',
+  861708070 => '湖南省长沙市',
+  861708071 => '湖南省长沙市',
+  861708072 => '湖南省长沙市',
+  861708073 => '湖南省长沙市',
+  861708074 => '湖南省长沙市',
+  861708075 => '湖南省岳阳市',
+  861708076 => '湖南省岳阳市',
+  861708077 => '湖南省岳阳市',
+  861708078 => '湖南省岳阳市',
+  861708079 => '湖南省衡阳市',
+  86170808 => '上海市',
+  861708090 => '广东省深圳市',
+  861708091 => '广东省深圳市',
+  861708092 => '广东省深圳市',
+  861708093 => '广东省深圳市',
+  861708094 => '广东省深圳市',
+  861708095 => '广东省深圳市',
+  861708096 => '广东省深圳市',
+  861708097 => '广东省佛山市',
+  861708098 => '广东省佛山市',
+  861708099 => '广东省佛山市',
+  86170810 => '北京市',
+  86170811 => '北京市',
+  86170812 => '天津市',
+  86170813 => '上海市',
+  86170814 => '上海市',
+  86170815 => '江苏省无锡市',
+  86170816 => '江苏省无锡市',
+  86170817 => '上海市',
+  86170818 => '广东省东莞市',
+  861708190 => '福建省厦门市',
+  861708191 => '福建省莆田市',
+  861708192 => '福建省莆田市',
+  861708193 => '福建省莆田市',
+  861708194 => '福建省厦门市',
+  861708195 => '福建省莆田市',
+  861708196 => '福建省漳州市',
+  861708197 => '福建省漳州市',
+  861708198 => '福建省漳州市',
+  861708199 => '福建省漳州市',
+  86170820 => '广东省东莞市',
+  86170821 => '上海市',
+  86170822 => '天津市',
+  86170823 => '重庆市',
+  86170824 => '辽宁省沈阳市',
+  861708250 => '江苏省南通市',
+  861708251 => '江苏省南通市',
+  861708252 => '江苏省南通市',
+  861708253 => '江苏省南通市',
+  861708254 => '江苏省南通市',
+  861708255 => '江苏省南通市',
+  861708256 => '江苏省南通市',
+  861708257 => '江苏省南通市',
+  861708258 => '江苏省南通市',
+  861708259 => '江苏省淮安市',
+  861708260 => '湖北省咸宁市',
+  861708261 => '湖北省荆门市',
+  861708262 => '湖北省荆门市',
+  861708263 => '湖北省荆门市',
+  861708264 => '湖北省荆门市',
+  861708265 => '湖北省荆门市',
+  861708266 => '湖北省荆门市',
+  861708267 => '湖北省武汉市',
+  861708268 => '湖北省武汉市',
+  861708269 => '湖北省武汉市',
+  86170827 => '湖北省武汉市',
+  86170828 => '四川省成都市',
+  86170829 => '陕西省西安市',
+  861708300 => '河北省邯郸市',
+  861708301 => '河北省邯郸市',
+  861708302 => '河北省邯郸市',
+  861708303 => '河北省邯郸市',
+  861708304 => '河北省邯郸市',
+  861708305 => '河北省邯郸市',
+  861708306 => '河北省石家庄市',
+  861708307 => '河北省石家庄市',
+  861708308 => '河北省石家庄市',
+  861708309 => '河北省石家庄市',
+  861708310 => '河北省邯郸市',
+  861708311 => '河北省石家庄市',
+  861708312 => '河北省保定市',
+  861708313 => '河北省唐山市',
+  861708314 => '河北省唐山市',
+  861708315 => '河北省唐山市',
+  861708316 => '河北省沧州市',
+  861708317 => '河北省沧州市',
+  861708318 => '河北省沧州市',
+  861708319 => '河北省沧州市',
+  861708320 => '河北省保定市',
+  861708321 => '河北省保定市',
+  861708322 => '河北省保定市',
+  861708323 => '河北省保定市',
+  861708324 => '河北省保定市',
+  861708325 => '河北省保定市',
+  861708326 => '河北省保定市',
+  861708327 => '河北省沧州市',
+  861708328 => '河北省沧州市',
+  861708329 => '河北省沧州市',
+  861708330 => '河北省唐山市',
+  861708331 => '河北省唐山市',
+  861708332 => '河北省唐山市',
+  861708333 => '河北省唐山市',
+  861708334 => '河北省唐山市',
+  861708335 => '河北省唐山市',
+  861708336 => '河北省石家庄市',
+  861708337 => '河北省石家庄市',
+  861708338 => '河北省石家庄市',
+  861708339 => '河北省石家庄市',
+  861708340 => '山西省大同市',
+  861708341 => '山西省大同市',
+  861708342 => '山西省大同市',
+  861708343 => '山西省大同市',
+  861708344 => '山西省大同市',
+  861708345 => '山西省长治市',
+  861708346 => '山西省长治市',
+  861708347 => '山西省长治市',
+  861708348 => '山西省长治市',
+  861708349 => '山西省长治市',
+  861708350 => '山西省大同市',
+  861708351 => '山西省太原市',
+  861708352 => '山西省太原市',
+  861708353 => '山西省太原市',
+  861708354 => '山西省太原市',
+  861708355 => '山西省太原市',
+  861708356 => '山西省太原市',
+  861708357 => '山西省太原市',
+  861708358 => '山西省太原市',
+  861708359 => '山西省太原市',
+  861708360 => '河南省郑州市',
+  861708361 => '河南省洛阳市',
+  861708362 => '河南省洛阳市',
+  861708363 => '河南省洛阳市',
+  861708364 => '河南省洛阳市',
+  861708365 => '河南省洛阳市',
+  861708366 => '河南省洛阳市',
+  861708367 => '河南省洛阳市',
+  861708368 => '河南省洛阳市',
+  861708369 => '河南省洛阳市',
+  861708370 => '河南省商丘市',
+  861708371 => '河南省郑州市',
+  861708372 => '河南省安阳市',
+  861708373 => '河南省新乡市',
+  861708374 => '河南省许昌市',
+  861708375 => '河南省平顶山市',
+  861708376 => '河南省信阳市',
+  861708377 => '河南省南阳市',
+  861708378 => '河南省郑州市',
+  861708379 => '河南省洛阳市',
+  861708380 => '河南省新乡市',
+  861708381 => '河南省新乡市',
+  861708382 => '河南省新乡市',
+  861708383 => '河南省焦作市',
+  861708384 => '河南省焦作市',
+  861708385 => '河南省安阳市',
+  861708386 => '河南省郑州市',
+  861708387 => '河南省鹤壁市',
+  861708388 => '河南省郑州市',
+  861708389 => '河南省濮阳市',
+  861708390 => '河南省焦作市',
+  861708391 => '河南省焦作市',
+  861708392 => '河南省鹤壁市',
+  861708393 => '河南省濮阳市',
+  861708394 => '河南省周口市',
+  861708395 => '河南省漯河市',
+  861708396 => '河南省驻马店市',
+  861708397 => '河南省信阳市',
+  861708398 => '河南省三门峡市',
+  861708399 => '河南省商丘市',
+  86170840 => '辽宁省大连市',
+  86170841 => '辽宁省大连市',
+  861708420 => '云南省临沧市',
+  861708421 => '云南省临沧市',
+  861708422 => '云南省临沧市',
+  861708423 => '云南省怒江傈僳族自治州',
+  861708424 => '云南省怒江傈僳族自治州',
+  861708425 => '云南省怒江傈僳族自治州',
+  861708426 => '云南省普洱市',
+  861708427 => '云南省普洱市',
+  861708428 => '云南省普洱市',
+  861708429 => '云南省文山壮族苗族自治州',
+  86170843 => '吉林省长春市',
+  86170844 => '广东省东莞市',
+  861708450 => '黑龙江省哈尔滨市',
+  861708451 => '黑龙江省哈尔滨市',
+  861708452 => '黑龙江省大庆市',
+  861708453 => '黑龙江省大庆市',
+  861708454 => '黑龙江省大庆市',
+  861708455 => '黑龙江省大庆市',
+  861708456 => '黑龙江省大庆市',
+  861708457 => '黑龙江省大庆市',
+  861708458 => '黑龙江省大庆市',
+  861708459 => '黑龙江省大庆市',
+  86170846 => '广东省佛山市',
+  861708470 => '内蒙古呼和浩特市',
+  861708471 => '内蒙古呼和浩特市',
+  861708472 => '内蒙古呼和浩特市',
+  861708473 => '内蒙古呼和浩特市',
+  861708474 => '内蒙古呼和浩特市',
+  861708475 => '内蒙古包头市',
+  861708476 => '内蒙古包头市',
+  861708477 => '内蒙古包头市',
+  861708478 => '内蒙古包头市',
+  861708479 => '内蒙古包头市',
+  861708480 => '河南省郑州市',
+  861708481 => '河南省郑州市',
+  861708482 => '河南省新乡市',
+  861708483 => '河南省许昌市',
+  861708484 => '河南省平顶山市',
+  861708485 => '河南省漯河市',
+  861708486 => '河南省三门峡市',
+  861708487 => '河南省信阳市',
+  861708488 => '河南省南阳市',
+  861708489 => '河南省南阳市',
+  86170849 => '广东省佛山市',
+  86170850 => '江苏省苏州市',
+  86170851 => '江苏省苏州市',
+  86170852 => '江苏省苏州市',
+  861708530 => '山东省济南市',
+  861708531 => '山东省济南市',
+  861708532 => '山东省青岛市',
+  861708533 => '山东省烟台市',
+  861708534 => '山东省烟台市',
+  861708535 => '山东省烟台市',
+  861708536 => '山东省潍坊市',
+  861708537 => '山东省济宁市',
+  861708538 => '山东省济宁市',
+  861708539 => '山东省临沂市',
+  86170854 => '安徽省合肥市',
+  861708550 => '安徽省合肥市',
+  861708551 => '安徽省合肥市',
+  861708552 => '安徽省合肥市',
+  861708553 => '安徽省芜湖市',
+  861708554 => '安徽省合肥市',
+  861708555 => '安徽省合肥市',
+  861708556 => '安徽省安庆市',
+  861708557 => '安徽省阜阳市',
+  861708558 => '安徽省阜阳市',
+  861708559 => '安徽省阜阳市',
+  861708560 => '安徽省六安市',
+  861708561 => '安徽省合肥市',
+  861708562 => '安徽省合肥市',
+  861708563 => '安徽省安庆市',
+  861708564 => '安徽省六安市',
+  861708565 => '安徽省安庆市',
+  861708566 => '安徽省安庆市',
+  861708567 => '安徽省阜阳市',
+  861708568 => '安徽省合肥市',
+  861708569 => '安徽省合肥市',
+  861708570 => '江苏省连云港市',
+  861708571 => '江苏省连云港市',
+  861708572 => '江苏省连云港市',
+  861708573 => '江苏省连云港市',
+  861708574 => '江苏省连云港市',
+  861708575 => '江苏省连云港市',
+  861708576 => '江苏省连云港市',
+  861708577 => '江苏省淮安市',
+  861708578 => '江苏省淮安市',
+  861708579 => '江苏省淮安市',
+  861708580 => '福建省泉州市',
+  861708581 => '福建省泉州市',
+  861708582 => '福建省厦门市',
+  861708583 => '福建省厦门市',
+  861708584 => '福建省厦门市',
+  861708585 => '福建省厦门市',
+  861708586 => '福建省厦门市',
+  861708587 => '福建省厦门市',
+  861708588 => '福建省厦门市',
+  861708589 => '福建省厦门市',
+  861708590 => '福建省福州市',
+  861708591 => '福建省福州市',
+  861708592 => '福建省福州市',
+  861708593 => '福建省福州市',
+  861708594 => '福建省泉州市',
+  861708595 => '福建省泉州市',
+  861708596 => '福建省泉州市',
+  861708597 => '福建省泉州市',
+  861708598 => '福建省泉州市',
+  861708599 => '福建省泉州市',
+  86170860 => '山东省青岛市',
+  86170861 => '山东省青岛市',
+  861708620 => '山东省青岛市',
+  861708621 => '山东省青岛市',
+  861708622 => '山东省青岛市',
+  861708623 => '山东省青岛市',
+  861708624 => '山东省青岛市',
+  861708625 => '山东省青岛市',
+  861708626 => '山东省青岛市',
+  861708627 => '山东省临沂市',
+  861708628 => '山东省临沂市',
+  861708629 => '山东省临沂市',
+  86170863 => '山东省临沂市',
+  861708640 => '江苏省无锡市',
+  861708641 => '江苏省无锡市',
+  861708642 => '江苏省无锡市',
+  861708643 => '江苏省无锡市',
+  861708644 => '江苏省无锡市',
+  861708645 => '江苏省无锡市',
+  861708646 => '江苏省盐城市',
+  861708647 => '江苏省盐城市',
+  861708648 => '江苏省常州市',
+  861708649 => '江苏省苏州市',
+  861708650 => '山东省潍坊市',
+  861708651 => '山东省潍坊市',
+  861708652 => '山东省潍坊市',
+  861708653 => '山东省潍坊市',
+  861708654 => '山东省潍坊市',
+  861708655 => '山东省潍坊市',
+  861708656 => '山东省潍坊市',
+  861708657 => '山东省潍坊市',
+  861708658 => '山东省烟台市',
+  861708659 => '山东省烟台市',
+  86170866 => '山东省烟台市',
+  86170867 => '广东省惠州市',
+  86170868 => '广东省惠州市',
+  86170869 => '广东省江门市',
+  861708700 => '广西南宁市',
+  861708701 => '广西南宁市',
+  861708702 => '广西南宁市',
+  861708703 => '广西桂林市',
+  861708704 => '广西桂林市',
+  861708705 => '广西桂林市',
+  861708706 => '广西桂林市',
+  861708707 => '广西桂林市',
+  861708708 => '广西桂林市',
+  861708709 => '广西桂林市',
+  86170871 => '湖北省武汉市',
+  861708720 => '江西省九江市',
+  861708721 => '江西省九江市',
+  861708722 => '江西省九江市',
+  861708723 => '江西省九江市',
+  861708724 => '江西省九江市',
+  861708725 => '江西省九江市',
+  861708726 => '江西省九江市',
+  861708727 => '江西省宜春市',
+  861708728 => '江西省宜春市',
+  861708729 => '江西省宜春市',
+  86170873 => '湖南省长沙市',
+  861708740 => '湖南省衡阳市',
+  861708741 => '湖南省衡阳市',
+  861708742 => '湖南省衡阳市',
+  861708743 => '湖南省衡阳市',
+  861708744 => '湖南省衡阳市',
+  861708745 => '湖南省衡阳市',
+  861708746 => '湖南省邵阳市',
+  861708747 => '湖南省邵阳市',
+  861708748 => '湖南省邵阳市',
+  861708749 => '湖南省邵阳市',
+  861708750 => '江西省抚州市',
+  861708751 => '江西省抚州市',
+  861708752 => '江西省抚州市',
+  861708753 => '江西省抚州市',
+  861708754 => '江西省抚州市',
+  861708755 => '江西省南昌市',
+  861708756 => '江西省南昌市',
+  861708757 => '江西省南昌市',
+  861708758 => '江西省南昌市',
+  861708759 => '江西省南昌市',
+  86170876 => '江苏省扬州市',
+  86170877 => '江苏省盐城市',
+  86170878 => '江苏省徐州市',
+  861708790 => '江苏省泰州市',
+  861708791 => '江苏省泰州市',
+  861708792 => '江苏省泰州市',
+  861708793 => '江苏省泰州市',
+  861708794 => '江苏省泰州市',
+  861708795 => '江苏省泰州市',
+  861708796 => '江苏省泰州市',
+  861708797 => '江苏省泰州市',
+  861708798 => '江苏省淮安市',
+  861708799 => '江苏省淮安市',
+  861708800 => '四川省成都市',
+  861708801 => '四川省成都市',
+  861708802 => '四川省成都市',
+  861708803 => '四川省成都市',
+  861708804 => '四川省乐山市',
+  861708805 => '四川省乐山市',
+  861708806 => '四川省乐山市',
+  861708807 => '四川省乐山市',
+  861708808 => '四川省乐山市',
+  861708809 => '四川省乐山市',
+  86170881 => '四川省成都市',
+  86170882 => '海南省海口市',
+  86170883 => '重庆市',
+  861708840 => '江西省萍乡市',
+  861708841 => '江西省萍乡市',
+  861708842 => '江西省萍乡市',
+  861708843 => '江西省萍乡市',
+  861708844 => '江西省新余市',
+  861708845 => '江西省新余市',
+  861708846 => '江西省新余市',
+  861708847 => '江西省新余市',
+  861708848 => '江西省景德镇市',
+  861708849 => '江西省景德镇市',
+  86170885 => '贵州省贵阳市',
+  86170886 => '云南省昆明市',
+  861708870 => '广东省江门市',
+  861708871 => '广东省江门市',
+  861708872 => '广东省江门市',
+  861708873 => '广东省江门市',
+  861708874 => '广东省江门市',
+  861708875 => '广东省茂名市',
+  861708876 => '广东省茂名市',
+  861708877 => '广东省茂名市',
+  861708878 => '广东省茂名市',
+  861708879 => '广东省茂名市',
+  86170888 => '广东省汕头市',
+  86170889 => '广东省汕头市',
+  86170890 => '新疆乌鲁木齐市',
+  861708910 => '陕西省西安市',
+  861708911 => '陕西省西安市',
+  861708912 => '陕西省西安市',
+  861708913 => '陕西省西安市',
+  861708914 => '陕西省西安市',
+  861708915 => '陕西省西安市',
+  861708916 => '陕西省榆林市',
+  861708917 => '陕西省榆林市',
+  861708918 => '陕西省榆林市',
+  861708919 => '陕西省榆林市',
+  861708920 => '广东省茂名市',
+  861708921 => '广东省茂名市',
+  861708922 => '广东省韶关市',
+  861708923 => '广东省韶关市',
+  861708924 => '广东省韶关市',
+  861708925 => '广东省韶关市',
+  861708926 => '广东省韶关市',
+  861708927 => '广东省韶关市',
+  861708928 => '广东省湛江市',
+  861708929 => '广东省湛江市',
+  861708930 => '广东省湛江市',
+  861708931 => '广东省湛江市',
+  861708932 => '广东省湛江市',
+  861708933 => '广东省湛江市',
+  861708934 => '广东省湛江市',
+  861708935 => '广东省肇庆市',
+  861708936 => '广东省肇庆市',
+  861708937 => '广东省肇庆市',
+  861708938 => '广东省肇庆市',
+  861708939 => '广东省肇庆市',
+  861708940 => '广东省肇庆市',
+  861708941 => '广东省肇庆市',
+  861708942 => '广东省中山市',
+  861708943 => '广东省珠海市',
+  861708944 => '广东省珠海市',
+  861708945 => '广东省珠海市',
+  861708946 => '广东省珠海市',
+  861708947 => '广东省珠海市',
+  861708948 => '广东省珠海市',
+  861708949 => '广东省珠海市',
+  86170895 => '宁夏银川市',
+  86170896 => '广东省中山市',
+  86170897 => '广东省中山市',
+  86170898 => '广东省珠海市',
+  86170899 => '广东省珠海市',
   86170900 => '北京市',
   86170901 => '北京市',
   86170902 => '广东省惠州市',
diff --git a/src/libphonenumber/geocoding/data/zh/86176.php b/src/libphonenumber/geocoding/data/zh/86176.php
index bdb8e864a..4545d4d8f 100644
--- a/src/libphonenumber/geocoding/data/zh/86176.php
+++ b/src/libphonenumber/geocoding/data/zh/86176.php
@@ -641,11 +641,14 @@
   861760998 => '新疆喀什地区',
   861760999 => '新疆伊犁哈萨克自治州',
   8617610 => '北京市',
+  8617611 => '北京市',
+  86176120 => '广东省广州市',
   86176121 => '上海市',
   86176122 => '天津市',
   86176123 => '重庆市',
   86176124 => '辽宁省沈阳市',
   86176125 => '江苏省南京市',
+  86176126 => '湖北省武汉市',
   86176127 => '湖北省武汉市',
   86176128 => '四川省成都市',
   861761290 => '陕西省咸阳市',
@@ -738,6 +741,16 @@
   861761477 => '内蒙古鄂尔多斯市',
   861761478 => '内蒙古巴彦淖尔市',
   861761479 => '内蒙古锡林郭勒盟',
+  861761480 => '内蒙古呼和浩特市',
+  861761481 => '内蒙古呼和浩特市',
+  861761482 => '内蒙古包头市',
+  861761483 => '内蒙古呼和浩特市',
+  861761484 => '内蒙古乌兰察布市',
+  861761485 => '内蒙古通辽市',
+  861761486 => '内蒙古赤峰市',
+  861761487 => '内蒙古赤峰市',
+  861761488 => '内蒙古呼和浩特市',
+  861761489 => '内蒙古呼和浩特市',
   8617615 => '辽宁省大连市',
   8617617 => '北京市',
   86176200 => '广东省广州市',
@@ -796,6 +809,426 @@
   861762549 => '江苏省常州市',
   86176255 => '江苏省苏州市',
   86176256 => '江苏省苏州市',
+  86176257 => '江苏省苏州市',
+  861762580 => '江苏省苏州市',
+  861762581 => '江苏省无锡市',
+  861762582 => '江苏省无锡市',
+  861762583 => '江苏省南通市',
+  861762584 => '江苏省徐州市',
+  861762585 => '江苏省扬州市',
+  861762586 => '江苏省扬州市',
+  861762587 => '江苏省徐州市',
+  861762588 => '江苏省盐城市',
+  861762589 => '江苏省常州市',
+  86176259 => '江苏省南京市',
+  8617628 => '四川省成都市',
+  8617629 => '陕西省西安市',
+  861763300 => '河北省唐山市',
+  861763301 => '河北省唐山市',
+  861763302 => '河北省唐山市',
+  861763303 => '河北省唐山市',
+  861763304 => '河北省唐山市',
+  861763305 => '河北省唐山市',
+  861763306 => '河北省廊坊市',
+  861763307 => '河北省邯郸市',
+  861763308 => '河北省邯郸市',
+  861763309 => '河北省邯郸市',
+  861763310 => '河北省邯郸市',
+  861763311 => '河北省石家庄市',
+  861763312 => '河北省保定市',
+  861763313 => '河北省张家口市',
+  861763314 => '河北省承德市',
+  861763315 => '河北省唐山市',
+  861763316 => '河北省廊坊市',
+  861763317 => '河北省沧州市',
+  861763318 => '河北省衡水市',
+  861763319 => '河北省邢台市',
+  861763320 => '河北省石家庄市',
+  861763321 => '河北省石家庄市',
+  861763322 => '河北省石家庄市',
+  861763323 => '河北省石家庄市',
+  861763324 => '河北省石家庄市',
+  861763325 => '河北省石家庄市',
+  861763326 => '河北省石家庄市',
+  861763327 => '河北省沧州市',
+  861763328 => '河北省沧州市',
+  861763329 => '河北省沧州市',
+  861763330 => '河北省保定市',
+  861763331 => '河北省保定市',
+  861763332 => '河北省保定市',
+  861763333 => '河北省保定市',
+  861763334 => '河北省保定市',
+  861763335 => '河北省秦皇岛市',
+  861763336 => '河北省秦皇岛市',
+  861763337 => '河北省张家口市',
+  861763338 => '河北省衡水市',
+  861763339 => '河北省邯郸市',
+  861763500 => '山西省忻州市',
+  861763501 => '山西省忻州市',
+  861763502 => '山西省忻州市',
+  861763503 => '山西省忻州市',
+  861763504 => '山西省朔州市',
+  861763505 => '山西省朔州市',
+  861763506 => '山西省朔州市',
+  861763507 => '山西省晋城市',
+  861763508 => '山西省晋城市',
+  861763509 => '山西省晋城市',
+  86176351 => '山西省太原市',
+  861763520 => '山西省大同市',
+  861763521 => '山西省大同市',
+  861763522 => '山西省大同市',
+  861763523 => '山西省大同市',
+  861763524 => '山西省临汾市',
+  861763525 => '山西省临汾市',
+  861763526 => '山西省临汾市',
+  861763527 => '山西省临汾市',
+  861763528 => '山西省临汾市',
+  861763529 => '山西省运城市',
+  861763530 => '山西省阳泉市',
+  861763531 => '山西省阳泉市',
+  861763532 => '山西省阳泉市',
+  861763533 => '山西省太原市',
+  861763534 => '山西省太原市',
+  861763535 => '山西省太原市',
+  861763536 => '山西省太原市',
+  861763537 => '山西省太原市',
+  861763538 => '山西省太原市',
+  861763539 => '山西省太原市',
+  861763540 => '山西省晋中市',
+  861763541 => '山西省晋中市',
+  861763542 => '山西省晋中市',
+  861763543 => '山西省晋中市',
+  861763544 => '山西省晋中市',
+  861763545 => '山西省吕梁市',
+  861763546 => '山西省吕梁市',
+  861763547 => '山西省吕梁市',
+  861763548 => '山西省吕梁市',
+  861763549 => '山西省吕梁市',
+  861763550 => '山西省长治市',
+  861763551 => '山西省长治市',
+  861763552 => '山西省长治市',
+  861763553 => '山西省长治市',
+  861763554 => '山西省长治市',
+  861763555 => '山西省长治市',
+  861763556 => '山西省运城市',
+  861763557 => '山西省运城市',
+  861763558 => '山西省运城市',
+  861763559 => '山西省运城市',
+  86176370 => '河南省商丘市',
+  86176371 => '河南省郑州市',
+  86176372 => '河南省安阳市',
+  86176373 => '河南省新乡市',
+  86176375 => '河南省平顶山市',
+  86176376 => '河南省信阳市',
+  86176377 => '河南省南阳市',
+  86176378 => '河南省郑州市',
+  8617638 => '河南省郑州市',
+  86176390 => '河南省许昌市',
+  86176391 => '河南省焦作市',
+  86176392 => '河南省鹤壁市',
+  86176393 => '河南省濮阳市',
+  86176395 => '河南省漯河市',
+  86176396 => '河南省驻马店市',
+  86176397 => '河南省周口市',
+  86176398 => '河南省三门峡市',
+  86176400 => '辽宁省沈阳市',
+  86176401 => '辽宁省沈阳市',
+  86176402 => '辽宁省沈阳市',
+  86176403 => '辽宁省大连市',
+  861764040 => '辽宁省大连市',
+  861764041 => '辽宁省大连市',
+  861764042 => '辽宁省大连市',
+  861764043 => '辽宁省沈阳市',
+  861764044 => '辽宁省沈阳市',
+  861764045 => '辽宁省沈阳市',
+  861764046 => '辽宁省丹东市',
+  861764047 => '辽宁省丹东市',
+  861764048 => '辽宁省营口市',
+  861764049 => '辽宁省营口市',
+  861764050 => '辽宁省阜新市',
+  861764051 => '辽宁省阜新市',
+  861764052 => '辽宁省辽阳市',
+  861764053 => '辽宁省辽阳市',
+  861764054 => '辽宁省沈阳市',
+  861764055 => '辽宁省沈阳市',
+  861764056 => '辽宁省朝阳市',
+  861764057 => '辽宁省朝阳市',
+  861764058 => '辽宁省盘锦市',
+  861764059 => '辽宁省盘锦市',
+  861764060 => '辽宁省锦州市',
+  861764061 => '辽宁省锦州市',
+  861764062 => '辽宁省葫芦岛市',
+  861764063 => '辽宁省葫芦岛市',
+  861764064 => '辽宁省葫芦岛市',
+  861764065 => '辽宁省鞍山市',
+  861764066 => '辽宁省鞍山市',
+  861764067 => '辽宁省鞍山市',
+  861764068 => '辽宁省鞍山市',
+  861764069 => '辽宁省鞍山市',
+  86176431 => '吉林省长春市',
+  86176432 => '吉林省吉林市',
+  86176433 => '吉林省延边朝鲜族自治州',
+  86176434 => '吉林省四平市',
+  86176435 => '吉林省通化市',
+  86176450 => '黑龙江省哈尔滨市',
+  86176451 => '黑龙江省哈尔滨市',
+  861764520 => '黑龙江省齐齐哈尔市',
+  861764521 => '黑龙江省齐齐哈尔市',
+  861764522 => '黑龙江省齐齐哈尔市',
+  861764523 => '黑龙江省齐齐哈尔市',
+  861764524 => '黑龙江省齐齐哈尔市',
+  861764525 => '黑龙江省齐齐哈尔市',
+  861764526 => '黑龙江省双鸭山市',
+  861764527 => '黑龙江省双鸭山市',
+  861764528 => '黑龙江省双鸭山市',
+  861764529 => '黑龙江省双鸭山市',
+  861764530 => '黑龙江省牡丹江市',
+  861764531 => '黑龙江省牡丹江市',
+  861764532 => '黑龙江省牡丹江市',
+  861764533 => '黑龙江省牡丹江市',
+  861764534 => '黑龙江省七台河市',
+  861764535 => '黑龙江省鸡西市',
+  861764536 => '黑龙江省鸡西市',
+  861764537 => '黑龙江省鸡西市',
+  861764538 => '黑龙江省鹤岗市',
+  861764539 => '黑龙江省鹤岗市',
+  861764540 => '黑龙江省佳木斯市',
+  861764541 => '黑龙江省佳木斯市',
+  861764542 => '黑龙江省佳木斯市',
+  861764543 => '黑龙江省佳木斯市',
+  861764544 => '黑龙江省佳木斯市',
+  861764545 => '黑龙江省哈尔滨市',
+  861764546 => '黑龙江省大庆市',
+  861764547 => '黑龙江省大庆市',
+  861764548 => '黑龙江省大庆市',
+  861764549 => '黑龙江省大庆市',
+  861764550 => '黑龙江省绥化市',
+  861764551 => '黑龙江省绥化市',
+  861764552 => '黑龙江省绥化市',
+  861764553 => '黑龙江省绥化市',
+  861764554 => '黑龙江省哈尔滨市',
+  861764555 => '黑龙江省哈尔滨市',
+  861764556 => '黑龙江省黑河市',
+  861764557 => '黑龙江省黑河市',
+  861764558 => '黑龙江省伊春市',
+  861764559 => '黑龙江省伊春市',
+  86176600 => '山东省济南市',
+  861766010 => '山东省济南市',
+  861766011 => '山东省济南市',
+  861766012 => '山东省济南市',
+  861766013 => '山东省济南市',
+  861766014 => '山东省济宁市',
+  861766015 => '山东省济宁市',
+  861766016 => '山东省济宁市',
+  861766017 => '山东省济宁市',
+  861766018 => '山东省济宁市',
+  861766019 => '山东省济宁市',
+  861766020 => '山东省莱芜市',
+  861766021 => '山东省青岛市',
+  861766022 => '山东省青岛市',
+  861766023 => '山东省青岛市',
+  861766024 => '山东省青岛市',
+  861766025 => '山东省泰安市',
+  861766026 => '山东省泰安市',
+  861766027 => '山东省淄博市',
+  861766028 => '山东省淄博市',
+  861766029 => '山东省淄博市',
+  861766030 => '山东省菏泽市',
+  861766031 => '山东省菏泽市',
+  861766032 => '山东省菏泽市',
+  861766033 => '山东省菏泽市',
+  861766034 => '山东省东营市',
+  861766035 => '山东省东营市',
+  861766036 => '山东省滨州市',
+  861766037 => '山东省滨州市',
+  861766038 => '山东省枣庄市',
+  861766039 => '山东省枣庄市',
+  861766040 => '山东省济南市',
+  861766041 => '山东省济南市',
+  861766042 => '山东省济南市',
+  861766043 => '山东省青岛市',
+  861766044 => '山东省青岛市',
+  861766045 => '山东省青岛市',
+  861766046 => '山东省烟台市',
+  861766047 => '山东省烟台市',
+  861766048 => '山东省潍坊市',
+  861766049 => '山东省临沂市',
+  861766050 => '山东省日照市',
+  861766051 => '山东省威海市',
+  861766052 => '山东省威海市',
+  861766053 => '山东省泰安市',
+  861766054 => '山东省临沂市',
+  861766055 => '山东省临沂市',
+  861766056 => '山东省临沂市',
+  861766057 => '山东省临沂市',
+  861766058 => '山东省临沂市',
+  861766059 => '山东省临沂市',
+  86176606 => '山东省青岛市',
+  861766070 => '山东省聊城市',
+  861766071 => '山东省潍坊市',
+  861766072 => '山东省潍坊市',
+  861766073 => '山东省潍坊市',
+  861766074 => '山东省潍坊市',
+  861766075 => '山东省潍坊市',
+  861766076 => '山东省潍坊市',
+  861766077 => '山东省潍坊市',
+  861766078 => '山东省东营市',
+  861766079 => '山东省威海市',
+  861766080 => '山东省德州市',
+  861766081 => '山东省德州市',
+  861766082 => '山东省烟台市',
+  861766083 => '山东省烟台市',
+  861766084 => '山东省烟台市',
+  861766085 => '山东省烟台市',
+  861766086 => '山东省烟台市',
+  861766087 => '山东省烟台市',
+  861766088 => '山东省烟台市',
+  861766089 => '山东省烟台市',
+  86176650 => '广东省广州市',
+  86176651 => '广东省广州市',
+  861766520 => '广东省深圳市',
+  861766521 => '广东省深圳市',
+  861766522 => '广东省深圳市',
+  861766523 => '广东省深圳市',
+  861766524 => '广东省深圳市',
+  861766525 => '广东省深圳市',
+  861766526 => '广东省深圳市',
+  861766527 => '广东省深圳市',
+  861766528 => '广东省深圳市',
+  861766529 => '广东省湛江市',
+  86176653 => '广东省深圳市',
+  861766540 => '广东省广州市',
+  861766541 => '广东省广州市',
+  861766542 => '广东省广州市',
+  861766543 => '广东省广州市',
+  861766544 => '广东省广州市',
+  861766545 => '广东省广州市',
+  861766546 => '广东省深圳市',
+  861766547 => '广东省深圳市',
+  861766548 => '广东省深圳市',
+  861766549 => '广东省深圳市',
+  861766610 => '广东省深圳市',
+  861766611 => '广东省深圳市',
+  861766612 => '广东省深圳市',
+  861766613 => '广东省深圳市',
+  861766614 => '广东省深圳市',
+  861766615 => '广东省佛山市',
+  861766616 => '广东省佛山市',
+  861766617 => '广东省佛山市',
+  861766618 => '广东省佛山市',
+  861766619 => '广东省佛山市',
+  861766620 => '广东省东莞市',
+  861766621 => '广东省东莞市',
+  861766622 => '广东省东莞市',
+  861766623 => '广东省东莞市',
+  861766624 => '广东省东莞市',
+  861766625 => '广东省东莞市',
+  861766626 => '广东省东莞市',
+  861766627 => '广东省珠海市',
+  861766628 => '广东省惠州市',
+  861766629 => '广东省深圳市',
+  861766630 => '广东省佛山市',
+  861766631 => '广东省佛山市',
+  861766632 => '广东省佛山市',
+  861766633 => '广东省佛山市',
+  861766634 => '广东省佛山市',
+  861766635 => '广东省佛山市',
+  861766636 => '广东省中山市',
+  861766637 => '广东省中山市',
+  861766638 => '广东省中山市',
+  861766639 => '广东省江门市',
+  861766640 => '广东省东莞市',
+  861766641 => '广东省东莞市',
+  861766642 => '广东省东莞市',
+  861766643 => '广东省佛山市',
+  861766644 => '广东省佛山市',
+  861766645 => '广东省佛山市',
+  861766646 => '广东省佛山市',
+  861766647 => '广东省中山市',
+  861766648 => '广东省中山市',
+  861766649 => '广东省江门市',
+  861767100 => '湖北省武汉市',
+  861767101 => '湖北省武汉市',
+  861767102 => '湖北省武汉市',
+  861767103 => '湖北省武汉市',
+  861767104 => '湖北省黄冈市',
+  861767105 => '湖北省黄冈市',
+  861767106 => '湖北省黄冈市',
+  861767107 => '湖北省黄冈市',
+  861767108 => '湖北省黄冈市',
+  861767109 => '湖北省黄冈市',
+  861767110 => '湖北省黄冈市',
+  861767111 => '湖北省十堰市',
+  861767112 => '湖北省十堰市',
+  861767113 => '湖北省十堰市',
+  861767114 => '湖北省十堰市',
+  861767115 => '湖北省襄樊市',
+  861767116 => '湖北省襄樊市',
+  861767117 => '湖北省襄樊市',
+  861767118 => '湖北省恩施土家族苗族自治州',
+  861767119 => '湖北省恩施土家族苗族自治州',
+  861767120 => '湖北省恩施土家族苗族自治州',
+  861767121 => '湖北省黄石市',
+  861767122 => '湖北省黄石市',
+  861767123 => '湖北省黄石市',
+  861767124 => '湖北省黄石市',
+  861767125 => '湖北省宜昌市',
+  861767126 => '湖北省宜昌市',
+  861767127 => '湖北省宜昌市',
+  861767128 => '湖北省荆门市',
+  861767129 => '湖北省荆门市',
+  86176730 => '湖南省长沙市',
+  86176731 => '湖南省长沙市',
+  861767320 => '湖南省长沙市',
+  861767321 => '湖南省长沙市',
+  861767322 => '湖南省长沙市',
+  861767323 => '湖南省长沙市',
+  861767324 => '湖南省长沙市',
+  861767325 => '湖南省长沙市',
+  861767326 => '湖南省衡阳市',
+  861767327 => '湖南省衡阳市',
+  861767328 => '湖南省衡阳市',
+  861767329 => '湖南省衡阳市',
+  861767330 => '湖南省郴州市',
+  861767331 => '湖南省郴州市',
+  861767332 => '湖南省郴州市',
+  861767333 => '湖南省益阳市',
+  861767334 => '湖南省益阳市',
+  861767335 => '湖南省常德市',
+  861767336 => '湖南省常德市',
+  861767337 => '湖南省娄底市',
+  861767338 => '湖南省娄底市',
+  861767339 => '湖南省邵阳市',
+  861767340 => '湖南省邵阳市',
+  861767341 => '湖南省永州市',
+  861767342 => '湖南省永州市',
+  861767343 => '湖南省湘西土家族苗族自治州',
+  861767344 => '湖南省怀化市',
+  861767345 => '湖南省岳阳市',
+  861767346 => '湖南省岳阳市',
+  861767347 => '湖南省岳阳市',
+  861767348 => '湖南省岳阳市',
+  861767349 => '湖南省岳阳市',
+  861767700 => '广西南宁市',
+  861767701 => '广西南宁市',
+  861767702 => '广西柳州市',
+  861767703 => '广西桂林市',
+  861767704 => '广西梧州市',
+  861767705 => '广西玉林市',
+  861767706 => '广西百色市',
+  861767707 => '广西梧州市',
+  861767708 => '广西河池市',
+  861767709 => '广西北海市',
+  861767900 => '江西省南昌市',
+  861767901 => '江西省南昌市',
+  861767902 => '江西省九江市',
+  861767903 => '江西省上饶市',
+  861767904 => '江西省抚州市',
+  861767905 => '江西省宜春市',
+  861767906 => '江西省吉安市',
+  861767907 => '江西省赣州市',
+  861767908 => '江西省南昌市',
+  861767909 => '江西省上饶市',
   86176800 => '湖南省长沙市',
   86176801 => '湖南省长沙市',
   861768020 => '湖南省长沙市',
@@ -912,6 +1345,36 @@
   861768197 => '浙江省温州市',
   861768198 => '浙江省温州市',
   861768199 => '浙江省宁波市',
+  861768200 => '安徽省合肥市',
+  861768201 => '安徽省合肥市',
+  861768202 => '安徽省蚌埠市',
+  861768203 => '安徽省六安市',
+  861768204 => '安徽省合肥市',
+  861768205 => '安徽省马鞍山市',
+  861768206 => '安徽省安庆市',
+  861768207 => '安徽省阜阳市',
+  861768208 => '安徽省阜阳市',
+  861768209 => '安徽省阜阳市',
+  861768230 => '浙江省杭州市',
+  861768231 => '浙江省杭州市',
+  861768232 => '浙江省杭州市',
+  861768233 => '浙江省杭州市',
+  861768234 => '浙江省杭州市',
+  861768235 => '浙江省宁波市',
+  861768236 => '浙江省宁波市',
+  861768237 => '浙江省宁波市',
+  861768238 => '浙江省宁波市',
+  861768239 => '浙江省宁波市',
+  861768240 => '浙江省台州市',
+  861768241 => '浙江省温州市',
+  861768242 => '浙江省金华市',
+  861768243 => '浙江省湖州市',
+  861768244 => '浙江省杭州市',
+  861768245 => '浙江省宁波市',
+  861768246 => '浙江省宁波市',
+  861768247 => '浙江省绍兴市',
+  861768248 => '浙江省杭州市',
+  861768249 => '浙江省嘉兴市',
   861768300 => '四川省泸州市',
   861768301 => '四川省绵阳市',
   861768302 => '四川省内江市',
@@ -932,6 +1395,16 @@
   861768317 => '四川省南充市',
   861768318 => '四川省南充市',
   861768319 => '四川省达州市',
+  861768320 => '四川省达州市',
+  861768321 => '四川省南充市',
+  861768322 => '四川省南充市',
+  861768323 => '四川省南充市',
+  861768324 => '四川省成都市',
+  861768325 => '四川省绵阳市',
+  861768326 => '四川省绵阳市',
+  861768327 => '四川省绵阳市',
+  861768328 => '四川省成都市',
+  861768329 => '四川省达州市',
   861768370 => '湖北省宜昌市',
   861768371 => '湖北省宜昌市',
   861768372 => '湖北省荆州市',
@@ -983,6 +1456,26 @@
   861768527 => '贵州省毕节地区',
   861768528 => '贵州省六盘水市',
   861768529 => '贵州省黔西南布依族苗族自治州',
+  861768530 => '贵州省贵阳市',
+  861768531 => '贵州省贵阳市',
+  861768532 => '贵州省遵义市',
+  861768533 => '贵州省黔南布依族苗族自治州',
+  861768534 => '贵州省贵阳市',
+  861768535 => '贵州省黔东南苗族侗族自治州',
+  861768536 => '贵州省铜仁地区',
+  861768537 => '贵州省安顺市',
+  861768538 => '贵州省黔南布依族苗族自治州',
+  861768539 => '贵州省铜仁地区',
+  861768540 => '山东省济南市',
+  861768541 => '山东省济南市',
+  861768542 => '山东省济南市',
+  861768543 => '山东省滨州市',
+  861768544 => '山东省青岛市',
+  861768545 => '山东省青岛市',
+  861768546 => '山东省东营市',
+  861768547 => '山东省青岛市',
+  861768548 => '山东省烟台市',
+  861768549 => '山东省烟台市',
   86176855 => '山东省青岛市',
   86176856 => '山东省淄博市',
   86176857 => '山东省青岛市',
@@ -1044,6 +1537,16 @@
   861768707 => '云南省玉溪市',
   861768708 => '云南省楚雄彝族自治州',
   861768709 => '云南省普洱市',
+  861768710 => '云南省昆明市',
+  861768711 => '云南省昆明市',
+  861768712 => '云南省昆明市',
+  861768713 => '云南省红河哈尼族彝族自治州',
+  861768714 => '云南省曲靖市',
+  861768715 => '云南省保山市',
+  861768716 => '云南省曲靖市',
+  861768717 => '云南省昆明市',
+  861768718 => '云南省丽江市',
+  861768719 => '云南省昆明市',
   861768740 => '广西防城港市',
   861768741 => '广西南宁市',
   861768742 => '广西柳州市',
@@ -1180,7 +1683,38 @@
   861768947 => '福建省泉州市',
   861768948 => '福建省泉州市',
   861768949 => '福建省泉州市',
+  861768950 => '西藏拉萨市',
+  861768951 => '西藏拉萨市',
+  861768952 => '西藏日喀则地区',
+  861768953 => '西藏山南地区',
+  861768954 => '西藏林芝地区',
+  861768955 => '西藏昌都地区',
+  861768956 => '西藏那曲地区',
+  861768957 => '西藏阿里地区',
+  861768958 => '西藏拉萨市',
+  861768959 => '西藏拉萨市',
+  861768960 => '福建省福州市',
+  861768961 => '福建省南平市',
+  861768962 => '福建省南平市',
+  861768963 => '福建省龙岩市',
+  861768964 => '福建省三明市',
+  861768965 => '福建省莆田市',
+  861768966 => '福建省宁德市',
+  861768967 => '福建省泉州市',
+  861768968 => '福建省泉州市',
+  861768969 => '福建省泉州市',
+  86176897 => '海南省海口市',
   86176898 => '海南省海口市',
+  861768990 => '福建省莆田市',
+  861768991 => '福建省宁德市',
+  861768992 => '福建省漳州市',
+  861768993 => '福建省漳州市',
+  861768994 => '福建省厦门市',
+  861768995 => '福建省龙岩市',
+  861768996 => '福建省泉州市',
+  861768997 => '福建省福州市',
+  861768998 => '福建省福州市',
+  861768999 => '福建省福州市',
   86176910 => '陕西省西安市',
   86176911 => '陕西省西安市',
   861769120 => '陕西省西安市',
@@ -1193,6 +1727,16 @@
   861769127 => '陕西省宝鸡市',
   861769128 => '陕西省商洛市',
   861769129 => '陕西省铜川市',
+  861769130 => '陕西省榆林市',
+  861769131 => '陕西省榆林市',
+  861769132 => '陕西省延安市',
+  861769133 => '陕西省渭南市',
+  861769134 => '陕西省西安市',
+  861769135 => '陕西省西安市',
+  861769136 => '陕西省商洛市',
+  861769137 => '陕西省宝鸡市',
+  861769138 => '陕西省安康市',
+  861769139 => '陕西省西安市',
   861769200 => '河北省邯郸市',
   861769201 => '河北省邯郸市',
   861769202 => '河北省邯郸市',
@@ -1257,6 +1801,16 @@
   861769308 => '甘肃省天水市',
   861769309 => '甘肃省陇南市',
   86176931 => '甘肃省兰州市',
+  861769320 => '甘肃省定西市',
+  861769321 => '甘肃省兰州市',
+  861769322 => '甘肃省兰州市',
+  861769323 => '甘肃省兰州市',
+  861769324 => '甘肃省兰州市',
+  861769325 => '甘肃省兰州市',
+  861769326 => '甘肃省张掖市',
+  861769327 => '甘肃省酒泉市',
+  861769328 => '甘肃省天水市',
+  861769329 => '甘肃省兰州市',
   861769500 => '宁夏银川市',
   861769501 => '宁夏银川市',
   861769502 => '宁夏石嘴山市',
@@ -1267,6 +1821,16 @@
   861769507 => '宁夏银川市',
   861769508 => '宁夏银川市',
   861769509 => '宁夏银川市',
+  861769510 => '宁夏银川市',
+  861769511 => '宁夏银川市',
+  861769512 => '宁夏石嘴山市',
+  861769513 => '宁夏吴忠市',
+  861769514 => '宁夏固原市',
+  861769515 => '宁夏中卫市',
+  861769516 => '宁夏银川市',
+  861769517 => '宁夏银川市',
+  861769518 => '宁夏银川市',
+  861769519 => '宁夏银川市',
   86176960 => '山西省太原市',
   861769610 => '山西省太原市',
   861769611 => '山西省太原市',
@@ -1298,6 +1862,16 @@
   861769707 => '青海省海西蒙古族藏族自治州',
   861769708 => '青海省西宁市',
   861769709 => '青海省海西蒙古族藏族自治州',
+  861769710 => '青海省西宁市',
+  861769711 => '青海省西宁市',
+  861769712 => '青海省海东地区',
+  861769713 => '青海省黄南藏族自治州',
+  861769714 => '青海省西宁市',
+  861769715 => '青海省西宁市',
+  861769716 => '青海省海南藏族自治州',
+  861769717 => '青海省西宁市',
+  861769718 => '青海省西宁市',
+  861769719 => '青海省海西蒙古族藏族自治州',
   861769800 => '河南省许昌市',
   861769801 => '河南省许昌市',
   861769802 => '河南省许昌市',
@@ -1390,4 +1964,14 @@
   861769927 => '新疆伊犁哈萨克自治州',
   861769928 => '新疆阿克苏地区',
   861769929 => '新疆阿克苏地区',
+  861769930 => '新疆喀什地区',
+  861769931 => '新疆喀什地区',
+  861769932 => '新疆和田地区',
+  861769933 => '新疆乌鲁木齐市',
+  861769934 => '新疆乌鲁木齐市',
+  861769935 => '新疆昌吉回族自治州',
+  861769936 => '新疆阿克苏地区',
+  861769937 => '新疆伊犁哈萨克自治州',
+  861769938 => '新疆伊犁哈萨克自治州',
+  861769939 => '新疆伊犁哈萨克自治州',
 );
diff --git a/src/libphonenumber/geocoding/data/zh/86177.php b/src/libphonenumber/geocoding/data/zh/86177.php
index aae9de5ae..03dba1ba7 100644
--- a/src/libphonenumber/geocoding/data/zh/86177.php
+++ b/src/libphonenumber/geocoding/data/zh/86177.php
@@ -695,6 +695,25 @@
   861770999 => '新疆伊犁哈萨克自治州',
   8617710 => '北京市',
   86177110 => '四川省成都市',
+  861771121 => '四川省宜宾市',
+  861771122 => '四川省宜宾市',
+  861771123 => '四川省达州市',
+  861771124 => '四川省达州市',
+  861771125 => '四川省达州市',
+  861771126 => '四川省阿坝藏族羌族自治州',
+  861771127 => '四川省乐山市',
+  861771128 => '四川省成都市',
+  861771129 => '四川省成都市',
+  861771130 => '四川省成都市',
+  861771131 => '四川省成都市',
+  861771132 => '四川省成都市',
+  861771133 => '四川省巴中市',
+  861771134 => '四川省成都市',
+  861771135 => '四川省成都市',
+  861771136 => '四川省成都市',
+  861771137 => '四川省成都市',
+  861771138 => '四川省成都市',
+  861771139 => '四川省成都市',
   861771140 => '四川省绵阳市',
   861771141 => '四川省南充市',
   861771142 => '四川省泸州市',
@@ -937,6 +956,16 @@
   861771428 => '江苏省苏州市',
   861771429 => '江苏省苏州市',
   86177143 => '江苏省南京市',
+  861771440 => '江苏省南京市',
+  861771441 => '江苏省南京市',
+  861771442 => '江苏省南京市',
+  861771443 => '江苏省苏州市',
+  861771444 => '江苏省苏州市',
+  861771445 => '江苏省苏州市',
+  861771446 => '江苏省盐城市',
+  861771447 => '江苏省无锡市',
+  861771448 => '江苏省扬州市',
+  861771449 => '江苏省镇江市',
   861771500 => '江苏省南通市',
   861771501 => '江苏省南通市',
   861771502 => '江苏省南通市',
@@ -993,6 +1022,7 @@
   861771563 => '江苏省淮安市',
   861771564 => '江苏省淮安市',
   861771565 => '江苏省淮安市',
+  861771566 => '江苏省南京市',
   861771567 => '江苏省无锡市',
   861771568 => '江苏省无锡市',
   861771569 => '江苏省无锡市',
@@ -1014,6 +1044,18 @@
   861771585 => '江苏省扬州市',
   861771586 => '江苏省扬州市',
   861771587 => '江苏省扬州市',
+  861771588 => '江苏省苏州市',
+  861771589 => '江苏省苏州市',
+  861771590 => '江苏省盐城市',
+  861771591 => '江苏省盐城市',
+  861771592 => '江苏省盐城市',
+  861771593 => '江苏省盐城市',
+  861771594 => '江苏省盐城市',
+  861771595 => '江苏省常州市',
+  861771596 => '江苏省常州市',
+  861771597 => '江苏省镇江市',
+  861771598 => '江苏省镇江市',
+  861771599 => '江苏省镇江市',
   861771610 => '四川省成都市',
   861771611 => '四川省成都市',
   861771612 => '四川省成都市',
@@ -1069,6 +1111,36 @@
   861771887 => '广东省江门市',
   861771888 => '广东省惠州市',
   861771889 => '广东省惠州市',
+  861771900 => '河南省商丘市',
+  861771901 => '河南省商丘市',
+  861771902 => '河南省商丘市',
+  861771903 => '河南省商丘市',
+  861771904 => '河南省商丘市',
+  861771905 => '河南省三门峡市',
+  861771906 => '河南省平顶山市',
+  861771907 => '河南省平顶山市',
+  861771908 => '河南省三门峡市',
+  861771909 => '河南省郑州市',
+  861771910 => '河南省漯河市',
+  861771911 => '河南省周口市',
+  861771912 => '河南省周口市',
+  861771913 => '河南省漯河市',
+  861771914 => '河南省驻马店市',
+  861771915 => '河南省驻马店市',
+  861771916 => '河南省驻马店市',
+  861771917 => '河南省驻马店市',
+  861771918 => '河南省驻马店市',
+  861771919 => '河南省驻马店市',
+  861771920 => '河南省郑州市',
+  861771921 => '河南省焦作市',
+  861771922 => '河南省洛阳市',
+  861771923 => '河南省洛阳市',
+  861771924 => '河南省洛阳市',
+  861771925 => '河南省洛阳市',
+  861771926 => '河南省洛阳市',
+  861771927 => '河南省洛阳市',
+  861771928 => '河南省信阳市',
+  861771929 => '河南省鹤壁市',
   86177195 => '陕西省西安市',
   861771960 => '陕西省宝鸡市',
   861771961 => '陕西省宝鸡市',
@@ -1101,7 +1173,69 @@
   861771997 => '河南省商丘市',
   861771998 => '河南省焦作市',
   861771999 => '河南省郑州市',
-  8617720 => '天津市',
+  86177200 => '天津市',
+  86177201 => '天津市',
+  861772020 => '湖北省武汉市',
+  861772021 => '湖北省武汉市',
+  861772022 => '湖北省武汉市',
+  861772023 => '湖北省鄂州市',
+  861772024 => '湖北省孝感市',
+  861772025 => '湖北省孝感市',
+  861772026 => '湖北省十堰市',
+  861772027 => '湖北省随州市',
+  861772028 => '湖北省荆门市',
+  861772029 => '湖北省黄石市',
+  861772030 => '湖北省恩施土家族苗族自治州',
+  861772031 => '湖北省咸宁市',
+  861772032 => '湖北省咸宁市',
+  861772033 => '湖北省咸宁市',
+  861772034 => '湖北省咸宁市',
+  861772035 => '湖北省荆门市',
+  861772036 => '湖北省荆门市',
+  861772037 => '湖北省荆门市',
+  861772038 => '湖北省荆门市',
+  861772039 => '湖北省宜昌市',
+  861772040 => '湖北省宜昌市',
+  861772041 => '湖北省宜昌市',
+  861772042 => '湖北省恩施土家族苗族自治州',
+  861772043 => '湖北省恩施土家族苗族自治州',
+  861772044 => '湖北省武汉市',
+  861772045 => '湖北省鄂州市',
+  861772046 => '湖北省孝感市',
+  861772047 => '湖北省孝感市',
+  861772048 => '湖北省武汉市',
+  861772049 => '湖北省武汉市',
+  86177205 => '湖北省武汉市',
+  861772060 => '福建省泉州市',
+  861772061 => '福建省泉州市',
+  861772062 => '福建省泉州市',
+  861772063 => '福建省泉州市',
+  861772064 => '福建省泉州市',
+  861772065 => '福建省泉州市',
+  861772066 => '福建省宁德市',
+  861772067 => '福建省宁德市',
+  861772068 => '福建省南平市',
+  861772069 => '福建省南平市',
+  861772070 => '福建省南平市',
+  861772071 => '福建省福州市',
+  861772072 => '福建省福州市',
+  861772073 => '福建省福州市',
+  861772074 => '福建省福州市',
+  861772075 => '福建省福州市',
+  861772076 => '福建省福州市',
+  861772077 => '福建省福州市',
+  861772078 => '福建省福州市',
+  861772079 => '福建省福州市',
+  861772080 => '福建省福州市',
+  861772081 => '福建省福州市',
+  861772082 => '福建省莆田市',
+  861772083 => '福建省莆田市',
+  861772084 => '福建省莆田市',
+  861772085 => '福建省莆田市',
+  861772086 => '福建省厦门市',
+  861772087 => '福建省厦门市',
+  861772088 => '福建省厦门市',
+  861772089 => '福建省龙岩市',
   86177210 => '上海市',
   86177215 => '江苏省南京市',
   861772160 => '江苏省南通市',
@@ -1124,6 +1258,26 @@
   861772177 => '江苏省徐州市',
   861772178 => '江苏省徐州市',
   861772179 => '江苏省徐州市',
+  861772180 => '四川省南充市',
+  861772181 => '四川省南充市',
+  861772182 => '四川省南充市',
+  861772183 => '四川省成都市',
+  861772184 => '四川省成都市',
+  861772185 => '四川省德阳市',
+  861772186 => '四川省成都市',
+  861772187 => '四川省成都市',
+  861772188 => '四川省成都市',
+  861772189 => '四川省绵阳市',
+  861772190 => '四川省绵阳市',
+  861772191 => '四川省绵阳市',
+  861772192 => '四川省南充市',
+  861772193 => '四川省南充市',
+  861772194 => '四川省南充市',
+  861772195 => '四川省成都市',
+  861772196 => '四川省成都市',
+  861772197 => '四川省泸州市',
+  861772198 => '四川省泸州市',
+  861772199 => '四川省泸州市',
   861772200 => '广东省阳江市',
   861772201 => '广东省梅州市',
   861772202 => '广东省珠海市',
@@ -1188,7 +1342,21 @@
   861772297 => '广东省揭阳市',
   861772298 => '广东省阳江市',
   861772299 => '广东省河源市',
-  8617723 => '重庆市',
+  86177230 => '重庆市',
+  86177231 => '重庆市',
+  86177232 => '重庆市',
+  861772340 => '四川省巴中市',
+  861772341 => '四川省巴中市',
+  861772342 => '四川省达州市',
+  861772343 => '四川省广元市',
+  861772344 => '四川省成都市',
+  861772345 => '四川省甘孜藏族自治州',
+  861772346 => '四川省攀枝花市',
+  861772347 => '四川省雅安市',
+  861772348 => '四川省雅安市',
+  861772349 => '四川省成都市',
+  86177235 => '重庆市',
+  86177236 => '重庆市',
   861772400 => '广东省广州市',
   861772401 => '广东省广州市',
   861772402 => '广东省广州市',
@@ -1368,6 +1536,42 @@
   861772927 => '陕西省铜川市',
   861772928 => '陕西省榆林市',
   861772929 => '陕西省西安市',
+  861772930 => '陕西省宝鸡市',
+  861772931 => '陕西省宝鸡市',
+  861772932 => '陕西省宝鸡市',
+  861772933 => '陕西省宝鸡市',
+  861772934 => '陕西省宝鸡市',
+  861772935 => '陕西省宝鸡市',
+  861772936 => '陕西省宝鸡市',
+  861772937 => '陕西省宝鸡市',
+  861772938 => '陕西省西安市',
+  861772939 => '陕西省西安市',
+  861772950 => '陕西省西安市',
+  861772951 => '陕西省西安市',
+  861772952 => '陕西省安康市',
+  861772953 => '陕西省延安市',
+  861772954 => '陕西省延安市',
+  86177296 => '重庆市',
+  861772970 => '河南省濮阳市',
+  861772971 => '河南省濮阳市',
+  861772972 => '河南省郑州市',
+  861772973 => '河南省郑州市',
+  861772974 => '河南省郑州市',
+  861772975 => '河南省郑州市',
+  861772976 => '河南省郑州市',
+  861772977 => '河南省郑州市',
+  861772978 => '河南省郑州市',
+  861772979 => '河南省郑州市',
+  861772980 => '四川省泸州市',
+  861772981 => '四川省泸州市',
+  861772982 => '四川省成都市',
+  861772983 => '四川省成都市',
+  861772984 => '四川省成都市',
+  861772985 => '四川省宜宾市',
+  861772986 => '四川省南充市',
+  861772987 => '四川省成都市',
+  861772988 => '四川省南充市',
+  861772989 => '四川省德阳市',
   861772990 => '安徽省淮南市',
   861772991 => '安徽省芜湖市',
   861772992 => '安徽省宣城市',
@@ -1379,6 +1583,11 @@
   861772998 => '安徽省六安市',
   861772999 => '安徽省芜湖市',
   86177300 => '安徽省合肥市',
+  861773020 => '安徽省合肥市',
+  861773021 => '安徽省合肥市',
+  861773022 => '安徽省合肥市',
+  861773023 => '安徽省合肥市',
+  861773024 => '安徽省淮北市',
   861773030 => '安徽省芜湖市',
   861773031 => '安徽省芜湖市',
   861773032 => '安徽省芜湖市',
@@ -1386,6 +1595,42 @@
   861773034 => '安徽省阜阳市',
   861773035 => '安徽省阜阳市',
   861773036 => '安徽省阜阳市',
+  861773040 => '安徽省芜湖市',
+  861773041 => '安徽省阜阳市',
+  861773042 => '安徽省宿州市',
+  861773043 => '安徽省马鞍山市',
+  861773044 => '安徽省合肥市',
+  861773050 => '河北省唐山市',
+  861773051 => '河北省唐山市',
+  861773052 => '河北省唐山市',
+  861773053 => '河北省沧州市',
+  861773054 => '河北省唐山市',
+  861773055 => '河北省石家庄市',
+  861773056 => '河北省石家庄市',
+  861773057 => '河北省保定市',
+  861773058 => '河北省承德市',
+  861773059 => '河北省邯郸市',
+  86177306 => '陕西省西安市',
+  861773070 => '陕西省渭南市',
+  861773071 => '陕西省渭南市',
+  861773072 => '陕西省渭南市',
+  861773073 => '陕西省渭南市',
+  861773074 => '陕西省汉中市',
+  861773075 => '陕西省汉中市',
+  861773076 => '陕西省汉中市',
+  861773077 => '陕西省汉中市',
+  861773078 => '陕西省榆林市',
+  861773079 => '陕西省榆林市',
+  861773080 => '河南省安阳市',
+  861773081 => '河南省安阳市',
+  861773082 => '河南省平顶山市',
+  861773083 => '河南省信阳市',
+  861773084 => '河南省信阳市',
+  861773085 => '河南省信阳市',
+  861773086 => '河南省许昌市',
+  861773087 => '河南省许昌市',
+  861773088 => '河南省新乡市',
+  861773089 => '河南省新乡市',
   86177310 => '河北省邯郸市',
   86177311 => '河北省石家庄市',
   86177312 => '河北省保定市',
@@ -1545,6 +1790,16 @@
   861773457 => '河北省石家庄市',
   861773458 => '河北省石家庄市',
   861773459 => '河北省石家庄市',
+  861773460 => '陕西省宝鸡市',
+  861773461 => '陕西省宝鸡市',
+  861773462 => '陕西省西安市',
+  861773463 => '陕西省西安市',
+  861773464 => '陕西省安康市',
+  861773465 => '陕西省汉中市',
+  861773466 => '陕西省榆林市',
+  861773467 => '陕西省商洛市',
+  861773468 => '陕西省渭南市',
+  861773469 => '陕西省渭南市',
   861773470 => '河南省商丘市',
   861773471 => '河南省商丘市',
   861773472 => '河南省许昌市',
@@ -1783,7 +2038,69 @@
   861773977 => '河南省郑州市',
   861773978 => '河南省郑州市',
   861773979 => '河南省郑州市',
-  8617740 => '辽宁省沈阳市',
+  86177398 => '甘肃省兰州市',
+  86177399 => '甘肃省兰州市',
+  86177400 => '辽宁省沈阳市',
+  861774010 => '四川省遂宁市',
+  861774011 => '四川省广安市',
+  861774012 => '四川省泸州市',
+  861774013 => '四川省绵阳市',
+  861774014 => '四川省绵阳市',
+  861774015 => '四川省南充市',
+  861774016 => '四川省南充市',
+  861774017 => '四川省成都市',
+  861774018 => '四川省成都市',
+  861774019 => '四川省成都市',
+  861774020 => '四川省成都市',
+  861774021 => '四川省成都市',
+  861774022 => '四川省成都市',
+  861774023 => '四川省乐山市',
+  861774024 => '四川省绵阳市',
+  861774025 => '四川省内江市',
+  861774026 => '四川省德阳市',
+  861774027 => '四川省南充市',
+  861774028 => '四川省宜宾市',
+  861774029 => '四川省自贡市',
+  861774030 => '河北省邢台市',
+  861774031 => '河北省邯郸市',
+  861774032 => '河北省邯郸市',
+  861774033 => '河北省邯郸市',
+  861774034 => '河北省邯郸市',
+  861774040 => '河南省郑州市',
+  861774041 => '河南省郑州市',
+  861774042 => '河南省洛阳市',
+  861774043 => '河南省洛阳市',
+  861774044 => '河南省驻马店市',
+  861774045 => '河南省周口市',
+  861774046 => '河南省周口市',
+  861774047 => '河南省商丘市',
+  861774048 => '河南省新乡市',
+  861774049 => '河南省安阳市',
+  861774050 => '湖北省武汉市',
+  861774051 => '湖北省武汉市',
+  861774052 => '湖北省武汉市',
+  861774053 => '湖北省武汉市',
+  861774054 => '湖北省武汉市',
+  861774055 => '湖北省恩施土家族苗族自治州',
+  861774056 => '湖北省襄樊市',
+  861774057 => '湖北省襄樊市',
+  861774058 => '湖北省襄樊市',
+  861774059 => '湖北省襄樊市',
+  861774060 => '湖北省荆门市',
+  861774061 => '湖北省荆门市',
+  861774062 => '湖北省黄冈市',
+  861774063 => '湖北省黄冈市',
+  861774064 => '湖北省黄冈市',
+  861774070 => '西藏日喀则地区',
+  861774071 => '西藏拉萨市',
+  861774072 => '西藏日喀则地区',
+  861774073 => '西藏山南地区',
+  861774074 => '西藏林芝地区',
+  861774075 => '西藏昌都地区',
+  861774076 => '西藏那曲地区',
+  861774077 => '西藏阿里地区',
+  861774078 => '西藏拉萨市',
+  861774079 => '西藏拉萨市',
   86177410 => '辽宁省沈阳市',
   86177411 => '辽宁省大连市',
   86177412 => '辽宁省鞍山市',
@@ -1807,6 +2124,16 @@
   861774247 => '陕西省安康市',
   861774248 => '陕西省渭南市',
   861774249 => '陕西省西安市',
+  861774250 => '湖南省岳阳市',
+  861774251 => '湖南省长沙市',
+  861774252 => '湖南省长沙市',
+  861774253 => '湖南省长沙市',
+  861774254 => '湖南省衡阳市',
+  861774255 => '湖南省郴州市',
+  861774256 => '湖南省常德市',
+  861774257 => '湖南省益阳市',
+  861774258 => '湖南省娄底市',
+  861774259 => '湖南省邵阳市',
   86177427 => '辽宁省盘锦市',
   86177429 => '辽宁省葫芦岛市',
   8617743 => '吉林省长春市',
@@ -1830,6 +2157,7 @@
   861774437 => '四川省德阳市',
   861774438 => '四川省乐山市',
   861774439 => '四川省凉山彝族自治州',
+  86177445 => '北京市',
   86177451 => '黑龙江省哈尔滨市',
   861774550 => '黑龙江省绥化市',
   861774551 => '黑龙江省绥化市',
@@ -1842,7 +2170,27 @@
   861774558 => '黑龙江省大庆市',
   861774559 => '黑龙江省大庆市',
   86177456 => '黑龙江省哈尔滨市',
-  8617746 => '北京市',
+  861774600 => '福建省泉州市',
+  861774601 => '福建省泉州市',
+  861774602 => '福建省泉州市',
+  861774603 => '福建省宁德市',
+  861774604 => '福建省厦门市',
+  861774605 => '福建省莆田市',
+  861774606 => '福建省南平市',
+  861774607 => '福建省福州市',
+  861774608 => '福建省福州市',
+  861774609 => '福建省福州市',
+  86177465 => '北京市',
+  861774690 => '河南省平顶山市',
+  861774691 => '河南省南阳市',
+  861774692 => '河南省焦作市',
+  861774693 => '河南省鹤壁市',
+  861774694 => '河南省三门峡市',
+  861774695 => '河南省濮阳市',
+  861774696 => '河南省郑州市',
+  861774697 => '河南省驻马店市',
+  861774698 => '河南省漯河市',
+  861774699 => '河南省许昌市',
   86177470 => '内蒙古呼伦贝尔市',
   86177471 => '内蒙古呼和浩特市',
   86177472 => '内蒙古包头市',
@@ -1915,6 +2263,7 @@
   861774927 => '陕西省宝鸡市',
   861774928 => '陕西省西安市',
   861774929 => '陕西省西安市',
+  86177493 => '陕西省西安市',
   861774940 => '河南省安阳市',
   861774941 => '河南省驻马店市',
   861774942 => '河南省漯河市',
@@ -1926,6 +2275,16 @@
   861774948 => '河南省商丘市',
   861774949 => '河南省商丘市',
   86177497 => '上海市',
+  861774980 => '河北省邢台市',
+  861774981 => '河北省石家庄市',
+  861774982 => '河北省石家庄市',
+  861774983 => '河北省沧州市',
+  861774984 => '河北省唐山市',
+  861774985 => '河北省张家口市',
+  861774986 => '河北省秦皇岛市',
+  861774987 => '河北省衡水市',
+  861774988 => '河北省保定市',
+  861774989 => '河北省保定市',
   861775000 => '福建省厦门市',
   861775001 => '福建省厦门市',
   861775002 => '福建省泉州市',
@@ -1989,6 +2348,7 @@
   861775069 => '福建省漳州市',
   86177507 => '福建省泉州市',
   86177508 => '福建省泉州市',
+  86177509 => '福建省泉州市',
   861775100 => '江苏省南京市',
   861775101 => '江苏省南京市',
   861775102 => '江苏省南京市',
@@ -2062,6 +2422,56 @@
   861775197 => '江苏省徐州市',
   861775198 => '江苏省徐州市',
   861775199 => '江苏省徐州市',
+  861775200 => '甘肃省定西市',
+  861775201 => '甘肃省定西市',
+  861775202 => '甘肃省定西市',
+  861775203 => '甘肃省定西市',
+  861775204 => '甘肃省平凉市',
+  861775205 => '甘肃省平凉市',
+  861775206 => '甘肃省平凉市',
+  861775207 => '甘肃省庆阳市',
+  861775208 => '甘肃省庆阳市',
+  861775209 => '甘肃省庆阳市',
+  861775260 => '湖南省湘西土家族苗族自治州',
+  861775261 => '湖南省湘西土家族苗族自治州',
+  861775262 => '湖南省湘西土家族苗族自治州',
+  861775263 => '湖南省湘西土家族苗族自治州',
+  861775264 => '湖南省张家界市',
+  861775265 => '湖南省张家界市',
+  861775266 => '湖南省邵阳市',
+  861775267 => '湖南省邵阳市',
+  861775268 => '湖南省娄底市',
+  861775269 => '湖南省娄底市',
+  861775270 => '湖南省益阳市',
+  861775271 => '湖南省益阳市',
+  861775272 => '湖南省常德市',
+  861775273 => '湖南省常德市',
+  861775274 => '湖南省郴州市',
+  861775275 => '湖南省郴州市',
+  861775276 => '湖南省衡阳市',
+  861775277 => '湖南省衡阳市',
+  861775278 => '湖南省长沙市',
+  861775279 => '湖南省长沙市',
+  861775280 => '湖南省长沙市',
+  861775281 => '湖南省长沙市',
+  861775282 => '湖南省岳阳市',
+  861775283 => '湖南省岳阳市',
+  861775284 => '湖南省长沙市',
+  861775285 => '湖南省长沙市',
+  861775286 => '湖南省长沙市',
+  861775287 => '湖南省长沙市',
+  861775288 => '湖南省长沙市',
+  861775289 => '湖南省长沙市',
+  861775290 => '河北省邯郸市',
+  861775291 => '河北省邯郸市',
+  861775292 => '河北省邯郸市',
+  861775293 => '河北省邯郸市',
+  861775294 => '河北省邯郸市',
+  861775295 => '河北省邯郸市',
+  861775296 => '河北省邯郸市',
+  861775297 => '河北省邯郸市',
+  861775298 => '河北省邯郸市',
+  861775299 => '河北省石家庄市',
   86177530 => '山东省菏泽市',
   86177531 => '山东省济南市',
   86177532 => '山东省青岛市',
@@ -2221,6 +2631,26 @@
   861776017 => '四川省遂宁市',
   861776018 => '四川省成都市',
   861776019 => '四川省自贡市',
+  861776080 => '安徽省宿州市',
+  861776081 => '安徽省宿州市',
+  861776082 => '安徽省蚌埠市',
+  861776083 => '安徽省蚌埠市',
+  861776084 => '安徽省蚌埠市',
+  861776085 => '安徽省安庆市',
+  861776086 => '安徽省安庆市',
+  861776087 => '安徽省安庆市',
+  861776088 => '安徽省安庆市',
+  861776089 => '安徽省宣城市',
+  861776090 => '四川省雅安市',
+  861776091 => '四川省攀枝花市',
+  861776092 => '四川省凉山彝族自治州',
+  861776093 => '四川省绵阳市',
+  861776094 => '四川省成都市',
+  861776095 => '四川省乐山市',
+  861776096 => '四川省成都市',
+  861776097 => '四川省德阳市',
+  861776098 => '四川省自贡市',
+  861776099 => '四川省成都市',
   861776101 => '四川省绵阳市',
   861776102 => '四川省绵阳市',
   861776103 => '四川省绵阳市',
@@ -2258,7 +2688,32 @@
   861776147 => '四川省雅安市',
   861776148 => '四川省巴中市',
   861776149 => '四川省阿坝藏族羌族自治州',
-  8617762 => '山东省青岛市',
+  861776160 => '河南省南阳市',
+  861776161 => '河南省南阳市',
+  861776162 => '河南省南阳市',
+  861776163 => '河南省鹤壁市',
+  861776164 => '河南省焦作市',
+  861776165 => '河南省焦作市',
+  861776166 => '河南省郑州市',
+  861776167 => '河南省周口市',
+  861776168 => '河南省焦作市',
+  861776169 => '河南省濮阳市',
+  861776190 => '江苏省苏州市',
+  861776191 => '江苏省苏州市',
+  861776192 => '江苏省苏州市',
+  861776193 => '江苏省苏州市',
+  861776194 => '江苏省苏州市',
+  861776195 => '江苏省南通市',
+  861776196 => '江苏省南通市',
+  861776197 => '江苏省扬州市',
+  861776198 => '江苏省扬州市',
+  861776199 => '江苏省扬州市',
+  86177620 => '山东省青岛市',
+  861776230 => '湖北省宜昌市',
+  861776231 => '湖北省恩施土家族苗族自治州',
+  861776232 => '湖北省武汉市',
+  861776233 => '湖北省武汉市',
+  861776234 => '湖北省武汉市',
   861776300 => '湖北省武汉市',
   861776301 => '湖北省武汉市',
   861776302 => '湖北省恩施土家族苗族自治州',
@@ -2275,7 +2730,28 @@
   861776412 => '湖北省武汉市',
   861776413 => '湖北省十堰市',
   861776414 => '湖北省荆州市',
+  861776430 => '安徽省阜阳市',
+  861776431 => '安徽省阜阳市',
+  861776432 => '安徽省芜湖市',
+  861776433 => '安徽省黄山市',
+  861776434 => '安徽省安庆市',
+  861776435 => '安徽省宣城市',
+  861776436 => '安徽省铜陵市',
+  861776437 => '安徽省池州市',
+  861776438 => '安徽省蚌埠市',
+  861776439 => '安徽省六安市',
   86177645 => '浙江省杭州市',
+  86177648 => '重庆市',
+  861776520 => '广东省珠海市',
+  861776521 => '广东省珠海市',
+  861776522 => '广东省珠海市',
+  861776523 => '广东省珠海市',
+  861776524 => '广东省广州市',
+  861776525 => '广东省广州市',
+  861776526 => '广东省广州市',
+  861776527 => '广东省广州市',
+  861776528 => '广东省深圳市',
+  861776529 => '广东省深圳市',
   861776560 => '广东省佛山市',
   861776561 => '广东省佛山市',
   861776562 => '广东省佛山市',
@@ -2296,6 +2772,38 @@
   861776577 => '广东省江门市',
   861776578 => '广东省江门市',
   861776579 => '广东省江门市',
+  86177659 => '广东省珠海市',
+  861776600 => '江苏省扬州市',
+  861776601 => '江苏省泰州市',
+  861776602 => '江苏省泰州市',
+  861776603 => '江苏省泰州市',
+  861776604 => '江苏省泰州市',
+  861776605 => '江苏省南京市',
+  861776606 => '江苏省南京市',
+  861776607 => '江苏省南京市',
+  861776608 => '江苏省南京市',
+  861776609 => '江苏省南京市',
+  861776610 => '江苏省南京市',
+  861776611 => '江苏省淮安市',
+  861776612 => '江苏省淮安市',
+  861776613 => '江苏省淮安市',
+  861776614 => '江苏省淮安市',
+  861776615 => '江苏省宿迁市',
+  861776616 => '江苏省无锡市',
+  861776617 => '江苏省无锡市',
+  861776618 => '江苏省无锡市',
+  861776619 => '江苏省无锡市',
+  86177666 => '陕西省西安市',
+  861776670 => '四川省达州市',
+  861776671 => '四川省雅安市',
+  861776672 => '四川省绵阳市',
+  861776673 => '四川省阿坝藏族羌族自治州',
+  861776674 => '四川省凉山彝族自治州',
+  861776675 => '四川省凉山彝族自治州',
+  861776676 => '四川省凉山彝族自治州',
+  861776677 => '四川省成都市',
+  861776678 => '四川省南充市',
+  861776679 => '四川省自贡市',
   861776700 => '浙江省舟山市',
   861776701 => '浙江省舟山市',
   861776702 => '浙江省舟山市',
@@ -2307,6 +2815,26 @@
   861776708 => '浙江省杭州市',
   861776709 => '浙江省杭州市',
   86177671 => '浙江省杭州市',
+  861776720 => '浙江省杭州市',
+  861776721 => '浙江省杭州市',
+  861776722 => '浙江省杭州市',
+  861776723 => '浙江省杭州市',
+  861776724 => '浙江省杭州市',
+  861776725 => '浙江省杭州市',
+  861776726 => '浙江省杭州市',
+  861776727 => '浙江省杭州市',
+  861776728 => '浙江省丽水市',
+  861776729 => '浙江省丽水市',
+  861776730 => '浙江省宁波市',
+  861776731 => '浙江省宁波市',
+  861776732 => '浙江省宁波市',
+  861776733 => '浙江省宁波市',
+  861776734 => '浙江省宁波市',
+  861776735 => '浙江省温州市',
+  861776736 => '浙江省温州市',
+  861776737 => '浙江省温州市',
+  861776738 => '浙江省衢州市',
+  861776739 => '浙江省衢州市',
   861776740 => '新疆乌鲁木齐市',
   861776741 => '新疆乌鲁木齐市',
   861776742 => '新疆和田地区',
@@ -2437,6 +2965,49 @@
   861776895 => '江苏省盐城市',
   861776896 => '江苏省盐城市',
   861776897 => '江苏省盐城市',
+  861776898 => '江苏省徐州市',
+  861776899 => '江苏省连云港市',
+  86177690 => '河北省石家庄市',
+  861776920 => '湖南省张家界市',
+  861776921 => '湖南省张家界市',
+  861776922 => '湖南省怀化市',
+  861776923 => '湖南省怀化市',
+  861776924 => '湖南省怀化市',
+  861776925 => '湖南省永州市',
+  861776926 => '湖南省永州市',
+  861776927 => '湖南省永州市',
+  861776928 => '湖南省怀化市',
+  861776929 => '湖南省永州市',
+  861776930 => '湖南省岳阳市',
+  861776931 => '湖南省长沙市',
+  861776932 => '湖南省长沙市',
+  861776933 => '湖南省长沙市',
+  861776934 => '湖南省衡阳市',
+  861776935 => '湖南省郴州市',
+  861776936 => '湖南省常德市',
+  861776937 => '湖南省益阳市',
+  861776938 => '湖南省娄底市',
+  861776939 => '湖南省邵阳市',
+  861776960 => '浙江省嘉兴市',
+  861776961 => '浙江省嘉兴市',
+  861776962 => '浙江省嘉兴市',
+  861776963 => '浙江省嘉兴市',
+  861776964 => '浙江省嘉兴市',
+  861776965 => '浙江省湖州市',
+  861776966 => '浙江省湖州市',
+  861776967 => '浙江省湖州市',
+  861776968 => '浙江省湖州市',
+  861776969 => '浙江省舟山市',
+  861776970 => '浙江省绍兴市',
+  861776971 => '浙江省绍兴市',
+  861776972 => '浙江省绍兴市',
+  861776973 => '浙江省绍兴市',
+  861776974 => '浙江省绍兴市',
+  861776975 => '浙江省金华市',
+  861776976 => '浙江省金华市',
+  861776977 => '浙江省台州市',
+  861776978 => '浙江省台州市',
+  861776979 => '浙江省舟山市',
   86177700 => '江西省九江市',
   861777010 => '江西省赣州市',
   861777011 => '江西省赣州市',
@@ -2453,6 +3024,7 @@
   86177704 => '江西省抚州市',
   86177705 => '江西省宜春市',
   86177706 => '江西省吉安市',
+  86177708 => '江西省南昌市',
   861777100 => '湖北省襄樊市',
   861777101 => '湖北省襄樊市',
   861777102 => '湖北省襄樊市',
@@ -2535,6 +3107,36 @@
   861777197 => '湖北省黄冈市',
   861777198 => '湖北省黄冈市',
   861777199 => '湖北省黄冈市',
+  861777200 => '广西柳州市',
+  861777201 => '广西柳州市',
+  861777202 => '广西柳州市',
+  861777203 => '广西柳州市',
+  861777204 => '广西钦州市',
+  861777205 => '广西钦州市',
+  861777206 => '广西钦州市',
+  861777207 => '广西梧州市',
+  861777208 => '广西梧州市',
+  861777209 => '广西梧州市',
+  861777250 => '河北省保定市',
+  861777251 => '河北省保定市',
+  861777252 => '河北省保定市',
+  861777253 => '河北省保定市',
+  861777254 => '河北省秦皇岛市',
+  861777255 => '河北省秦皇岛市',
+  861777256 => '河北省秦皇岛市',
+  861777257 => '河北省秦皇岛市',
+  861777258 => '河北省秦皇岛市',
+  861777259 => '河北省秦皇岛市',
+  861777260 => '河北省邢台市',
+  861777261 => '河北省邢台市',
+  861777262 => '河北省邢台市',
+  861777263 => '河北省邢台市',
+  861777264 => '河北省沧州市',
+  861777265 => '河北省沧州市',
+  861777266 => '河北省廊坊市',
+  861777267 => '河北省沧州市',
+  861777268 => '河北省沧州市',
+  861777269 => '河北省沧州市',
   86177730 => '湖南省岳阳市',
   86177731 => '湖南省长沙市',
   86177732 => '湖南省长沙市',
@@ -2545,6 +3147,16 @@
   86177737 => '湖南省益阳市',
   86177738 => '湖南省娄底市',
   86177739 => '湖南省邵阳市',
+  861777400 => '浙江省杭州市',
+  861777401 => '浙江省杭州市',
+  861777402 => '浙江省温州市',
+  861777403 => '浙江省温州市',
+  861777404 => '浙江省湖州市',
+  861777405 => '浙江省绍兴市',
+  861777406 => '浙江省金华市',
+  861777407 => '浙江省金华市',
+  861777408 => '浙江省衢州市',
+  861777409 => '浙江省台州市',
   86177743 => '湖南省湘西土家族苗族自治州',
   86177744 => '湖南省张家界市',
   86177745 => '湖南省怀化市',
@@ -2559,6 +3171,36 @@
   861777477 => '广西钦州市',
   861777478 => '广西河池市',
   861777479 => '广西北海市',
+  861777500 => '安徽省阜阳市',
+  861777501 => '安徽省六安市',
+  861777502 => '安徽省六安市',
+  861777503 => '安徽省合肥市',
+  861777504 => '安徽省合肥市',
+  861777505 => '安徽省合肥市',
+  861777506 => '安徽省宿州市',
+  861777507 => '安徽省宿州市',
+  861777508 => '安徽省宿州市',
+  861777509 => '安徽省阜阳市',
+  861777520 => '安徽省淮南市',
+  861777521 => '安徽省淮南市',
+  861777522 => '安徽省淮南市',
+  861777523 => '安徽省滁州市',
+  861777524 => '安徽省滁州市',
+  861777525 => '安徽省芜湖市',
+  861777526 => '安徽省芜湖市',
+  861777527 => '安徽省芜湖市',
+  861777528 => '安徽省芜湖市',
+  861777529 => '安徽省芜湖市',
+  861777550 => '四川省乐山市',
+  861777551 => '四川省广元市',
+  861777552 => '四川省成都市',
+  861777553 => '四川省广安市',
+  861777554 => '四川省绵阳市',
+  861777555 => '四川省绵阳市',
+  861777556 => '四川省成都市',
+  861777557 => '四川省成都市',
+  861777558 => '四川省内江市',
+  861777559 => '四川省内江市',
   86177758 => '湖南省长沙市',
   861777590 => '湖南省岳阳市',
   861777591 => '湖南省怀化市',
@@ -2610,6 +3252,30 @@
   861777637 => '广西玉林市',
   861777638 => '广西玉林市',
   861777639 => '广西玉林市',
+  861777640 => '广西河池市',
+  861777641 => '广西河池市',
+  861777642 => '广西玉林市',
+  861777643 => '广西玉林市',
+  861777644 => '广西柳州市',
+  861777645 => '广西柳州市',
+  861777646 => '广西桂林市',
+  861777647 => '广西桂林市',
+  861777648 => '广西南宁市',
+  861777649 => '广西南宁市',
+  861777650 => '广西桂林市',
+  861777651 => '广西桂林市',
+  861777652 => '广西桂林市',
+  861777653 => '广西南宁市',
+  861777654 => '广西南宁市',
+  861777655 => '广西南宁市',
+  861777656 => '广西南宁市',
+  861777657 => '广西河池市',
+  861777658 => '广西河池市',
+  861777659 => '广西河池市',
+  86177766 => '广西南宁市',
+  86177767 => '广西玉林市',
+  86177768 => '海南省海口市',
+  86177769 => '海南省海口市',
   861777700 => '广西防城港市',
   861777701 => '广西防城港市',
   861777702 => '广西防城港市',
@@ -2621,6 +3287,8 @@
   86177774 => '广西梧州市',
   86177775 => '广西玉林市',
   86177776 => '广西百色市',
+  86177777 => '北京市',
+  86177778 => '北京市',
   861777790 => '广西北海市',
   861777791 => '广西北海市',
   861777792 => '广西北海市',
@@ -2808,6 +3476,8 @@
   861778197 => '四川省绵阳市',
   861778198 => '四川省绵阳市',
   861778199 => '四川省绵阳市',
+  86177820 => '重庆市',
+  86177821 => '重庆市',
   86177822 => '重庆市',
   86177823 => '重庆市',
   86177824 => '陕西省西安市',
@@ -2993,6 +3663,26 @@
   861778927 => '陕西省宝鸡市',
   861778928 => '陕西省宝鸡市',
   861778929 => '陕西省宝鸡市',
+  861778930 => '甘肃省临夏回族自治州',
+  861778931 => '甘肃省临夏回族自治州',
+  861778932 => '甘肃省临夏回族自治州',
+  861778933 => '甘肃省武威市',
+  861778934 => '甘肃省武威市',
+  861778935 => '甘肃省武威市',
+  861778936 => '甘肃省张掖市',
+  861778937 => '甘肃省张掖市',
+  861778938 => '甘肃省张掖市',
+  861778939 => '甘肃省陇南市',
+  861778940 => '甘肃省天水市',
+  861778941 => '甘肃省甘南藏族自治州',
+  861778942 => '甘肃省白银市',
+  861778943 => '甘肃省白银市',
+  861778944 => '甘肃省白银市',
+  861778945 => '甘肃省陇南市',
+  861778946 => '甘肃省陇南市',
+  861778947 => '甘肃省酒泉市',
+  861778948 => '甘肃省天水市',
+  861778949 => '甘肃省天水市',
   861778950 => '甘肃省临夏回族自治州',
   861778951 => '甘肃省定西市',
   861778952 => '甘肃省定西市',
@@ -3233,6 +3923,16 @@
   861779747 => '青海省海西蒙古族藏族自治州',
   861779748 => '青海省海西蒙古族藏族自治州',
   861779749 => '青海省海西蒙古族藏族自治州',
+  861779770 => '河南省新乡市',
+  861779771 => '河南省许昌市',
+  861779772 => '河南省安阳市',
+  861779773 => '河南省郑州市',
+  861779774 => '河南省郑州市',
+  861779775 => '河南省郑州市',
+  861779776 => '河南省郑州市',
+  861779777 => '河南省郑州市',
+  861779778 => '河南省商丘市',
+  861779779 => '河南省周口市',
   861779900 => '新疆阿克苏地区',
   861779901 => '新疆塔城地区',
   861779902 => '新疆哈密地区',
diff --git a/src/libphonenumber/geocoding/data/zh/86178.php b/src/libphonenumber/geocoding/data/zh/86178.php
index 97ddff1d9..2ad05d868 100644
--- a/src/libphonenumber/geocoding/data/zh/86178.php
+++ b/src/libphonenumber/geocoding/data/zh/86178.php
@@ -318,7 +318,7 @@
   861780767 => '广东省佛山市',
   861780768 => '广东省潮州市',
   861780769 => '广东省东莞市',
-  861780770 => '广西桂林市',
+  861780770 => '广西百色市',
   861780771 => '广西南宁市',
   861780772 => '广西柳州市',
   861780773 => '广西桂林市',
@@ -658,6 +658,36 @@
   861782047 => '广东省湛江市',
   861782048 => '广东省梅州市',
   861782049 => '广东省中山市',
+  861782050 => '广东省广州市',
+  861782051 => '广东省广州市',
+  861782052 => '广东省广州市',
+  861782053 => '广东省广州市',
+  861782054 => '广东省广州市',
+  861782055 => '广东省广州市',
+  861782056 => '广东省广州市',
+  861782057 => '广东省广州市',
+  861782058 => '广东省深圳市',
+  861782059 => '广东省广州市',
+  861782060 => '广东省深圳市',
+  861782061 => '广东省佛山市',
+  861782062 => '广东省深圳市',
+  861782063 => '广东省深圳市',
+  861782064 => '广东省深圳市',
+  861782065 => '广东省深圳市',
+  861782066 => '广东省深圳市',
+  861782067 => '广东省深圳市',
+  861782068 => '广东省广州市',
+  861782069 => '广东省深圳市',
+  861782070 => '广东省广州市',
+  861782071 => '广东省广州市',
+  861782072 => '广东省广州市',
+  861782073 => '广东省深圳市',
+  861782074 => '广东省深圳市',
+  861782075 => '广东省汕头市',
+  861782076 => '广东省惠州市',
+  861782077 => '广东省惠州市',
+  861782078 => '广东省深圳市',
+  861782079 => '广东省深圳市',
   86178222 => '天津市',
   861782280 => '贵州省黔东南苗族侗族自治州',
   861782281 => '贵州省黔东南苗族侗族自治州',
@@ -1444,15 +1474,15 @@
   86178780 => '广西玉林市',
   86178781 => '广西玉林市',
   86178782 => '广西柳州市',
-  861787830 => '广西桂林市',
+  861787830 => '广西河池市',
   861787831 => '广西梧州市',
-  861787832 => '广西梧州市',
-  861787833 => '广西梧州市',
-  861787834 => '广西北海市',
-  861787835 => '广西北海市',
-  861787836 => '广西北海市',
-  861787837 => '广西北海市',
-  861787838 => '广西北海市',
+  861787832 => '广西玉林市',
+  861787833 => '广西玉林市',
+  861787834 => '广西玉林市',
+  861787835 => '广西玉林市',
+  861787836 => '广西玉林市',
+  861787837 => '广西玉林市',
+  861787838 => '广西玉林市',
   861787839 => '广西北海市',
   861787840 => '广西梧州市',
   861787841 => '广西梧州市',
@@ -1477,7 +1507,7 @@
   861787896 => '广西北海市',
   861787897 => '广西北海市',
   861787898 => '广西北海市',
-  861787899 => '广西柳州市',
+  861787899 => '广西梧州市',
   86178793 => '江西省上饶市',
   86178794 => '江西省南昌市',
   86178795 => '江西省宜春市',
diff --git a/src/libphonenumber/geocoding/data/zh/86181.php b/src/libphonenumber/geocoding/data/zh/86181.php
index 64abeecb2..603ecd8fe 100644
--- a/src/libphonenumber/geocoding/data/zh/86181.php
+++ b/src/libphonenumber/geocoding/data/zh/86181.php
@@ -2666,6 +2666,16 @@
   861814317 => '吉林省辽源市',
   861814318 => '吉林省松原市',
   861814319 => '吉林省白山市',
+  861814320 => '西藏日喀则地区',
+  861814321 => '西藏拉萨市',
+  861814322 => '西藏日喀则地区',
+  861814323 => '西藏山南地区',
+  861814324 => '西藏林芝地区',
+  861814325 => '西藏昌都地区',
+  861814326 => '西藏那曲地区',
+  861814327 => '西藏那曲地区',
+  861814328 => '西藏拉萨市',
+  861814329 => '西藏拉萨市',
   861814330 => '湖南省张家界市',
   861814331 => '湖南省永州市',
   861814332 => '湖南省娄底市',
diff --git a/src/libphonenumber/geocoding/data/zh/86184.php b/src/libphonenumber/geocoding/data/zh/86184.php
index d923fa430..b603421df 100644
--- a/src/libphonenumber/geocoding/data/zh/86184.php
+++ b/src/libphonenumber/geocoding/data/zh/86184.php
@@ -629,7 +629,10 @@
   861840999 => '新疆伊犁哈萨克自治州',
   8618410 => '北京市',
   8618411 => '北京市',
-  8618413 => '浙江省杭州市',
+  86184136 => '浙江省衢州市',
+  86184137 => '浙江省杭州市',
+  86184138 => '浙江省杭州市',
+  86184139 => '浙江省杭州市',
   86184140 => '浙江省杭州市',
   86184141 => '浙江省杭州市',
   86184142 => '浙江省杭州市',
@@ -1638,7 +1641,16 @@
   861845897 => '浙江省绍兴市',
   861845898 => '浙江省绍兴市',
   861845899 => '浙江省绍兴市',
-  86184590 => '福建省泉州市',
+  861845900 => '福建省泉州市',
+  861845901 => '福建省福州市',
+  861845902 => '福建省泉州市',
+  861845903 => '福建省泉州市',
+  861845904 => '福建省泉州市',
+  861845905 => '福建省福州市',
+  861845906 => '福建省泉州市',
+  861845907 => '福建省泉州市',
+  861845908 => '福建省泉州市',
+  861845909 => '福建省泉州市',
   86184591 => '福建省福州市',
   86184592 => '福建省厦门市',
   86184593 => '福建省宁德市',
diff --git a/src/libphonenumber/geocoding/data/zh/86185.php b/src/libphonenumber/geocoding/data/zh/86185.php
index c62112923..0abaee2de 100644
--- a/src/libphonenumber/geocoding/data/zh/86185.php
+++ b/src/libphonenumber/geocoding/data/zh/86185.php
@@ -806,6 +806,9 @@
   861852574 => '辽宁省葫芦岛市',
   861852575 => '辽宁省葫芦岛市',
   861852576 => '辽宁省葫芦岛市',
+  861852577 => '辽宁省鞍山市',
+  861852578 => '辽宁省鞍山市',
+  861852579 => '辽宁省鞍山市',
   8618526 => '天津市',
   86185270 => '湖北省武汉市',
   861852710 => '湖北省武汉市',
@@ -838,6 +841,7 @@
   861852737 => '湖北省黄冈市',
   861852738 => '湖北省黄冈市',
   861852739 => '湖北省黄冈市',
+  8618528 => '北京市',
   861852900 => '广东省揭阳市',
   861852901 => '广东省揭阳市',
   861852902 => '广东省揭阳市',
@@ -853,6 +857,16 @@
   86185293 => '广东省广州市',
   86185294 => '广东省广州市',
   86185295 => '广东省深圳市',
+  861852960 => '广东省珠海市',
+  861852961 => '广东省珠海市',
+  861852962 => '广东省珠海市',
+  861852963 => '广东省珠海市',
+  861852964 => '广东省珠海市',
+  861852965 => '广东省珠海市',
+  861852966 => '广东省珠海市',
+  861852967 => '广东省揭阳市',
+  861852968 => '广东省揭阳市',
+  861852969 => '广东省揭阳市',
   86185300 => '河南省郑州市',
   861853010 => '河南省开封市',
   861853011 => '河南省开封市',
@@ -1023,7 +1037,16 @@
   861853397 => '河北省唐山市',
   861853398 => '河北省唐山市',
   861853399 => '河北省唐山市',
-  86185340 => '山西省太原市',
+  861853400 => '山西省太原市',
+  861853401 => '山西省朔州市',
+  861853402 => '山西省朔州市',
+  861853403 => '山西省长治市',
+  861853404 => '山西省长治市',
+  861853405 => '山西省长治市',
+  861853406 => '山西省长治市',
+  861853407 => '山西省长治市',
+  861853408 => '山西省长治市',
+  861853409 => '山西省临汾市',
   861853410 => '山西省长治市',
   861853411 => '山西省长治市',
   861853412 => '山西省长治市',
@@ -1106,6 +1129,7 @@
   86185357 => '山西省临汾市',
   86185358 => '山西省吕梁市',
   86185359 => '山西省运城市',
+  86185360 => '山西省临汾市',
   861853650 => '山西省朔州市',
   861853651 => '山西省晋中市',
   861853652 => '山西省晋中市',
@@ -1268,6 +1292,9 @@
   861854007 => '辽宁省沈阳市',
   861854008 => '辽宁省本溪市',
   861854009 => '辽宁省沈阳市',
+  86185401 => '辽宁省沈阳市',
+  86185402 => '辽宁省沈阳市',
+  86185403 => '辽宁省沈阳市',
   861854300 => '吉林省长春市',
   861854301 => '吉林省长春市',
   861854302 => '吉林省通化市',
@@ -1367,8 +1394,20 @@
   861854653 => '黑龙江省哈尔滨市',
   861854654 => '黑龙江省哈尔滨市',
   861854655 => '黑龙江省哈尔滨市',
+  861854656 => '黑龙江省黑河市',
+  861854657 => '黑龙江省黑河市',
+  861854658 => '黑龙江省大庆市',
+  861854659 => '黑龙江省大庆市',
   861854660 => '黑龙江省鹤岗市',
   861854661 => '黑龙江省哈尔滨市',
+  861854662 => '黑龙江省哈尔滨市',
+  861854663 => '黑龙江省哈尔滨市',
+  861854664 => '黑龙江省大庆市',
+  861854665 => '黑龙江省大庆市',
+  861854666 => '黑龙江省大庆市',
+  861854667 => '黑龙江省大庆市',
+  861854668 => '黑龙江省大庆市',
+  861854669 => '黑龙江省大庆市',
   86185467 => '黑龙江省七台河市',
   861854690 => '黑龙江省双鸭山市',
   861854691 => '黑龙江省黑河市',
@@ -1766,6 +1805,26 @@
   861855617 => '江苏省淮安市',
   861855618 => '江苏省南京市',
   861855619 => '江苏省南京市',
+  861855620 => '江苏省扬州市',
+  861855621 => '江苏省扬州市',
+  861855622 => '江苏省扬州市',
+  861855623 => '江苏省扬州市',
+  861855624 => '江苏省宿迁市',
+  861855625 => '江苏省宿迁市',
+  861855626 => '江苏省宿迁市',
+  861855627 => '江苏省宿迁市',
+  861855628 => '江苏省扬州市',
+  861855629 => '江苏省扬州市',
+  861855630 => '安徽省芜湖市',
+  861855631 => '安徽省芜湖市',
+  861855632 => '安徽省芜湖市',
+  861855633 => '安徽省芜湖市',
+  861855634 => '安徽省合肥市',
+  861855635 => '安徽省合肥市',
+  861855636 => '安徽省合肥市',
+  861855637 => '安徽省合肥市',
+  861855638 => '安徽省合肥市',
+  861855639 => '安徽省合肥市',
   861855650 => '安徽省合肥市',
   861855651 => '安徽省合肥市',
   861855652 => '安徽省合肥市',
@@ -2948,6 +3007,16 @@
   861857932 => '江西省上饶市',
   861857933 => '江西省上饶市',
   861857934 => '江西省宜春市',
+  861857940 => '广西柳州市',
+  861857941 => '广西柳州市',
+  861857942 => '广西柳州市',
+  861857943 => '广西桂林市',
+  861857944 => '广西桂林市',
+  861857945 => '广西南宁市',
+  861857946 => '广西南宁市',
+  861857947 => '广西南宁市',
+  861857948 => '广西南宁市',
+  861857949 => '广西南宁市',
   86185795 => '湖南省永州市',
   861857960 => '江西省吉安市',
   861857961 => '江西省吉安市',
@@ -3442,6 +3511,12 @@
   861858941 => '西藏那曲地区',
   861858942 => '西藏阿里地区',
   861858943 => '西藏山南地区',
+  861858944 => '西藏林芝地区',
+  861858945 => '西藏昌都地区',
+  861858946 => '西藏那曲地区',
+  861858947 => '西藏阿里地区',
+  861858948 => '西藏拉萨市',
+  861858949 => '西藏拉萨市',
   86185895 => '海南省海口市',
   86185896 => '海南省海口市',
   86185897 => '重庆市',
@@ -3605,6 +3680,27 @@
   861859317 => '云南省曲靖市',
   861859318 => '云南省曲靖市',
   861859319 => '云南省曲靖市',
+  861859320 => '广西玉林市',
+  861859321 => '广西玉林市',
+  861859322 => '广西柳州市',
+  861859323 => '广西桂林市',
+  861859324 => '广西南宁市',
+  861859325 => '广西南宁市',
+  861859326 => '广西柳州市',
+  861859327 => '广西桂林市',
+  861859328 => '广西桂林市',
+  861859329 => '广西桂林市',
+  86185933 => '湖南省长沙市',
+  861859340 => '湖南省长沙市',
+  861859341 => '湖南省衡阳市',
+  861859342 => '湖南省衡阳市',
+  861859343 => '湖南省衡阳市',
+  861859344 => '湖南省衡阳市',
+  861859345 => '湖南省衡阳市',
+  861859346 => '湖南省衡阳市',
+  861859347 => '湖南省邵阳市',
+  861859348 => '湖南省邵阳市',
+  861859349 => '湖南省邵阳市',
   861859350 => '福建省莆田市',
   861859351 => '福建省宁德市',
   861859352 => '福建省宁德市',
@@ -3959,6 +4055,16 @@
   861859947 => '新疆巴音郭楞蒙古自治州',
   861859948 => '新疆喀什地区',
   861859949 => '新疆伊犁哈萨克自治州',
+  861859950 => '福建省三明市',
+  861859951 => '福建省南平市',
+  861859952 => '福建省南平市',
+  861859953 => '福建省福州市',
+  861859954 => '福建省泉州市',
+  861859955 => '福建省泉州市',
+  861859956 => '福建省漳州市',
+  861859957 => '福建省莆田市',
+  861859958 => '福建省莆田市',
+  861859959 => '福建省宁德市',
   861859990 => '四川省绵阳市',
   861859991 => '四川省南充市',
   861859992 => '四川省巴中市',
diff --git a/src/libphonenumber/geocoding/data/zh/86186.php b/src/libphonenumber/geocoding/data/zh/86186.php
index 911ce1a7e..db27af5ae 100644
--- a/src/libphonenumber/geocoding/data/zh/86186.php
+++ b/src/libphonenumber/geocoding/data/zh/86186.php
@@ -806,6 +806,18 @@
   86186141 => '北京市',
   86186142 => '北京市',
   86186143 => '北京市',
+  86186144 => '北京市',
+  861861450 => '黑龙江省哈尔滨市',
+  861861451 => '黑龙江省哈尔滨市',
+  861861452 => '黑龙江省绥化市',
+  861861453 => '黑龙江省绥化市',
+  861861454 => '黑龙江省绥化市',
+  861861455 => '黑龙江省绥化市',
+  861861456 => '黑龙江省绥化市',
+  861861457 => '黑龙江省绥化市',
+  861861458 => '黑龙江省绥化市',
+  861861459 => '黑龙江省绥化市',
+  86186146 => '北京市',
   861861470 => '内蒙古呼伦贝尔市',
   861861471 => '内蒙古呼和浩特市',
   861861472 => '内蒙古包头市',
@@ -898,6 +910,7 @@
   861861577 => '四川省成都市',
   861861578 => '四川省成都市',
   861861579 => '四川省成都市',
+  86186158 => '北京市',
   861861590 => '山东省潍坊市',
   861861591 => '山东省潍坊市',
   861861592 => '山东省济宁市',
@@ -1906,6 +1919,16 @@
   86186444 => '上海市',
   86186445 => '上海市',
   86186446 => '上海市',
+  861864480 => '吉林省四平市',
+  861864481 => '吉林省四平市',
+  861864482 => '吉林省四平市',
+  861864483 => '吉林省四平市',
+  861864484 => '吉林省四平市',
+  861864485 => '吉林省四平市',
+  861864486 => '吉林省通化市',
+  861864487 => '吉林省通化市',
+  861864488 => '吉林省通化市',
+  861864489 => '吉林省通化市',
   861864490 => '吉林省四平市',
   861864491 => '吉林省四平市',
   861864492 => '吉林省长春市',
@@ -2079,6 +2102,16 @@
   861864867 => '内蒙古鄂尔多斯市',
   861864868 => '内蒙古鄂尔多斯市',
   861864869 => '内蒙古鄂尔多斯市',
+  861864870 => '内蒙古呼和浩特市',
+  861864871 => '内蒙古呼和浩特市',
+  861864872 => '内蒙古呼和浩特市',
+  861864873 => '内蒙古呼和浩特市',
+  861864874 => '内蒙古巴彦淖尔市',
+  861864875 => '内蒙古巴彦淖尔市',
+  861864876 => '内蒙古巴彦淖尔市',
+  861864877 => '内蒙古巴彦淖尔市',
+  861864878 => '内蒙古巴彦淖尔市',
+  861864879 => '内蒙古巴彦淖尔市',
   861864880 => '广西南宁市',
   861864881 => '广西南宁市',
   861864882 => '广西来宾市',
@@ -4538,7 +4571,16 @@
   861869458 => '浙江省杭州市',
   861869459 => '浙江省杭州市',
   86186946 => '安徽省阜阳市',
-  86186947 => '福建省泉州市',
+  861869470 => '福建省泉州市',
+  861869471 => '福建省泉州市',
+  861869472 => '福建省泉州市',
+  861869473 => '福建省泉州市',
+  861869474 => '福建省泉州市',
+  861869475 => '福建省泉州市',
+  861869476 => '福建省漳州市',
+  861869477 => '福建省三明市',
+  861869478 => '福建省南平市',
+  861869479 => '福建省南平市',
   861869480 => '浙江省杭州市',
   861869481 => '浙江省杭州市',
   861869482 => '浙江省杭州市',
diff --git a/src/libphonenumber/timezone/data/map_data.php b/src/libphonenumber/timezone/data/map_data.php
index 35713a95c..7812ab943 100644
--- a/src/libphonenumber/timezone/data/map_data.php
+++ b/src/libphonenumber/timezone/data/map_data.php
@@ -16,6 +16,7 @@
   120822 => 'America/Denver',
   120823 => 'America/Denver',
   120824 => 'America/Los_Angeles',
+  1208251 => 'America/Denver',
   1208253 => 'America/Denver',
   1208255 => 'America/Los_Angeles',
   120826 => 'America/Los_Angeles',
@@ -31,6 +32,7 @@
   1208436 => 'America/Denver',
   1208437 => 'America/Los_Angeles',
   1208438 => 'America/Denver',
+  1208440 => 'America/Denver',
   1208442 => 'America/Denver',
   1208443 => 'America/Los_Angeles',
   1208448 => 'America/Los_Angeles',
@@ -92,7 +94,8 @@
   1208794 => 'America/Denver',
   1208798 => 'America/Los_Angeles',
   1208799 => 'America/Los_Angeles',
-  120881 => 'America/Los_Angeles',
+  1208814 => 'America/Denver',
+  1208818 => 'America/Los_Angeles',
   1208835 => 'America/Los_Angeles',
   1208837 => 'America/Denver',
   120884 => 'America/Denver',
@@ -118,6 +121,7 @@
   1208926 => 'America/Los_Angeles',
   1208934 => 'America/Denver',
   1208935 => 'America/Los_Angeles',
+  1208936 => 'America/Denver',
   1208938 => 'America/Denver',
   1208939 => 'America/Denver',
   120894 => 'America/Denver',
@@ -223,6 +227,7 @@
   127025 => 'America/Chicago',
   127026 => 'America/Chicago',
   127027 => 'America/Chicago',
+  127028 => 'America/Chicago',
   127029 => 'America/Chicago',
   127033 => 'America/Chicago',
   127034 => 'America/Chicago',
@@ -322,6 +327,7 @@
   1308235 => 'America/Denver',
   1308236 => 'America/Chicago',
   1308237 => 'America/Chicago',
+  130824 => 'America/Denver',
   130825 => 'America/Denver',
   130826 => 'America/Denver',
   130828 => 'America/Denver',
@@ -491,7 +497,8 @@
   1518 => 'America/New_York',
   1519 => 'America/Toronto',
   152 => 'America/Denver',
-  153 => 'America/Los_Angeles',
+  1530 => 'America/Los_Angeles',
+  1534 => 'America/Chicago',
   1540 => 'America/New_York',
   15412 => 'America/Los_Angeles',
   154130 => 'America/Los_Angeles',
@@ -569,6 +576,7 @@
   15749 => 'America/New_York',
   1575 => 'America/Denver',
   1580 => 'America/Chicago',
+  1581 => 'America/Toronto',
   1585 => 'America/New_York',
   1586 => 'America/New_York',
   1587 => 'America/Edmonton',
@@ -744,8 +752,7 @@
   1670 => 'Pacific/Saipan',
   1671 => 'Pacific/Guam',
   1678 => 'America/New_York',
-  1682 => 'America/Chicago',
-  1684 => 'Pacific/Pago_Pago',
+  168 => 'America/Chicago',
   1701221 => 'America/Chicago',
   1701222 => 'America/Chicago',
   1701223 => 'America/Chicago',
@@ -785,9 +792,7 @@
   17016 => 'America/Chicago',
   170172 => 'America/Chicago',
   170173 => 'America/Chicago',
-  1701742 => 'America/Chicago',
-  1701746 => 'America/Chicago',
-  1701748 => 'America/Denver',
+  170174 => 'America/Chicago',
   170175 => 'America/Chicago',
   1701764 => 'America/Denver',
   1701766 => 'America/Chicago',
@@ -906,9 +911,7 @@
   180773 => 'America/Winnipeg',
   180776 => 'America/Toronto',
   18078 => 'America/Toronto',
-  1807934 => 'America/Winnipeg',
-  1807937 => 'America/Winnipeg',
-  1807939 => 'America/Toronto',
+  18079 => 'America/Winnipeg',
   1808 => 'Pacific/Honolulu',
   1809 => 'America/Halifax',
   1810 => 'America/New_York',
@@ -964,9 +967,7 @@
   181264 => 'America/Chicago',
   181265 => 'America/New_York',
   181266 => 'America/New_York',
-  1812682 => 'America/Chicago',
-  1812683 => 'America/New_York',
-  1812689 => 'America/New_York',
+  181268 => 'America/New_York',
   181272 => 'America/New_York',
   181273 => 'America/New_York',
   181274 => 'America/Chicago',
@@ -1053,6 +1054,7 @@
   1850329 => 'America/New_York',
   185033 => 'America/Chicago',
   185036 => 'America/Chicago',
+  185037 => 'America/Chicago',
   185038 => 'America/New_York',
   1850391 => 'America/New_York',
   1850398 => 'America/Chicago',
@@ -1147,6 +1149,7 @@
   1850769 => 'America/Chicago',
   185078 => 'America/Chicago',
   185079 => 'America/Chicago',
+  185081 => 'America/Chicago',
   1850830 => 'America/Chicago',
   1850833 => 'America/Chicago',
   1850835 => 'America/Chicago',
@@ -1258,6 +1261,7 @@
   1931 => 'America/Chicago',
   1936 => 'America/Chicago',
   1937 => 'America/New_York',
+  1939 => 'America/Puerto_Rico',
   1940 => 'America/Chicago',
   1941 => 'America/New_York',
   1949 => 'America/Los_Angeles',
@@ -1431,7 +1435,7 @@
   372 => 'Europe/Bucharest',
   373 => 'Europe/Bucharest',
   374 => 'Asia/Yerevan',
-  375 => 'Europe/Belarus',
+  375 => 'Europe/Minsk',
   376 => 'Europe/Andorra',
   377 => 'Europe/Monaco',
   378 => 'Europe/San_Marino',
@@ -1614,7 +1618,7 @@
   508 => 'America/Miquelon',
   509 => 'America/Port-au-Prince',
   51 => 'America/Lima',
-  52 => 'America/Mazatlan&America/Mexico_City&America/Tijuana',
+  52 => 'America/Hermosillo&America/Mazatlan&America/Mexico_City&America/New_York&America/Santa_Isabel&America/Tijuana',
   522 => 'America/Mexico_City',
   52311 => 'America/Mazatlan',
   52312 => 'America/Mexico_City',
@@ -1691,7 +1695,29 @@
   5269 => 'America/Mazatlan',
   527 => 'America/Mexico_City',
   528 => 'America/Mexico_City',
-  529 => 'America/Mexico_City',
+  5291 => 'America/Mexico_City',
+  5292 => 'America/Mexico_City',
+  5293 => 'America/Mexico_City',
+  5295 => 'America/Mexico_City',
+  5296 => 'America/Mexico_City',
+  5297 => 'America/Mexico_City',
+  52981 => 'America/Mexico_City',
+  52982 => 'America/Mexico_City',
+  52983 => 'America/Mexico_City&America/New_York',
+  52984 => 'America/Mexico_City&America/New_York',
+  52985 => 'America/Mexico_City',
+  52986 => 'America/Mexico_City',
+  52987 => 'America/New_York',
+  52988 => 'America/Mexico_City',
+  52991 => 'America/Mexico_City',
+  52992 => 'America/Mexico_City',
+  52993 => 'America/Mexico_City',
+  52994 => 'America/Mexico_City',
+  52995 => 'America/Mexico_City',
+  52996 => 'America/Mexico_City',
+  52997 => 'America/Mexico_City',
+  52998 => 'America/Mexico_City&America/New_York',
+  52999 => 'America/Mexico_City',
   53 => 'America/Havana',
   54 => 'America/Buenos_Aires',
   55 => 'America/Manaus&America/Noronha&America/Rio_Branco&America/Sao_Paulo',
@@ -1736,7 +1762,7 @@
   5932 => 'America/Guayaquil',
   5933 => 'America/Guayaquil',
   5934 => 'America/Guayaquil',
-  5935 => 'America/Guayaquil&Pacific/Galapagos',
+  5935 => 'America/Guayaquil',
   5936 => 'America/Guayaquil',
   5937 => 'America/Guayaquil',
   594 => 'America/Cayenne',
@@ -1764,144 +1790,56 @@
   6235 => 'Asia/Jakarta',
   6236 => 'Asia/Makassar',
   6237 => 'Asia/Makassar',
-  62380 => 'Asia/Makassar',
-  62381 => 'Asia/Makassar',
-  62382 => 'Asia/Makassar',
-  62383 => 'Asia/Makassar',
-  62384 => 'Asia/Makassar',
-  62385 => 'Asia/Makassar',
-  62386 => 'Asia/Makassar',
-  62387 => 'Asia/Makassar',
-  62388 => 'Asia/Jakarta&Asia/Makassar',
-  62389 => 'Asia/Makassar',
+  6238 => 'Asia/Makassar',
   62401 => 'Asia/Makassar',
   62402 => 'Asia/Makassar',
-  62403 => 'Asia/Makassar&Asia/Jayapura',
+  62403 => 'Asia/Jayapura&Asia/Makassar',
   62404 => 'Asia/Makassar',
   62405 => 'Asia/Makassar',
   62408 => 'Asia/Makassar',
-  62410 => 'Asia/Makassar',
-  62411 => 'Asia/Jakarta',
-  62413 => 'Asia/Makassar',
-  62414 => 'Asia/Jakarta&Asia/Makassar',
-  62417 => 'Asia/Jakarta&Asia/Makassar',
-  62419 => 'Asia/Jakarta',
-  62420 => 'Asia/Jakarta',
-  62421 => 'Asia/Makassar',
-  62422 => 'Asia/Makassar',
-  62423 => 'Asia/Jakarta&Asia/Makassar',
-  62426 => 'Asia/Makassar',
-  62428 => 'Asia/Makassar',
+  6241 => 'Asia/Makassar',
+  6242 => 'Asia/Makassar',
   6243 => 'Asia/Makassar',
-  62451 => 'Asia/Makassar',
-  62452 => 'Asia/Makassar',
-  62453 => 'Asia/Jayapura&Asia/Makassar',
-  62457 => 'Asia/Makassar',
-  62458 => 'Asia/Jakarta',
-  62461 => 'Asia/Makassar',
-  62462 => 'Asia/Jakarta&Asia/Makassar',
-  62463 => 'Asia/Makassar',
-  62464 => 'Asia/Makassar',
-  62465 => 'Asia/Makassar',
-  62471 => 'Asia/Jakarta&Asia/Makassar',
-  62473 => 'Asia/Makassar',
-  62481 => 'Asia/Makassar',
-  62484 => 'Asia/Makassar',
-  62485 => 'Asia/Jakarta',
+  6245 => 'Asia/Makassar',
+  6246 => 'Asia/Makassar',
+  6247 => 'Asia/Makassar',
+  6248 => 'Asia/Makassar',
   62511 => 'Asia/Makassar',
   62512 => 'Asia/Makassar',
   62513 => 'Asia/Jakarta',
   62516 => 'Asia/Jakarta',
   62517 => 'Asia/Makassar',
-  62518 => 'Asia/Jakarta&Asia/Makassar',
+  62518 => 'Asia/Makassar',
   62519 => 'Asia/Jakarta',
   62522 => 'Asia/Jakarta',
   62525 => 'Asia/Jakarta',
   62526 => 'Asia/Makassar',
   62527 => 'Asia/Makassar',
-  62528 => 'Asia/Jakarta&Asia/Makassar',
+  62528 => 'Asia/Jakarta',
   6253 => 'Asia/Jakarta',
   6254 => 'Asia/Makassar',
-  62551 => 'Asia/Makassar',
-  62552 => 'Asia/Jakarta&Asia/Makassar',
-  62553 => 'Asia/Makassar&Asia/Jakarta',
-  62554 => 'Asia/Makassar',
-  62556 => 'Asia/Makassar',
+  6255 => 'Asia/Makassar',
   6256 => 'Asia/Jakarta',
-  6261 => 'Asia/Jakarta',
-  62620 => 'Asia/Jakarta',
-  62621 => 'Asia/Jakarta',
-  62622 => 'Asia/Jakarta',
-  62623 => 'Asia/Jakarta&Asia/Makassar',
-  62624 => 'Asia/Jakarta',
-  62625 => 'Asia/Jakarta',
-  62626 => 'Asia/Jakarta',
-  62627 => 'Asia/Jakarta',
-  62628 => 'Asia/Jakarta',
-  62629 => 'Asia/Jakarta',
-  6263 => 'Asia/Jakarta',
-  62641 => 'Asia/Jakarta',
-  62642 => 'Asia/Jakarta&Asia/Makassar',
-  62643 => 'Asia/Jakarta',
-  62644 => 'Asia/Jakarta',
-  62645 => 'Asia/Jakarta',
-  62646 => 'Asia/Jakarta',
-  6265 => 'Asia/Jakarta',
-  62711 => 'Asia/Makassar',
-  62712 => 'Asia/Makassar',
-  62713 => 'Asia/Makassar',
-  62714 => 'Asia/Makassar',
-  62716 => 'Asia/Jakarta',
-  62717 => 'Asia/Jakarta',
-  62718 => 'Asia/Jakarta',
-  62719 => 'Asia/Jakarta',
-  6272 => 'Asia/Jakarta',
-  62730 => 'Asia/Makassar',
-  62731 => 'Asia/Makassar',
-  62732 => 'Asia/Jakarta',
-  62733 => 'Asia/Makassar',
-  62734 => 'Asia/Makassar',
-  62735 => 'Asia/Makassar',
-  62736 => 'Asia/Jakarta',
-  62737 => 'Asia/Jakarta',
-  62738 => 'Asia/Jakarta',
-  62739 => 'Asia/Jakarta',
-  6274 => 'Asia/Jakarta',
-  6275 => 'Asia/Jakarta',
-  6276 => 'Asia/Jakarta',
-  6277 => 'Asia/Jakarta',
-  62901 => 'Asia/Jayapura',
-  62902 => 'Asia/Jakarta&Asia/Makassar',
-  62910 => 'Asia/Jayapura&Asia/Jakarta',
+  626 => 'Asia/Jakarta',
+  627 => 'Asia/Jakarta',
+  6290 => 'Asia/Jayapura',
+  62910 => 'Asia/Jakarta&Asia/Jayapura',
   62911 => 'Asia/Jayapura',
-  62913 => 'Asia/Jakarta&Asia/Jayapura',
+  62913 => 'Asia/Jayapura',
   62914 => 'Asia/Jayapura',
-  62915 => 'Asia/Jayapura&Asia/Jakarta',
-  62916 => 'Asia/Jakarta&Asia/Jayapura',
-  62917 => 'Asia/Jakarta&Asia/Jayapura',
-  62918 => 'Asia/Jakarta&Asia/Jayapura',
-  62921 => 'Asia/Jayapura',
-  62922 => 'Asia/Jayapura',
-  62923 => 'Asia/Jayapura',
-  62924 => 'Asia/Jayapura',
-  62927 => 'Asia/Jayapura',
-  62929 => 'Asia/Jakarta&Asia/Jayapura',
-  62951 => 'Asia/Jayapura',
-  62955 => 'Asia/Jakarta&Asia/Jayapura',
-  62956 => 'Asia/Jayapura',
-  62957 => 'Asia/Jayapura',
-  62958 => 'Asia/Jakarta',
+  62915 => 'Asia/Jakarta&Asia/Jayapura',
+  62916 => 'Asia/Jayapura',
+  62917 => 'Asia/Jayapura',
+  62918 => 'Asia/Jayapura',
+  6292 => 'Asia/Jayapura',
+  6295 => 'Asia/Jayapura',
   62962 => 'Asia/Jayapura',
   62963 => 'Asia/Jakarta',
-  62966 => 'Asia/Jayapura&Asia/Jakarta',
+  62966 => 'Asia/Jayapura',
   62967 => 'Asia/Jayapura',
   62969 => 'Asia/Jayapura',
-  62971 => 'Asia/Jayapura',
-  62975 => 'Asia/Jayapura&Asia/Makassar',
-  62981 => 'Asia/Jayapura',
-  62983 => 'Asia/Jakarta&Asia/Jayapura',
-  62984 => 'Asia/Jayapura',
-  62986 => 'Asia/Jayapura',
+  6297 => 'Asia/Jayapura',
+  6298 => 'Asia/Jayapura',
   63 => 'Asia/Manila',
   64 => 'Pacific/Auckland&Pacific/Chatham',
   643 => 'Pacific/Auckland',
@@ -1951,7 +1889,7 @@
   69137 => 'Pacific/Kosrae&Pacific/Truk',
   6919 => 'Pacific/Ponape',
   692 => 'Pacific/Majuro',
-  7 => 'Asia/Almaty&Asia/Aqtobe&Asia/Irkutsk&Asia/Krasnoyarsk&Asia/Magadan&Asia/Novosibirsk&Asia/Omsk&Asia/Sakhalin&Asia/Vladivostok&Asia/Yakutsk&Asia/Yekaterinburg&Europe/Moscow&Europe/Volgograd',
+  7 => 'Asia/Almaty&Asia/Aqtobe&Asia/Irkutsk&Asia/Kamchatka&Asia/Krasnoyarsk&Asia/Magadan&Asia/Novosibirsk&Asia/Omsk&Asia/Sakhalin&Asia/Vladivostok&Asia/Yakutsk&Asia/Yekaterinburg&Europe/Bucharest&Europe/Moscow&Europe/Samara',
   7301 => 'Asia/Irkutsk',
   7302 => 'Asia/Yakutsk',
   733 => 'Asia/Almaty',
@@ -2047,13 +1985,6 @@
   974 => 'Asia/Qatar',
   975 => 'Asia/Thimphu',
   976 => 'Asia/Choibalsan&Asia/Hovd&Asia/Ulaanbaatar',
-  97611 => 'Asia/Ulaanbaatar',
-  97612 => 'Asia/Ulaanbaatar',
-  97613 => 'Asia/Ulaanbaatar',
-  97614 => 'Asia/Hovd',
-  97615 => 'Asia/Ulaanbaatar',
-  9762 => 'Asia/Ulaanbaatar',
-  9765 => 'Asia/Ulaanbaatar',
   977 => 'Asia/Katmandu',
   98 => 'Asia/Tehran',
   992 => 'Asia/Dushanbe',