diff --git a/cpp/src/phonenumbers/geocoding/geocoding_data.cc b/cpp/src/phonenumbers/geocoding/geocoding_data.cc index bd990f2d78975bfbbcf60e6d44b9f98ab994f234..bca1c595f98059e0700a9482f02537f7e2b4f55b 100644 --- a/cpp/src/phonenumbers/geocoding/geocoding_data.cc +++ b/cpp/src/phonenumbers/geocoding/geocoding_data.cc @@ -444259,7 +444259,7 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Suoxian, Tibet", + "Suoxian, Xizang", "Panzhihua, Sichuan", "Zigong, Sichuan", "Mianyang, Sichuan", @@ -444301,13 +444301,13 @@ const char* prefix_86_en_descriptions[] = { "Liuku, Yunnan", "Zhongdian, Yunnan", "Lijiang, Yunnan", - "Lhasa, Tibet", - "Rikaze/Zhongba, Tibet", - "Naidong, Tibet", - "Linzhi, Tibet", - "Changdu, Tibet", - "Naqu/Jiali/Nierong/Shenzha/Shuanghu/Bange/Nima, Tibet", - "GeEr/Pulan/Zhada, Tibet", + "Lhasa, Xizang", + "Rikaze/Zhongba, Xizang", + "Naidong, Xizang", + "Linzhi, Xizang", + "Changdu, Xizang", + "Naqu/Jiali/Nierong/Shenzha/Shuanghu/Bange/Nima, Xizang", + "GeEr/Pulan/Zhada, Xizang", "Haikou, Hainan", "Tacheng, Xinjiang", "Hami, Xinjiang", @@ -446145,7 +446145,7 @@ const char* prefix_86_en_descriptions[] = { "Zhengzhou, Henan", "Xuchang, Henan", "Zhengzhou, Henan", - "Lhasa, Tibet", + "Lhasa, Xizang", "XiAn, Shaanxi", "XiAn, Shaanxi", "Tianjin", @@ -447079,7 +447079,7 @@ const char* prefix_86_en_descriptions[] = { "Chengdu, Sichuan", "Kunming, Yunnan", "Haikou, Hainan", - "Lhasa, Tibet", + "Lhasa, Xizang", "XiAn, Shaanxi", "Lanzhou, Gansu", "Xining, Qinghai", @@ -447233,7 +447233,7 @@ const char* prefix_86_en_descriptions[] = { "Changsha, Hunan", "Changsha, Hunan", "Changsha, Hunan", - "Lhasa, Tibet", + "Lhasa, Xizang", "Meizhou, Guangdong", "Dongguan, Guangdong", "Dongguan, Guangdong", @@ -451349,7 +451349,7 @@ const char* prefix_86_en_descriptions[] = { "Hangzhou, Zhejiang", "Ningbo, Zhejiang", "Wenzhou, Zhejiang", - "Lhasa, Tibet", + "Lhasa, Xizang", "Huizhou, Guangdong", "Qingyuan, Guangdong", "Zhongshan, Guangdong", @@ -454593,7 +454593,7 @@ const char* prefix_86_en_descriptions[] = { "Shanghai", "Tianjin", "Haikou, Hainan", - "Lhasa, Tibet", + "Lhasa, Xizang", "Lanzhou, Gansu", "Dingxi, Gansu", "Pingliang, Gansu", @@ -459854,7 +459854,7 @@ const char* prefix_86_en_descriptions[] = { "Hami, Xinjiang", "Changji, Xinjiang", "Wuzhou, Guangxi", - "Lhasa, Tibet", + "Lhasa, Xizang", "Shanghai", "Tianjin", "Chongqing", @@ -460260,9 +460260,9 @@ const char* prefix_86_en_descriptions[] = { "Wenshan, Yunnan", "Xishuangbanna, Yunnan", "Haikou, Hainan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Haikou, Hainan", "Haikou, Hainan", "Suzhou, Jiangsu", @@ -462615,7 +462615,7 @@ const char* prefix_86_en_descriptions[] = { "Shaoxing, Zhejiang", "Beijing", "Hangzhou, Zhejiang", - "Lhasa, Tibet", + "Lhasa, Xizang", "Changsha, Hunan", "Changsha, Hunan", "Yiyang, Hunan", @@ -475195,16 +475195,16 @@ const char* prefix_86_en_descriptions[] = { "Suqian, Jiangsu", "Suqian, Jiangsu", "Suqian, Jiangsu", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Xingtai, Hebei", "Xingtai, Hebei", "Jiangmen, Guangdong", @@ -478472,10 +478472,10 @@ const char* prefix_86_en_descriptions[] = { "Liaoyuan, Jilin", "Changchun, Jilin", "Siping, Jilin", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Nagqu, Tibet", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Nagqu, Xizang", "Shangluo, Shaanxi", "Ankang, Shaanxi", "Shangluo, Shaanxi", @@ -479096,16 +479096,16 @@ const char* prefix_86_en_descriptions[] = { "Deqen, Yunnan", "Lijiang, Yunnan", "Yuxi, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Zigong, Sichuan", "Mianyang, Sichuan", "Deyang, Sichuan", @@ -479911,16 +479911,16 @@ const char* prefix_86_en_descriptions[] = { "Panjin, Liaoning", "Panjin, Liaoning", "Huludao, Liaoning", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Dongguan, Guangdong", "Dongguan, Guangdong", "Huizhou, Guangdong", @@ -484858,16 +484858,16 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Neijiang, Sichuan", "Neijiang, Sichuan", "Zigong, Sichuan", @@ -486110,7 +486110,7 @@ const char* prefix_86_en_descriptions[] = { "Wuhan, Hubei", "Nanning, Guangxi", "Nanning, Guangxi", - "Lhasa, Tibet", + "Lhasa, Xizang", "Yinchuan, Ningxia", "Karamay, Xinjiang", "Nanjing, Jiangsu", @@ -486179,7 +486179,7 @@ const char* prefix_86_en_descriptions[] = { "Kunming, Yunnan", "Kunming, Yunnan", "Ankang, Shaanxi", - "Xigaze, Tibet", + "Xigaze, Xizang", "Hainan, Qinghai", "Hotan, Xinjiang", "Jinan, Shandong", @@ -486192,7 +486192,7 @@ const char* prefix_86_en_descriptions[] = { "Qinzhou, Guangxi", "Kunming, Yunnan", "Baoji, Shaanxi", - "Lhasa, Tibet", + "Lhasa, Xizang", "Longnan, Gansu", "Chongqing", "Jinan, Shandong", @@ -486203,7 +486203,7 @@ const char* prefix_86_en_descriptions[] = { "Hechi, Guangxi", "Kunming, Yunnan", "XiAn, Shaanxi", - "Lhasa, Tibet", + "Lhasa, Xizang", "Longnan, Gansu", "Urumchi, Xinjiang", "Jinan, Shandong", @@ -488731,10 +488731,10 @@ const char* prefix_86_en_descriptions[] = { "TaiAn, Shandong", "Linyi, Shandong", "Yuxi, Yunnan", - "Xigaze, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", + "Xigaze, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", "Linxia, Gansu", "Baiyin, Gansu", "Dingxi, Gansu", @@ -489447,10 +489447,10 @@ const char* prefix_86_en_descriptions[] = { "Changsha, Hunan", "Changsha, Hunan", "Huaihua, Hunan", - "Xigaze, Tibet", - "Nagqu, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", + "Xigaze, Xizang", + "Nagqu, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", "Changde, Hunan", "Changde, Hunan", "Changde, Hunan", @@ -492006,16 +492006,16 @@ const char* prefix_86_en_descriptions[] = { "Deqen, Yunnan", "Lijiang, Yunnan", "Yuxi, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Neijiang, Sichuan", "Ziyang, Sichuan", "Zigong, Sichuan", @@ -492645,16 +492645,16 @@ const char* prefix_86_en_descriptions[] = { "Xishuangbanna, Yunnan", "Lincang, Yunnan", "Lijiang, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Neijiang, Sichuan", "Ziyang, Sichuan", "Zigong, Sichuan", @@ -493071,16 +493071,16 @@ const char* prefix_86_en_descriptions[] = { "Bijie, Guizhou", "Liupanshui, Guizhou", "Qianxinan, Guizhou", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Guiyang, Guizhou", "Guiyang, Guizhou", "Guiyang, Guizhou", @@ -493619,16 +493619,16 @@ const char* prefix_86_en_descriptions[] = { "Yuxi, Yunnan", "Chuxiong, Yunnan", "Puer, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Neijiang, Sichuan", "Ziyang, Sichuan", "Zigong, Sichuan", @@ -494207,16 +494207,16 @@ const char* prefix_86_en_descriptions[] = { "Yuxi, Yunnan", "Chuxiong, Yunnan", "Puer, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Neijiang, Sichuan", "Ziyang, Sichuan", "Mianyang, Sichuan", @@ -494249,16 +494249,16 @@ const char* prefix_86_en_descriptions[] = { "Jiuquan, Gansu", "Tianshui, Gansu", "Longnan, Gansu", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", "Nanning, Guangxi", "Nanning, Guangxi", "Liuzhou, Guangxi", @@ -500410,16 +500410,16 @@ const char* prefix_86_en_descriptions[] = { "Xishuangbanna, Yunnan", "Xishuangbanna, Yunnan", "Xishuangbanna, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Guangzhou, Guangdong", "Shenzhen, Guangdong", "Foshan, Guangdong", @@ -500724,7 +500724,7 @@ const char* prefix_86_en_descriptions[] = { "Jingmen, Hubei", "Kunming, Yunnan", "Xishuangbanna, Yunnan", - "Qamdo, Tibet", + "Qamdo, Xizang", "Aba, Sichuan", "Yulin, Shaanxi", "XiAn, Shaanxi", @@ -501294,16 +501294,16 @@ const char* prefix_86_en_descriptions[] = { "Kunming, Yunnan", "Lijiang, Yunnan", "Yuxi, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Zigong, Sichuan", "Mianyang, Sichuan", "Deyang, Sichuan", @@ -502572,16 +502572,16 @@ const char* prefix_86_en_descriptions[] = { "Chuxiong, Yunnan", "Chuxiong, Yunnan", "Puer, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Neijiang, Sichuan", "Neijiang, Sichuan", "Luzhou, Sichuan", @@ -502612,16 +502612,16 @@ const char* prefix_86_en_descriptions[] = { "Hangzhou, Zhejiang", "Hangzhou, Zhejiang", "Hangzhou, Zhejiang", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Aba, Sichuan", "Aba, Sichuan", "Aba, Sichuan", @@ -503392,16 +503392,16 @@ const char* prefix_86_en_descriptions[] = { "Zhumadian, Henan", "Sanmenxia, Henan", "Sanmenxia, Henan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Tieling, Liaoning", "Dalian, Liaoning", "Anshan, Liaoning", @@ -504431,16 +504431,16 @@ const char* prefix_86_en_descriptions[] = { "Puyang, Henan", "Zhoukou, Henan", "Zhumadian, Henan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Shenyang, Liaoning", "Shenyang, Liaoning", "Dalian, Liaoning", @@ -505881,16 +505881,16 @@ const char* prefix_86_en_descriptions[] = { "Chuxiong, Yunnan", "Nujiang, Yunnan", "Nujiang, Yunnan", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", "Shangluo, Shaanxi", "Shangluo, Shaanxi", "Shangluo, Shaanxi", @@ -505941,16 +505941,16 @@ const char* prefix_86_en_descriptions[] = { "Wenshan, Yunnan", "Wenshan, Yunnan", "Wenshan, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Haibei, Qinghai", "Xining, Qinghai", "Haidong, Qinghai", @@ -506842,16 +506842,16 @@ const char* prefix_86_en_descriptions[] = { "Zhaoqing, Guangdong", "Zhaoqing, Guangdong", "Meizhou, Guangdong", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Zhangye, Gansu", "Zhangye, Gansu", "Zhangye, Gansu", @@ -507007,16 +507007,16 @@ const char* prefix_86_en_descriptions[] = { "Qianxinan, Guizhou", "Qianxinan, Guizhou", "Qianxinan, Guizhou", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "YanAn, Shaanxi", "YanAn, Shaanxi", "Yulin, Shaanxi", @@ -507673,7 +507673,7 @@ const char* prefix_86_en_descriptions[] = { "Fuzhou, Fujian", "Guiyang, Guizhou", "Kunming, Yunnan", - "Lhasa, Tibet", + "Lhasa, Xizang", "XiAn, Shaanxi", "Lanzhou, Gansu", "Yinchuan, Ningxia", @@ -508314,16 +508314,16 @@ const char* prefix_86_en_descriptions[] = { "Xinxiang, Henan", "Xinxiang, Henan", "Xinxiang, Henan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Yueyang, Hunan", "Yueyang, Hunan", "Chuzhou, Anhui", @@ -510913,8 +510913,8 @@ const char* prefix_86_en_descriptions[] = { "Zhoushan, Zhejiang", "Zhoushan, Zhejiang", "Zhoushan, Zhejiang", - "Nagqu, Tibet", - "Qamdo, Tibet", + "Nagqu, Xizang", + "Qamdo, Xizang", "Shantou, Guangdong", "Shantou, Guangdong", "Shantou, Guangdong", @@ -514109,16 +514109,16 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nagqu, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nagqu, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", "Guiyang, Guizhou", "Guiyang, Guizhou", "Zunyi, Guizhou", @@ -516201,26 +516201,26 @@ const char* prefix_86_en_descriptions[] = { "Qingdao, Shandong", "Qingdao, Shandong", "Weifang, Shandong", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Xianyang, Shaanxi", "YanAn, Shaanxi", "Yulin, Shaanxi", @@ -518037,11 +518037,11 @@ const char* prefix_86_en_descriptions[] = { "Chongqing", "Kunming, Yunnan", "Guiyang, Guizhou", - "Lhasa, Tibet", + "Lhasa, Xizang", "Chengdu, Sichuan", "Mianyang, Sichuan", "Liangshan, Sichuan", - "Lhasa, Tibet", + "Lhasa, Xizang", "Chengdu, Sichuan", "Chengdu, Sichuan", "Wenshan, Yunnan", @@ -519237,16 +519237,16 @@ const char* prefix_86_en_descriptions[] = { "Yuxi, Yunnan", "Chuxiong, Yunnan", "Puer, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Jiayuguan, Gansu", "Gannan, Gansu", "Gannan, Gansu", @@ -525450,16 +525450,16 @@ const char* prefix_86_en_descriptions[] = { "Deqen, Yunnan", "Lijiang, Yunnan", "Kunming, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Zigong, Sichuan", "Mianyang, Sichuan", "Deyang, Sichuan", @@ -525996,16 +525996,16 @@ const char* prefix_86_en_descriptions[] = { "Dongguan, Guangdong", "Dongguan, Guangdong", "Dongguan, Guangdong", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Xigaze, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Xigaze, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", "Rizhao, Shandong", "Rizhao, Shandong", "Jinan, Shandong", @@ -527695,10 +527695,10 @@ const char* prefix_86_en_descriptions[] = { "Foshan, Guangdong", "Foshan, Guangdong", "Foshan, Guangdong", - "Xigaze, Tibet", - "Qamdo, Tibet", - "Nyingchi, Tibet", - "Nagqu, Tibet", + "Xigaze, Xizang", + "Qamdo, Xizang", + "Nyingchi, Xizang", + "Nagqu, Xizang", "Qiannan, Guizhou", "Guiyang, Guizhou", "Zunyi, Guizhou", @@ -528631,16 +528631,16 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Qamdo, Tibet", - "Ngari, Tibet", - "Xigaze, Tibet", - "Qamdo, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Qamdo, Xizang", + "Ngari, Xizang", + "Xigaze, Xizang", + "Qamdo, Xizang", "Suining, Sichuan", "Suining, Sichuan", "Panzhihua, Sichuan", @@ -529827,16 +529827,16 @@ const char* prefix_86_en_descriptions[] = { "Yantai, Shandong", "Jining, Shandong", "Jining, Shandong", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Ningbo, Zhejiang", "Ningbo, Zhejiang", "Ningbo, Zhejiang", @@ -529996,16 +529996,16 @@ const char* prefix_86_en_descriptions[] = { "Chaozhou, Guangdong", "Jiangmen, Guangdong", "Huizhou, Guangdong", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Sanmenxia, Henan", "Sanmenxia, Henan", "Sanmenxia, Henan", @@ -533594,16 +533594,16 @@ const char* prefix_86_en_descriptions[] = { "Yuxi, Yunnan", "Lincang, Yunnan", "Lincang, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Zhongshan, Guangdong", "Shenzhen, Guangdong", "Jieyang, Guangdong", @@ -540085,26 +540085,26 @@ const char* prefix_86_en_descriptions[] = { "Guangzhou, Guangdong", "Guangzhou, Guangdong", "Shenzhen, Guangdong", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Xiamen, Fujian", "Xiamen, Fujian", "Fuzhou, Fujian", @@ -540135,16 +540135,16 @@ const char* prefix_86_en_descriptions[] = { "Quanzhou, Fujian", "Quanzhou, Fujian", "Quanzhou, Fujian", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Fuzhou, Fujian", "Nanping, Fujian", "Nanping, Fujian", @@ -540888,16 +540888,16 @@ const char* prefix_86_en_descriptions[] = { "Deqen, Yunnan", "Lijiang, Yunnan", "Lijiang, Yunnan", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Deyang, Sichuan", "Deyang, Sichuan", "Deyang, Sichuan", @@ -541010,16 +541010,16 @@ const char* prefix_86_en_descriptions[] = { "Wuzhong, Ningxia", "Zhongwei, Ningxia", "Guyuan, Ningxia", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", "HuaiAn, Jiangsu", "HuaiAn, Jiangsu", "HuaiAn, Jiangsu", @@ -542027,16 +542027,16 @@ const char* prefix_86_en_descriptions[] = { "Huanggang, Hubei", "Huanggang, Hubei", "Huanggang, Hubei", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "XiAn, Shaanxi", "XiAn, Shaanxi", "XiAn, Shaanxi", @@ -543214,16 +543214,16 @@ const char* prefix_86_en_descriptions[] = { "Yuxi, Yunnan", "Puer, Yunnan", "Puer, Yunnan", - "Lhasa, Tibet", - "Shannan, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", + "Lhasa, Xizang", + "Shannan, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", "Weinan, Shaanxi", "Weinan, Shaanxi", "Weinan, Shaanxi", @@ -543267,16 +543267,16 @@ const char* prefix_86_en_descriptions[] = { "Longnan, Gansu", "Tianshui, Gansu", "Qingyang, Gansu", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nagqu, Tibet", - "Shannan, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nagqu, Xizang", + "Shannan, Xizang", + "Lhasa, Xizang", "Deyang, Sichuan", "Deyang, Sichuan", "Deyang, Sichuan", @@ -543819,16 +543819,16 @@ const char* prefix_86_en_descriptions[] = { "Bijie, Guizhou", "Bijie, Guizhou", "Bijie, Guizhou", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", "XiAn, Shaanxi", "YanAn, Shaanxi", "Yulin, Shaanxi", @@ -544705,36 +544705,36 @@ const char* prefix_86_en_descriptions[] = { "Qiannan, Guizhou", "Qiandongnan, Guizhou", "Qiandongnan, Guizhou", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Lhasa, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Xigaze, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Lhasa, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nagqu, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Lhasa, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Xigaze, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Lhasa, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nagqu, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", "Xuzhou, Jiangsu", "Xuzhou, Jiangsu", "Suqian, Jiangsu", @@ -545322,16 +545322,16 @@ const char* prefix_86_en_descriptions[] = { "Deqen, Yunnan", "Lijiang, Yunnan", "Kunming, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Liangshan, Sichuan", "Liangshan, Sichuan", "Liangshan, Sichuan", @@ -547612,16 +547612,16 @@ const char* prefix_86_en_descriptions[] = { "Guilin, Guangxi", "Guilin, Guangxi", "Guilin, Guangxi", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Nanning, Guangxi", "Wuzhou, Guangxi", "Nanning, Guangxi", @@ -548021,16 +548021,16 @@ const char* prefix_86_en_descriptions[] = { "Puer, Yunnan", "Wenshan, Yunnan", "Lijiang, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Linxia, Gansu", "Lanzhou, Gansu", "Dingxi, Gansu", @@ -548061,16 +548061,16 @@ const char* prefix_86_en_descriptions[] = { "Panzhihua, Sichuan", "Panzhihua, Sichuan", "Panzhihua, Sichuan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Chengdu, Sichuan", "Chengdu, Sichuan", "Chengdu, Sichuan", @@ -548617,7 +548617,7 @@ const char* prefix_86_en_descriptions[] = { "Yinchuan, Ningxia", "Haikou, Hainan", "Xining, Qinghai", - "Lhasa, Tibet", + "Lhasa, Xizang", "Urumchi, Xinjiang", "HuaiAn, Jiangsu", "Yancheng, Jiangsu", @@ -549066,16 +549066,16 @@ const char* prefix_86_en_descriptions[] = { "Yuxi, Yunnan", "Lijiang, Yunnan", "Dehong, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "XiAn, Shaanxi", "YanAn, Shaanxi", "Yulin, Shaanxi", @@ -550538,16 +550538,16 @@ const char* prefix_86_en_descriptions[] = { "Liaoyuan, Jilin", "Songyuan, Jilin", "Baishan, Jilin", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Zhangjiajie, Hunan", "Yongzhou, Hunan", "Loudi, Hunan", @@ -550588,16 +550588,16 @@ const char* prefix_86_en_descriptions[] = { "Lanzhou, Gansu", "Lanzhou, Gansu", "Lanzhou, Gansu", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Nagqu, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Nagqu, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", "Zhengzhou, Henan", "Jiaozuo, Henan", "Hebi, Henan", @@ -552303,16 +552303,16 @@ const char* prefix_86_en_descriptions[] = { "Zunyi, Guizhou", "Zunyi, Guizhou", "Zunyi, Guizhou", - "Qamdo, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nyingchi, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", + "Qamdo, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nyingchi, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", "Zunyi, Guizhou", "Zunyi, Guizhou", "Zunyi, Guizhou", @@ -552514,16 +552514,16 @@ const char* prefix_86_en_descriptions[] = { "Hengyang, Hunan", "Changde, Hunan", "Changsha, Hunan", - "Qamdo, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Shannan, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Xigaze, Tibet", - "Qamdo, Tibet", + "Qamdo, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Shannan, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Xigaze, Xizang", + "Qamdo, Xizang", "Linxia, Gansu", "Lanzhou, Gansu", "Dingxi, Gansu", @@ -552554,16 +552554,16 @@ const char* prefix_86_en_descriptions[] = { "Lanzhou, Gansu", "Lanzhou, Gansu", "Lanzhou, Gansu", - "Qamdo, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Shannan, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", + "Qamdo, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Shannan, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", "Mianyang, Sichuan", "Mianyang, Sichuan", "Luzhou, Sichuan", @@ -553329,16 +553329,16 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Xigaze, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Xigaze, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", "Guiyang, Guizhou", "Guiyang, Guizhou", "Zunyi, Guizhou", @@ -555054,26 +555054,26 @@ const char* prefix_86_en_descriptions[] = { "Lijiang, Yunnan", "Lijiang, Yunnan", "Lijiang, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Shannan, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Shannan, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Qinzhou, Guangxi", "Qinzhou, Guangxi", "Qinzhou, Guangxi", @@ -555829,16 +555829,16 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", "Neijiang, Sichuan", "Neijiang, Sichuan", "Luzhou, Sichuan", @@ -557551,16 +557551,16 @@ const char* prefix_86_en_descriptions[] = { "Kunming, Yunnan", "Lincang, Yunnan", "Honghe, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", "Yiyang, Hunan", "Yiyang, Hunan", "Yiyang, Hunan", @@ -558477,16 +558477,16 @@ const char* prefix_86_en_descriptions[] = { "Nujiang, Yunnan", "Deqen, Yunnan", "Lijiang, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Xigaze, Tibet", - "Qamdo, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Xigaze, Xizang", + "Qamdo, Xizang", "Kashi, Xinjiang", "Bortala, Xinjiang", "Hami, Xinjiang", @@ -559849,26 +559849,26 @@ const char* prefix_86_en_descriptions[] = { "Lincang, Yunnan", "Lincang, Yunnan", "Lincang, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Xigaze, Tibet", - "Nagqu, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Shannan, Tibet", - "Nagqu, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Xigaze, Xizang", + "Nagqu, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Shannan, Xizang", + "Nagqu, Xizang", "Nanjing, Jiangsu", "Xuzhou, Jiangsu", "Taizhou, Jiangsu", @@ -561964,16 +561964,16 @@ const char* prefix_86_en_descriptions[] = { "Shenzhen, Guangdong", "Shenzhen, Guangdong", "Guangzhou, Guangdong", - "Xigaze, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Nyingchi, Tibet", - "Lhasa, Tibet", + "Xigaze, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Nyingchi, Xizang", + "Lhasa, Xizang", "Qujing, Yunnan", "Kunming, Yunnan", "Dehong, Yunnan", @@ -561984,16 +561984,16 @@ const char* prefix_86_en_descriptions[] = { "Chuxiong, Yunnan", "Qujing, Yunnan", "Zhaotong, Yunnan", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Nanning, Guangxi", "Yulin, Guangxi", "Liuzhou, Guangxi", @@ -564994,26 +564994,26 @@ const char* prefix_86_en_descriptions[] = { "Shenzhen, Guangdong", "Guangzhou, Guangdong", "Qingyuan, Guangdong", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Shenzhen, Guangdong", "Shenzhen, Guangdong", "Shenzhen, Guangdong", @@ -565900,16 +565900,16 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nagqu, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nagqu, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", "Guiyang, Guizhou", "Guiyang, Guizhou", "Zunyi, Guizhou", @@ -568022,16 +568022,16 @@ const char* prefix_86_en_descriptions[] = { "Zunyi, Guizhou", "Zunyi, Guizhou", "Zunyi, Guizhou", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Nagqu, Tibet", - "Qamdo, Tibet", - "Xigaze, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Nagqu, Xizang", + "Qamdo, Xizang", + "Xigaze, Xizang", "Tacheng, Xinjiang", "Altay, Xinjiang", "Altay, Xinjiang", @@ -570524,8 +570524,8 @@ const char* prefix_86_en_descriptions[] = { "Qinzhou, Guangxi", "Yulin, Guangxi", "Yulin, Guangxi", - "Xigaze, Tibet", - "Nyingchi, Tibet", + "Xigaze, Xizang", + "Nyingchi, Xizang", "Chenzhou, Hunan", "Chenzhou, Hunan", "Chenzhou, Hunan", @@ -570975,16 +570975,16 @@ const char* prefix_86_en_descriptions[] = { "Ganzhou, Jiangxi", "Jingdezhen, Jiangxi", "Pingxiang, Jiangxi", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Xigaze, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Nagqu, Tibet", - "Nyingchi, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Xigaze, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Nagqu, Xizang", + "Nyingchi, Xizang", "Kaifeng, Henan", "Kaifeng, Henan", "Kaifeng, Henan", @@ -571740,16 +571740,16 @@ const char* prefix_86_en_descriptions[] = { "Deqen, Yunnan", "Lijiang, Yunnan", "Kunming, Yunnan", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Zigong, Sichuan", "Mianyang, Sichuan", "Deyang, Sichuan", @@ -573812,16 +573812,16 @@ const char* prefix_86_en_descriptions[] = { "Shenzhen, Guangdong", "Shenzhen, Guangdong", "Shenzhen, Guangdong", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Neijiang, Sichuan", "Neijiang, Sichuan", "Luzhou, Sichuan", @@ -573852,16 +573852,16 @@ const char* prefix_86_en_descriptions[] = { "Hangzhou, Zhejiang", "Hangzhou, Zhejiang", "Hangzhou, Zhejiang", - "Lhasa, Tibet", - "Lhasa, Tibet", - "Xigaze, Tibet", - "Shannan, Tibet", - "Nyingchi, Tibet", - "Qamdo, Tibet", - "Nagqu, Tibet", - "Ngari, Tibet", - "Lhasa, Tibet", - "Lhasa, Tibet", + "Lhasa, Xizang", + "Lhasa, Xizang", + "Xigaze, Xizang", + "Shannan, Xizang", + "Nyingchi, Xizang", + "Qamdo, Xizang", + "Nagqu, Xizang", + "Ngari, Xizang", + "Lhasa, Xizang", + "Lhasa, Xizang", "Aba, Sichuan", "Aba, Sichuan", "Aba, Sichuan", diff --git a/cpp/src/phonenumbers/phonemetadata.pb.h b/cpp/src/phonenumbers/phonemetadata.pb.h index f5d0294047ca4b5f574a87c42901cd3e6ad83b7d..251b1f99e7cd12b4f4b316a0ad763bd07b5b3eef 100644 --- a/cpp/src/phonenumbers/phonemetadata.pb.h +++ b/cpp/src/phonenumbers/phonemetadata.pb.h @@ -81,7 +81,7 @@ namespace phonenumbers { class NumberFormat PROTOBUF_FINAL : public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:i18n.phonenumbers.NumberFormat) */ { public: - inline NumberFormat() : NumberFormat(nullptr) {}; + inline NumberFormat() : NumberFormat(nullptr) {} virtual ~NumberFormat(); NumberFormat(const NumberFormat& from); @@ -228,15 +228,6 @@ class NumberFormat PROTOBUF_FINAL : std::string* mutable_pattern(); std::string* release_pattern(); void set_allocated_pattern(std::string* pattern); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_pattern(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_pattern( - std::string* pattern); private: const std::string& _internal_pattern() const; void _internal_set_pattern(const std::string& value); @@ -257,15 +248,6 @@ class NumberFormat PROTOBUF_FINAL : std::string* mutable_format(); std::string* release_format(); void set_allocated_format(std::string* format); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_format(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_format( - std::string* format); private: const std::string& _internal_format() const; void _internal_set_format(const std::string& value); @@ -286,15 +268,6 @@ class NumberFormat PROTOBUF_FINAL : std::string* mutable_national_prefix_formatting_rule(); std::string* release_national_prefix_formatting_rule(); void set_allocated_national_prefix_formatting_rule(std::string* national_prefix_formatting_rule); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_national_prefix_formatting_rule(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_national_prefix_formatting_rule( - std::string* national_prefix_formatting_rule); private: const std::string& _internal_national_prefix_formatting_rule() const; void _internal_set_national_prefix_formatting_rule(const std::string& value); @@ -315,15 +288,6 @@ class NumberFormat PROTOBUF_FINAL : std::string* mutable_domestic_carrier_code_formatting_rule(); std::string* release_domestic_carrier_code_formatting_rule(); void set_allocated_domestic_carrier_code_formatting_rule(std::string* domestic_carrier_code_formatting_rule); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_domestic_carrier_code_formatting_rule(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_domestic_carrier_code_formatting_rule( - std::string* domestic_carrier_code_formatting_rule); private: const std::string& _internal_domestic_carrier_code_formatting_rule() const; void _internal_set_domestic_carrier_code_formatting_rule(const std::string& value); @@ -368,7 +332,7 @@ class NumberFormat PROTOBUF_FINAL : class PhoneNumberDesc PROTOBUF_FINAL : public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:i18n.phonenumbers.PhoneNumberDesc) */ { public: - inline PhoneNumberDesc() : PhoneNumberDesc(nullptr) {}; + inline PhoneNumberDesc() : PhoneNumberDesc(nullptr) {} virtual ~PhoneNumberDesc(); PhoneNumberDesc(const PhoneNumberDesc& from); @@ -533,15 +497,6 @@ class PhoneNumberDesc PROTOBUF_FINAL : std::string* mutable_national_number_pattern(); std::string* release_national_number_pattern(); void set_allocated_national_number_pattern(std::string* national_number_pattern); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_national_number_pattern(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_national_number_pattern( - std::string* national_number_pattern); private: const std::string& _internal_national_number_pattern() const; void _internal_set_national_number_pattern(const std::string& value); @@ -562,15 +517,6 @@ class PhoneNumberDesc PROTOBUF_FINAL : std::string* mutable_example_number(); std::string* release_example_number(); void set_allocated_example_number(std::string* example_number); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_example_number(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_example_number( - std::string* example_number); private: const std::string& _internal_example_number() const; void _internal_set_example_number(const std::string& value); @@ -597,7 +543,7 @@ class PhoneNumberDesc PROTOBUF_FINAL : class PhoneMetadata PROTOBUF_FINAL : public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:i18n.phonenumbers.PhoneMetadata) */ { public: - inline PhoneMetadata() : PhoneMetadata(nullptr) {}; + inline PhoneMetadata() : PhoneMetadata(nullptr) {} virtual ~PhoneMetadata(); PhoneMetadata(const PhoneMetadata& from); @@ -781,15 +727,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_id(); std::string* release_id(); void set_allocated_id(std::string* id); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_id(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_id( - std::string* id); private: const std::string& _internal_id() const; void _internal_set_id(const std::string& value); @@ -810,15 +747,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_international_prefix(); std::string* release_international_prefix(); void set_allocated_international_prefix(std::string* international_prefix); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_international_prefix(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_international_prefix( - std::string* international_prefix); private: const std::string& _internal_international_prefix() const; void _internal_set_international_prefix(const std::string& value); @@ -839,15 +767,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_national_prefix(); std::string* release_national_prefix(); void set_allocated_national_prefix(std::string* national_prefix); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_national_prefix(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_national_prefix( - std::string* national_prefix); private: const std::string& _internal_national_prefix() const; void _internal_set_national_prefix(const std::string& value); @@ -868,15 +787,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_preferred_extn_prefix(); std::string* release_preferred_extn_prefix(); void set_allocated_preferred_extn_prefix(std::string* preferred_extn_prefix); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_preferred_extn_prefix(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_preferred_extn_prefix( - std::string* preferred_extn_prefix); private: const std::string& _internal_preferred_extn_prefix() const; void _internal_set_preferred_extn_prefix(const std::string& value); @@ -897,15 +807,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_national_prefix_for_parsing(); std::string* release_national_prefix_for_parsing(); void set_allocated_national_prefix_for_parsing(std::string* national_prefix_for_parsing); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_national_prefix_for_parsing(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_national_prefix_for_parsing( - std::string* national_prefix_for_parsing); private: const std::string& _internal_national_prefix_for_parsing() const; void _internal_set_national_prefix_for_parsing(const std::string& value); @@ -926,15 +827,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_national_prefix_transform_rule(); std::string* release_national_prefix_transform_rule(); void set_allocated_national_prefix_transform_rule(std::string* national_prefix_transform_rule); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_national_prefix_transform_rule(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_national_prefix_transform_rule( - std::string* national_prefix_transform_rule); private: const std::string& _internal_national_prefix_transform_rule() const; void _internal_set_national_prefix_transform_rule(const std::string& value); @@ -955,15 +847,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_preferred_international_prefix(); std::string* release_preferred_international_prefix(); void set_allocated_preferred_international_prefix(std::string* preferred_international_prefix); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_preferred_international_prefix(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_preferred_international_prefix( - std::string* preferred_international_prefix); private: const std::string& _internal_preferred_international_prefix() const; void _internal_set_preferred_international_prefix(const std::string& value); @@ -984,15 +867,6 @@ class PhoneMetadata PROTOBUF_FINAL : std::string* mutable_leading_digits(); std::string* release_leading_digits(); void set_allocated_leading_digits(std::string* leading_digits); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_leading_digits(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_leading_digits( - std::string* leading_digits); private: const std::string& _internal_leading_digits() const; void _internal_set_leading_digits(const std::string& value); @@ -1404,7 +1278,7 @@ class PhoneMetadata PROTOBUF_FINAL : class PhoneMetadataCollection PROTOBUF_FINAL : public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:i18n.phonenumbers.PhoneMetadataCollection) */ { public: - inline PhoneMetadataCollection() : PhoneMetadataCollection(nullptr) {}; + inline PhoneMetadataCollection() : PhoneMetadataCollection(nullptr) {} virtual ~PhoneMetadataCollection(); PhoneMetadataCollection(const PhoneMetadataCollection& from); @@ -1621,25 +1495,6 @@ inline void NumberFormat::set_allocated_pattern(std::string* pattern) { GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.NumberFormat.pattern) } -inline std::string* NumberFormat::unsafe_arena_release_pattern() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.NumberFormat.pattern) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000001u; - return pattern_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void NumberFormat::unsafe_arena_set_allocated_pattern( - std::string* pattern) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (pattern != nullptr) { - _has_bits_[0] |= 0x00000001u; - } else { - _has_bits_[0] &= ~0x00000001u; - } - pattern_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - pattern, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.NumberFormat.pattern) -} // required string format = 2; inline bool NumberFormat::_internal_has_format() const { @@ -1714,25 +1569,6 @@ inline void NumberFormat::set_allocated_format(std::string* format) { GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.NumberFormat.format) } -inline std::string* NumberFormat::unsafe_arena_release_format() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.NumberFormat.format) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000002u; - return format_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void NumberFormat::unsafe_arena_set_allocated_format( - std::string* format) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (format != nullptr) { - _has_bits_[0] |= 0x00000002u; - } else { - _has_bits_[0] &= ~0x00000002u; - } - format_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - format, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.NumberFormat.format) -} // repeated string leading_digits_pattern = 3; inline int NumberFormat::_internal_leading_digits_pattern_size() const { @@ -1881,25 +1717,6 @@ inline void NumberFormat::set_allocated_national_prefix_formatting_rule(std::str GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.NumberFormat.national_prefix_formatting_rule) } -inline std::string* NumberFormat::unsafe_arena_release_national_prefix_formatting_rule() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.NumberFormat.national_prefix_formatting_rule) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000004u; - return national_prefix_formatting_rule_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void NumberFormat::unsafe_arena_set_allocated_national_prefix_formatting_rule( - std::string* national_prefix_formatting_rule) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (national_prefix_formatting_rule != nullptr) { - _has_bits_[0] |= 0x00000004u; - } else { - _has_bits_[0] &= ~0x00000004u; - } - national_prefix_formatting_rule_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - national_prefix_formatting_rule, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.NumberFormat.national_prefix_formatting_rule) -} // optional bool national_prefix_optional_when_formatting = 6 [default = false]; inline bool NumberFormat::_internal_has_national_prefix_optional_when_formatting() const { @@ -2002,25 +1819,6 @@ inline void NumberFormat::set_allocated_domestic_carrier_code_formatting_rule(st GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.NumberFormat.domestic_carrier_code_formatting_rule) } -inline std::string* NumberFormat::unsafe_arena_release_domestic_carrier_code_formatting_rule() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.NumberFormat.domestic_carrier_code_formatting_rule) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000008u; - return domestic_carrier_code_formatting_rule_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void NumberFormat::unsafe_arena_set_allocated_domestic_carrier_code_formatting_rule( - std::string* domestic_carrier_code_formatting_rule) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (domestic_carrier_code_formatting_rule != nullptr) { - _has_bits_[0] |= 0x00000008u; - } else { - _has_bits_[0] &= ~0x00000008u; - } - domestic_carrier_code_formatting_rule_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - domestic_carrier_code_formatting_rule, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.NumberFormat.domestic_carrier_code_formatting_rule) -} // ------------------------------------------------------------------- @@ -2099,25 +1897,6 @@ inline void PhoneNumberDesc::set_allocated_national_number_pattern(std::string* GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneNumberDesc.national_number_pattern) } -inline std::string* PhoneNumberDesc::unsafe_arena_release_national_number_pattern() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneNumberDesc.national_number_pattern) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000001u; - return national_number_pattern_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneNumberDesc::unsafe_arena_set_allocated_national_number_pattern( - std::string* national_number_pattern) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (national_number_pattern != nullptr) { - _has_bits_[0] |= 0x00000001u; - } else { - _has_bits_[0] &= ~0x00000001u; - } - national_number_pattern_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - national_number_pattern, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneNumberDesc.national_number_pattern) -} // repeated int32 possible_length = 9; inline int PhoneNumberDesc::_internal_possible_length_size() const { @@ -2286,25 +2065,6 @@ inline void PhoneNumberDesc::set_allocated_example_number(std::string* example_n GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneNumberDesc.example_number) } -inline std::string* PhoneNumberDesc::unsafe_arena_release_example_number() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneNumberDesc.example_number) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000002u; - return example_number_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneNumberDesc::unsafe_arena_set_allocated_example_number( - std::string* example_number) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (example_number != nullptr) { - _has_bits_[0] |= 0x00000002u; - } else { - _has_bits_[0] &= ~0x00000002u; - } - example_number_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - example_number, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneNumberDesc.example_number) -} // ------------------------------------------------------------------- @@ -2346,7 +2106,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_general_desc( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.general_desc) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_general_desc() { - auto temp = unsafe_arena_release_general_desc(); + _has_bits_[0] &= ~0x00000100u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = general_desc_; + general_desc_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2427,7 +2189,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_fixed_line( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.fixed_line) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_fixed_line() { - auto temp = unsafe_arena_release_fixed_line(); + _has_bits_[0] &= ~0x00000200u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = fixed_line_; + fixed_line_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2508,7 +2272,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_mobile( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.mobile) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_mobile() { - auto temp = unsafe_arena_release_mobile(); + _has_bits_[0] &= ~0x00000400u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = mobile_; + mobile_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2589,7 +2355,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_toll_free( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.toll_free) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_toll_free() { - auto temp = unsafe_arena_release_toll_free(); + _has_bits_[0] &= ~0x00000800u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = toll_free_; + toll_free_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2670,7 +2438,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_premium_rate( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.premium_rate) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_premium_rate() { - auto temp = unsafe_arena_release_premium_rate(); + _has_bits_[0] &= ~0x00001000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = premium_rate_; + premium_rate_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2751,7 +2521,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_shared_cost( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.shared_cost) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_shared_cost() { - auto temp = unsafe_arena_release_shared_cost(); + _has_bits_[0] &= ~0x00002000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = shared_cost_; + shared_cost_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2832,7 +2604,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_personal_number( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.personal_number) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_personal_number() { - auto temp = unsafe_arena_release_personal_number(); + _has_bits_[0] &= ~0x00004000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = personal_number_; + personal_number_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2913,7 +2687,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_voip( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.voip) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_voip() { - auto temp = unsafe_arena_release_voip(); + _has_bits_[0] &= ~0x00008000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = voip_; + voip_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -2994,7 +2770,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_pager( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.pager) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_pager() { - auto temp = unsafe_arena_release_pager(); + _has_bits_[0] &= ~0x00010000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = pager_; + pager_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3075,7 +2853,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_uan( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.uan) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_uan() { - auto temp = unsafe_arena_release_uan(); + _has_bits_[0] &= ~0x00040000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = uan_; + uan_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3156,7 +2936,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_emergency( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.emergency) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_emergency() { - auto temp = unsafe_arena_release_emergency(); + _has_bits_[0] &= ~0x00080000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = emergency_; + emergency_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3237,7 +3019,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_voicemail( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.voicemail) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_voicemail() { - auto temp = unsafe_arena_release_voicemail(); + _has_bits_[0] &= ~0x00100000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = voicemail_; + voicemail_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3318,7 +3102,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_short_code( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.short_code) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_short_code() { - auto temp = unsafe_arena_release_short_code(); + _has_bits_[0] &= ~0x00200000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = short_code_; + short_code_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3399,7 +3185,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_standard_rate( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.standard_rate) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_standard_rate() { - auto temp = unsafe_arena_release_standard_rate(); + _has_bits_[0] &= ~0x00400000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = standard_rate_; + standard_rate_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3480,7 +3268,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_carrier_specific( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.carrier_specific) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_carrier_specific() { - auto temp = unsafe_arena_release_carrier_specific(); + _has_bits_[0] &= ~0x00800000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = carrier_specific_; + carrier_specific_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3561,7 +3351,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_sms_services( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.sms_services) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_sms_services() { - auto temp = unsafe_arena_release_sms_services(); + _has_bits_[0] &= ~0x01000000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = sms_services_; + sms_services_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3642,7 +3434,9 @@ inline void PhoneMetadata::unsafe_arena_set_allocated_no_international_dialling( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.no_international_dialling) } inline ::i18n::phonenumbers::PhoneNumberDesc* PhoneMetadata::release_no_international_dialling() { - auto temp = unsafe_arena_release_no_international_dialling(); + _has_bits_[0] &= ~0x00020000u; + ::i18n::phonenumbers::PhoneNumberDesc* temp = no_international_dialling_; + no_international_dialling_ = nullptr; if (GetArena() != nullptr) { temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } @@ -3760,25 +3554,6 @@ inline void PhoneMetadata::set_allocated_id(std::string* id) { GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.id) } -inline std::string* PhoneMetadata::unsafe_arena_release_id() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.id) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000001u; - return id_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_id( - std::string* id) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (id != nullptr) { - _has_bits_[0] |= 0x00000001u; - } else { - _has_bits_[0] &= ~0x00000001u; - } - id_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - id, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.id) -} // optional int32 country_code = 10; inline bool PhoneMetadata::_internal_has_country_code() const { @@ -3881,25 +3656,6 @@ inline void PhoneMetadata::set_allocated_international_prefix(std::string* inter GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.international_prefix) } -inline std::string* PhoneMetadata::unsafe_arena_release_international_prefix() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.international_prefix) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000002u; - return international_prefix_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_international_prefix( - std::string* international_prefix) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (international_prefix != nullptr) { - _has_bits_[0] |= 0x00000002u; - } else { - _has_bits_[0] &= ~0x00000002u; - } - international_prefix_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - international_prefix, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.international_prefix) -} // optional string preferred_international_prefix = 17; inline bool PhoneMetadata::_internal_has_preferred_international_prefix() const { @@ -3974,25 +3730,6 @@ inline void PhoneMetadata::set_allocated_preferred_international_prefix(std::str GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.preferred_international_prefix) } -inline std::string* PhoneMetadata::unsafe_arena_release_preferred_international_prefix() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.preferred_international_prefix) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000040u; - return preferred_international_prefix_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_preferred_international_prefix( - std::string* preferred_international_prefix) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (preferred_international_prefix != nullptr) { - _has_bits_[0] |= 0x00000040u; - } else { - _has_bits_[0] &= ~0x00000040u; - } - preferred_international_prefix_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - preferred_international_prefix, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.preferred_international_prefix) -} // optional string national_prefix = 12; inline bool PhoneMetadata::_internal_has_national_prefix() const { @@ -4067,25 +3804,6 @@ inline void PhoneMetadata::set_allocated_national_prefix(std::string* national_p GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.national_prefix) } -inline std::string* PhoneMetadata::unsafe_arena_release_national_prefix() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.national_prefix) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000004u; - return national_prefix_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_national_prefix( - std::string* national_prefix) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (national_prefix != nullptr) { - _has_bits_[0] |= 0x00000004u; - } else { - _has_bits_[0] &= ~0x00000004u; - } - national_prefix_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - national_prefix, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.national_prefix) -} // optional string preferred_extn_prefix = 13; inline bool PhoneMetadata::_internal_has_preferred_extn_prefix() const { @@ -4160,25 +3878,6 @@ inline void PhoneMetadata::set_allocated_preferred_extn_prefix(std::string* pref GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.preferred_extn_prefix) } -inline std::string* PhoneMetadata::unsafe_arena_release_preferred_extn_prefix() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.preferred_extn_prefix) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000008u; - return preferred_extn_prefix_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_preferred_extn_prefix( - std::string* preferred_extn_prefix) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (preferred_extn_prefix != nullptr) { - _has_bits_[0] |= 0x00000008u; - } else { - _has_bits_[0] &= ~0x00000008u; - } - preferred_extn_prefix_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - preferred_extn_prefix, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.preferred_extn_prefix) -} // optional string national_prefix_for_parsing = 15; inline bool PhoneMetadata::_internal_has_national_prefix_for_parsing() const { @@ -4253,25 +3952,6 @@ inline void PhoneMetadata::set_allocated_national_prefix_for_parsing(std::string GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.national_prefix_for_parsing) } -inline std::string* PhoneMetadata::unsafe_arena_release_national_prefix_for_parsing() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.national_prefix_for_parsing) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000010u; - return national_prefix_for_parsing_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_national_prefix_for_parsing( - std::string* national_prefix_for_parsing) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (national_prefix_for_parsing != nullptr) { - _has_bits_[0] |= 0x00000010u; - } else { - _has_bits_[0] &= ~0x00000010u; - } - national_prefix_for_parsing_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - national_prefix_for_parsing, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.national_prefix_for_parsing) -} // optional string national_prefix_transform_rule = 16; inline bool PhoneMetadata::_internal_has_national_prefix_transform_rule() const { @@ -4346,25 +4026,6 @@ inline void PhoneMetadata::set_allocated_national_prefix_transform_rule(std::str GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.national_prefix_transform_rule) } -inline std::string* PhoneMetadata::unsafe_arena_release_national_prefix_transform_rule() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.national_prefix_transform_rule) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000020u; - return national_prefix_transform_rule_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_national_prefix_transform_rule( - std::string* national_prefix_transform_rule) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (national_prefix_transform_rule != nullptr) { - _has_bits_[0] |= 0x00000020u; - } else { - _has_bits_[0] &= ~0x00000020u; - } - national_prefix_transform_rule_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - national_prefix_transform_rule, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.national_prefix_transform_rule) -} // optional bool same_mobile_and_fixed_line_pattern = 18 [default = false]; inline bool PhoneMetadata::_internal_has_same_mobile_and_fixed_line_pattern() const { @@ -4573,25 +4234,6 @@ inline void PhoneMetadata::set_allocated_leading_digits(std::string* leading_dig GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneMetadata.leading_digits) } -inline std::string* PhoneMetadata::unsafe_arena_release_leading_digits() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneMetadata.leading_digits) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000080u; - return leading_digits_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneMetadata::unsafe_arena_set_allocated_leading_digits( - std::string* leading_digits) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (leading_digits != nullptr) { - _has_bits_[0] |= 0x00000080u; - } else { - _has_bits_[0] &= ~0x00000080u; - } - leading_digits_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - leading_digits, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneMetadata.leading_digits) -} // optional bool mobile_number_portable_region = 32 [default = false]; inline bool PhoneMetadata::_internal_has_mobile_number_portable_region() const { diff --git a/cpp/src/phonenumbers/phonenumber.pb.cc b/cpp/src/phonenumbers/phonenumber.pb.cc index 1f50453e007cceff1b0a683b124e323da61d77c7..eeb16842e204ffae36990abd3e398310fbeca756 100644 --- a/cpp/src/phonenumbers/phonenumber.pb.cc +++ b/cpp/src/phonenumbers/phonenumber.pb.cc @@ -89,7 +89,7 @@ const std::string& PhoneNumber_CountryCodeSource_Name( PhoneNumber_CountryCodeSource_strings[idx].get(); } bool PhoneNumber_CountryCodeSource_Parse( - const std::string& name, PhoneNumber_CountryCodeSource* value) { + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, PhoneNumber_CountryCodeSource* value) { int int_value; bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue( PhoneNumber_CountryCodeSource_entries, 5, name, &int_value); diff --git a/cpp/src/phonenumbers/phonenumber.pb.h b/cpp/src/phonenumbers/phonenumber.pb.h index 17f97053e4a3a745fbd2d7ebe5d1b6dc23e5e3f2..2f26efe3a8624b882d4e8042ec1a7ae82a85cab8 100644 --- a/cpp/src/phonenumbers/phonenumber.pb.h +++ b/cpp/src/phonenumbers/phonenumber.pb.h @@ -86,13 +86,13 @@ inline const std::string& PhoneNumber_CountryCodeSource_Name(T enum_t_value) { return PhoneNumber_CountryCodeSource_Name(static_cast(enum_t_value)); } bool PhoneNumber_CountryCodeSource_Parse( - const std::string& name, PhoneNumber_CountryCodeSource* value); + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, PhoneNumber_CountryCodeSource* value); // =================================================================== class PhoneNumber PROTOBUF_FINAL : public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:i18n.phonenumbers.PhoneNumber) */ { public: - inline PhoneNumber() : PhoneNumber(nullptr) {}; + inline PhoneNumber() : PhoneNumber(nullptr) {} virtual ~PhoneNumber(); PhoneNumber(const PhoneNumber& from); @@ -218,7 +218,7 @@ class PhoneNumber PROTOBUF_FINAL : "Incorrect type passed to function CountryCodeSource_Name."); return PhoneNumber_CountryCodeSource_Name(enum_t_value); } - static inline bool CountryCodeSource_Parse(const std::string& name, + static inline bool CountryCodeSource_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name, CountryCodeSource* value) { return PhoneNumber_CountryCodeSource_Parse(name, value); } @@ -249,15 +249,6 @@ class PhoneNumber PROTOBUF_FINAL : std::string* mutable_extension(); std::string* release_extension(); void set_allocated_extension(std::string* extension); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_extension(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_extension( - std::string* extension); private: const std::string& _internal_extension() const; void _internal_set_extension(const std::string& value); @@ -278,15 +269,6 @@ class PhoneNumber PROTOBUF_FINAL : std::string* mutable_raw_input(); std::string* release_raw_input(); void set_allocated_raw_input(std::string* raw_input); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_raw_input(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_raw_input( - std::string* raw_input); private: const std::string& _internal_raw_input() const; void _internal_set_raw_input(const std::string& value); @@ -307,15 +289,6 @@ class PhoneNumber PROTOBUF_FINAL : std::string* mutable_preferred_domestic_carrier_code(); std::string* release_preferred_domestic_carrier_code(); void set_allocated_preferred_domestic_carrier_code(std::string* preferred_domestic_carrier_code); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - std::string* unsafe_arena_release_preferred_domestic_carrier_code(); - GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" - " string fields are deprecated and will be removed in a" - " future release.") - void unsafe_arena_set_allocated_preferred_domestic_carrier_code( - std::string* preferred_domestic_carrier_code); private: const std::string& _internal_preferred_domestic_carrier_code() const; void _internal_set_preferred_domestic_carrier_code(const std::string& value); @@ -549,25 +522,6 @@ inline void PhoneNumber::set_allocated_extension(std::string* extension) { GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneNumber.extension) } -inline std::string* PhoneNumber::unsafe_arena_release_extension() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneNumber.extension) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000001u; - return extension_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneNumber::unsafe_arena_set_allocated_extension( - std::string* extension) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (extension != nullptr) { - _has_bits_[0] |= 0x00000001u; - } else { - _has_bits_[0] &= ~0x00000001u; - } - extension_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - extension, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneNumber.extension) -} // optional bool italian_leading_zero = 4; inline bool PhoneNumber::_internal_has_italian_leading_zero() const { @@ -698,25 +652,6 @@ inline void PhoneNumber::set_allocated_raw_input(std::string* raw_input) { GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneNumber.raw_input) } -inline std::string* PhoneNumber::unsafe_arena_release_raw_input() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneNumber.raw_input) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000002u; - return raw_input_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneNumber::unsafe_arena_set_allocated_raw_input( - std::string* raw_input) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (raw_input != nullptr) { - _has_bits_[0] |= 0x00000002u; - } else { - _has_bits_[0] &= ~0x00000002u; - } - raw_input_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - raw_input, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneNumber.raw_input) -} // optional .i18n.phonenumbers.PhoneNumber.CountryCodeSource country_code_source = 6; inline bool PhoneNumber::_internal_has_country_code_source() const { @@ -820,25 +755,6 @@ inline void PhoneNumber::set_allocated_preferred_domestic_carrier_code(std::stri GetArena()); // @@protoc_insertion_point(field_set_allocated:i18n.phonenumbers.PhoneNumber.preferred_domestic_carrier_code) } -inline std::string* PhoneNumber::unsafe_arena_release_preferred_domestic_carrier_code() { - // @@protoc_insertion_point(field_unsafe_arena_release:i18n.phonenumbers.PhoneNumber.preferred_domestic_carrier_code) - GOOGLE_DCHECK(GetArena() != nullptr); - _has_bits_[0] &= ~0x00000004u; - return preferred_domestic_carrier_code_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - GetArena()); -} -inline void PhoneNumber::unsafe_arena_set_allocated_preferred_domestic_carrier_code( - std::string* preferred_domestic_carrier_code) { - GOOGLE_DCHECK(GetArena() != nullptr); - if (preferred_domestic_carrier_code != nullptr) { - _has_bits_[0] |= 0x00000004u; - } else { - _has_bits_[0] &= ~0x00000004u; - } - preferred_domestic_carrier_code_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - preferred_domestic_carrier_code, GetArena()); - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:i18n.phonenumbers.PhoneNumber.preferred_domestic_carrier_code) -} #ifdef __GNUC__ #pragma GCC diagnostic pop diff --git a/resources/geocoding/en/86.txt b/resources/geocoding/en/86.txt index 6cfdb4caa8cd57d0809757de6d0effcb556ce793..c86c76567b2e80d6ff16bd5012625ac79b80610e 100644 --- a/resources/geocoding/en/86.txt +++ b/resources/geocoding/en/86.txt @@ -13060,16 +13060,16 @@ 861322871|Suqian, Jiangsu 861322872|Suqian, Jiangsu 86132288|Nantong, Jiangsu -861322890|Lhasa, Tibet -861322891|Lhasa, Tibet -861322892|Xigaze, Tibet -861322893|Shannan, Tibet -861322894|Nyingchi, Tibet -861322895|Qamdo, Tibet -861322896|Nagqu, Tibet -861322897|Ngari, Tibet -861322898|Lhasa, Tibet -861322899|Lhasa, Tibet +861322890|Lhasa, Xizang +861322891|Lhasa, Xizang +861322892|Xigaze, Xizang +861322893|Shannan, Xizang +861322894|Nyingchi, Xizang +861322895|Qamdo, Xizang +861322896|Nagqu, Xizang +861322897|Ngari, Xizang +861322898|Lhasa, Xizang +861322899|Lhasa, Xizang 86132290|Zhaoqing, Guangdong 861322906|Xingtai, Hebei 861322907|Xingtai, Hebei @@ -16679,11 +16679,11 @@ 861329887|Liaoyuan, Jilin 861329888|Changchun, Jilin 861329889|Siping, Jilin -86132989|Lhasa, Tibet -861329892|Xigaze, Tibet -861329893|Shannan, Tibet -861329894|Nyingchi, Tibet -861329896|Nagqu, Tibet +86132989|Lhasa, Xizang +861329892|Xigaze, Xizang +861329893|Shannan, Xizang +861329894|Nyingchi, Xizang +861329896|Nagqu, Xizang 86132990|XiAn, Shaanxi 86132991|XiAn, Shaanxi 861329914|Shangluo, Shaanxi @@ -17342,16 +17342,16 @@ 861330887|Deqen, Yunnan 861330888|Lijiang, Yunnan 861330889|Yuxi, Yunnan -861330890|Lhasa, Tibet -861330891|Lhasa, Tibet -861330892|Xigaze, Tibet -861330893|Shannan, Tibet -861330894|Nyingchi, Tibet -861330895|Qamdo, Tibet -861330896|Nagqu, Tibet -861330897|Ngari, Tibet -861330898|Lhasa, Tibet -861330899|Lhasa, Tibet +861330890|Lhasa, Xizang +861330891|Lhasa, Xizang +861330892|Xigaze, Xizang +861330893|Shannan, Xizang +861330894|Nyingchi, Xizang +861330895|Qamdo, Xizang +861330896|Nagqu, Xizang +861330897|Ngari, Xizang +861330898|Lhasa, Xizang +861330899|Lhasa, Xizang 861330900|Zigong, Sichuan 861330901|Mianyang, Sichuan 861330902|Deyang, Sichuan @@ -18209,16 +18209,16 @@ 861332238|Panjin, Liaoning 861332239|Huludao, Liaoning 86133224|Shenyang, Liaoning -861332250|Lhasa, Tibet -861332251|Lhasa, Tibet -861332252|Xigaze, Tibet -861332253|Shannan, Tibet -861332254|Nyingchi, Tibet -861332255|Qamdo, Tibet -861332256|Nagqu, Tibet -861332257|Ngari, Tibet -861332258|Lhasa, Tibet -861332259|Lhasa, Tibet +861332250|Lhasa, Xizang +861332251|Lhasa, Xizang +861332252|Xigaze, Xizang +861332253|Shannan, Xizang +861332254|Nyingchi, Xizang +861332255|Qamdo, Xizang +861332256|Nagqu, Xizang +861332257|Ngari, Xizang +861332258|Lhasa, Xizang +861332259|Lhasa, Xizang 861332260|Dongguan, Guangdong 861332261|Dongguan, Guangdong 861332262|Huizhou, Guangdong @@ -23409,16 +23409,16 @@ 861339797|Ganzhou, Jiangxi 861339798|Jingdezhen, Jiangxi 861339799|Pingxiang, Jiangxi -861339800|Lhasa, Tibet -861339801|Lhasa, Tibet -861339802|Xigaze, Tibet -861339803|Shannan, Tibet -861339804|Nyingchi, Tibet -861339805|Qamdo, Tibet -861339806|Nagqu, Tibet -861339807|Ngari, Tibet -861339808|Lhasa, Tibet -861339809|Lhasa, Tibet +861339800|Lhasa, Xizang +861339801|Lhasa, Xizang +861339802|Xigaze, Xizang +861339803|Shannan, Xizang +861339804|Nyingchi, Xizang +861339805|Qamdo, Xizang +861339806|Nagqu, Xizang +861339807|Ngari, Xizang +861339808|Lhasa, Xizang +861339809|Lhasa, Xizang 861339810|Neijiang, Sichuan 861339811|Neijiang, Sichuan 861339812|Zigong, Sichuan @@ -24929,7 +24929,7 @@ 861344083|Nanning, Guangxi 861344084|Nanning, Guangxi 86134409|Shanghai -861344093|Lhasa, Tibet +861344093|Lhasa, Xizang 861344095|Yinchuan, Ningxia 861344099|Karamay, Xinjiang 8613441|Shanghai @@ -25007,7 +25007,7 @@ 861344686|Kunming, Yunnan 861344687|Kunming, Yunnan 861344690|Ankang, Shaanxi -861344693|Xigaze, Tibet +861344693|Xigaze, Xizang 861344697|Hainan, Qinghai 861344699|Hotan, Xinjiang 86134470|Shanghai @@ -25021,7 +25021,7 @@ 861344784|Qinzhou, Guangxi 861344787|Kunming, Yunnan 861344790|Baoji, Shaanxi -861344793|Lhasa, Tibet +861344793|Lhasa, Xizang 861344794|Longnan, Gansu 861344796|Chongqing 861344854|Jinan, Shandong @@ -25033,7 +25033,7 @@ 861344884|Hechi, Guangxi 861344887|Kunming, Yunnan 861344890|XiAn, Shaanxi -861344893|Lhasa, Tibet +861344893|Lhasa, Xizang 861344894|Longnan, Gansu 861344899|Urumchi, Xinjiang 861344954|Jinan, Shandong @@ -27892,11 +27892,11 @@ 86135187|Kunming, Yunnan 861351877|Yuxi, Yunnan 86135188|Haikou, Hainan -86135189|Lhasa, Tibet -861351892|Xigaze, Tibet -861351894|Nyingchi, Tibet -861351895|Qamdo, Tibet -861351896|Nagqu, Tibet +86135189|Lhasa, Xizang +861351892|Xigaze, Xizang +861351894|Nyingchi, Xizang +861351895|Qamdo, Xizang +861351896|Nagqu, Xizang 861351900|Linxia, Gansu 861351901|Baiyin, Gansu 861351902|Dingxi, Gansu @@ -28771,11 +28771,11 @@ 861354897|Changsha, Hunan 861354898|Changsha, Hunan 861354899|Huaihua, Hunan -86135490|Lhasa, Tibet -861354902|Xigaze, Tibet -861354903|Nagqu, Tibet -861354904|Nyingchi, Tibet -861354905|Qamdo, Tibet +86135490|Lhasa, Xizang +861354902|Xigaze, Xizang +861354903|Nagqu, Xizang +861354904|Nyingchi, Xizang +861354905|Qamdo, Xizang 86135491|Meizhou, Guangdong 86135492|Dongguan, Guangdong 86135493|Dongguan, Guangdong @@ -31746,16 +31746,16 @@ 861361887|Deqen, Yunnan 861361888|Lijiang, Yunnan 861361889|Yuxi, Yunnan -861361890|Lhasa, Tibet -861361891|Lhasa, Tibet -861361892|Xigaze, Tibet -861361893|Shannan, Tibet -861361894|Nyingchi, Tibet -861361895|Qamdo, Tibet -861361896|Nagqu, Tibet -861361897|Ngari, Tibet -861361898|Lhasa, Tibet -861361899|Lhasa, Tibet +861361890|Lhasa, Xizang +861361891|Lhasa, Xizang +861361892|Xigaze, Xizang +861361893|Shannan, Xizang +861361894|Nyingchi, Xizang +861361895|Qamdo, Xizang +861361896|Nagqu, Xizang +861361897|Ngari, Xizang +861361898|Lhasa, Xizang +861361899|Lhasa, Xizang 861361900|Neijiang, Sichuan 861361901|Ziyang, Sichuan 861361902|Zigong, Sichuan @@ -32424,16 +32424,16 @@ 861362881|Xishuangbanna, Yunnan 861362883|Lincang, Yunnan 861362888|Lijiang, Yunnan -861362890|Lhasa, Tibet -861362891|Lhasa, Tibet -861362892|Xigaze, Tibet -861362893|Shannan, Tibet -861362894|Nyingchi, Tibet -861362895|Qamdo, Tibet -861362896|Nagqu, Tibet -861362897|Ngari, Tibet -861362898|Lhasa, Tibet -861362899|Lhasa, Tibet +861362890|Lhasa, Xizang +861362891|Lhasa, Xizang +861362892|Xigaze, Xizang +861362893|Shannan, Xizang +861362894|Nyingchi, Xizang +861362895|Qamdo, Xizang +861362896|Nagqu, Xizang +861362897|Ngari, Xizang +861362898|Lhasa, Xizang +861362899|Lhasa, Xizang 861362900|Neijiang, Sichuan 861362901|Ziyang, Sichuan 861362902|Zigong, Sichuan @@ -32911,16 +32911,16 @@ 86136386|Wuhan, Hubei 86136387|Chuxiong, Yunnan 86136388|Zhaotong, Yunnan -861363890|Lhasa, Tibet -861363891|Lhasa, Tibet -861363892|Xigaze, Tibet -861363893|Shannan, Tibet -861363894|Nyingchi, Tibet -861363895|Qamdo, Tibet -861363896|Nagqu, Tibet -861363897|Ngari, Tibet -861363898|Lhasa, Tibet -861363899|Lhasa, Tibet +861363890|Lhasa, Xizang +861363891|Lhasa, Xizang +861363892|Xigaze, Xizang +861363893|Shannan, Xizang +861363894|Nyingchi, Xizang +861363895|Qamdo, Xizang +861363896|Nagqu, Xizang +861363897|Ngari, Xizang +861363898|Lhasa, Xizang +861363899|Lhasa, Xizang 86136390|Guiyang, Guizhou 861363910|Guiyang, Guizhou 861363911|Guiyang, Guizhou @@ -33508,16 +33508,16 @@ 861364878|Chuxiong, Yunnan 861364879|Puer, Yunnan 86136488|Kunming, Yunnan -861364890|Lhasa, Tibet -861364891|Lhasa, Tibet -861364892|Xigaze, Tibet -861364893|Shannan, Tibet -861364894|Nyingchi, Tibet -861364895|Qamdo, Tibet -861364896|Nagqu, Tibet -861364897|Ngari, Tibet -861364898|Lhasa, Tibet -861364899|Lhasa, Tibet +861364890|Lhasa, Xizang +861364891|Lhasa, Xizang +861364892|Xigaze, Xizang +861364893|Shannan, Xizang +861364894|Nyingchi, Xizang +861364895|Qamdo, Xizang +861364896|Nagqu, Xizang +861364897|Ngari, Xizang +861364898|Lhasa, Xizang +861364899|Lhasa, Xizang 861364900|Neijiang, Sichuan 861364901|Ziyang, Sichuan 861364902|Zigong, Sichuan @@ -34140,16 +34140,16 @@ 861365878|Chuxiong, Yunnan 861365879|Puer, Yunnan 86136588|Kunming, Yunnan -861365890|Lhasa, Tibet -861365891|Lhasa, Tibet -861365892|Xigaze, Tibet -861365893|Shannan, Tibet -861365894|Nyingchi, Tibet -861365895|Qamdo, Tibet -861365896|Nagqu, Tibet -861365897|Ngari, Tibet -861365898|Lhasa, Tibet -861365899|Lhasa, Tibet +861365890|Lhasa, Xizang +861365891|Lhasa, Xizang +861365892|Xigaze, Xizang +861365893|Shannan, Xizang +861365894|Nyingchi, Xizang +861365895|Qamdo, Xizang +861365896|Nagqu, Xizang +861365897|Ngari, Xizang +861365898|Lhasa, Xizang +861365899|Lhasa, Xizang 861365900|Neijiang, Sichuan 861365901|Ziyang, Sichuan 861365902|Mianyang, Sichuan @@ -34184,16 +34184,16 @@ 861365938|Tianshui, Gansu 861365939|Longnan, Gansu 86136594|Lanzhou, Gansu -861365950|Lhasa, Tibet -861365951|Lhasa, Tibet -861365952|Lhasa, Tibet -861365953|Lhasa, Tibet -861365954|Lhasa, Tibet -861365955|Qamdo, Tibet -861365956|Xigaze, Tibet -861365957|Xigaze, Tibet -861365958|Shannan, Tibet -861365959|Nyingchi, Tibet +861365950|Lhasa, Xizang +861365951|Lhasa, Xizang +861365952|Lhasa, Xizang +861365953|Lhasa, Xizang +861365954|Lhasa, Xizang +861365955|Qamdo, Xizang +861365956|Xigaze, Xizang +861365957|Xigaze, Xizang +861365958|Shannan, Xizang +861365959|Nyingchi, Xizang 861365960|Nanning, Guangxi 861365961|Nanning, Guangxi 861365962|Liuzhou, Guangxi @@ -41817,16 +41817,16 @@ 861388792|Xishuangbanna, Yunnan 861388793|Xishuangbanna, Yunnan 8613888|Kunming, Yunnan -861388900|Lhasa, Tibet -861388901|Lhasa, Tibet -861388902|Xigaze, Tibet -861388903|Shannan, Tibet -861388904|Nyingchi, Tibet -861388905|Qamdo, Tibet -861388906|Nagqu, Tibet -861388907|Ngari, Tibet -861388908|Lhasa, Tibet -861388909|Lhasa, Tibet +861388900|Lhasa, Xizang +861388901|Lhasa, Xizang +861388902|Xigaze, Xizang +861388903|Shannan, Xizang +861388904|Nyingchi, Xizang +861388905|Qamdo, Xizang +861388906|Nagqu, Xizang +861388907|Ngari, Xizang +861388908|Lhasa, Xizang +861388909|Lhasa, Xizang 86138891|Shenyang, Liaoning 86138892|Shenyang, Liaoning 86138893|Shenyang, Liaoning @@ -42211,7 +42211,7 @@ 861390086|Jingmen, Hubei 861390087|Kunming, Yunnan 861390088|Xishuangbanna, Yunnan -861390089|Qamdo, Tibet +861390089|Qamdo, Xizang 861390090|Aba, Sichuan 861390091|Yulin, Shaanxi 861390092|XiAn, Shaanxi @@ -42808,16 +42808,16 @@ 861390887|Kunming, Yunnan 861390888|Lijiang, Yunnan 861390889|Yuxi, Yunnan -861390890|Lhasa, Tibet -861390891|Lhasa, Tibet -861390892|Xigaze, Tibet -861390893|Shannan, Tibet -861390894|Nyingchi, Tibet -861390895|Qamdo, Tibet -861390896|Nagqu, Tibet -861390897|Ngari, Tibet -861390898|Lhasa, Tibet -861390899|Lhasa, Tibet +861390890|Lhasa, Xizang +861390891|Lhasa, Xizang +861390892|Xigaze, Xizang +861390893|Shannan, Xizang +861390894|Nyingchi, Xizang +861390895|Qamdo, Xizang +861390896|Nagqu, Xizang +861390897|Ngari, Xizang +861390898|Lhasa, Xizang +861390899|Lhasa, Xizang 861390900|Zigong, Sichuan 861390901|Mianyang, Sichuan 861390902|Deyang, Sichuan @@ -44672,16 +44672,16 @@ 86139887|Deqen, Yunnan 86139888|Lijiang, Yunnan 86139889|Qujing, Yunnan -861398900|Lhasa, Tibet -861398901|Lhasa, Tibet -861398902|Xigaze, Tibet -861398903|Shannan, Tibet -861398904|Nyingchi, Tibet -861398905|Qamdo, Tibet -861398906|Nagqu, Tibet -861398907|Ngari, Tibet -861398908|Lhasa, Tibet -861398909|Lhasa, Tibet +861398900|Lhasa, Xizang +861398901|Lhasa, Xizang +861398902|Xigaze, Xizang +861398903|Shannan, Xizang +861398904|Nyingchi, Xizang +861398905|Qamdo, Xizang +861398906|Nagqu, Xizang +861398907|Ngari, Xizang +861398908|Lhasa, Xizang +861398909|Lhasa, Xizang 861398910|Neijiang, Sichuan 861398911|Neijiang, Sichuan 861398912|Luzhou, Sichuan @@ -44717,16 +44717,16 @@ 86139896|Taizhou, Zhejiang 86139897|Wenzhou, Zhejiang 86139898|Hangzhou, Zhejiang -861398990|Lhasa, Tibet -861398991|Lhasa, Tibet -861398992|Xigaze, Tibet -861398993|Shannan, Tibet -861398994|Nyingchi, Tibet -861398995|Qamdo, Tibet -861398996|Nagqu, Tibet -861398997|Ngari, Tibet -861398998|Lhasa, Tibet -861398999|Lhasa, Tibet +861398990|Lhasa, Xizang +861398991|Lhasa, Xizang +861398992|Xigaze, Xizang +861398993|Shannan, Xizang +861398994|Nyingchi, Xizang +861398995|Qamdo, Xizang +861398996|Nagqu, Xizang +861398997|Ngari, Xizang +861398998|Lhasa, Xizang +861398999|Lhasa, Xizang 86139900|Zigong, Sichuan 86139901|Mianyang, Sichuan 86139902|Deyang, Sichuan @@ -45632,16 +45632,16 @@ 86145236|Chongqing 86145237|Chongqing 86145238|Haikou, Hainan -861452390|Lhasa, Tibet -861452391|Lhasa, Tibet -861452392|Xigaze, Tibet -861452393|Shannan, Tibet -861452394|Nyingchi, Tibet -861452395|Qamdo, Tibet -861452396|Nagqu, Tibet -861452397|Ngari, Tibet -861452398|Lhasa, Tibet -861452399|Lhasa, Tibet +861452390|Lhasa, Xizang +861452391|Lhasa, Xizang +861452392|Xigaze, Xizang +861452393|Shannan, Xizang +861452394|Nyingchi, Xizang +861452395|Qamdo, Xizang +861452396|Nagqu, Xizang +861452397|Ngari, Xizang +861452398|Lhasa, Xizang +861452399|Lhasa, Xizang 86145240|Shenyang, Liaoning 861452410|Tieling, Liaoning 861452411|Dalian, Liaoning @@ -46757,16 +46757,16 @@ 86145423|Chongqing 86145424|Haikou, Hainan 86145425|Haikou, Hainan -861454260|Lhasa, Tibet -861454261|Lhasa, Tibet -861454262|Xigaze, Tibet -861454263|Shannan, Tibet -861454264|Nyingchi, Tibet -861454265|Qamdo, Tibet -861454266|Nagqu, Tibet -861454267|Ngari, Tibet -861454268|Lhasa, Tibet -861454269|Lhasa, Tibet +861454260|Lhasa, Xizang +861454261|Lhasa, Xizang +861454262|Xigaze, Xizang +861454263|Shannan, Xizang +861454264|Nyingchi, Xizang +861454265|Qamdo, Xizang +861454266|Nagqu, Xizang +861454267|Ngari, Xizang +861454268|Lhasa, Xizang +861454269|Lhasa, Xizang 861454280|Shenyang, Liaoning 861454281|Shenyang, Liaoning 861454282|Dalian, Liaoning @@ -48298,16 +48298,16 @@ 861459427|Chuxiong, Yunnan 861459428|Nujiang, Yunnan 861459429|Nujiang, Yunnan -861459430|Xigaze, Tibet -861459431|Lhasa, Tibet -861459432|Xigaze, Tibet -861459433|Shannan, Tibet -861459434|Nyingchi, Tibet -861459435|Qamdo, Tibet -861459436|Nagqu, Tibet -861459437|Ngari, Tibet -861459438|Xigaze, Tibet -861459439|Xigaze, Tibet +861459430|Xigaze, Xizang +861459431|Lhasa, Xizang +861459432|Xigaze, Xizang +861459433|Shannan, Xizang +861459434|Nyingchi, Xizang +861459435|Qamdo, Xizang +861459436|Nagqu, Xizang +861459437|Ngari, Xizang +861459438|Xigaze, Xizang +861459439|Xigaze, Xizang 86145944|Weinan, Shaanxi 861459450|Shangluo, Shaanxi 861459451|Shangluo, Shaanxi @@ -48362,16 +48362,16 @@ 861459527|Wenshan, Yunnan 861459528|Wenshan, Yunnan 861459529|Wenshan, Yunnan -861459530|Lhasa, Tibet -861459531|Lhasa, Tibet -861459532|Xigaze, Tibet -861459533|Shannan, Tibet -861459534|Nyingchi, Tibet -861459535|Qamdo, Tibet -861459536|Nagqu, Tibet -861459537|Ngari, Tibet -861459538|Lhasa, Tibet -861459539|Lhasa, Tibet +861459530|Lhasa, Xizang +861459531|Lhasa, Xizang +861459532|Xigaze, Xizang +861459533|Shannan, Xizang +861459534|Nyingchi, Xizang +861459535|Qamdo, Xizang +861459536|Nagqu, Xizang +861459537|Ngari, Xizang +861459538|Lhasa, Xizang +861459539|Lhasa, Xizang 861459540|Haibei, Qinghai 861459541|Xining, Qinghai 861459542|Haidong, Qinghai @@ -49346,16 +49346,16 @@ 86147186|Chongqing 86147187|Haikou, Hainan 86147188|Haikou, Hainan -861471890|Lhasa, Tibet -861471891|Lhasa, Tibet -861471892|Xigaze, Tibet -861471893|Shannan, Tibet -861471894|Nyingchi, Tibet -861471895|Qamdo, Tibet -861471896|Nagqu, Tibet -861471897|Lhasa, Tibet -861471898|Lhasa, Tibet -861471899|Lhasa, Tibet +861471890|Lhasa, Xizang +861471891|Lhasa, Xizang +861471892|Xigaze, Xizang +861471893|Shannan, Xizang +861471894|Nyingchi, Xizang +861471895|Qamdo, Xizang +861471896|Nagqu, Xizang +861471897|Lhasa, Xizang +861471898|Lhasa, Xizang +861471899|Lhasa, Xizang 86147190|Linxia, Gansu 861471907|Zhangye, Gansu 861471908|Zhangye, Gansu @@ -49552,16 +49552,16 @@ 861472877|Qianxinan, Guizhou 861472878|Qianxinan, Guizhou 861472879|Qianxinan, Guizhou -861472890|Lhasa, Tibet -861472891|Lhasa, Tibet -861472892|Xigaze, Tibet -861472893|Shannan, Tibet -861472894|Nyingchi, Tibet -861472895|Qamdo, Tibet -861472896|Nagqu, Tibet -861472897|Xigaze, Tibet -861472898|Lhasa, Tibet -861472899|Lhasa, Tibet +861472890|Lhasa, Xizang +861472891|Lhasa, Xizang +861472892|Xigaze, Xizang +861472893|Shannan, Xizang +861472894|Nyingchi, Xizang +861472895|Qamdo, Xizang +861472896|Nagqu, Xizang +861472897|Xigaze, Xizang +861472898|Lhasa, Xizang +861472899|Lhasa, Xizang 86147290|Xianyang, Shaanxi 861472910|YanAn, Shaanxi 861472911|YanAn, Shaanxi @@ -50397,7 +50397,7 @@ 861476573|Fuzhou, Fujian 861476575|Guiyang, Guizhou 861476577|Kunming, Yunnan -861476579|Lhasa, Tibet +861476579|Lhasa, Xizang 861476581|XiAn, Shaanxi 861476583|Lanzhou, Gansu 861476585|Yinchuan, Ningxia @@ -51140,16 +51140,16 @@ 86147887|Zhoukou, Henan 86147888|Zhengzhou, Henan 86147889|Luoyang, Henan -861478900|Lhasa, Tibet -861478901|Lhasa, Tibet -861478902|Xigaze, Tibet -861478903|Shannan, Tibet -861478904|Nyingchi, Tibet -861478905|Qamdo, Tibet -861478906|Nagqu, Tibet -861478907|Ngari, Tibet -861478908|Lhasa, Tibet -861478909|Lhasa, Tibet +861478900|Lhasa, Xizang +861478901|Lhasa, Xizang +861478902|Xigaze, Xizang +861478903|Shannan, Xizang +861478904|Nyingchi, Xizang +861478905|Qamdo, Xizang +861478906|Nagqu, Xizang +861478907|Ngari, Xizang +861478908|Lhasa, Xizang +861478909|Lhasa, Xizang 86147891|Yiyang, Hunan 86147892|Chenzhou, Hunan 86147893|Hengyang, Hunan @@ -54455,9 +54455,9 @@ 861508888|Zhoushan, Zhejiang 861508889|Zhoushan, Zhejiang 86150889|Wenzhou, Zhejiang -86150890|Lhasa, Tibet -861508906|Nagqu, Tibet -861508907|Qamdo, Tibet +86150890|Lhasa, Xizang +861508906|Nagqu, Xizang +861508907|Qamdo, Xizang 861508910|Shantou, Guangdong 861508911|Shantou, Guangdong 861508912|Shantou, Guangdong @@ -58540,16 +58540,16 @@ 861520797|Ganzhou, Jiangxi 861520798|Jingdezhen, Jiangxi 861520799|Pingxiang, Jiangxi -861520800|Xigaze, Tibet -861520801|Xigaze, Tibet -861520802|Xigaze, Tibet -861520803|Shannan, Tibet -861520804|Nyingchi, Tibet -861520805|Qamdo, Tibet -861520806|Nagqu, Tibet -861520807|Nagqu, Tibet -861520808|Qamdo, Tibet -861520809|Xigaze, Tibet +861520800|Xigaze, Xizang +861520801|Xigaze, Xizang +861520802|Xigaze, Xizang +861520803|Shannan, Xizang +861520804|Nyingchi, Xizang +861520805|Qamdo, Xizang +861520806|Nagqu, Xizang +861520807|Nagqu, Xizang +861520808|Qamdo, Xizang +861520809|Xigaze, Xizang 86152081|Chengdu, Sichuan 86152082|Chengdu, Sichuan 86152083|Chengdu, Sichuan @@ -61212,26 +61212,26 @@ 861528897|Qingdao, Shandong 861528898|Qingdao, Shandong 861528899|Weifang, Shandong -861528900|Lhasa, Tibet -861528901|Lhasa, Tibet -861528902|Xigaze, Tibet -861528903|Shannan, Tibet -861528904|Nyingchi, Tibet -861528905|Qamdo, Tibet -861528906|Nagqu, Tibet -861528907|Ngari, Tibet -861528908|Lhasa, Tibet -861528909|Lhasa, Tibet -861528910|Lhasa, Tibet -861528911|Lhasa, Tibet -861528912|Xigaze, Tibet -861528913|Shannan, Tibet -861528914|Nyingchi, Tibet -861528915|Qamdo, Tibet -861528916|Nagqu, Tibet -861528917|Ngari, Tibet -861528918|Lhasa, Tibet -861528919|Lhasa, Tibet +861528900|Lhasa, Xizang +861528901|Lhasa, Xizang +861528902|Xigaze, Xizang +861528903|Shannan, Xizang +861528904|Nyingchi, Xizang +861528905|Qamdo, Xizang +861528906|Nagqu, Xizang +861528907|Ngari, Xizang +861528908|Lhasa, Xizang +861528909|Lhasa, Xizang +861528910|Lhasa, Xizang +861528911|Lhasa, Xizang +861528912|Xigaze, Xizang +861528913|Shannan, Xizang +861528914|Nyingchi, Xizang +861528915|Qamdo, Xizang +861528916|Nagqu, Xizang +861528917|Ngari, Xizang +861528918|Lhasa, Xizang +861528919|Lhasa, Xizang 861528920|Xianyang, Shaanxi 861528921|YanAn, Shaanxi 861528922|Yulin, Shaanxi @@ -63239,11 +63239,11 @@ 861533130|Chongqing 861533131|Kunming, Yunnan 861533132|Guiyang, Guizhou -861533133|Lhasa, Tibet +861533133|Lhasa, Xizang 861533134|Chengdu, Sichuan 861533135|Mianyang, Sichuan 861533136|Liangshan, Sichuan -861533137|Lhasa, Tibet +861533137|Lhasa, Xizang 861533138|Chengdu, Sichuan 861533139|Chengdu, Sichuan 861533140|Wenshan, Yunnan @@ -64490,16 +64490,16 @@ 861534878|Chuxiong, Yunnan 861534879|Puer, Yunnan 86153488|Haikou, Hainan -861534890|Lhasa, Tibet -861534891|Lhasa, Tibet -861534892|Xigaze, Tibet -861534893|Shannan, Tibet -861534894|Nyingchi, Tibet -861534895|Qamdo, Tibet -861534896|Nagqu, Tibet -861534897|Ngari, Tibet -861534898|Lhasa, Tibet -861534899|Lhasa, Tibet +861534890|Lhasa, Xizang +861534891|Lhasa, Xizang +861534892|Xigaze, Xizang +861534893|Shannan, Xizang +861534894|Nyingchi, Xizang +861534895|Qamdo, Xizang +861534896|Nagqu, Xizang +861534897|Ngari, Xizang +861534898|Lhasa, Xizang +861534899|Lhasa, Xizang 861534900|Jiayuguan, Gansu 861534901|Gannan, Gansu 861534902|Gannan, Gansu @@ -71709,16 +71709,16 @@ 861560887|Deqen, Yunnan 861560888|Lijiang, Yunnan 861560889|Kunming, Yunnan -861560890|Lhasa, Tibet -861560891|Lhasa, Tibet -861560892|Xigaze, Tibet -861560893|Shannan, Tibet -861560894|Nyingchi, Tibet -861560895|Qamdo, Tibet -861560896|Nagqu, Tibet -861560897|Ngari, Tibet -861560898|Lhasa, Tibet -861560899|Lhasa, Tibet +861560890|Lhasa, Xizang +861560891|Lhasa, Xizang +861560892|Xigaze, Xizang +861560893|Shannan, Xizang +861560894|Nyingchi, Xizang +861560895|Qamdo, Xizang +861560896|Nagqu, Xizang +861560897|Ngari, Xizang +861560898|Lhasa, Xizang +861560899|Lhasa, Xizang 861560900|Zigong, Sichuan 861560901|Mianyang, Sichuan 861560902|Deyang, Sichuan @@ -72365,16 +72365,16 @@ 861562838|Dongguan, Guangdong 861562839|Dongguan, Guangdong 86156284|Nanyang, Henan -861562850|Nagqu, Tibet -861562851|Lhasa, Tibet -861562852|Xigaze, Tibet -861562853|Shannan, Tibet -861562854|Nyingchi, Tibet -861562855|Xigaze, Tibet -861562856|Nagqu, Tibet -861562857|Ngari, Tibet -861562858|Xigaze, Tibet -861562859|Lhasa, Tibet +861562850|Nagqu, Xizang +861562851|Lhasa, Xizang +861562852|Xigaze, Xizang +861562853|Shannan, Xizang +861562854|Nyingchi, Xizang +861562855|Xigaze, Xizang +861562856|Nagqu, Xizang +861562857|Ngari, Xizang +861562858|Xigaze, Xizang +861562859|Lhasa, Xizang 86156286|Dezhou, Shandong 861562860|Rizhao, Shandong 861562861|Rizhao, Shandong @@ -74515,11 +74515,11 @@ 861569248|Foshan, Guangdong 861569249|Foshan, Guangdong 86156925|Haikou, Hainan -86156926|Lhasa, Tibet -861569262|Xigaze, Tibet -861569263|Qamdo, Tibet -861569264|Nyingchi, Tibet -861569266|Nagqu, Tibet +86156926|Lhasa, Xizang +861569262|Xigaze, Xizang +861569263|Qamdo, Xizang +861569264|Nyingchi, Xizang +861569266|Nagqu, Xizang 861569270|Qiannan, Guizhou 861569271|Guiyang, Guizhou 861569272|Zunyi, Guizhou @@ -75501,16 +75501,16 @@ 861570797|Ganzhou, Jiangxi 861570798|Jingdezhen, Jiangxi 861570799|Pingxiang, Jiangxi -861570800|Lhasa, Tibet -861570801|Lhasa, Tibet -861570802|Xigaze, Tibet -861570803|Shannan, Tibet -861570804|Nyingchi, Tibet -861570805|Qamdo, Tibet -861570806|Qamdo, Tibet -861570807|Ngari, Tibet -861570808|Xigaze, Tibet -861570809|Qamdo, Tibet +861570800|Lhasa, Xizang +861570801|Lhasa, Xizang +861570802|Xigaze, Xizang +861570803|Shannan, Xizang +861570804|Nyingchi, Xizang +861570805|Qamdo, Xizang +861570806|Qamdo, Xizang +861570807|Ngari, Xizang +861570808|Xigaze, Xizang +861570809|Qamdo, Xizang 861570810|Suining, Sichuan 861570811|Suining, Sichuan 861570812|Panzhihua, Sichuan @@ -76757,16 +76757,16 @@ 861572658|Jining, Shandong 861572659|Jining, Shandong 86157266|Beijing -861572670|Lhasa, Tibet -861572671|Lhasa, Tibet -861572672|Xigaze, Tibet -861572673|Shannan, Tibet -861572674|Nyingchi, Tibet -861572675|Qamdo, Tibet -861572676|Nagqu, Tibet -861572677|Lhasa, Tibet -861572678|Lhasa, Tibet -861572679|Lhasa, Tibet +861572670|Lhasa, Xizang +861572671|Lhasa, Xizang +861572672|Xigaze, Xizang +861572673|Shannan, Xizang +861572674|Nyingchi, Xizang +861572675|Qamdo, Xizang +861572676|Nagqu, Xizang +861572677|Lhasa, Xizang +861572678|Lhasa, Xizang +861572679|Lhasa, Xizang 861572680|Ningbo, Zhejiang 861572681|Ningbo, Zhejiang 861572682|Ningbo, Zhejiang @@ -76933,16 +76933,16 @@ 861572887|Chaozhou, Guangdong 861572888|Jiangmen, Guangdong 861572889|Huizhou, Guangdong -861572890|Lhasa, Tibet -861572891|Lhasa, Tibet -861572892|Xigaze, Tibet -861572893|Shannan, Tibet -861572894|Nyingchi, Tibet -861572895|Qamdo, Tibet -861572896|Nagqu, Tibet -861572897|Ngari, Tibet -861572898|Lhasa, Tibet -861572899|Lhasa, Tibet +861572890|Lhasa, Xizang +861572891|Lhasa, Xizang +861572892|Xigaze, Xizang +861572893|Shannan, Xizang +861572894|Nyingchi, Xizang +861572895|Qamdo, Xizang +861572896|Nagqu, Xizang +861572897|Ngari, Xizang +861572898|Lhasa, Xizang +861572899|Lhasa, Xizang 861572900|Sanmenxia, Henan 861572901|Sanmenxia, Henan 861572902|Sanmenxia, Henan @@ -81454,16 +81454,16 @@ 86158887|Wenzhou, Zhejiang 86158888|Hangzhou, Zhejiang 86158889|Jinhua, Zhejiang -861588900|Lhasa, Tibet -861588901|Lhasa, Tibet -861588902|Xigaze, Tibet -861588903|Shannan, Tibet -861588904|Nyingchi, Tibet -861588905|Qamdo, Tibet -861588906|Nagqu, Tibet -861588907|Lhasa, Tibet -861588908|Lhasa, Tibet -861588909|Lhasa, Tibet +861588900|Lhasa, Xizang +861588901|Lhasa, Xizang +861588902|Xigaze, Xizang +861588903|Shannan, Xizang +861588904|Nyingchi, Xizang +861588905|Qamdo, Xizang +861588906|Nagqu, Xizang +861588907|Lhasa, Xizang +861588908|Lhasa, Xizang +861588909|Lhasa, Xizang 86158891|Jieyang, Guangdong 86158892|Shantou, Guangdong 861588920|Zhongshan, Guangdong @@ -89085,26 +89085,26 @@ 861768888|Guangzhou, Guangdong 861768889|Shenzhen, Guangdong 86176889|Shenzhen, Guangdong -861768900|Lhasa, Tibet -861768901|Lhasa, Tibet -861768902|Xigaze, Tibet -861768903|Shannan, Tibet -861768904|Nyingchi, Tibet -861768905|Qamdo, Tibet -861768906|Nagqu, Tibet -861768907|Ngari, Tibet -861768908|Lhasa, Tibet -861768909|Lhasa, Tibet -861768910|Lhasa, Tibet -861768911|Lhasa, Tibet -861768912|Xigaze, Tibet -861768913|Shannan, Tibet -861768914|Nyingchi, Tibet -861768915|Qamdo, Tibet -861768916|Nagqu, Tibet -861768917|Ngari, Tibet -861768918|Lhasa, Tibet -861768919|Lhasa, Tibet +861768900|Lhasa, Xizang +861768901|Lhasa, Xizang +861768902|Xigaze, Xizang +861768903|Shannan, Xizang +861768904|Nyingchi, Xizang +861768905|Qamdo, Xizang +861768906|Nagqu, Xizang +861768907|Ngari, Xizang +861768908|Lhasa, Xizang +861768909|Lhasa, Xizang +861768910|Lhasa, Xizang +861768911|Lhasa, Xizang +861768912|Xigaze, Xizang +861768913|Shannan, Xizang +861768914|Nyingchi, Xizang +861768915|Qamdo, Xizang +861768916|Nagqu, Xizang +861768917|Ngari, Xizang +861768918|Lhasa, Xizang +861768919|Lhasa, Xizang 861768920|Xiamen, Fujian 861768921|Xiamen, Fujian 861768922|Fuzhou, Fujian @@ -89135,16 +89135,16 @@ 861768947|Quanzhou, Fujian 861768948|Quanzhou, Fujian 861768949|Quanzhou, Fujian -861768950|Lhasa, Tibet -861768951|Lhasa, Tibet -861768952|Xigaze, Tibet -861768953|Shannan, Tibet -861768954|Nyingchi, Tibet -861768955|Qamdo, Tibet -861768956|Nagqu, Tibet -861768957|Ngari, Tibet -861768958|Lhasa, Tibet -861768959|Lhasa, Tibet +861768950|Lhasa, Xizang +861768951|Lhasa, Xizang +861768952|Xigaze, Xizang +861768953|Shannan, Xizang +861768954|Nyingchi, Xizang +861768955|Qamdo, Xizang +861768956|Nagqu, Xizang +861768957|Ngari, Xizang +861768958|Lhasa, Xizang +861768959|Lhasa, Xizang 861768960|Fuzhou, Fujian 861768961|Nanping, Fujian 861768962|Nanping, Fujian @@ -89942,16 +89942,16 @@ 861770887|Deqen, Yunnan 861770888|Lijiang, Yunnan 861770889|Lijiang, Yunnan -861770890|Xigaze, Tibet -861770891|Lhasa, Tibet -861770892|Xigaze, Tibet -861770893|Shannan, Tibet -861770894|Nyingchi, Tibet -861770895|Qamdo, Tibet -861770896|Nagqu, Tibet -861770897|Ngari, Tibet -861770898|Lhasa, Tibet -861770899|Lhasa, Tibet +861770890|Xigaze, Xizang +861770891|Lhasa, Xizang +861770892|Xigaze, Xizang +861770893|Shannan, Xizang +861770894|Nyingchi, Xizang +861770895|Qamdo, Xizang +861770896|Nagqu, Xizang +861770897|Ngari, Xizang +861770898|Lhasa, Xizang +861770899|Lhasa, Xizang 86177090|Mianyang, Sichuan 861770907|Deyang, Sichuan 861770908|Deyang, Sichuan @@ -90072,16 +90072,16 @@ 861771183|Wuzhong, Ningxia 861771185|Zhongwei, Ningxia 861771186|Guyuan, Ningxia -861771190|Lhasa, Tibet -861771191|Lhasa, Tibet -861771192|Xigaze, Tibet -861771193|Shannan, Tibet -861771194|Nyingchi, Tibet -861771195|Qamdo, Tibet -861771196|Nagqu, Tibet -861771197|Xigaze, Tibet -861771198|Xigaze, Tibet -861771199|Lhasa, Tibet +861771190|Lhasa, Xizang +861771191|Lhasa, Xizang +861771192|Xigaze, Xizang +861771193|Shannan, Xizang +861771194|Nyingchi, Xizang +861771195|Qamdo, Xizang +861771196|Nagqu, Xizang +861771197|Xigaze, Xizang +861771198|Xigaze, Xizang +861771199|Lhasa, Xizang 86177120|Xuzhou, Jiangsu 861771204|HuaiAn, Jiangsu 861771205|HuaiAn, Jiangsu @@ -91211,16 +91211,16 @@ 861774062|Huanggang, Hubei 861774063|Huanggang, Hubei 861774064|Huanggang, Hubei -861774070|Xigaze, Tibet -861774071|Lhasa, Tibet -861774072|Xigaze, Tibet -861774073|Shannan, Tibet -861774074|Nyingchi, Tibet -861774075|Qamdo, Tibet -861774076|Nagqu, Tibet -861774077|Ngari, Tibet -861774078|Lhasa, Tibet -861774079|Lhasa, Tibet +861774070|Xigaze, Xizang +861774071|Lhasa, Xizang +861774072|Xigaze, Xizang +861774073|Shannan, Xizang +861774074|Nyingchi, Xizang +861774075|Qamdo, Xizang +861774076|Nagqu, Xizang +861774077|Ngari, Xizang +861774078|Lhasa, Xizang +861774079|Lhasa, Xizang 86177410|Shenyang, Liaoning 86177411|Dalian, Liaoning 86177412|Anshan, Liaoning @@ -92594,16 +92594,16 @@ 861778791|Yuxi, Yunnan 861778792|Puer, Yunnan 861778793|Puer, Yunnan -861778900|Lhasa, Tibet -861778901|Shannan, Tibet -861778902|Xigaze, Tibet -861778903|Shannan, Tibet -861778904|Nyingchi, Tibet -861778905|Qamdo, Tibet -861778906|Nagqu, Tibet -861778907|Lhasa, Tibet -861778908|Nyingchi, Tibet -861778909|Qamdo, Tibet +861778900|Lhasa, Xizang +861778901|Shannan, Xizang +861778902|Xigaze, Xizang +861778903|Shannan, Xizang +861778904|Nyingchi, Xizang +861778905|Qamdo, Xizang +861778906|Nagqu, Xizang +861778907|Lhasa, Xizang +861778908|Nyingchi, Xizang +861778909|Qamdo, Xizang 86177891|XiAn, Shaanxi 861778919|Weinan, Shaanxi 861778920|Weinan, Shaanxi @@ -92651,16 +92651,16 @@ 861778969|Qingyang, Gansu 86177897|Haikou, Hainan 86177898|Haikou, Hainan -861778990|Lhasa, Tibet -861778991|Xigaze, Tibet -861778992|Xigaze, Tibet -861778993|Shannan, Tibet -861778994|Nyingchi, Tibet -861778995|Qamdo, Tibet -861778996|Nagqu, Tibet -861778997|Nagqu, Tibet -861778998|Shannan, Tibet -861778999|Lhasa, Tibet +861778990|Lhasa, Xizang +861778991|Xigaze, Xizang +861778992|Xigaze, Xizang +861778993|Shannan, Xizang +861778994|Nyingchi, Xizang +861778995|Qamdo, Xizang +861778996|Nagqu, Xizang +861778997|Nagqu, Xizang +861778998|Shannan, Xizang +861778999|Lhasa, Xizang 86177900|Changchun, Jilin 861779010|Deyang, Sichuan 861779011|Deyang, Sichuan @@ -93252,16 +93252,16 @@ 861780861|Bijie, Guizhou 861780862|Bijie, Guizhou 861780863|Bijie, Guizhou -861780890|Lhasa, Tibet -861780891|Lhasa, Tibet -861780892|Xigaze, Tibet -861780893|Shannan, Tibet -861780894|Nyingchi, Tibet -861780895|Qamdo, Tibet -861780896|Nagqu, Tibet -861780897|Ngari, Tibet -861780898|Xigaze, Tibet -861780899|Shannan, Tibet +861780890|Lhasa, Xizang +861780891|Lhasa, Xizang +861780892|Xigaze, Xizang +861780893|Shannan, Xizang +861780894|Nyingchi, Xizang +861780895|Qamdo, Xizang +861780896|Nagqu, Xizang +861780897|Ngari, Xizang +861780898|Xigaze, Xizang +861780899|Shannan, Xizang 861780910|XiAn, Shaanxi 861780911|YanAn, Shaanxi 861780912|Yulin, Shaanxi @@ -94252,37 +94252,37 @@ 861788527|Qiannan, Guizhou 861788528|Qiandongnan, Guizhou 861788529|Qiandongnan, Guizhou -861788800|Lhasa, Tibet -861788801|Lhasa, Tibet -861788802|Xigaze, Tibet -861788803|Shannan, Tibet -861788804|Lhasa, Tibet -861788805|Qamdo, Tibet -861788806|Nagqu, Tibet -861788807|Lhasa, Tibet -861788808|Xigaze, Tibet -861788809|Xigaze, Tibet +861788800|Lhasa, Xizang +861788801|Lhasa, Xizang +861788802|Xigaze, Xizang +861788803|Shannan, Xizang +861788804|Lhasa, Xizang +861788805|Qamdo, Xizang +861788806|Nagqu, Xizang +861788807|Lhasa, Xizang +861788808|Xigaze, Xizang +861788809|Xigaze, Xizang 86178888|Beijing -861788900|Lhasa, Tibet -861788901|Lhasa, Tibet -861788902|Xigaze, Tibet -861788903|Shannan, Tibet -861788904|Nyingchi, Tibet -861788905|Qamdo, Tibet -861788906|Nagqu, Tibet -861788907|Ngari, Tibet -861788908|Xigaze, Tibet -861788909|Nagqu, Tibet -861788910|Lhasa, Tibet -861788911|Lhasa, Tibet -861788912|Xigaze, Tibet -861788913|Shannan, Tibet -861788914|Lhasa, Tibet -861788915|Qamdo, Tibet -861788916|Nagqu, Tibet -861788917|Nagqu, Tibet -861788918|Xigaze, Tibet -861788919|Lhasa, Tibet +861788900|Lhasa, Xizang +861788901|Lhasa, Xizang +861788902|Xigaze, Xizang +861788903|Shannan, Xizang +861788904|Nyingchi, Xizang +861788905|Qamdo, Xizang +861788906|Nagqu, Xizang +861788907|Ngari, Xizang +861788908|Xigaze, Xizang +861788909|Nagqu, Xizang +861788910|Lhasa, Xizang +861788911|Lhasa, Xizang +861788912|Xigaze, Xizang +861788913|Shannan, Xizang +861788914|Lhasa, Xizang +861788915|Qamdo, Xizang +861788916|Nagqu, Xizang +861788917|Nagqu, Xizang +861788918|Xigaze, Xizang +861788919|Lhasa, Xizang 86178898|Haikou, Hainan 86178899|Haikou, Hainan 861800010|Xuzhou, Jiangsu @@ -94903,16 +94903,16 @@ 861800887|Deqen, Yunnan 861800888|Lijiang, Yunnan 861800889|Kunming, Yunnan -861800890|Lhasa, Tibet -861800891|Lhasa, Tibet -861800892|Xigaze, Tibet -861800893|Shannan, Tibet -861800894|Nyingchi, Tibet -861800895|Qamdo, Tibet -861800896|Nagqu, Tibet -861800897|Ngari, Tibet -861800898|Lhasa, Tibet -861800899|Lhasa, Tibet +861800890|Lhasa, Xizang +861800891|Lhasa, Xizang +861800892|Xigaze, Xizang +861800893|Shannan, Xizang +861800894|Nyingchi, Xizang +861800895|Qamdo, Xizang +861800896|Nagqu, Xizang +861800897|Ngari, Xizang +861800898|Lhasa, Xizang +861800899|Lhasa, Xizang 861800900|Liangshan, Sichuan 861800901|Liangshan, Sichuan 861800902|Liangshan, Sichuan @@ -97635,16 +97635,16 @@ 861807677|Guilin, Guangxi 861807678|Guilin, Guangxi 861807679|Guilin, Guangxi -861807690|Lhasa, Tibet -861807691|Lhasa, Tibet -861807692|Xigaze, Tibet -861807693|Shannan, Tibet -861807694|Nyingchi, Tibet -861807695|Qamdo, Tibet -861807696|Nagqu, Tibet -861807697|Ngari, Tibet -861807698|Lhasa, Tibet -861807699|Lhasa, Tibet +861807690|Lhasa, Xizang +861807691|Lhasa, Xizang +861807692|Xigaze, Xizang +861807693|Shannan, Xizang +861807694|Nyingchi, Xizang +861807695|Qamdo, Xizang +861807696|Nagqu, Xizang +861807697|Ngari, Xizang +861807698|Lhasa, Xizang +861807699|Lhasa, Xizang 86180770|Fangchenggang, Guangxi 861807700|Nanning, Guangxi 861807701|Wuzhou, Guangxi @@ -98130,16 +98130,16 @@ 861808894|Puer, Yunnan 861808895|Wenshan, Yunnan 861808897|Lijiang, Yunnan -861808900|Lhasa, Tibet -861808901|Lhasa, Tibet -861808902|Xigaze, Tibet -861808903|Shannan, Tibet -861808904|Nyingchi, Tibet -861808905|Qamdo, Tibet -861808906|Nagqu, Tibet -861808907|Ngari, Tibet -861808908|Lhasa, Tibet -861808909|Lhasa, Tibet +861808900|Lhasa, Xizang +861808901|Lhasa, Xizang +861808902|Xigaze, Xizang +861808903|Shannan, Xizang +861808904|Nyingchi, Xizang +861808905|Qamdo, Xizang +861808906|Nagqu, Xizang +861808907|Ngari, Xizang +861808908|Lhasa, Xizang +861808909|Lhasa, Xizang 86180891|XiAn, Shaanxi 86180892|XiAn, Shaanxi 861808930|Linxia, Gansu @@ -98175,16 +98175,16 @@ 86180896|Zunyi, Guizhou 86180897|Haikou, Hainan 86180898|Haikou, Hainan -861808990|Lhasa, Tibet -861808991|Lhasa, Tibet -861808992|Xigaze, Tibet -861808993|Shannan, Tibet -861808994|Nyingchi, Tibet -861808995|Qamdo, Tibet -861808996|Nagqu, Tibet -861808997|Xigaze, Tibet -861808998|Lhasa, Tibet -861808999|Lhasa, Tibet +861808990|Lhasa, Xizang +861808991|Lhasa, Xizang +861808992|Xigaze, Xizang +861808993|Shannan, Xizang +861808994|Nyingchi, Xizang +861808995|Qamdo, Xizang +861808996|Nagqu, Xizang +861808997|Xigaze, Xizang +861808998|Lhasa, Xizang +861808999|Lhasa, Xizang 86180900|Deyang, Sichuan 861809006|Chengdu, Sichuan 861809007|Chengdu, Sichuan @@ -98785,7 +98785,7 @@ 861810095|Yinchuan, Ningxia 861810096|Haikou, Hainan 861810097|Xining, Qinghai -861810098|Lhasa, Tibet +861810098|Lhasa, Xizang 861810099|Urumchi, Xinjiang 86181010|Beijing 86181011|Beijing @@ -99270,16 +99270,16 @@ 861810887|Yuxi, Yunnan 861810888|Lijiang, Yunnan 861810889|Dehong, Yunnan -861810890|Lhasa, Tibet -861810891|Lhasa, Tibet -861810892|Xigaze, Tibet -861810893|Shannan, Tibet -861810894|Nyingchi, Tibet -861810895|Qamdo, Tibet -861810896|Nagqu, Tibet -861810897|Ngari, Tibet -861810898|Lhasa, Tibet -861810899|Lhasa, Tibet +861810890|Lhasa, Xizang +861810891|Lhasa, Xizang +861810892|Xigaze, Xizang +861810893|Shannan, Xizang +861810894|Nyingchi, Xizang +861810895|Qamdo, Xizang +861810896|Nagqu, Xizang +861810897|Ngari, Xizang +861810898|Lhasa, Xizang +861810899|Lhasa, Xizang 86181090|Chengdu, Sichuan 861810910|XiAn, Shaanxi 861810911|YanAn, Shaanxi @@ -100944,16 +100944,16 @@ 861814317|Liaoyuan, Jilin 861814318|Songyuan, Jilin 861814319|Baishan, Jilin -861814320|Xigaze, Tibet -861814321|Lhasa, Tibet -861814322|Xigaze, Tibet -861814323|Shannan, Tibet -861814324|Nyingchi, Tibet -861814325|Qamdo, Tibet -861814326|Nagqu, Tibet -861814327|Nagqu, Tibet -861814328|Lhasa, Tibet -861814329|Lhasa, Tibet +861814320|Xigaze, Xizang +861814321|Lhasa, Xizang +861814322|Xigaze, Xizang +861814323|Shannan, Xizang +861814324|Nyingchi, Xizang +861814325|Qamdo, Xizang +861814326|Nagqu, Xizang +861814327|Nagqu, Xizang +861814328|Lhasa, Xizang +861814329|Lhasa, Xizang 861814330|Zhangjiajie, Hunan 861814331|Yongzhou, Hunan 861814332|Loudi, Hunan @@ -100995,16 +100995,16 @@ 861814377|Lanzhou, Gansu 861814378|Lanzhou, Gansu 861814379|Lanzhou, Gansu -861814380|Lhasa, Tibet -861814381|Lhasa, Tibet -861814382|Xigaze, Tibet -861814383|Shannan, Tibet -861814384|Shannan, Tibet -861814385|Nyingchi, Tibet -861814386|Nagqu, Tibet -861814387|Xigaze, Tibet -861814388|Lhasa, Tibet -861814389|Xigaze, Tibet +861814380|Lhasa, Xizang +861814381|Lhasa, Xizang +861814382|Xigaze, Xizang +861814383|Shannan, Xizang +861814384|Shannan, Xizang +861814385|Nyingchi, Xizang +861814386|Nagqu, Xizang +861814387|Xigaze, Xizang +861814388|Lhasa, Xizang +861814389|Xigaze, Xizang 861814390|Zhengzhou, Henan 861814391|Jiaozuo, Henan 861814392|Hebi, Henan @@ -102965,16 +102965,16 @@ 86181846|Haikou, Hainan 86181847|Chongqing 86181848|Kunming, Yunnan -861818490|Qamdo, Tibet -861818491|Lhasa, Tibet -861818492|Xigaze, Tibet -861818493|Shannan, Tibet -861818494|Nyingchi, Tibet -861818495|Qamdo, Tibet -861818496|Nagqu, Tibet -861818497|Nyingchi, Tibet -861818498|Xigaze, Tibet -861818499|Xigaze, Tibet +861818490|Qamdo, Xizang +861818491|Lhasa, Xizang +861818492|Xigaze, Xizang +861818493|Shannan, Xizang +861818494|Nyingchi, Xizang +861818495|Qamdo, Xizang +861818496|Nagqu, Xizang +861818497|Nyingchi, Xizang +861818498|Xigaze, Xizang +861818499|Xigaze, Xizang 86181850|Guiyang, Guizhou 861818505|Zunyi, Guizhou 861818506|Zunyi, Guizhou @@ -103199,16 +103199,16 @@ 861818897|Hengyang, Hunan 861818898|Changde, Hunan 861818899|Changsha, Hunan -861818900|Qamdo, Tibet -861818901|Xigaze, Tibet -861818902|Xigaze, Tibet -861818903|Shannan, Tibet -861818904|Shannan, Tibet -861818905|Qamdo, Tibet -861818906|Xigaze, Tibet -861818907|Xigaze, Tibet -861818908|Xigaze, Tibet -861818909|Qamdo, Tibet +861818900|Qamdo, Xizang +861818901|Xigaze, Xizang +861818902|Xigaze, Xizang +861818903|Shannan, Xizang +861818904|Shannan, Xizang +861818905|Qamdo, Xizang +861818906|Xigaze, Xizang +861818907|Xigaze, Xizang +861818908|Xigaze, Xizang +861818909|Qamdo, Xizang 86181891|XiAn, Shaanxi 86181892|XiAn, Shaanxi 861818930|Linxia, Gansu @@ -103244,16 +103244,16 @@ 861818969|Lanzhou, Gansu 86181897|Haikou, Hainan 86181898|Haikou, Hainan -861818990|Qamdo, Tibet -861818991|Lhasa, Tibet -861818992|Xigaze, Tibet -861818993|Shannan, Tibet -861818994|Nyingchi, Tibet -861818995|Qamdo, Tibet -861818996|Nagqu, Tibet -861818997|Shannan, Tibet -861818998|Xigaze, Tibet -861818999|Lhasa, Tibet +861818990|Qamdo, Xizang +861818991|Lhasa, Xizang +861818992|Xigaze, Xizang +861818993|Shannan, Xizang +861818994|Nyingchi, Xizang +861818995|Qamdo, Xizang +861818996|Nagqu, Xizang +861818997|Shannan, Xizang +861818998|Xigaze, Xizang +861818999|Lhasa, Xizang 861819000|Mianyang, Sichuan 861819001|Mianyang, Sichuan 861819002|Luzhou, Sichuan @@ -104110,16 +104110,16 @@ 861820797|Ganzhou, Jiangxi 861820798|Jingdezhen, Jiangxi 861820799|Pingxiang, Jiangxi -861820800|Lhasa, Tibet -861820801|Lhasa, Tibet -861820802|Xigaze, Tibet -861820803|Shannan, Tibet -861820804|Nyingchi, Tibet -861820805|Qamdo, Tibet -861820806|Nagqu, Tibet -861820807|Xigaze, Tibet -861820808|Qamdo, Tibet -861820809|Xigaze, Tibet +861820800|Lhasa, Xizang +861820801|Lhasa, Xizang +861820802|Xigaze, Xizang +861820803|Shannan, Xizang +861820804|Nyingchi, Xizang +861820805|Qamdo, Xizang +861820806|Nagqu, Xizang +861820807|Xigaze, Xizang +861820808|Qamdo, Xizang +861820809|Xigaze, Xizang 86182081|Chengdu, Sichuan 86182082|Yibin, Sichuan 86182083|Luzhou, Sichuan @@ -106438,26 +106438,26 @@ 861828889|Lijiang, Yunnan 86182889|Kunming, Yunnan 8618289|Haikou, Hainan -861828900|Lhasa, Tibet -861828901|Lhasa, Tibet -861828902|Xigaze, Tibet -861828903|Shannan, Tibet -861828904|Nyingchi, Tibet -861828905|Qamdo, Tibet -861828906|Nagqu, Tibet -861828907|Shannan, Tibet -861828908|Qamdo, Tibet -861828909|Xigaze, Tibet -861828910|Lhasa, Tibet -861828911|Lhasa, Tibet -861828912|Xigaze, Tibet -861828913|Shannan, Tibet -861828914|Nyingchi, Tibet -861828915|Qamdo, Tibet -861828916|Nagqu, Tibet -861828917|Nagqu, Tibet -861828918|Lhasa, Tibet -861828919|Lhasa, Tibet +861828900|Lhasa, Xizang +861828901|Lhasa, Xizang +861828902|Xigaze, Xizang +861828903|Shannan, Xizang +861828904|Nyingchi, Xizang +861828905|Qamdo, Xizang +861828906|Nagqu, Xizang +861828907|Shannan, Xizang +861828908|Qamdo, Xizang +861828909|Xigaze, Xizang +861828910|Lhasa, Xizang +861828911|Lhasa, Xizang +861828912|Xigaze, Xizang +861828913|Shannan, Xizang +861828914|Nyingchi, Xizang +861828915|Qamdo, Xizang +861828916|Nagqu, Xizang +861828917|Nagqu, Xizang +861828918|Lhasa, Xizang +861828919|Lhasa, Xizang 86182900|Guilin, Guangxi 86182901|Guilin, Guangxi 861829017|Qinzhou, Guangxi @@ -107319,16 +107319,16 @@ 861830797|Ganzhou, Jiangxi 861830798|Jingdezhen, Jiangxi 861830799|Pingxiang, Jiangxi -861830800|Lhasa, Tibet -861830801|Lhasa, Tibet -861830802|Xigaze, Tibet -861830803|Shannan, Tibet -861830804|Nyingchi, Tibet -861830805|Qamdo, Tibet -861830806|Nagqu, Tibet -861830807|Ngari, Tibet -861830808|Qamdo, Tibet -861830809|Xigaze, Tibet +861830800|Lhasa, Xizang +861830801|Lhasa, Xizang +861830802|Xigaze, Xizang +861830803|Shannan, Xizang +861830804|Nyingchi, Xizang +861830805|Qamdo, Xizang +861830806|Nagqu, Xizang +861830807|Ngari, Xizang +861830808|Qamdo, Xizang +861830809|Xigaze, Xizang 86183081|Yibin, Sichuan 86183082|Liangshan, Sichuan 861830824|Neijiang, Sichuan @@ -109659,16 +109659,16 @@ 86183889|Lincang, Yunnan 861838899|Honghe, Yunnan 8618389|Haikou, Hainan -861838900|Lhasa, Tibet -861838901|Lhasa, Tibet -861838902|Xigaze, Tibet -861838903|Shannan, Tibet -861838904|Nyingchi, Tibet -861838905|Qamdo, Tibet -861838906|Nagqu, Tibet -861838907|Qamdo, Tibet -861838908|Xigaze, Tibet -861838909|Shannan, Tibet +861838900|Lhasa, Xizang +861838901|Lhasa, Xizang +861838902|Xigaze, Xizang +861838903|Shannan, Xizang +861838904|Nyingchi, Xizang +861838905|Qamdo, Xizang +861838906|Nagqu, Xizang +861838907|Qamdo, Xizang +861838908|Xigaze, Xizang +861838909|Shannan, Xizang 86183891|Weihai, Shandong 86183900|Yueyang, Hunan 86183901|Yueyang, Hunan @@ -110205,7 +110205,7 @@ 861839983|Shihezi, Xinjiang 86183999|Changji, Xinjiang 86184007|Wuzhou, Guangxi -86184008|Lhasa, Tibet +86184008|Lhasa, Xizang 8618401|Beijing 861840200|Guangzhou, Guangdong 861840201|Guangzhou, Guangdong @@ -110671,16 +110671,16 @@ 861840886|Nujiang, Yunnan 861840887|Deqen, Yunnan 861840888|Lijiang, Yunnan -861840890|Lhasa, Tibet -861840891|Lhasa, Tibet -861840892|Xigaze, Tibet -861840893|Shannan, Tibet -861840894|Nyingchi, Tibet -861840895|Qamdo, Tibet -861840896|Nagqu, Tibet -861840897|Ngari, Tibet -861840898|Xigaze, Tibet -861840899|Qamdo, Tibet +861840890|Lhasa, Xizang +861840891|Lhasa, Xizang +861840892|Xigaze, Xizang +861840893|Shannan, Xizang +861840894|Nyingchi, Xizang +861840895|Qamdo, Xizang +861840896|Nagqu, Xizang +861840897|Ngari, Xizang +861840898|Xigaze, Xizang +861840899|Qamdo, Xizang 861840900|Kashi, Xinjiang 861840901|Bortala, Xinjiang 861840902|Hami, Xinjiang @@ -112448,29 +112448,29 @@ 861848799|Lincang, Yunnan 8618488|Kunming, Yunnan 86184890|Haikou, Hainan -861848910|Lhasa, Tibet -861848911|Lhasa, Tibet -861848912|Xigaze, Tibet -861848913|Shannan, Tibet -861848914|Nyingchi, Tibet -861848915|Qamdo, Tibet -861848916|Nagqu, Tibet -861848917|Ngari, Tibet -861848918|Xigaze, Tibet -861848919|Nagqu, Tibet -861848920|Lhasa, Tibet -861848921|Lhasa, Tibet -861848922|Xigaze, Tibet -861848923|Shannan, Tibet -861848924|Nyingchi, Tibet -861848925|Qamdo, Tibet -861848926|Nagqu, Tibet -861848927|Ngari, Tibet -861848928|Shannan, Tibet -861848929|Nagqu, Tibet -86184893|Lhasa, Tibet -86184894|Lhasa, Tibet -86184895|Lhasa, Tibet +861848910|Lhasa, Xizang +861848911|Lhasa, Xizang +861848912|Xigaze, Xizang +861848913|Shannan, Xizang +861848914|Nyingchi, Xizang +861848915|Qamdo, Xizang +861848916|Nagqu, Xizang +861848917|Ngari, Xizang +861848918|Xigaze, Xizang +861848919|Nagqu, Xizang +861848920|Lhasa, Xizang +861848921|Lhasa, Xizang +861848922|Xigaze, Xizang +861848923|Shannan, Xizang +861848924|Nyingchi, Xizang +861848925|Qamdo, Xizang +861848926|Nagqu, Xizang +861848927|Ngari, Xizang +861848928|Shannan, Xizang +861848929|Nagqu, Xizang +86184893|Lhasa, Xizang +86184894|Lhasa, Xizang +86184895|Lhasa, Xizang 86184898|Haikou, Hainan 86184899|Haikou, Hainan 8618500|Beijing @@ -115007,16 +115007,16 @@ 861858898|Shenzhen, Guangdong 861858899|Guangzhou, Guangdong 86185890|Shenzhen, Guangdong -861858910|Xigaze, Tibet -861858911|Lhasa, Tibet -861858912|Xigaze, Tibet -861858913|Shannan, Tibet -861858914|Nyingchi, Tibet -861858915|Qamdo, Tibet -861858916|Nagqu, Tibet -861858917|Ngari, Tibet -861858918|Nyingchi, Tibet -861858919|Lhasa, Tibet +861858910|Xigaze, Xizang +861858911|Lhasa, Xizang +861858912|Xigaze, Xizang +861858913|Shannan, Xizang +861858914|Nyingchi, Xizang +861858915|Qamdo, Xizang +861858916|Nagqu, Xizang +861858917|Ngari, Xizang +861858918|Nyingchi, Xizang +861858919|Lhasa, Xizang 86185892|Guangzhou, Guangdong 861858930|Qujing, Yunnan 861858931|Kunming, Yunnan @@ -115028,16 +115028,16 @@ 861858937|Chuxiong, Yunnan 861858938|Qujing, Yunnan 861858939|Zhaotong, Yunnan -861858940|Qamdo, Tibet -861858941|Nagqu, Tibet -861858942|Ngari, Tibet -861858943|Shannan, Tibet -861858944|Nyingchi, Tibet -861858945|Qamdo, Tibet -861858946|Nagqu, Tibet -861858947|Ngari, Tibet -861858948|Lhasa, Tibet -861858949|Lhasa, Tibet +861858940|Qamdo, Xizang +861858941|Nagqu, Xizang +861858942|Ngari, Xizang +861858943|Shannan, Xizang +861858944|Nyingchi, Xizang +861858945|Qamdo, Xizang +861858946|Nagqu, Xizang +861858947|Ngari, Xizang +861858948|Lhasa, Xizang +861858949|Lhasa, Xizang 86185895|Haikou, Hainan 86185896|Haikou, Hainan 86185897|Chongqing @@ -118644,26 +118644,26 @@ 86186889|Shenzhen, Guangdong 861868890|Guangzhou, Guangdong 861868891|Qingyuan, Guangdong -861868900|Lhasa, Tibet -861868901|Lhasa, Tibet -861868902|Xigaze, Tibet -861868903|Shannan, Tibet -861868904|Nyingchi, Tibet -861868905|Qamdo, Tibet -861868906|Nagqu, Tibet -861868907|Ngari, Tibet -861868908|Lhasa, Tibet -861868909|Lhasa, Tibet -861868910|Lhasa, Tibet -861868911|Lhasa, Tibet -861868912|Xigaze, Tibet -861868913|Shannan, Tibet -861868914|Nyingchi, Tibet -861868915|Qamdo, Tibet -861868916|Nagqu, Tibet -861868917|Ngari, Tibet -861868918|Lhasa, Tibet -861868919|Lhasa, Tibet +861868900|Lhasa, Xizang +861868901|Lhasa, Xizang +861868902|Xigaze, Xizang +861868903|Shannan, Xizang +861868904|Nyingchi, Xizang +861868905|Qamdo, Xizang +861868906|Nagqu, Xizang +861868907|Ngari, Xizang +861868908|Lhasa, Xizang +861868909|Lhasa, Xizang +861868910|Lhasa, Xizang +861868911|Lhasa, Xizang +861868912|Xigaze, Xizang +861868913|Shannan, Xizang +861868914|Nyingchi, Xizang +861868915|Qamdo, Xizang +861868916|Nagqu, Xizang +861868917|Ngari, Xizang +861868918|Lhasa, Xizang +861868919|Lhasa, Xizang 86186892|Foshan, Guangdong 861868920|Shenzhen, Guangdong 861868921|Shenzhen, Guangdong @@ -119652,16 +119652,16 @@ 861870797|Ganzhou, Jiangxi 861870798|Jingdezhen, Jiangxi 861870799|Pingxiang, Jiangxi -861870800|Lhasa, Tibet -861870801|Lhasa, Tibet -861870802|Xigaze, Tibet -861870803|Shannan, Tibet -861870804|Nyingchi, Tibet -861870805|Qamdo, Tibet -861870806|Nagqu, Tibet -861870807|Nagqu, Tibet -861870808|Qamdo, Tibet -861870809|Xigaze, Tibet +861870800|Lhasa, Xizang +861870801|Lhasa, Xizang +861870802|Xigaze, Xizang +861870803|Shannan, Xizang +861870804|Nyingchi, Xizang +861870805|Qamdo, Xizang +861870806|Nagqu, Xizang +861870807|Nagqu, Xizang +861870808|Qamdo, Xizang +861870809|Xigaze, Xizang 86187081|Chengdu, Sichuan 86187082|Ziyang, Sichuan 86187083|Zigong, Sichuan @@ -122441,16 +122441,16 @@ 861879869|Zunyi, Guizhou 86187987|Guiyang, Guizhou 86187988|Guiyang, Guizhou -861879890|Lhasa, Tibet -861879891|Lhasa, Tibet -861879892|Xigaze, Tibet -861879893|Shannan, Tibet -861879894|Nyingchi, Tibet -861879895|Qamdo, Tibet -861879896|Nagqu, Tibet -861879897|Nagqu, Tibet -861879898|Qamdo, Tibet -861879899|Xigaze, Tibet +861879890|Lhasa, Xizang +861879891|Lhasa, Xizang +861879892|Xigaze, Xizang +861879893|Shannan, Xizang +861879894|Nyingchi, Xizang +861879895|Qamdo, Xizang +861879896|Nagqu, Xizang +861879897|Nagqu, Xizang +861879898|Qamdo, Xizang +861879899|Xigaze, Xizang 861879900|Tacheng, Xinjiang 861879901|Altay, Xinjiang 861879902|Altay, Xinjiang @@ -125526,9 +125526,9 @@ 86188888|Beijing 86188889|Hangzhou, Zhejiang 8618889|Haikou, Hainan -86188890|Lhasa, Tibet -861888902|Xigaze, Tibet -861888904|Nyingchi, Tibet +86188890|Lhasa, Xizang +861888902|Xigaze, Xizang +861888904|Nyingchi, Xizang 86188900|Changsha, Hunan 861889010|Chenzhou, Hunan 861889011|Chenzhou, Hunan @@ -126015,16 +126015,16 @@ 861889797|Ganzhou, Jiangxi 861889798|Jingdezhen, Jiangxi 861889799|Pingxiang, Jiangxi -861889800|Lhasa, Tibet -861889801|Lhasa, Tibet -861889802|Xigaze, Tibet -861889803|Shannan, Tibet -861889804|Xigaze, Tibet -861889805|Qamdo, Tibet -861889806|Nagqu, Tibet -861889807|Ngari, Tibet -861889808|Nagqu, Tibet -861889809|Nyingchi, Tibet +861889800|Lhasa, Xizang +861889801|Lhasa, Xizang +861889802|Xigaze, Xizang +861889803|Shannan, Xizang +861889804|Xigaze, Xizang +861889805|Qamdo, Xizang +861889806|Nagqu, Xizang +861889807|Ngari, Xizang +861889808|Nagqu, Xizang +861889809|Nyingchi, Xizang 861889810|Kaifeng, Henan 861889811|Kaifeng, Henan 861889812|Kaifeng, Henan @@ -126816,16 +126816,16 @@ 861890887|Deqen, Yunnan 861890888|Lijiang, Yunnan 861890889|Kunming, Yunnan -861890890|Lhasa, Tibet -861890891|Lhasa, Tibet -861890892|Xigaze, Tibet -861890893|Shannan, Tibet -861890894|Nyingchi, Tibet -861890895|Qamdo, Tibet -861890896|Nagqu, Tibet -861890897|Ngari, Tibet -861890898|Lhasa, Tibet -861890899|Lhasa, Tibet +861890890|Lhasa, Xizang +861890891|Lhasa, Xizang +861890892|Xigaze, Xizang +861890893|Shannan, Xizang +861890894|Nyingchi, Xizang +861890895|Qamdo, Xizang +861890896|Nagqu, Xizang +861890897|Ngari, Xizang +861890898|Lhasa, Xizang +861890899|Lhasa, Xizang 861890900|Zigong, Sichuan 861890901|Mianyang, Sichuan 861890902|Deyang, Sichuan @@ -129402,16 +129402,16 @@ 861898879|Shenzhen, Guangdong 86189888|Guangzhou, Guangdong 86189889|Guangzhou, Guangdong -861898900|Lhasa, Tibet -861898901|Lhasa, Tibet -861898902|Xigaze, Tibet -861898903|Shannan, Tibet -861898904|Nyingchi, Tibet -861898905|Qamdo, Tibet -861898906|Nagqu, Tibet -861898907|Ngari, Tibet -861898908|Lhasa, Tibet -861898909|Lhasa, Tibet +861898900|Lhasa, Xizang +861898901|Lhasa, Xizang +861898902|Xigaze, Xizang +861898903|Shannan, Xizang +861898904|Nyingchi, Xizang +861898905|Qamdo, Xizang +861898906|Nagqu, Xizang +861898907|Ngari, Xizang +861898908|Lhasa, Xizang +861898909|Lhasa, Xizang 861898910|Neijiang, Sichuan 861898911|Neijiang, Sichuan 861898912|Luzhou, Sichuan @@ -129447,16 +129447,16 @@ 86189896|Taizhou, Zhejiang 86189897|Wenzhou, Zhejiang 86189898|Hangzhou, Zhejiang -861898990|Lhasa, Tibet -861898991|Lhasa, Tibet -861898992|Xigaze, Tibet -861898993|Shannan, Tibet -861898994|Nyingchi, Tibet -861898995|Qamdo, Tibet -861898996|Nagqu, Tibet -861898997|Ngari, Tibet -861898998|Lhasa, Tibet -861898999|Lhasa, Tibet +861898990|Lhasa, Xizang +861898991|Lhasa, Xizang +861898992|Xigaze, Xizang +861898993|Shannan, Xizang +861898994|Nyingchi, Xizang +861898995|Qamdo, Xizang +861898996|Nagqu, Xizang +861898997|Ngari, Xizang +861898998|Lhasa, Xizang +861898999|Lhasa, Xizang 86189900|Zigong, Sichuan 86189901|Mianyang, Sichuan 86189902|Deyang, Sichuan @@ -130062,7 +130062,7 @@ 86797|Ganzhou, Jiangxi 86798|Jingdezhen, Jiangxi 86799|Pingxiang, Jiangxi -86807|Suoxian, Tibet +86807|Suoxian, Xizang 86812|Panzhihua, Sichuan 86813|Zigong, Sichuan 86816|Mianyang, Sichuan @@ -130104,13 +130104,13 @@ 86886|Liuku, Yunnan 86887|Zhongdian, Yunnan 86888|Lijiang, Yunnan -86891|Lhasa, Tibet -86892|Rikaze/Zhongba, Tibet -86893|Naidong, Tibet -86894|Linzhi, Tibet -86895|Changdu, Tibet -86896|Naqu/Jiali/Nierong/Shenzha/Shuanghu/Bange/Nima, Tibet -86897|GeEr/Pulan/Zhada, Tibet +86891|Lhasa, Xizang +86892|Rikaze/Zhongba, Xizang +86893|Naidong, Xizang +86894|Linzhi, Xizang +86895|Changdu, Xizang +86896|Naqu/Jiali/Nierong/Shenzha/Shuanghu/Bange/Nima, Xizang +86897|GeEr/Pulan/Zhada, Xizang 86898|Haikou, Hainan 86901|Tacheng, Xinjiang 86902|Hami, Xinjiang