Update known diffs using geonames 2021-07-29 am: 716cad8834 am: 0b9c8df78e am: c32db41a29 am: dcf40ada2e Original change: https://android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/1864558 Change-Id: Ifaeec9b8d5fee30b8765ce61389e0f8590f1647a

commit: f78467ddeeaad1af94f92e960136209c527420d9 [log] [tgz]
author: Neil Fuller <[email protected]> Wed Oct 20 12:26:42 2021 +0000
committer: Automerger Merge Worker <[email protected]> Wed Oct 20 12:26:42 2021 +0000
tree: fbf99d7ea7a54fb837f5d92c0c728791412d67a5
parent: af2e348bfac14d73fbe5022ddf137194201d3536 [diff]
parent: dcf40ada2e9a6027c5e7851321cfe83dbdff8e23 [diff]
diff --git a/validation/geonames/known_diffs/known_diffs1000.prototxt b/validation/geonames/known_diffs/known_diffs1000.prototxt
index bec39c8..d6b0f9f 100644
--- a/validation/geonames/known_diffs/known_diffs1000.prototxt
+++ b/validation/geonames/known_diffs/known_diffs1000.prototxt

@@ -1,244 +1,4 @@
 knownDifferences {
-  cityName: "Watson Lake"
-  s2CellId: 6051529110713270272
-  referenceDataResult {
-    isoCountryCodes: "ca"
-    zoneIds: "America/Vancouver"
-  }
-  actualResult {
-    isoCountryCodes: "ca"
-    zoneIds: "America/Whitehorse"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dangchengwan"
-  s2CellId: 4005214967853744128
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yuanquan"
-  s2CellId: 4017494470479052800
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Suicheng"
-  s2CellId: 3939852979795918848
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shuidong"
-  s2CellId: 3939707009963655168
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Potou"
-  s2CellId: 3554233391815589888
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Mazhang"
-  s2CellId: 3554137857247412224
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Maoming"
-  s2CellId: 3939690856054784000
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Chikan"
-  s2CellId: 3554230989318258688
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nanhai"
-  s2CellId: 3939706688377978880
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Leicheng"
-  s2CellId: 3554165646759559168
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dongzhen"
-  s2CellId: 3939538178557345792
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Luozhou"
-  s2CellId: 3939847974548406272
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hexi"
-  s2CellId: 3939781156131569664
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shazhou"
-  s2CellId: 4029245347992698880
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hongliuwan"
-  s2CellId: 4005071068195717120
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Meilu"
   s2CellId: 3939725057416232960
   referenceDataResult {
@@ -254,21 +14,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Nierong"
-  s2CellId: 3997666483374129152
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Fr\303\251naros"
   s2CellId: 1504148290218754048
   referenceDataResult {
@@ -359,36 +104,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Danaupanggang"
-  s2CellId: 3307090924990889984
-  referenceDataResult {
-    isoCountryCodes: "id"
-    zoneIds: "Asia/Jakarta"
-  }
-  actualResult {
-    isoCountryCodes: "id"
-    zoneIds: "Asia/Makassar"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jembrana Subdistrict"
-  s2CellId: 3301526775531569152
-  referenceDataResult {
-    isoCountryCodes: "id"
-    zoneIds: "Asia/Jakarta"
-  }
-  actualResult {
-    isoCountryCodes: "id"
-    zoneIds: "Asia/Makassar"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Imlili"
   s2CellId: 873983272751726592
   referenceDataResult {
@@ -530,66 +245,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Uk\303\272m"
-  s2CellId: 10329511310001176576
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Cancun"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xmab\303\251n"
-  s2CellId: 10329508737852637184
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Cancun"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xpujil"
-  s2CellId: 10329320328374779904
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Cancun"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zoh-Laguna"
-  s2CellId: 10329255059367395328
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Cancun"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Prax\303\251dis Guerrero"
   s2CellId: 9720747440260251648
   referenceDataResult {
@@ -637,21 +292,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Puente de Camotl\303\241n"
-  s2CellId: 9522746425868288000
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Chihuahua"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Praxedis G. Guerrero"
   s2CellId: 9720747457976991744
   referenceDataResult {
@@ -821,21 +461,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Ejido Doctor Alberto Oviedo Mota (El Indiviso)"
-  s2CellId: 9284122192377806848
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Hermosillo"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Tijuana"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Colonia Venustiano Carranza"
   s2CellId: 9682610790867140608
   referenceDataResult {
@@ -975,7 +600,7 @@
   s2CellId: 6875725836339642368
   referenceDataResult {
     isoCountryCodes: "ru"
-    zoneIds: "Asia/Tokyo"
+    zoneIds: "Asia/Magadan"
   }
   actualResult {
     isoCountryCodes: "ru"
@@ -1091,36 +716,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Ordzhonikidze"
-  s2CellId: 4677980750170030080
-  referenceDataResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Kiev"
-  }
-  actualResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Simferopol"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Mysovoe"
-  s2CellId: 4677368386080997376
-  referenceDataResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Kiev"
-  }
-  actualResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Simferopol"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Huguley"
   s2CellId: 9839418635947343872
   referenceDataResult {
@@ -1136,21 +731,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Fort Pierre"
-  s2CellId: 9763823498538516480
-  referenceDataResult {
-    isoCountryCodes: "us"
-    zoneIds: "America/Denver"
-  }
-  actualResult {
-    isoCountryCodes: "us"
-    zoneIds: "America/Chicago"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "LeChee"
   s2CellId: 9742432670008213504
   referenceDataResult {
@@ -3043,21 +2623,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "C\341\272\251m Ph\341\272\243"
-  s2CellId: 3551930755158376448
-  referenceDataResult {
-    isoCountryCodes: "vn"
-    zoneIds: "Asia/Bangkok"
-  }
-  actualResult {
-    isoCountryCodes: "th"
-    zoneIds: "Asia/Bangkok"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Cam L\341\273\231"
   s2CellId: 3549096208276389888
   referenceDataResult {
@@ -5682,3 +5247,18 @@
   type: "UNKNOWN"
   bugUri: "http://b/bugId"
 }
+knownDifferences {
+  cityName: "Fernando de Noronha (Distrito Estadual)"
+  s2CellId: 447635812889133056
+  referenceDataResult {
+    isoCountryCodes: "br"
+    zoneIds: "America/Sao_Paulo"
+  }
+  actualResult {
+    isoCountryCodes: "br"
+    zoneIds: "America/Noronha"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}

diff --git a/validation/geonames/known_diffs/known_diffs15000.prototxt b/validation/geonames/known_diffs/known_diffs15000.prototxt
index be44782..8a31995 100644
--- a/validation/geonames/known_diffs/known_diffs15000.prototxt
+++ b/validation/geonames/known_diffs/known_diffs15000.prototxt

@@ -12,141 +12,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "L\303\251vis"
-  s2CellId: 5528333079304732672
-  referenceDataResult {
-    isoCountryCodes: "ca"
-    zoneIds: "America/Blanc-Sablon"
-  }
-  actualResult {
-    isoCountryCodes: "ca"
-    zoneIds: "America/Toronto"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhanjiang"
-  s2CellId: 3554231191718592512
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xucheng"
-  s2CellId: 3553983235740401664
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Wuchuan"
-  s2CellId: 3939725508924669952
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Lianjiang"
-  s2CellId: 3939841663093964800
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Huazhou"
-  s2CellId: 3939737416184627200
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gaozhou"
-  s2CellId: 3939674516925448192
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xinyi"
-  s2CellId: 3939538212380213248
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhongshan"
-  s2CellId: 3939748998100811776
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Protaras"
   s2CellId: 1504136330345447424
   referenceDataResult {
@@ -284,21 +149,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Sevastopol"
-  s2CellId: 4653666233785253888
-  referenceDataResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Kiev"
-  }
-  actualResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Simferopol"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Y\303\252n Vinh"
   s2CellId: 3547093097269690368
   referenceDataResult {
@@ -1200,3 +1050,108 @@
   type: "UNKNOWN"
   bugUri: "http://b/bugId"
 }
+knownDifferences {
+  cityName: "Baikonur"
+  s2CellId: 4752461235117621248
+  referenceDataResult {
+    isoCountryCodes: "kz"
+    zoneIds: "Asia/Almaty"
+  }
+  actualResult {
+    isoCountryCodes: "kz"
+    zoneIds: "Asia/Oral"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
+knownDifferences {
+  cityName: "Ngh\304\251a L\341\273\231"
+  s2CellId: 3545244948146159616
+  referenceDataResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Bangkok"
+  }
+  actualResult {
+    isoCountryCodes: "th"
+    zoneIds: "Asia/Bangkok"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
+knownDifferences {
+  cityName: "M\306\260\341\273\235ng Lay"
+  s2CellId: 3543547665654480896
+  referenceDataResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Bangkok"
+  }
+  actualResult {
+    isoCountryCodes: "th"
+    zoneIds: "Asia/Bangkok"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
+knownDifferences {
+  cityName: "C\341\273\225 L\303\263a"
+  s2CellId: 3545741068408455168
+  referenceDataResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Bangkok"
+  }
+  actualResult {
+    isoCountryCodes: "th"
+    zoneIds: "Asia/Bangkok"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
+knownDifferences {
+  cityName: "Ch\303\255 Linh"
+  s2CellId: 3545871968274219008
+  referenceDataResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Bangkok"
+  }
+  actualResult {
+    isoCountryCodes: "th"
+    zoneIds: "Asia/Bangkok"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
+knownDifferences {
+  cityName: "C\341\272\251m Ph\341\272\243"
+  s2CellId: 3551930755158376448
+  referenceDataResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Bangkok"
+  }
+  actualResult {
+    isoCountryCodes: "th"
+    zoneIds: "Asia/Bangkok"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
+knownDifferences {
+  cityName: "th\341\273\213 x\303\243 Qu\341\272\243ng Tr\341\273\213"
+  s2CellId: 3549087959254827008
+  referenceDataResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Bangkok"
+  }
+  actualResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Ho_Chi_Minh"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}

diff --git a/validation/geonames/known_diffs/known_diffs500.prototxt b/validation/geonames/known_diffs/known_diffs500.prototxt
index e683989..2fe633d 100644
--- a/validation/geonames/known_diffs/known_diffs500.prototxt
+++ b/validation/geonames/known_diffs/known_diffs500.prototxt

@@ -1,394 +1,4 @@
 knownDifferences {
-  cityName: "Nganglam"
-  s2CellId: 3989027993103106048
-  referenceDataResult {
-    isoCountryCodes: "bt"
-    zoneIds: "Asia/Thimphu"
-  }
-  actualResult {
-    isoCountryCodes: "in"
-    zoneIds: "Asia/Kolkata"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Upper Liard"
-  s2CellId: 6051535508603928576
-  referenceDataResult {
-    isoCountryCodes: "ca"
-    zoneIds: "America/Vancouver"
-  }
-  actualResult {
-    isoCountryCodes: "ca"
-    zoneIds: "America/Whitehorse"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yanchiwan"
-  s2CellId: 4016862486979411968
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shibaocheng"
-  s2CellId: 4017035450144260096
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yangjiaqiao"
-  s2CellId: 4029251302964854784
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xihu"
-  s2CellId: 4029171426236825600
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Wudun"
-  s2CellId: 4029242264743051264
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tashi"
-  s2CellId: 4017473429434269696
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qili"
-  s2CellId: 4029248724910735360
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Mengjiaqiao"
-  s2CellId: 4029246456094261248
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Liuyuan"
-  s2CellId: 4017643028565983232
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Huangqu"
-  s2CellId: 4029291663846277120
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guazhou"
-  s2CellId: 4017304266778607616
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dongbatu"
-  s2CellId: 4017318900805926912
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Bulongji"
-  s2CellId: 4019136304406069248
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhusha"
-  s2CellId: 3939530029930643456
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhongdong"
-  s2CellId: 3939775439530098688
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yingzai"
-  s2CellId: 3939886118152962048
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yingli"
-  s2CellId: 3554001586525044736
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yatang"
-  s2CellId: 3939868455099957248
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yangqing"
-  s2CellId: 3554128712188297216
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xin\342\200\231an"
-  s2CellId: 3939767679061065728
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xilian"
-  s2CellId: 3554019633440751616
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xieji"
-  s2CellId: 3939671965178003456
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xiaqiao"
-  s2CellId: 3553979272022458368
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xiadong"
-  s2CellId: 3939350482580930560
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Wuyang"
   s2CellId: 3939746278849642496
   referenceDataResult {
@@ -404,1656 +14,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Wushi"
-  s2CellId: 3554015859775111168
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Wenlou"
-  s2CellId: 3939618156753977344
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Wangfu"
-  s2CellId: 3939363304668921856
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tongqing"
-  s2CellId: 3939735523177791488
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tiaofeng"
-  s2CellId: 3554183184721641472
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tangpeng"
-  s2CellId: 3939830621806788608
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tangjia"
-  s2CellId: 3554059210490642432
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Taiping"
-  s2CellId: 3554145879172579328
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shuikou"
-  s2CellId: 3939649004819709952
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shiling"
-  s2CellId: 3939871929728499712
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shijing"
-  s2CellId: 3939873831862140928
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shigu"
-  s2CellId: 3939684835584376832
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shenzhen"
-  s2CellId: 3939392142153089024
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shalang"
-  s2CellId: 3939377783540547584
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qujie"
-  s2CellId: 3553994505197715456
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qishui"
-  s2CellId: 3554053385441247232
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qingping"
-  s2CellId: 3939883354341507072
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qijing"
-  s2CellId: 3939703905776041984
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qianshan"
-  s2CellId: 3554376098009579520
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qianpai"
-  s2CellId: 3939508825677103104
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Pingtang"
-  s2CellId: 3939494688255377408
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Pingding"
-  s2CellId: 3939804012336906240
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nawu"
-  s2CellId: 3939794543544631296
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nanxing"
-  s2CellId: 3554167167177981952
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nantang"
-  s2CellId: 3939630924618006528
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nansheng"
-  s2CellId: 3939782487034560512
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nahuo"
-  s2CellId: 3939376060184920064
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Meihua"
-  s2CellId: 3939703116038930432
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Maichen"
-  s2CellId: 3553975257838649344
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Magang"
-  s2CellId: 3939346252038144000
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Longtang"
-  s2CellId: 3554383230339645440
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Longmen"
-  s2CellId: 3554171493283790848
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Lintou"
-  s2CellId: 3939697867588894720
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Linchen"
-  s2CellId: 3939785775905767424
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Liangguang"
-  s2CellId: 3939739921224302592
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Liangdong"
-  s2CellId: 3939760620819185664
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Kelu"
-  s2CellId: 3554115532007407616
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jintang"
-  s2CellId: 3939683466563551232
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jinhe"
-  s2CellId: 3554371698352455680
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jindong"
-  s2CellId: 3939545905740382208
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jijia"
-  s2CellId: 3554069299368820736
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jianghong"
-  s2CellId: 3554070556183625728
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Huangpo"
-  s2CellId: 3939748938508140544
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hetou"
-  s2CellId: 3554111828134985728
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Heshui"
-  s2CellId: 3939501626238173184
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hengshan"
-  s2CellId: 3939859522641723392
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hejiang"
-  s2CellId: 3939788596625539072
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hechun"
-  s2CellId: 3939840590962753536
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hai\342\200\231an"
-  s2CellId: 3553984366390542336
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guizi"
-  s2CellId: 3939523166036033536
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guanzhu"
-  s2CellId: 3939352128627146752
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guanqiao"
-  s2CellId: 3939776980349616128
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gongguan"
-  s2CellId: 3939689109613707264
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Fenjie"
-  s2CellId: 3939694267332558848
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dongshan"
-  s2CellId: 3554220916546207744
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dongli"
-  s2CellId: 3554216637148168192
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dongjian"
-  s2CellId: 3554223459703717888
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dong\342\200\231an"
-  s2CellId: 3939658283559682048
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Diancheng"
-  s2CellId: 3939316223237423104
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dapo"
-  s2CellId: 3939388518274433024
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Danchang"
-  s2CellId: 3939339797239169024
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dajing"
-  s2CellId: 3939633057069268992
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Chidong"
-  s2CellId: 3939538945209008128
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Chengyue"
-  s2CellId: 3554120477125378048
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Changshan"
-  s2CellId: 3939827598686683136
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Changqi"
-  s2CellId: 3939726747485863936
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Changpo"
-  s2CellId: 3939663097144279040
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Caotan"
-  s2CellId: 3554096803265642496
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Boyang"
-  s2CellId: 3939621921829683200
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Bohe"
-  s2CellId: 3939342963703808000
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Beipo"
-  s2CellId: 3554104797273522176
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Baoxu"
-  s2CellId: 3939626830977302528
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Baishi"
-  s2CellId: 3939535448568758272
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Anpu"
-  s2CellId: 3939862521602637824
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dacheng"
-  s2CellId: 3939394696048017408
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Aotou"
-  s2CellId: 3939731062854254592
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yangjiao"
-  s2CellId: 3939692251919155200
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Mata"
-  s2CellId: 3939358457261457408
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dingbao"
-  s2CellId: 3939650905342738432
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Beijie"
-  s2CellId: 3939641990064373760
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shuzi"
-  s2CellId: 3939345321640853504
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Lingmen"
-  s2CellId: 3939358876557639680
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Genzi"
-  s2CellId: 3939668000923189248
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Luokeng"
-  s2CellId: 3939376796234940416
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Huangling"
-  s2CellId: 3939379027470450688
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yuntan"
-  s2CellId: 3939381482581131264
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xindong"
-  s2CellId: 3939666419301482496
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Pingshan"
-  s2CellId: 3939656279420567552
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guding"
-  s2CellId: 3939399866651770880
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xinbao"
-  s2CellId: 3939499517946101760
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Sihe"
-  s2CellId: 3939483542278373376
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hongguan"
-  s2CellId: 3939513851325710336
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Chashan"
-  s2CellId: 3939516070750060544
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tandou"
-  s2CellId: 3554015577381011456
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xinliao"
-  s2CellId: 3554192284683599872
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Leigao"
-  s2CellId: 3554179219929956352
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Songzhu"
-  s2CellId: 3554165211894120448
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yangjia"
-  s2CellId: 3554163433777659904
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Baisha"
-  s2CellId: 3554165705815359488
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shentang"
-  s2CellId: 3554158275521937408
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Min\342\200\231an"
-  s2CellId: 3554148819077693440
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jianxin"
-  s2CellId: 3554144651885674496
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Lemin"
-  s2CellId: 3554082641147854848
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nansan"
-  s2CellId: 3554237763555426304
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gangmen"
-  s2CellId: 3554108139831820288
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qiantang"
-  s2CellId: 3554241665533214720
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Wutang"
-  s2CellId: 3554124108520226816
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Lingbei"
-  s2CellId: 3554133458664030208
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yanggan"
-  s2CellId: 3554102923057168384
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guandu"
-  s2CellId: 3939756389202657280
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Tangwei"
   s2CellId: 3939723961125830656
   referenceDataResult {
@@ -2069,681 +29,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Jiepao"
-  s2CellId: 3939863867538014208
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhenwen"
-  s2CellId: 3939745418782441472
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tanba"
-  s2CellId: 3939717871935946752
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhangpu"
-  s2CellId: 3939743941850562560
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xiaoliang"
-  s2CellId: 3939729218702671872
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shayuan"
-  s2CellId: 3939706230427090944
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Lanshi"
-  s2CellId: 3939730244662984704
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Cheban"
-  s2CellId: 3939891835828174848
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yangmei"
-  s2CellId: 3939739481527025664
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Daqiao"
-  s2CellId: 3939765024234405888
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qianshui"
-  s2CellId: 3939733887868993536
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhencheng"
-  s2CellId: 3939732286383063040
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gaoqiao"
-  s2CellId: 3939881442544189440
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Poxin"
-  s2CellId: 3939698828587827200
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gaoshan"
-  s2CellId: 3939690851222945792
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xinpo"
-  s2CellId: 3939690412062539776
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dongshan"
-  s2CellId: 3939781565227204608
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jishui"
-  s2CellId: 3939842095275048960
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shange"
-  s2CellId: 3939693248888438784
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Ligang"
-  s2CellId: 3939783244022546432
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Heliao"
-  s2CellId: 3939835670003974144
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Sishui"
-  s2CellId: 3939669255590510592
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhenjiang"
-  s2CellId: 3939790743572316160
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jianghu"
-  s2CellId: 3939789776667803648
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shijiao"
-  s2CellId: 3939837446509821952
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shatian"
-  s2CellId: 3939678488159584256
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Caojiang"
-  s2CellId: 3939672762968178688
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shiban"
-  s2CellId: 3939637572153638912
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tantou"
-  s2CellId: 3939646370931015680
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhenlong"
-  s2CellId: 3939646616817893376
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hehua"
-  s2CellId: 3939596917066956800
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xiayang"
-  s2CellId: 3554370047474401280
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Beihe"
-  s2CellId: 3554010712793677824
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Chengbei"
-  s2CellId: 3553983205138759680
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jiaoweixiang"
-  s2CellId: 3553973275174371328
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "He\342\200\231an"
-  s2CellId: 3554184973575520256
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Fucheng"
-  s2CellId: 3554159063111565312
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Haitou"
-  s2CellId: 3554229626739884032
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Longtou"
-  s2CellId: 3939755228487745536
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Huguang"
-  s2CellId: 3554140910969159680
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shiwan"
-  s2CellId: 3939737788773040128
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shicheng"
-  s2CellId: 3939848025014272000
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Wangcungang"
-  s2CellId: 3939716851881213952
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dashanjiang"
-  s2CellId: 3939725190560219136
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Bopu"
-  s2CellId: 3939725283975757824
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Haibin"
   s2CellId: 3939724892596862976
   referenceDataResult {
@@ -2759,591 +44,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Shanmei"
-  s2CellId: 3939674312914501632
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jinshan"
-  s2CellId: 3939680164807442432
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Shiziling"
-  s2CellId: 3939680553501982720
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Magui"
-  s2CellId: 3939402340552933376
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hetang"
-  s2CellId: 3939676250481623040
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guandu"
-  s2CellId: 3939692876300025856
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xiaguo"
-  s2CellId: 3939736614636355584
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xinmin"
-  s2CellId: 3939857412202168320
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nanshan"
-  s2CellId: 3553982632297496576
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Tangtuzhui"
-  s2CellId: 3939752377166331904
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gongnong"
-  s2CellId: 3554229489300930560
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nanqiao"
-  s2CellId: 3554230981265195008
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nandiao"
-  s2CellId: 3554233006342275072
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hedong"
-  s2CellId: 3939691217368907776
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hexi"
-  s2CellId: 3939690343343063040
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gaodi"
-  s2CellId: 3939704347083931648
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Panzhou"
-  s2CellId: 3939674562559475712
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Baoguang"
-  s2CellId: 3939674664564948992
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Sanwei"
-  s2CellId: 4029244756360953856
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Suzhou"
-  s2CellId: 4029248155827568640
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "L\303\274jiabao"
-  s2CellId: 4029244227006234624
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guojiabao"
-  s2CellId: 4029243701409611776
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Zhuanqukou"
-  s2CellId: 4029196799292997632
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qiaozi"
-  s2CellId: 4017451513826770944
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Nancha"
-  s2CellId: 4017306118983254016
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Sandaogou"
-  s2CellId: 4019148718472167424
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Yaozhanzi"
-  s2CellId: 4019145680319676416
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hedong"
-  s2CellId: 4019146864656908288
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Huancheng"
-  s2CellId: 4017492714374299648
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Mazongshan"
-  s2CellId: 4018614300523364352
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hexi"
-  s2CellId: 3939737038764376064
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xiashihao"
-  s2CellId: 3892677219004186624
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Donggong Cilao"
-  s2CellId: 3892710067450937344
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Xinjiang"
-  s2CellId: 3892689303968415744
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Jihuluntu Sumu"
-  s2CellId: 3892657367128473600
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Dongshengyong"
-  s2CellId: 3892637367076388864
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Butahai"
-  s2CellId: 3892518080802193408
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Hongnijing"
-  s2CellId: 3892560299793842176
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Guolemude"
-  s2CellId: 4006108714040819712
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Duobagou"
   s2CellId: 4004621555307905024
   referenceDataResult {
@@ -3359,90 +59,15 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Yu\342\200\231erhong"
-  s2CellId: 4015092376874778624
+  cityName: "Nganglam"
+  s2CellId: 3989027993103106048
   referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
+    isoCountryCodes: "bt"
+    zoneIds: "Asia/Thimphu"
   }
   actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Qiangma"
-  s2CellId: 3998283775401263104
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Mawu"
-  s2CellId: 3968463910880673792
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Gamei"
-  s2CellId: 3995366664752332800
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Chiduo"
-  s2CellId: 3994117619543179264
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Cuozheqiangma"
-  s2CellId: 4166411753577512960
-  referenceDataResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Urumqi"
-  }
-  actualResult {
-    isoCountryCodes: "cn"
-    zoneIds: "Asia/Shanghai"
+    isoCountryCodes: "in"
+    zoneIds: "Asia/Kolkata"
   }
   comment: "Add a comment here"
   type: "UNKNOWN"
@@ -3479,21 +104,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Jungutbatu Kaja Dua"
-  s2CellId: 3301822018025947136
-  referenceDataResult {
-    isoCountryCodes: "id"
-    zoneIds: "Asia/Jakarta"
-  }
-  actualResult {
-    isoCountryCodes: "id"
-    zoneIds: "Asia/Makassar"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Ensenada"
   s2CellId: 9684253037647888384
   referenceDataResult {
@@ -3541,36 +151,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Dzitox"
-  s2CellId: 10327225047369908224
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Cancun"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Venustiano Carranza"
-  s2CellId: 9707995643703721984
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Chihuahua"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Hermosillo"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Pancho Villa"
   s2CellId: 9717366343220592640
   referenceDataResult {
@@ -3601,21 +181,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Apozolco"
-  s2CellId: 9522800005048434688
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Chihuahua"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Paso del T\303\255o P\303\255o"
   s2CellId: 9724756555470995456
   referenceDataResult {
@@ -3740,21 +305,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Punta Abreojos"
-  s2CellId: 9310505403383021568
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Hermosillo"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Chihuahua"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "El Bismarck"
   s2CellId: 9717743277066682368
   referenceDataResult {
@@ -3770,21 +320,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Mesa del Tirador"
-  s2CellId: 9522739151267430400
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Chihuahua"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Entronque (Ley Seis de Enero)"
   s2CellId: 9717713083446591488
   referenceDataResult {
@@ -3800,21 +335,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Chan X-Cail"
-  s2CellId: 10327223369111437312
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Cancun"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Ampliaci\303\263n R\303\255o Bravo"
   s2CellId: 9684266207628230656
   referenceDataResult {
@@ -3845,21 +365,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Santo Domingo"
-  s2CellId: 10330929480821899264
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Cancun"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Oymyakon"
   s2CellId: 6620448050231902208
   referenceDataResult {
@@ -3890,36 +395,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Vladimirskiy"
-  s2CellId: 4689272353408942080
-  referenceDataResult {
-    isoCountryCodes: "ru"
-    zoneIds: "Europe/Moscow"
-  }
-  actualResult {
-    isoCountryCodes: "ru"
-    zoneIds: "Europe/Saratov"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Solyonoye Ozero"
-  s2CellId: 4677550466387673088
-  referenceDataResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Kiev"
-  }
-  actualResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Simferopol"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Savoonga"
   s2CellId: 6289207735749705728
   referenceDataResult {

diff --git a/validation/geonames/known_diffs/known_diffs5000.prototxt b/validation/geonames/known_diffs/known_diffs5000.prototxt
index c583572..2c9ea41 100644
--- a/validation/geonames/known_diffs/known_diffs5000.prototxt
+++ b/validation/geonames/known_diffs/known_diffs5000.prototxt

@@ -1,34 +1,4 @@
 knownDifferences {
-  cityName: "CPF"
-  s2CellId: 4460350630355009536
-  referenceDataResult {
-    isoCountryCodes: "ye"
-    zoneIds: "Asia/Kuwait"
-  }
-  actualResult {
-    isoCountryCodes: "ye"
-    zoneIds: "Asia/Aden"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
-  cityName: "Itamarac\303\241"
-  s2CellId: 552609014618259456
-  referenceDataResult {
-    isoCountryCodes: "br"
-    zoneIds: "America/Noronha"
-  }
-  actualResult {
-    isoCountryCodes: "br"
-    zoneIds: "America/Sao_Paulo"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Paral\303\255mni"
   s2CellId: 1504138485882159104
   referenceDataResult {
@@ -181,21 +151,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Tayoltita"
-  s2CellId: 9698598183856242688
-  referenceDataResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Chihuahua"
-  }
-  actualResult {
-    isoCountryCodes: "mx"
-    zoneIds: "America/Mexico_City"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "San Juan de Abajo"
   s2CellId: 9520952381521526784
   referenceDataResult {
@@ -288,21 +243,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Salf\304\253t"
-  s2CellId: 1521415989336473600
-  referenceDataResult {
-    isoCountryCodes: "ps"
-    zoneIds: "Asia/Jerusalem"
-  }
-  actualResult {
-    isoCountryCodes: "ps"
-    zoneIds: "Asia/Hebron"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Khandyga"
   s2CellId: 6627854273046642688
   referenceDataResult {
@@ -348,21 +288,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Roschinskiy"
-  s2CellId: 4712454939215921152
-  referenceDataResult {
-    isoCountryCodes: "ru"
-    zoneIds: "Europe/Moscow"
-  }
-  actualResult {
-    isoCountryCodes: "ru"
-    zoneIds: "Europe/Samara"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Buq\342\200\230\304\201t\304\201"
   s2CellId: 1521848172031246336
   referenceDataResult {
@@ -393,21 +318,6 @@
   bugUri: "http://b/bugId"
 }
 knownDifferences {
-  cityName: "Shchyolkino"
-  s2CellId: 4677366645008629760
-  referenceDataResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Kiev"
-  }
-  actualResult {
-    isoCountryCodes: "ua"
-    zoneIds: "Europe/Simferopol"
-  }
-  comment: "Add a comment here"
-  type: "UNKNOWN"
-  bugUri: "http://b/bugId"
-}
-knownDifferences {
   cityName: "Lanett"
   s2CellId: 9839419099266940928
   referenceDataResult {
@@ -679,3 +589,35 @@
   type: "UNKNOWN"
   bugUri: "http://b/bugId"
 }
+knownDifferences {
+  cityName: "Tyuratam"
+  s2CellId: 4752462147261300736
+  referenceDataResult {
+    isoCountryCodes: "kz"
+    zoneIds: "Asia/Almaty"
+  }
+  actualResult {
+    isoCountryCodes: "kz"
+    zoneIds: "Asia/Oral"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
+knownDifferences {
+  cityName: "Th\341\273\213 Tr\341\272\245n \304\220\341\273\223ng \304\220\304\203ng"
+  s2CellId: 3942156659056443392
+  referenceDataResult {
+    isoCountryCodes: "vn"
+    zoneIds: "Asia/Bangkok"
+  }
+  actualResult {
+    isoCountryCodes: "th"
+    isoCountryCodes: "cn"
+    zoneIds: "Asia/Bangkok"
+    zoneIds: "Asia/Shanghai"
+  }
+  comment: "Add a comment here"
+  type: "UNKNOWN"
+  bugUri: "http://b/bugId"
+}
commit	f78467ddeeaad1af94f92e960136209c527420d9	[log] [tgz]
author	Neil Fuller <[email protected]>	Wed Oct 20 12:26:42 2021 +0000
committer	Automerger Merge Worker <[email protected]>	Wed Oct 20 12:26:42 2021 +0000
tree	fbf99d7ea7a54fb837f5d92c0c728791412d67a5
parent	af2e348bfac14d73fbe5022ddf137194201d3536 [diff]
parent	dcf40ada2e9a6027c5e7851321cfe83dbdff8e23 [diff]