@wemap/routers 10.4.0 → 10.5.1

package/index.d.ts

@@ -1,4 +1,5 @@
-import { Coordinates, GraphProjection, Network } from '@wemap/geo';
+import { Coordinates, GraphEdge, GraphNode, GraphProjection, GraphRouter, Network } from '@wemap/geo';
+import { OsmElement } from '@wemap/osm';
 
 declare module '@wemap/routers' {
 
@@ -53,7 +54,7 @@ declare module '@wemap/routers' {
 
         isPublicTransport(): boolean;
         equals(obj: Leg): boolean;
-        toNetwork(): Network;
+        toNetwork(): Network<null>;
         toJson(): object;
 
         static equals(obj1: Leg, obj2: Leg): boolean;
@@ -74,13 +75,13 @@ declare module '@wemap/routers' {
         get mode(): ItineraryMode;
 
         equals(obj: Itinerary): boolean;
-        toNetwork(): Network;
+        toNetwork(): Network<null>;
         toJson(): object;
 
         static equals(obj1: Itinerary, obj2: Itinerary): boolean;
         static fromItineraries(...itineraries: Itinerary[]): Itinerary;
         static fromOrderedPointsArray(points: number[][], from: Coordinates, to: Coordinates): Itinerary;
-        static fromOrderedCoordinates(points: Coordinates[], from: Coordinates, to: Coordinates, mode: ItineraryMode = 'WALK'): Itinerary;
+        static fromOrderedCoordinates(points: Coordinates[], from: Coordinates, to: Coordinates, mode?: ItineraryMode): Itinerary;
         static fromJson(json: object): Itinerary;
     }
 
@@ -98,10 +99,10 @@ declare module '@wemap/routers' {
         static fromJson(json: object): RouterResponse;
     }
 
-    export class ItineraryInfo {
+    export class ItineraryInfo<T> {
         nextStep: Step;
         previousStep: Step;
-        projection: GraphProjection;
+        projection: GraphProjection<T>;
         leg: Leg;
         traveledDistance: number;
         traveledPercentage: number;
@@ -109,12 +110,56 @@ declare module '@wemap/routers' {
         remainingPercentage: number;
     }
 
-    export class ItineraryInfoManager {
+    export class ItineraryInfoManager<T> {
         set itinerary(itinerary: Itinerary);
-        getInfo(position: Coordinates): ItineraryInfo | null;
+        getInfo(position: Coordinates): ItineraryInfo<T> | null;
     }
 
-    export function getDurationFromLength(length: number, speed: number = 5): number;
+    export class WemapRouterOptions {
+        static DEFAULT: WemapRouterOptions;
+        static get WITHOUT_STAIRS(): WemapRouterOptions;
+        static getDurationFromLength(length: number, speed?: number): number;
+
+        weightEdgeFn: (edge: GraphEdge<OsmElement>) => boolean;
+    }
+
+    export class WemapMetaRouterIOMap {
+        name: string | null;
+        network: Network<OsmElement>;
+        router: GraphRouter<OsmElement>;
+        bounds: [number, number][];
+        entryPoints: GraphNode<OsmElement>;
+        disabledWays: Set<number>;
+
+        constructor(
+            network: Network<OsmElement>,
+            entryPoints: GraphNode<OsmElement>[],
+            bounds?: Coordinates[] | null,
+            name?: string | null
+        );
+
+        disableWay(osmId: number): void;
+        enableWay(osmId: number): void;
+        getOrderedEntryPointsSortedByDistance(
+            start: Coordinates, end: Coordinates
+        ): GraphNode<OsmElement>[];
+        getBestItineraryFromEntryPointsToEnd(
+            start: Coordinates, end: Coordinates,
+            options: WemapRouterOptions
+        ): Itinerary[];
+        getBestItineraryFromStartToEntryPoints(
+            start: Coordinates, end: Coordinates,
+            options: WemapRouterOptions
+        ): Itinerary[];
+        getItineraryInsideMap(start: Coordinates, end: Coordinates,
+            options: WemapRouterOptions
+        ): Itinerary[] | null;
+        isPointInside(coordinates: Coordinates): boolean;
+
+        static fromOsmXml(osmXmlString: string, name?: string | null): WemapMetaRouterIOMap;
+    }
+
+    export function getDurationFromLength(length: number, speed?: number): number;
     export function multiplyLegLevel(leg: Leg, levelFactor: number): void;
     export function multiplyItineraryLevel(itinerary: Itinerary, levelFactor: number): void;
     export function multiplyRouterResponseLevel(routerResponse: RouterResponse, levelFactor: number): void;

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "10.4.0",
+    "version": "10.5.1",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -30,10 +30,10 @@
         "@turf/boolean-point-in-polygon": "^6.5.0",
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
-        "@wemap/geo": "^10.3.1",
+        "@wemap/geo": "^10.5.1",
         "@wemap/logger": "^10.0.0",
         "@wemap/maths": "^10.3.1",
-        "@wemap/osm": "^10.3.1"
+        "@wemap/osm": "^10.5.1"
     },
-    "gitHead": "00c259754b234de1d75a307f543badda8f6f0771"
+    "gitHead": "ce2d0e4a541b521098e5382bd665dc54805f1c27"
 }

package/src/wemap-meta/IOMap.js

@@ -3,7 +3,7 @@ import convexHullFn from '@turf/convex';
 import { polygon as turfPolygon } from '@turf/helpers';
 
 import { Coordinates, GraphNode, GraphRouter, Network, NoRouteFoundError } from '@wemap/geo';
-import { OsmParser, OsmNetworkUtils } from '@wemap/osm';
+import { OsmParser, OsmNetworkUtils, OsmElement } from '@wemap/osm';
 import { Itinerary, WemapRouterOptions, WemapRouterUtils } from '@wemap/routers';
 
 import Constants from '../Constants.js';
@@ -13,16 +13,22 @@ class IOMap {
     /** @type {?string} */
     name;
 
-    /** @type {!GraphRouter} */
+    /** @type {!Network<OsmElement>} */
+    network;
+
+    /** @type {!GraphRouter<OsmElement>} */
     router;
 
     /** @type {!([number, number][])} */
     bounds;
 
 
-    /** @type {!(GraphNode[])} */
+    /** @type {!(GraphNode<OsmElement>[])} */
     entryPoints;
 
+    /** @type {Set<number>} */
+    disabledWays = new Set();
+
     /**
      * @param {Network} network The network of the map
      * @param {GraphNode[]} entryPoints The map vertex that can be used to go inside / outside a IOMap
@@ -33,6 +39,7 @@ class IOMap {
     constructor(network, entryPoints, bounds = null, name = null) {
 
         this.name = name;
+        this.network = network;
         this.router = new GraphRouter(network);
 
         // Entry points
@@ -189,6 +196,20 @@ class IOMap {
         // Transform a network itinerary (nodes, edges...) to a router itinerary (legs, steps...)
         return WemapRouterUtils.createItineraryFromGraphItinerary(graphItinerary, Constants.ROUTING_MODE.WALK);
     }
+
+    enableWay(osmId) {
+        this.network.edges
+            .filter(edge => edge.builtFrom.id === osmId)
+            .forEach(e => this.router.disabledEdges.delete(e));
+        this.disabledWays.delete(osmId);
+    }
+
+    disableWay(osmId) {
+        this.network.edges
+            .filter(edge => edge.builtFrom.id === osmId)
+            .forEach(e => this.router.disabledEdges.add(e));
+        this.disabledWays.add(osmId);
+    }
 }
 
 export default IOMap;