gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

added max supported distance for taxi

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-07-06 17:38:15 +03:00 • committed by r.kuznetsov
parent a1ccdc0266
commit 80b011dbbc
7 changed files with 79 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
partners_api/partners_api_tests/uber_tests.cpp
View file

@ -4,6 +4,8 @@
#include "geometry/latlon.hpp"
#include "platform/platform.hpp"
#include "std/algorithm.hpp"
#include "std/atomic.hpp"
#include "std/mutex.hpp"
@ -174,16 +176,32 @@ UNIT_TEST(Uber_GetAvailableProducts)
api.GetAvailableProducts(from, to,
[&resultProducts](std::vector<taxi::Product> const & products) {
resultProducts = products;
testing::StopEventLoop();
GetPlatform().RunOnGuiThread([] { testing::StopEventLoop(); });
},
[](taxi::ErrorCode const code) {
LOG(LWARNING, (code));
testing::StopEventLoop();
TEST(false, (code));
GetPlatform().RunOnGuiThread([=] { testing::StopEventLoop(); });
});
testing::RunEventLoop();
TEST(!resultProducts.empty(), ());
taxi::ErrorCode errorCode = taxi::ErrorCode::RemoteError;
ms::LatLon const farPos(56.838197, 35.908507);
api.GetAvailableProducts(from, farPos,
[](std::vector<taxi::Product> const & products) {
TEST(false, ());
GetPlatform().RunOnGuiThread([] { testing::StopEventLoop(); });
},
[&errorCode](taxi::ErrorCode const code) {
errorCode = code;
GetPlatform().RunOnGuiThread([=] { testing::StopEventLoop(); });
});
TEST_EQUAL(errorCode, taxi::ErrorCode::NoProducts, ());
testing::RunEventLoop();
}
UNIT_TEST(Uber_GetRideRequestLinks)

24
partners_api/partners_api_tests/yandex_tests.cpp
View file

@ -4,6 +4,8 @@
#include "geometry/latlon.hpp"
#include "platform/platform.hpp"
namespace
{
UNIT_TEST(Yandex_GetTaxiInfo)
@ -28,15 +30,31 @@ UNIT_TEST(Yandex_GetAvailableProducts)
api.GetAvailableProducts(from, to,
[&resultProducts](std::vector<taxi::Product> const & products) {
resultProducts = products;
testing::StopEventLoop();
GetPlatform().RunOnGuiThread([] { testing::StopEventLoop(); });
},
[](taxi::ErrorCode const code) {
LOG(LWARNING, (code));
testing::StopEventLoop();
TEST(false, (code));
GetPlatform().RunOnGuiThread([] { testing::StopEventLoop(); });
});
testing::RunEventLoop();
TEST(!resultProducts.empty(), ());
taxi::ErrorCode errorCode = taxi::ErrorCode::RemoteError;
ms::LatLon const farPos(56.838197, 35.908507);
api.GetAvailableProducts(from, farPos,
[](std::vector<taxi::Product> const & products) {
TEST(false, ());
GetPlatform().RunOnGuiThread([] { testing::StopEventLoop(); });
},
[&errorCode](taxi::ErrorCode const code) {
errorCode = code;
GetPlatform().RunOnGuiThread([] { testing::StopEventLoop(); });
});
TEST_EQUAL(errorCode, taxi::ErrorCode::NoProducts, ());
testing::RunEventLoop();
}
} // namespace

13
partners_api/taxi_base.cpp
View file

@ -1,7 +1,20 @@
#include "partners_api/taxi_base.hpp"
#include "geometry/distance_on_sphere.hpp"
namespace
{
// The maximum supported distance in meters by default.
double const kMaxSupportedDistance = 100000;
} // namespace
namespace taxi
{
bool ApiBase::IsDistanceSupported(ms::LatLon const & from, ms::LatLon const & to) const
{
return ms::DistanceOnEarth(from, to) <= kMaxSupportedDistance;
}
bool ApiItem::AreAllCountriesDisabled(storage::TCountriesVec const & countryIds,
std::string const & city) const
{

2
partners_api/taxi_base.hpp
View file

@ -44,6 +44,8 @@ public:
ms::LatLon const & to) const = 0;
protected:
virtual bool IsDistanceSupported(ms::LatLon const & from, ms::LatLon const & to) const;
std::string const m_baseUrl;
};

7
partners_api/uber_api.cpp
View file

@ -233,6 +233,13 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to,
ASSERT(successFn, ());
ASSERT(errorFn, ());
if (!IsDistanceSupported(from, to))
{
// TODO(a): Add ErrorCode::FarDistance and provide this error code.
errorFn(ErrorCode::NoProducts);
return;
}
auto const reqId = ++m_requestId;
auto const maker = m_maker;
auto const baseUrl = m_baseUrl;

12
partners_api/yandex_api.cpp
View file

@ -23,6 +23,7 @@ bool RunSimpleHttpRequest(std::string const & url, std::string & result)
{
platform::HttpClient request(url);
request.SetRawHeader("Accept", "application/json");
request.SetRawHeader("YaTaxi-Api-Key", YANDEX_API_KEY);
if (request.RunHttpRequest() && !request.WasRedirected() && request.ErrorCode() == 200)
{
result = request.ServerResponse();
@ -60,8 +61,8 @@ bool RawApi::GetTaxiInfo(ms::LatLon const & from, ms::LatLon const & to, std::st
{
std::ostringstream url;
url << std::fixed << std::setprecision(6) << baseUrl << "/taxi_info?clid=" << YANDEX_CLIENT_ID
<< "&apikey=" << YANDEX_API_KEY << "&rll=" << from.lon << "," << from.lat << "~" << to.lon
<< "," << to.lat << "&class=econom";
<< "&rll=" << from.lon << "," << from.lat << "~" << to.lon << "," << to.lat
<< "&class=econom";
return RunSimpleHttpRequest(url.str(), result);
}
@ -74,6 +75,13 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to,
ASSERT(successFn, ());
ASSERT(errorFn, ());
// TODO(a): Add ErrorCode::FarDistance and provide this error code.
if (!IsDistanceSupported(from, to))
{
errorFn(ErrorCode::NoProducts);
return;
}
auto const baseUrl = m_baseUrl;
threads::SimpleThread([from, to, baseUrl, successFn, errorFn]()

10
tools/python/jsons.py
View file

@ -217,31 +217,31 @@ PARTNERS_TAXI_INFO = """
"distance": 6888.846981748964,
"options": [
{
"class": "econom",
"class_name": "econom",
"min_price": 129,
"price": 344,
"waiting_time": 527.8793726078095
},
{
"class": "business",
"class_name": "business",
"min_price": 239,
"price": 504,
"waiting_time": 76.37023611385494
},
{
"class": "comfortplus",
"class_name": "comfortplus",
"min_price": 239,
"price": 557,
"waiting_time": 99.0058955445591
},
{
"class": "minivan",
"class_name": "minivan",
"min_price": 239,
"price": 532,
"waiting_time": 322.77413167989687
},
{
"class": "vip",
"class_name": "vip",
"min_price": 359,
"price": 799,
"waiting_time": 223.34814145904883