@wemap/routers 12.8.8 → 12.8.10

package/src/remote/navitia/types.ts

@@ -0,0 +1,73 @@
+
+export type NavitiaCoordinates = { lat: number | string, lon: number | string };
+export type NavitiaPath = {
+    name: string,
+    length: number
+} & ({ instruction_start_coordinate: NavitiaCoordinates } | { via_uri: string });
+
+export type NavitiaWaypoint = { name: string }
+    & (
+        { stop_point: { coord: NavitiaCoordinates } } |
+        { address: { coord: NavitiaCoordinates } } |
+        { poi: { coord: NavitiaCoordinates } }
+    )
+
+export type NavitiaSection = {
+    id: string;
+    type: 'waiting' | 'transfer' | string,
+    mode: string,
+    departure_date_time: string,
+    arrival_date_time: string,
+    duration: number,
+    geojson: {
+        coordinates: [number, number][],
+        properties: { length: number }[]
+    },
+    path: NavitiaPath[],
+    display_informations: {
+        code: string,
+        color: string,
+        text_color: string,
+        direction: string,
+        physical_mode: string
+    },
+    from: NavitiaWaypoint,
+    to: NavitiaWaypoint,
+    vias?: {
+        id: string;
+        name: string;
+        access_point: {
+            id: string;
+            name: string;
+            coord: {
+                lon: string;
+                lat: string;
+            },
+            embedded_type: string;
+        },
+        is_entrance: boolean,
+        is_exit: boolean,
+        length: number,
+        traversal_time: number,
+        pathway_mode: number
+    }[]
+}
+export type NavitiaJson = {
+    journeys: {
+        duration: number,
+        departure_date_time: string,
+        arrival_date_time: string,
+        sections: NavitiaSection[]
+    }[],
+    context: {
+        timezone: string
+    };
+    error: {
+        message?: string;
+    }
+};
+
+export type NavitiaIntermediateStep = {
+    name: string,
+    distance: number
+};

package/src/wemap-osm/OsmGraphUtils.spec.ts

@@ -136,4 +136,18 @@ describe('OsmGraph - complex', () => {
 
     });
 
-});
+    it('escalators', () => {
+
+        const osmXmlString = loadFile('network-escalators.osm');
+        const osmModel = OsmParser.parseOsmXmlString(osmXmlString);
+        const graph = OsmGraphUtils.createGraphFromOsmModel(osmModel);
+
+        verifyCoherence(graph);
+
+        expect(graph.vertices.length).equals(4);
+        expect(graph.edges.length).equals(3);
+        graph.vertices.forEach(v => expect(v.coords.level).be.a("number"));
+
+    });
+
+});

package/src/wemap-osm/OsmGraphUtils.ts

@@ -72,7 +72,10 @@ export default class OsmGraphUtils {
             if (vertex) {
                 // In the case where vertices are linked to edges with level change
                 if (!Level.equals(vertex.coords.level, nodeLevel)) {
-                    vertex.coords.level = Level.intersection(vertex.coords.level, nodeLevel) || nodeLevel;
+                    vertex.coords.level = Level.intersection(vertex.coords.level, nodeLevel);
+                    if (vertex.coords.level === null) {
+                        vertex.coords.level = nodeLevel;
+                    }
                 }
                 return vertex;
             }