@wemap/osm 5.4.1 → 5.4.6

package/index.js

@@ -14,6 +14,7 @@ export * as OsmNetworkUtils from './src/routers/custom/OsmNetworkUtils.js';
 /* OSRM/OTP Router */
 export * as OsrmUtils from './src/routers/osrm/OsrmUtils.js';
 export * as OtpUtils from './src/routers/otp/OtpUtils.js';
+export * as CitywayUtils from './src/routers/cityway/CitywayUtils.js';
 
 /* Router model */
 export { default as RouterResponse } from './src/routers/RouterResponse.js';

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "5.4.1",
+    "version": "5.4.6",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -31,5 +31,5 @@
         "@wemap/maths": "^5.1.1",
         "saxes": "^5.0.1"
     },
-    "gitHead": "4fd8663d8eeb2fe38a4d25883efb5258d69f3982"
+    "gitHead": "3e1281575d667fcf2e911258a449695022a61910"
 }

package/src/routers/Leg.js

@@ -4,7 +4,7 @@ import Step from './Step.js';
 
 class Leg {
 
-    /** @type {!string} can be WALK, BIKE, BUS, TRAM, CAR */
+    /** @type {!string} can be WALK, BIKE, BUS, TRAM, CAR, FUNICULAR */
     mode;
 
     /** @type {!number} */

package/src/routers/cityway/CitywayUtils.js

@@ -89,10 +89,13 @@ export function createRouterResponseFromJson(json) {
     routerResponse.routerName = 'cityway';
 
 
-    // For the moment, take the first of the Data array.
-    const jsonResponse = json.Data[0].response;
+    // Do not know if it the best approach, but it works...
+    const allJsonTrips = json.Data.reduce((acc, dataObj) => {
+        acc.push(...dataObj.response.trips.Trip);
+        return acc;
+    }, []);
 
-    for (const trip of jsonResponse.trips.Trip) {
+    for (const trip of allJsonTrips) {
 
         const itinerary = new Itinerary();
 
@@ -115,7 +118,7 @@ export function createRouterResponseFromJson(json) {
             leg.endTime = jsonDateToTimestamp(jsonLeg.Arrival.Time);
             leg.coords = [];
 
-            if (leg.mode === 'WALK') {
+            if (leg.mode === 'WALK' || leg.mode === 'BICYCLE') {
 
                 leg.from = {
                     name: jsonLeg.Departure.Site.Name,
@@ -156,7 +159,7 @@ export function createRouterResponseFromJson(json) {
                     leg.steps.push(step);
                 }
 
-            } else if (leg.mode === 'BUS' || leg.mode === 'TRAM') {
+            } else if (leg.mode === 'BUS' || leg.mode === 'TRAM' || leg.mode === 'FUNICULAR') {
 
                 leg.from = {
                     name: jsonLeg.Departure.StopPlace.Name,

package/src/routers/cityway/CitywayUtils.spec.js

@@ -19,7 +19,7 @@ describe('CitywayUtils - createRouterResponseFromJson', () => {
 
     it('RouterResponse - 1', () => {
 
-        const filePath = path.resolve(__dirname, '../../../assets/itinerary-lehavre-cityway.json');
+        const filePath = path.resolve(__dirname, '../../../assets/itinerary-lehavre-cityway-1.json');
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
@@ -60,6 +60,38 @@ describe('CitywayUtils - createRouterResponseFromJson', () => {
         expect(itinerary1leg2.transportInfo.directionName).equal('Graville');
     });
 
+    it('RouterResponse - 2', () => {
+        const filePath = path.resolve(__dirname, '../../../assets/itinerary-lehavre-cityway-2.json');
+        const fileString = fs.readFileSync(filePath, 'utf8');
+        const json = JSON.parse(fileString);
+
+        const routerResponse = createRouterResponseFromJson(json);
+        verifyRouterResponseData(routerResponse);
+
+        expect(routerResponse.itineraries.length).equal(1);
+    });
+
+    it('RouterResponse - 3', () => {
+        const filePath = path.resolve(__dirname, '../../../assets/itinerary-lehavre-cityway-3.json');
+        const fileString = fs.readFileSync(filePath, 'utf8');
+        const json = JSON.parse(fileString);
+
+        const routerResponse = createRouterResponseFromJson(json);
+        verifyRouterResponseData(routerResponse);
+
+        expect(routerResponse.itineraries[0].legs[1].mode).equal('FUNICULAR');
+    });
+
+    it('RouterResponse - 4', () => {
+        const filePath = path.resolve(__dirname, '../../../assets/itinerary-lehavre-cityway-4.json');
+        const fileString = fs.readFileSync(filePath, 'utf8');
+        const json = JSON.parse(fileString);
+
+        const routerResponse = createRouterResponseFromJson(json);
+        verifyRouterResponseData(routerResponse);
+
+        expect(routerResponse.itineraries[0].legs[0].mode).equal('BICYCLE');
+    });
 
 });