@golemio/pid 2.9.1 → 2.9.2-dev.1019504900

package/dist/output-gateway/pid/data-access/DeparturesRepository.js

@@ -14,47 +14,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeparturesRepository = void 0;
 const FeatureFlagEnum_1 = require("../../shared/data-access/FeatureFlagEnum");
-const PositionRepository_1 = require("../../vehicle-positions/data-access/PositionRepository");
-const TripRepository_1 = require("../../vehicle-positions/data-access/TripRepository");
-const VehicleDescriptorRepository_1 = require("../../vehicle-positions/data-access/VehicleDescriptorRepository");
 const const_1 = require("../../../schema-definitions/const");
-const precomputed_1 = require("../../../schema-definitions/ropid-gtfs/models/precomputed");
-const output_gateway_1 = require("@golemio/core/dist/output-gateway");
 const data_access_1 = require("@golemio/core/dist/output-gateway/data-access");
-const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
+const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
 const moment_1 = __importDefault(require("moment"));
-const const_2 = require("../../../const");
 const __1 = require("..");
-class DeparturesRepository extends output_gateway_1.SequelizeModel {
+const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
+const output_gateway_1 = require("@golemio/core/dist/output-gateway");
+const Di_1 = require("@golemio/core/dist/output-gateway/ioc/Di");
+class DeparturesRepository {
     constructor() {
-        super("DeparturesRepository", precomputed_1.DeparturesModel.TABLE_NAME, precomputed_1.DeparturesModel.attributeModel, {
-            schema: const_1.PG_SCHEMA,
-        });
-        this.sequelizeModel.removeAttribute("id");
-        this.tripRepository = new TripRepository_1.TripRepository();
-        this.positionRepository = new PositionRepository_1.PositionRepository();
-        this.vehicleDescriptorRepository = new VehicleDescriptorRepository_1.VehicleDescriptorRepository();
-        this.sequelizeModel.hasOne(this.tripRepository.sequelizeModel, {
-            foreignKey: "gtfs_trip_id",
-            sourceKey: "trip_id",
-            scope: {
-                [sequelize_1.default.Op.and]: [sequelize_1.default.literal(`trip.gtfs_date = ${precomputed_1.DeparturesModel.TABLE_NAME}.date`)],
-            },
-            as: "trip",
-        });
-        this.tripRepository.sequelizeModel.hasOne(this.positionRepository.sequelizeModel, {
-            foreignKey: "id",
-            sourceKey: "last_position_id",
-            as: "last_position",
-        });
-        this.tripRepository.sequelizeModel.hasOne(this.vehicleDescriptorRepository.sequelizeModel, {
-            as: "vehicle_descriptor",
-            foreignKey: "registration_number",
-            sourceKey: "vehicle_registration_number",
-            scope: {
-                [sequelize_1.default.Op.and]: [sequelize_1.default.literal(`trip.gtfs_route_type = "trip->vehicle_descriptor".gtfs_route_type`)],
-            },
-        });
+        this.schema = const_1.PG_SCHEMA;
+        this.connector = Di_1.OutputGatewayContainer.resolve(CoreToken_1.CoreToken.PostgresConnector);
+        this.log = output_gateway_1.log;
     }
     GetOne(id) {
         throw new Error("Method not implemented.");
@@ -67,190 +39,48 @@ class DeparturesRepository extends output_gateway_1.SequelizeModel {
     GetAll(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const isAirConditioningFeatureEnabled = (yield data_access_1.featureFlagService.isFeatureEnabled(FeatureFlagEnum_1.FeatureFlagEnum.PIDEnableAirConditioning, true)) && options.isAirCondition;
-            // eslint-disable-next-line max-len
-            const delaySecondsLiteral = `CASE WHEN "trip->last_position"."delay" IS NULL THEN 0 ELSE "trip->last_position"."delay" END`;
-            const delayMinutesLiteral = `TRUNC("trip->last_position"."delay"::DECIMAL/60, 0)::INT`;
-            const waitAtStopIntervalLiteral = `("departure_datetime" - "arrival_datetime")::INTERVAL`;
-            const isDelayAvailableLiteral = `CASE WHEN "trip->last_position"."delay" IS NULL THEN FALSE ELSE TRUE END`;
-            // Always add delay to the arrival time (even when ahead of time)
-            const arrivalDatetimeRealLiteral = `"arrival_datetime" + MAKE_INTERVAL(secs => (${delaySecondsLiteral}))`;
-            // Always add delay to the departure time (even when ahead of time)
-            // When delayed and waiting at stop, substract the waiting time from the delay
-            //   as long as the result delay is greater than zero
-            const departureDatetimeRealLiteral = `
-            "departure_datetime" +
-            MAKE_INTERVAL(secs => (${delaySecondsLiteral})) -
-            CASE
-                WHEN (MAKE_INTERVAL(secs => (${delaySecondsLiteral})) > MAKE_INTERVAL())
-                THEN LEAST(
-                    MAKE_INTERVAL(secs => (${delaySecondsLiteral})),
-                    ${waitAtStopIntervalLiteral}
-                )
-                ELSE MAKE_INTERVAL()
-            END
-        `;
-            let conditionMode = {
-                [sequelize_1.default.Op.and]: [
-                    {
-                        pickup_type: {
-                            [sequelize_1.default.Op.ne]: "1",
-                        },
-                    },
-                    {
-                        stop_sequence: {
-                            [sequelize_1.default.Op.ne]: sequelize_1.default.col("max_stop_sequence"),
-                        },
-                    },
-                ],
-            };
-            switch (options.mode) {
-                case __1.DepartureMode.ARRIVALS:
-                    conditionMode = {
-                        [sequelize_1.default.Op.and]: [
-                            {
-                                drop_off_type: {
-                                    [sequelize_1.default.Op.ne]: "1",
-                                },
-                            },
-                            {
-                                stop_sequence: {
-                                    [sequelize_1.default.Op.ne]: sequelize_1.default.col("min_stop_sequence"),
-                                },
-                            },
-                        ],
-                    };
-                    break;
-                case __1.DepartureMode.MIXED:
-                    conditionMode = {
-                        pickup_type: {
-                            [sequelize_1.default.Op.ne]: "1",
-                        },
-                    };
-                    break;
-            }
-            const conditionTripNotYetDepartured = {
-                [sequelize_1.default.Op.or]: [
-                    {
-                        stop_sequence: {
-                            [sequelize_1.default.Op.gte]: sequelize_1.default.literal(`"trip->last_position"."last_stop_sequence"`),
-                        },
-                    },
-                    sequelize_1.default.literal(`"trip->last_position"."last_stop_sequence" IS NULL`),
-                ],
-            };
-            const conditionDepartureBetween = sequelize_1.default.where(sequelize_1.default.literal(options.mode === __1.DepartureMode.ARRIVALS ? arrivalDatetimeRealLiteral : departureDatetimeRealLiteral), {
-                [sequelize_1.default.Op.between]: [
-                    options.currentMoment
-                        .clone()
-                        .add(options.minutesOffset - options.minutesBefore, "minutes")
-                        .toDate(),
-                    options.currentMoment
-                        .clone()
-                        .add(options.minutesOffset + options.minutesAfter, "minutes")
-                        .toDate(),
-                ],
-            });
-            const conditionCanceledTripDepartureSustain = {
-                [sequelize_1.default.Op.and]: [
-                    sequelize_1.default.literal(`"trip"."is_canceled" = TRUE`),
-                    sequelize_1.default.where(sequelize_1.default.literal(options.mode === __1.DepartureMode.ARRIVALS ? arrivalDatetimeRealLiteral : departureDatetimeRealLiteral), {
-                        [sequelize_1.default.Op.between]: [
-                            moment_1.default
-                                .min([
-                                options.currentMoment.clone().add(options.minutesOffset - options.minutesBefore, "minutes"),
-                                options.currentMoment.clone().add(options.minutesOffset - 3, "minutes"),
-                            ])
-                                .toDate(),
-                            moment_1.default
-                                .max(options.currentMoment.clone().add(options.minutesOffset + options.minutesAfter, "minutes"), options.currentMoment.clone().add(options.minutesOffset + 3, "minutes"))
-                                .toDate(),
-                        ],
-                    }),
-                ],
-            };
-            const whereCondition = {
-                [sequelize_1.default.Op.and]: [
-                    {
-                        [sequelize_1.default.Op.or]: [
-                            {
-                                [sequelize_1.default.Op.and]: [
-                                    conditionDepartureBetween,
-                                    options.minutesBefore <= 0 && conditionTripNotYetDepartured,
-                                ],
-                            },
-                            conditionCanceledTripDepartureSustain,
-                        ],
-                    },
-                    conditionMode,
-                ],
-            };
-            return this.sequelizeModel.findAll({
-                attributes: {
-                    include: [
-                        [sequelize_1.default.literal(`"trip->last_position"."delay"`), "delay_seconds"],
-                        [sequelize_1.default.literal(`"trip"."wheelchair_accessible"`), "real_wheelchair_accessible"],
-                        [sequelize_1.default.literal(`"trip->last_position"."is_canceled"`), "is_canceled"],
-                        [sequelize_1.default.literal(arrivalDatetimeRealLiteral), "arrival_datetime_real"],
-                        [sequelize_1.default.literal(departureDatetimeRealLiteral), "departure_datetime_real"],
-                        [sequelize_1.default.literal(delayMinutesLiteral), "delay_minutes"],
-                        [sequelize_1.default.literal(isDelayAvailableLiteral), "is_delay_available"],
-                    ],
-                },
-                where: {
-                    [sequelize_1.default.Op.and]: [
-                        {
-                            stop_id: {
-                                [sequelize_1.default.Op.in]: options.stopsIds,
-                            },
-                        },
-                        whereCondition,
-                    ],
-                },
-                include: {
-                    model: this.tripRepository.sequelizeModel,
-                    as: "trip",
-                    required: false,
-                    include: this.composeIncludeForTrip(isAirConditioningFeatureEnabled),
+            const dateDepartureBetweenStart = options.currentMoment
+                .clone()
+                .add(options.minutesOffset - options.minutesBefore, "minutes")
+                .toDate();
+            const dateDepartureBetweenEnd = options.currentMoment
+                .clone()
+                .add(options.minutesOffset + options.minutesAfter, "minutes")
+                .toDate();
+            const dateCanceledDepartureBetweenStart = moment_1.default
+                .min([
+                options.currentMoment.clone().add(options.minutesOffset - options.minutesBefore, "minutes"),
+                options.currentMoment.clone().add(options.minutesOffset - 3, "minutes"),
+            ])
+                .toDate();
+            const dateCanceledDepartureBetweenEnd = moment_1.default
+                .max(options.currentMoment.clone().add(options.minutesOffset + options.minutesAfter, "minutes"), options.currentMoment.clone().add(options.minutesOffset + 3, "minutes"))
+                .toDate();
+            const result = yield this.connector.getConnection().query(`
+            SELECT * from ${this.schema}.get_departures(
+                $stopsids, 
+                $mode, 
+                $datedeparturebetweenstart, 
+                $datedeparturebetweenend, 
+                $isnegativeminutesbefore, 
+                $datecanceleddeparturebetweenstart, 
+                $datecanceleddeparturebetweenend,
+                $airconditioninfoenabled);`, {
+                type: sequelize_1.QueryTypes.SELECT,
+                bind: {
+                    stopsids: options.stopsIds.join(","),
+                    mode: options.mode === __1.DepartureMode.ARRIVALS ? 2 : options.mode === __1.DepartureMode.MIXED ? 3 : 1,
+                    datedeparturebetweenstart: dateDepartureBetweenStart,
+                    datedeparturebetweenend: dateDepartureBetweenEnd,
+                    isnegativeminutesbefore: options.minutesBefore < 0 ? 1 : 0,
+                    datecanceleddeparturebetweenstart: dateCanceledDepartureBetweenStart,
+                    datecanceleddeparturebetweenend: dateCanceledDepartureBetweenEnd,
+                    airconditioninfoenabled: isAirConditioningFeatureEnabled ? 1 : 0,
                 },
-                raw: true,
             });
+            return result;
         });
     }
-    composeIncludeForTrip(isAirConditioningFeatureEnabled) {
-        const include = [
-            {
-                as: "last_position",
-                model: this.positionRepository.sequelizeModel,
-                required: true,
-                where: {
-                    valid_to: {
-                        [sequelize_1.default.Op.or]: [null, { [sequelize_1.default.Op.gte]: new Date() }],
-                    },
-                    state_position: {
-                        [sequelize_1.default.Op.in]: [
-                            // StatePositionEnum.AFTER_TRACK, // excluding those vehicles after their trip
-                            const_2.StatePositionEnum.AT_STOP,
-                            const_2.StatePositionEnum.BEFORE_TRACK,
-                            const_2.StatePositionEnum.BEFORE_TRACK_DELAYED,
-                            const_2.StatePositionEnum.CANCELED,
-                            // StatePositionEnum.INVISIBLE, // excluding information about trips to be hidden
-                            const_2.StatePositionEnum.OFF_TRACK,
-                            const_2.StatePositionEnum.ON_TRACK,
-                        ],
-                    },
-                },
-            },
-        ];
-        if (isAirConditioningFeatureEnabled) {
-            include.push({
-                as: "vehicle_descriptor",
-                model: this.vehicleDescriptorRepository.sequelizeModel,
-                attributes: ["is_air_conditioned"],
-                required: false,
-            });
-        }
-        return include;
-    }
 }
 exports.DeparturesRepository = DeparturesRepository;
 //# sourceMappingURL=DeparturesRepository.js.map

package/dist/output-gateway/pid/data-access/DeparturesRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8EAAyE;AACzE,+FAA0F;AAC1F,uFAAkF;AAClF,iHAA4G;AAC5G,6DAAuC;AACvC,2FAAqE;AACrE,sEAAmE;AACnE,+EAAmF;AAEnF,oFAA6E;AAC7E,oDAA4B;AAC5B,0CAA8C;AAC9C,0BAAkD;AAYlD,MAAa,oBAAqB,SAAQ,+BAAc;IAKpD;QACI,KAAK,CAAC,sBAAsB,EAAE,6BAAe,CAAC,UAAU,EAAE,6BAAe,CAAC,cAAc,EAAE;YACtF,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE1C,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,EAAE,CAAC;QAC3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,EAAE,CAAC;QACnD,IAAI,CAAC,2BAA2B,GAAG,IAAI,yDAA2B,EAAE,CAAC;QAErE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE;YAC3D,UAAU,EAAE,cAAc;YAC1B,SAAS,EAAE,SAAS;YACpB,KAAK,EAAE;gBACH,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAS,CAAC,OAAO,CAAC,oBAAoB,6BAAe,CAAC,UAAU,OAAO,CAAC,CAAC;aACjG;YACD,EAAE,EAAE,MAAM;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;YAC9E,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,kBAAkB;YAC7B,EAAE,EAAE,eAAe;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,cAAc,EAAE;YACvF,EAAE,EAAE,oBAAoB;YACxB,UAAU,EAAE,qBAAqB;YACjC,SAAS,EAAE,6BAA6B;YACxC,KAAK,EAAE;gBACH,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAS,CAAC,OAAO,CAAC,mEAAmE,CAAC,CAAC;aAC/G;SACJ,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,EAAO;QACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACG,MAAM,CAAC,OAA+B;;YACxC,MAAM,+BAA+B,GACjC,CAAC,MAAM,gCAAkB,CAAC,gBAAgB,CAAC,iCAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC;YAE1H,mCAAmC;YACnC,MAAM,mBAAmB,GAAG,+FAA+F,CAAC;YAC5H,MAAM,mBAAmB,GAAG,0DAA0D,CAAC;YACvF,MAAM,yBAAyB,GAAG,uDAAuD,CAAC;YAC1F,MAAM,uBAAuB,GAAG,0EAA0E,CAAC;YAE3G,iEAAiE;YACjE,MAAM,0BAA0B,GAAG,+CAA+C,mBAAmB,IAAI,CAAC;YAE1G,mEAAmE;YACnE,8EAA8E;YAC9E,qDAAqD;YACrD,MAAM,4BAA4B,GAAG;;qCAER,mBAAmB;;+CAET,mBAAmB;;6CAErB,mBAAmB;sBAC1C,yBAAyB;;;;SAItC,CAAC;YAEF,IAAI,aAAa,GAAQ;gBACrB,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;oBAChB;wBACI,WAAW,EAAE;4BACT,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG;yBACzB;qBACJ;oBACD;wBACI,aAAa,EAAE;4BACX,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,mBAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC;yBACxD;qBACJ;iBACJ;aACJ,CAAC;YACF,QAAQ,OAAO,CAAC,IAAI,EAAE;gBAClB,KAAK,iBAAa,CAAC,QAAQ;oBACvB,aAAa,GAAG;wBACZ,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;4BAChB;gCACI,aAAa,EAAE;oCACX,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG;iCACzB;6BACJ;4BACD;gCACI,aAAa,EAAE;oCACX,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,mBAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC;iCACxD;6BACJ;yBACJ;qBACJ,CAAC;oBACF,MAAM;gBACV,KAAK,iBAAa,CAAC,KAAK;oBACpB,aAAa,GAAG;wBACZ,WAAW,EAAE;4BACT,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG;yBACzB;qBACJ,CAAC;oBACF,MAAM;aACb;YAED,MAAM,6BAA6B,GAAG;gBAClC,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;oBACf;wBACI,aAAa,EAAE;4BACX,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,mBAAS,CAAC,OAAO,CAAC,4CAA4C,CAAC;yBACtF;qBACJ;oBACD,mBAAS,CAAC,OAAO,CAAC,oDAAoD,CAAC;iBAC1E;aACJ,CAAC;YACF,MAAM,yBAAyB,GAAG,mBAAS,CAAC,KAAK,CAC7C,mBAAS,CAAC,OAAO,CACb,OAAO,CAAC,IAAI,KAAK,iBAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,4BAA4B,CACtG,EACD;gBACI,CAAC,mBAAS,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;oBACpB,OAAO,CAAC,aAAa;yBAChB,KAAK,EAAE;yBACP,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC;yBAC7D,MAAM,EAAE;oBACb,OAAO,CAAC,aAAa;yBAChB,KAAK,EAAE;yBACP,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC;yBAC5D,MAAM,EAAE;iBAChB;aACJ,CACJ,CAAC;YACF,MAAM,qCAAqC,GAAG;gBAC1C,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;oBAChB,mBAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC;oBAChD,mBAAS,CAAC,KAAK,CACX,mBAAS,CAAC,OAAO,CACb,OAAO,CAAC,IAAI,KAAK,iBAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,4BAA4B,CACtG,EACD;wBACI,CAAC,mBAAS,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;4BACpB,gBAAM;iCACD,GAAG,CAAC;gCACD,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC;gCAC3F,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,EAAE,SAAS,CAAC;6BAC1E,CAAC;iCACD,MAAM,EAAE;4BACb,gBAAM;iCACD,GAAG,CACA,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,EAC1F,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,EAAE,SAAS,CAAC,CAC1E;iCACA,MAAM,EAAE;yBAChB;qBACJ,CACJ;iBACJ;aACJ,CAAC;YAEF,MAAM,cAAc,GAAG;gBACnB,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;oBAChB;wBACI,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;4BACf;gCACI,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;oCAChB,yBAAyB;oCACzB,OAAO,CAAC,aAAa,IAAI,CAAC,IAAI,6BAA6B;iCAC9D;6BACJ;4BACD,qCAAqC;yBACxC;qBACJ;oBACD,aAAa;iBAChB;aACJ,CAAC;YAEF,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC/B,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,CAAC,mBAAS,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,eAAe,CAAC;wBACrE,CAAC,mBAAS,CAAC,OAAO,CAAC,gCAAgC,CAAC,EAAE,4BAA4B,CAAC;wBACnF,CAAC,mBAAS,CAAC,OAAO,CAAC,qCAAqC,CAAC,EAAE,aAAa,CAAC;wBACzE,CAAC,mBAAS,CAAC,OAAO,CAAC,0BAA0B,CAAC,EAAE,uBAAuB,CAAC;wBACxE,CAAC,mBAAS,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAAE,yBAAyB,CAAC;wBAC5E,CAAC,mBAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,eAAe,CAAC;wBACzD,CAAC,mBAAS,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,oBAAoB,CAAC;qBACrE;iBACJ;gBACD,KAAK,EAAE;oBACH,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;wBAChB;4BACI,OAAO,EAAE;gCACL,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ;6BACtC;yBACJ;wBACD,cAAc;qBACjB;iBACJ;gBACD,OAAO,EAAE;oBACL,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,cAAc;oBACzC,EAAE,EAAE,MAAM;oBACV,QAAQ,EAAE,KAAK;oBACf,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,+BAA+B,CAAC;iBACvE;gBACD,GAAG,EAAE,IAAI;aACZ,CAA6B,CAAC;QACnC,CAAC;KAAA;IAEO,qBAAqB,CAAC,+BAAwC;QAClE,MAAM,OAAO,GAAkB;YAC3B;gBACI,EAAE,EAAE,eAAe;gBACnB,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,cAAc;gBAC7C,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE;oBACH,QAAQ,EAAE;wBACN,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;qBAChE;oBACD,cAAc,EAAE;wBACZ,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;4BACf,8EAA8E;4BAC9E,yBAAiB,CAAC,OAAO;4BACzB,yBAAiB,CAAC,YAAY;4BAC9B,yBAAiB,CAAC,oBAAoB;4BACtC,yBAAiB,CAAC,QAAQ;4BAC1B,iFAAiF;4BACjF,yBAAiB,CAAC,SAAS;4BAC3B,yBAAiB,CAAC,QAAQ;yBAC7B;qBACJ;iBACJ;aACJ;SACJ,CAAC;QAEF,IAAI,+BAA+B,EAAE;YACjC,OAAO,CAAC,IAAI,CAAC;gBACT,EAAE,EAAE,oBAAoB;gBACxB,KAAK,EAAE,IAAI,CAAC,2BAA2B,CAAC,cAAc;gBACtD,UAAU,EAAE,CAAC,oBAAoB,CAAC;gBAClC,QAAQ,EAAE,KAAK;aAClB,CAAC,CAAC;SACN;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AAlQD,oDAkQC"}
+{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8EAAyE;AACzE,6DAAuC;AAGvC,+EAAmF;AAEnF,mEAAiE;AACjE,oDAA4B;AAC5B,0BAAkD;AAElD,wEAAqE;AACrE,sEAAwD;AACxD,iEAAkF;AAYlF,MAAa,oBAAoB;IAK7B;QACI,IAAI,CAAC,MAAM,GAAG,iBAAS,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,2BAAsB,CAAC,OAAO,CAAqB,qBAAS,CAAC,iBAAiB,CAAC,CAAC;QACjG,IAAI,CAAC,GAAG,GAAG,oBAAG,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,EAAO;QACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACG,MAAM,CAAC,OAA+B;;YACxC,MAAM,+BAA+B,GACjC,CAAC,MAAM,gCAAkB,CAAC,gBAAgB,CAAC,iCAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC;YAE1H,MAAM,yBAAyB,GAAG,OAAO,CAAC,aAAa;iBAClD,KAAK,EAAE;iBACP,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC;iBAC7D,MAAM,EAAE,CAAC;YACd,MAAM,uBAAuB,GAAG,OAAO,CAAC,aAAa;iBAChD,KAAK,EAAE;iBACP,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC;iBAC5D,MAAM,EAAE,CAAC;YAEd,MAAM,iCAAiC,GAAG,gBAAM;iBAC3C,GAAG,CAAC;gBACD,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC;gBAC3F,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,EAAE,SAAS,CAAC;aAC1E,CAAC;iBACD,MAAM,EAAE,CAAC;YACd,MAAM,+BAA+B,GAAG,gBAAM;iBACzC,GAAG,CACA,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,EAC1F,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,EAAE,SAAS,CAAC,CAC1E;iBACA,MAAM,EAAE,CAAC;YAEd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,KAAK,CACrD;4BACgB,IAAI,CAAC,MAAM;;;;;;;;2CAQI,EAC/B;gBACI,IAAI,EAAE,sBAAU,CAAC,MAAM;gBACvB,IAAI,EAAE;oBACF,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;oBACpC,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,iBAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAChG,yBAAyB,EAAE,yBAAyB;oBACpD,uBAAuB,EAAE,uBAAuB;oBAChD,uBAAuB,EAAE,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC1D,iCAAiC,EAAE,iCAAiC;oBACpE,+BAA+B,EAAE,+BAA+B;oBAChE,uBAAuB,EAAE,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACnE;aACJ,CACJ,CAAC;YAEF,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CACJ;AA1ED,oDA0EC"}

package/dist/output-gateway/pid/index.d.ts

@@ -1,78 +1,41 @@
+import { GtfsStopWheelchairBoardingEnum, GtfsTripWheelchairAccessEnum } from "../../helpers/AccessibilityEnums";
 import { GTFSRouteTypeEnum } from "../../helpers/RouteTypeEnums";
 import { DeparturesDirectionsEnum } from "../../schema-definitions/ropid-departures-directions";
-import { IDeparturesModel } from "../../schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel";
-import { StatePositionEnum, StateProcessEnum } from "../../const";
 export * from "./PIDRouter";
 export * from "./models";
-export interface IPIDDeparture extends IDeparturesModel {
+export interface IPIDDeparture {
+    stop_sequence: number;
+    stop_headsign: string | null;
+    arrival_datetime: Date | null;
+    departure_datetime: Date | null;
+    stop_id: string;
+    platform_code: string | null;
+    wheelchair_boarding: GtfsStopWheelchairBoardingEnum | null;
+    min_stop_sequence: number | null;
+    max_stop_sequence: number | null;
+    trip_id: string;
+    trip_headsign: string;
+    trip_short_name: string | null;
+    wheelchair_accessible: GtfsTripWheelchairAccessEnum | null;
+    route_short_name: string | null;
+    route_type: GTFSRouteTypeEnum;
+    route_id: string | null;
+    is_night: string | null;
+    is_regional: string | null;
+    is_substitute_transport: string | null;
+    next_stop_id: string | null;
     direction: DeparturesDirectionsEnum | null;
     delay_seconds: number | null;
     delay_minutes: number | null;
     is_delay_available: boolean;
     arrival_datetime_real: Date | null;
     departure_datetime_real: Date | null;
-    state_position: string;
     real_wheelchair_accessible: boolean | null;
     is_canceled: boolean;
-    "trip.agency_name_real": string | null;
-    "trip.agency_name_scheduled": string | null;
-    "trip.cis_line_id": string | null;
-    "trip.cis_line_short_name": string | null;
-    "trip.cis_trip_number": string | null;
-    "trip.gtfs_block_id": string | null;
-    "trip.gtfs_route_id": string | null;
-    "trip.gtfs_route_short_name": string | null;
-    "trip.gtfs_route_type": GTFSRouteTypeEnum | null;
-    "trip.gtfs_trip_headsign": string | null;
-    "trip.gtfs_trip_id": string | null;
-    "trip.id": string | null;
-    "trip.is_canceled": string | null;
-    "trip.last_position_id": string | null;
-    "trip.origin_route_name": string | null;
-    "trip.run_number": string | null;
-    "trip.start_asw_stop_id": string | null;
-    "trip.start_cis_stop_id": string | null;
-    "trip.start_cis_stop_platform_code": string | null;
-    "trip.start_time": string | null;
-    "trip.start_timestamp": string | null;
-    "trip.end_timestamp": string | null;
-    "trip.vehicle_registration_number": string | null;
-    "trip.vehicle_type_id": string | null;
-    "trip.wheelchair_accessible": string | null;
-    "trip.last_position.asw_last_stop_id": string | null;
-    "trip.last_position.bearing": number | null;
-    "trip.last_position.cis_last_stop_id": string | null;
-    "trip.last_position.cis_last_stop_sequence": number | null;
-    "trip.last_position.delay": number | null;
-    "trip.last_position.delay_stop_arrival": string | null;
-    "trip.last_position.delay_stop_departure": string | null;
-    "trip.last_position.id": string | null;
-    "trip.last_position.is_canceled": string | null;
-    "trip.last_position.last_stop_arrival_time": string | null;
-    "trip.last_position.last_stop_departure_time": string | null;
     "trip.last_position.last_stop_id": string | null;
     "trip.last_position.last_stop_sequence": number | null;
     "trip.last_position.last_stop_name": string | null;
-    "trip.last_position.lat": string | null;
-    "trip.last_position.lng": string | null;
-    "trip.last_position.next_stop_arrival_time": string | null;
-    "trip.last_position.next_stop_departure_time": string | null;
-    "trip.last_position.next_stop_id": string | null;
-    "trip.last_position.next_stop_sequence": number | null;
-    "trip.last_position.next_stop_name": string | null;
-    "trip.last_position.origin_time": string | null;
-    "trip.last_position.origin_timestamp": string | null;
-    "trip.last_position.shape_dist_traveled": string | null;
-    "trip.last_position.speed": number | null;
-    "trip.last_position.state_position": StatePositionEnum | null;
-    "trip.last_position.state_process": StateProcessEnum | null;
-    "trip.last_position.this_stop_id": string | null;
     "trip.last_position.this_stop_sequence": number | null;
-    "trip.last_position.this_stop_name": string | null;
-    "trip.last_position.tracking": number | null;
-    "trip.last_position.trips_id": string | null;
-    "trip.last_position.tcp_event": string | null;
-    "trip.last_position.last_stop_headsign": string | null;
     "trip.vehicle_descriptor.is_air_conditioned"?: boolean | null;
 }
 export interface IPIDDepartureOutput {

package/dist/output-gateway/pid/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAKA,8CAA4B;AAC5B,2CAAyB;AAqHzB,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACnB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,yCAAuB,CAAA;AAC3B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,2CAAwB,CAAA;IACxB,0DAAuC,CAAA;IACvC,oDAAiC,CAAA;IACjC,mEAAgD,CAAA;IAChD,qEAAkD,CAAA;IAClD,8EAA2D,CAAA;AAC/D,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAED,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,mCAAkB,CAAA;IAClB,8BAA8B;AAClC,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAMA,8CAA4B;AAC5B,2CAAyB;AAiFzB,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACnB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,yCAAuB,CAAA;AAC3B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,2CAAwB,CAAA;IACxB,0DAAuC,CAAA;IACvC,oDAAiC,CAAA;IACjC,mEAAgD,CAAA;IAChD,qEAAkD,CAAA;IAClD,8EAA2D,CAAA;AAC/D,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAED,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,mCAAkB,CAAA;IAClB,8BAA8B;AAClC,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB"}

package/dist/schema-definitions/vehicle-descriptors/datasources/SeznamAutobusuJsonSchema.js

@@ -15,6 +15,7 @@ exports.seznamAutobusuJsonSchema = {
             manufacturer: { type: "string" },
             type: { type: "string" },
             traction: { type: "string" },
+            wheelchairAccessible: { oneOf: [{ type: "integer" }, { type: "null", nullable: true }] },
             airCondition: { type: "integer", enum: [0, 1] },
             usbChargers: { type: "integer", enum: [0, 1] },
             paint: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },

package/dist/schema-definitions/vehicle-descriptors/datasources/SeznamAutobusuJsonSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"SeznamAutobusuJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-descriptors/datasources/SeznamAutobusuJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,wBAAwB,GAAuC;IACxE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE;YAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAChC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACxE,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YAC9C,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACxE,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAC/E,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;SAC9E;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,OAAO;YACP,QAAQ;YACR,aAAa;YACb,OAAO;YACP,UAAU;YACV,cAAc;YACd,MAAM;YACN,UAAU;YACV,cAAc;YACd,aAAa;YACb,OAAO;YACP,cAAc;YACd,UAAU;SACb;KACJ;CACJ,CAAC"}
+{"version":3,"file":"SeznamAutobusuJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-descriptors/datasources/SeznamAutobusuJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,wBAAwB,GAAuC;IACxE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE;YAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAChC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACxE,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACxF,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YAC9C,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACxE,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAC/E,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;SAC9E;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,OAAO;YACP,QAAQ;YACR,aAAa;YACb,OAAO;YACP,UAAU;YACV,cAAc;YACd,MAAM;YACN,UAAU;YACV,cAAc;YACd,aAAa;YACb,OAAO;YACP,cAAc;YACd,UAAU;SACb;KACJ;CACJ,CAAC"}

package/dist/schema-definitions/vehicle-descriptors/datasources/interfaces/IVehicleListInfo.d.ts

@@ -8,6 +8,7 @@ export interface IVehicleListInfo {
     manufacturer: string;
     type: string;
     traction: string;
+    wheelchairAccessible: number | null;
     airCondition: number;
     usbChargers: number;
     paint: string | null;

package/dist/schema-definitions/vehicle-descriptors/models/DescriptorModel.d.ts

@@ -15,6 +15,7 @@ export declare class DescriptorModel extends Model<IDescriptorOutputDto & IDescr
     type: string;
     traction: string;
     gtfs_route_type: GTFSRouteTypeEnum;
+    is_wheelchair_accessible: boolean | null;
     is_air_conditioned: boolean;
     has_usb_chargers: boolean;
     paint: string | null;

package/dist/schema-definitions/vehicle-descriptors/models/DescriptorModel.js

@@ -18,6 +18,7 @@ DescriptorModel.attributeModel = {
     type: { type: sequelize_1.DataTypes.STRING, allowNull: false },
     traction: { type: sequelize_1.DataTypes.STRING, allowNull: false },
     gtfs_route_type: { type: sequelize_1.DataTypes.SMALLINT, allowNull: false },
+    is_wheelchair_accessible: { type: sequelize_1.DataTypes.BOOLEAN, allowNull: true },
     is_air_conditioned: { type: sequelize_1.DataTypes.BOOLEAN, allowNull: false },
     has_usb_chargers: { type: sequelize_1.DataTypes.BOOLEAN, allowNull: false },
     paint: { type: sequelize_1.DataTypes.STRING, allowNull: true },
@@ -42,6 +43,7 @@ DescriptorModel.arrayJsonSchema = {
             type: { type: "string" },
             traction: { type: "string" },
             gtfs_route_type: { type: "integer" },
+            is_wheelchair_accessible: { oneOf: [{ type: "boolean" }, { type: "null", nullable: true }] },
             is_air_conditioned: { type: "boolean" },
             has_usb_chargers: { type: "boolean" },
             paint: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
@@ -59,6 +61,7 @@ DescriptorModel.arrayJsonSchema = {
             "type",
             "traction",
             "gtfs_route_type",
+            "is_wheelchair_accessible",
             "is_air_conditioned",
             "has_usb_chargers",
             "paint",

package/dist/schema-definitions/vehicle-descriptors/models/DescriptorModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"DescriptorModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-descriptors/models/DescriptorModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAExF,oFAAgF;AAGhF,MAAa,eAAgB,SAAQ,iBAAiD;;AAAtF,0CAiFC;AAhFiB,yBAAS,GAAG,sCAAsC,CAAC;AAkBnD,8BAAc,GAA2D;IACnF,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;IACjD,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IACnD,mBAAmB,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;IAClE,yBAAyB,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE;IACzE,aAAa,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;IAC1D,QAAQ,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IACtD,YAAY,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IAC1D,IAAI,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IAClD,QAAQ,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IACtD,eAAe,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE;IAC/D,kBAAkB,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;IACjE,gBAAgB,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;IAC/D,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;IAClD,aAAa,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;IAC1D,SAAS,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;CACzD,CAAC;AAEY,gCAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;KACvE,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,IAAI,CAAC;KACzC,MAAM,CAAC,YAAY,CAAsC,CAAC;AAEjD,+BAAe,GAA2C;IACpE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,mDAA0B,CAAC,EAAE;YAC1E,mBAAmB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACxC,yBAAyB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC9C,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAChF,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACpC,kBAAkB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvC,gBAAgB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACxE,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAChF,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;SAC/E;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,OAAO;YACP,qBAAqB;YACrB,2BAA2B;YAC3B,eAAe;YACf,UAAU;YACV,cAAc;YACd,MAAM;YACN,UAAU;YACV,iBAAiB;YACjB,oBAAoB;YACpB,kBAAkB;YAClB,OAAO;YACP,eAAe;YACf,WAAW;SACd;KACJ;CACJ,CAAC"}
+{"version":3,"file":"DescriptorModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-descriptors/models/DescriptorModel.ts"],"names":[],"mappings":"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"}

package/dist/schema-definitions/vehicle-descriptors/models/interfaces/IDescriptorOutputDto.d.ts

@@ -12,6 +12,7 @@ export interface IDescriptorOutputDto {
     traction: string;
     gtfs_route_type: GTFSRouteTypeEnum;
     is_air_conditioned: boolean;
+    is_wheelchair_accessible: boolean | null;
     has_usb_chargers: boolean;
     paint: string | null;
     thumbnail_url: string | null;

package/dist/schema-definitions/vehicle-positions/models/RegionalBusRunsMessagesModel.d.ts

@@ -5,8 +5,8 @@ import { IRegionalBusRunsMessagesModel } from "./interfaces/IRegionalBusRunsMess
 export declare class RegionalBusRunsMessagesModel extends Model<RegionalBusRunsMessagesModel> implements IRegionalBusRunsMessagesModel {
     static TABLE_NAME: string;
     external_trip_id: string;
-    cis_route_id: string | null;
-    cis_trip_id: string | null;
+    cis_line_id: string | null;
+    cis_trip_number: number | null;
     events: string;
     coordinates: Point;
     vehicle_timestamp: Date;

package/dist/schema-definitions/vehicle-positions/models/RegionalBusRunsMessagesModel.js

@@ -12,11 +12,11 @@ RegionalBusRunsMessagesModel.attributeModel = {
         type: sequelize_1.DataTypes.STRING(100),
         primaryKey: true,
     },
-    cis_route_id: {
+    cis_line_id: {
         type: sequelize_1.DataTypes.STRING(10),
     },
-    cis_trip_id: {
-        type: sequelize_1.DataTypes.STRING(10),
+    cis_trip_number: {
+        type: sequelize_1.DataTypes.INTEGER,
     },
     events: {
         type: sequelize_1.DataTypes.STRING(10),
@@ -50,11 +50,11 @@ RegionalBusRunsMessagesModel.arrayJsonSchema = {
             external_trip_id: {
                 type: "string",
             },
-            cis_route_id: {
+            cis_line_id: {
                 type: ["null", "string"],
             },
-            cis_trip_id: {
-                type: ["null", "string"],
+            cis_trip_number: {
+                type: ["null", "number"],
             },
             events: {
                 type: "string",

package/dist/schema-definitions/vehicle-positions/models/RegionalBusRunsMessagesModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"RegionalBusRunsMessagesModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/RegionalBusRunsMessagesModel.ts"],"names":[],"mappings":";;;AAAA,8EAA6E;AAG7E,mEAAwF;AAGxF,MAAa,4BAA6B,SAAQ,iBAAmC;;AAArF,oEA0FC;AAzFiB,uCAAU,GAAG,6CAA6C,CAAC;AAY3D,2CAAc,GAAkD;IAC1E,gBAAgB,EAAE;QACd,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,UAAU,EAAE,IAAI;KACnB;IACD,YAAY,EAAE;QACV,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,WAAW,EAAE;QACT,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,MAAM,EAAE;QACJ,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,WAAW,EAAE;QACT,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;IACD,iBAAiB,EAAE;QACf,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,UAAU,EAAE,IAAI;KACnB;IACD,mBAAmB,EAAE;QACjB,IAAI,EAAE,qBAAS,CAAC,OAAO;KAC1B;IACD,SAAS,EAAE;QACP,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;IACD,OAAO,EAAE;QACL,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;CACJ,CAAC;AAEY,4CAAe,GAAoD;IAC7E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;aACjB;YACD,YAAY,EAAE;gBACV,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;aAC3B;YACD,WAAW,EAAE;gBACT,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;aAC3B;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;aACjB;YACD,WAAW,EAAE;gBACT,IAAI,EAAE,wBAAwB;aACjC;YACD,iBAAiB,EAAE;gBACf,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,mBAAmB,EAAE;gBACjB,IAAI,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;aAC5B;YACD,SAAS,EAAE;gBACP,IAAI,EAAE,SAAS;aAClB;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,QAAQ,EAAE,CAAC,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,SAAS,CAAC;KACvG;IACD,WAAW,EAAE;QACT,mBAAmB;QACnB,QAAQ,EAAE,yCAAoB,CAAC,QAAQ;KAC1C;CACJ,CAAC"}
+{"version":3,"file":"RegionalBusRunsMessagesModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/RegionalBusRunsMessagesModel.ts"],"names":[],"mappings":";;;AAAA,8EAA6E;AAG7E,mEAAwF;AAGxF,MAAa,4BAA6B,SAAQ,iBAAmC;;AAArF,oEA0FC;AAzFiB,uCAAU,GAAG,6CAA6C,CAAC;AAY3D,2CAAc,GAAkD;IAC1E,gBAAgB,EAAE;QACd,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,UAAU,EAAE,IAAI;KACnB;IACD,WAAW,EAAE;QACT,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,eAAe,EAAE;QACb,IAAI,EAAE,qBAAS,CAAC,OAAO;KAC1B;IACD,MAAM,EAAE;QACJ,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,WAAW,EAAE;QACT,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;IACD,iBAAiB,EAAE;QACf,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,UAAU,EAAE,IAAI;KACnB;IACD,mBAAmB,EAAE;QACjB,IAAI,EAAE,qBAAS,CAAC,OAAO;KAC1B;IACD,SAAS,EAAE;QACP,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;IACD,OAAO,EAAE;QACL,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;CACJ,CAAC;AAEY,4CAAe,GAAoD;IAC7E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;aACjB;YACD,WAAW,EAAE;gBACT,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;aAC3B;YACD,eAAe,EAAE;gBACb,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;aAC3B;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;aACjB;YACD,WAAW,EAAE;gBACT,IAAI,EAAE,wBAAwB;aACjC;YACD,iBAAiB,EAAE;gBACf,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,mBAAmB,EAAE;gBACjB,IAAI,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;aAC5B;YACD,SAAS,EAAE;gBACP,IAAI,EAAE,SAAS;aAClB;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,QAAQ,EAAE,CAAC,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,SAAS,CAAC;KACvG;IACD,WAAW,EAAE;QACT,mBAAmB;QACnB,QAAQ,EAAE,yCAAoB,CAAC,QAAQ;KAC1C;CACJ,CAAC"}

package/dist/schema-definitions/vehicle-positions/models/interfaces/IRegionalBusRunsMessagesModel.d.ts

@@ -1,11 +1,11 @@
 import { Point } from "@golemio/core/dist/shared/geojson";
 export interface IRegionalBusRunsMessagesModel {
     external_trip_id: string;
-    cis_route_id: string | null;
-    cis_trip_id: string | null;
+    cis_line_id: string | null;
+    cis_trip_number: number | null;
     events: string;
     coordinates: Point;
-    vehicle_timestamp: Date;
+    vehicle_timestamp: Date | string;
     registration_number: number | null;
     speed_kmh: number;
     bearing: number;

package/dist/schema-definitions/vehicle-positions/models/interfaces/IVPTripsPositionAttributes.d.ts

@@ -1,4 +1,4 @@
-import { StatePositionEnum, StateProcessEnum, TCPEventEnum } from "../../../../const";
+import { RegionalBusEventEnum, StatePositionEnum, StateProcessEnum, TCPEventEnum } from "../../../../const";
 export interface IVPTripsPositionAttributes {
     bearing: number | null;
     lat: number;
@@ -13,7 +13,7 @@ export interface IVPTripsPositionAttributes {
     is_canceled: boolean;
     state_position: StatePositionEnum;
     state_process: StateProcessEnum;
-    tcp_event: TCPEventEnum | null;
+    tcp_event: TCPEventEnum | RegionalBusEventEnum | null;
     this_stop_sequence: number | null;
     this_stop_id: string | null;
     last_stop_sequence: number | null;

package/dist/schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto.d.ts

@@ -6,6 +6,8 @@ export interface IScheduleDto {
     route_id: string;
     route_type: GTFSRouteTypeEnum;
     route_short_name: string;
+    origin_route_name: string;
+    run_number: number;
     is_regional: string;
     is_substitute_transport: string;
     is_night: string;
@@ -25,6 +27,7 @@ export interface IScheduleDto {
     end_timestamp: string;
     first_stop_id: string;
     last_stop_id: string;
+    trip_number: number | null;
     requiredTurnaroundSeconds?: number;
 }
 export interface IGtfsRunTripCacheDto {

package/dist/schema-definitions/vehicle-positions/redis/interfaces/IRegionalBusCisCacheDto.d.ts

@@ -1,5 +1,5 @@
 export interface IRegionalBusCisCacheDto {
-    cis_route_id: string;
-    cis_trip_id: string;
+    cis_line_id: string;
+    cis_trip_number: number;
     registration_number: number;
 }

package/dist/schema-definitions/vehicle-positions/redis/interfaces/IRegionalBusGtfsCacheDto.d.ts

@@ -0,0 +1,7 @@
+export interface IRegionalBusGtfsCacheDto {
+    gtfs_trip_id: string;
+    route_name: string;
+    run_number: number;
+    agency_name: string;
+    is_wheelchair_accessible: boolean | null;
+}