diff --git a/data/taxi_places/yandex.json b/data/taxi_places/yandex.json index 6ffca382e0..04c6f0e6f3 100644 --- a/data/taxi_places/yandex.json +++ b/data/taxi_places/yandex.json @@ -48,6 +48,16 @@ ], "id": "Belarus" }, + { + "cities": [ + "Gyumri", + "Goris", + "Kapan", + "Vanadzor", + "Yerevan" + ], + "id": "Armenia" + }, { "cities": [ "Tartu", @@ -71,14 +81,7 @@ }, { "cities": [ - "Riga", - "Daugavpils" - ], - "id": "Latvia" - }, - { - "cities": [ - "Chi\u0219in\u0103u" + "Chi\u0219inau" ], "id": "Moldova" }, @@ -89,23 +92,20 @@ ], "id": "Uzbekistan" }, + { + "cities": [ + "Riga", + "Daugavpils" + ], + "id": "Latvia" + }, { "cities": [ "Tbilisi", "Rustavi", "Batumi" ], - "id": "Georgia" - }, - { - "cities": [ - "Gyumri", - "Goris", - "Kapan", - "Vanadzor", - "Yerevan" - ], - "id": "Armenia" + "id": "Georgia Region" }, { "cities": [ @@ -717,7 +717,121 @@ "Elista", "Yugorsk", "Yurga", - "Yakutsk" + "Yakutsk", + "Abakan", + "Aleksin", + "Angarsk", + "Astrakhan", + "Barnaul", + "Berezniki", + "Blagoveshchensk", + "Bryansk", + "Veliky Novgorod", + "Vladivostok", + "Vladimir", + "Volgograd", + "Vologda", + "Voronezh", + "Votkinsk", + "Gatchina", + "Dzerzhinsk", + "Dimitrovgrad", + "Donskoj", + "Yekaterinburg", + "Zlatoust", + "Ivanovo", + "Izhevsk", + "Irkutsk", + "Yoshkar-Ola", + "Kazan", + "Kaliningrad", + "Kaluga", + "Kemerovo", + "Kirov", + "Kirov", + "Kondrovo", + "Kostroma", + "Krasnodar", + "Krasnoyarsk", + "Kungur", + "Kyzyl", + "Lipetsk", + "Lysva", + "Lyudinovo", + "Magnitogorsk", + "Miass", + "Minusinsk", + "Moscow", + "Murmansk", + "Naberezhnye Chelny", + "Nizhny Novgorod", + "Nizhny Tagil", + "Novoaltaysk", + "Novokuznetsk", + "Novokuybyshevsk", + "Novomoskovsk", + "Novorossiysk", + "Novosibirsk", + "Novocherkassk", + "Obninsk", + "Oktyabrskiy", + "Omsk", + "Orenburg", + "Orsk", + "Penza", + "Pervouralsk", + "Perm", + "Petrozavodsk", + "Pskov", + "Rostov-on-Don", + "Ryazan", + "Salavat", + "Samara", + "Saint Petersburg", + "Saransk", + "Saratov", + "Sayanogorsk", + "Serpukhov", + "Smolensk", + "Solikamsk", + "Sochi", + "Sterlitamak", + "Syzran", + "Syktyvkar", + "Taganrog", + "Tambov", + "Tver", + "Tolyatti", + "Tomsk", + "Tyumen", + "Ulan-Ude", + "Ulyanovsk", + "Ufa", + "Khabarovsk", + "Chaikovsky", + "Chapaevsk", + "Cheboksary", + "Chelyabinsk", + "Cherepovets", + "Chernogorsk", + "Chita", + "Chusovoy", + "Shakhty", + "Engels", + "Yaroslavl", + "Mytishchi", + "Reutov", + "Kotelniki", + "Dzerzhinsky", + "Vidnoye", + "Odintsovo", + "Krasnogorsk", + "Dolgoprudny", + "Khimki", + "Sestroretsk", + "Murino", + "Shushary", + "Kolpino" ], "id": "Russian Federation" }, @@ -739,7 +853,10 @@ "Taraz", "Oral", "Oskemen", - "Ekibastuz" + "Ekibastuz", + "Almaty", + "Astana", + "Karaganda" ], "id": "Kazakhstan" } diff --git a/partners_api/partners_api_tests/taxi_engine_tests.cpp b/partners_api/partners_api_tests/taxi_engine_tests.cpp index 571dab2970..99c7431e22 100644 --- a/partners_api/partners_api_tests/taxi_engine_tests.cpp +++ b/partners_api/partners_api_tests/taxi_engine_tests.cpp @@ -544,7 +544,7 @@ UNIT_TEST(TaxiEngine_GetProvidersAtPos) engine.SetDelegate(std::make_unique()); providers = engine.GetProvidersAtPos(latlon); TEST_EQUAL(providers.size(), 1, ()); - TEST_EQUAL(providers[0], taxi::Provider::Type::Rutaxi, ()); + TEST_EQUAL(providers[0], taxi::Provider::Type::Yandex, ()); engine.SetDelegate(std::make_unique()); providers = engine.GetProvidersAtPos(latlon); diff --git a/partners_api/taxi_engine.cpp b/partners_api/taxi_engine.cpp index 3b3220474c..571503ab3e 100644 --- a/partners_api/taxi_engine.cpp +++ b/partners_api/taxi_engine.cpp @@ -119,7 +119,6 @@ void ResultMaker::DecrementRequestCount() Engine::Engine(std::vector urls /* = {} */) { AddApi(urls, Provider::Type::Yandex); - AddApi(urls, Provider::Type::Rutaxi); AddApi(urls, Provider::Type::Freenow); }