@wemap/routers 12.11.6 → 12.12.0

package/dist/src/graph/Graph.d.ts

@@ -1,3 +1,4 @@
+import { MultiPolygon } from 'geojson';
 import { BoundingBox, Coordinates, UserPosition, Level_t } from '@wemap/geo';
 import { default as Edge } from './Edge.js';
 import { default as GraphProjection } from './GraphProjection.js';
@@ -7,6 +8,8 @@ import { GraphProjectionOptions } from './GraphProjectionOptions.js';
 declare class Graph {
     readonly vertices: Vertex[];
     readonly edges: Edge[];
+    readonly routingBounds: MultiPolygon | null;
+    readonly routingBoundsEntryPoints: Vertex[];
     /**
      * exitVertices are vertices that have at least one indoor edge and one outdoor edge
      * They are stored because the Level model cannot handle an indoor and outdoor state like [null, 1] or [null, [1,2]]
@@ -15,12 +18,14 @@ declare class Graph {
      * - if projection origin is not null, the intersection level with an exit vertex can be used
      */
     readonly exitVertices: Set<Vertex>;
-    constructor(vertices: Vertex[], edges: Edge[]);
+    constructor(vertices: Vertex[], edges: Edge[], routingBounds?: MultiPolygon | null, routingBoundsEntryPoints?: Vertex[]);
     getEdgeByVertices(vertex1: Vertex, vertex2: Vertex): Edge | undefined;
     getVertexByCoords(coords: Coordinates): Vertex | undefined;
     static getVertexByCoords(vertices: Vertex[], coords: Coordinates): Vertex | undefined;
     getVertexByName(name: string): Vertex | undefined;
+    getVerticesByName(name: string): Vertex[];
     getEdgeByName(name: string): Edge | undefined;
+    getEdgesByName(name: string): Edge[];
     getBoundingBox(extendedMeasure?: number): BoundingBox | null;
     getProjection<U extends (Coordinates | UserPosition)>(origin: U, options?: GraphProjectionOptions): GraphProjection<U> | null;
     toJson(): GeoGraphJson;

package/dist/src/graph/Vertex.d.ts

@@ -15,5 +15,11 @@ export default class Vertex {
     distanceTo(other: Vertex): number;
     bearingTo(other: Vertex): number;
     toJson(): GraphVertexJson;
+    /**
+     * Check if two vertices are equal. It only checks the coordinates (not the properties)
+     * @param other - The other vertex to compare to
+     * @returns True if the vertices are equal, false otherwise
+     */
+    equals(other: Vertex): boolean;
     static fromJson(json: GraphVertexJson): Vertex;
 }

package/dist/src/import/geojson/GeoJsonGraphUtils.d.ts

@@ -0,0 +1,12 @@
+import { Feature, GeoJSON, Point } from 'geojson';
+import { default as Graph } from '../../graph/Graph.js';
+import { EdgeProperties } from '../../graph/Edge.js';
+import { VertexProperties } from '../../graph/Vertex.js';
+export default class GeoJsonGraphUtils {
+    static RESTRICTED_PEDESTRIANS_HIGHWAYS: string[];
+    static DEFAULT_FEATURE_SELECTOR: (feature: Feature) => boolean;
+    static parsePointProperties(feature: Feature<Point>): VertexProperties;
+    static parseLineStringProperties(feature: Feature): EdgeProperties;
+    static createGraphFromGeojsonString(geojsonString: string): Graph;
+    static createGraphFromGeojson(geojson: GeoJSON, featureSelectionFilter?: (feature: Feature<import('geojson').Geometry, import('geojson').GeoJsonProperties>) => boolean): Graph;
+}

package/dist/src/import/geojson/GeoJsonUtils.d.ts

@@ -0,0 +1,6 @@
+import { LineString } from 'geojson';
+export declare function osmStringToGeojson(osmString: string): import('geojson').FeatureCollection<import('geojson').Geometry, import('geojson').GeoJsonProperties>;
+export declare function lineStringToPolygon(lineString: LineString): {
+    type: string;
+    coordinates: import('geojson').Position[][];
+};

package/dist/src/{wemap-osm → import/osm}/OsmGraphUtils.d.ts

@@ -1,11 +1,12 @@
 import { OsmModel, OsmNode, OsmWay } from '@wemap/osm';
-import { default as Graph } from '../graph/Graph.js';
-import { EdgeProperties } from '../graph/Edge.js';
-import { default as Vertex, VertexProperties } from '../graph/Vertex.js';
+import { default as Graph } from '../../graph/Graph.js';
+import { EdgeProperties } from '../../graph/Edge.js';
+import { default as Vertex, VertexProperties } from '../../graph/Vertex.js';
 export default class OsmGraphUtils {
     static RESTRICTED_PEDESTRIANS_HIGHWAYS: string[];
     static DEFAULT_WAY_SELECTOR: (way: OsmWay) => boolean;
     static parseNodeProperties(osmNode: OsmNode): VertexProperties;
     static parseWayProperties(osmWay: OsmWay): EdgeProperties;
+    static createGraphFromOsmXmlString(osmXmlString: string): Graph;
     static createGraphFromOsmModel(osmModel: OsmModel, waySelectionFilter?: (way: OsmWay) => boolean, callbackVerticesMapping?: (mapping: [nodeId: number, vertex: Vertex][]) => void): Graph;
 }

package/dist/src/types.d.ts

@@ -1,3 +1,4 @@
+import { MultiPolygon } from 'geojson';
 import { CoordinatesCompressedJson } from '@wemap/geo';
 import { EdgeProperties } from './graph/Edge.js';
 import { VertexProperties } from './graph/Vertex.js';
@@ -15,6 +16,8 @@ export type GraphEdgeJson = {
 export type GeoGraphJson = {
     vertices: GraphVertexJson[];
     edges: GraphEdgeJson[];
+    routingBounds?: MultiPolygon;
+    routingBoundsEntryPoints?: number[];
 };
 export type CompressedGraphVertexJson = CoordinatesCompressedJson;
 export type CompressedGeoGraphJson = {

package/dist/src/wemap-multi/CustomGraphMap.d.ts

@@ -1,23 +1,14 @@
-import { MultiPolygon } from '@turf/helpers';
 import { Coordinates } from '@wemap/geo';
-import { OsmNode } from '@wemap/osm';
 import { default as Graph } from '../graph/Graph.js';
 import { default as GraphRouter } from '../graph/GraphRouter.js';
 import { GraphRouterOptions } from '../graph/GraphRouterOptions.js';
-import { default as Vertex } from '../graph/Vertex.js';
-export type ParsingErrors = {
-    couldNotParseFile?: string;
-    routingIoNotFound: OsmNode[];
-    routingBoundsNotFound: boolean;
-};
 export default class CustomGraphMap {
-    name: string | null;
     graph: Graph;
+    name: string | null;
     router: GraphRouter;
-    bounds: MultiPolygon;
-    entryPoints: Vertex[];
-    constructor(graph: Graph, entryPoints: Vertex[], bounds?: MultiPolygon | null, name?: string | null);
-    static fromOsmXml(osmXmlString: string, name?: string | null, callbackErrors?: (errors: ParsingErrors) => void): CustomGraphMap | undefined;
+    get routingBounds(): import('geojson').MultiPolygon | null;
+    get entryPoints(): import('../graph/Vertex.js').default[];
+    constructor(graph: Graph, name?: string | null);
     isPointInside(coordinates: Coordinates): boolean;
     /**
      * Get the list of entry points sorted by the lowest distance between:
@@ -25,7 +16,7 @@ export default class CustomGraphMap {
      * (as the crow flies)
      *
      */
-    getOrderedEntryPointsSortedByDistance(start: Coordinates, end: Coordinates): Vertex[];
+    getOrderedEntryPointsSortedByDistance(start: Coordinates, end: Coordinates): import('../graph/Vertex.js').default[];
     /**
      * Get the best itinerary from any entry point to an end coordinates.
      *

package/dist/src/wemap-multi/CustomGraphMapTester.d.ts

@@ -1,11 +1,11 @@
-import { OsmNode } from '@wemap/osm';
+import { GeoJSON } from 'geojson';
 import { default as CustomGraphMap } from './CustomGraphMap.js';
 import { default as Vertex } from '../graph/Vertex.js';
 export type Report = {
     customGraphMap?: CustomGraphMap;
     errors: Error[];
 };
-export type Error = CouldNotParseFileError | MultipleGraphComponentsError | RoutingBoundsNotFoundError | RoutingIoNotOnGraphError;
+export type Error = CouldNotParseFileError | MultipleGraphComponentsError | RoutingBoundsNotFoundError | RoutingBoundsEntryPointsNotFoundError;
 export type CouldNotParseFileError = {
     type: 'could-not-parse-file';
     details: string | undefined;
@@ -17,22 +17,27 @@ export type MultipleGraphComponentsError = {
 export type RoutingBoundsNotFoundError = {
     type: 'routing-bounds-not-found';
 };
-export type RoutingIoNotOnGraphError = {
-    type: 'routing-io-not-on-graph';
-    data: OsmNode[];
+export type RoutingBoundsEntryPointsNotFoundError = {
+    type: 'routing-bounds-entry-points-not-found';
 };
 export default class CustomGraphMapTester {
-    static createReport(osmXmlString: string): Report;
+    static createReportFromOsmXmlString(osmXmlString: string): Report;
+    static createReportFromGeoJsonString(geojsonString: string): Report;
+    static createReportFromGeoJson(geojson: GeoJSON): Report;
+    private static createReportFromCustomGraphMap;
     static reportToJson(report: Report): {
-        graph: import('../types.js').CompressedGeoGraphJson | undefined;
+        graph: import('../types.js').GeoGraphJson | undefined;
         errors: ({
             type: "multiple-graph-components";
             data: number[][];
         } | {
-            type: "routing-io-not-on-graph";
-            data: number[];
+            type: "routing-bounds-entry-points-not-found";
+            data?: undefined;
+        } | {
+            type: "routing-bounds-not-found";
+            data?: undefined;
         } | {
-            type: "could-not-parse-file" | "routing-bounds-not-found";
+            type: "could-not-parse-file";
             data?: undefined;
         })[];
     };

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "12.11.6",
+    "version": "12.12.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -34,16 +34,18 @@
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
         "@types/mapbox__polyline": "^1.0.2",
-        "@wemap/geo": "^12.11.3",
+        "@wemap/geo": "^12.12.0",
         "@wemap/logger": "^12.10.9",
         "@wemap/maths": "^12.10.9",
-        "@wemap/osm": "^12.11.3",
+        "@wemap/osm": "^12.12.0",
         "@wemap/salesman.js": "^2.1.0"
     },
     "devDependencies": {
         "@types/fetch-mock": "^7.3.5",
+        "@xmldom/xmldom": "^0.9.8",
         "fetch-mock": "^9.11.0",
-        "geojson": "^0.5.0"
+        "geojson": "^0.5.0",
+        "osmtogeojson": "^3.0.0-beta.5"
     },
     "files": [
         "dist",
@@ -60,5 +62,5 @@
             "types": "./dist/helpers/*.d.ts"
         }
     },
-    "gitHead": "f42a97330c016910c50dac0d10edb478c073d117"
+    "gitHead": "37e99664e922120a00c513e7c6eb7897b50dbe45"
 }