From 768c33127a2bdd2dd517943d6a3e707249e0a819 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sun, 23 Oct 2022 14:26:10 +0200 Subject: [PATCH] Implement NodeJS based server fully replicating osrm-routed --- routed-js/schema.js | 16 ++++++++++++---- routed-js/schema.ts | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/routed-js/schema.js b/routed-js/schema.js index 21d4a6ab9..f1c0e9891 100644 --- a/routed-js/schema.js +++ b/routed-js/schema.js @@ -40,10 +40,15 @@ const queryStringJsonSchemaGeneral = { radiuses: { type: 'array', items: { - type: ['number', 'string'], - oneOf: [ - { exclusiveMinimum: 0 }, - { enum: ['unlimited'] } + anyOf: [ + { + type: 'number', + exclusiveMinimum: 0 + }, + { + type: 'string', + enum: ['unlimited'] + } ] } }, @@ -277,6 +282,9 @@ function parseQueryString(queryString) { if ('timestamps' in parsed) { parsed['timestamps'] = parseArray(parsed['timestamps'], ';'); } + if ('radiuses' in parsed) { + parsed['radiuses'] = parseArray(parsed['radiuses'], ';'); + } if ('approaches' in parsed) { parsed['approaches'] = parseArray(parsed['approaches'], ';'); } diff --git a/routed-js/schema.ts b/routed-js/schema.ts index a04a573f4..908bb7416 100644 --- a/routed-js/schema.ts +++ b/routed-js/schema.ts @@ -36,10 +36,15 @@ const queryStringJsonSchemaGeneral = { radiuses: { type: 'array', items: { - type: ['number', 'string'], - oneOf: [ - { exclusiveMinimum: 0 }, - { enum: ['unlimited'] } + anyOf: [ + { + type: 'number', + exclusiveMinimum: 0 + }, + { + type: 'string', + enum: ['unlimited'] + } ] } }, @@ -295,6 +300,9 @@ export function parseQueryString(queryString: string): any { if ('timestamps' in parsed) { parsed['timestamps'] = parseArray(parsed['timestamps'], ';'); } + if ('radiuses' in parsed) { + parsed['radiuses'] = parseArray(parsed['radiuses'], ';'); + } if ('approaches' in parsed) { parsed['approaches'] = parseArray(parsed['approaches'], ';'); }