mobility-toolbox-js 1.6.4 → 1.7.0

package/api/routing/RoutingAPI.test.js

@@ -18,8 +18,7 @@ describe('RoutingAPI', () => {
       return api
         .route({
           mot: 'bus',
-          via:
-            '47.3739194713294,8.538274823394632|47.37595378493421,8.537490375951839',
+          via: '47.3739194713294,8.538274823394632|47.37595378493421,8.537490375951839',
         })
         .then((featureCollection) => {
           // Correct url

package/api/trajserv/TrajservAPI.js

@@ -51,9 +51,7 @@ class TrajservAPI extends API {
   fetchTrajectories(params, abortController = {}) {
     return this.fetch(`/trajectory_collection`, params, {
       signal: abortController.signal,
-    }).then((data) => {
-      return translateTrajCollResponse(data.features);
-    });
+    }).then((data) => translateTrajCollResponse(data.features));
   }
 
   /**
@@ -66,9 +64,7 @@ class TrajservAPI extends API {
   fetchTrajectoryStations(params, abortController = {}) {
     return this.fetch(`/trajstations`, params, {
       signal: abortController.signal,
-    }).then((data) => {
-      return translateTrajStationsResp(data);
-    });
+    }).then((data) => translateTrajStationsResp(data));
   }
 }
 

package/api/trajserv/TrajservAPI.test.js

@@ -20,8 +20,7 @@ describe('TrajservAPI', () => {
       return api
         .fetchTrajectoryById({
           a: '1',
-          bbox:
-            '917830.8141233932,5949421.787168904,926771.7516620635,5953300.375201735',
+          bbox: '917830.8141233932,5949421.787168904,926771.7516620635,5953300.375201735',
           btime: '5:54:7.880',
           cd: '1',
           date: '20200701',
@@ -57,8 +56,7 @@ describe('TrajservAPI', () => {
       return api
         .fetchTrajectoryById({
           attr_det: '1',
-          bbox:
-            '922972.5439121567,5951167.694705085,923812.5648796591,5951532.096677226',
+          bbox: '922972.5439121567,5951167.694705085,923812.5648796591,5951532.096677226',
           btime: '5:18:31.766',
           etime: '5:18:41.967',
           date: '20200701',
@@ -86,8 +84,7 @@ describe('TrajservAPI', () => {
       return api
         .fetchTrajectories({
           attr_det: '1',
-          bbox:
-            '922972.5439121567,5951167.694705085,923812.5648796591,5951532.096677226',
+          bbox: '922972.5439121567,5951167.694705085,923812.5648796591,5951532.096677226',
           btime: '5:18:31.766',
           etime: '5:18:41.967',
           date: '20200701',
@@ -116,8 +113,7 @@ describe('TrajservAPI', () => {
       return api
         .fetchTrajectories({
           attr_det: '1',
-          bbox:
-            '922972.5439121567,5951167.694705085,923812.5648796591,5951532.096677226',
+          bbox: '922972.5439121567,5951167.694705085,923812.5648796591,5951532.096677226',
           btime: '5:18:31.766',
           etime: '5:18:41.967',
           date: '20200701',
@@ -147,8 +143,7 @@ describe('TrajservAPI', () => {
       return api
         .fetchTrajectoryStations({
           a: '1',
-          bbox:
-            '1059098.4179109985,5917420.543096403,1063534.5137495932,5919344.9260996',
+          bbox: '1059098.4179109985,5917420.543096403,1063534.5137495932,5919344.9260996',
           btime: '6:17:22.722',
           cd: '1',
           date: '20200701',

package/api/tralis/TralisAPI.js

@@ -86,18 +86,14 @@ class TralisAPI {
 
     Object.defineProperties(this, {
       url: {
-        get: () => {
-          return url;
-        },
+        get: () => url,
         set: (newUrl) => {
           url = newUrl;
           this.open();
         },
       },
       projection: {
-        get: () => {
-          return projection;
-        },
+        get: () => projection,
         set: (newProjection) => {
           if (newProjection !== projection) {
             projection = newProjection;
@@ -108,9 +104,7 @@ class TralisAPI {
         },
       },
       bbox: {
-        get: () => {
-          return bbox;
-        },
+        get: () => bbox,
         set: (newBbox) => {
           if (JSON.stringify(newBbox) !== JSON.stringify(bbox)) {
             bbox = newBbox;
@@ -234,20 +228,19 @@ class TralisAPI {
    * Unsubscribe both modes of a channel.
    *
    * @param {string} channel Name of the websocket channel to unsubscribe.
-   * @param {string} [suffix=''] Suffix to add to the channel name.
+   * @param {string} suffix Suffix to add to the channel name.
    * @param {function} cb Callback function to unsubscribe. If null all subscriptions for the channel will be unsubscribed.
    * @private
    */
-  unsubscribe(channel, suffix = '', cb) {
+  unsubscribe(channel, suffix, cb) {
     this.conn.unsubscribe(
       `${channel}${getModeSuffix(TralisModes.SCHEMATIC, TralisModes)}${suffix}`,
       cb,
     );
     this.conn.unsubscribe(
-      `${channel}${getModeSuffix(
-        TralisModes.TOPOGRAPHIC,
-        TralisModes,
-      )}${suffix}`,
+      `${channel}${getModeSuffix(TralisModes.TOPOGRAPHIC, TralisModes)}${
+        suffix || ''
+      }`,
       cb,
     );
   }
@@ -323,7 +316,7 @@ class TralisAPI {
    * @param {Boolean} sortByMinArrivalTime Sort by minimum arrival time
    * @param {function(departures:Departure[])} onMessage Function called on each message of the channel.
    */
-  subscribeDepartures(stationId, sortByMinArrivalTime = false, onMessage) {
+  subscribeDepartures(stationId, sortByMinArrivalTime, onMessage) {
     window.clearTimeout(this.departureUpdateTimeout);
     this.unsubscribeDepartures();
     this.subscribedStationUic = stationId;
@@ -342,7 +335,7 @@ class TralisAPI {
           this.departureUpdateTimeout = window.setTimeout(() => {
             const departures = this.filterDepartures(
               departureObject,
-              sortByMinArrivalTime,
+              sortByMinArrivalTime || false,
             );
             onMessage(departures);
           }, 100);
@@ -584,9 +577,9 @@ class TralisAPI {
    * @return {Promise<Array<FullTrajectory>>} Return an array of full trajectories.
    */
   getFullTrajectories(ids, mode, generalizationLevel) {
-    const promises = ids.map((id) => {
-      return this.getFullTrajectory(id, mode, generalizationLevel);
-    });
+    const promises = ids.map((id) =>
+      this.getFullTrajectory(id, mode, generalizationLevel),
+    );
     return Promise.all(promises);
   }
 
@@ -637,9 +630,9 @@ class TralisAPI {
         params,
         (data) => {
           if (data.content && data.content.length) {
-            const content = data.content.map((stopSequence) => {
-              return cleanStopTime(stopSequence);
-            });
+            const content = data.content.map((stopSequence) =>
+              cleanStopTime(stopSequence),
+            );
 
             // Remove the delay from arrivalTime and departureTime
             resolve(content);
@@ -660,9 +653,7 @@ class TralisAPI {
    * @return {Promise<Array<StopSequence>>} Return an array of stop sequences.
    */
   getStopSequences(ids) {
-    const promises = ids.map((id) => {
-      return this.getStopSequence(id);
-    });
+    const promises = ids.map((id) => this.getStopSequence(id));
     return Promise.all(promises);
   }
 
@@ -680,9 +671,9 @@ class TralisAPI {
       `stopsequence_${id}`,
       (data) => {
         if (data.content && data.content.length) {
-          const content = data.content.map((stopSequence) => {
-            return cleanStopTime(stopSequence);
-          });
+          const content = data.content.map((stopSequence) =>
+            cleanStopTime(stopSequence),
+          );
 
           // Remove the delay from arrivalTime and departureTime
           onMessage(content);

package/api/tralis/WebSocketConnector.js

@@ -13,35 +13,31 @@ class WebSocketConnector {
   defineProperties() {
     Object.defineProperties(this, {
       closed: {
-        get: () => {
-          return !!(
+        get: () =>
+          !!(
             this.websocket &&
             this.websocket.readyState === this.websocket.CLOSED
-          );
-        },
+          ),
       },
       closing: {
-        get: () => {
-          return !!(
+        get: () =>
+          !!(
             this.websocket &&
             this.websocket.readyState === this.websocket.CLOSING
-          );
-        },
+          ),
       },
       connecting: {
-        get: () => {
-          return !!(
+        get: () =>
+          !!(
             this.websocket &&
             this.websocket.readyState === this.websocket.CONNECTING
-          );
-        },
+          ),
       },
       open: {
-        get: () => {
-          return !!(
+        get: () =>
+          !!(
             this.websocket && this.websocket.readyState === this.websocket.OPEN
-          );
-        },
+          ),
       },
       /**
        * Array of message to send on open.
@@ -212,9 +208,9 @@ class WebSocketConnector {
       return;
     }
     this.subscriptions
-      .filter((s) => {
-        return s.params.channel === params.channel && (!cb || s.cb === cb);
-      })
+      .filter(
+        (s) => s.params.channel === params.channel && (!cb || s.cb === cb),
+      )
       .forEach(({ onMessageCb, onErrorCb }) => {
         if (this.websocket) {
           this.websocket.removeEventListener('message', onMessageCb);
@@ -253,9 +249,9 @@ class WebSocketConnector {
     const { onMessageCb, onErrorCb } = this.listen(params, cb, errorCb);
     const reqStr = WebSocketConnector.getRequestString('', params);
 
-    const index = this.subscriptions.findIndex((subcr) => {
-      return params.channel === subcr.params.channel && cb === subcr.cb;
-    });
+    const index = this.subscriptions.findIndex(
+      (subcr) => params.channel === subcr.params.channel && cb === subcr.cb,
+    );
     const newSubscr = { params, cb, errorCb, onMessageCb, onErrorCb, quiet };
     if (index > -1) {
       this.subscriptions[index] = newSubscr;
@@ -279,9 +275,9 @@ class WebSocketConnector {
    * @private
    */
   unsubscribe(source, cb) {
-    const toRemove = this.subscriptions.filter((s) => {
-      return s.params.channel === source && (!cb || s.cb === cb);
-    });
+    const toRemove = this.subscriptions.filter(
+      (s) => s.params.channel === source && (!cb || s.cb === cb),
+    );
 
     toRemove.forEach(({ onMessageCb, onErrorCb }) => {
       if (this.websocket) {

package/common/Tracker.js

@@ -291,9 +291,7 @@ export default class Tracker {
           continue;
         }
 
-        px = px.map((p) => {
-          return p * pixelRatio;
-        });
+        px = px.map((p) => p * pixelRatio);
 
         if (
           px[0] < 0 ||

package/common/api/api.js

@@ -29,9 +29,9 @@ class API extends BaseObject {
    * Append the apiKey before sending the request.
    * @ignore
    */
-  fetch(path = '', params = {}, config) {
+  fetch(path, params, config) {
     // Clean requets parameters, removing undefined and null values.
-    const urlParams = { ...params, key: this.apiKey };
+    const urlParams = { ...(params || {}), key: this.apiKey };
     const clone = { ...urlParams };
     Object.keys(urlParams).forEach(
       (key) =>
@@ -43,20 +43,21 @@ class API extends BaseObject {
         new Error(`No apiKey defined for request to ${this.url}`),
       );
     }
-    return fetch(`${this.url}${path}?${qs.stringify(clone)}`, config).then(
-      (response) => {
-        try {
-          return response.json().then((data) => {
-            if (data.error) {
-              throw new Error(data.error);
-            }
-            return data;
-          });
-        } catch (err) {
-          return Promise.reject(new Error(err));
-        }
-      },
-    );
+    return fetch(
+      `${this.url}${path || ''}?${qs.stringify(clone)}`,
+      config,
+    ).then((response) => {
+      try {
+        return response.json().then((data) => {
+          if (data.error) {
+            throw new Error(data.error);
+          }
+          return data;
+        });
+      } catch (err) {
+        return Promise.reject(new Error(err));
+      }
+    });
   }
 }
 

package/common/controls/Control.js

@@ -48,9 +48,7 @@ class Control extends BaseObject {
 
     Object.defineProperties(this, {
       active: {
-        get: () => {
-          return this.get('active');
-        },
+        get: () => this.get('active'),
         set: (newActive) => {
           this.set('active', newActive);
           if (newActive) {
@@ -62,9 +60,7 @@ class Control extends BaseObject {
         },
       },
       map: {
-        get: () => {
-          return this.get('map');
-        },
+        get: () => this.get('map'),
         set: (map) => {
           // Remove previous node.
           if (this.map && this.element && this.element.parentNode) {

package/common/layers/Layer.js

@@ -130,14 +130,12 @@ export default class Layer extends Observable {
         writable: true,
       },
       copyrights: {
-        get: () => {
-          return this.get('copyrights');
-        },
+        get: () => this.get('copyrights'),
         set: (newCopyrights) => {
           const arrValue = !Array.isArray(newCopyrights)
             ? [newCopyrights]
             : newCopyrights;
-          return this.set('copyrights', arrValue);
+          this.set('copyrights', arrValue);
         },
       },
       visible: {
@@ -376,9 +374,7 @@ export default class Layer extends Observable {
         );
         return featureInfo;
       })
-      .catch(() => {
-        return emptyFeatureInfo;
-      });
+      .catch(() => emptyFeatureInfo);
   }
 
   /**
@@ -434,8 +430,6 @@ export default class Layer extends Observable {
         );
         return featureInfo;
       })
-      .catch(() => {
-        return emptyFeatureInfo;
-      });
+      .catch(() => emptyFeatureInfo);
   }
 }

package/common/layers/Layer.test.js

@@ -456,14 +456,12 @@ describe('Layer', () => {
   describe('#onUserClickCallback()', () => {
     const evt = { type: 'signleclick', coordinate: [0, 0] };
 
-    const getFeatureInfo = (layer, features = []) => {
-      return {
-        features,
-        layer,
-        coordinate: evt.coordinate,
-        event: evt,
-      };
-    };
+    const getFeatureInfo = (layer, features = []) => ({
+      features,
+      layer,
+      coordinate: evt.coordinate,
+      event: evt,
+    });
 
     test('calls click callback functions', (done) => {
       const layer = new Layer({
@@ -599,14 +597,12 @@ describe('Layer', () => {
   describe('#onUserMoveCallback()', () => {
     const evt = { type: 'pointermove', coordinate: [0, 0] };
 
-    const getFeatureInfo = (layer, features = []) => {
-      return {
-        features,
-        layer,
-        coordinate: evt.coordinate,
-        event: evt,
-      };
-    };
+    const getFeatureInfo = (layer, features = []) => ({
+      features,
+      layer,
+      coordinate: evt.coordinate,
+      event: evt,
+    });
 
     test('calls hover callback functions', (done) => {
       const layer = new Layer({

package/common/mixins/TrackerLayerMixin.js

@@ -137,12 +137,8 @@ const TrackerLayerMixin = (Base) =>
         live,
       } = options;
 
-      let {
-        regexPublishedLineName,
-        publishedLineName,
-        tripNumber,
-        operator,
-      } = options;
+      let { regexPublishedLineName, publishedLineName, tripNumber, operator } =
+        options;
 
       const initTrackerOptions = {
         pixelRatio: pixelRatio || window.devicePixelRatio || 1,
@@ -266,11 +262,10 @@ const TrackerLayerMixin = (Base) =>
          * Id of the hovered vehicle.
          */
         hoverVehicleId: {
-          get: () => {
-            return this.tracker
+          get: () =>
+            this.tracker
               ? this.tracker.hoverVehicleId
-              : this.initTrackerOptions.hoverVehicleId;
-          },
+              : this.initTrackerOptions.hoverVehicleId,
           set: (newHoverVehicleId) => {
             if (this.tracker) {
               this.tracker.hoverVehicleId = newHoverVehicleId;
@@ -334,36 +329,28 @@ const TrackerLayerMixin = (Base) =>
          * Filter properties used in combination with permalink parameters.
          */
         publishedLineName: {
-          get: () => {
-            return publishedLineName;
-          },
+          get: () => publishedLineName,
           set: (newPublishedLineName) => {
             publishedLineName = newPublishedLineName;
             this.updateFilters();
           },
         },
         tripNumber: {
-          get: () => {
-            return tripNumber;
-          },
+          get: () => tripNumber,
           set: (newTripNumber) => {
             tripNumber = newTripNumber;
             this.updateFilters();
           },
         },
         operator: {
-          get: () => {
-            return operator;
-          },
+          get: () => operator,
           set: (newOperator) => {
             operator = newOperator;
             this.updateFilters();
           },
         },
         regexPublishedLineName: {
-          get: () => {
-            return regexPublishedLineName;
-          },
+          get: () => regexPublishedLineName,
           set: (newRegex) => {
             regexPublishedLineName = newRegex;
             this.updateFilters();
@@ -398,6 +385,28 @@ const TrackerLayerMixin = (Base) =>
         //   writable: true,
         // },
       });
+
+      // When we use the delay style we want to display delayed train on top by default
+      if (this.useDelayStyle && !this.sort) {
+        this.sort = (traj1, traj2) => {
+          if (traj1.delay === null && traj2.delay !== null) {
+            return 1;
+          }
+          if (traj2.delay === null && traj1.delay !== null) {
+            return -1;
+          }
+
+          // We put cancelled train inbetween green and yellow trains
+          // >=180000ms corresponds to yellow train
+          if (traj1.cancelled && !traj2.cancelled) {
+            return traj2.delay < 180000 ? -1 : 1;
+          }
+          if (traj2.cancelled && !traj1.cancelled) {
+            return traj1.delay < 180000 ? 1 : -1;
+          }
+          return traj2.delay - traj1.delay;
+        };
+      }
     }
 
     /**

package/common/mixins/TrajservLayerMixin.js

@@ -133,9 +133,7 @@ const TrajservLayerMixin = (TrackerLayer) =>
       }
       Object.defineProperties(this, {
         requestIntervalSeconds: {
-          get: () => {
-            return requestIntervalSeconds;
-          },
+          get: () => requestIntervalSeconds,
           set: (newRequestIntervalSeconds) => {
             if (newRequestIntervalSeconds !== requestIntervalSeconds) {
               requestIntervalSeconds = newRequestIntervalSeconds;

package/common/mixins/TralisLayerMixin.js

@@ -58,7 +58,7 @@ export class TralisLayerInterface {
    * @param {TralisMode} mode The mode to request. If not defined, the layer´s mode propetrty will be used.
    * @return {Promise<{stopSequence: StopSequence, fullTrajectory: FullTrajectory>} A promise that will be resolved with the trajectory informations.
    */
-  getTrajectoryInfos(vehicleId, mode) {}
+  getTrajectoryInfos(id, mode) {}
 
   /**
    * Define the style of the vehicle.
@@ -109,9 +109,8 @@ const TralisLayerMixin = (TrackerLayer) =>
 
       // Bind callbacks
       this.onTrajectoryMessage = this.onTrajectoryMessage.bind(this);
-      this.onDeleteTrajectoryMessage = this.onDeleteTrajectoryMessage.bind(
-        this,
-      );
+      this.onDeleteTrajectoryMessage =
+        this.onDeleteTrajectoryMessage.bind(this);
     }
 
     start() {

package/common/trackerConfig.js

@@ -67,27 +67,8 @@ export const textColors = [
  * @ignore
  */
 export const timeSteps = [
-  100000,
-  50000,
-  40000,
-  30000,
-  20000,
-  15000,
-  10000,
-  5000,
-  2000,
-  1000,
-  400,
-  300,
-  250,
-  180,
-  90,
-  60,
-  50,
-  50,
-  50,
-  50,
-  50,
+  100000, 50000, 40000, 30000, 20000, 15000, 10000, 5000, 2000, 1000, 400, 300,
+  250, 180, 90, 60, 50, 50, 50, 50, 50,
 ];
 
 /**
@@ -103,9 +84,9 @@ export const getTypeIndex = (type) => {
 /**
  * @ignore
  */
-export const getRadius = (type = 0, zoom) => {
+export const getRadius = (type, zoom) => {
   try {
-    const typeIdx = getTypeIndex(type);
+    const typeIdx = getTypeIndex(type || 0);
     return trackerRadiusMapping[typeIdx][zoom];
   } catch (e) {
     return 1;

package/common/utils/removeDuplicate.js

@@ -13,9 +13,9 @@ const removeDuplicate = (array) => {
     str.toLowerCase(),
   );
   const uniqueLowerCaseValues = [...new Set(lowerCasesValues)];
-  const uniqueValues = uniqueLowerCaseValues.map((uniqueStr) => {
-    return arrWithoutEmptyValues.find((str) => str.toLowerCase() === uniqueStr);
-  });
+  const uniqueValues = uniqueLowerCaseValues.map((uniqueStr) =>
+    arrWithoutEmptyValues.find((str) => str.toLowerCase() === uniqueStr),
+  );
   return uniqueValues;
 };
 

package/common/utils/simpleTrackerStyle.js

@@ -14,7 +14,5 @@ ctx.strokeStyle = 'black';
 ctx.stroke();
 ctx.lineWidth = 3;
 
-const style = () => {
-  return canvas;
-};
+const style = () => canvas;
 export default style;