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

Implement NodeJS based server fully replicating osrm-routed

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-10-29 13:24:48 +02:00
parent 4dfae26be7
commit ddde7e1ea6
7 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/nodejs/node_osrm_support.hpp
View File

@ -88,7 +88,6 @@ inline void ParseResult(const osrm::Status &result_status, osrm::json::Object &r
throw std::logic_error(code_iter->second.get<osrm::json::String>().value.c_str()); throw std::logic_error(code_iter->second.get<osrm::json::String>().value.c_str());
} }
result.values.erase(code_iter);
const auto message_iter = result.values.find("message"); const auto message_iter = result.values.find("message");
if (message_iter != end_iter) if (message_iter != end_iter)
{ {

10
routed-js/OSRMWrapper.js
View File

@ -15,19 +15,19 @@ class OSRMWrapper {
return util_1.default.promisify(this.osrm.tile.bind(this.osrm))(zxy); return util_1.default.promisify(this.osrm.tile.bind(this.osrm))(zxy);
} }
async route(options) { async route(options) {
return util_1.default.promisify(this.osrm.route.bind(this.osrm))(options); return util_1.default.promisify(this.osrm.route.bind(this.osrm))(options, { format: 'buffer' });
} }
async nearest(options) { async nearest(options) {
return util_1.default.promisify(this.osrm.nearest.bind(this.osrm))(options); return util_1.default.promisify(this.osrm.nearest.bind(this.osrm))(options, { format: 'buffer' });
} }
async table(options) { async table(options) {
return util_1.default.promisify(this.osrm.table.bind(this.osrm))(options); return util_1.default.promisify(this.osrm.table.bind(this.osrm))(options, { format: 'buffer' });
} }
async trip(options) { async trip(options) {
return util_1.default.promisify(this.osrm.trip.bind(this.osrm))(options); return util_1.default.promisify(this.osrm.trip.bind(this.osrm))(options, { format: 'buffer' });
} }
async match(options) { async match(options) {
return util_1.default.promisify(this.osrm.match.bind(this.osrm))(options); return util_1.default.promisify(this.osrm.match.bind(this.osrm))(options, { format: 'buffer' });
} }
} }
exports.OSRMWrapper = OSRMWrapper; exports.OSRMWrapper = OSRMWrapper;

10
routed-js/OSRMWrapper.ts
View File

@ -15,22 +15,22 @@ export class OSRMWrapper {
} }
async route(options: any): Promise<any> { async route(options: any): Promise<any> {
return util.promisify(this.osrm.route.bind(this.osrm))(options); return util.promisify(this.osrm.route.bind(this.osrm))(options, {format: 'buffer'});
} }
async nearest(options: any): Promise<any> { async nearest(options: any): Promise<any> {
return util.promisify(this.osrm.nearest.bind(this.osrm))(options); return util.promisify(this.osrm.nearest.bind(this.osrm))(options, {format: 'buffer'});
} }
async table(options: any): Promise<any> { async table(options: any): Promise<any> {
return util.promisify(this.osrm.table.bind(this.osrm))(options); return util.promisify(this.osrm.table.bind(this.osrm))(options, {format: 'buffer'});
} }
async trip(options: any): Promise<any> { async trip(options: any): Promise<any> {
return util.promisify(this.osrm.trip.bind(this.osrm))(options); return util.promisify(this.osrm.trip.bind(this.osrm))(options, {format: 'buffer'});
} }
async match(options: any): Promise<any> { async match(options: any): Promise<any> {
return util.promisify(this.osrm.match.bind(this.osrm))(options); return util.promisify(this.osrm.match.bind(this.osrm))(options, {format: 'buffer'});
} }
} }

1
routed-js/RouteServiceHandler.js
View File

@ -13,7 +13,6 @@ class RouteServiceHandler extends ServiceHandler_1.ServiceHandler {
if (query.waypoints) { if (query.waypoints) {
options.waypoints = query.waypoints; options.waypoints = query.waypoints;
} }
// throw Error(JSON.stringify(options));
return options; return options;
} }
async callOSRM(options) { async callOSRM(options) {

2
routed-js/RouteServiceHandler.ts
View File

@ -10,11 +10,9 @@ export class RouteServiceHandler extends ServiceHandler {
if (query.approaches) { if (query.approaches) {
options.approaches = query.approaches; options.approaches = query.approaches;
} }
if (query.waypoints) { if (query.waypoints) {
options.waypoints = query.waypoints; options.waypoints = query.waypoints;
} }
// throw Error(JSON.stringify(options));
return options; return options;
} }

2
routed-js/routed.js
View File

@ -107,7 +107,7 @@ async function main() {
break; break;
} }
const result = await handler.handle(coordinates, query, format); const result = await handler.handle(coordinates, query, format);
result['code'] = 'Ok'; // result['code'] = 'Ok';
return result; return result;
} }
catch (e) { catch (e) {

4
routed-js/routed.ts
View File

@ -92,9 +92,7 @@ async function main() {
break; break;
} }
const result = await handler.handle(coordinates, query, format); return handler.handle(coordinates, query, format);
result['code'] = 'Ok';
return result;
} catch (e: any) { } catch (e: any) {
reply.code(400); reply.code(400);