@golemio/pid 2.3.2-dev.662776826 → 2.3.2-dev.663061815
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/02_pid_line_example_115.sql +5 -0
- package/dist/integration-engine/ropid-gtfs/workers/railtrack/tasks/transformations/MetroRailtrackDataTransformation.js +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.d.ts +1 -0
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js +37 -36
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js.map +1 -1
- package/package.json +1 -1
|
@@ -57,6 +57,11 @@ VALUES
|
|
|
57
57
|
(E'10:56:00',NULL,E'10:56:00',NULL,E'3',E'3',3.91433,NULL,E'U1131Z1P',7,E'115_6_201230_V2',1000000115,E'2021-07-26 05:36:31.281+02',NULL,-1,E'2021-07-26 05:36:31.281+02',NULL,NULL),
|
|
58
58
|
(E'10:58:00',NULL,E'10:58:00',NULL,E'0',E'0',4.87451,NULL,E'U52Z2P',8,E'115_6_201230_V2',1000000115,E'2021-07-26 05:36:31.281+02',NULL,-1,E'2021-07-26 05:36:31.281+02',NULL,NULL);
|
|
59
59
|
|
|
60
|
+
INSERT INTO "ropidgtfs_stop_times"("arrival_time","arrival_time_seconds","departure_time","departure_time_seconds","drop_off_type","pickup_type","shape_dist_traveled","stop_headsign","stop_id","stop_sequence","trip_id","create_batch_id","created_at","created_by","update_batch_id","updated_at","updated_by","timepoint")
|
|
61
|
+
VALUES
|
|
62
|
+
(E'25:45:00',NULL,E'25:45:00',NULL,E'0',E'0',0,E'Městský archiv',E'U1131Z2P',1,E'115_6_201230_V3',1000000115,E'2021-07-26 05:36:31.28+02',NULL,-1,E'2021-07-26 05:36:31.28+02',NULL,NULL);
|
|
63
|
+
|
|
64
|
+
|
|
60
65
|
WITH init_values AS (
|
|
61
66
|
SELECT NOW()::DATE AS now_date,
|
|
62
67
|
make_timestamptz(
|
|
@@ -20,7 +20,7 @@ class MetroRailtrackDataTransformation extends transformations_1.BaseTransformat
|
|
|
20
20
|
route_name: element.line,
|
|
21
21
|
coordinates: {
|
|
22
22
|
type: "Point",
|
|
23
|
-
coordinates: [Number.parseFloat(element.
|
|
23
|
+
coordinates: [Number.parseFloat(element.gps_lon), Number.parseFloat(element.gps_lat)],
|
|
24
24
|
},
|
|
25
25
|
gtfs_stop_id: element.stop_id === "" ? null : element.stop_id,
|
|
26
26
|
};
|
|
@@ -45,42 +45,40 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
|
|
|
45
45
|
this.GetAll = (options) => __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
const { limit, offset, to, from, date, stopId, stop } = options;
|
|
47
47
|
const include = [];
|
|
48
|
+
const where = {
|
|
49
|
+
stop_id: stopId,
|
|
50
|
+
[sequelize_1.default.Op.and]: [],
|
|
51
|
+
};
|
|
52
|
+
if (from) {
|
|
53
|
+
where[sequelize_1.default.Op.and].push(GTFSStopTimesModel.arrivalTimeComparison(from, "<="));
|
|
54
|
+
}
|
|
55
|
+
if (to) {
|
|
56
|
+
where[sequelize_1.default.Op.and].push(GTFSStopTimesModel.arrivalTimeComparison(to, ">="));
|
|
57
|
+
}
|
|
58
|
+
if (date) {
|
|
59
|
+
include.push({
|
|
60
|
+
attributes: [],
|
|
61
|
+
include: [
|
|
62
|
+
{
|
|
63
|
+
as: "service",
|
|
64
|
+
attributes: [],
|
|
65
|
+
model: output_gateway_1.sequelizeConnection.models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({
|
|
66
|
+
method: ["forDate", date],
|
|
67
|
+
}),
|
|
68
|
+
},
|
|
69
|
+
],
|
|
70
|
+
model: output_gateway_1.sequelizeConnection.models[ropid_gtfs_1.RopidGTFS.trips.pgTableName],
|
|
71
|
+
required: true,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
if (stop) {
|
|
75
|
+
include.push({
|
|
76
|
+
as: "stop",
|
|
77
|
+
model: output_gateway_1.sequelizeConnection.models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
|
|
78
|
+
});
|
|
79
|
+
}
|
|
48
80
|
try {
|
|
49
|
-
|
|
50
|
-
stop_id: stopId,
|
|
51
|
-
[sequelize_1.default.Op.and]: [],
|
|
52
|
-
};
|
|
53
|
-
if (from) {
|
|
54
|
-
where[sequelize_1.default.Op.and].push(sequelize_1.default.literal(`to_timestamp('${from}', 'HH24:mm:ss') ` +
|
|
55
|
-
`<= to_timestamp(regexp_replace(arrival_time, '^24', '00'), 'HH24:MI:SS')`));
|
|
56
|
-
}
|
|
57
|
-
if (to) {
|
|
58
|
-
where[sequelize_1.default.Op.and].push(sequelize_1.default.literal(`to_timestamp('${to}', 'HH24:mm:ss') ` +
|
|
59
|
-
`>= to_timestamp(regexp_replace(arrival_time, '^24', '00'), 'HH24:MI:SS')`));
|
|
60
|
-
}
|
|
61
|
-
if (date) {
|
|
62
|
-
include.push({
|
|
63
|
-
attributes: [],
|
|
64
|
-
include: [
|
|
65
|
-
{
|
|
66
|
-
as: "service",
|
|
67
|
-
attributes: [],
|
|
68
|
-
model: output_gateway_1.sequelizeConnection.models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({
|
|
69
|
-
method: ["forDate", date],
|
|
70
|
-
}),
|
|
71
|
-
},
|
|
72
|
-
],
|
|
73
|
-
model: output_gateway_1.sequelizeConnection.models[ropid_gtfs_1.RopidGTFS.trips.pgTableName],
|
|
74
|
-
required: true,
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
if (stop) {
|
|
78
|
-
include.push({
|
|
79
|
-
as: "stop",
|
|
80
|
-
model: output_gateway_1.sequelizeConnection.models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
|
|
81
|
-
});
|
|
82
|
-
}
|
|
83
|
-
const data = yield this.sequelizeModel.findAll({
|
|
81
|
+
return yield this.sequelizeModel.findAll({
|
|
84
82
|
include,
|
|
85
83
|
limit,
|
|
86
84
|
offset,
|
|
@@ -90,7 +88,6 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
|
|
|
90
88
|
],
|
|
91
89
|
where,
|
|
92
90
|
});
|
|
93
|
-
return data;
|
|
94
91
|
}
|
|
95
92
|
catch (err) {
|
|
96
93
|
throw new golemio_errors_1.CustomError("Database error", true, "GTFSStopTimesModel", 500, err);
|
|
@@ -102,4 +99,8 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
|
|
|
102
99
|
}
|
|
103
100
|
}
|
|
104
101
|
exports.GTFSStopTimesModel = GTFSStopTimesModel;
|
|
102
|
+
GTFSStopTimesModel.arrivalTimeComparison = (time, operator) => {
|
|
103
|
+
// arrival_time 25:45:20 -> 01:45:20
|
|
104
|
+
return sequelize_1.default.literal(`'${time}'::time ${operator} cast(arrival_time as interval)::time`);
|
|
105
|
+
};
|
|
105
106
|
//# sourceMappingURL=GTFSStopTimesModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSStopTimesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"GTFSStopTimesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.ts"],"names":[],"mappings":"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"}
|