@wemap/routers 6.2.1 → 6.2.3

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "6.2.1",
+    "version": "6.2.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -26,10 +26,10 @@
     "license": "ISC",
     "dependencies": {
         "@mapbox/polyline": "^1.1.1",
-        "@wemap/geo": "^6.0.0",
+        "@wemap/geo": "^6.2.3",
         "@wemap/logger": "^6.0.0",
         "@wemap/maths": "^6.0.0",
-        "@wemap/osm": "^6.0.0"
+        "@wemap/osm": "^6.2.3"
     },
-    "gitHead": "0d2771fd12d66b079ff5467d3f8d9064091a0c30"
+    "gitHead": "e88b0f15de31c30588aaacdadcbad2da46f9673d"
 }

package/src/Constants.js

@@ -9,10 +9,12 @@ Constants.ROUTING_MODE = {
     FERRY: 'FERRY',
     FUNICULAR: 'FUNICULAR',
     METRO: 'METRO',
+    MOTO: 'MOTO',
     TRAIN: 'TRAIN',
     TAXI: 'TAXI',
     TRAM: 'TRAM',
-    WALK: 'WALK'
+    WALK: 'WALK',
+    UNKNOWN: 'UNKNOWN'
 };
 
 Constants.PUBLIC_TRANSPORT = [
@@ -23,7 +25,6 @@ Constants.PUBLIC_TRANSPORT = [
     Constants.ROUTING_MODE.FUNICULAR,
     Constants.ROUTING_MODE.METRO,
     Constants.ROUTING_MODE.TRAIN,
-    Constants.ROUTING_MODE.TAXI,
     Constants.ROUTING_MODE.TRAM
 ];
 

package/src/cityway/CitywayUtils.js

@@ -13,10 +13,43 @@ import Constants from '../Constants.js';
 const routingModeCorrespondance = new Map();
 routingModeCorrespondance.set('WALK', Constants.ROUTING_MODE.WALK);
 routingModeCorrespondance.set('BICYCLE', Constants.ROUTING_MODE.BIKE);
-routingModeCorrespondance.set('BUS', Constants.ROUTING_MODE.BUS);
 routingModeCorrespondance.set('TRAMWAY', Constants.ROUTING_MODE.TRAM);
+routingModeCorrespondance.set('METRO', Constants.ROUTING_MODE.METRO);
 routingModeCorrespondance.set('FUNICULAR', Constants.ROUTING_MODE.FUNICULAR);
+routingModeCorrespondance.set('BUS', Constants.ROUTING_MODE.BUS);
+routingModeCorrespondance.set('COACH', Constants.ROUTING_MODE.BUS);
+routingModeCorrespondance.set('SCHOOL', Constants.ROUTING_MODE.BUS);
+routingModeCorrespondance.set('BUS_PMR', Constants.ROUTING_MODE.BUS);
+routingModeCorrespondance.set('MINIBUS', Constants.ROUTING_MODE.BUS);
+routingModeCorrespondance.set('TROLLEY_BUS', Constants.ROUTING_MODE.BUS);
+routingModeCorrespondance.set('TAXIBUS', Constants.ROUTING_MODE.BUS);
+routingModeCorrespondance.set('SHUTTLE', Constants.ROUTING_MODE.BUS);
 routingModeCorrespondance.set('TRAIN', Constants.ROUTING_MODE.TRAIN);
+routingModeCorrespondance.set('HST', Constants.ROUTING_MODE.TRAIN);
+routingModeCorrespondance.set('LOCAL_TRAIN', Constants.ROUTING_MODE.TRAIN);
+routingModeCorrespondance.set('AIR', Constants.ROUTING_MODE.AIRPLANE);
+routingModeCorrespondance.set('FERRY', Constants.ROUTING_MODE.BOAT);
+routingModeCorrespondance.set('TAXI', Constants.ROUTING_MODE.UNKNOWN);
+routingModeCorrespondance.set('CAR_POOL', Constants.ROUTING_MODE.UNKNOWN);
+routingModeCorrespondance.set('PRIVATE_VEHICLE', Constants.ROUTING_MODE.CAR);
+routingModeCorrespondance.set('SCOOTER', Constants.ROUTING_MODE.MOTO);
+
+const planTripType = new Map();
+planTripType.set(0, Constants.ROUTING_MODE.BUS);
+planTripType.set(1, Constants.ROUTING_MODE.WALK);
+planTripType.set(2, Constants.ROUTING_MODE.BIKE);
+planTripType.set(3, Constants.ROUTING_MODE.CAR);
+planTripType.set(4, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(5, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(6, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(7, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(8, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(9, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(10, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(11, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(12, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(13, Constants.ROUTING_MODE.UNKNOWN);
+planTripType.set(14, Constants.ROUTING_MODE.UNKNOWN);
 
 /**
  * @param {object} json
@@ -51,9 +84,16 @@ function jsonDateToTimestamp(jsonDate) {
  */
 function parseWKTGeometry(wktGeometry) {
     const tmpCoordsStr = wktGeometry.match(/LINESTRING \((.*)\)/i);
-    if (!tmpCoordsStr) {
+    const tmpCoordsPt = wktGeometry.match(/POINT \((.*)\)/i);
+    if (!tmpCoordsStr && !tmpCoordsPt) {
         return null;
     }
+
+    if (tmpCoordsPt) {
+        const [lng, lat] = tmpCoordsPt[1].split(' ');
+        return [new Coordinates(Number(lat), Number(lng))];
+    }
+
     return tmpCoordsStr[1].split(',').map(str => {
         const sp = str.trim().split(' ');
         return new Coordinates(Number(sp[1]), Number(sp[0]));
@@ -105,12 +145,21 @@ export function createRouterResponseFromJson(json) {
 
     // Do not know if it the best approach, but it works...
     const allJsonTrips = json.Data.reduce((acc, dataObj) => {
-        acc.push(...dataObj.response.trips.Trip);
+        acc.push(...dataObj.response.trips.Trip.map(trip => ({
+            ...trip,
+            ...(dataObj.hasOwnProperty('PlanTripType') ? {PlanTripType: dataObj.PlanTripType} : {})
+        })));
         return acc;
     }, []);
 
+    // eslint-disable-next-line no-labels
+    itineraryLoop:
     for (const trip of allJsonTrips) {
 
+        if (trip.hasOwnProperty('PlanTripType') && planTripType.get(trip.PlanTripType) === Constants.ROUTING_MODE.UNKNOWN) {
+            continue;
+        }
+
         const itinerary = new Itinerary();
 
         itinerary.duration = parseDuration(trip.Duration);
@@ -118,7 +167,6 @@ export function createRouterResponseFromJson(json) {
         itinerary.from = jsonToCoordinates(trip.Departure.Site.Position);
         itinerary.endTime = jsonDateToTimestamp(trip.Arrival.Time);
         itinerary.to = jsonToCoordinates(trip.Arrival.Site.Position);
-        routerResponse.itineraries.push(itinerary);
 
         for (const jsonSection of trip.sections.Section) {
 
@@ -132,7 +180,14 @@ export function createRouterResponseFromJson(json) {
             leg.endTime = jsonDateToTimestamp(jsonLeg.Arrival.Time);
             leg.coords = [];
 
-            if (leg.mode === Constants.ROUTING_MODE.WALK || leg.mode === Constants.ROUTING_MODE.BIKE) {
+            if (leg.mode === Constants.ROUTING_MODE.UNKNOWN) {
+                // eslint-disable-next-line
+                continue itineraryLoop;
+            }
+
+            if (leg.mode === Constants.ROUTING_MODE.WALK
+                || leg.mode === Constants.ROUTING_MODE.BIKE
+                || leg.mode === Constants.ROUTING_MODE.CAR) {
 
                 leg.from = {
                     name: jsonLeg.Departure.Site.Name,
@@ -185,7 +240,7 @@ export function createRouterResponseFromJson(json) {
                 };
 
                 let transportName = jsonLeg.Line.Number;
-                if (leg.mode === Constants.ROUTING_MODE.TRAM) {
+                if (leg.mode === Constants.ROUTING_MODE.TRAM && transportName.toLowerCase().includes('tram')) {
                     // In order to remove the "TRAM " prefix.
                     transportName = transportName.substr(5);
                 }
@@ -218,7 +273,7 @@ export function createRouterResponseFromJson(json) {
                 legStep.distance = jsonLeg.Distance;
                 leg.steps = [legStep];
             } else {
-                Logger.warn(`[CitywayParser] Unknown leg mode: ${leg.mode}`);
+                Logger.warn(`[CitywayParser] Unknown leg mode: ${jsonLeg.TransportMode}`);
             }
 
             leg.distance = leg.coords.reduce((acc, coords, idx, arr) => {
@@ -232,6 +287,8 @@ export function createRouterResponseFromJson(json) {
 
         }
 
+        routerResponse.itineraries.push(itinerary);
+
         itinerary.distance = itinerary.coords.reduce((acc, coords, idx, arr) => {
             if (idx === 0) {
                 return acc;

package/src/idfm/IdfmUtils.js

@@ -31,6 +31,7 @@ routingModeCorrespondance.set('Shuttle', Constants.ROUTING_MODE.BUS);
 routingModeCorrespondance.set('SuspendedCableCar', Constants.ROUTING_MODE.FUNICULAR);
 routingModeCorrespondance.set('Taxi', Constants.ROUTING_MODE.TAXI);
 routingModeCorrespondance.set('Train', Constants.ROUTING_MODE.TRAIN);
+routingModeCorrespondance.set('RER', Constants.ROUTING_MODE.TRAIN);
 routingModeCorrespondance.set('Tramway', Constants.ROUTING_MODE.TRAM);
 routingModeCorrespondance.set('walking', Constants.ROUTING_MODE.WALK);
 routingModeCorrespondance.set('bike', Constants.ROUTING_MODE.BIKE);
@@ -83,6 +84,14 @@ function findStepsCoord(leg) {
         } else if (idx === steps.length - 1) {
             step._idCoordsInLeg = coords.length - 1;
             newCoords = last(coords);
+        } else if (duplicatedCoords.length === 1) {
+            accumulatedIndex++;
+
+            step._idCoordsInLeg = accumulatedIndex;
+
+            newCoords = duplicatedCoords[0];
+
+            coords[step._idCoordsInLeg] = newCoords;
         } else {
             const result = GeoUtils.trimRoute(duplicatedCoords, duplicatedCoords[0], previousStep.distance);
             accumulatedIndex += result.length - 1;