@golemio/pid 2.6.4 → 2.6.5-dev.834035052
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/00_clear_test_data.sql +4 -4
- package/db/example/03_ropidgtfs_dump.sql +10 -1
- package/db/example/14_nightDelays.sql +16 -8
- package/db/migrations/postgresql/20230327121511-departure-view.js +53 -0
- package/db/migrations/postgresql/sqls/20220915123941-partitioned-departures-down.sql +2 -0
- package/db/migrations/postgresql/sqls/20230307124639-positions-internal-down.sql +1 -1
- package/db/migrations/postgresql/sqls/20230327121511-departure-view-down.sql +81 -0
- package/db/migrations/postgresql/sqls/20230327121511-departure-view-up.sql +37 -0
- package/dist/integration-engine/queueDefinitions.js +10 -0
- package/dist/integration-engine/queueDefinitions.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.d.ts +13 -7
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js +50 -45
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.d.ts +4 -3
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js +50 -18
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/{DeparturesRepository.d.ts → precomputed/DeparturesRepository.d.ts} +2 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js +132 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/MinMaxStopSequencesRepository.d.ts +9 -0
- package/dist/integration-engine/ropid-gtfs/{RopidGTFSMinMaxSequencesModel.js → data-access/precomputed/MinMaxStopSequencesRepository.js} +34 -33
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/MinMaxStopSequencesRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/ServicesCalendarRepository.d.ts +9 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/ServicesCalendarRepository.js +135 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/ServicesCalendarRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.d.ts +11 -0
- package/dist/integration-engine/ropid-gtfs/{RopidGTFSScheduledTripsModel.js → data-access/precomputed/TripScheduleRepository.js} +27 -26
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.d.ts +4 -0
- package/dist/integration-engine/ropid-gtfs/data-access/{index.js → precomputed/index.js} +3 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/helpers/SourceTableSuffixEnum.d.ts +5 -0
- package/dist/integration-engine/ropid-gtfs/helpers/SourceTableSuffixEnum.js +10 -0
- package/dist/integration-engine/ropid-gtfs/helpers/SourceTableSuffixEnum.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/index.d.ts +0 -3
- package/dist/integration-engine/ropid-gtfs/index.js +0 -3
- package/dist/integration-engine/ropid-gtfs/index.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/utils.js +5 -4
- package/dist/integration-engine/ropid-gtfs/utils.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.js +3 -0
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/interfaces/IGtfsRtFeedEntity.d.ts +3 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js +3 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js +3 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +38 -22
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.d.ts +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js +7 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js.map +1 -1
- package/dist/output-gateway/departure-boards/DepartureBoardsRouter.js +1 -1
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js +0 -6
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js.map +1 -1
- package/dist/output-gateway/pid/middleware/checkTimeFromMiddleware.js +2 -2
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +3 -3
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +15 -15
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.d.ts +0 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js +5 -18
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.d.ts +0 -1
- package/docs/implementation_documentation.md +30 -10
- package/docs/openapi-output.yaml +8 -1
- package/package.json +4 -3
- package/db/example/99_precomputed_tables.sql +0 -169
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMinMaxSequencesModel.d.ts +0 -19
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMinMaxSequencesModel.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSScheduledTripsModel.d.ts +0 -21
- package/dist/integration-engine/ropid-gtfs/RopidGTFSScheduledTripsModel.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSServicesFirst14daysModel.d.ts +0 -19
- package/dist/integration-engine/ropid-gtfs/RopidGTFSServicesFirst14daysModel.js +0 -142
- package/dist/integration-engine/ropid-gtfs/RopidGTFSServicesFirst14daysModel.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturesRepository.js +0 -162
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturesRepository.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/index.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/index.js.map +0 -1
|
@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
exports.TripsRepository = void 0;
|
|
39
39
|
const ropid_gtfs_1 = require("../../../../ropid-gtfs");
|
|
40
|
+
const DescriptorRepository_1 = require("../../vehicle-descriptors/data-access/DescriptorRepository");
|
|
40
41
|
const vehicle_positions_1 = require("../../../../../schema-definitions/vehicle-positions");
|
|
41
42
|
const models_1 = require("../../../../../schema-definitions/vehicle-positions/models");
|
|
42
43
|
const connectors_1 = require("@golemio/core/dist/integration-engine/connectors");
|
|
@@ -49,8 +50,8 @@ const sequelize_1 = __importStar(require("@golemio/core/dist/shared/sequelize"))
|
|
|
49
50
|
const const_1 = require("../../../../../const");
|
|
50
51
|
const RouteTypeEnums_1 = require("../../../../../helpers/RouteTypeEnums");
|
|
51
52
|
const DPPUtils_1 = __importDefault(require("../helpers/DPPUtils"));
|
|
52
|
-
const TripsMapper_1 = __importDefault(require("./helpers/TripsMapper"));
|
|
53
53
|
const PositionsRepository_1 = require("./PositionsRepository");
|
|
54
|
+
const TripsMapper_1 = __importDefault(require("./helpers/TripsMapper"));
|
|
54
55
|
class TripsRepository extends models_2.PostgresModel {
|
|
55
56
|
constructor() {
|
|
56
57
|
super("VPTripsRepository", {
|
|
@@ -434,7 +435,6 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
434
435
|
where: {
|
|
435
436
|
gtfs_trip_id: data.nextGtfsTrips.map((element) => element.trip_id),
|
|
436
437
|
vehicle_registration_number: data.currentRegistrationNumber,
|
|
437
|
-
[sequelize_1.default.Op.and]: [sequelize_1.default.literal(`TO_TIMESTAMP(start_timestamp/1000)::date = CURRENT_DATE`)],
|
|
438
438
|
},
|
|
439
439
|
order: [["start_timestamp", "ASC"]],
|
|
440
440
|
});
|
|
@@ -459,24 +459,24 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
459
459
|
// gtfs_trip_id obsahuje POS, rozlisit podle cis_order
|
|
460
460
|
/* eslint-disable max-len */
|
|
461
461
|
const sqlQuery = `
|
|
462
|
-
SELECT DISTINCT
|
|
462
|
+
SELECT DISTINCT
|
|
463
463
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id as gtfs_trip_id,
|
|
464
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
464
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.date as gtfs_date,
|
|
465
465
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_headsign as gtfs_trip_headsign,
|
|
466
466
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_id as gtfs_route_id,
|
|
467
467
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_type as gtfs_route_type,
|
|
468
468
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_short_name as gtfs_route_short_name,
|
|
469
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
470
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
471
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
472
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
469
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.min_stop_time,
|
|
470
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.max_stop_time,
|
|
471
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.run_number as internal_run_number,
|
|
472
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.origin_route_name as internal_route_name
|
|
473
473
|
FROM "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips
|
|
474
474
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.route_id=ropidgtfs_routes.route_id
|
|
475
475
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_stop_times ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_stop_times.trip_id
|
|
476
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
477
|
-
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=
|
|
478
|
-
AND
|
|
479
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
476
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule
|
|
477
|
+
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_precomputed_trip_schedule.trip_id
|
|
478
|
+
AND ropidgtfs_precomputed_trip_schedule.start_timestamp::date = current_date
|
|
479
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_precomputed_minmax_stop_sequences.trip_id
|
|
480
480
|
WHERE
|
|
481
481
|
( "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_short_name LIKE $cisLineShortName
|
|
482
482
|
OR CASE WHEN ($cisLineShortName = 'IKEA')
|
|
@@ -572,9 +572,9 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
572
572
|
FROM "${vehicle_positions_1.VehiclePositions.pgSchema}".vehiclepositions_trips
|
|
573
573
|
WHERE id = $tripId
|
|
574
574
|
LIMIT 1)
|
|
575
|
-
SELECT DISTINCT
|
|
575
|
+
SELECT DISTINCT
|
|
576
576
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id as gtfs_trip_id,
|
|
577
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
577
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.date as gtfs_date,
|
|
578
578
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.block_id as gtfs_block_id,
|
|
579
579
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_headsign as gtfs_trip_headsign,
|
|
580
580
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_short_name as gtfs_trip_short_name,
|
|
@@ -582,18 +582,18 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
582
582
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_type as gtfs_route_type,
|
|
583
583
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_short_name as gtfs_route_short_name,
|
|
584
584
|
wanted_trip.cis_trip_number,
|
|
585
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
586
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
587
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
588
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
585
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.min_stop_time,
|
|
586
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.max_stop_time,
|
|
587
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.run_number as internal_run_number,
|
|
588
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.origin_route_name as internal_route_name
|
|
589
589
|
FROM "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips
|
|
590
590
|
INNER JOIN wanted_trip ON 1 = 1
|
|
591
591
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.route_id=ropidgtfs_routes.route_id
|
|
592
592
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_stop_times ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_stop_times.trip_id
|
|
593
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
594
|
-
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=
|
|
595
|
-
AND
|
|
596
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
593
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule
|
|
594
|
+
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_precomputed_trip_schedule.trip_id
|
|
595
|
+
AND ropidgtfs_precomputed_trip_schedule.start_timestamp::date = current_date
|
|
596
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id="${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.trip_id
|
|
597
597
|
WHERE
|
|
598
598
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id ~ CONCAT('\\d+_', wanted_trip.cis_trip_number, '_\\d+')
|
|
599
599
|
AND "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_type = '2'
|
|
@@ -708,6 +708,11 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
708
708
|
as: "stop_times",
|
|
709
709
|
model: this.gtfsStopsTimesRepository.sequelizeModel,
|
|
710
710
|
},
|
|
711
|
+
{
|
|
712
|
+
as: "vehicle_descriptor",
|
|
713
|
+
model: this.descriptorRepository.sequelizeModel,
|
|
714
|
+
attributes: ["is_air_conditioned"],
|
|
715
|
+
},
|
|
711
716
|
],
|
|
712
717
|
where: {
|
|
713
718
|
gtfs_trip_id: { [sequelize_1.default.Op.ne]: null },
|
|
@@ -716,6 +721,7 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
716
721
|
});
|
|
717
722
|
});
|
|
718
723
|
this.positionsRepository = new PositionsRepository_1.PositionsRepository();
|
|
724
|
+
this.descriptorRepository = new DescriptorRepository_1.DescriptorRepository(helpers_1.log);
|
|
719
725
|
this.gtfsStopsTimesRepository = new ropid_gtfs_1.RopidGTFSStopTimesModel();
|
|
720
726
|
this.sequelizeModel.belongsTo(this.positionsRepository.sequelizeModel, {
|
|
721
727
|
as: "last_position",
|
|
@@ -727,6 +733,16 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
727
733
|
sourceKey: "gtfs_trip_id",
|
|
728
734
|
constraints: false,
|
|
729
735
|
});
|
|
736
|
+
this.sequelizeModel.belongsTo(this.descriptorRepository.sequelizeModel, {
|
|
737
|
+
as: "vehicle_descriptor",
|
|
738
|
+
foreignKey: "vehicle_registration_number",
|
|
739
|
+
targetKey: "registration_number",
|
|
740
|
+
scope: {
|
|
741
|
+
[sequelize_1.default.Op.and]: [
|
|
742
|
+
sequelize_1.default.literal(`${models_1.VPTripsModel.TABLE_NAME}.gtfs_route_type = vehicle_descriptor.gtfs_route_type`),
|
|
743
|
+
],
|
|
744
|
+
},
|
|
745
|
+
});
|
|
730
746
|
}
|
|
731
747
|
}
|
|
732
748
|
exports.TripsRepository = TripsRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,4 +15,5 @@ export declare class PropagateDelayTask extends AbstractTask<IPropagateDelayInpu
|
|
|
15
15
|
* Takes all newly computed positions search for next trips in near future and propagate delay for them
|
|
16
16
|
*/
|
|
17
17
|
private propagateDelayForGtfsTrip;
|
|
18
|
+
private isConnectingLinkIn60Minutes;
|
|
18
19
|
}
|
|
@@ -105,8 +105,7 @@ class PropagateDelayTask extends workers_1.AbstractTask {
|
|
|
105
105
|
continue;
|
|
106
106
|
}
|
|
107
107
|
const gtfsNextTrips = scheduledTrips.schedule.filter((trip) => {
|
|
108
|
-
return
|
|
109
|
-
(0, moment_timezone_1.default)(gtfsCurrentTrip.end_timestamp) <= (0, moment_timezone_1.default)(trip.start_timestamp));
|
|
108
|
+
return this.isConnectingLinkIn60Minutes(gtfsCurrentTrip, trip);
|
|
110
109
|
});
|
|
111
110
|
try {
|
|
112
111
|
yield this.propagateDelayForGtfsTrip({
|
|
@@ -131,6 +130,12 @@ class PropagateDelayTask extends workers_1.AbstractTask {
|
|
|
131
130
|
}
|
|
132
131
|
});
|
|
133
132
|
}
|
|
133
|
+
isConnectingLinkIn60Minutes(gtfsCurrentTrip, trip) {
|
|
134
|
+
const currentTripEndTime = new Date(gtfsCurrentTrip.end_timestamp);
|
|
135
|
+
const nextTripStartTime = new Date(trip.start_timestamp);
|
|
136
|
+
const currentTripEndTimePlus60Minutes = new Date(currentTripEndTime.getTime() + 60 * 60 * 1000);
|
|
137
|
+
return currentTripEndTimePlus60Minutes >= nextTripStartTime && currentTripEndTime <= nextTripStartTime;
|
|
138
|
+
}
|
|
134
139
|
}
|
|
135
140
|
exports.PropagateDelayTask = PropagateDelayTask;
|
|
136
141
|
//# sourceMappingURL=PropagateDelayTask.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,4FAAiH;AAEjH,2EAAoE;AACpE,2EAA6E;AAC7E,gGAA+D;AAE/D,gDAA8C;AAC9C,oEAAqH;AAGrH,yEAAgF;AAEhF,MAAa,kBAAmB,SAAQ,sBAAkC;IAQtE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,gBAAgB,CAAC;QAC7B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,qDAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"PropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ class DepartureBoardsRouter extends BaseRouter_1.BaseRouter {
|
|
|
47
47
|
minutesBefore: 0,
|
|
48
48
|
timeFromValidRange: {
|
|
49
49
|
hoursBefore: 6,
|
|
50
|
-
hoursAfter:
|
|
50
|
+
hoursAfter: 2 * 24,
|
|
51
51
|
},
|
|
52
52
|
};
|
|
53
53
|
this.GetDepartureBoard = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -184,7 +184,6 @@ class DeparturesRepository extends output_gateway_1.SequelizeModel {
|
|
|
184
184
|
conditionMode,
|
|
185
185
|
],
|
|
186
186
|
};
|
|
187
|
-
const stopPrefixes = new Set(options.stopsIds.map((stopId) => stopId.substring(0, 4)));
|
|
188
187
|
return this.sequelizeModel.findAll({
|
|
189
188
|
attributes: {
|
|
190
189
|
include: [
|
|
@@ -199,11 +198,6 @@ class DeparturesRepository extends output_gateway_1.SequelizeModel {
|
|
|
199
198
|
},
|
|
200
199
|
where: {
|
|
201
200
|
[sequelize_1.default.Op.and]: [
|
|
202
|
-
{
|
|
203
|
-
part_index: {
|
|
204
|
-
[sequelize_1.default.Op.in]: [...stopPrefixes],
|
|
205
|
-
},
|
|
206
|
-
},
|
|
207
201
|
{
|
|
208
202
|
stop_id: {
|
|
209
203
|
[sequelize_1.default.Op.in]: options.stopsIds,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const class_transformer_1 = require("@golemio/core/dist/shared/class-transformer
|
|
|
10
10
|
const dto_1 = require("../dto");
|
|
11
11
|
exports.defaultTimeQueryParams = {
|
|
12
12
|
hoursBefore: 6,
|
|
13
|
-
hoursAfter:
|
|
13
|
+
hoursAfter: 2 * 24,
|
|
14
14
|
};
|
|
15
15
|
const checkTimeFromMiddleware = (routerName) => {
|
|
16
16
|
return (req, _res, next) => {
|
|
@@ -19,7 +19,7 @@ const checkTimeFromMiddleware = (routerName) => {
|
|
|
19
19
|
const currentMoment = (0, moment_timezone_1.default)();
|
|
20
20
|
if (timeFrom &&
|
|
21
21
|
!timeFrom.isBetween(currentMoment.clone().subtract(exports.defaultTimeQueryParams.hoursBefore, "hours"), currentMoment.clone().add(exports.defaultTimeQueryParams.hoursAfter, "hours"), undefined, "[]")) {
|
|
22
|
-
return next(new golemio_errors_1.CustomError("Parameter timeFrom must be in interval [-6h; +
|
|
22
|
+
return next(new golemio_errors_1.CustomError("Parameter timeFrom must be in interval [-6h; +2d]", true, routerName || "BaseRouter", 400));
|
|
23
23
|
}
|
|
24
24
|
return next();
|
|
25
25
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ModelAttributes } from "@golemio/core/dist/shared/sequelize";
|
|
2
2
|
export declare const RopidGTFSPrecomputed: {
|
|
3
|
-
|
|
3
|
+
servicesCalendar: {
|
|
4
4
|
name: string;
|
|
5
5
|
outputJsonSchema: {
|
|
6
6
|
type: string;
|
|
@@ -21,7 +21,7 @@ export declare const RopidGTFSPrecomputed: {
|
|
|
21
21
|
modelIndexOptions: import("sequelize/types/dialects/abstract/query-interface").IndexesOptions[];
|
|
22
22
|
pgTableName: string;
|
|
23
23
|
};
|
|
24
|
-
|
|
24
|
+
minMaxStopSequences: {
|
|
25
25
|
name: string;
|
|
26
26
|
outputJsonSchema: {
|
|
27
27
|
type: string;
|
|
@@ -48,7 +48,7 @@ export declare const RopidGTFSPrecomputed: {
|
|
|
48
48
|
modelIndexOptions: import("sequelize/types/dialects/abstract/query-interface").IndexesOptions[];
|
|
49
49
|
pgTableName: string;
|
|
50
50
|
};
|
|
51
|
-
|
|
51
|
+
tripSchedule: {
|
|
52
52
|
name: string;
|
|
53
53
|
outputJsonSchema: {
|
|
54
54
|
type: string;
|
|
@@ -11,7 +11,7 @@ const servicesFirst14daysConstraintsMIO = [
|
|
|
11
11
|
{
|
|
12
12
|
unique: true,
|
|
13
13
|
using: "BTREE",
|
|
14
|
-
name: "
|
|
14
|
+
name: "ropidgtfs_precomputed_services_calendar_date_service_id_idx",
|
|
15
15
|
fields: ["date", "service_id"],
|
|
16
16
|
},
|
|
17
17
|
];
|
|
@@ -41,7 +41,7 @@ const tripsMinMaxSequencesConstraintsMIO = [
|
|
|
41
41
|
{
|
|
42
42
|
unique: true,
|
|
43
43
|
using: "BTREE",
|
|
44
|
-
name: "
|
|
44
|
+
name: "ropidgtfs_precomputed_minmax_stop_sequences_trip_id_idx",
|
|
45
45
|
fields: ["trip_id"],
|
|
46
46
|
},
|
|
47
47
|
];
|
|
@@ -70,25 +70,25 @@ const scheduledTripsConstraintsMIO = [
|
|
|
70
70
|
{
|
|
71
71
|
unique: false,
|
|
72
72
|
using: "BTREE",
|
|
73
|
-
name: "
|
|
73
|
+
name: "ropidgtfs_precomputed_trip_schedule_origin_route_id_idx",
|
|
74
74
|
fields: ["origin_route_id"],
|
|
75
75
|
},
|
|
76
76
|
{
|
|
77
77
|
unique: false,
|
|
78
78
|
using: "BTREE",
|
|
79
|
-
name: "
|
|
79
|
+
name: "ropidgtfs_precomputed_trip_schedule_origin_route_name_idx",
|
|
80
80
|
fields: ["origin_route_name"],
|
|
81
81
|
},
|
|
82
82
|
{
|
|
83
83
|
unique: false,
|
|
84
84
|
using: "BTREE",
|
|
85
|
-
name: "
|
|
85
|
+
name: "ropidgtfs_precomputed_trip_schedule_start_timestamp_idx",
|
|
86
86
|
fields: ["start_timestamp"],
|
|
87
87
|
},
|
|
88
88
|
{
|
|
89
89
|
unique: true,
|
|
90
90
|
using: "BTREE",
|
|
91
|
-
name: "
|
|
91
|
+
name: "ropidgtfs_precomputed_trip_schedule_unique_id",
|
|
92
92
|
fields: ["trip_id", "service_id", "run_number", "date", "origin_route_id"],
|
|
93
93
|
},
|
|
94
94
|
];
|
|
@@ -188,26 +188,26 @@ const outputScheduledTripsJsonSchema = {
|
|
|
188
188
|
},
|
|
189
189
|
};
|
|
190
190
|
exports.RopidGTFSPrecomputed = {
|
|
191
|
-
|
|
192
|
-
name: "
|
|
191
|
+
servicesCalendar: {
|
|
192
|
+
name: "RopidGTFSPrecomputedServicesCalendar",
|
|
193
193
|
outputJsonSchema: outputServicesFirst14daysJsonSchema,
|
|
194
194
|
outputSequelizeAttributes: outputServicesFirst14daysSDMA,
|
|
195
195
|
modelIndexOptions: servicesFirst14daysConstraintsMIO,
|
|
196
|
-
pgTableName: "
|
|
196
|
+
pgTableName: "ropidgtfs_precomputed_services_calendar",
|
|
197
197
|
},
|
|
198
|
-
|
|
199
|
-
name: "
|
|
198
|
+
minMaxStopSequences: {
|
|
199
|
+
name: "RopidGTFSPrecomputedMinMaxStopSequences",
|
|
200
200
|
outputJsonSchema: outputTripsMinMaxSequencesJsonSchema,
|
|
201
201
|
outputSequelizeAttributes: outputTripsMinMaxSequencesSDMA,
|
|
202
202
|
modelIndexOptions: tripsMinMaxSequencesConstraintsMIO,
|
|
203
|
-
pgTableName: "
|
|
203
|
+
pgTableName: "ropidgtfs_precomputed_minmax_stop_sequences",
|
|
204
204
|
},
|
|
205
|
-
|
|
206
|
-
name: "
|
|
205
|
+
tripSchedule: {
|
|
206
|
+
name: "RopidGTFSPrecomputedTripSchedule",
|
|
207
207
|
outputJsonSchema: outputScheduledTripsJsonSchema,
|
|
208
208
|
outputSequelizeAttributes: outputScheduledTripsSDMA,
|
|
209
209
|
modelIndexOptions: scheduledTripsConstraintsMIO,
|
|
210
|
-
pgTableName: "
|
|
210
|
+
pgTableName: "ropidgtfs_precomputed_trip_schedule",
|
|
211
211
|
},
|
|
212
212
|
};
|
|
213
213
|
//# sourceMappingURL=RopidGTFSPrecomputed.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":";;;AAAA,mEAAsG;AAEtG,MAAM,6BAA6B,GAAyB;IACxD,IAAI,EAAE,qBAAS,CAAC,IAAI;IACpB,QAAQ,EAAE,qBAAS,CAAC,OAAO;IAC3B,UAAU,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,MAAM,iCAAiC,GAA0B;IAC7D;QACI,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,6 @@ export declare class DeparturesModel extends Model<DeparturesModel> implements I
|
|
|
33
33
|
next_stop_id: string | null;
|
|
34
34
|
last_stop_sequence: number | null;
|
|
35
35
|
last_stop_id: string | null;
|
|
36
|
-
part_index: string;
|
|
37
36
|
static attributeModel: ModelAttributes<DeparturesModel>;
|
|
38
37
|
static indexesOptions: ModelIndexesOptions[];
|
|
39
38
|
static jsonSchema: JSONSchemaType<IDeparturesModel>;
|
|
@@ -5,7 +5,7 @@ const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
|
5
5
|
class DeparturesModel extends sequelize_1.Model {
|
|
6
6
|
}
|
|
7
7
|
exports.DeparturesModel = DeparturesModel;
|
|
8
|
-
DeparturesModel.TABLE_NAME = "
|
|
8
|
+
DeparturesModel.TABLE_NAME = "ropidgtfs_precomputed_departures";
|
|
9
9
|
DeparturesModel.attributeModel = {
|
|
10
10
|
stop_sequence: {
|
|
11
11
|
type: sequelize_1.DataTypes.SMALLINT,
|
|
@@ -49,29 +49,19 @@ DeparturesModel.attributeModel = {
|
|
|
49
49
|
next_stop_id: sequelize_1.DataTypes.STRING(30),
|
|
50
50
|
last_stop_sequence: sequelize_1.DataTypes.SMALLINT,
|
|
51
51
|
last_stop_id: sequelize_1.DataTypes.STRING(30),
|
|
52
|
-
part_index: {
|
|
53
|
-
type: sequelize_1.DataTypes.STRING(4),
|
|
54
|
-
allowNull: false,
|
|
55
|
-
},
|
|
56
52
|
};
|
|
57
53
|
DeparturesModel.indexesOptions = [
|
|
58
54
|
{
|
|
59
55
|
unique: false,
|
|
60
56
|
using: "BTREE",
|
|
61
|
-
name: "
|
|
57
|
+
name: "ropidgtfs_precomputed_departures_stop_id_idx",
|
|
62
58
|
fields: ["stop_id"],
|
|
63
59
|
},
|
|
64
|
-
{
|
|
65
|
-
unique: false,
|
|
66
|
-
using: "BTREE",
|
|
67
|
-
name: "ropidgtfs_departures_part_index_idx",
|
|
68
|
-
fields: ["part_index"],
|
|
69
|
-
},
|
|
70
60
|
{
|
|
71
61
|
unique: true,
|
|
72
62
|
using: "BTREE",
|
|
73
|
-
name: "
|
|
74
|
-
fields: ["
|
|
63
|
+
name: "ropidgtfs_precomputed_departures_unique_idx",
|
|
64
|
+
fields: ["date", "trip_id", "stop_sequence"],
|
|
75
65
|
},
|
|
76
66
|
];
|
|
77
67
|
DeparturesModel.jsonSchema = {
|
|
@@ -167,10 +157,7 @@ DeparturesModel.jsonSchema = {
|
|
|
167
157
|
last_stop_id: {
|
|
168
158
|
type: "string",
|
|
169
159
|
},
|
|
170
|
-
part_index: {
|
|
171
|
-
type: "string",
|
|
172
|
-
},
|
|
173
160
|
},
|
|
174
|
-
required: ["stop_sequence", "stop_id", "trip_id", "trip_headsign"
|
|
161
|
+
required: ["stop_sequence", "stop_id", "trip_id", "trip_headsign"],
|
|
175
162
|
};
|
|
176
163
|
//# sourceMappingURL=DeparturesModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturesModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.ts"],"names":[],"mappings":";;;AAAA,mEAA6G;AAI7G,MAAa,eAAgB,SAAQ,iBAAsB;;AAA3D,
|
|
1
|
+
{"version":3,"file":"DeparturesModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.ts"],"names":[],"mappings":"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"}
|