@golemio/pid 2.17.1-dev.1412857437 → 2.18.0-rc.1418092579

package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js

@@ -13,14 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PIDDepartureBoardsModel = void 0;
-const data_access_1 = require("../data-access");
-const models_1 = require("../../ropid-gtfs/models");
-const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
+const models_1 = require("../../ropid-gtfs/models");
 const _1 = require(".");
-const Di_1 = require("../ioc/Di");
-const OgPidToken_1 = require("../ioc/OgPidToken");
+const data_access_1 = require("../data-access");
+const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
 const PIDDepartureModel_1 = __importDefault(require("./helpers/PIDDepartureModel"));
 class PIDDepartureBoardsModel {
     constructor() {
@@ -33,7 +31,7 @@ class PIDDepartureBoardsModel {
             var _a, _b;
             const currentMoment = (0, moment_timezone_1.default)();
             const minutesOffset = options.timeFrom ? options.timeFrom.diff(currentMoment, "minutes") : 0;
-            const spanStops = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.stops");
+            const spanStops = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.stops");
             spanStops === null || spanStops === void 0 ? void 0 : spanStops.setAttributes(Object.assign(Object.assign({}, options), { timeFrom: (_a = options.timeFrom) === null || _a === void 0 ? void 0 : _a.toString() }));
             const stopsToInclude = yield models_1.models.GTFSStopModel.GetAll({
                 includeMetroTrains: options.includeMetroTrains,
@@ -54,23 +52,16 @@ class PIDDepartureBoardsModel {
             }
             const stopsIds = stopsToInclude.map((e) => e.stop_id);
             spanStops === null || spanStops === void 0 ? void 0 : spanStops.end();
-            const spanInfotexts = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.infotexts");
+            const spanVymi = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.vymi");
             let infotextsToInclude;
             try {
-                const infotexts = yield this.infotextRepository.findAllForDepartureBoard(stopsIds, ((_b = options.timeFrom) !== null && _b !== void 0 ? _b : currentMoment).toDate());
-                infotextsToInclude = this.infotextTransformation.transformArray(infotexts.map((infotext) => ({
-                    data: infotext,
-                    timeZone: options.timezone,
-                })));
+                infotextsToInclude = yield this.ropidVYMIEventsStopsModel.GetAllDistinctWithEvents(stopsIds, (_b = options.timeFrom) !== null && _b !== void 0 ? _b : currentMoment, options.timezone);
             }
             catch (err) {
-                if (err instanceof golemio_errors_1.AbstractGolemioError) {
-                    throw err;
-                }
                 throw new golemio_errors_1.GeneralError("Database error", "DepartureBoardsModel", err, 500);
             }
-            spanInfotexts === null || spanInfotexts === void 0 ? void 0 : spanInfotexts.end();
-            const spanDirections = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.directions");
+            spanVymi === null || spanVymi === void 0 ? void 0 : spanVymi.end();
+            const spanDirections = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.directions");
             let departuresDirections;
             try {
                 departuresDirections = yield this.ropidDeparturesDirectionsModel.GetAll(stopsIds);
@@ -89,7 +80,7 @@ class PIDDepartureBoardsModel {
                     mode: options.mode,
                     isAirCondition: !!options.airCondition,
                 });
-                const spanDepartures = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.departures");
+                const spanDepartures = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.departures");
                 const res = {
                     departures: new PIDDepartureModel_1.default(results, {
                         limit: options.limit,
@@ -112,10 +103,9 @@ class PIDDepartureBoardsModel {
                 throw new golemio_errors_1.GeneralError("Database error", "DepartureBoardsModel", err, 500);
             }
         });
+        this.ropidVYMIEventsStopsModel = new _1.RopidVYMIEventsStopsModel();
         this.ropidDeparturesDirectionsModel = new _1.RopidDeparturesDirectionsModel();
         this.departuresRepository = new data_access_1.DeparturesRepository();
-        this.infotextRepository = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.JISInfotextRepository);
-        this.infotextTransformation = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.JISInfotextDepartureTransformation);
     }
 }
 exports.PIDDepartureBoardsModel = PIDDepartureBoardsModel;

package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js.map

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

package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.d.ts

@@ -1,5 +1,9 @@
 import { SequelizeModel } from "@golemio/core/dist/output-gateway";
-import { InfotextDisplayType } from "../domain/InfotextDisplayTypeEnum";
+import moment from "@golemio/core/dist/shared/moment-timezone";
+export declare enum InfotextsDisplayTypeEnum {
+    INLINE = "inline",
+    GENERAL = "general"
+}
 interface IInfotextsStopsWithEventModel {
     valid_from: Date | null;
     valid_to: Date | null;
@@ -15,8 +19,14 @@ interface IInfotextsStopsWithRoutesModel extends IInfotextsStopsWithEventModel {
     last_updated_user: string;
     related_routes: string[];
 }
+export interface IInfotextsStopsWithEventOutputModel extends Omit<IInfotextsStopsWithEventModel, "stop_type" | "valid_from" | "valid_to"> {
+    display_type: InfotextsDisplayTypeEnum;
+    text_en: null;
+    valid_from: string | null;
+    valid_to: string | null;
+}
 interface IInfotextsStopsWithRoutesOutputModel extends Omit<IInfotextsStopsWithRoutesModel, "stop_type" | "expiration_date" | "last_updated" | "valid_from" | "valid_to"> {
-    display_type: InfotextDisplayType;
+    display_type: InfotextsDisplayTypeEnum;
     text_en: null;
     expiration_date: string | null;
     last_updated: string;
@@ -34,10 +44,17 @@ export declare class RopidVYMIEventsStopsModel extends SequelizeModel {
     GetAll(options?: any): Promise<any>;
     GetOne(id: any): Promise<any>;
     constructor();
+    /** Retrieves all infotexts with event, could be inner joined with set of stops
+     *
+     * @param {string[]} stopsIds - Array of GTFS stop ids to be inner joined with corresponding infotexts
+     * @param {Moment} timeFrom - Timestamp to filter out specified expiration_date column greater than this value
+     */
+    GetAllDistinctWithEvents: (stopsIds: string[], timeFrom: moment.Moment | undefined, timezone: string) => Promise<IInfotextsStopsWithEventOutputModel[]>;
     /**
      *  Retrieve all infotexts with routes
      */
     GetAllWithRoutes: (timezone: string) => Promise<IInfotextsStopsWithRoutesOutputModel[]>;
+    private mapDataWithEvent;
     private mapDataWithRoutes;
     private mapStopTypeToDisplayType;
 }

package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RopidVYMIEventsStopsModel = void 0;
+exports.RopidVYMIEventsStopsModel = exports.InfotextsDisplayTypeEnum = void 0;
 const models_1 = require("./");
 const GTFSStopModel_1 = require("../../ropid-gtfs/models/GTFSStopModel");
 const shared_1 = require("../../shared");
@@ -31,9 +31,20 @@ const const_1 = require("../../../schema-definitions/const");
 const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
 const ropid_vymi_1 = require("../../../schema-definitions/ropid-vymi");
 const output_gateway_1 = require("@golemio/core/dist/output-gateway");
-const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
+const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
 const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
-const InfotextDisplayTypeEnum_1 = require("../domain/InfotextDisplayTypeEnum");
+const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
+var InfotextsRecordTypeEnum;
+(function (InfotextsRecordTypeEnum) {
+    InfotextsRecordTypeEnum[InfotextsRecordTypeEnum["EXCEPTION"] = 1] = "EXCEPTION";
+    InfotextsRecordTypeEnum[InfotextsRecordTypeEnum["PLANNED_RESTRICTION"] = 2] = "PLANNED_RESTRICTION";
+    InfotextsRecordTypeEnum[InfotextsRecordTypeEnum["PERMANENT_CHANGE"] = 3] = "PERMANENT_CHANGE";
+})(InfotextsRecordTypeEnum || (InfotextsRecordTypeEnum = {}));
+var InfotextsDisplayTypeEnum;
+(function (InfotextsDisplayTypeEnum) {
+    InfotextsDisplayTypeEnum["INLINE"] = "inline";
+    InfotextsDisplayTypeEnum["GENERAL"] = "general";
+})(InfotextsDisplayTypeEnum || (exports.InfotextsDisplayTypeEnum = InfotextsDisplayTypeEnum = {}));
 /**
  * Custom Postgres model for Ropid VYMI Events
  */
@@ -46,6 +57,49 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
     }
     constructor() {
         super(ropid_vymi_1.RopidVYMI.eventsStops.name + "Model", ropid_vymi_1.RopidVYMI.eventsStops.pgTableName, ropid_vymi_1.RopidVYMI.eventsStops.outputSequelizeAttributes, { schema: const_1.PG_SCHEMA });
+        /** Retrieves all infotexts with event, could be inner joined with set of stops
+         *
+         * @param {string[]} stopsIds - Array of GTFS stop ids to be inner joined with corresponding infotexts
+         * @param {Moment} timeFrom - Timestamp to filter out specified expiration_date column greater than this value
+         */
+        this.GetAllDistinctWithEvents = (stopsIds, timeFrom = (0, moment_timezone_1.default)(), timezone) => __awaiter(this, void 0, void 0, function* () {
+            if (stopsIds.length < 1) {
+                return [];
+            }
+            const data = yield this.sequelizeModel.findAll({
+                attributes: [
+                    "valid_from",
+                    "valid_to",
+                    "text",
+                    "stop_type",
+                    [sequelize_1.default.fn("ARRAY_AGG", sequelize_1.default.col("gtfs_stop_id")), "related_stops"],
+                ],
+                include: {
+                    attributes: [],
+                    as: "vymi_event",
+                    model: this.dbConnector.getConnection().models[ropid_vymi_1.RopidVYMI.events.pgTableName],
+                    where: {
+                        time_from: {
+                            [sequelize_1.default.Op.lte]: new Date().toISOString(),
+                        },
+                        expiration_date: {
+                            [sequelize_1.default.Op.or]: [null, { [sequelize_1.default.Op.gte]: timeFrom.toISOString() }],
+                        },
+                    },
+                },
+                where: {
+                    gtfs_stop_id: {
+                        [sequelize_1.default.Op.in]: stopsIds,
+                    },
+                    text: {
+                        [sequelize_1.default.Op.and]: [{ [sequelize_1.default.Op.ne]: null }, { [sequelize_1.default.Op.ne]: "" }],
+                    },
+                },
+                group: ["valid_from", "valid_to", "text", "stop_type", "vymi_event.vymi_id"],
+                raw: true,
+            });
+            return this.mapDataWithEvent(data, timezone);
+        });
         /**
          *  Retrieve all infotexts with routes
          */
@@ -111,6 +165,12 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
             });
             return this.mapDataWithRoutes(data, timezone);
         });
+        this.mapDataWithEvent = (items, timezone) => {
+            return items.map((item) => {
+                const { stop_type: stopType, valid_from, valid_to } = item, infotextsStopModel = __rest(item, ["stop_type", "valid_from", "valid_to"]);
+                return Object.assign(Object.assign({ display_type: this.mapStopTypeToDisplayType(stopType), text_en: null }, infotextsStopModel), { valid_from: shared_1.RopidRouterUtils.formatTimestamp(valid_from, timezone), valid_to: shared_1.RopidRouterUtils.formatTimestamp(valid_to, timezone) });
+            });
+        };
         this.mapDataWithRoutes = (items, timezone) => {
             return items.map((item) => {
                 const { vymi_id, vymi_id_dtb, stop_type: stopType, expiration_date, last_updated, valid_from, valid_to, last_updated_user } = item, infotextsStopModel = __rest(item, ["vymi_id", "vymi_id_dtb", "stop_type", "expiration_date", "last_updated", "valid_from", "valid_to", "last_updated_user"]);
@@ -119,7 +179,7 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
         };
         this.mapStopTypeToDisplayType = (stopType) => {
             // stop type 1 and 9 leads to general infotext type
-            return stopType === 1 || stopType === 9 ? InfotextDisplayTypeEnum_1.InfotextDisplayType.General : InfotextDisplayTypeEnum_1.InfotextDisplayType.Inline;
+            return stopType === 1 || stopType === 9 ? InfotextsDisplayTypeEnum.GENERAL : InfotextsDisplayTypeEnum.INLINE;
         };
         this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
         this.eventsModel = new models_1.RopidVYMIEventsModel();

package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"RopidVYMIEventsStopsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/RopidVYMIEventsStopsModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RopidVYMIEventsStopsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/RopidVYMIEventsStopsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAkF;AAClF,yEAAoE;AACpE,yCAA8C;AAC9C,6DAAuC;AACvC,uEAA4C;AAC5C,uEAA4C;AAC5C,sEAAmE;AACnE,gGAA2E;AAC3E,oFAA4D;AAE5D,gEAAgG;AAEhG,IAAK,uBAIJ;AAJD,WAAK,uBAAuB;IACxB,+EAAa,CAAA;IACb,mGAAuB,CAAA;IACvB,6FAAoB,CAAA;AACxB,CAAC,EAJI,uBAAuB,KAAvB,uBAAuB,QAI3B;AAED,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,+CAAmB,CAAA;AACvB,CAAC,EAHW,wBAAwB,wCAAxB,wBAAwB,QAGnC;AAqCD;;GAEG;AACH,MAAa,yBAA0B,SAAQ,+BAAc;IAMzD,MAAM,CAAC,OAAa;QAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,CAAC,EAAO;QACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED;QACI,KAAK,CACD,sBAAS,CAAC,WAAW,CAAC,IAAI,GAAG,OAAO,EACpC,sBAAS,CAAC,WAAW,CAAC,WAAW,EACjC,sBAAS,CAAC,WAAW,CAAC,yBAAyB,EAC/C,EAAE,MAAM,EAAE,iBAAS,EAAE,CACxB,CAAC;QA2BN;;;;WAIG;QACI,6BAAwB,GAAG,CAC9B,QAAkB,EAClB,WAAmB,IAAA,yBAAM,GAAE,EAC3B,QAAgB,EAC8B,EAAE;YAChD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,OAAO,EAAE,CAAC;aACb;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC3C,UAAU,EAAE;oBACR,YAAY;oBACZ,UAAU;oBACV,MAAM;oBACN,WAAW;oBACX,CAAC,mBAAS,CAAC,EAAE,CAAC,WAAW,EAAE,mBAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,eAAe,CAAC;iBAC9E;gBACD,OAAO,EAAE;oBACL,UAAU,EAAE,EAAE;oBACd,EAAE,EAAE,YAAY;oBAChB,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,sBAAS,CAAC,MAAM,CAAC,WAAW,CAAC;oBAC5E,KAAK,EAAE;wBACH,SAAS,EAAE;4BACP,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;yBAC/C;wBACD,eAAe,EAAE;4BACb,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;yBAC5E;qBACJ;iBACJ;gBACD,KAAK,EAAE;oBACH,YAAY,EAAE;wBACV,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ;qBAC9B;oBACD,IAAI,EAAE;wBACF,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;qBAC/E;iBACJ;gBACD,KAAK,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,CAAC;gBAC5E,GAAG,EAAE,IAAI;aACZ,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,CAAC,CAAA,CAAC;QAEF;;WAEG;QACI,qBAAgB,GAAG,CAAO,QAAgB,EAAmD,EAAE;YAClG,MAAM,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC3C,UAAU,EAAE;oBACR,YAAY;oBACZ,UAAU;oBACV,MAAM;oBACN,WAAW;oBACX,CAAC,mBAAS,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC;oBACpD,CAAC,mBAAS,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,aAAa,CAAC;oBAC5D,CAAC,mBAAS,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAAE,iBAAiB,CAAC;oBACpE,CAAC,mBAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE,cAAc,CAAC;oBAClE,CAAC,mBAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE,mBAAmB,CAAC;oBACvE;wBACI,mBAAS,CAAC,OAAO;wBACb,mCAAmC;wBACnC,mIAAmI,CACtI;wBACD,eAAe;qBAClB;oBACD,CAAC,mBAAS,CAAC,OAAO,CAAC,kEAAkE,CAAC,EAAE,gBAAgB,CAAC;iBAC5G;gBACD,OAAO,EAAE;oBACL;wBACI,UAAU,EAAE,EAAE;wBACd,EAAE,EAAE,YAAY;wBAChB,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,sBAAS,CAAC,MAAM,CAAC,WAAW,CAAC;wBAC5E,KAAK,EAAE;4BACH,SAAS,EAAE;gCACP,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,cAAc;6BACrC;4BACD,eAAe,EAAE;gCACb,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,CAAC;6BACpE;yBACJ;qBACJ;oBACD;wBACI,UAAU,EAAE,EAAE;wBACd,EAAE,EAAE,YAAY;wBAChB,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,sBAAS,CAAC,YAAY,CAAC,WAAW,CAAC;qBACrF;oBACD;wBACI,UAAU,EAAE,EAAE;wBACd,EAAE,EAAE,WAAW;wBACf,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,sBAAS,CAAC,KAAK,CAAC,WAAW,CAAC;qBAC9E;iBACJ;gBACD,KAAK,EAAE;oBACH,IAAI,EAAE;wBACF,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;qBAC/E;iBACJ;gBACD,KAAK,EAAE;oBACH,mCAAmC;oBACnC,iCAAiC;oBACjC,6BAA6B;oBAC7B,WAAW;oBACX,oBAAoB;iBACvB;gBACD,GAAG,EAAE,IAAI;aACZ,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC,CAAA,CAAC;QAEM,qBAAgB,GAAG,CACvB,KAAsC,EACtC,QAAgB,EACqB,EAAE;YACvC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACtB,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,KAA4B,IAAI,EAA3B,kBAAkB,UAAK,IAAI,EAA3E,uCAAoE,CAAO,CAAC;gBAClF,qCACI,YAAY,EAAE,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,EACrD,OAAO,EAAE,IAAI,IACV,kBAAkB,KACrB,UAAU,EAAE,yBAAgB,CAAC,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,EAClE,QAAQ,EAAE,yBAAgB,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAChE;YACN,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QAEM,sBAAiB,GAAG,CACxB,KAAuC,EACvC,QAAgB,EACsB,EAAE;YACxC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACtB,MAAM,EACF,OAAO,EACP,WAAW,EACX,SAAS,EAAE,QAAQ,EACnB,eAAe,EACf,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,iBAAiB,KAEjB,IAAI,EADD,kBAAkB,UACrB,IAAI,EAVF,yHAUL,CAAO,CAAC;gBACT,qCACI,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,EACrD,OAAO,EAAE,IAAI,IACV,kBAAkB,KACrB,eAAe,EAAE,yBAAgB,CAAC,eAAe,CAAC,eAAe,EAAE,QAAQ,CAAC,EAC5E,YAAY,EAAE,yBAAgB,CAAC,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAE,EACvE,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,yBAAgB,CAAC,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,EAClE,QAAQ,EAAE,yBAAgB,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAChE;YACN,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QAEM,6BAAwB,GAAG,CAAC,QAAgB,EAA4B,EAAE;YAC9E,mDAAmD;YACnD,OAAO,QAAQ,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC;QACjH,CAAC,CAAC;QAjME,IAAI,CAAC,WAAW,GAAG,4BAAsB,CAAC,OAAO,CAAqB,oBAAc,CAAC,gBAAgB,CAAC,CAAC;QAEvG,IAAI,CAAC,WAAW,GAAG,IAAI,6BAAoB,EAAE,CAAC;QAC9C,IAAI,CAAC,iBAAiB,GAAG,IAAI,mCAA0B,EAAE,CAAC;QAC1D,IAAI,CAAC,cAAc,GAAG,IAAI,6BAAa,EAAE,CAAC;QAE1C,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE;YAC3D,EAAE,EAAE,YAAY;YAChB,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,UAAU;SACzB,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE;YAC/D,EAAE,EAAE,YAAY;YAChB,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,UAAU;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE;YAC3D,EAAE,EAAE,WAAW;YACf,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,cAAc;SAC5B,CAAC,CAAC;IACP,CAAC;CA2KJ;AAvND,8DAuNC"}

package/dist/output-gateway/public/controllers/{v2/V2PublicDepartureBoardsController.d.ts → v1/PublicDepartureBoardsController.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="express" />
 import { RequestHandler } from "@golemio/core/dist/shared/express";
-export declare class V2PublicDepartureBoardsController {
+export declare class PublicDepartureBoardsController {
     constructor();
     getAll: RequestHandler;
     private parseDepartureParams;

package/dist/output-gateway/public/controllers/{v2/V2PublicDepartureBoardsController.js → v1/PublicDepartureBoardsController.js}

@@ -9,14 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.V2PublicDepartureBoardsController = void 0;
+exports.PublicDepartureBoardsController = void 0;
 const Di_1 = require("../../ioc/Di");
 const OgModuleToken_1 = require("../../ioc/OgModuleToken");
 const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
-class V2PublicDepartureBoardsController {
+class PublicDepartureBoardsController {
     constructor() {
         this.getAll = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            const span = (0, trace_provider_1.createChildSpan)("V2PublicDepartureBoardsController.getAll");
+            const span = (0, trace_provider_1.createChildSpan)("PublicDepartureBoardsController.getAll");
             try {
                 const facade = Di_1.OgPublicContainer.resolve(OgModuleToken_1.OgModuleToken.DepartureBoardFacade);
                 const params = this.parseDepartureParams(req.query);
@@ -61,5 +61,5 @@ class V2PublicDepartureBoardsController {
         return output;
     }
 }
-exports.V2PublicDepartureBoardsController = V2PublicDepartureBoardsController;
-//# sourceMappingURL=V2PublicDepartureBoardsController.js.map
+exports.PublicDepartureBoardsController = PublicDepartureBoardsController;
+//# sourceMappingURL=PublicDepartureBoardsController.js.map

package/dist/output-gateway/public/controllers/v1/PublicDepartureBoardsController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PublicDepartureBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/controllers/v1/PublicDepartureBoardsController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAsD;AACtD,2DAA6D;AAK7D,+FAA6F;AAE7F,MAAa,+BAA+B;IACxC;QAEO,WAAM,GAAmB,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACrD,MAAM,IAAI,GAAG,IAAA,gCAAe,EAAC,wCAAwC,CAAC,CAAC;YAEvE,IAAI;gBACA,MAAM,MAAM,GAAG,sBAAiB,CAAC,OAAO,CAAuB,6BAAa,CAAC,oBAAoB,CAAC,CAAC;gBACnG,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACpD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;gBAE9G,IAAI,MAAM,KAAK,IAAI,EAAE;oBACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACzB,OAAO;iBACV;gBACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACpB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;oBAAS;gBACN,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,EAAE,CAAC;aACf;QACL,CAAC,CAAA,CAAC;IApBa,CAAC;IAsBR,oBAAoB,CAAC,KAAe;QACxC,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,YAAY,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,OAAoB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAiB,CAAC,CAAC;YACpH,eAAe,EAAE,KAAK,CAAC,eAAe;gBAClC,CAAC,CAAC,KAAK,CAAC,eAAe,YAAY,KAAK;oBACpC,CAAC,CAAE,KAAK,CAAC,eAA4B;oBACrC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAyB,CAAC;gBACvC,CAAC,CAAC,IAAI;YACV,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAsB,CAAC,CAAC,CAAC,CAAC,EAAE;SACjF,CAAC;IACN,CAAC;IAEO,YAAY,CAAC,gBAA0B;QAC3C,IAAI,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;QAE1D,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE;YACnC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,OAAO,GAAa,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE3C,MAAM,CAAC,GAAG,CAAC;gBACP,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACnC,OAAO,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;aACjC,CAAC,CAAC;SACN;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AApDD,0EAoDC"}

package/dist/output-gateway/public/controllers/{v2/V2PublicGtfsController.d.ts → v1/PublicGtfsController.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="express" />
 import { RequestHandler } from "@golemio/core/dist/shared/express";
-export declare class V2PublicGtfsController {
+export declare class PublicGtfsController {
     getOneTrip: RequestHandler;
     private parseGtfsTripLookupParams;
 }

package/dist/output-gateway/public/controllers/{v2/V2PublicGtfsController.js → v1/PublicGtfsController.js}

@@ -9,14 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.V2PublicGtfsController = void 0;
+exports.PublicGtfsController = void 0;
 const Di_1 = require("../../ioc/Di");
 const OgModuleToken_1 = require("../../ioc/OgModuleToken");
 const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
-class V2PublicGtfsController {
+class PublicGtfsController {
     constructor() {
         this.getOneTrip = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            const span = (0, trace_provider_1.createChildSpan)("V2PublicGtfsController.getOneTrip");
+            const span = (0, trace_provider_1.createChildSpan)("PublicGtfsController.getOneTrip");
             try {
                 const facade = Di_1.OgPublicContainer.resolve(OgModuleToken_1.OgModuleToken.GtfsTripLookupFacade);
                 const params = this.parseGtfsTripLookupParams(req);
@@ -40,5 +40,5 @@ class V2PublicGtfsController {
         };
     }
 }
-exports.V2PublicGtfsController = V2PublicGtfsController;
-//# sourceMappingURL=V2PublicGtfsController.js.map
+exports.PublicGtfsController = PublicGtfsController;
+//# sourceMappingURL=PublicGtfsController.js.map

package/dist/output-gateway/public/controllers/v1/PublicGtfsController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PublicGtfsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/controllers/v1/PublicGtfsController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAsD;AACtD,2DAA6D;AAG7D,+FAA6F;AAI7F,MAAa,oBAAoB;IAAjC;QACW,eAAU,GAAmB,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzD,MAAM,IAAI,GAAG,IAAA,gCAAe,EAAC,iCAAiC,CAAC,CAAC;YAEhE,IAAI;gBACA,MAAM,MAAM,GAAG,sBAAiB,CAAC,OAAO,CAAuB,6BAAa,CAAC,oBAAoB,CAAC,CAAC;gBACnG,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACnD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE/E,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;oBAAS;gBACN,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,EAAE,CAAC;aACf;QACL,CAAC,CAAA,CAAC;IAWN,CAAC;IATW,yBAAyB,CAAC,GAAY;QAC1C,OAAO;YACH,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU;YACjC,MAAM,EACF,GAAG,CAAC,KAAK,CAAC,MAAM,YAAY,KAAK;gBAC7B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAA6B,CAAC,CAAC;gBAC9D,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAA2B,CAAC;SACpD,CAAC;IACN,CAAC;CACJ;AA1BD,oDA0BC"}

package/dist/output-gateway/public/controllers/{v2/V2PublicVehiclePositionsController.d.ts → v1/PublicVehiclePositionsController.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="express" />
 import { RequestHandler } from "@golemio/core/dist/shared/express";
-export declare class V2PublicVehiclePositionsController {
+export declare class PublicVehiclePositionsController {
     constructor();
     getAll: RequestHandler;
     getOneByVehicleId: RequestHandler;

package/dist/output-gateway/public/controllers/{v2/V2PublicVehiclePositionsController.js → v1/PublicVehiclePositionsController.js}

@@ -9,12 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.V2PublicVehiclePositionsController = void 0;
+exports.PublicVehiclePositionsController = void 0;
 const RouteTypeEnums_1 = require("../../../../helpers/RouteTypeEnums");
 const const_1 = require("../../domain/const");
 const Di_1 = require("../../ioc/Di");
 const OgModuleToken_1 = require("../../ioc/OgModuleToken");
-class V2PublicVehiclePositionsController {
+class PublicVehiclePositionsController {
     constructor() {
         this.getAll = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             try {
@@ -82,5 +82,5 @@ class V2PublicVehiclePositionsController {
         };
     }
 }
-exports.V2PublicVehiclePositionsController = V2PublicVehiclePositionsController;
-//# sourceMappingURL=V2PublicVehiclePositionsController.js.map
+exports.PublicVehiclePositionsController = PublicVehiclePositionsController;
+//# sourceMappingURL=PublicVehiclePositionsController.js.map

package/dist/output-gateway/public/controllers/v1/PublicVehiclePositionsController.js.map

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

package/dist/output-gateway/public/controllers/{v2 → v1}/interfaces/PublicParamsInterfaces.d.ts

@@ -1,6 +1,6 @@
 import { GTFSRouteTypeEnum } from "../../../../../helpers/RouteTypeEnums";
 import { IBoundingBox } from "../../../domain/IBoudingBox";
-import { DetailedTripScope } from "../../../routers/v2/helpers/DetailedTripScopeEnum";
+import { DetailedTripScope } from "../../../routers/v1/helpers/DetailedTripScopeEnum";
 export interface IVehiclePositionsParams {
     boundingBox: IBoundingBox;
     routeShortName: string | string[] | undefined;

package/dist/output-gateway/public/controllers/{v2 → v1}/interfaces/PublicParamsInterfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"PublicParamsInterfaces.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/controllers/v2/interfaces/PublicParamsInterfaces.ts"],"names":[],"mappings":""}
+{"version":3,"file":"PublicParamsInterfaces.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/controllers/v1/interfaces/PublicParamsInterfaces.ts"],"names":[],"mappings":""}

package/dist/output-gateway/public/routers/{v2/V2PublicDeparturesRouter.d.ts → v1/PublicDeparturesRouter.d.ts}

@@ -1,7 +1,6 @@
 /// <reference types="express" />
-import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 import { Router } from "@golemio/core/dist/shared/express";
-export declare class V2PublicDeparturesRouter extends AbstractRouter {
+export declare class PublicDeparturesRouter {
     router: Router;
     private cacheHeaderMiddleware;
     private compressionByDefaultMiddleware;
@@ -9,5 +8,5 @@ export declare class V2PublicDeparturesRouter extends AbstractRouter {
     constructor();
     protected initRoutes(): void;
 }
-declare const v2PublicDeparturesRouter: AbstractRouter;
-export { v2PublicDeparturesRouter };
+declare const v1PublicDeparturesRouter: Router;
+export { v1PublicDeparturesRouter };

package/dist/output-gateway/public/routers/{v2/V2PublicDeparturesRouter.js → v1/PublicDeparturesRouter.js}

@@ -1,22 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.v2PublicDeparturesRouter = exports.V2PublicDeparturesRouter = void 0;
-const V2PublicDepartureBoardsController_1 = require("../../controllers/v2/V2PublicDepartureBoardsController");
+exports.v1PublicDeparturesRouter = exports.PublicDeparturesRouter = void 0;
+const PublicDepartureBoardsController_1 = require("../../controllers/v1/PublicDepartureBoardsController");
 const Di_1 = require("../../ioc/Di");
-const constants_1 = require("../../../shared/constants");
-const AbstractRouter_1 = require("@golemio/core/dist/helpers/routing/AbstractRouter");
 const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
 const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
 const express_1 = require("@golemio/core/dist/shared/express");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 const CustomStopIdGroupValidator_1 = require("./helpers/CustomStopIdGroupValidator");
-class V2PublicDeparturesRouter extends AbstractRouter_1.AbstractRouter {
+class PublicDeparturesRouter {
     constructor() {
-        super(constants_1.RouteVersion.v2, "public/departureboards");
         this.router = (0, express_1.Router)();
         this.cacheHeaderMiddleware = Di_1.OgPublicContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.compressionByDefaultMiddleware = Di_1.OgPublicContainer.resolve(ioc_1.ContainerToken.CompressionByDefaultMiddleware);
-        this.departureController = new V2PublicDepartureBoardsController_1.V2PublicDepartureBoardsController();
+        this.departureController = new PublicDepartureBoardsController_1.PublicDepartureBoardsController();
         this.initRoutes();
     }
     initRoutes() {
@@ -30,7 +27,7 @@ class V2PublicDeparturesRouter extends AbstractRouter_1.AbstractRouter {
         this.cacheHeaderMiddleware.getMiddleware(3, 2), this.compressionByDefaultMiddleware.getMiddleware(), this.departureController.getAll);
     }
 }
-exports.V2PublicDeparturesRouter = V2PublicDeparturesRouter;
-const v2PublicDeparturesRouter = new V2PublicDeparturesRouter();
-exports.v2PublicDeparturesRouter = v2PublicDeparturesRouter;
-//# sourceMappingURL=V2PublicDeparturesRouter.js.map
+exports.PublicDeparturesRouter = PublicDeparturesRouter;
+const v1PublicDeparturesRouter = new PublicDeparturesRouter().router;
+exports.v1PublicDeparturesRouter = v1PublicDeparturesRouter;
+//# sourceMappingURL=PublicDeparturesRouter.js.map

package/dist/output-gateway/public/routers/v1/PublicDeparturesRouter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PublicDeparturesRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/routers/v1/PublicDeparturesRouter.ts"],"names":[],"mappings":";;;AAAA,0GAA4G;AAC5G,qCAAsD;AAGtD,6EAA2E;AAC3E,+DAAuE;AACvE,+DAA2D;AAC3D,mFAAoE;AACpE,qFAAkF;AAElF,MAAa,sBAAsB;IAM/B;QACI,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,IAAI,CAAC,qBAAqB,GAAG,sBAAiB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACpH,IAAI,CAAC,8BAA8B,GAAG,sBAAiB,CAAC,OAAO,CAC3D,oBAAc,CAAC,8BAA8B,CAChD,CAAC;QACF,IAAI,CAAC,mBAAmB,GAAG,IAAI,iEAA+B,EAAE,CAAC;QACjE,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH;YACI,IAAA,yBAAK,EAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,uDAA0B,CAAC,QAAQ,CAAC;YACrE,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACpE,IAAA,yBAAK,EAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;YAC9E,IAAA,yBAAK,EAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;SAC/E,EACD,wBAAW;QACX,sDAAsD;QACtD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,8BAA8B,CAAC,aAAa,EAAE,EACnD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAClC,CAAC;IACN,CAAC;CACJ;AAhCD,wDAgCC;AAED,MAAM,wBAAwB,GAAG,IAAI,sBAAsB,EAAE,CAAC,MAAM,CAAC;AAC5D,4DAAwB"}

package/dist/output-gateway/public/routers/{v2/V2PublicGtfsRouter.d.ts → v1/PublicGtfsRouter.d.ts}

@@ -1,7 +1,6 @@
 /// <reference types="express" />
-import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 import { Router } from "@golemio/core/dist/shared/express";
-export declare class V2PublicGtfsRouter extends AbstractRouter {
+export declare class PublicGtfsRouter {
     router: Router;
     private cacheHeaderMiddleware;
     private compressionByDefaultMiddleware;
@@ -9,5 +8,5 @@ export declare class V2PublicGtfsRouter extends AbstractRouter {
     constructor();
     protected initRoutes(): void;
 }
-declare const v2PublicGtfsRouter: AbstractRouter;
-export { v2PublicGtfsRouter };
+declare const v1PublicGtfsRouter: Router;
+export { v1PublicGtfsRouter };

package/dist/output-gateway/public/routers/{v2/V2PublicGtfsRouter.js → v1/PublicGtfsRouter.js}

@@ -1,22 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.v2PublicGtfsRouter = exports.V2PublicGtfsRouter = void 0;
-const V2PublicGtfsController_1 = require("../../controllers/v2/V2PublicGtfsController");
+exports.v1PublicGtfsRouter = exports.PublicGtfsRouter = void 0;
+const PublicGtfsController_1 = require("../../controllers/v1/PublicGtfsController");
 const Di_1 = require("../../ioc/Di");
-const constants_1 = require("../../../shared/constants");
-const AbstractRouter_1 = require("@golemio/core/dist/helpers/routing/AbstractRouter");
 const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
 const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
 const express_1 = require("@golemio/core/dist/shared/express");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 const CustomScopeValidator_1 = require("./helpers/CustomScopeValidator");
-class V2PublicGtfsRouter extends AbstractRouter_1.AbstractRouter {
+class PublicGtfsRouter {
     constructor() {
-        super(constants_1.RouteVersion.v2, "public/gtfs");
         this.router = (0, express_1.Router)();
         this.cacheHeaderMiddleware = Di_1.OgPublicContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.compressionByDefaultMiddleware = Di_1.OgPublicContainer.resolve(ioc_1.ContainerToken.CompressionByDefaultMiddleware);
-        this.gtfsController = new V2PublicGtfsController_1.V2PublicGtfsController();
+        this.gtfsController = new PublicGtfsController_1.PublicGtfsController();
         this.initRoutes();
     }
     initRoutes() {
@@ -25,7 +22,7 @@ class V2PublicGtfsRouter extends AbstractRouter_1.AbstractRouter {
         this.cacheHeaderMiddleware.getMiddleware(4 * 60 * 60, 60), this.compressionByDefaultMiddleware.getMiddleware(), this.gtfsController.getOneTrip);
     }
 }
-exports.V2PublicGtfsRouter = V2PublicGtfsRouter;
-const v2PublicGtfsRouter = new V2PublicGtfsRouter();
-exports.v2PublicGtfsRouter = v2PublicGtfsRouter;
-//# sourceMappingURL=V2PublicGtfsRouter.js.map
+exports.PublicGtfsRouter = PublicGtfsRouter;
+const v1PublicGtfsRouter = new PublicGtfsRouter().router;
+exports.v1PublicGtfsRouter = v1PublicGtfsRouter;
+//# sourceMappingURL=PublicGtfsRouter.js.map

package/dist/output-gateway/public/routers/v1/PublicGtfsRouter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PublicGtfsRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/routers/v1/PublicGtfsRouter.ts"],"names":[],"mappings":";;;AAAA,oFAAsF;AACtF,qCAAsD;AAGtD,6EAA2E;AAC3E,+DAAuE;AACvE,+DAA2D;AAC3D,mFAA2E;AAC3E,yEAAsE;AAEtE,MAAa,gBAAgB;IAMzB;QACI,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,IAAI,CAAC,qBAAqB,GAAG,sBAAiB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACpH,IAAI,CAAC,8BAA8B,GAAG,sBAAiB,CAAC,OAAO,CAC3D,oBAAc,CAAC,8BAA8B,CAChD,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,oBAAoB,EACpB,CAAC,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,2CAAoB,CAAC,QAAQ,CAAC,CAAC,EACrF,wBAAW;QACX,mDAAmD;QACnD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EACzD,IAAI,CAAC,8BAA8B,CAAC,aAAa,EAAE,EACnD,IAAI,CAAC,cAAc,CAAC,UAAU,CACjC,CAAC;IACN,CAAC;CACJ;AA3BD,4CA2BC;AAED,MAAM,kBAAkB,GAAG,IAAI,gBAAgB,EAAE,CAAC,MAAM,CAAC;AAChD,gDAAkB"}

package/dist/output-gateway/public/routers/{v2/V2PublicVehiclePositionsRouter.d.ts → v1/PublicVehiclePositionsRouter.d.ts}

@@ -1,7 +1,6 @@
 /// <reference types="express" />
-import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 import { Router } from "@golemio/core/dist/shared/express";
-export declare class V2PublicVehiclePositionsRouter extends AbstractRouter {
+export declare class PublicVehiclePositionsRouter {
     router: Router;
     private cacheHeaderMiddleware;
     private compressionByDefaultMiddleware;
@@ -10,5 +9,5 @@ export declare class V2PublicVehiclePositionsRouter extends AbstractRouter {
     constructor();
     protected initRoutes(): void;
 }
-declare const v2PublicVPRouter: AbstractRouter;
-export { v2PublicVPRouter };
+declare const v1PublicVPRouter: Router;
+export { v1PublicVPRouter };

package/dist/output-gateway/public/routers/{v2/V2PublicVehiclePositionsRouter.js → v1/PublicVehiclePositionsRouter.js}

@@ -1,24 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.v2PublicVPRouter = exports.V2PublicVehiclePositionsRouter = void 0;
-const V2PublicVehiclePositionsController_1 = require("../../controllers/v2/V2PublicVehiclePositionsController");
+exports.v1PublicVPRouter = exports.PublicVehiclePositionsRouter = void 0;
+const PublicVehiclePositionsController_1 = require("../../controllers/v1/PublicVehiclePositionsController");
 const Di_1 = require("../../ioc/Di");
 const OgModuleToken_1 = require("../../ioc/OgModuleToken");
-const constants_1 = require("../../../shared/constants");
-const AbstractRouter_1 = require("@golemio/core/dist/helpers/routing/AbstractRouter");
 const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
 const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
 const express_1 = require("@golemio/core/dist/shared/express");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 const CustomScopeValidator_1 = require("./helpers/CustomScopeValidator");
 const CustomTypeValidator_1 = require("./helpers/CustomTypeValidator");
-class V2PublicVehiclePositionsRouter extends AbstractRouter_1.AbstractRouter {
+class PublicVehiclePositionsRouter {
     constructor() {
-        super(constants_1.RouteVersion.v2, "public/vehiclepositions");
         this.router = (0, express_1.Router)();
         this.cacheHeaderMiddleware = Di_1.OgPublicContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.compressionByDefaultMiddleware = Di_1.OgPublicContainer.resolve(ioc_1.ContainerToken.CompressionByDefaultMiddleware);
-        this.vehiclePositionsController = new V2PublicVehiclePositionsController_1.V2PublicVehiclePositionsController();
+        this.vehiclePositionsController = new PublicVehiclePositionsController_1.PublicVehiclePositionsController();
         this.initRoutes();
         this.redisSubscriber = Di_1.OgPublicContainer.resolve(OgModuleToken_1.OgModuleToken.VPSubscriber);
         this.redisSubscriber.initialize();
@@ -43,7 +40,7 @@ class V2PublicVehiclePositionsRouter extends AbstractRouter_1.AbstractRouter {
         this.cacheHeaderMiddleware.getMiddleware(5, 5), this.compressionByDefaultMiddleware.getMiddleware(), this.vehiclePositionsController.getOneByVehicleId);
     }
 }
-exports.V2PublicVehiclePositionsRouter = V2PublicVehiclePositionsRouter;
-const v2PublicVPRouter = new V2PublicVehiclePositionsRouter();
-exports.v2PublicVPRouter = v2PublicVPRouter;
-//# sourceMappingURL=V2PublicVehiclePositionsRouter.js.map
+exports.PublicVehiclePositionsRouter = PublicVehiclePositionsRouter;
+const v1PublicVPRouter = new PublicVehiclePositionsRouter().router;
+exports.v1PublicVPRouter = v1PublicVPRouter;
+//# sourceMappingURL=PublicVehiclePositionsRouter.js.map

package/dist/output-gateway/public/routers/v1/PublicVehiclePositionsRouter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PublicVehiclePositionsRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/routers/v1/PublicVehiclePositionsRouter.ts"],"names":[],"mappings":";;;AAAA,4GAA8G;AAC9G,qCAAsD;AACtD,2DAA6D;AAI7D,6EAA2E;AAC3E,+DAAuE;AACvE,+DAA2D;AAC3D,mFAA2E;AAC3E,yEAAsE;AACtE,uEAAoE;AAEpE,MAAa,4BAA4B;IAOrC;QACI,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,IAAI,CAAC,qBAAqB,GAAG,sBAAiB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACpH,IAAI,CAAC,8BAA8B,GAAG,sBAAiB,CAAC,OAAO,CAC3D,oBAAc,CAAC,8BAA8B,CAChD,CAAC;QACF,IAAI,CAAC,0BAA0B,GAAG,IAAI,mEAAgC,EAAE,CAAC;QACzE,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,eAAe,GAAG,sBAAiB,CAAC,OAAO,CAAe,6BAAa,CAAC,YAAY,CAAC,CAAC;QAC3F,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH;YACI,IAAA,yBAAK,EAAC,aAAa,CAAC;iBACf,QAAQ,EAAE;iBACV,OAAO,CAAC,4BAA4B,CAAC,CAAC,8BAA8B;iBACpE,GAAG,EAAE;iBACL,OAAO,EAAE;YACd,IAAA,yBAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;YAC7E,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,yCAAmB,CAAC,QAAQ,CAAC;SACrE,EACD,wBAAW;QACX,sDAAsD;QACtD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,8BAA8B,CAAC,aAAa,EAAE,EACnD,IAAI,CAAC,0BAA0B,CAAC,MAAM,CACzC,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,oCAAoC,EACpC,CAAC,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,MAAM,EAAE,EAAE,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,2CAAoB,CAAC,QAAQ,CAAC,CAAC,EAClH,wBAAW;QACX,sDAAsD;QACtD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,8BAA8B,CAAC,aAAa,EAAE,EACnD,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,CAC5D,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,aAAa,EACb,CAAC,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,MAAM,EAAE,EAAE,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,2CAAoB,CAAC,QAAQ,CAAC,CAAC,EACpF,wBAAW;QACX,sDAAsD;QACtD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,8BAA8B,CAAC,aAAa,EAAE,EACnD,IAAI,CAAC,0BAA0B,CAAC,iBAAiB,CACpD,CAAC;IACN,CAAC;CACJ;AA1DD,oEA0DC;AAED,MAAM,gBAAgB,GAAG,IAAI,4BAA4B,EAAE,CAAC,MAAM,CAAC;AAE1D,4CAAgB"}