wip

Author: SiarheiFedartsou

server/Format.ts

@@ -1,4 +1,4 @@
 export enum Format {
     Json = 'json',
     Flatbuffers = 'flatbuffers'
-  }
+}

server/ServiceHandler.js

@@ -31,15 +31,9 @@ class ServiceHandler {
         if (query.steps) {
             options.steps = query.steps;
         }
+        // TODO: annotations is per-service option
         if (query.annotations) {
-            let annotations;
-            if (query.annotations === 'true') {
-                annotations = true;
-            }
-            else if (typeof query.annotations === 'string') {
-                annotations = query.annotations.split(',');
-            }
-            options.annotations = annotations;
+            options.annotations = query.annotations;
         }
         if (query.exclude) {
             options.exclude = query.exclude;

server/ServiceHandler.ts

@@ -44,15 +44,9 @@ import {OSRMWrapper} from "./OSRMWrapper";
           options.steps = query.steps;
         }
 
-      
+        // TODO: annotations is per-service option
         if (query.annotations) {
-          let annotations;
-          if (query.annotations === 'true') {
-            annotations = true;
-          } else if (typeof query.annotations === 'string') {
-            annotations = query.annotations.split(',');
-          }
-          options.annotations = annotations;
+          options.annotations = query.annotations;
         }
 
         if (query.exclude) {

server/schema.js

@@ -2,6 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseQueryString = exports.tileSchema = exports.tripSchema = exports.matchSchema = exports.tableSchema = exports.nearestSchema = exports.routeSchema = void 0;
 const querystring = require('querystring');
+function makeAnnotationsSchema(allowedAnnotations) {
+    return {
+        oneOf: [
+            {
+                type: 'array',
+                items: {
+                    enum: allowedAnnotations
+                }
+            },
+            {
+                type: 'boolean'
+            }
+        ],
+        default: false
+    };
+}
 const queryStringJsonSchemaGeneral = {
     type: 'object',
     properties: {
@@ -18,10 +34,12 @@ const queryStringJsonSchemaGeneral = {
         },
         radiuses: {
             type: 'array',
-            oneOf: [
-                { type: 'number', exclusiveMinimum: 0 },
-                { enum: ['unlimited'] }
-            ]
+            items: {
+                oneOf: [
+                    { type: 'number', exclusiveMinimum: 0 },
+                    { enum: ['unlimited'] }
+                ]
+            }
         },
         generate_hints: { type: 'boolean', default: true },
         hints: {
@@ -50,16 +68,17 @@ const queryStringJsonSchemaGeneral = {
         skip_waypoints: { type: 'boolean', default: false },
     }
 };
+// annotations_type.add("duration", AnnotationsType::Duration)("nodes",
+// AnnotationsType::Nodes)(
+// "distance", AnnotationsType::Distance)("weight", AnnotationsType::Weight)(
+// "datasources", AnnotationsType::Datasources)("speed", AnnotationsType::Speed);
 const queryStringJsonSchemaRoute = {
     type: 'object',
     properties: {
         ...queryStringJsonSchemaGeneral.properties,
         alternatives: { type: ['boolean', 'integer'], default: false },
         steps: { type: 'boolean', default: false },
-        annotations: {
-            type: 'string',
-            // TODO: pattern
-        },
+        annotations: makeAnnotationsSchema(['duration', 'nodes', 'distance', 'weight', 'datasources', 'speed']),
         geometries: {
             enum: ['polyline', 'polyline6', 'geojson'],
             default: 'polyline'
@@ -120,8 +139,11 @@ const queryStringJsonSchemaTable = {
             ]
         },
         annotations: {
-            type: 'string',
-            // TODO: pattern
+            type: 'array',
+            items: {
+                enum: ['duration', 'distance'],
+                default: 'duration'
+            }
         },
         fallback_speed: {
             type: 'number',
@@ -167,6 +189,7 @@ const queryStringJsonSchemaMatch = {
                 type: 'integer'
             }
         },
+        annotations: makeAnnotationsSchema(['duration', 'nodes', 'distance', 'weight', 'datasources', 'speed'])
     }
 };
 const queryStringJsonSchemaTrip = {
@@ -182,10 +205,7 @@ const queryStringJsonSchemaTrip = {
             enum: ['any', 'last'],
             default: 'any'
         },
-        annotations: {
-            type: 'string',
-            // TODO: pattern
-        },
+        annotations: makeAnnotationsSchema(['duration', 'nodes', 'distance', 'weight', 'datasources', 'speed']),
         steps: { type: 'boolean', default: false },
         geometries: {
             enum: ['polyline', 'polyline6', 'geojson'],
@@ -258,6 +278,11 @@ function parseQueryString(queryString) {
     if ('bearings' in parsed) {
         parsed['bearings'] = parseArray(parsed['bearings'], ';').map(bearingWithRange => { parseArray(bearingWithRange, ','); });
     }
+    if ('annotations' in parsed) {
+        if (!['true', 'false'].includes(parsed['annotations'])) {
+            parsed['annotations'] = parseArray(parsed['annotations'], ',');
+        }
+    }
     return parsed;
 }
 exports.parseQueryString = parseQueryString;

server/schema.ts

@@ -1,5 +1,22 @@
 const querystring = require('querystring');
 
+function makeAnnotationsSchema(allowedAnnotations: string[]): any {
+    return {
+        oneOf: [
+            {
+                type: 'array',
+                items: {
+                    enum: allowedAnnotations
+                }
+            },
+            {
+                type: 'boolean'
+            }
+        ],
+        default: false
+    }
+}
+
 const queryStringJsonSchemaGeneral = {
     type: 'object',
     properties: {
@@ -16,10 +33,12 @@ const queryStringJsonSchemaGeneral = {
         },
         radiuses: {
             type: 'array',
-            oneOf: [
-                {type: 'number', exclusiveMinimum: 0},
-                {enum: ['unlimited']}
-            ]
+            items: {
+                oneOf: [
+                    {type: 'number', exclusiveMinimum: 0},
+                    {enum: ['unlimited']}
+                ]
+            }
         },
         generate_hints: { type: 'boolean', default: true },
         hints: {
@@ -49,16 +68,18 @@ const queryStringJsonSchemaGeneral = {
     }
 };
 
+// annotations_type.add("duration", AnnotationsType::Duration)("nodes",
+// AnnotationsType::Nodes)(
+// "distance", AnnotationsType::Distance)("weight", AnnotationsType::Weight)(
+// "datasources", AnnotationsType::Datasources)("speed", AnnotationsType::Speed);
+
 const queryStringJsonSchemaRoute = {
     type: 'object',
     properties: {
         ...queryStringJsonSchemaGeneral.properties,
         alternatives: { type: ['boolean', 'integer'], default: false },
         steps: { type: 'boolean', default: false },
-        annotations: {
-            type: 'string',
-            // TODO: pattern
-        },
+        annotations: makeAnnotationsSchema(['duration', 'nodes', 'distance', 'weight', 'datasources', 'speed']),
         geometries: {
             enum: ['polyline', 'polyline6', 'geojson'],
             default: 'polyline'
@@ -123,8 +144,11 @@ const queryStringJsonSchemaTable = {
 
         },
         annotations: {
-            type: 'string',
-            // TODO: pattern
+            type: 'array',
+            items: {
+                enum: ['duration', 'distance'],
+                default: 'duration'
+            }
         },
         fallback_speed: {
             type: 'number',
@@ -174,6 +198,7 @@ const queryStringJsonSchemaMatch = {
                 type: 'integer'
             }
         },
+        annotations: makeAnnotationsSchema(['duration', 'nodes', 'distance', 'weight', 'datasources', 'speed'])
     }
 }
 
@@ -191,10 +216,8 @@ const queryStringJsonSchemaTrip = {
             enum: ['any', 'last'],
             default: 'any'
         },
-        annotations: {
-            type: 'string',
-            // TODO: pattern
-        },
+        
+        annotations: makeAnnotationsSchema(['duration', 'nodes', 'distance', 'weight', 'datasources', 'speed']),
         steps: { type: 'boolean', default: false },
         geometries: {
             enum: ['polyline', 'polyline6', 'geojson'],
@@ -276,6 +299,11 @@ export function parseQueryString(queryString: string): any {
     if ('bearings' in parsed) {
         parsed['bearings'] = parseArray(parsed['bearings'], ';').map(bearingWithRange => { parseArray(bearingWithRange, ',') });
     }
+    if ('annotations' in parsed) {
+        if (!['true', 'false'].includes(parsed['annotations'])) {
+            parsed['annotations'] = parseArray(parsed['annotations'], ',');
+        }
+    }
 
     return parsed;
 }

server/server.js

@@ -35,7 +35,6 @@ async function main() {
         .alias('h', 'help')
         .argv;
     if (argv.version) {
-        console.log(argv.max_viaroute_size);
         // TODO: print real version
         process.stdout.write('v5.27.0\n');
         return;