@golemio/pid 2.2.12-dev.651500043 → 2.2.12

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,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const models_1 = require("../../../models");
7
- const BusDelayAtStop_1 = __importDefault(require("./BusDelayAtStop"));
8
7
  const TramDelayAtStop_1 = __importDefault(require("./TramDelayAtStop"));
9
8
  class FactoryDelayAtStop {
10
9
  constructor() {
11
10
  this.dictionary = new Map();
12
11
  this.dictionary.set(models_1.GTFSRouteTypeEnum.TRAM, new TramDelayAtStop_1.default());
13
- this.dictionary.set(models_1.GTFSRouteTypeEnum.BUS, new BusDelayAtStop_1.default());
12
+ // TODO Temporarily disable delay at stop calculation for busses
13
+ // https://gitlab.com/operator-ict/golemio/code/modules/pid/-/issues/168#note_1115019230
14
+ // this.dictionary.set(GTFSRouteTypeEnum.BUS, new BusDelayAtStop());
14
15
  }
15
16
  static getInstance() {
16
17
  if (!this._instance) {
@@ -1 +1 @@
1
- {"version":3,"file":"FactoryDelayAtStop.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/helpers/compute-positions/strategy/FactoryDelayAtStop.ts"],"names":[],"mappings":";;;;;AAAA,4CAAiE;AAEjE,sEAA8C;AAC9C,wEAAgD;AAEhD,MAAqB,kBAAkB;IAYnC;QACI,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAA0C,CAAC;QACpE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,0BAAiB,CAAC,IAAI,EAAE,IAAI,yBAAe,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,0BAAiB,CAAC,GAAG,EAAE,IAAI,wBAAc,EAAE,CAAC,CAAC;IACrE,CAAC;IAZM,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;SAC7C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAQM,WAAW,CAAC,aAAgC;QAC/C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAE,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAzBD,qCAyBC"}
1
+ {"version":3,"file":"FactoryDelayAtStop.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/helpers/compute-positions/strategy/FactoryDelayAtStop.ts"],"names":[],"mappings":";;;;;AAAA,4CAAiE;AAGjE,wEAAgD;AAEhD,MAAqB,kBAAkB;IAYnC;QACI,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAA0C,CAAC;QACpE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,0BAAiB,CAAC,IAAI,EAAE,IAAI,yBAAe,EAAE,CAAC,CAAC;QACnE,gEAAgE;QAChE,wFAAwF;QACxF,oEAAoE;IACxE,CAAC;IAdM,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;SAC7C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAUM,WAAW,CAAC,aAAgC;QAC/C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAE,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA3BD,qCA2BC"}
@@ -25,7 +25,9 @@ class TramDelayAtStop extends AbstractDelayAtStop_1.default {
25
25
  if (position && this.didTramArrive(position)) {
26
26
  positionToUpdate.delay_stop_arrival = this.calcDelayAtStop(position.origin_timestamp, positionToUpdate.last_stop_arrival_time);
27
27
  }
28
- else if (position && this.didTramDeparture(position, positionToUpdate, context)) {
28
+ else if (position &&
29
+ this.didTramDeparture(position, positionToUpdate, context) &&
30
+ !positionToUpdate.delay_stop_departure) {
29
31
  positionToUpdate.delay_stop_departure = this.calcDelayAtStop(position.origin_timestamp, positionToUpdate.last_stop_departure_time);
30
32
  }
31
33
  return positionToUpdate;
@@ -1 +1 @@
1
- {"version":3,"file":"TramDelayAtStop.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.ts"],"names":[],"mappings":";;;;;AAEA,gDAA+D;AAC/D,gFAAwD;AAExD,MAAqB,eAAgB,SAAQ,6BAAmB;IACrD,aAAa,CAChB,OAA0B,EAC1B,gBAA0C,EAC1C,QAAiC;;QAEjC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC9B,OAAO,CAAC,oBAAoB,CAAC,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC;YACtE,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;YACrH,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,IAAI,CAAC;SACtD;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE;YACnE,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAAC;SAC3E;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,cAAc,CACjB,OAA0B,EAC1B,gBAAmC,EACnC,QAA6C;QAE7C,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,gBAAgB,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEhF,IAAI,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC1C,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC,eAAe,CACtD,QAAQ,CAAC,gBAAgB,EACzB,gBAAgB,CAAC,sBAAuB,CAC3C,CAAC;SACL;aAAM,IAAI,QAAQ,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE;YAC/E,gBAAgB,CAAC,oBAAoB,GAAG,IAAI,CAAC,eAAe,CACxD,QAAQ,CAAC,gBAAiB,EAC1B,gBAAgB,CAAC,wBAAyB,CAC7C,CAAC;SACL;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAEO,aAAa,CAAC,QAA6C;QAC/D,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,MAAK,oBAAY,CAAC,iBAAiB,IAAI,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,CAAC;IACzH,CAAC;IAEO,gBAAgB,CACpB,QAA6C,EAC7C,gBAA0C,EAC1C,OAA0B;;QAE1B,OAAO,CACH,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,MAAK,oBAAY,CAAC,UAAU;YAC/C,OAAO,CAAC,oBAAoB,CAAC,QAAQ,KAAK,CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,mCAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,CAAC;YAChH,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,CACtD,CAAC;IACN,CAAC;CACJ;AAxDD,kCAwDC"}
1
+ {"version":3,"file":"TramDelayAtStop.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.ts"],"names":[],"mappings":";;;;;AAEA,gDAA+D;AAC/D,gFAAwD;AAExD,MAAqB,eAAgB,SAAQ,6BAAmB;IACrD,aAAa,CAChB,OAA0B,EAC1B,gBAA0C,EAC1C,QAAiC;;QAEjC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC9B,OAAO,CAAC,oBAAoB,CAAC,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC;YACtE,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;YACrH,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,IAAI,CAAC;SACtD;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE;YACnE,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAAC;SAC3E;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,cAAc,CACjB,OAA0B,EAC1B,gBAAmC,EACnC,QAA6C;QAE7C,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,gBAAgB,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEhF,IAAI,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC1C,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC,eAAe,CACtD,QAAQ,CAAC,gBAAgB,EACzB,gBAAgB,CAAC,sBAAuB,CAC3C,CAAC;SACL;aAAM,IACH,QAAQ;YACR,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC;YAC1D,CAAC,gBAAgB,CAAC,oBAAoB,EACxC;YACE,gBAAgB,CAAC,oBAAoB,GAAG,IAAI,CAAC,eAAe,CACxD,QAAQ,CAAC,gBAAiB,EAC1B,gBAAgB,CAAC,wBAAyB,CAC7C,CAAC;SACL;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAEO,aAAa,CAAC,QAA6C;QAC/D,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,MAAK,oBAAY,CAAC,iBAAiB,IAAI,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,CAAC;IACzH,CAAC;IAEO,gBAAgB,CACpB,QAA6C,EAC7C,gBAA0C,EAC1C,OAA0B;;QAE1B,OAAO,CACH,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,MAAK,oBAAY,CAAC,UAAU;YAC/C,OAAO,CAAC,oBAAoB,CAAC,QAAQ,KAAK,CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,mCAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,CAAC;YAChH,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,CACtD,CAAC;IACN,CAAC;CACJ;AA5DD,kCA4DC"}
package/package.json CHANGED
@@ -1,78 +1,78 @@
1
1
  {
2
- "name": "@golemio/pid",
3
- "version": "2.2.12-dev.651500043",
4
- "description": "Golemio PID Module",
5
- "main": "dist/index.js",
6
- "types": "dist/index.d.ts",
7
- "scripts": {
8
- "build": "rimraf ./dist && ttsc -p ./tsconfig.build.json",
9
- "build-minimal": "run-s 'build --sourceMap false --declaration false'",
10
- "build-watch": "run-s 'build --watch --preserveWatchOutput'",
11
- "pretest": "golemio import-db-data",
12
- "test": "cross-env NODE_ENV='test' TS_NODE_COMPILER='ttypescript' TZ='UTC' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
13
- "test-debug": "run-s 'test --inspect-brk=9230'",
14
- "code-coverage": "nyc run-s 'test -r source-map-support/register'",
15
- "generate-docs": "typedoc --out docs/typedoc src",
16
- "lint": "eslint --cache \"{src,test}/**/*.ts\""
17
- },
18
- "keywords": [
19
- "golemio"
20
- ],
21
- "author": "Operator ICT, a.s.",
22
- "license": "MIT",
23
- "repository": {
24
- "type": "git",
25
- "url": "https://gitlab.com/operator-ict/golemio/code/modules/pid"
26
- },
27
- "devDependencies": {
28
- "@commitlint/cli": "^11.0.0",
29
- "@commitlint/config-conventional": "^11.0.0",
30
- "@golemio/cli": "1.3.2-dev.650635067",
31
- "@golemio/core": "1.2.19-dev.648810013",
32
- "@golemio/db-common": "1.0.1",
33
- "@golemio/eslint-config": "^1.1.0",
34
- "@ovos-media/ts-transform-paths": "^1.7.18-1",
35
- "@types/amqplib": "^0.5.17",
36
- "@types/chai": "4.2.3",
37
- "@types/chai-as-promised": "7.1.2",
38
- "@types/mocha": "^9.1.1",
39
- "@types/node": "^16.11.35",
40
- "@types/pg-copy-streams": "^1.2.1",
41
- "@types/sinon": "^9.0.10",
42
- "@types/supertest": "^2.0.10",
43
- "body-parser": "^1.19.0",
44
- "body-parser-xml": "^2.0.0",
45
- "chai": "4.2.0",
46
- "chai-as-promised": "7.1.1",
47
- "cross-env": "^7.0.3",
48
- "dotenv": "^8.2.0",
49
- "eslint": "^8.1.1",
50
- "husky": "^4.3.7",
51
- "mocha": "^10.0.0",
52
- "npm-run-all": "^4.1.5",
53
- "nyc": "^15.1.0",
54
- "prettier": "^2.5.1",
55
- "pretty-quick": "^3.1.0",
56
- "rimraf": "^3.0.2",
57
- "sinon": "^9.2.3",
58
- "source-map-support": "0.5.19",
59
- "supertest": "^6.0.1",
60
- "ts-node": "^10.7.0",
61
- "ttypescript": "^1.5.13",
62
- "typedoc": "^0.22.15",
63
- "typescript": "4.6.4"
64
- },
65
- "peerDependencies": {
66
- "@golemio/core": "^1.2.17"
67
- },
68
- "dependencies": {
69
- "@golemio/ovapi-gtfs-realtime-bindings": "1.0.0",
70
- "@turf/turf": "^6.5.0",
71
- "JSONStream": "^1.3.5",
72
- "cheap-ruler": "^2.5.1",
73
- "csv-parser": "^3.0.0",
74
- "csv-stringify": "^5.6.2",
75
- "html-entities": "^2.3.3",
76
- "pg-copy-streams": "^5.1.1"
77
- }
2
+ "name": "@golemio/pid",
3
+ "version": "2.2.12",
4
+ "description": "Golemio PID Module",
5
+ "main": "dist/index.js",
6
+ "types": "dist/index.d.ts",
7
+ "scripts": {
8
+ "build": "rimraf ./dist && ttsc -p ./tsconfig.build.json",
9
+ "build-minimal": "run-s 'build --sourceMap false --declaration false'",
10
+ "build-watch": "run-s 'build --watch --preserveWatchOutput'",
11
+ "pretest": "golemio import-db-data",
12
+ "test": "cross-env NODE_ENV='test' TS_NODE_COMPILER='ttypescript' TZ='UTC' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
13
+ "test-debug": "run-s 'test --inspect-brk=9230'",
14
+ "code-coverage": "nyc run-s 'test -r source-map-support/register'",
15
+ "generate-docs": "typedoc --out docs/typedoc src",
16
+ "lint": "eslint --cache \"{src,test}/**/*.ts\""
17
+ },
18
+ "keywords": [
19
+ "golemio"
20
+ ],
21
+ "author": "Operator ICT, a.s.",
22
+ "license": "MIT",
23
+ "repository": {
24
+ "type": "git",
25
+ "url": "https://gitlab.com/operator-ict/golemio/code/modules/pid"
26
+ },
27
+ "devDependencies": {
28
+ "@commitlint/cli": "^11.0.0",
29
+ "@commitlint/config-conventional": "^11.0.0",
30
+ "@golemio/cli": "1.3.2-dev.650635067",
31
+ "@golemio/core": "1.2.19-dev.648810013",
32
+ "@golemio/db-common": "1.0.1",
33
+ "@golemio/eslint-config": "^1.1.0",
34
+ "@ovos-media/ts-transform-paths": "^1.7.18-1",
35
+ "@types/amqplib": "^0.5.17",
36
+ "@types/chai": "4.2.3",
37
+ "@types/chai-as-promised": "7.1.2",
38
+ "@types/mocha": "^9.1.1",
39
+ "@types/node": "^16.11.35",
40
+ "@types/pg-copy-streams": "^1.2.1",
41
+ "@types/sinon": "^9.0.10",
42
+ "@types/supertest": "^2.0.10",
43
+ "body-parser": "^1.19.0",
44
+ "body-parser-xml": "^2.0.0",
45
+ "chai": "4.2.0",
46
+ "chai-as-promised": "7.1.1",
47
+ "cross-env": "^7.0.3",
48
+ "dotenv": "^8.2.0",
49
+ "eslint": "^8.1.1",
50
+ "husky": "^4.3.7",
51
+ "mocha": "^10.0.0",
52
+ "npm-run-all": "^4.1.5",
53
+ "nyc": "^15.1.0",
54
+ "prettier": "^2.5.1",
55
+ "pretty-quick": "^3.1.0",
56
+ "rimraf": "^3.0.2",
57
+ "sinon": "^9.2.3",
58
+ "source-map-support": "0.5.19",
59
+ "supertest": "^6.0.1",
60
+ "ts-node": "^10.7.0",
61
+ "ttypescript": "^1.5.13",
62
+ "typedoc": "^0.22.15",
63
+ "typescript": "4.6.4"
64
+ },
65
+ "peerDependencies": {
66
+ "@golemio/core": "^1.2.17"
67
+ },
68
+ "dependencies": {
69
+ "@golemio/ovapi-gtfs-realtime-bindings": "1.0.0",
70
+ "@turf/turf": "^6.5.0",
71
+ "JSONStream": "^1.3.5",
72
+ "cheap-ruler": "^2.5.1",
73
+ "csv-parser": "^3.0.0",
74
+ "csv-stringify": "^5.6.2",
75
+ "html-entities": "^2.3.3",
76
+ "pg-copy-streams": "^5.1.1"
77
+ }
78
78
  }