@golemio/pid 6.0.0 → 6.0.1-dev.2901184022
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/dist/output-gateway/pid/controllers/v2/V2DepartureBoardsController.js +1 -1
- package/dist/output-gateway/pid/controllers/v2/V2DepartureBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/dto/DepartureBoardsDTO.d.ts +1 -0
- package/dist/output-gateway/pid/dto/DepartureBoardsDTO.js +5 -0
- package/dist/output-gateway/pid/dto/DepartureBoardsDTO.js.map +1 -1
- package/dist/output-gateway/pid/dto/interfaces/IDepartureBoardsQueryDTO.d.ts +1 -0
- package/dist/output-gateway/pid/routers/v2/V2PIDRouter.js +2 -0
- package/dist/output-gateway/pid/routers/v2/V2PIDRouter.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.d.ts +2 -1
- package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.js +99 -96
- package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.js.map +1 -1
- package/docs/implementation_documentation.md +3 -2
- package/docs/openapi-output.yaml +13 -2
- package/package.json +2 -2
- package/docs/index.md +0 -3
|
@@ -12,7 +12,7 @@ export class V2DepartureBoardsController {
|
|
|
12
12
|
constructor() {
|
|
13
13
|
this.getDepartureBoard = async (req, res, next) => {
|
|
14
14
|
const { query, preferredTimezone } = this.parseQuery(req);
|
|
15
|
-
res.setHeader("X-Golemio-Preset-Metadata", `airConditionPossible=${query.airCondition ? 1 : 0}`);
|
|
15
|
+
res.setHeader("X-Golemio-Preset-Metadata", `wheelchairAccessiblePossible=${query.wheelchairAccessible ? 1 : 0};airConditionPossible=${query.airCondition ? 1 : 0}`);
|
|
16
16
|
const timeFrom = this.computeTimeFrom(query, preferredTimezone);
|
|
17
17
|
const span = createChildSpan("V2DepartureBoardsController.getDepartureBoard");
|
|
18
18
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2DepartureBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v2/V2DepartureBoardsController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAEhG,OAAO,oBAAoB,MAAM,gDAAgD,CAAC;AAClF,MAAM,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;AAC7C,OAAO,iBAAiB,MAAM,6CAA6C,CAAC;AAC5E,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC;AAE3C,OAAO,MAAM,MAAM,8CAA8C,CAAC;AAElE,MAAM,OAAO,2BAA2B;IAGpC;QAIO,sBAAiB,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC1D,GAAG,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"V2DepartureBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v2/V2DepartureBoardsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export declare class DepartureBoardsQueryDTO implements IDepartureBoardsQueryDTO
|
|
|
17
17
|
minutesBefore: number;
|
|
18
18
|
includeMetroTrains: boolean;
|
|
19
19
|
airCondition: boolean;
|
|
20
|
+
wheelchairAccessible: boolean;
|
|
20
21
|
mode: DepartureMode;
|
|
21
22
|
order: DepartureOrder;
|
|
22
23
|
filter: DepartureFilter;
|
|
@@ -23,6 +23,7 @@ export class DepartureBoardsQueryDTO {
|
|
|
23
23
|
this.minutesBefore = 0;
|
|
24
24
|
this.includeMetroTrains = false;
|
|
25
25
|
this.airCondition = true;
|
|
26
|
+
this.wheelchairAccessible = true;
|
|
26
27
|
this.mode = DepartureMode.DEPARTURES;
|
|
27
28
|
this.order = DepartureOrder.REAL;
|
|
28
29
|
this.filter = DepartureFilter.NONE;
|
|
@@ -69,6 +70,10 @@ __decorate([
|
|
|
69
70
|
TransformBoolean(),
|
|
70
71
|
__metadata("design:type", Boolean)
|
|
71
72
|
], DepartureBoardsQueryDTO.prototype, "airCondition", void 0);
|
|
73
|
+
__decorate([
|
|
74
|
+
TransformBoolean(),
|
|
75
|
+
__metadata("design:type", Boolean)
|
|
76
|
+
], DepartureBoardsQueryDTO.prototype, "wheelchairAccessible", void 0);
|
|
72
77
|
__decorate([
|
|
73
78
|
TransformInteger(),
|
|
74
79
|
__metadata("design:type", Number)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardsDTO.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/dto/DepartureBoardsDTO.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAEjG,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAKpE,MAAM,OAAO,uBAAuB;IAApC;QAEI,WAAM,GAAa,EAAE,CAAC;QAGtB,WAAM,GAAa,EAAE,CAAC;QAGtB,QAAG,GAAa,EAAE,CAAC;QAGnB,UAAK,GAAa,EAAE,CAAC;QAGrB,SAAI,GAAoB,EAAE,CAAC;QAG3B,UAAK,GAAW,EAAE,CAAC;QAGnB,iBAAY,GAAW,GAAG,CAAC;QAG3B,kBAAa,GAAW,CAAC,CAAC;QAG1B,uBAAkB,GAAY,KAAK,CAAC;QAGpC,iBAAY,GAAY,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"DepartureBoardsDTO.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/dto/DepartureBoardsDTO.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAEjG,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAKpE,MAAM,OAAO,uBAAuB;IAApC;QAEI,WAAM,GAAa,EAAE,CAAC;QAGtB,WAAM,GAAa,EAAE,CAAC;QAGtB,QAAG,GAAa,EAAE,CAAC;QAGnB,UAAK,GAAa,EAAE,CAAC;QAGrB,SAAI,GAAoB,EAAE,CAAC;QAG3B,UAAK,GAAW,EAAE,CAAC;QAGnB,iBAAY,GAAW,GAAG,CAAC;QAG3B,kBAAa,GAAW,CAAC,CAAC;QAG1B,uBAAkB,GAAY,KAAK,CAAC;QAGpC,iBAAY,GAAY,IAAI,CAAC;QAG7B,yBAAoB,GAAY,IAAI,CAAC;QAErC,SAAI,GAAkB,aAAa,CAAC,UAAU,CAAC;QAE/C,UAAK,GAAmB,cAAc,CAAC,IAAI,CAAC;QAE5C,WAAM,GAAoB,eAAe,CAAC,IAAI,CAAC;QAG/C,WAAM,GAAW,CAAC,CAAC;IAavB,CAAC;CAAA;AApDG;IADC,cAAc,EAAE;;uDACK;AAGtB;IADC,cAAc,EAAE;;uDACK;AAGtB;IADC,cAAc,EAAE;;oDACE;AAGnB;IADC,cAAc,EAAE;;sDACI;AAGrB;IADC,cAAc,EAAE;;qDACU;AAG3B;IADC,gBAAgB,EAAE;;sDACA;AAGnB;IADC,gBAAgB,EAAE;;6DACQ;AAG3B;IADC,gBAAgB,EAAE;;8DACO;AAG1B;IADC,gBAAgB,EAAE;;mEACiB;AAGpC;IADC,gBAAgB,EAAE;;6DACU;AAG7B;IADC,gBAAgB,EAAE;;qEACkB;AASrC;IADC,gBAAgB,EAAE;;uDACA;AAGnB;IADC,gBAAgB,EAAE;;sDACJ;AAOf;IADC,gBAAgB,EAAE;;qEACW;AAKlC,MAAM,OAAO,0BAA0B;IAAvC;QACI,UAAK,GAA4B,EAAE,CAAC;QACpC,eAAU,GAA0B,EAAE,CAAC;QACvC,cAAS,GAAkC,EAAE,CAAC;IAClD,CAAC;CAAA"}
|
|
@@ -57,6 +57,7 @@ export class V2PIDRouter extends AbstractRouter {
|
|
|
57
57
|
query("timeFrom").optional().isISO8601().custom(ParamValidatorManager.getTimeFromValidator()).not().isArray(),
|
|
58
58
|
query("includeMetroTrains").optional().isBoolean().not().isArray(),
|
|
59
59
|
query("airCondition").optional().isBoolean().not().isArray(),
|
|
60
|
+
query("wheelchairAccessible").optional().isBoolean().not().isArray(),
|
|
60
61
|
query("total").optional().isInt().not().isArray(),
|
|
61
62
|
query("appendHeadsignsLimit").optional().isInt({ min: 0, max: 100 }).not().isArray(),
|
|
62
63
|
query("preset").optional().isString().not().isArray(),
|
|
@@ -85,6 +86,7 @@ export class V2PIDRouter extends AbstractRouter {
|
|
|
85
86
|
query("timeFrom").optional(),
|
|
86
87
|
query("includeMetroTrains").optional(),
|
|
87
88
|
query("airCondition").optional(),
|
|
89
|
+
query("wheelchairAccessible").optional(),
|
|
88
90
|
query("total").optional(),
|
|
89
91
|
query("appendHeadsignsLimit").optional(),
|
|
90
92
|
query("limit").optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2PIDRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/routers/v2/V2PIDRouter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"V2PIDRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/routers/v2/V2PIDRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TripWithLastPositionModel } from "#sch/vehicle-positions/models/views/TripWithLastPositionModel";
|
|
2
2
|
import { type IGeoJSONFeature } from "@golemio/core/dist/output-gateway/Geo.js";
|
|
3
3
|
export declare class PositionOutputMapper {
|
|
4
|
-
static
|
|
4
|
+
static buildCoordinatesList(lng: number | null, lat: number | null): Array<number | null>;
|
|
5
|
+
static mapTripModelToDto(data: TripWithLastPositionModel): IGeoJSONFeature;
|
|
5
6
|
}
|
|
@@ -1,102 +1,105 @@
|
|
|
1
1
|
import { GeoCoordinatesType, buildGeojsonFeatureType } from "@golemio/core/dist/output-gateway/Geo.js";
|
|
2
2
|
export class PositionOutputMapper {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
3
|
+
static buildCoordinatesList(lng, lat) {
|
|
4
|
+
return [lng !== null ? Number(lng) : null, lat !== null ? Number(lat) : null];
|
|
5
|
+
}
|
|
6
|
+
static mapTripModelToDto(data) {
|
|
7
|
+
const { vehicle_type, vehicle_descriptor, all_positions = [], ...tripWithPosition } = data.toJSON();
|
|
8
|
+
const tripObject = {
|
|
9
|
+
last_position: {
|
|
10
|
+
bearing: tripWithPosition.bearing,
|
|
11
|
+
delay: {
|
|
12
|
+
actual: tripWithPosition.delay,
|
|
13
|
+
last_stop_arrival: tripWithPosition.delay_stop_arrival,
|
|
14
|
+
last_stop_departure: tripWithPosition.delay_stop_departure,
|
|
15
|
+
},
|
|
16
|
+
is_canceled: tripWithPosition.is_canceled,
|
|
17
|
+
last_stop: {
|
|
18
|
+
arrival_time: tripWithPosition.last_stop_arrival_time_isostring,
|
|
19
|
+
departure_time: tripWithPosition.last_stop_departure_time_isostring,
|
|
20
|
+
id: tripWithPosition.last_stop_id,
|
|
21
|
+
sequence: tripWithPosition.last_stop_sequence,
|
|
22
|
+
},
|
|
23
|
+
next_stop: {
|
|
24
|
+
arrival_time: tripWithPosition.next_stop_arrival_time_isostring,
|
|
25
|
+
departure_time: tripWithPosition.next_stop_departure_time_isostring,
|
|
26
|
+
id: tripWithPosition.next_stop_id,
|
|
27
|
+
sequence: tripWithPosition.next_stop_sequence,
|
|
28
|
+
},
|
|
29
|
+
origin_timestamp: tripWithPosition.origin_timestamp_isostring,
|
|
30
|
+
shape_dist_traveled: tripWithPosition.shape_dist_traveled,
|
|
31
|
+
speed: tripWithPosition.speed,
|
|
32
|
+
state_position: tripWithPosition.state_position || null,
|
|
33
|
+
tracking: tripWithPosition.is_tracked,
|
|
26
34
|
},
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
trip: {
|
|
36
|
+
agency_name: {
|
|
37
|
+
real: tripWithPosition.agency_name_real,
|
|
38
|
+
scheduled: tripWithPosition.agency_name_scheduled,
|
|
39
|
+
},
|
|
40
|
+
cis: {
|
|
41
|
+
line_id: tripWithPosition.cis_line_id,
|
|
42
|
+
trip_number: tripWithPosition.cis_trip_number,
|
|
43
|
+
},
|
|
44
|
+
gtfs: {
|
|
45
|
+
route_id: tripWithPosition.gtfs_route_id,
|
|
46
|
+
route_short_name: tripWithPosition.gtfs_route_short_name,
|
|
47
|
+
route_type: tripWithPosition.gtfs_route_type,
|
|
48
|
+
trip_headsign: tripWithPosition.last_stop_headsign ?? tripWithPosition.gtfs_trip_headsign,
|
|
49
|
+
trip_id: tripWithPosition.gtfs_trip_id,
|
|
50
|
+
trip_short_name: tripWithPosition.gtfs_trip_short_name,
|
|
51
|
+
},
|
|
52
|
+
origin_route_name: tripWithPosition.origin_route_name,
|
|
53
|
+
sequence_id: tripWithPosition.run_number,
|
|
54
|
+
start_timestamp: tripWithPosition.start_timestamp_isostring,
|
|
55
|
+
vehicle_registration_number: tripWithPosition.vehicle_registration_number,
|
|
56
|
+
vehicle_type,
|
|
57
|
+
wheelchair_accessible: tripWithPosition.wheelchair_accessible,
|
|
58
|
+
air_conditioned: vehicle_descriptor?.is_air_conditioned ?? null,
|
|
59
|
+
usb_chargers: vehicle_descriptor?.has_usb_chargers ?? null,
|
|
37
60
|
},
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
61
|
+
...(all_positions.length && {
|
|
62
|
+
all_positions: {
|
|
63
|
+
features: all_positions.map((position) => buildGeojsonFeatureType("geometry", {
|
|
64
|
+
geometry: {
|
|
65
|
+
type: GeoCoordinatesType.Point,
|
|
66
|
+
coordinates: PositionOutputMapper.buildCoordinatesList(position.lng, position.lat),
|
|
67
|
+
},
|
|
68
|
+
bearing: position.bearing,
|
|
69
|
+
delay: {
|
|
70
|
+
actual: position.delay,
|
|
71
|
+
last_stop_arrival: position.delay_stop_arrival,
|
|
72
|
+
last_stop_departure: position.delay_stop_departure,
|
|
73
|
+
},
|
|
74
|
+
is_canceled: position.is_canceled,
|
|
75
|
+
last_stop: {
|
|
76
|
+
arrival_time: position.last_stop_arrival_time_isostring,
|
|
77
|
+
departure_time: position.last_stop_departure_time_isostring,
|
|
78
|
+
id: position.last_stop_id,
|
|
79
|
+
sequence: position.last_stop_sequence,
|
|
80
|
+
},
|
|
81
|
+
next_stop: {
|
|
82
|
+
arrival_time: position.next_stop_arrival_time_isostring,
|
|
83
|
+
departure_time: position.next_stop_departure_time_isostring,
|
|
84
|
+
id: position.next_stop_id,
|
|
85
|
+
sequence: position.next_stop_sequence,
|
|
86
|
+
},
|
|
87
|
+
origin_timestamp: position.origin_timestamp_isostring,
|
|
88
|
+
shape_dist_traveled: position.shape_dist_traveled,
|
|
89
|
+
speed: position.speed,
|
|
90
|
+
})),
|
|
91
|
+
type: "FeatureCollection",
|
|
92
|
+
},
|
|
93
|
+
}),
|
|
94
|
+
};
|
|
95
|
+
return {
|
|
96
|
+
geometry: {
|
|
97
|
+
type: GeoCoordinatesType.Point,
|
|
98
|
+
coordinates: PositionOutputMapper.buildCoordinatesList(tripWithPosition.lng, tripWithPosition.lat),
|
|
41
99
|
},
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
trip_id: tripWithPosition.gtfs_trip_id,
|
|
48
|
-
trip_short_name: tripWithPosition.gtfs_trip_short_name,
|
|
49
|
-
},
|
|
50
|
-
origin_route_name: tripWithPosition.origin_route_name,
|
|
51
|
-
sequence_id: tripWithPosition.run_number,
|
|
52
|
-
start_timestamp: tripWithPosition.start_timestamp_isostring,
|
|
53
|
-
vehicle_registration_number: tripWithPosition.vehicle_registration_number,
|
|
54
|
-
vehicle_type,
|
|
55
|
-
wheelchair_accessible: tripWithPosition.wheelchair_accessible,
|
|
56
|
-
air_conditioned: vehicle_descriptor?.is_air_conditioned ?? null,
|
|
57
|
-
usb_chargers: vehicle_descriptor?.has_usb_chargers ?? null,
|
|
58
|
-
},
|
|
59
|
-
...(all_positions.length && {
|
|
60
|
-
all_positions: {
|
|
61
|
-
features: all_positions.map((position) => buildGeojsonFeatureType("geometry", {
|
|
62
|
-
geometry: {
|
|
63
|
-
type: GeoCoordinatesType.Point,
|
|
64
|
-
coordinates: [position.lng, position.lat],
|
|
65
|
-
},
|
|
66
|
-
bearing: position.bearing,
|
|
67
|
-
delay: {
|
|
68
|
-
actual: position.delay,
|
|
69
|
-
last_stop_arrival: position.delay_stop_arrival,
|
|
70
|
-
last_stop_departure: position.delay_stop_departure,
|
|
71
|
-
},
|
|
72
|
-
is_canceled: position.is_canceled,
|
|
73
|
-
last_stop: {
|
|
74
|
-
arrival_time: position.last_stop_arrival_time_isostring,
|
|
75
|
-
departure_time: position.last_stop_departure_time_isostring,
|
|
76
|
-
id: position.last_stop_id,
|
|
77
|
-
sequence: position.last_stop_sequence,
|
|
78
|
-
},
|
|
79
|
-
next_stop: {
|
|
80
|
-
arrival_time: position.next_stop_arrival_time_isostring,
|
|
81
|
-
departure_time: position.next_stop_departure_time_isostring,
|
|
82
|
-
id: position.next_stop_id,
|
|
83
|
-
sequence: position.next_stop_sequence,
|
|
84
|
-
},
|
|
85
|
-
origin_timestamp: position.origin_timestamp_isostring,
|
|
86
|
-
shape_dist_traveled: position.shape_dist_traveled,
|
|
87
|
-
speed: position.speed,
|
|
88
|
-
})),
|
|
89
|
-
type: "FeatureCollection",
|
|
90
|
-
},
|
|
91
|
-
}),
|
|
92
|
-
};
|
|
93
|
-
return {
|
|
94
|
-
geometry: {
|
|
95
|
-
type: GeoCoordinatesType.Point,
|
|
96
|
-
coordinates: [tripWithPosition.lng, tripWithPosition.lat],
|
|
97
|
-
},
|
|
98
|
-
properties: tripObject,
|
|
99
|
-
type: "Feature",
|
|
100
|
-
};
|
|
101
|
-
};
|
|
100
|
+
properties: tripObject,
|
|
101
|
+
type: "Feature",
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
}
|
|
102
105
|
//# sourceMappingURL=PositionOutputMapper.js.map
|
package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionOutputMapper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AAE7H,MAAM,OAAO,oBAAoB
|
|
1
|
+
{"version":3,"file":"PositionOutputMapper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1532,9 +1532,10 @@ Worker má na starost stahování VYMI (JIS) událostí a infotextů, jejich tra
|
|
|
1532
1532
|
|
|
1533
1533
|
- zdrojové tabulky
|
|
1534
1534
|
- `ropidgtfs_precomputed_departures`, `ropidgtfs_stops`, `ropidgtfs_cis_stops`, `jis_infotexts`, `jis_infotexts_ropidgtfs_stops`, `ropid_departures_directions`, `vehiclepositions_positions`, `vehiclepositions_trips`
|
|
1535
|
-
- odpověď obsahuje hlavičku `X-Golemio-Preset-Metadata: airConditionPossible=0|1`
|
|
1536
|
-
- `
|
|
1535
|
+
- odpověď obsahuje hlavičku `X-Golemio-Preset-Metadata: wheelchairAccessiblePossible=0|1;airConditionPossible=0|1` (dvojice `klíč=hodnota` oddělené `;` v tomto pořadí)
|
|
1536
|
+
- pro `wheelchairAccessible` i `airCondition` je hodnota `0` pouze při explicitním nastavení query parametru na `false`, jinak `1` (výchozí hodnota je `true`)
|
|
1537
1537
|
- slouží monitorovacím systémům (preset systémy monitorovacího centra ROPID) k detekci aktivního filtrování dle klimatizace
|
|
1538
|
+
- `wheelchairAccessible` zatím odjezdy nefiltruje (navazující issue)
|
|
1538
1539
|
- kód nástupiště (`platform_code`)
|
|
1539
1540
|
- **vlaky**: preferuje se CIS hodnota `cis_stop_platform_code` uložená z MPVNet zpráv (`PlatformCodeResolver`); MPVNet atribut `$.stan` je před uložením oříznut na první platný segment (viz [parsování `stan` u vlaků](../processing/input_realtime_data/http_mpvnet.md#parsování-stanoviště-stan-u-vlaků))
|
|
1540
1541
|
- **ostatní typy**: používá se GTFS `platform_code` ze `stop_times.txt`
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -922,6 +922,7 @@ paths:
|
|
|
922
922
|
- $ref: "#/components/parameters/DepartureBoardsTimeFrom"
|
|
923
923
|
- $ref: "#/components/parameters/DepartureBoardsIncludeMetroTrains"
|
|
924
924
|
- $ref: "#/components/parameters/DepartureBoardsAirCondition"
|
|
925
|
+
- $ref: "#/components/parameters/DepartureBoardsWheelchairAccessible"
|
|
925
926
|
- $ref: "#/components/parameters/DepartureBoardsPreferredTimezone"
|
|
926
927
|
- name: mode
|
|
927
928
|
in: query
|
|
@@ -950,10 +951,10 @@ paths:
|
|
|
950
951
|
type: string
|
|
951
952
|
example: public, s-maxage=5, stale-while-revalidate=5
|
|
952
953
|
X-Golemio-Preset-Metadata:
|
|
953
|
-
description: Preset metadata indicating air condition
|
|
954
|
+
description: Preset metadata as `;`-delimited key=value pairs indicating whether wheelchair accessibility and air condition indications are enabled (1=enabled, 0=disabled)
|
|
954
955
|
schema:
|
|
955
956
|
type: string
|
|
956
|
-
example: airConditionPossible=1
|
|
957
|
+
example: wheelchairAccessiblePossible=1;airConditionPossible=1
|
|
957
958
|
content:
|
|
958
959
|
application/json:
|
|
959
960
|
schema:
|
|
@@ -992,6 +993,7 @@ paths:
|
|
|
992
993
|
- $ref: "#/components/parameters/DepartureBoardsTimeFrom"
|
|
993
994
|
- $ref: "#/components/parameters/DepartureBoardsIncludeMetroTrains"
|
|
994
995
|
- $ref: "#/components/parameters/DepartureBoardsAirCondition"
|
|
996
|
+
- $ref: "#/components/parameters/DepartureBoardsWheelchairAccessible"
|
|
995
997
|
- $ref: "#/components/parameters/DepartureBoardsPreferredTimezone"
|
|
996
998
|
- name: mode
|
|
997
999
|
in: query
|
|
@@ -2237,6 +2239,15 @@ components:
|
|
|
2237
2239
|
type: boolean
|
|
2238
2240
|
example: true
|
|
2239
2241
|
default: true
|
|
2242
|
+
DepartureBoardsWheelchairAccessible:
|
|
2243
|
+
name: wheelchairAccessible
|
|
2244
|
+
in: query
|
|
2245
|
+
description: Controls the wheelchair accessibility indication in the `X-Golemio-Preset-Metadata` header on the JSON departure boards endpoint. Setting to `false` reports `wheelchairAccessiblePossible=0`. It does not filter departures yet.
|
|
2246
|
+
required: false
|
|
2247
|
+
schema:
|
|
2248
|
+
type: boolean
|
|
2249
|
+
example: true
|
|
2250
|
+
default: true
|
|
2240
2251
|
DepartureBoardsPreferredTimezone:
|
|
2241
2252
|
name: preferredTimezone
|
|
2242
2253
|
in: query
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.1-dev.2901184022",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
"typescript": "6.0.3"
|
|
121
121
|
},
|
|
122
122
|
"peerDependencies": {
|
|
123
|
-
"@golemio/core": "^
|
|
123
|
+
"@golemio/core": "^4.0.1-dev.2 || ^4.0.1"
|
|
124
124
|
},
|
|
125
125
|
"dependencies": {
|
|
126
126
|
"@golemio/ovapi-gtfs-realtime-bindings": "1.4.1-dev.2464451735",
|
package/docs/index.md
DELETED