wip

SiarheiFedartsou · SiarheiFedartsou · commit 64f7bee92418 · 2022-10-21T09:35:58.000+02:00
diff --git a/scripts/ci/build_arm64.sh b/scripts/ci/build_arm64.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e pipefail
+
diff --git a/server/Format.js b/server/Format.js
@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Format = void 0;
+var Format;
+(function (Format) {
+    Format["Json"] = "json";
+    Format["Flatbuffers"] = "flatbuffers";
+})(Format = exports.Format || (exports.Format = {}));
diff --git a/server/Format.ts b/server/Format.ts
@@ -0,0 +1,4 @@
+export enum Format {
+    Json = 'json',
+    Flatbuffers = 'flatbuffers'
+  }
diff --git a/server/MatchServiceHandler.js b/server/MatchServiceHandler.js
@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MatchServiceHandler = void 0;
+const ServiceHandler_1 = require("./ServiceHandler");
+class MatchServiceHandler extends ServiceHandler_1.ServiceHandler {
+    buildServiceOptions(options, query) {
+        if (query.timestamps) {
+            options.timestamps = query.timestamps;
+        }
+        if (query.waypoints) {
+            options.waypoints = query.waypoints;
+        }
+        if (query.gaps) {
+            options.gaps = query.gaps;
+        }
+        if (query.tidy) {
+            options.tidy = query.tidy;
+        }
+        return options;
+    }
+    async callOSRM(options) {
+        return this.osrm.match(options);
+    }
+}
+exports.MatchServiceHandler = MatchServiceHandler;
diff --git a/server/MatchServiceHandler.ts b/server/MatchServiceHandler.ts
@@ -0,0 +1,27 @@
+import {ServiceHandler} from "./ServiceHandler";
+
+export class MatchServiceHandler extends ServiceHandler {
+    protected buildServiceOptions(options: any, query: any): any {
+      
+    if (query.timestamps) {
+      options.timestamps = query.timestamps;
+    }
+  
+    if (query.waypoints) {
+      options.waypoints = query.waypoints;
+    }
+    
+    if (query.gaps) {
+      options.gaps = query.gaps;
+    }
+  
+    if (query.tidy) {
+      options.tidy = query.tidy;
+    }
+      return options;
+    }
+  
+    protected async callOSRM(options: any): Promise<any> {
+      return this.osrm.match(options);
+    }
+  }
diff --git a/server/NearestServiceHandler.js b/server/NearestServiceHandler.js
@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NearestServiceHandler = void 0;
+const ServiceHandler_1 = require("./ServiceHandler");
+class NearestServiceHandler extends ServiceHandler_1.ServiceHandler {
+    buildServiceOptions(options, query) {
+        if (query.number !== undefined) {
+            options.number = query.number;
+        }
+        return options;
+    }
+    async callOSRM(options) {
+        return this.osrm.nearest(options);
+    }
+}
+exports.NearestServiceHandler = NearestServiceHandler;
diff --git a/server/NearestServiceHandler.ts b/server/NearestServiceHandler.ts
@@ -0,0 +1,14 @@
+import {ServiceHandler} from "./ServiceHandler";
+
+export class NearestServiceHandler extends ServiceHandler {
+    protected buildServiceOptions(options: any, query: any): any {
+      if (query.number !== undefined) {
+        options.number = query.number;
+      }
+      return options;
+    }
+  
+    protected async callOSRM(options: any): Promise<any> {
+      return this.osrm.nearest(options);
+    }
+  }
diff --git a/server/OSRMWrapper.js b/server/OSRMWrapper.js
@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OSRMWrapper = void 0;
+const util = require('util');
+const OSRM = require('../lib/index.js');
+class OSRMWrapper {
+    constructor(osrmOptions) {
+        this.osrm = new OSRM(osrmOptions);
+    }
+    async tile(zxy) {
+        return util.promisify(this.osrm.tile.bind(this.osrm))(zxy);
+    }
+    async route(options) {
+        return util.promisify(this.osrm.route.bind(this.osrm))(options);
+    }
+    async nearest(options) {
+        return util.promisify(this.osrm.nearest.bind(this.osrm))(options);
+    }
+    async table(options) {
+        return util.promisify(this.osrm.table.bind(this.osrm))(options);
+    }
+    async trip(options) {
+        return util.promisify(this.osrm.trip.bind(this.osrm))(options);
+    }
+    async match(options) {
+        return util.promisify(this.osrm.match.bind(this.osrm))(options);
+    }
+}
+exports.OSRMWrapper = OSRMWrapper;
diff --git a/server/OSRMWrapper.ts b/server/OSRMWrapper.ts
@@ -0,0 +1,34 @@
+const util = require('util');
+const OSRM = require('../lib/index.js')
+
+export class OSRMWrapper {
+    private readonly osrm: typeof OSRM;
+
+    constructor(osrmOptions: any) {
+        this.osrm = new OSRM(osrmOptions);
+    }
+  
+    async tile(zxy: [number, number, number]): Promise<any> {
+      return util.promisify(this.osrm.tile.bind(this.osrm))(zxy);
+    }
+  
+    async route(options: any): Promise<any> {
+      return util.promisify(this.osrm.route.bind(this.osrm))(options);
+    }
+  
+    async nearest(options: any): Promise<any> {
+      return util.promisify(this.osrm.nearest.bind(this.osrm))(options);
+    }
+  
+    async table(options: any): Promise<any> {
+      return util.promisify(this.osrm.table.bind(this.osrm))(options);
+    }
+  
+    async trip(options: any): Promise<any> {
+      return util.promisify(this.osrm.trip.bind(this.osrm))(options);
+    }
+  
+    async match(options: any): Promise<any> {
+      return util.promisify(this.osrm.match.bind(this.osrm))(options);
+    }
+  }
diff --git a/server/RouteServiceHandler.js b/server/RouteServiceHandler.js
@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteServiceHandler = void 0;
+const ServiceHandler_1 = require("./ServiceHandler");
+class RouteServiceHandler extends ServiceHandler_1.ServiceHandler {
+    buildServiceOptions(options, query) {
+        if (query.alternatives) {
+            options.alternatives = query.alternatives;
+        }
+        if (query.approaches) {
+            options.approaches = query.approaches;
+        }
+        if (query.waypoints) {
+            options.waypoints = query.waypoints;
+        }
+        return options;
+    }
+    async callOSRM(options) {
+        return this.osrm.route(options);
+    }
+}
+exports.RouteServiceHandler = RouteServiceHandler;
diff --git a/server/RouteServiceHandler.ts b/server/RouteServiceHandler.ts
@@ -0,0 +1,24 @@
+
+import {ServiceHandler} from "./ServiceHandler";
+
+export class RouteServiceHandler extends ServiceHandler {
+    protected buildServiceOptions(options: any, query: any): any {
+      
+      if (query.alternatives) {
+        options.alternatives = query.alternatives;
+      }
+      if (query.approaches) {
+        options.approaches = query.approaches;
+      }
+    
+      if (query.waypoints) {
+        options.waypoints = query.waypoints;
+      }
+      return options;
+    }
+  
+  
+    protected async callOSRM(options: any): Promise<any> {
+      return this.osrm.route(options);
+    }
+  }
diff --git a/server/ServiceHandler.js b/server/ServiceHandler.js
@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceHandler = void 0;
+class ServiceHandler {
+    constructor(osrm) {
+        this.osrm = osrm;
+    }
+    async handle(coordinates, query, format) {
+        const options = this.build(coordinates, query, format);
+        return this.callOSRM(options);
+    }
+    build(coordinates, query, format) {
+        const options = this.buildBaseOptions(coordinates, query, format);
+        return this.buildServiceOptions(options, query);
+    }
+    buildBaseOptions(coordinates, query, format) {
+        const options = {
+            coordinates: coordinates
+        };
+        this.handleCommonParams(query, options, format);
+        return options;
+    }
+    handleCommonParams(query, options, format) {
+        options.format = format;
+        if (query.overview) {
+            options.overview = query.overview;
+        }
+        if (query.geometries) {
+            options.geometries = query.geometries;
+        }
+        if (query.steps) {
+            options.steps = query.steps;
+        }
+        if (query.annotations) {
+            let annotations;
+            if (query.annotations === 'true') {
+                annotations = true;
+            }
+            else if (typeof query.annotations === 'string') {
+                annotations = query.annotations.split(',');
+            }
+            options.annotations = annotations;
+        }
+        if (query.exclude) {
+            options.exclude = query.exclude;
+        }
+        if (query.snapping) {
+            options.snapping = query.snapping;
+        }
+        if (query.radiuses) {
+            options.radiuses = query.radiuses.map((r) => {
+                if (r === 'unlimited') {
+                    return null;
+                }
+                return r;
+            });
+        }
+        if (query.bearings) {
+            options.bearings = query.bearings;
+        }
+        if (query.hints) {
+            options.hints = query.hints;
+        }
+        if (query.generate_hints) {
+            options.generate_hints = query.generate_hints;
+        }
+        if (query.skip_waypoints) {
+            options.skip_waypoints = query.skip_waypoints;
+        }
+        if (query.continue_straight) {
+            options.continue_straight = query.continue_straight === 'true';
+        }
+    }
+}
+exports.ServiceHandler = ServiceHandler;
diff --git a/server/ServiceHandler.ts b/server/ServiceHandler.ts
@@ -0,0 +1,96 @@
+
+import {Format} from "./Format";
+import {OSRMWrapper} from "./OSRMWrapper";
+
+
+  
+  export abstract class ServiceHandler {
+    public constructor(protected readonly osrm: OSRMWrapper) {}
+    public async handle(coordinates: [number, number][], query: any, format: Format): Promise<any> {
+      const options = this.build(coordinates, query, format);
+      return this.callOSRM(options);
+    }
+  
+    
+  
+    private build(coordinates: [number, number][], query: any, format: Format): any {
+      const options = this.buildBaseOptions(coordinates, query, format);
+      return this.buildServiceOptions(options, query); 
+    }
+  
+    protected abstract buildServiceOptions(options: any, query: any): any;
+    protected abstract callOSRM(options: any): Promise<any>;
+  
+    private buildBaseOptions(coordinates: [number, number][], query: any, format: Format): any {
+      const options: any = {
+        coordinates: coordinates
+      };
+      this.handleCommonParams(query, options, format);
+      return options;
+    }
+
+    private handleCommonParams(query: any, options: any, format: Format) {
+        options.format = format;
+      
+        if (query.overview) {
+          options.overview = query.overview;
+        }
+      
+        if (query.geometries) {
+          options.geometries = query.geometries;
+        }
+      
+        if (query.steps) {
+          options.steps = query.steps;
+        }
+      
+      
+        if (query.annotations) {
+          let annotations;
+          if (query.annotations === 'true') {
+            annotations = true;
+          } else if (typeof query.annotations === 'string') {
+            annotations = query.annotations.split(',');
+          }
+          options.annotations = annotations;
+        }
+      
+        if (query.exclude) {
+          options.exclude = query.exclude;
+        }
+      
+        if (query.snapping) {
+          options.snapping = query.snapping;
+        }
+      
+        if (query.radiuses) {
+          options.radiuses = query.radiuses.map((r: string | 'unlimited') => {
+            if (r === 'unlimited') {
+              return null;
+            }
+            return r;
+          });
+        }
+      
+        if (query.bearings) {
+          options.bearings = query.bearings;
+        }
+      
+        if (query.hints) {
+          options.hints = query.hints;
+        }
+      
+        if (query.generate_hints) {
+          options.generate_hints = query.generate_hints;
+        }
+      
+        if (query.skip_waypoints) {
+          options.skip_waypoints = query.skip_waypoints;
+        }
+      
+        if (query.continue_straight) {
+          options.continue_straight = query.continue_straight === 'true';
+        }
+      }
+  }
+  
diff --git a/server/TableServiceHandler.js b/server/TableServiceHandler.js
diff --git a/server/TableServiceHandler.ts b/server/TableServiceHandler.ts
diff --git a/server/TripServiceHandler.js b/server/TripServiceHandler.js
diff --git a/server/TripServiceHandler.ts b/server/TripServiceHandler.ts
diff --git a/server/server.js b/server/server.js
diff --git a/server/server.ts b/server/server.ts
