@golemio/pid 2.11.1-dev.1125776413 → 2.11.1-dev.1127019328

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  import { IGtfsRtTripDto } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IGtfsRtTripDto";
2
2
  import { IVehicleDescriptor } from "../interfaces/GtfsRealtimeInterfaces";
3
3
  export declare class VehicleDescriptor {
4
+ private vehicleIdGenerator;
5
+ constructor();
4
6
  getVehicleDescriptor(tripRecord: IGtfsRtTripDto): IVehicleDescriptor;
5
- private getVehicleId;
6
7
  }
@@ -1,12 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.VehicleDescriptor = void 0;
4
- const RouteTypeEnums_1 = require("../../../../../helpers/RouteTypeEnums");
4
+ const VehicleIdGenerator_1 = require("./VehicleIdGenerator");
5
5
  class VehicleDescriptor {
6
+ constructor() {
7
+ this.vehicleIdGenerator = new VehicleIdGenerator_1.VehicleIdGenerator();
8
+ }
6
9
  getVehicleDescriptor(tripRecord) {
7
10
  var _a;
8
- return Object.assign(Object.assign({ id: this.getVehicleId(tripRecord) }, (tripRecord.vehicle_registration_number && {
9
- label: tripRecord.vehicle_registration_number,
11
+ return Object.assign(Object.assign({ id: this.vehicleIdGenerator.getVehicleId(tripRecord.gtfs_route_type, tripRecord.gtfs_route_short_name, tripRecord.cis_trip_number, tripRecord.vehicle_registration_number, tripRecord.run_number) }, (tripRecord.vehicle_registration_number && {
12
+ label: tripRecord.vehicle_registration_number.toString(),
10
13
  })), { ".transit_realtime.ovapiVehicleDescriptor": {
11
14
  wheelchairAccessible: (_a = tripRecord.wheelchair_accessible) !== null && _a !== void 0 ? _a : undefined,
12
15
  vehicleType: tripRecord.vehicle_descriptor
@@ -14,15 +17,6 @@ class VehicleDescriptor {
14
17
  : undefined,
15
18
  } });
16
19
  }
17
- getVehicleId(feedEntity) {
18
- if (feedEntity.gtfs_route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN) {
19
- return "train-" + feedEntity.cis_trip_number;
20
- }
21
- if (feedEntity.gtfs_route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.METRO) {
22
- return "metro-" + feedEntity.gtfs_route_short_name + "-" + feedEntity.run_number;
23
- }
24
- return "service-" + feedEntity.gtfs_route_type + "-" + feedEntity.vehicle_registration_number;
25
- }
26
20
  }
27
21
  exports.VehicleDescriptor = VehicleDescriptor;
28
22
  //# sourceMappingURL=VehicleDescriptor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"VehicleDescriptor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.ts"],"names":[],"mappings":";;;AACA,0EAA+D;AAG/D,MAAa,iBAAiB;IACnB,oBAAoB,CAAC,UAA0B;;QAClD,qCACI,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAC9B,CAAC,UAAU,CAAC,2BAA2B,IAAI;YAC1C,KAAK,EAAE,UAAU,CAAC,2BAA2B;SAChD,CAAC,KACF,0CAA0C,EAAE;gBACxC,oBAAoB,EAAE,MAAA,UAAU,CAAC,qBAAqB,mCAAI,SAAS;gBACnE,WAAW,EAAE,UAAU,CAAC,kBAAkB;oBACtC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;oBACtF,CAAC,CAAC,SAAS;aAClB,IACH;IACN,CAAC;IAEO,YAAY,CAAC,UAA0B;QAC3C,IAAI,UAAU,CAAC,eAAe,KAAK,kCAAiB,CAAC,KAAK,EAAE;YACxD,OAAO,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC;SAChD;QAED,IAAI,UAAU,CAAC,eAAe,KAAK,kCAAiB,CAAC,KAAK,EAAE;YACxD,OAAO,QAAQ,GAAG,UAAU,CAAC,qBAAqB,GAAG,GAAG,GAAG,UAAU,CAAC,UAAU,CAAC;SACpF;QAED,OAAO,UAAU,GAAG,UAAU,CAAC,eAAe,GAAG,GAAG,GAAG,UAAU,CAAC,2BAA2B,CAAC;IAClG,CAAC;CACJ;AA3BD,8CA2BC"}
1
+ {"version":3,"file":"VehicleDescriptor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.ts"],"names":[],"mappings":";;;AAEA,6DAA0D;AAE1D,MAAa,iBAAiB;IAE1B;QACI,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,EAAE,CAAC;IACvD,CAAC;IACM,oBAAoB,CAAC,UAA0B;;QAClD,qCACI,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,YAAY,CACpC,UAAU,CAAC,eAAe,EAC1B,UAAU,CAAC,qBAAqB,EAChC,UAAU,CAAC,eAAe,EAC1B,UAAU,CAAC,2BAA2B,EACtC,UAAU,CAAC,UAAU,CACxB,IACE,CAAC,UAAU,CAAC,2BAA2B,IAAI;YAC1C,KAAK,EAAE,UAAU,CAAC,2BAA2B,CAAC,QAAQ,EAAE;SAC3D,CAAC,KACF,0CAA0C,EAAE;gBACxC,oBAAoB,EAAE,MAAA,UAAU,CAAC,qBAAqB,mCAAI,SAAS;gBACnE,WAAW,EAAE,UAAU,CAAC,kBAAkB;oBACtC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;oBACtF,CAAC,CAAC,SAAS;aAClB,IACH;IACN,CAAC;CACJ;AAzBD,8CAyBC"}
@@ -21,7 +21,7 @@ export interface IGtfsRtTripDto {
21
21
  cis_line_id: string | null;
22
22
  cis_trip_number: number | null;
23
23
  start_time: string | null;
24
- vehicle_registration_number: string | null;
24
+ vehicle_registration_number: number | null;
25
25
  gtfs_trip_id: string;
26
26
  gtfs_route_id: string | null;
27
27
  gtfs_route_type: GTFSRouteTypeEnum;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/pid",
3
- "version": "2.11.1-dev.1125776413",
3
+ "version": "2.11.1-dev.1127019328",
4
4
  "description": "Golemio PID Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",