@wemap/routers 12.0.0-alpha.11 → 12.0.0-alpha.13

package/index.ts

@@ -1,6 +1,6 @@
 
 /* Model */
-export { type RouterRequest } from './src/model/RouterRequest.js';
+export { type RouterRequest, routerRequestToJson } from './src/model/RouterRequest.js';
 export { default as Itinerary, type ItineraryJson } from './src/model/Itinerary.js';
 export { default as Leg, type LegJson, type DestinationJson, type TransportInfo } from './src/model/Leg.js';
 export type { Step, MinStepInfo, StepJson } from './src/model/Step.js';

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "12.0.0-alpha.11",
+    "version": "12.0.0-alpha.13",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -37,7 +37,7 @@
         "@wemap/geo": "^12.0.0-alpha.11",
         "@wemap/logger": "^12.0.0-alpha.0",
         "@wemap/maths": "^11.0.1",
-        "@wemap/osm": "^12.0.0-alpha.11",
+        "@wemap/osm": "^12.0.0-alpha.13",
         "@wemap/salesman.js": "^2.1.0"
     },
     "devDependencies": {
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "ba3049786a9c40313adee6ce098a8aff2be81fd9"
+    "gitHead": "d96b3c94a650a0d67a1706ac3c71d5c571f75ac0"
 }

package/src/model/Itinerary.ts

@@ -20,6 +20,7 @@ export type ItineraryJson = {
     transitMode: TransitMode,
     origin: CoordinatesJson,
     destination: CoordinatesJson,
+    distance: number,
     duration: number,
     legs: LegJson[]
 } & ItineraryCommon;
@@ -229,6 +230,7 @@ export default class Itinerary {
         return {
             origin: this.origin.toJson(),
             destination: this.destination.toJson(),
+            distance: Number(this.distance.toFixed(1)),
             duration: Number(this.duration.toFixed(1)),
             transitMode: this.transitMode,
             legs: this.legs.map(leg => leg.toJson()),

package/src/model/Leg.ts

@@ -54,6 +54,7 @@ export type LegJson = {
     end: DestinationJson,
     coords: CoordinatesCompressedJson[],
     steps: StepJson[],
+    distance: number,
     duration: number
 } & LegCommon;
 
@@ -167,6 +168,7 @@ export default class Leg {
                 coords: this.end.coords.toCompressedJson(),
                 ...(this.end.name && { name: this.end.name }),
             },
+            distance: Number(this.distance.toFixed(1)),
             duration: Number(this.duration.toFixed(1)),
             coords: this.coords.map(coords => coords.toCompressedJson()),
             steps: this.steps.map(stepToJson),

package/src/model/RouterRequest.ts

@@ -20,4 +20,14 @@ export type RouterRequest = {
     output?: {
         distanceAndDurationOnly?: boolean
     }
+}
+
+export function routerRequestToJson(routerRequest: RouterRequest) {
+    const { origin, destination, waypoints, ...rest } = routerRequest;
+    return {
+        origin: origin.toJson(),
+        destination: destination.toJson(),
+        ...(waypoints && { waypoints: waypoints.map(w => w.toJson()) }),
+        ...rest
+    }
 }

package/src/types.ts

@@ -6,7 +6,6 @@ export type GraphVertexJson = CoordinatesCompressedJson;
 export type GeoGraphJson = {
     vertices: GraphVertexJson[],
     edges: (
-        [number, number] |
         [number, number] |
         [number, number, EdgeProperties]
     )[]

package/src/wemap-osm/OsmGraphUtils.ts

@@ -22,7 +22,7 @@ export default class OsmGraphUtils {
 
     static parseNodeProperties(osmNode: OsmNode): VertexProperties {
         return {
-            ...(osmNode.name !== null && { name: osmNode.name }),
+            ...(osmNode.name && { name: osmNode.name }),
             ...(osmNode.isGate && { isGate: osmNode.isGate }),
             ...(osmNode.isSubwayEntrance && { isSubwayEntrance: osmNode.isSubwayEntrance }),
             ...(osmNode.subwayEntranceRef && { subwayEntrsanceRef: osmNode.subwayEntranceRef })
@@ -31,7 +31,7 @@ export default class OsmGraphUtils {
 
     static parseWayProperties(osmWay: OsmWay): EdgeProperties {
         return {
-            ...(osmWay.name !== null && { name: osmWay.name }),
+            ...(osmWay.name && { name: osmWay.name }),
             ...(osmWay.isOneway && { isOneway: osmWay.isOneway }),
             ...(osmWay.areStairs && { areStairs: osmWay.areStairs }),
             ...(osmWay.isElevator && { isElevator: osmWay.isElevator }),