@golemio/pid 2.13.6-dev.1310475463 → 2.13.6-dev.1313672574

package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.js

@@ -19,8 +19,12 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GTFSTripsModel = void 0;
+const PassengerTransferEnums_1 = require("../../../helpers/PassengerTransferEnums");
 const const_1 = require("../../../schema-definitions/const");
 const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
 const TripDto_1 = require("../../../schema-definitions/ropid-gtfs/models/TripDto");
@@ -28,6 +32,8 @@ const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
 const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
 const models_1 = require("@golemio/core/dist/output-gateway/models");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
+const GtfsTripScheduleRepository_1 = require("../data-access/GtfsTripScheduleRepository");
 class GTFSTripsModel extends models_1.SequelizeModel {
     constructor() {
         super(ropid_gtfs_1.RopidGTFS.trips.name, ropid_gtfs_1.RopidGTFS.trips.pgTableName, TripDto_1.TripDto.attributeModel, {
@@ -61,6 +67,14 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 otherKey: "stop_id",
                 through: models.GTFSStopTimesModel.sequelizeModel,
             });
+            this.sequelizeModel.hasOne(this.tripScheduleRepository.sequelizeModel, {
+                as: "schedule",
+                foreignKey: "trip_id",
+                sourceKey: "trip_id",
+                scope: {
+                    [sequelize_1.default.Op.and]: [sequelize_1.default.literal(`start_timestamp::date = CURRENT_DATE`)],
+                },
+            });
         };
         /** Retrieves all gtfs trips
          * @param {object} options Options object with params
@@ -129,6 +143,18 @@ class GTFSTripsModel extends models_1.SequelizeModel {
             }
             return trip ? this.ConvertItem(trip, { route, stops, shapes, stopTimes }) : null;
         });
+        this.getOneForPublicGtfsLookup = (id, options = {}) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const tripEntity = yield this.sequelizeModel.findByPk(id, {
+                    attributes: ["trip_id", "shape_id", "trip_headsign", "wheelchair_accessible"],
+                    include: this.getInclusionsForPublicGtfsLookup(options),
+                });
+                return tripEntity ? tripEntity.toJSON() : null;
+            }
+            catch (err) {
+                throw new golemio_errors_1.GeneralError("Cannot get GTFS trip from database", this.constructor.name, err, 500);
+            }
+        });
         /** Prepare ORM query with selected params
          * @param {object} options Options object with params
          * @param {boolean} [options.route] Enhance response with route data
@@ -146,12 +172,17 @@ class GTFSTripsModel extends models_1.SequelizeModel {
             if (stops && stopTimes) {
                 include.push({
                     as: "stop_times",
+                    attributes: {
+                        exclude: ["arrival_time_seconds", "departure_time_seconds", "timepoint"],
+                    },
                     include: [
                         {
                             as: "stop",
                             model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
                         },
                     ],
+                    order: [["stop_sequence", "ASC"]],
+                    separate: true,
                     model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
                 });
                 // Only stops or only stop times selected to include
@@ -166,6 +197,11 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 stopTimes &&
                     include.push({
                         as: "stop_times",
+                        attributes: {
+                            exclude: ["arrival_time_seconds", "departure_time_seconds", "timepoint"],
+                        },
+                        order: [["stop_sequence", "ASC"]],
+                        separate: true,
                         model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
                     });
             }
@@ -189,6 +225,55 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 });
             return include;
         };
+        this.getInclusionsForPublicGtfsLookup = (options) => {
+            const { shouldIncludeStopTimes, shouldIncludeShapes } = options;
+            const include = [];
+            include.push({
+                as: "route",
+                attributes: ["route_id", "route_short_name", "route_type"],
+                model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.routes.pgTableName],
+            });
+            include.push({
+                as: "schedule",
+                attributes: ["run_number"],
+                model: this.dbConnector.getConnection().models[this.tripScheduleRepository.tableName],
+            });
+            if (shouldIncludeStopTimes) {
+                include.push({
+                    as: "stop_times",
+                    attributes: [
+                        "stop_sequence",
+                        "shape_dist_traveled",
+                        [sequelize_1.default.literal(`EXTRACT(EPOCH FROM "arrival_time"::INTERVAL)::int`), "arrival_time_seconds"],
+                        [sequelize_1.default.literal(`EXTRACT(EPOCH FROM "departure_time"::INTERVAL)::int`), "departure_time_seconds"],
+                    ],
+                    include: [
+                        {
+                            as: "stop",
+                            attributes: ["stop_name", "zone_id", "stop_lon", "stop_lat", "wheelchair_boarding"],
+                            required: true,
+                            model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
+                        },
+                    ],
+                    where: {
+                        // exclude no stop waypoints
+                        drop_off_type: { [sequelize_1.default.Op.ne]: PassengerTransferEnums_1.GtfsStopTimeDropOffType.NoDropOff.toString() },
+                        pickup_type: { [sequelize_1.default.Op.ne]: PassengerTransferEnums_1.GtfsStopTimePickupType.NoPickup.toString() },
+                    },
+                    order: [["stop_sequence", "ASC"]],
+                    separate: true,
+                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
+                });
+            }
+            if (shouldIncludeShapes) {
+                include.push({
+                    as: "shapes",
+                    attributes: ["shape_dist_traveled", "shape_pt_lon", "shape_pt_lat"],
+                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.shapes.pgTableName],
+                });
+            }
+            return include;
+        };
         /**
          * Convert a single db result to proper output format with all its included sub-elements
          * @param {object} trip Trip object
@@ -204,7 +289,8 @@ class GTFSTripsModel extends models_1.SequelizeModel {
             })), (options.stops &&
                 options.stopTimes && {
                 stop_times: stopTimesItems.map((stopTime) => {
-                    const convertedStopTime = stopTime;
+                    // exclude computed fields from stop time
+                    const { arrival_time_seconds, departure_time_seconds } = stopTime, convertedStopTime = __rest(stopTime, ["arrival_time_seconds", "departure_time_seconds"]);
                     convertedStopTime.stop = this.BuildResponse(stopTime.stop, "stop_lon", "stop_lat");
                     return convertedStopTime;
                 }),
@@ -213,7 +299,11 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 stops: stopItems.map((stop) => this.BuildResponse(stop, "stop_lon", "stop_lat")),
             })), (!options.stops &&
                 options.stopTimes && {
-                stop_times: stopTimesItems,
+                stop_times: stopTimesItems.map((stopTime) => {
+                    // exclude computed fields from stop time
+                    const { arrival_time_seconds, departure_time_seconds } = stopTime, convertedStopTime = __rest(stopTime, ["arrival_time_seconds", "departure_time_seconds"]);
+                    return convertedStopTime;
+                }),
             })), (options.shapes && {
                 shapes: shapeItems.map((shape) => this.BuildResponse(shape, "shape_pt_lon", "shape_pt_lat")),
             }));
@@ -225,6 +315,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
             return (0, Geo_1.buildGeojsonFeature)(responseObject, longLoc, latLoc, true);
         };
         this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
+        this.tripScheduleRepository = new GtfsTripScheduleRepository_1.GtfsTripScheduleRepository();
     }
 }
 exports.GTFSTripsModel = GTFSTripsModel;

package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"GTFSTripsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSTripsModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GTFSTripsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSTripsModel.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.d.ts

@@ -8,6 +8,7 @@ import { NextFunction, Request, Response, Router } from "@golemio/core/dist/shar
 import { ITripWithPositionRepository } from "./data-access/interfaces/ITripWithPositionRepository";
 export declare class VehiclePositionsRouter {
     router: Router;
+    private cacheHeaderMiddleware;
     protected tripWithPositionRepository: ITripWithPositionRepository;
     constructor();
     GetAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js

@@ -21,9 +21,10 @@ exports.vehiclepositionsRouter = exports.VehiclePositionsRouter = void 0;
 const shared_1 = require("../shared");
 const constants_1 = require("../shared/constants");
 const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
-const redis_1 = require("@golemio/core/dist/output-gateway/redis");
 const Utils_1 = require("@golemio/core/dist/output-gateway/Utils");
 const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
+const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
+const redis_1 = require("@golemio/core/dist/output-gateway/redis");
 const express_1 = require("@golemio/core/dist/shared/express");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
@@ -96,7 +97,8 @@ class VehiclePositionsRouter {
          * Initiates all routes. Should respond with correct data to a HTTP requests to all routes.
          * @param {number|string} expire TTL for the caching middleware
          */
-        this.initRoutes = (expire) => {
+        this.initRoutes = () => {
+            //#region PID Vehicle Positions
             this.router.get("/", [
                 (0, express_validator_1.query)("cisTripNumber").optional().isNumeric().not().isArray(),
                 (0, express_validator_1.query)("routeId").optional().not().isArray(),
@@ -106,22 +108,38 @@ class VehiclePositionsRouter {
                 (0, express_validator_1.query)("includeNotPublic").optional().isBoolean().not().isArray(),
                 (0, express_validator_1.query)("updatedSince").optional().isISO8601().not().isArray(),
                 (0, express_validator_1.query)("preferredTimezone").optional().isIn(constants_1.ValidationArrays.preferredTimezone).not().isArray(),
-            ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("VehiclePositionsRouter"), (0, redis_1.useCacheMiddleware)(expire), this.GetAll);
+            ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("VehiclePositionsRouter"), 
+            // max-age 5 seconds, stale-while-revalidate 5 seconds
+            this.cacheHeaderMiddleware.getMiddleware(5, 5), this.GetAll);
             this.router.get("/:id", [
                 (0, express_validator_1.param)("id").exists(),
                 (0, express_validator_1.query)("includeNotTracking").optional().isBoolean().not().isArray(),
                 (0, express_validator_1.query)("includePositions").optional().isBoolean().not().isArray(),
                 (0, express_validator_1.query)("includeNotPublic").optional().isBoolean().not().isArray(),
                 (0, express_validator_1.query)("preferredTimezone").optional().not().isEmpty({ ignore_whitespace: true }),
-            ], Validation_1.checkErrors, (0, redis_1.useCacheMiddleware)(expire), this.GetOne);
-            this.router.get("/gtfsrt/trip_updates.pb", this.GetGtfsRtFeed("trip_updates.pb"));
-            this.router.get("/gtfsrt/vehicle_positions.pb", this.GetGtfsRtFeed("vehicle_positions.pb"));
-            this.router.get("/gtfsrt/pid_feed.pb", this.GetGtfsRtFeed("pid_feed.pb"));
-            this.router.get("/gtfsrt/alerts.pb", this.GetGtfsRtFeed("alerts.pb"));
+            ], Validation_1.checkErrors, 
+            // max-age 5 seconds, stale-while-revalidate 5 seconds
+            this.cacheHeaderMiddleware.getMiddleware(5, 5), this.GetOne);
+            //#endregion
+            //#region GTFS Realtime
+            this.router.get("/gtfsrt/trip_updates.pb", 
+            // no-cache
+            this.cacheHeaderMiddleware.getNoCacheMiddleware(), this.GetGtfsRtFeed("trip_updates.pb"));
+            this.router.get("/gtfsrt/vehicle_positions.pb", 
+            // no-cache
+            this.cacheHeaderMiddleware.getNoCacheMiddleware(), this.GetGtfsRtFeed("vehicle_positions.pb"));
+            this.router.get("/gtfsrt/pid_feed.pb", 
+            // no-cache
+            this.cacheHeaderMiddleware.getNoCacheMiddleware(), this.GetGtfsRtFeed("pid_feed.pb"));
+            this.router.get("/gtfsrt/alerts.pb", 
+            // no-cache
+            this.cacheHeaderMiddleware.getNoCacheMiddleware(), this.GetGtfsRtFeed("alerts.pb"));
+            //#endregion
         };
         this.router = (0, express_1.Router)();
+        this.cacheHeaderMiddleware = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.tripWithPositionRepository = data_access_1.repositories.tripWithLastPositionRepository;
-        this.initRoutes("5 seconds");
+        this.initRoutes();
     }
 }
 exports.VehiclePositionsRouter = VehiclePositionsRouter;

package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"VehiclePositionsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/vehicle-positions/VehiclePositionsRouter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VehiclePositionsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/vehicle-positions/VehiclePositionsRouter.ts"],"names":[],"mappings":"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"}

package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js

@@ -52,12 +52,18 @@ const outputMinMaxStopSequencesJsonSchema = {
 };
 const outputTripScheduleSDMA = {
     origin_route_id: sequelize_1.DataTypes.STRING,
-    trip_id: sequelize_1.DataTypes.STRING,
+    trip_id: {
+        type: sequelize_1.DataTypes.STRING,
+        primaryKey: true,
+    },
     service_id: sequelize_1.DataTypes.STRING,
     direction_id: sequelize_1.DataTypes.SMALLINT,
     shape_id: sequelize_1.DataTypes.STRING(15),
     run_number: sequelize_1.DataTypes.INTEGER,
-    date: sequelize_1.DataTypes.STRING,
+    date: {
+        type: sequelize_1.DataTypes.STRING,
+        primaryKey: true,
+    },
     route_id: sequelize_1.DataTypes.STRING,
     route_type: {
         type: sequelize_1.DataTypes.SMALLINT,

package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map

@@ -1 +1 @@
-{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}

package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.d.ts

@@ -1,7 +1,7 @@
 import { ModelAttributes } from "@golemio/core/dist/shared/sequelize";
 export interface IRopidGTFSRunNumbersInputData {
     route_id: string;
-    run_number: string;
+    run_number: number;
     service_id: string;
     trip_id: string;
     vehicle_type: string;

package/dist/schema-definitions/ropid-gtfs/interfaces/ITripWithOptionalAssociationsDto.d.ts

@@ -0,0 +1,19 @@
+import { IRouteDto } from "./IRouteDto";
+import { IShapeDto } from "./IShapeDto";
+import { IStopDto } from "./IStopDto";
+import { IStopTimesDto } from "./IStopTimesDto";
+import { ITripDto } from "./ITripDto";
+export interface IStopTimeWithStopDto extends IStopTimesDto {
+    stop: IStopDto;
+}
+export interface ITripWithDefinedRouteDto extends ITripWithOptionalAssociationsDto {
+    route: IRouteDto;
+}
+export interface ITripWithOptionalAssociationsDto extends ITripDto {
+    route?: IRouteDto;
+    stop_times?: IStopTimeWithStopDto[];
+    shapes?: IShapeDto[];
+    schedule?: {
+        run_number: number;
+    };
+}

package/dist/schema-definitions/ropid-gtfs/interfaces/ITripWithOptionalAssociationsDto.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ITripWithOptionalAssociationsDto.js.map

package/dist/schema-definitions/ropid-gtfs/interfaces/ITripWithOptionalAssociationsDto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ITripWithOptionalAssociationsDto.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-gtfs/interfaces/ITripWithOptionalAssociationsDto.ts"],"names":[],"mappings":""}

package/docs/implementation_documentation.md

@@ -595,7 +595,7 @@ Task se stará o aktualizaci cache pro public odjezdy. Pouští se pravidelně c
     -   žádné
 -   data modely
     -   RopidGTFSMetadataModel `ropidgtfs_metadata`
- 
+
 #### _DownloadDeparturesPresetsTask_
 
 -   vstupní rabbitmq fronta
@@ -1256,6 +1256,15 @@ Worker má na starost retenci dat tabulek Azure Table Storage
 
 ### Public
 
+#### _/public/gtfs/trips/{gtfsTripId}_
+
+-   načte statické informace o GTFS spoji z PSQL, případně jeho oběhové číslo pro současný den (pokud je k dispozici), shapes a zastávky
+    -   `info`: statické informace o GTFS spoji a jeho oběhové číslo pro současný den (pokud je k dispozici)
+    -   `stop_times`: seznam zastávek ve formátu geojson
+    -   `shapes`: seznam tvarů trasy podle GTFS ve formátu geojson
+    -   `vehicle_descriptor`: informace o vozidle - pouze očekáváná nízkopodlažnost vozidla načtená z GTFS trips.txt
+-   cachováno na 4 hodiny pomocí cache-control hlavičky
+
 #### _/public/vehiclepositions_
 
 -   načte aktuální polohy vozidel z redisu a vrátí je ve formátu geojson

package/docs/openapi-output.yaml

@@ -31,6 +31,9 @@ tags:
     - name: 🚏 PID Departure Boards
       description: ""
 
+    - name: 🗓️ Public GTFS Static Lookup (experimental)
+      description: ""
+
     - name: 🕐 Public Vehicle Positions (experimental)
       description: ""
 
@@ -949,6 +952,52 @@ paths:
                 "404":
                     description: Not found
 
+    /public/gtfs/trips/{gtfsTripId}:
+        get:
+            tags:
+                - 🗓️ Public GTFS Static Lookup (experimental)
+            summary: GET GTFS Trip
+            description: "Get GTFS static trip info by trip ID, including associated stop times (without no stop waypoints) and shapes."
+            parameters:
+                - name: gtfsTripId
+                  in: path
+                  description:
+                    Filter result by GTFS trip ID.
+                  required: true
+                  schema:
+                    type: string
+                    example: "115_107_180501"
+                - name: scopes
+                  in: query
+                  schema:
+                      type: array
+                      items:
+                          type: string
+                          enum:
+                              - info
+                              - stop_times
+                              - shapes
+                              - vehicle_descriptor
+                  description: "Choose which scopes to include in response."
+                  required: true
+                  example: ["info"]
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json; charset=utf-8:
+                            schema:
+                                allOf:
+                                  - $ref: "#/components/schemas/ScopeStaticInfo"
+                                  - $ref: "#/components/schemas/ScopeStaticStopTimes"
+                                  - $ref: "#/components/schemas/ScopeShapes"
+                                  - $ref: "#/components/schemas/ScopeStaticVehicleDescriptor"
+
+                401:
+                    $ref: "#/components/responses/UnauthorizedError"
+                404:
+                    description: Not found
+
     /public/vehiclepositions:
         get:
             tags:
@@ -1324,17 +1373,9 @@ components:
                 arrival_time:
                     type: string
                     example: "13:12:05"
-                arrival_time_seconds:
-                    type: number
-                    format: int64
-                    nullable: true
                 departure_time:
                     type: string
                     example: "13:12:35"
-                departure_time_seconds:
-                    type: number
-                    format: int64
-                    nullable: true
                 drop_off_type:
                     type: string
                     example: "0"
@@ -1362,10 +1403,6 @@ components:
                 trip_id:
                     type: string
                     example: "991_1156_180709"
-                timepoint:
-                    type: number
-                    nullable: true
-                    example: 1
             required:
                 - arrival_time
                 - departure_time
@@ -1375,7 +1412,6 @@ components:
                 - stop_id
                 - stop_sequence
                 - trip_id
-                - timepoint
 
         GTFSShape:
             title: GTFS Shape
@@ -2248,12 +2284,51 @@ components:
                     description: "time when vehicle send last update"
                     example: "2023-12-06T12:00:00+01:00"
 
+        ScopeStaticInfo:
+            type: object
+            properties:
+                gtfs_trip_id:
+                    type: string
+                    nullable: false
+                    example: "115_107_180501"
+                route_type:
+                    type: string
+                    nullable: false
+                    enum: ["tram", "metro", "train", "bus", "ferry", "funicular", "trolleybus", "ext_miscellaneous"]
+                    example: "bus"
+                route_short_name:
+                    type: string
+                    nullable: false
+                    example: "22"
+                shape_id:
+                    type: string
+                    nullable: true
+                    example: "L22V3"
+                origin_route_name:
+                    type: string
+                    nullable: true
+                    example: "22"
+                run_number:
+                    type: integer
+                    nullable: true
+                    example: 1
+                trip_headsign:
+                    type: string
+                    nullable: true
+                    example: "Bílá Hora"
+
         ScopeStopTimes:
             type: object
             properties:
                 stop_times:
                     $ref: "#/components/schemas/PublicTripStopTimeFeatureCollection"
 
+        ScopeStaticStopTimes:
+            type: object
+            properties:
+                stop_times:
+                    $ref: "#/components/schemas/PublicTripStaticStopTimeFeatureCollection"
+
         ScopeShapes:
             type: object
             properties:
@@ -2292,6 +2367,17 @@ components:
                             nullable: true
                             example: "1001"
 
+        ScopeStaticVehicleDescriptor:
+            type: object
+            properties:
+                vehicle_descriptor:
+                    type: object
+                    properties:
+                        is_wheelchair_accessible:
+                            type: boolean
+                            nullable: true
+                            example: true
+
         PublicTripShapeFeatureCollection:
             type: object
             properties:
@@ -2379,6 +2465,58 @@ components:
                     type: string
                     example: FeatureCollection
 
+        PublicTripStaticStopTimeFeatureCollection:
+            type: object
+            description: "List of stop and arrival, departure times for the trip. No stop waypoints are not included."
+            properties:
+                features:
+                    type: array
+                    items:
+                        type: object
+                        properties:
+                            geometry:
+                                $ref: "#/components/schemas/GeometryPoint"
+                            properties:
+                                type: object
+                                properties:
+                                    stop_name:
+                                        type: string
+                                        nullable: false
+                                        example: "Nádraží Veleslavín"
+                                    stop_sequence:
+                                        type: number
+                                        nullable: false
+                                        example: 3
+                                    zone_id:
+                                        type: string
+                                        nullable: true
+                                        example: "P"
+                                    is_wheelchair_accessible:
+                                        type: boolean
+                                        nullable: true
+                                        example: true
+                                    shape_dist_traveled:
+                                        type: number
+                                        nullable: false
+                                        example: 0
+                                    arrival_time:
+                                        type: string
+                                        nullable: false
+                                        description: "Time for arrival to the stop according to trip schedule."
+                                        example: "12:00:00"
+                                    departure_time:
+                                        type: string
+                                        nullable: false
+                                        description: "Time for departure from the stop according to trip schedule."
+                                        example: "12:00:10"
+                            type:
+                                type: string
+                                example: Feature
+
+                type:
+                    type: string
+                    example: FeatureCollection
+
         GeometryPoint:
             type: object
             description: GeoJson point