mobility-toolbox-js 2.0.0-beta.51 → 2.0.0-beta.52

package/common/utils/createTrackerFilters.d.ts

@@ -3,7 +3,7 @@ import { RealtimeTrajectory } from '../../types';
  * Return a filter functions based on some parameters of a vehicle.
  *
  * @param {string|Array<string>} line - A list of vehicle's name to filter. Names can be separated by a comma. Ex: 'S1,S2,S3'
- * @param {string|Array<string} route - A list of vehicle's route (contained in routeIdentifier property) to filter. Indentifiers can be separated by a comma. Ex: 'id1,id2,id3'
+ * @param {string|Array<string} route - A list of vehicle's route (contained in route_identifier property) to filter. Indentifiers can be separated by a comma. Ex: 'id1,id2,id3'
  * @param {string|Array<string} operator  A list of vehicle's operator to filter. Operators can be separated by a comma. Ex: 'SBB,DB'
  * @param {Regexp} regexLine - A regex aplly of vehcile's name.
  * @private

package/common/utils/createTrackerFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTrackerFilters.d.ts","sourceRoot":"","sources":["../../../src/common/utils/createTrackerFilters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD;;;;;;;;GAQG;AACH,QAAA,MAAM,aAAa,SACX,MAAM,GAAG,MAAM,EAAE,SAChB,MAAM,GAAG,MAAM,EAAE,YACd,MAAM,GAAG,MAAM,EAAE,aAChB,MAAM,GAAG,MAAM,EAAE,mBACb,kBAAkB,KAAK,OAAO,QA2E9C,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"createTrackerFilters.d.ts","sourceRoot":"","sources":["../../../src/common/utils/createTrackerFilters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD;;;;;;;;GAQG;AACH,QAAA,MAAM,aAAa,SACX,MAAM,GAAG,MAAM,EAAE,SAChB,MAAM,GAAG,MAAM,EAAE,YACd,MAAM,GAAG,MAAM,EAAE,aAChB,MAAM,GAAG,MAAM,EAAE,mBACb,kBAAkB,KAAK,OAAO,QA8E9C,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/common/utils/createTrackerFilters.js

@@ -2,7 +2,7 @@
  * Return a filter functions based on some parameters of a vehicle.
  *
  * @param {string|Array<string>} line - A list of vehicle's name to filter. Names can be separated by a comma. Ex: 'S1,S2,S3'
- * @param {string|Array<string} route - A list of vehicle's route (contained in routeIdentifier property) to filter. Indentifiers can be separated by a comma. Ex: 'id1,id2,id3'
+ * @param {string|Array<string} route - A list of vehicle's route (contained in route_identifier property) to filter. Indentifiers can be separated by a comma. Ex: 'id1,id2,id3'
  * @param {string|Array<string} operator  A list of vehicle's operator to filter. Operators can be separated by a comma. Ex: 'SBB,DB'
  * @param {Regexp} regexLine - A regex aplly of vehcile's name.
  * @private
@@ -42,14 +42,21 @@ const createFilters = (line, route, operator, regexLine) => {
         const routes = typeof route === 'string' ? route.split(',') : route;
         const routeList = routes.map((item) => parseInt(item, 10));
         const routeFilter = (item) => {
-            const routeId = parseInt(item.properties.routeIdentifier.split('.')[0], 10);
+            const routeIdentifier = item.properties.route_identifier ||
+                item.properties.routeIdentifier ||
+                '';
+            const routeId = parseInt(routeIdentifier.split('.')[0], 10);
             return routeList.includes(routeId);
         };
         filterList.push(routeFilter);
     }
     if (operator) {
         const operatorList = typeof operator === 'string' ? [operator] : operator;
-        const operatorFilter = (item) => operatorList.some((op) => new RegExp(op, 'i').test(item.properties.operator || ''));
+        const operatorFilter = (item) => operatorList.some((op) => {
+            // operaotr is the old property tenant is the new one
+            const tenant = item.properties.operator || item.properties.tenant || '';
+            return new RegExp(op, 'i').test(tenant);
+        });
         filterList.push(operatorFilter);
     }
     if (!filterList.length) {

package/mbt.js

@@ -34620,14 +34620,18 @@ uniform ${i3} ${o3} u_${a3};
       const routes = typeof route === "string" ? route.split(",") : route;
       const routeList = routes.map((item) => parseInt(item, 10));
       const routeFilter = (item) => {
-        const routeId = parseInt(item.properties.routeIdentifier.split(".")[0], 10);
+        const routeIdentifier = item.properties.route_identifier || item.properties.routeIdentifier || "";
+        const routeId = parseInt(routeIdentifier.split(".")[0], 10);
         return routeList.includes(routeId);
       };
       filterList.push(routeFilter);
     }
     if (operator) {
       const operatorList = typeof operator === "string" ? [operator] : operator;
-      const operatorFilter = (item) => operatorList.some((op) => new RegExp(op, "i").test(item.properties.operator || ""));
+      const operatorFilter = (item) => operatorList.some((op) => {
+        const tenant = item.properties.operator || item.properties.tenant || "";
+        return new RegExp(op, "i").test(tenant);
+      });
       filterList.push(operatorFilter);
     }
     if (!filterList.length) {