diff --git a/data/taxi_places/yandex.json b/data/taxi_places/yandex.json index b1edffd914..6ffca382e0 100644 --- a/data/taxi_places/yandex.json +++ b/data/taxi_places/yandex.json @@ -7,10 +7,10 @@ "countries": [ { "cities": [ + "Odesa", "Kharkiv", "Dnipro", "Kyiv", - "Odessa", "Lviv" ], "id": "Ukraine" @@ -24,11 +24,29 @@ }, { "cities": [ - "Tbilisi", - "Batumi", - "Rustavi" + "Maladzie\u010dna", + "Vitebsk", + "Zhlobin", + "Lida", + "Orsha", + "Slonim", + "Sluck", + "Smarhon", + "Barysaw", + "Mahilyow", + "Baranovichi", + "Zhodzina", + "Minsk", + "Mazyr", + "Rechytsa", + "Soligorsk", + "Babruysk", + "Brest", + "Vawkavysk", + "Homel", + "Hrodna" ], - "id": "Georgia" + "id": "Belarus" }, { "cities": [ @@ -53,7 +71,14 @@ }, { "cities": [ - "Chisinau" + "Riga", + "Daugavpils" + ], + "id": "Latvia" + }, + { + "cities": [ + "Chi\u0219in\u0103u" ], "id": "Moldova" }, @@ -66,10 +91,11 @@ }, { "cities": [ - "Riga", - "Daugavpils" + "Tbilisi", + "Rustavi", + "Batumi" ], - "id": "Latvia" + "id": "Georgia" }, { "cities": [ @@ -83,29 +109,123 @@ }, { "cities": [ + "\u0428\u0430\u0434\u0440\u0438\u043d\u0441\u043a", + "\u0422\u0440\u0443\u0431\u0447\u0435\u0432\u0441\u043a", + "\u0422\u0430\u0440\u043a\u043e-\u0421\u0430\u043b\u0435", + "\u0420\u044b\u0431\u043d\u043e\u0435", + "\u0420\u0443\u0437\u0430\u0435\u0432\u043a\u0430", + "\u041e\u0440\u0435\u0445\u043e\u0432\u043e-\u0417\u0443\u0435\u0432\u043e", + "Nyandoma", + "Novopavlovsk", + "\u041c\u0438\u0440\u043d\u044b\u0439", + "\u041c\u0435\u0434\u043d\u043e\u0433\u043e\u0440\u0441\u043a", + "\u041c\u0430\u043b\u043e\u044f\u0440\u043e\u0441\u043b\u0430\u0432\u0435\u0446", + "\u041c\u0430\u043b\u0430\u044f \u0412\u0438\u0448\u0435\u0440\u0430", + "\u041a\u0443\u043c\u0435\u0440\u0442\u0430\u0443", + "\u041a\u043e\u043b\u044c\u0447\u0443\u0433\u0438\u043d\u043e", + "\u041a\u043b\u0438\u043d\u0446\u044b", + "Zelenogorsk", + "\u0414\u043e\u043b\u0433\u043e\u0434\u0435\u0440\u0435\u0432\u0435\u043d\u0441\u043a\u043e\u0435", + "\u0413\u0435\u043e\u0440\u0433\u0438\u0435\u0432\u0441\u043a", + "\u0412\u044f\u0437\u044c\u043c\u0430", + "Zhigulyevsk", + "Zavodoukovsk", + "Yuzhnoural'sk", + "Yalutorovsk", + "Vurnary", + "Verkhneyarkeyevo", + "Venyov", + "Velikiy Ustyug", + "Valday", + "Ust-Ilimsk", + "Usolye-Sibirskoye", + "Urus-Martan", + "Uchaly", + "Tulun", + "Tryokhgorny", + "Tovarkovo", + "Tayshet", + "Taiga", + "Suvorov", + "Strezhevoy", + "Spassk-Dal'nij", + "Sorochinsk", + "Sol-Iletsk", + "Sobinka", + "Shebekino", + "Sharlyk", + "Segezha", + "Salsk", + "Safonovo", + "Rzhev", + "Rtishchevo", + "Raychikhinsk", + "Polarnie Zori", + "Petushki", + "Pavlogradka", + "Partisansk", + "Osinniki", + "Novospasskoye", + "Nizhnyaya Tura", + "Nizhnyaya Salda", + "Nizhneudinsk", + "Nazarovo", + "Myski", + "Moskalenki", + "Morshansk", + "Mikhnevo", + "Michurinsk", + "Lyubinsky", + "Lakinsk", + "Labytnangi", + "Kuvandyk", + "Kursavka", + "Krasnoturinsk", + "Koryazhma", + "Kirishi", + "Kinel", + "Kasli", + "Karmaskaly", + "Karachev", + "Kantyshevo", + "Kaltan", + "Isilkul", + "Ishim", + "Gvardeysk", + "Davlekanovo", + "Chudovo", + "Chernigovka", + "Chechen-Aul", + "Buinsk", + "Bolshoy Kamen", + "Boguchar", + "Blagodarnoyy", + "Belovo", + "Belaya Kalitva", + "Baymak", + "Baltiysk", + "Asha", + "Arsk", + "Argun", + "Anzhero-Sudzhensk", + "Aleysk", + "Agryz", "Abinsk", "Avsyunino", - "\u0410\u0433\u0440\u044b\u0437", "Aznakayevo", - "Akademgorodok", "Alekseevka", "Apatity", "Asino", "Akhtubinsk", - "\u0410\u0448\u0430", - "\u0411\u0430\u0439\u043c\u0430\u043a", "Barabinsk", "Barysh", "Birobidzhan", - "\u0411\u043b\u0430\u0433\u043e\u0432\u0435\u0449\u0435\u043d\u0441\u043a", "Bologoe", "Bor", "Borovichi", "Bronnitsy", "\u0411\u0443\u0433\u0443\u0440\u0443\u0441\u043b\u0430\u043d", - "\u0412\u0430\u043b\u0434\u0430\u0439", "Vanino", - "Verkhneyarkeevo", "Vladikavkaz", "Volgorechensk", "Volzhsk", @@ -119,11 +239,9 @@ "Gusev", "Dmitrov", "Dobryanka", - "Dolgoderevenskoye", "Drezna", "Dyurtyuli", "Yelabuga", - "Zhigulyovsk", "Zavety Il'icha", "Zalukokoazhe", "\u0417\u0430\u0440\u0435\u0447\u043d\u044b\u0439", @@ -133,13 +251,9 @@ "Zubova Polyana", "Igra", "Irbit", - "\u0418\u0441\u0438\u043b\u044c\u043a\u0443\u043b\u044c", - "\u0418\u0448\u0438\u043c", - "\u041a\u0430\u043b\u0442\u0430\u043d", "Kamensk-Uralsky", "Kamensk-Shakhtinsky", "Kamen-na-Obi", - "\u041a\u0430\u0440\u0430\u0447\u0435\u0432", "Kaspiysk", "Kizilyurt", "Kislovodsk", @@ -165,13 +279,7 @@ "Megion", "Mesyagutovo", "Mineralnye Vody", - "Mirny", - "\u041c\u0438\u0445\u043d\u0435\u0432\u043e", - "Mitchurinsk", "Monchegorsk", - "\u041c\u043e\u0440\u0448\u0430\u043d\u0441\u043a", - "\u041c\u043e\u0441\u043a\u0430\u043b\u0435\u043d\u043a\u0438", - "\u041c\u044b\u0441\u043a\u0438", "Navashino", "Nalchik", "Nar'yan-Mar", @@ -185,13 +293,11 @@ "Nikolskoye", "Novoaleksandrovsk", "Novovoronezh", - "\u041d\u043e\u0432\u043e\u043f\u0430\u0432\u043b\u043e\u0432\u0441\u043a", "Novosergiyevka", "Novyy Oskol", "Novy Urengoy", "Oboyan'", "Olenegorsk", - "\u041e\u0441\u0438\u043d\u043d\u0438\u043a\u0438", "Otradny", "Pallasovka", "Peterhof", @@ -199,19 +305,14 @@ "Pokrov", "Pokrovskoye", "Polevskoy", - "\u041f\u043e\u043b\u044f\u0440\u043d\u044b\u0435 \u0417\u043e\u0440\u0438", "Primorsko-Akhtarsk", "Prokopyevsk", "Pyt'-Yakh", "Rodniki", "Rybinsk", - "Rybnoe", - "\u0421\u0430\u043b\u044c\u0441\u043a", "Sarapul", - "\u0421\u0430\u0444\u043e\u043d\u043e\u0432\u043e", "Svetlogorsk", "Svobodny", - "\u0421\u0435\u0433\u0435\u0436\u0430", "\u0421\u0435\u043c\u0438\u0431\u0440\u0430\u0442\u043e\u0432\u043e", "Sergiyev Posad", "Sibay", @@ -219,8 +320,6 @@ "Slavyansk-na-Kubani", "Solnechnodolsk", "Solnechny", - "\u0421\u043e\u043b\u044c-\u0418\u043b\u0435\u0446\u043a", - "\u0421\u043e\u0440\u043e\u0447\u0438\u043d\u0441\u043a", "Sosnovo", "Sosnoviy Bor", "Sosnogorsk", @@ -230,27 +329,20 @@ "Sudzha", "Surkhakhi", "Tara", - "Tarko-Sale", "Tobolsk", "Tutaev", "Uglich", "Uryupinsk", - "\u0423\u0441\u0442\u044c-\u0418\u043b\u0438\u043c\u0441\u043a", - "\u0423\u0447\u0430\u043b\u044b", "Khvalynsk", "Chamzinka", "Chegem", - "\u0427\u0435\u0447\u0435\u043d-\u0410\u0443\u043b", "Chistopol", - "Shadrinsk", "Sharypovo", "Shatura", - "\u0428\u0435\u0431\u0435\u043a\u0438\u043d\u043e", "Shuya", "Elektrostal", "Yugo-Kamskiy", "Yuzhno-Sakhalinsk", - "Yuzhnouralsk", "Yartsevo", "Abdulino", "Alagir", @@ -264,11 +356,9 @@ "Belokurikha", "Berdsk", "Birsk", - "\u0411\u043b\u0430\u0433\u043e\u0434\u0430\u0440\u043d\u044b\u0439", "Bratsk", "Bryukhovetskaya", "Bugulma", - "\u0411\u0443\u0438\u043d\u0441\u043a", "Buynaksk", "Velikiye Luki", "\u0412\u0435\u043b\u044c\u0441\u043a", @@ -280,7 +370,6 @@ "Goryachiy Klyuch", "Gudermes", "Gulkevichi", - "\u0414\u0430\u0432\u043b\u0435\u043a\u0430\u043d\u043e\u0432\u043e", "Dagestanskiye Ogni", "Derbent", "Dzhubga", @@ -289,10 +378,8 @@ "Dyatkovo", "Yefremov", "Zheleznogorsk", - "\u0417\u0430\u0432\u043e\u0434\u043e\u0443\u043a\u043e\u0432\u0441\u043a", "Zavolzhe", "\u0417\u0430\u0440\u0435\u0447\u043d\u044b\u0439", - "\u0417\u0435\u043b\u0435\u043d\u043e\u0433\u043e\u0440\u0441\u043a", "Iglino", "Kamyshin", "Kanevskaya", @@ -302,7 +389,6 @@ "Kachkanar", "Kashira", "Kingisepp", - "\u041a\u0438\u043d\u0435\u043b\u044c", "Kirzhach", "Konstantinovsk", "Kotovo", @@ -315,7 +401,6 @@ "Kudymkar", "Kuznetsk", "Kurgan", - "Kurortny District", "Leninogorsk", "Lesosibirsk", "\u041b\u0443\u043a\u043e\u044f\u043d\u043e\u0432", @@ -329,15 +414,12 @@ "Nartkala", "Nevyansk", "Nizhniy Lomov", - "\u041d\u0438\u0436\u043d\u044f\u044f \u0421\u0430\u043b\u0434\u0430", - "\u041d\u0438\u0436\u043d\u044f\u044f \u0422\u0443\u0440\u0430", "Novotroitsk", "Nytva", "Ozyorsk", "Orlovskiy", "Pavlovo", "Pavlovsky Posad", - "\u041f\u0430\u0440\u0442\u0438\u0437\u0430\u043d\u0441\u043a", "Pereslavl-Zalessky", "\u041f\u043e\u0439\u043a\u043e\u0432\u0441\u043a\u0438\u0439", "Priozersk", @@ -346,16 +428,12 @@ "Pyatigorsk", "Rasskazovo", "Roshal", - "\u0420\u0442\u0438\u0449\u0435\u0432\u043e", - "Ruzaevka", "Sarov", "Sverdlovskiy", "Serdobsk", "Solnechnogorsk", "Stavropol", "Stary Oskol", - "Strezhevoi", - "\u0421\u0443\u0432\u043e\u0440\u043e\u0432", "Surgut", "Surovikino", "Tashtagol", @@ -366,11 +444,9 @@ "Toksovo", "Torzhok", "Totskoye", - "\u0422\u0440\u0451\u0445\u0433\u043e\u0440\u043d\u044b\u0439", "Tuchkovo", "Tyrnyauz", "Uvarovo", - "\u0423\u0440\u0443\u0441-\u041c\u0430\u0440\u0442\u0430\u043d", "Ust-Donetski", "Ust-Labinsk", "Ukhta", @@ -391,18 +467,13 @@ "Adygeysk", "Azov", "Alapaevsk", - "\u0410\u043b\u0435\u0439\u0441\u043a", - "\u0410\u0440\u0433\u0443\u043d", "Armavir", - "\u0410\u0440\u0441\u043a", "Arkhangelsk", "Atkarsk", "Baksan", "Balabanovo", "Balakovo", - "\u0411\u0430\u043b\u0442\u0438\u0439\u0441\u043a", "Belaya Glina", - "\u0411\u0435\u043b\u0430\u044f \u041a\u0430\u043b\u0438\u0442\u0432\u0430", "Belgorod", "Belebei", "Belogorsk", @@ -412,17 +483,14 @@ "Borisovka", "Budyonnovsk", "Buy", - "\u0412\u0435\u043d\u0451\u0432", "Vereshchagino", "Verhniy Ufaley", "Volodarsk", "Volosovo", "Volkhov", "Volsk", - "\u0412\u0443\u0440\u043d\u0430\u0440\u044b", "Vyazniki", "Gagarin", - "Georgiyevsk", "Glazov", "Gukovo", "Gus-Khrustalny", @@ -448,29 +516,22 @@ "Kanash", "Kandalaksha", "Kansk", - "\u041a\u0430\u043d\u0442\u044b\u0448\u0435\u0432\u043e", "Karabash", "Karachayevsk", - "\u041a\u0430\u0440\u043c\u0430\u0441\u043a\u0430\u043b\u044b", "Kimry", "Kineshma", - "\u041a\u0438\u0440\u0438\u0448\u0438", "Klin", "Kovrov", "Kovylkino", "Kozelsk", "Kolomna", "Korenovsk", - "\u041a\u043e\u0440\u044f\u0436\u043c\u0430", "Kotlas", - "\u041a\u0440\u0430\u0441\u043d\u043e\u0442\u0443\u0440\u044c\u0438\u043d\u0441\u043a", "Krasnoufimsk", "Krasny Kut", "Kronstadt", "Krylovskaya", "Krymsk", - "\u041a\u0443\u0440\u0441\u0430\u0432\u043a\u0430", - "\u041b\u0430\u0431\u044b\u0442\u043d\u0430\u043d\u0433\u0438", "Lesnoy", "Likino-Dulyovo", "Liski", @@ -478,21 +539,18 @@ "Luga", "Magadan", "Mariinsk", - "Mednogorsk", "Meleuz", "\u041c\u0438\u0445\u0430\u0439\u043b\u043e\u0432\u043a\u0430", "Mozhaisk", "Mozhga", "Mozdok", "Muravlenko", - "\u041d\u0430\u0437\u0430\u0440\u043e\u0432\u043e", "Naro-Fominsk", "Nerekhta", "Nefteyugansk", "Nizhnekamsk", "Nikolayevsk-on-Amur", "Novopokrovskaya", - "\u041d\u043e\u0432\u043e\u0441\u043f\u0430\u0441\u0441\u043a\u043e\u0435", "Noginsk", "Norilsk", "Noyabrsk", @@ -511,7 +569,6 @@ "Pugachyov", "Revda", "Rezh", - "\u0420\u0436\u0435\u0432", "Rovenki", "Roslavl", "Rostov", @@ -523,62 +580,46 @@ "\u0421\u0435\u043b\u044c\u0446\u043e", "Semikarakorsk", "Serov", - "\u0421\u043e\u0431\u0438\u043d\u043a\u0430", "Sovetskiy", "Sokol", "Sofrino", "Sysert", - "\u0422\u0430\u0439\u0433\u0430", - "\u0422\u0430\u0439\u0448\u0435\u0442", "Tikhvin", "Tolbazy", "Troitsk", - "Trubchevsk", "Tujmazy", - "\u0422\u0443\u043b\u0443\u043d", "Uray", "Ussurijsk", "Khadyzhensk", "Kholmsk", - "\u0427\u0435\u0440\u043d\u0438\u0433\u043e\u0432\u043a\u0430", "Chernushka", "Chernyakhovsk", - "\u0427\u0443\u0434\u043e\u0432\u043e", - "\u0428\u0430\u0440\u043b\u044b\u043a", "Elektrogorsk", "\u042e\u0440\u044c\u0435\u0432-\u041f\u043e\u043b\u044c\u0441\u043a\u0438\u0439", "Yuryuzan", - "\u042f\u043b\u0443\u0442\u043e\u0440\u043e\u0432\u0441\u043a", "Agidel", "Alatyr", "\u0410\u043b\u0435\u043a\u0441\u0430\u043d\u0434\u0440\u043e\u0432\u0441\u043a\u043e\u0435", "Almetyevsk", "Anapa", - "Andzhero-Sudzhensk", "Apsheronsk", "Arseniev", "Afipskiy", "Achinsk", "Balakhna", "Bezenchuk", - "\u0411\u0435\u043b\u043e\u0432\u043e", "Biysk", "Bogdanovich", - "\u0411\u043e\u0433\u0443\u0447\u0430\u0440", - "\u0411\u043e\u043b\u044c\u0448\u043e\u0439 \u041a\u0430\u043c\u0435\u043d\u044c", "Borisoglebsk", "Borisoglebsky", "Buzuluk", "Buturlinovka", "Valuyki", - "\u0412\u0435\u043b\u0438\u043a\u0438\u0439 \u0423\u0441\u0442\u044e\u0433", "Verkhnyaya Salda", "Vichuga", "Volgodonsk", "Vyksa", - "Vyazma", "Gavrlov Yam", - "\u0413\u0432\u0430\u0440\u0434\u0435\u0439\u0441\u043a", "Gorodets", "Gubakha", "Guryevsk", @@ -594,65 +635,50 @@ "Ishimbay", "Kalach", "Kamyzyak", - "\u041a\u0430\u0441\u043b\u0438", "Kashkhatau", "Kizel", "Kizlyar", "Kirovo-Chepetsk", "Kirovsk", "Kirovsk", - "Klintsy", "Kogalym", "Kolyvan", - "Kolchugino", "Korkino", "Kotelnich", - "\u041a\u0443\u0432\u0430\u043d\u0434\u044b\u043a", "Kuzovatovo", - "Kumertau", "Kurganinsk", "Kurovskoye", "Kurchatov", "Kushchovskaya", - "\u041b\u0430\u043a\u0438\u043d\u0441\u043a", "Langepas", "Leningradskaya", "Leninsk-Kuznetsky", "Linevo", "Lodeynoye Pole", - "\u041b\u044e\u0431\u0438\u043d\u0441\u043a\u0438\u0439", "Lyantor", "Maykop", "Mayskiy", - "Malaya Vishera", - "Maloyaroslavets", "Mendeleyevsk", "Monino", "\u041d\u0435\u043b\u0438\u0434\u043e\u0432\u043e", "Nizhnevartovsk", - "\u041d\u0438\u0436\u043d\u0435\u0443\u0434\u0438\u043d\u0441\u043a", "Novozybkov", "Novouralsk", "Nurlat", "Nyagan", - "\u041d\u044f\u043d\u0434\u043e\u043c\u0430", "Oktyabrsk", "Okulovka", "Oryol", - "Orekhovo-Zuyevo", "Osa", "Ostrogozhsk", "Otchor", "Pavlovsk", - "\u041f\u0430\u0432\u043b\u043e\u0433\u0440\u0430\u0434\u043a\u0430", - "\u041f\u0435\u0442\u0443\u0448\u043a\u0438", "\u041f\u0438\u043e\u043d\u0435\u0440\u0441\u043a\u0438\u0439", "Podporozhye", "\u041f\u043e\u0447\u0435\u043f", "Priyutovo", "Pushkin", "Pushchino", - "\u0420\u0430\u0439\u0447\u0438\u0445\u0438\u043d\u0441\u043a", "Rossosh", "Ruza", "Saraktash", @@ -663,7 +689,6 @@ "Skopin", "Slobodskoy", "Sortavala", - "\u0421\u043f\u0430\u0441\u0441\u043a-\u0414\u0430\u043b\u044c\u043d\u0438\u0439", "Staraya Russa", "Suzdal", "Sukhoy Log", @@ -671,7 +696,6 @@ "Tatarsk", "Teykovo", "Timashevsk", - "\u0422\u043e\u0432\u0430\u0440\u043a\u043e\u0432\u043e", "Toguchin", "Tosno", "Tuapse", @@ -679,7 +703,6 @@ "Udomlya", "Usinsk", "Usman", - "\u0423\u0441\u043e\u043b\u044c\u0435-\u0421\u0438\u0431\u0438\u0440\u0441\u043a\u043e\u0435", "Ust-Dzheguta", "Frolovo", "Khasavyurt", @@ -700,37 +723,12 @@ }, { "cities": [ - "Vitebsk", - "Zhlobin", - "Lida", - "Molodechno", - "Orsha", - "Slonim", - "Sluck", - "Smarhon", - "Barysaw", - "Mahilyow", - "Baranovichi", - "Zhodzina", - "Minsk", - "Mazyr", - "Rechytsa", - "Soligorsk", - "Babruysk", - "Brest", - "Vawkavysk", - "Homel", - "Hrodna" - ], - "id": "Belarus" - }, - { - "cities": [ + "Semey", + "Petropavl", "Aktobe", "Atyrau", "Kyzylorda", "Taldykorgan", - "Semipalatinsk", "Temirtau", "Shymkent", "Aktau", @@ -738,7 +736,6 @@ "Kokshetau", "Kostanay", "Pavlodar", - "Petropavlovsk", "Taraz", "Oral", "Oskemen", diff --git a/partners_api/partners_api_tests/taxi_engine_tests.cpp b/partners_api/partners_api_tests/taxi_engine_tests.cpp index 4299afa4bb..571dab2970 100644 --- a/partners_api/partners_api_tests/taxi_engine_tests.cpp +++ b/partners_api/partners_api_tests/taxi_engine_tests.cpp @@ -37,7 +37,7 @@ class UkraineOdessaDelegate : public taxi::Delegate public: storage::CountriesVec GetCountryIds(m2::PointD const & point) override { return {"Ukraine"}; } - std::string GetCityName(m2::PointD const & point) override { return "Odessa"; } + std::string GetCityName(m2::PointD const & point) override { return "Odesa"; } storage::CountryId GetMwmId(m2::PointD const & point) override { return "Ukraine_Odessa Oblast"; } };