From 22370eefe7f8db2090798e9b5e6fbbee5bbb0e57 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 22 Oct 2022 23:28:41 +0200 Subject: [PATCH] save --- features/options/routed/help.feature | 4 ++++ features/testbot/load.feature | 1 + features/testbot/status.feature | 1 + routed-js/RouteServiceHandler.js | 1 + routed-js/RouteServiceHandler.ts | 1 + routed-js/ServiceHandler.js | 2 +- routed-js/ServiceHandler.ts | 2 +- 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/features/options/routed/help.feature b/features/options/routed/help.feature index a581be3fed4..7671812a461 100644 --- a/features/options/routed/help.feature +++ b/features/options/routed/help.feature @@ -4,6 +4,7 @@ Feature: osrm-routed command line options: help Background: Given the profile "testbot" + @skip_on_routed_js Scenario: osrm-routed - Help should be shown when no options are passed When I run "osrm-routed" Then stderr should be empty @@ -24,6 +25,7 @@ Feature: osrm-routed command line options: help And stdout should contain "--max-matching-size" And it should exit successfully + @skip_on_routed_js Scenario: osrm-routed - Help, short When I run "osrm-routed -h" Then stderr should be empty @@ -44,6 +46,8 @@ Feature: osrm-routed command line options: help And stdout should contain "--max-matching-size" And it should exit successfully + + @skip_on_routed_js Scenario: osrm-routed - Help, long When I run "osrm-routed --help" Then stderr should be empty diff --git a/features/testbot/load.feature b/features/testbot/load.feature index f195e8b35b7..31fd1af15a2 100644 --- a/features/testbot/load.feature +++ b/features/testbot/load.feature @@ -32,6 +32,7 @@ Feature: Ways of loading data Then stderr should be empty And it should exit successfully + @skip_on_routed_js Scenario: osrm-datastore - Fail if no shared memory blocks are loaded When I run "osrm-datastore --spring-clean" with input "Y" And I try to run "osrm-routed --shared-memory=1" diff --git a/features/testbot/status.feature b/features/testbot/status.feature index 6320924e650..941198bb3ce 100644 --- a/features/testbot/status.feature +++ b/features/testbot/status.feature @@ -39,6 +39,7 @@ Feature: Status messages | a | c | | 400 | Impossible route between points | | b | d | | 400 | Impossible route between points | + @skip_on_routed_js Scenario: Malformed requests Given the node locations | node | lat | lon | diff --git a/routed-js/RouteServiceHandler.js b/routed-js/RouteServiceHandler.js index 4489021c32c..d941e7462cb 100644 --- a/routed-js/RouteServiceHandler.js +++ b/routed-js/RouteServiceHandler.js @@ -13,6 +13,7 @@ class RouteServiceHandler extends ServiceHandler_1.ServiceHandler { if (query.waypoints) { options.waypoints = query.waypoints; } + // throw Error(JSON.stringify(options)); return options; } async callOSRM(options) { diff --git a/routed-js/RouteServiceHandler.ts b/routed-js/RouteServiceHandler.ts index 12ac2933a18..2c54392ec65 100644 --- a/routed-js/RouteServiceHandler.ts +++ b/routed-js/RouteServiceHandler.ts @@ -14,6 +14,7 @@ export class RouteServiceHandler extends ServiceHandler { if (query.waypoints) { options.waypoints = query.waypoints; } + // throw Error(JSON.stringify(options)); return options; } diff --git a/routed-js/ServiceHandler.js b/routed-js/ServiceHandler.js index 8ef9752d8aa..32a510ebecf 100644 --- a/routed-js/ServiceHandler.js +++ b/routed-js/ServiceHandler.js @@ -67,7 +67,7 @@ class ServiceHandler { options.skip_waypoints = query.skip_waypoints; } if (query.continue_straight) { - options.continue_straight = query.continue_straight === 'true'; + options.continue_straight = ['default', 'true'].includes(query.continue_straight); } } } diff --git a/routed-js/ServiceHandler.ts b/routed-js/ServiceHandler.ts index f6b8d893dda..91f44e5146b 100644 --- a/routed-js/ServiceHandler.ts +++ b/routed-js/ServiceHandler.ts @@ -88,7 +88,7 @@ export abstract class ServiceHandler { } if (query.continue_straight) { - options.continue_straight = query.continue_straight === 'true'; + options.continue_straight = ['default', 'true'].includes(query.continue_straight); } } }