@golemio/pid 2.8.3-dev.948391241 → 2.8.3-dev.948668951

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.
@@ -4,6 +4,7 @@ import { IVPTripsLastPositionContext } from "../../../../../../../schema-definit
4
4
  export default abstract class AbstractDelayAtStop {
5
5
  abstract updateContext(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate | null, position: IVPTripsPositionAttributes): IVPTripsLastPositionContext;
6
6
  abstract updatePosition(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate, position: IVPTripsPositionAttributes | undefined): IPositionToUpdate;
7
+ protected calcDelayAtStop(actualTimestamp: number, scheduledTimestamp: Date | undefined): number | null;
7
8
  protected resetContext(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate | null, position: IVPTripsPositionAttributes | undefined): IVPTripsLastPositionContext;
8
9
  protected isContextChange(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate | null, position: IVPTripsPositionAttributes | undefined): boolean;
9
10
  }
@@ -5,6 +5,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
5
5
  * If position was already processed positionToUpdate is null so position instance should be checked.
6
6
  */
7
7
  class AbstractDelayAtStop {
8
+ calcDelayAtStop(actualTimestamp, scheduledTimestamp) {
9
+ if (!scheduledTimestamp) {
10
+ return null;
11
+ }
12
+ return (actualTimestamp - scheduledTimestamp.getTime()) / 1000;
13
+ }
8
14
  resetContext(context, positionToUpdate, position) {
9
15
  if (this.isContextChange(context, positionToUpdate, position)) {
10
16
  context.lastPositionLastStop.arrival_time = null;
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.ts"],"names":[],"mappings":";;AAKA;;;GAGG;AACH,MAA8B,mBAAmB;IAanC,YAAY,CAClB,OAAoC,EACpC,gBAA0C,EAC1C,QAAgD;QAEhD,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE;YAC3D,OAAO,CAAC,oBAAoB,CAAC,YAAY,GAAG,IAAI,CAAC;YACjD,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,IAAI,CAAC;YAClD,OAAO,CAAC,oBAAoB,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC7C,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,IAAI,CAAC;YACnD,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,IAAI,CAAC;SACvD;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,eAAe,CACrB,OAAoC,EACpC,gBAA0C,EAC1C,QAAgD;;QAEhD,OAAO,OAAO,CAAC,oBAAoB,CAAC,QAAQ,KAAK,CAAC,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAC,CAAC;IAC5H,CAAC;CACJ;AApCD,sCAoCC"}
1
+ {"version":3,"file":"AbstractDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.ts"],"names":[],"mappings":";;AAKA;;;GAGG;AACH,MAA8B,mBAAmB;IAanC,eAAe,CAAC,eAAuB,EAAE,kBAAoC;QACnF,IAAI,CAAC,kBAAkB,EAAE;YACrB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,CAAC,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;IACnE,CAAC;IAES,YAAY,CAClB,OAAoC,EACpC,gBAA0C,EAC1C,QAAgD;QAEhD,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE;YAC3D,OAAO,CAAC,oBAAoB,CAAC,YAAY,GAAG,IAAI,CAAC;YACjD,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,IAAI,CAAC;YAClD,OAAO,CAAC,oBAAoB,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC7C,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,IAAI,CAAC;YACnD,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,IAAI,CAAC;SACvD;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,eAAe,CACrB,OAAoC,EACpC,gBAA0C,EAC1C,QAAgD;;QAEhD,OAAO,OAAO,CAAC,oBAAoB,CAAC,QAAQ,KAAK,CAAC,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAC,CAAC;IAC5H,CAAC;CACJ;AA5CD,sCA4CC"}
@@ -7,7 +7,7 @@ const const_1 = require("../../../../../../../const");
7
7
  const AbstractDelayAtStop_1 = __importDefault(require("./AbstractDelayAtStop"));
8
8
  class CommonDelayAtStop extends AbstractDelayAtStop_1.default {
9
9
  updateContext(context, positionToUpdate, position) {
10
- var _a, _b;
10
+ var _a, _b, _c, _d;
11
11
  if (!this.hasTcpEvent(position) || position.tracking !== const_1.PositionTrackingEnum.TRACKING) {
12
12
  return context;
13
13
  }
@@ -16,15 +16,15 @@ class CommonDelayAtStop extends AbstractDelayAtStop_1.default {
16
16
  context.lastPositionLastStop.sequence = (_b = (_a = positionToUpdate === null || positionToUpdate === void 0 ? void 0 : positionToUpdate.last_stop_sequence) !== null && _a !== void 0 ? _a : position === null || position === void 0 ? void 0 : position.last_stop_sequence) !== null && _b !== void 0 ? _b : null;
17
17
  }
18
18
  if (this.didVehicleArrive(position)) {
19
- context.lastPositionLastStop.arrival_delay = context.lastPositionDelay;
19
+ context.lastPositionLastStop.arrival_delay = (_c = positionToUpdate === null || positionToUpdate === void 0 ? void 0 : positionToUpdate.delay_stop_arrival) !== null && _c !== void 0 ? _c : context.lastPositionDelay;
20
20
  }
21
21
  else if (this.didVehicleDepart(position)) {
22
- context.lastPositionLastStop.departure_delay = context.lastPositionDelay;
22
+ context.lastPositionLastStop.departure_delay = (_d = positionToUpdate === null || positionToUpdate === void 0 ? void 0 : positionToUpdate.delay_stop_departure) !== null && _d !== void 0 ? _d : context.lastPositionDelay;
23
23
  }
24
24
  return context;
25
25
  }
26
26
  updatePosition(context, positionToUpdate, position) {
27
- var _a, _b, _c, _d;
27
+ var _a, _b;
28
28
  if (positionToUpdate.state_position === const_1.StatePositionEnum.AFTER_TRACK) {
29
29
  positionToUpdate.delay_stop_arrival = (_b = (_a = positionToUpdate.delay) !== null && _a !== void 0 ? _a : position === null || position === void 0 ? void 0 : position.delay) !== null && _b !== void 0 ? _b : 0;
30
30
  }
@@ -33,10 +33,10 @@ class CommonDelayAtStop extends AbstractDelayAtStop_1.default {
33
33
  }
34
34
  context = this.resetContext(context, positionToUpdate, position);
35
35
  if (this.didVehicleArrive(position)) {
36
- positionToUpdate.delay_stop_arrival = (_c = positionToUpdate.delay) !== null && _c !== void 0 ? _c : position.delay;
36
+ positionToUpdate.delay_stop_arrival = this.calcDelayAtStop(position.origin_timestamp.getTime(), positionToUpdate.last_stop_arrival_time);
37
37
  }
38
38
  else if (this.didVehicleDepart(position)) {
39
- positionToUpdate.delay_stop_departure = (_d = positionToUpdate.delay) !== null && _d !== void 0 ? _d : position.delay;
39
+ positionToUpdate.delay_stop_departure = this.calcDelayAtStop(position.origin_timestamp.getTime(), positionToUpdate.last_stop_departure_time);
40
40
  }
41
41
  return this.updatePositionStopDelays(positionToUpdate, context);
42
42
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CommonDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CommonDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.ts"],"names":[],"mappings":";;;;;AAGA,sDAAkF;AAClF,gFAAwD;AAExD,MAAqB,iBAAkB,SAAQ,6BAAmB;IACvD,aAAa,CAChB,OAAoC,EACpC,gBAA0C,EAC1C,QAAoC;;QAEpC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,EAAE;YACpF,OAAO,OAAO,CAAC;SAClB;QAED,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAEjE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,EAAE;YACxC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,GAAG,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,mCAAI,IAAI,CAAC;SACxH;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACjC,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,mCAAI,OAAO,CAAC,iBAAiB,CAAC;SAClH;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACxC,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,oBAAoB,mCAAI,OAAO,CAAC,iBAAiB,CAAC;SACtH;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,cAAc,CACjB,OAAoC,EACpC,gBAAmC,EACnC,QAAgD;;QAEhD,IAAI,gBAAgB,CAAC,cAAc,KAAK,yBAAiB,CAAC,WAAW,EAAE;YACnE,gBAAgB,CAAC,kBAAkB,GAAG,MAAA,MAAA,gBAAgB,CAAC,KAAK,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,mCAAI,CAAC,CAAC;SACxF;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,EAAE;YACpF,OAAO,gBAAgB,CAAC;SAC3B;QAED,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAEjE,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACjC,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC,eAAe,CACtD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,EACnC,gBAAgB,CAAC,sBAAsB,CAC1C,CAAC;SACL;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACxC,gBAAgB,CAAC,oBAAoB,GAAG,IAAI,CAAC,eAAe,CACxD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,EACnC,gBAAgB,CAAC,wBAAwB,CAC5C,CAAC;SACL;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAEO,WAAW,CAAC,QAAgD;QAChE,OAAO,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAA,KAAK,QAAQ,CAAC;IACnD,CAAC;IAEO,gBAAgB,CAAC,QAAoC;QACzD,OAAO,QAAQ,CAAC,SAAS,KAAK,oBAAY,CAAC,iBAAiB,CAAC;IACjE,CAAC;IAEO,gBAAgB,CAAC,QAAoC;QACzD,OAAO,QAAQ,CAAC,SAAS,KAAK,oBAAY,CAAC,UAAU,CAAC;IAC1D,CAAC;IAEO,wBAAwB,CAC5B,gBAAmC,EACnC,OAAoC;QAEpC,MAAM,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAAC;QAEtE,IACI,CAAC,kBAAkB,KAAK,IAAI,IAAI,kBAAkB,KAAK,SAAS,CAAC;YACjE,OAAO,CAAC,oBAAoB,CAAC,aAAa,KAAK,IAAI,EACrD;YACE,gBAAgB,CAAC,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC;SACpF;QAED,IACI,CAAC,oBAAoB,KAAK,IAAI,IAAI,oBAAoB,KAAK,SAAS,CAAC;YACrE,OAAO,CAAC,oBAAoB,CAAC,eAAe,KAAK,IAAI,EACvD;YACE,gBAAgB,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC;SACxF;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ;AAzFD,oCAyFC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/pid",
3
- "version": "2.8.3-dev.948391241",
3
+ "version": "2.8.3-dev.948668951",
4
4
  "description": "Golemio PID Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",