Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Added flatbuffers compatibility to the Node

Browse Source
This commit is contained in:
Denis Chaplygin 2019-08-12 17:28:14 +03:00
parent 90191c9f34
commit e26a5cc392
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nodejs/node_osrm.cpp
View File

@ -151,18 +151,20 @@ inline void async(const Nan::FunctionCallbackInfo<v8::Value> &info,
void Execute() override try void Execute() override try
{ {
osrm::json::Object r; osrm::engine::api::ResultT r;
r=osrm::util::json::Object();
const auto status = ((*osrm).*(service))(*params, r); const auto status = ((*osrm).*(service))(*params, r);
ParseResult(status, r); auto json_result = r.get<osrm::json::Object>();
ParseResult(status, json_result);
if (pluginParams.renderJSONToBuffer) if (pluginParams.renderJSONToBuffer)
{ {
std::ostringstream buf; std::ostringstream buf;
osrm::util::json::render(buf, r); osrm::util::json::render(buf, json_result);
result = buf.str(); result = buf.str();
} }
else else
{ {
result = r; result = json_result;
} }
} }
catch (const std::exception &e) catch (const std::exception &e)
@ -230,8 +232,10 @@ inline void asyncForTiles(const Nan::FunctionCallbackInfo<v8::Value> &info,
void Execute() override try void Execute() override try
{ {
result = std::string();
const auto status = ((*osrm).*(service))(*params, result); const auto status = ((*osrm).*(service))(*params, result);
ParseResult(status, result); auto str_result = result.get<std::string>();
ParseResult(status, str_result);
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {
@ -243,7 +247,8 @@ inline void asyncForTiles(const Nan::FunctionCallbackInfo<v8::Value> &info,
Nan::HandleScope scope; Nan::HandleScope scope;
const constexpr auto argc = 2u; const constexpr auto argc = 2u;
v8::Local<v8::Value> argv[argc] = {Nan::Null(), render(result)}; auto str_result = result.get<std::string>();
v8::Local<v8::Value> argv[argc] = {Nan::Null(), render(str_result)};
callback->Call(argc, argv); callback->Call(argc, argv);
} }
@ -254,7 +259,7 @@ inline void asyncForTiles(const Nan::FunctionCallbackInfo<v8::Value> &info,
const ParamPtr params; const ParamPtr params;
const PluginParameters pluginParams; const PluginParameters pluginParams;
std::string result; osrm::engine::api::ResultT result;
}; };
auto *callback = new Nan::Callback{info[info.Length() - 1].As<v8::Function>()}; auto *callback = new Nan::Callback{info[info.Length() - 1].As<v8::Function>()};