@golemio/pid 5.15.4-dev.2629000433 → 5.16.0-rc.2635246332
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.
- package/db/example/19_train_trip_with_cis_platform_code.sql +4 -9
- package/dist/integration-engine/jis/ioc/Di.js +2 -2
- package/dist/integration-engine/jis/ioc/Di.js.map +1 -1
- package/dist/integration-engine/jis/ioc/JISContainerToken.d.ts +1 -1
- package/dist/integration-engine/jis/ioc/JISContainerToken.js +1 -1
- package/dist/integration-engine/jis/ioc/JISContainerToken.js.map +1 -1
- package/dist/integration-engine/jis/repositories/JISEventsRepository.d.ts +0 -1
- package/dist/integration-engine/jis/repositories/JISEventsRepository.js +0 -14
- package/dist/integration-engine/jis/repositories/JISEventsRepository.js.map +1 -1
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.d.ts +3 -2
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.js +28 -22
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.js.map +1 -1
- package/dist/integration-engine/jis/transformations/{JISInfotextCacheTransformation.d.ts → JISInfotextCacheTranformation.d.ts} +1 -1
- package/dist/integration-engine/jis/transformations/{JISInfotextCacheTransformation.js → JISInfotextCacheTranformation.js} +7 -7
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.js.map +1 -0
- package/dist/integration-engine/jis/transformations/JISInfotextsTransformation.js +0 -1
- package/dist/integration-engine/jis/transformations/JISInfotextsTransformation.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.d.ts +3 -3
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.js +6 -6
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/RopidGtfsRepository.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/RopidGtfsRepository.js +0 -10
- package/dist/integration-engine/ropid-gtfs/data-access/RopidGtfsRepository.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshPrecomputedTablesTask.js +0 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshPrecomputedTablesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/ioc/Di.js +0 -8
- package/dist/integration-engine/vehicle-positions/ioc/Di.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.d.ts +0 -1
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js +0 -3
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/interfaces/AlertsInterfaces.d.ts +1 -11
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/interfaces/AlertsInterfaces.js +0 -8
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/interfaces/AlertsInterfaces.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.d.ts +1 -4
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.js +7 -29
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.js +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.js.map +1 -1
- package/dist/output-gateway/jis/data-access/JISEventsRepository.js +0 -1
- package/dist/output-gateway/jis/data-access/JISEventsRepository.js.map +1 -1
- package/dist/{helpers/jis → output-gateway/pid/helpers}/JISInfotextStopSuppressionFilter.d.ts +2 -2
- package/dist/{helpers/jis → output-gateway/pid/helpers}/JISInfotextStopSuppressionFilter.js +18 -18
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.js.map +1 -0
- package/dist/output-gateway/pid/ioc/Di.js +1 -1
- package/dist/output-gateway/pid/ioc/Di.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/InfotextFacade.d.ts +1 -1
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js +1 -1
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/routers/v2/V2VehiclePositionsRouter.js +0 -1
- package/dist/output-gateway/vehicle-positions/routers/v2/V2VehiclePositionsRouter.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/JISInfotextsJsonSchema.js +0 -2
- package/dist/schema-definitions/jis/datasources/JISInfotextsJsonSchema.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/interfaces/IJISInfotext.d.ts +0 -1
- package/dist/schema-definitions/jis/models/JISInfotextsModel.d.ts +0 -1
- package/dist/schema-definitions/jis/models/JISInfotextsModel.js +0 -5
- package/dist/schema-definitions/jis/models/JISInfotextsModel.js.map +1 -1
- package/dist/schema-definitions/jis/models/interfaces/IJISInfotext.d.ts +0 -1
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.d.ts +0 -1
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.js +0 -4
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/interfaces/IPublicStopTimeDto.d.ts +0 -1
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IPublicStopTimeCacheDto.d.ts +0 -1
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js +0 -4
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js.map +1 -1
- package/docs/cache/types/redis.md +0 -1
- package/docs/implementation_documentation.md +0 -41
- package/docs/openapi-input.yaml +0 -7
- package/docs/openapi-output.yaml +0 -24
- package/package.json +2 -2
- package/db/migrations/postgresql/20260611120000-jis-infotexts-event-id.js +0 -49
- package/db/migrations/postgresql/20260615120000-create-shapes-for-mvt-view.js +0 -53
- package/db/migrations/postgresql/20260617140000-add-assigned-stop-id-to-combined-stop-times.js +0 -49
- package/db/migrations/postgresql/sqls/20260611120000-jis-infotexts-event-id-down.sql +0 -2
- package/db/migrations/postgresql/sqls/20260611120000-jis-infotexts-event-id-up.sql +0 -2
- package/db/migrations/postgresql/sqls/20260615120000-create-shapes-for-mvt-view-down.sql +0 -2
- package/db/migrations/postgresql/sqls/20260615120000-create-shapes-for-mvt-view-up.sql +0 -27
- package/db/migrations/postgresql/sqls/20260617140000-add-assigned-stop-id-to-combined-stop-times-down.sql +0 -52
- package/db/migrations/postgresql/sqls/20260617140000-add-assigned-stop-id-to-combined-stop-times-up.sql +0 -60
- package/dist/helpers/jis/JISInfotextStopSuppressionFilter.js.map +0 -1
- package/dist/helpers/jis/getJISStopId.d.ts +0 -4
- package/dist/helpers/jis/getJISStopId.js +0 -7
- package/dist/helpers/jis/getJISStopId.js.map +0 -1
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTransformation.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/DisplayAlertsGenerator.d.ts +0 -15
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/DisplayAlertsGenerator.js +0 -55
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/DisplayAlertsGenerator.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.d.ts +0 -15
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.js +0 -58
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.js.map +0 -1
|
@@ -8,7 +8,6 @@ exports.jisInfotextsJsonSchema = {
|
|
|
8
8
|
type: "object",
|
|
9
9
|
properties: {
|
|
10
10
|
id: { type: "string" },
|
|
11
|
-
event_id: { type: "string" },
|
|
12
11
|
severity_level: { type: "string", enum: Object.values(JISInfotextSeverityLevelEnum_1.JISInfotextSeverityLevel) },
|
|
13
12
|
display_type: { type: "string", enum: ["GENERAL", "INLINE"] },
|
|
14
13
|
active_period: {
|
|
@@ -86,7 +85,6 @@ exports.jisInfotextsJsonSchema = {
|
|
|
86
85
|
},
|
|
87
86
|
required: [
|
|
88
87
|
"id",
|
|
89
|
-
"event_id",
|
|
90
88
|
"severity_level",
|
|
91
89
|
"display_type",
|
|
92
90
|
"active_period",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/datasources/JISInfotextsJsonSchema.ts"],"names":[],"mappings":";;;AAAA,oGAAqF;AAIxE,QAAA,sBAAsB,GAAmC;IAClE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,
|
|
1
|
+
{"version":3,"file":"JISInfotextsJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/datasources/JISInfotextsJsonSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import { IJISInfotextPreset } from "./IJISInfotextPreset";
|
|
|
4
4
|
import { IJISTranslationText } from "./IJISTranslationText";
|
|
5
5
|
export interface IJISInfotext {
|
|
6
6
|
id: string;
|
|
7
|
-
event_id: string;
|
|
8
7
|
severity_level: JISInfotextSeverityLevel;
|
|
9
8
|
display_type: string;
|
|
10
9
|
active_period: {
|
|
@@ -7,7 +7,6 @@ import { IJISInfotext, IJISTranslationText } from "./interfaces";
|
|
|
7
7
|
export declare class JISInfotextsModel extends Model<InferAttributes<JISInfotextsModel>, InferCreationAttributes<JISInfotextsModel>> implements IJISInfotext {
|
|
8
8
|
static tableName: string;
|
|
9
9
|
id: string;
|
|
10
|
-
jis_event_id: string | null;
|
|
11
10
|
severity_level: JISInfotextSeverityLevel;
|
|
12
11
|
display_type: string;
|
|
13
12
|
active_period_start: Date;
|
|
@@ -13,10 +13,6 @@ JISInfotextsModel.attributeModel = {
|
|
|
13
13
|
allowNull: false,
|
|
14
14
|
type: sequelize_1.DataTypes.UUID,
|
|
15
15
|
},
|
|
16
|
-
jis_event_id: {
|
|
17
|
-
type: sequelize_1.DataTypes.UUID,
|
|
18
|
-
allowNull: true,
|
|
19
|
-
},
|
|
20
16
|
severity_level: {
|
|
21
17
|
type: sequelize_1.DataTypes.ENUM(...Object.values(JISInfotextSeverityLevelEnum_1.JISInfotextSeverityLevel)),
|
|
22
18
|
allowNull: false,
|
|
@@ -71,7 +67,6 @@ JISInfotextsModel.jsonSchema = {
|
|
|
71
67
|
type: "object",
|
|
72
68
|
properties: {
|
|
73
69
|
id: { type: "string" },
|
|
74
|
-
jis_event_id: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
|
|
75
70
|
severity_level: { type: "string", enum: Object.values(JISInfotextSeverityLevelEnum_1.JISInfotextSeverityLevel) },
|
|
76
71
|
display_type: { type: "string", enum: ["GENERAL", "INLINE"] },
|
|
77
72
|
active_period_start: { type: "object", required: ["toISOString"] },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/models/JISInfotextsModel.ts"],"names":[],"mappings":";;;AAAA,oGAAqF;AAIrF,mEAO6C;AAG7C,MAAa,iBACT,SAAQ,iBAAqF;;AADjG,
|
|
1
|
+
{"version":3,"file":"JISInfotextsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/models/JISInfotextsModel.ts"],"names":[],"mappings":";;;AAAA,oGAAqF;AAIrF,mEAO6C;AAG7C,MAAa,iBACT,SAAQ,iBAAqF;;AADjG,8CAgIC;AA5HiB,2BAAS,GAAG,eAAe,CAAC;AAoB5B,gCAAc,GAAuC;IAC/D,EAAE,EAAE;QACA,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,cAAc,EAAE;QACZ,IAAI,EAAE,qBAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,uDAAwB,CAAC,CAAC;QAChE,SAAS,EAAE,KAAK;KACnB;IACD,YAAY,EAAE;QACV,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,SAAS,EAAE,KAAK;KACnB;IACD,mBAAmB,EAAE;QACjB,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,KAAK;KACnB;IACD,iBAAiB,EAAE;QACf,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,gBAAgB,EAAE;QACd,IAAI,EAAE,qBAAS,CAAC,KAAK;QACrB,SAAS,EAAE,KAAK;KACnB;IACD,cAAc,EAAE;QACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,YAAY,EAAE,KAAK;KACtB;IACD,iBAAiB,EAAE;QACf,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,IAAI;KAClB;IACD,eAAe,EAAE;QACb,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,IAAI;KAClB;IACD,iBAAiB,EAAE;QACf,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,KAAK;KACnB;IACD,iBAAiB,EAAE;QACf,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,KAAK;KACnB;IACD,UAAU,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,KAAK;KACnB;IACD,UAAU,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,KAAK;KACnB;CACJ,CAAC;AAEY,4BAAU,GAAmC;IACvD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,uDAAwB,CAAC,EAAE;YACjF,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;YAC7D,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,EAAE;YAClE,iBAAiB,EAAE;gBACf,KAAK,EAAE;oBACH,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,EAAE;oBAC7C,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,gBAAgB,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE;YACvD,cAAc,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACnC,iBAAiB,EAAE;gBACf,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAChE;YACD,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAChE;YACD,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,EAAE;YAChE,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,EAAE;SACnE;QACD,oBAAoB,EAAE,KAAK;QAC3B,QAAQ,EAAE;YACN,IAAI;YACJ,gBAAgB;YAChB,cAAc;YACd,qBAAqB;YACrB,kBAAkB;YAClB,mBAAmB;YACnB,mBAAmB;SACtB;KACJ;IACD,WAAW,EAAE;QACT,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACtB,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;aACxE;YACD,oBAAoB,EAAE,KAAK;YAC3B,QAAQ,EAAE,CAAC,IAAI,CAAC;SACnB;KACJ;CACJ,CAAC"}
|
|
@@ -2,7 +2,6 @@ import { JISInfotextSeverityLevel } from "../../../../helpers/jis/JISInfotextSev
|
|
|
2
2
|
import { IJISTranslationText } from "./IJISTranslationText";
|
|
3
3
|
export interface IJISInfotext {
|
|
4
4
|
id: string;
|
|
5
|
-
jis_event_id: string | null;
|
|
6
5
|
severity_level: JISInfotextSeverityLevel;
|
|
7
6
|
display_type: string;
|
|
8
7
|
active_period_start: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicStopTimeModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.ts"],"names":[],"mappings":";;;AAEA,mEAAwF;AAGxF,MAAa,mBAAoB,SAAQ,iBAA0B;;AAAnE,
|
|
1
|
+
{"version":3,"file":"PublicStopTimeModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.ts"],"names":[],"mappings":";;;AAEA,mEAAwF;AAGxF,MAAa,mBAAoB,SAAQ,iBAA0B;;AAAnE,kDAwFC;AAvFiB,6BAAS,GAAG,+CAA+C,CAAC;AAmB5D,kCAAc,GAAyC;IACjE,UAAU,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,IAAI;KACnB;IACD,YAAY,EAAE;QACV,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;KACnB;IACD,aAAa,EAAE;QACX,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,IAAI;KACnB;IACD,cAAc,EAAE;QACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI;KAClB;IACD,cAAc,EAAE;QACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI;KAClB;IACD,eAAe,EAAE;QACb,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI;KAClB;IACD,qBAAqB,EAAE;QACnB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,IAAI;KAClB;IACD,UAAU,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI;KAClB;IACD,mBAAmB,EAAE;QACjB,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI;KAClB;IACD,oBAAoB,EAAE;QAClB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACzB,SAAS,EAAE,KAAK;KACnB;IACD,eAAe,EAAE;QACb,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI;KAClB;IACD,2BAA2B,EAAE;QACzB,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,IAAI;KAClB;IACD,sBAAsB,EAAE;QACpB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,IAAI;KAClB;IACD,aAAa,EAAE;QACX,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,IAAI;KAClB;IACD,OAAO,EAAE;QACL,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;KACnB;IACD,SAAS,EAAE;QACP,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;KACnB;CACJ,CAAC"}
|
package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js
CHANGED
|
@@ -61,10 +61,6 @@ const publicStopTimeCacheDtoSchema = {
|
|
|
61
61
|
stop_name: {
|
|
62
62
|
type: "string",
|
|
63
63
|
},
|
|
64
|
-
assigned_stop_id: {
|
|
65
|
-
type: "string",
|
|
66
|
-
nullable: true,
|
|
67
|
-
},
|
|
68
64
|
},
|
|
69
65
|
required: ["sequence", "arr_delay", "dep_delay", "cis_stop_platform_code", "platform_code", "stop_id", "stop_name"],
|
|
70
66
|
},
|
package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicStopTimeCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.ts"],"names":[],"mappings":";;;AAGA,MAAM,4BAA4B,GAA8C;IAC5E,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,QAAQ,EAAE;gBACN,IAAI,EAAE,QAAQ;aACjB;YACD,SAAS,EAAE;gBACP,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,SAAS,EAAE;gBACP,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,sBAAsB,EAAE;gBACpB,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,aAAa,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;aACjB;YACD,SAAS,EAAE;gBACP,IAAI,EAAE,QAAQ;aACjB;
|
|
1
|
+
{"version":3,"file":"PublicStopTimeCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.ts"],"names":[],"mappings":";;;AAGA,MAAM,4BAA4B,GAA8C;IAC5E,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,QAAQ,EAAE;gBACN,IAAI,EAAE,QAAQ;aACjB;YACD,SAAS,EAAE;gBACP,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,SAAS,EAAE;gBACP,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,sBAAsB,EAAE;gBACpB,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,aAAa,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;aACjB;YACD,SAAS,EAAE;gBACP,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,QAAQ,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,wBAAwB,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,CAAC;KACtH;CACJ,CAAC;AACuC,oEAA4B"}
|
|
@@ -288,7 +288,6 @@ flowchart TD
|
|
|
288
288
|
- `platform_code` - označení zastávky podle GTFS
|
|
289
289
|
- `stop_id` - GTFS id zastávky
|
|
290
290
|
- `stop_name` - název zastávky
|
|
291
|
-
- `assigned_stop_id` - GTFS `stop_id` konkrétního nástupištního záznamu (pro vlaky, kde se podařilo spárovat CIS `cis_stop_platform_code` s nástupištní zastávkou v GTFS); `null` pokud k přiřazení nedošlo nebo nejde o vlak; zdroj: pohled `v_public_vehiclepositions_combined_stop_times` (self-join na `ropidgtfs_stops` přes `parent_station` + `platform_code = cis_stop_platform_code`, `location_type = 0`)
|
|
292
291
|
- TTL 1 hodina a 5 minut
|
|
293
292
|
- Automatické promazání dat po úspěšném načtení GTFS jíždních řádů
|
|
294
293
|
- Cca jednou za 5 vteřin se přenačtou stop times pro všechny aktivní spoje. Generování může běžet pouze jednou, po dokončení tasku se spustí znovu (max čekání 4.8 vteřin)
|
|
@@ -573,7 +573,6 @@ Všechny tabulky se nachází ve schématu `pid`
|
|
|
573
573
|
- RopidGTFSPrecomputedDeparturesModel `ropidgtfs_precomputed_departures`
|
|
574
574
|
- RopidGTFSPrecomputedTripScheduleModel `ropidgtfs_precomputed_trip_schedule`
|
|
575
575
|
- RopidGTFSPrecomputedTripConnectionsModel `ropidgtfs_precomputed_trip_connections`
|
|
576
|
-
- materialized view `v_ropidgtfs_shapes_for_mvt` (geometrie tras linek pro MVT mapové dlaždice; obnovován na konci úlohy RefreshPrecomputedTables)
|
|
577
576
|
|
|
578
577
|
#### task _RefreshPrecomputedTables_
|
|
579
578
|
|
|
@@ -594,10 +593,6 @@ Všechny tabulky se nachází ve schématu `pid`
|
|
|
594
593
|
- RopidGTFSPrecomputedDeparturesModel `ropidgtfs_precomputed_departures`
|
|
595
594
|
- RopidGTFSPrecomputedTripScheduleModel `ropidgtfs_precomputed_trip_schedule`
|
|
596
595
|
- RopidGTFSPrecomputedTripConnectionsModel `ropidgtfs_precomputed_trip_connections`
|
|
597
|
-
- po úspěšném nahrazení precomputed tabulek a vyčištění cache je provedena neblokující obnova
|
|
598
|
-
materializovaného pohledu `v_ropidgtfs_shapes_for_mvt` (`REFRESH MATERIALIZED VIEW CONCURRENTLY`);
|
|
599
|
-
pohled používá `CURRENT_DATE` — pokud je přeskočen reload GTFS, zůstane pohled do příštího
|
|
600
|
-
reloadu s geometriemi předchozího dne
|
|
601
596
|
|
|
602
597
|
#### task _RefreshPublicGtfsDepartureCacheTask_
|
|
603
598
|
|
|
@@ -1177,42 +1172,6 @@ Predikce odjezdů probíhá podle vzorce:
|
|
|
1177
1172
|
];
|
|
1178
1173
|
```
|
|
1179
1174
|
|
|
1180
|
-
**Strukturované nástupištní `stop_id` u vlaků (GTFS-RT platform fields)**
|
|
1181
|
-
|
|
1182
|
-
Pro vlakové spoje, u nichž je v RT datech k dispozici konkrétní nástupišťě, se do feedů emitují dva strukturované GTFS-RT identifikátory. Toto chování je podmíněno typem trasy (`gtfs_route_type = 2`, vlak) a dostupností pole `assigned_stop_id`.
|
|
1183
|
-
|
|
1184
|
-
Tok dat: pohled `v_public_vehiclepositions_combined_stop_times` (sloupec `assigned_stop_id`, snake_case) → cache `IPublicStopTimeCacheDto.assigned_stop_id` (snake_case) → `GenerateFilesTask` (camelCase v protobuf polích).
|
|
1185
|
-
|
|
1186
|
-
Pohled `v_public_vehiclepositions_combined_stop_times` odvozuje `assigned_stop_id` self-joinem na tabulku `ropidgtfs_stops`: hledá záznam, kde `parent_station` odpovídá stanici obsluhované zastávky, `platform_code` se rovná `cis_stop_platform_code` z RT dat a `location_type = 0` (fyzická nástupištní zastávka). Pokud takový záznam neexistuje, je `assigned_stop_id` null.
|
|
1187
|
-
|
|
1188
|
-
_TripUpdate — StopTimeUpdate_
|
|
1189
|
-
|
|
1190
|
-
Podmínka emise: `assigned_stop_id != null` (loose porovnání pokrývá i `undefined` v případě starých Redis záznamů bez tohoto pole).
|
|
1191
|
-
|
|
1192
|
-
Při splnění podmínky:
|
|
1193
|
-
- `StopTimeUpdate.stopId` je nastaven na hodnotu `assigned_stop_id` (přepis oproti výchozímu plánovanému `stop_id`)
|
|
1194
|
-
- `StopTimeUpdate.stopTimeProperties.assignedStopId` je nastaven na totožnou hodnotu `assigned_stop_id`
|
|
1195
|
-
- `StopTimeUpdate.stopSequence` zůstává beze změny
|
|
1196
|
-
|
|
1197
|
-
Při nesplnění podmínky (unmatched zastávka, nespárované nástupiště) nebo pro jiné typy vozidel než vlak:
|
|
1198
|
-
- `StopTimeUpdate.stopId` zůstává původní plánované `stop_id` ze GTFS
|
|
1199
|
-
- `StopTimeUpdate.stopTimeProperties` se do feedu nevkládá
|
|
1200
|
-
- výstup je byte-for-byte identický s chováním před implementací této funkce
|
|
1201
|
-
|
|
1202
|
-
_VehiclePosition — stopId_
|
|
1203
|
-
|
|
1204
|
-
Podmínka emise: zastávka, jejíž `stop_sequence` odpovídá `last_stop_sequence` vozidla (`last_stop_sequence` null → nenastavuje se), je vlakového typu a má `assigned_stop_id != null`.
|
|
1205
|
-
|
|
1206
|
-
Při splnění podmínky:
|
|
1207
|
-
- `VehiclePosition.stopId` je nastaven na `assigned_stop_id` konkrétní nástupištní zastávky
|
|
1208
|
-
|
|
1209
|
-
Pro ostatní zastávky v rámci spoje nebo při nesplnění podmínky:
|
|
1210
|
-
- `VehiclePosition.stopId` se nenastavuje
|
|
1211
|
-
|
|
1212
|
-
_Textová pole actualTrack / scheduledTrack_
|
|
1213
|
-
|
|
1214
|
-
Pole `actualTrack` a `scheduledTrack` v custom rozšíření `.transit_realtime.ovapiStopTimeUpdate` zůstávají nezměněna a jsou emitována ve všech případech, kde tomu tak bylo doposud. Strukturovaná nástupištní pole jsou pouze aditivní — nepřepisují ani neruší textový výstup.
|
|
1215
|
-
|
|
1216
1175
|
### _DescriptorWorker_
|
|
1217
1176
|
|
|
1218
1177
|
Worker má na starost stahování informací o vozidlech (např. dostupnost klimatizace nebo USB zásuvek) a jejich uložení do databáze
|
package/docs/openapi-input.yaml
CHANGED
|
@@ -728,10 +728,6 @@ components:
|
|
|
728
728
|
type: string
|
|
729
729
|
format: uuid
|
|
730
730
|
description: Unique identifier for the infotext
|
|
731
|
-
event_id:
|
|
732
|
-
type: string
|
|
733
|
-
format: uuid
|
|
734
|
-
description: UUID of the JIS event this infotext belongs to
|
|
735
731
|
severity_level:
|
|
736
732
|
type: string
|
|
737
733
|
enum:
|
|
@@ -825,7 +821,6 @@ components:
|
|
|
825
821
|
description: Timestamp when the infotext was updated in VYMI
|
|
826
822
|
required:
|
|
827
823
|
- id
|
|
828
|
-
- event_id
|
|
829
824
|
- severity_level
|
|
830
825
|
- display_type
|
|
831
826
|
- active_period
|
|
@@ -947,7 +942,6 @@ components:
|
|
|
947
942
|
[
|
|
948
943
|
{
|
|
949
944
|
"id": "1833020b-b8c2-4903-85d5-469b0a2ebc70",
|
|
950
|
-
"event_id": "e9fd7855-79dd-4d5d-b88b-59bfaba8f59a",
|
|
951
945
|
"severity_level": "SEVERE",
|
|
952
946
|
"display_type": "INLINE",
|
|
953
947
|
"active_period": {
|
|
@@ -974,7 +968,6 @@ components:
|
|
|
974
968
|
},
|
|
975
969
|
{
|
|
976
970
|
"id": "178c4bff-b098-41a9-b0e7-d611bd3c54ac",
|
|
977
|
-
"event_id": "a0cbbeb0-9b75-4376-831a-721007dcdf73",
|
|
978
971
|
"severity_level": "INFO",
|
|
979
972
|
"display_type": "INLINE",
|
|
980
973
|
"active_period": {
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -878,30 +878,6 @@ paths:
|
|
|
878
878
|
"404":
|
|
879
879
|
description: Not found
|
|
880
880
|
|
|
881
|
-
/v2/vehiclepositions/gtfsrt/pid_display_alerts.pb:
|
|
882
|
-
get:
|
|
883
|
-
summary: GET GTFS-RT Display Alerts Feed
|
|
884
|
-
description: "Experimental feed with infotext alerts targeted at specific stops for e-paper displays. Uses stopId in informedEntity instead of routeId."
|
|
885
|
-
tags:
|
|
886
|
-
- 🗺 GTFS Realtime (v2)
|
|
887
|
-
responses:
|
|
888
|
-
"200":
|
|
889
|
-
description: successful operation
|
|
890
|
-
headers:
|
|
891
|
-
Cache-Control:
|
|
892
|
-
$ref: "#/components/headers/CacheControlNoCache"
|
|
893
|
-
Last-Modified:
|
|
894
|
-
$ref: "#/components/headers/LastModified"
|
|
895
|
-
content:
|
|
896
|
-
application/octet-stream:
|
|
897
|
-
schema:
|
|
898
|
-
type: string
|
|
899
|
-
format: binary
|
|
900
|
-
"401":
|
|
901
|
-
$ref: "#/components/responses/UnauthorizedError"
|
|
902
|
-
"404":
|
|
903
|
-
description: Not found
|
|
904
|
-
|
|
905
881
|
/v2/pid/departureboards:
|
|
906
882
|
get:
|
|
907
883
|
summary: GET Departure Boards
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.16.0-rc.2635246332",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"@golemio/core": "^3.0.7-dev.2 || ^3.1.0-dev.2 || ^3.0.0"
|
|
82
82
|
},
|
|
83
83
|
"dependencies": {
|
|
84
|
-
"@golemio/ovapi-gtfs-realtime-bindings": "1.4.
|
|
84
|
+
"@golemio/ovapi-gtfs-realtime-bindings": "1.4.0",
|
|
85
85
|
"@turf/turf": "^6.5.0",
|
|
86
86
|
"cheap-ruler": "^3.0.2",
|
|
87
87
|
"csv-parser": "^3.0.0",
|
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
var dbm;
|
|
4
|
-
var type;
|
|
5
|
-
var seed;
|
|
6
|
-
var fs = require('fs');
|
|
7
|
-
var path = require('path');
|
|
8
|
-
var Promise;
|
|
9
|
-
|
|
10
|
-
exports.setup = function(options, seedLink) {
|
|
11
|
-
dbm = options.dbmigrate;
|
|
12
|
-
type = dbm.dataType;
|
|
13
|
-
seed = seedLink;
|
|
14
|
-
Promise = options.Promise;
|
|
15
|
-
};
|
|
16
|
-
|
|
17
|
-
exports.up = function(db) {
|
|
18
|
-
var filePath = path.join(__dirname, 'sqls', '20260611120000-jis-infotexts-event-id-up.sql');
|
|
19
|
-
return new Promise( function( resolve, reject ) {
|
|
20
|
-
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
21
|
-
if (err) return reject(err);
|
|
22
|
-
console.log('received data: ' + data);
|
|
23
|
-
|
|
24
|
-
resolve(data);
|
|
25
|
-
});
|
|
26
|
-
})
|
|
27
|
-
.then(function(data) {
|
|
28
|
-
return db.runSql(data);
|
|
29
|
-
});
|
|
30
|
-
};
|
|
31
|
-
|
|
32
|
-
exports.down = function(db) {
|
|
33
|
-
var filePath = path.join(__dirname, 'sqls', '20260611120000-jis-infotexts-event-id-down.sql');
|
|
34
|
-
return new Promise( function( resolve, reject ) {
|
|
35
|
-
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
36
|
-
if (err) return reject(err);
|
|
37
|
-
console.log('received data: ' + data);
|
|
38
|
-
|
|
39
|
-
resolve(data);
|
|
40
|
-
});
|
|
41
|
-
})
|
|
42
|
-
.then(function(data) {
|
|
43
|
-
return db.runSql(data);
|
|
44
|
-
});
|
|
45
|
-
};
|
|
46
|
-
|
|
47
|
-
exports._meta = {
|
|
48
|
-
"version": 1
|
|
49
|
-
};
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
var dbm;
|
|
4
|
-
var type;
|
|
5
|
-
var seed;
|
|
6
|
-
var fs = require('fs');
|
|
7
|
-
var path = require('path');
|
|
8
|
-
var Promise;
|
|
9
|
-
|
|
10
|
-
/**
|
|
11
|
-
* We receive the dbmigrate dependency from dbmigrate initially.
|
|
12
|
-
* This enables us to not have to rely on NODE_PATH.
|
|
13
|
-
*/
|
|
14
|
-
exports.setup = function(options, seedLink) {
|
|
15
|
-
dbm = options.dbmigrate;
|
|
16
|
-
type = dbm.dataType;
|
|
17
|
-
seed = seedLink;
|
|
18
|
-
Promise = options.Promise;
|
|
19
|
-
};
|
|
20
|
-
|
|
21
|
-
exports.up = function(db) {
|
|
22
|
-
var filePath = path.join(__dirname, 'sqls', '20260615120000-create-shapes-for-mvt-view-up.sql');
|
|
23
|
-
return new Promise( function( resolve, reject ) {
|
|
24
|
-
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
25
|
-
if (err) return reject(err);
|
|
26
|
-
console.log('received data: ' + data);
|
|
27
|
-
|
|
28
|
-
resolve(data);
|
|
29
|
-
});
|
|
30
|
-
})
|
|
31
|
-
.then(function(data) {
|
|
32
|
-
return db.runSql(data);
|
|
33
|
-
});
|
|
34
|
-
};
|
|
35
|
-
|
|
36
|
-
exports.down = function(db) {
|
|
37
|
-
var filePath = path.join(__dirname, 'sqls', '20260615120000-create-shapes-for-mvt-view-down.sql');
|
|
38
|
-
return new Promise( function( resolve, reject ) {
|
|
39
|
-
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
40
|
-
if (err) return reject(err);
|
|
41
|
-
console.log('received data: ' + data);
|
|
42
|
-
|
|
43
|
-
resolve(data);
|
|
44
|
-
});
|
|
45
|
-
})
|
|
46
|
-
.then(function(data) {
|
|
47
|
-
return db.runSql(data);
|
|
48
|
-
});
|
|
49
|
-
};
|
|
50
|
-
|
|
51
|
-
exports._meta = {
|
|
52
|
-
"version": 1
|
|
53
|
-
};
|
package/db/migrations/postgresql/20260617140000-add-assigned-stop-id-to-combined-stop-times.js
DELETED
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
var dbm;
|
|
4
|
-
var type;
|
|
5
|
-
var seed;
|
|
6
|
-
var fs = require('fs');
|
|
7
|
-
var path = require('path');
|
|
8
|
-
var Promise;
|
|
9
|
-
|
|
10
|
-
exports.setup = function(options, seedLink) {
|
|
11
|
-
dbm = options.dbmigrate;
|
|
12
|
-
type = dbm.dataType;
|
|
13
|
-
seed = seedLink;
|
|
14
|
-
Promise = options.Promise;
|
|
15
|
-
};
|
|
16
|
-
|
|
17
|
-
exports.up = function(db) {
|
|
18
|
-
var filePath = path.join(__dirname, 'sqls', '20260617140000-add-assigned-stop-id-to-combined-stop-times-up.sql');
|
|
19
|
-
return new Promise( function( resolve, reject ) {
|
|
20
|
-
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
21
|
-
if (err) return reject(err);
|
|
22
|
-
console.log('received data: ' + data);
|
|
23
|
-
|
|
24
|
-
resolve(data);
|
|
25
|
-
});
|
|
26
|
-
})
|
|
27
|
-
.then(function(data) {
|
|
28
|
-
return db.runSql(data);
|
|
29
|
-
});
|
|
30
|
-
};
|
|
31
|
-
|
|
32
|
-
exports.down = function(db) {
|
|
33
|
-
var filePath = path.join(__dirname, 'sqls', '20260617140000-add-assigned-stop-id-to-combined-stop-times-down.sql');
|
|
34
|
-
return new Promise( function( resolve, reject ) {
|
|
35
|
-
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
36
|
-
if (err) return reject(err);
|
|
37
|
-
console.log('received data: ' + data);
|
|
38
|
-
|
|
39
|
-
resolve(data);
|
|
40
|
-
});
|
|
41
|
-
})
|
|
42
|
-
.then(function(data) {
|
|
43
|
-
return db.runSql(data);
|
|
44
|
-
});
|
|
45
|
-
};
|
|
46
|
-
|
|
47
|
-
exports._meta = {
|
|
48
|
-
"version": 1
|
|
49
|
-
};
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
CREATE MATERIALIZED VIEW v_ropidgtfs_shapes_for_mvt AS
|
|
2
|
-
WITH distinct_pairs AS (
|
|
3
|
-
SELECT DISTINCT
|
|
4
|
-
r.route_id,
|
|
5
|
-
r.route_short_name,
|
|
6
|
-
r.route_type,
|
|
7
|
-
t.shape_id
|
|
8
|
-
FROM ropidgtfs_precomputed_trip_schedule pts
|
|
9
|
-
JOIN ropidgtfs_trips t ON t.trip_id = pts.trip_id AND t.exceptional = 0
|
|
10
|
-
JOIN ropidgtfs_routes r ON r.route_id = t.route_id
|
|
11
|
-
WHERE pts.date = CURRENT_DATE
|
|
12
|
-
)
|
|
13
|
-
SELECT
|
|
14
|
-
dp.route_id,
|
|
15
|
-
dp.route_short_name,
|
|
16
|
-
dp.route_type,
|
|
17
|
-
dp.shape_id,
|
|
18
|
-
ST_SetSRID(
|
|
19
|
-
ST_MakeLine(ST_MakePoint(s.shape_pt_lon, s.shape_pt_lat) ORDER BY s.shape_pt_sequence),
|
|
20
|
-
4326
|
|
21
|
-
) AS shape_geometry
|
|
22
|
-
FROM distinct_pairs dp
|
|
23
|
-
JOIN ropidgtfs_shapes s ON s.shape_id = dp.shape_id
|
|
24
|
-
GROUP BY dp.route_id, dp.route_short_name, dp.route_type, dp.shape_id;
|
|
25
|
-
|
|
26
|
-
CREATE UNIQUE INDEX v_ropidgtfs_shapes_for_mvt_shape_id_route_id_idx
|
|
27
|
-
ON v_ropidgtfs_shapes_for_mvt (shape_id, route_id);
|
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
drop index ropidgtfs_stops_parent_station_platform_code_idx;
|
|
2
|
-
|
|
3
|
-
drop index ropidgtfs_stops_actual_parent_station_platform_code_idx;
|
|
4
|
-
|
|
5
|
-
drop view v_public_vehiclepositions_combined_stop_times;
|
|
6
|
-
|
|
7
|
-
create view v_public_vehiclepositions_combined_stop_times as
|
|
8
|
-
select
|
|
9
|
-
distinct on (rt_trip_id, stop_sequence) stop_times.rt_trip_id,
|
|
10
|
-
vt.gtfs_trip_id,
|
|
11
|
-
stop_times.stop_sequence,
|
|
12
|
-
stop_times.stop_arr_delay,
|
|
13
|
-
stop_times.stop_dep_delay,
|
|
14
|
-
vt.gtfs_route_type,
|
|
15
|
-
vt.gtfs_route_short_name,
|
|
16
|
-
vt.run_number,
|
|
17
|
-
vt.internal_run_number,
|
|
18
|
-
vt.provider_source_type,
|
|
19
|
-
vt.cis_trip_number,
|
|
20
|
-
vt.vehicle_registration_number,
|
|
21
|
-
stop_times.stop_id,
|
|
22
|
-
vcs.cis_stop_platform_code,
|
|
23
|
-
rs.platform_code,
|
|
24
|
-
rs.stop_name
|
|
25
|
-
from
|
|
26
|
-
(
|
|
27
|
-
select
|
|
28
|
-
*
|
|
29
|
-
from
|
|
30
|
-
v_public_vehiclepositions_future_stop_times prediction
|
|
31
|
-
union
|
|
32
|
-
all
|
|
33
|
-
select
|
|
34
|
-
*
|
|
35
|
-
from
|
|
36
|
-
v_public_vehiclepositions_past_stop_times history
|
|
37
|
-
) as stop_times
|
|
38
|
-
join vehiclepositions_trips vt on vt.id = stop_times.rt_trip_id
|
|
39
|
-
join vehiclepositions_positions vp on vt.last_position_id = vp.id
|
|
40
|
-
and (
|
|
41
|
-
vp.valid_to is null
|
|
42
|
-
or vp.valid_to >= now()
|
|
43
|
-
)
|
|
44
|
-
and vp.state_position != 'after_track'
|
|
45
|
-
inner join ropidgtfs_stops rs on rs.stop_id = stop_times.stop_id
|
|
46
|
-
left join ropidgtfs_cis_stops rcs on rcs.id = rs.computed_cis_stop_id
|
|
47
|
-
left join vehiclepositions_cis_stops vcs
|
|
48
|
-
on vcs.rt_trip_id = stop_times.rt_trip_id
|
|
49
|
-
and vcs.cis_stop_group_id = rcs.cis
|
|
50
|
-
order by
|
|
51
|
-
rt_trip_id,
|
|
52
|
-
stop_sequence;
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
create
|
|
2
|
-
or replace view v_public_vehiclepositions_combined_stop_times as
|
|
3
|
-
select
|
|
4
|
-
distinct on (rt_trip_id, stop_sequence) stop_times.rt_trip_id,
|
|
5
|
-
vt.gtfs_trip_id,
|
|
6
|
-
stop_times.stop_sequence,
|
|
7
|
-
stop_times.stop_arr_delay,
|
|
8
|
-
stop_times.stop_dep_delay,
|
|
9
|
-
vt.gtfs_route_type,
|
|
10
|
-
vt.gtfs_route_short_name,
|
|
11
|
-
vt.run_number,
|
|
12
|
-
vt.internal_run_number,
|
|
13
|
-
vt.provider_source_type,
|
|
14
|
-
vt.cis_trip_number,
|
|
15
|
-
vt.vehicle_registration_number,
|
|
16
|
-
stop_times.stop_id,
|
|
17
|
-
vcs.cis_stop_platform_code,
|
|
18
|
-
rs.platform_code,
|
|
19
|
-
rs.stop_name,
|
|
20
|
-
platform.stop_id as assigned_stop_id
|
|
21
|
-
from
|
|
22
|
-
(
|
|
23
|
-
select
|
|
24
|
-
*
|
|
25
|
-
from
|
|
26
|
-
v_public_vehiclepositions_future_stop_times prediction
|
|
27
|
-
union
|
|
28
|
-
all
|
|
29
|
-
select
|
|
30
|
-
*
|
|
31
|
-
from
|
|
32
|
-
v_public_vehiclepositions_past_stop_times history
|
|
33
|
-
) as stop_times
|
|
34
|
-
join vehiclepositions_trips vt on vt.id = stop_times.rt_trip_id
|
|
35
|
-
join vehiclepositions_positions vp on vt.last_position_id = vp.id
|
|
36
|
-
and (
|
|
37
|
-
vp.valid_to is null
|
|
38
|
-
or vp.valid_to >= now()
|
|
39
|
-
)
|
|
40
|
-
and vp.state_position != 'after_track'
|
|
41
|
-
inner join ropidgtfs_stops rs on rs.stop_id = stop_times.stop_id
|
|
42
|
-
left join ropidgtfs_cis_stops rcs on rcs.id = rs.computed_cis_stop_id
|
|
43
|
-
left join vehiclepositions_cis_stops vcs
|
|
44
|
-
on vcs.rt_trip_id = stop_times.rt_trip_id
|
|
45
|
-
and vcs.cis_stop_group_id = rcs.cis
|
|
46
|
-
left join ropidgtfs_stops platform
|
|
47
|
-
on rs.parent_station is not null
|
|
48
|
-
and platform.parent_station = rs.parent_station
|
|
49
|
-
and platform.platform_code = vcs.cis_stop_platform_code
|
|
50
|
-
and platform.location_type = 0
|
|
51
|
-
order by
|
|
52
|
-
rt_trip_id,
|
|
53
|
-
stop_sequence,
|
|
54
|
-
platform.stop_id;
|
|
55
|
-
|
|
56
|
-
create index ropidgtfs_stops_parent_station_platform_code_idx
|
|
57
|
-
on ropidgtfs_stops using btree (parent_station, platform_code);
|
|
58
|
-
|
|
59
|
-
create index ropidgtfs_stops_actual_parent_station_platform_code_idx
|
|
60
|
-
on ropidgtfs_stops_actual using btree (parent_station, platform_code);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextStopSuppressionFilter.js","sourceRoot":"","sources":["../../../src/helpers/jis/JISInfotextStopSuppressionFilter.ts"],"names":[],"mappings":"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"}
|