@golemio/pid 3.4.1-dev.1622321089 → 3.4.1-dev.1622952033

package/dist/output-gateway/ropid-gtfs/data-access/CisStopGroupRepository.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CisStopGroupRepository = void 0;
 const const_1 = require("../../../schema-definitions/const");
@@ -37,23 +28,21 @@ let CisStopGroupRepository = exports.CisStopGroupRepository = class CisStopGroup
             .getConnection()
             .define(this.tableName, ropid_gtfs_1.RopidGTFS.cis_stop_groups.outputSequelizeAttributes, { schema: this.schema });
     }
-    getNodeByCisId(cisId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const cisStopGroup = yield this.sequelizeModel.findOne({
-                    attributes: ["node"],
-                    raw: true,
-                    where: { cis: cisId },
-                });
-                if (!cisStopGroup || cisStopGroup.node === null) {
-                    return null;
-                }
-                return cisStopGroup.node;
-            }
-            catch (error) {
-                throw new golemio_errors_1.GeneralError("Error while getting CIS stop groups", this.constructor.name, error, 500);
+    async getNodeByCisId(cisId) {
+        try {
+            const cisStopGroup = await this.sequelizeModel.findOne({
+                attributes: ["node"],
+                raw: true,
+                where: { cis: cisId },
+            });
+            if (!cisStopGroup || cisStopGroup.node === null) {
+                return null;
             }
-        });
+            return cisStopGroup.node;
+        }
+        catch (error) {
+            throw new golemio_errors_1.GeneralError("Error while getting CIS stop groups", this.constructor.name, error, 500);
+        }
     }
 };
 exports.CisStopGroupRepository = CisStopGroupRepository = __decorate([

package/dist/output-gateway/ropid-gtfs/data-access/CisStopGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"CisStopGroupRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/data-access/CisStopGroupRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAG5C,kIAA+H;AAC/H,wEAAqE;AACrE,6EAAwE;AAExE,iEAAwE;AAGjE,IAAM,sBAAsB,oCAA5B,MAAM,sBAAuB,SAAQ,iDAAuB;IAK/D,YAAiD,SAA6B,EAA4B,MAAe;QACrH,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QALtB,WAAM,GAAG,iBAAS,CAAC;QACnB,cAAS,GAAG,sBAAS,CAAC,eAAe,CAAC,WAAW,CAAC;QAMrD,IAAI,CAAC,cAAc,GAAG,SAAS;aAC1B,aAAa,EAAE;aACf,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,sBAAS,CAAC,eAAe,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9G,CAAC;IAEY,cAAc,CAAC,KAAa;;YACrC,IAAI;gBACA,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACnD,UAAU,EAAE,CAAC,MAAM,CAAC;oBACpB,GAAG,EAAE,IAAI;oBACT,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;iBACxB,CAAC,CAAC;gBAEH,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,IAAI,EAAE;oBAC7C,OAAO,IAAI,CAAC;iBACf;gBAED,OAAO,YAAY,CAAC,IAAI,CAAC;aAC5B;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,qCAAqC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aACpG;QACL,CAAC;KAAA;CACJ,CAAA;iCA9BY,sBAAsB;IADlC,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IAAiC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GALhG,sBAAsB,CA8BlC"}
+{"version":3,"file":"CisStopGroupRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/data-access/CisStopGroupRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAG5C,kIAA+H;AAC/H,wEAAqE;AACrE,6EAAwE;AAExE,iEAAwE;AAGjE,IAAM,sBAAsB,oCAA5B,MAAM,sBAAuB,SAAQ,iDAAuB;IAK/D,YAAiD,SAA6B,EAA4B,MAAe;QACrH,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QALtB,WAAM,GAAG,iBAAS,CAAC;QACnB,cAAS,GAAG,sBAAS,CAAC,eAAe,CAAC,WAAW,CAAC;QAMrD,IAAI,CAAC,cAAc,GAAG,SAAS;aAC1B,aAAa,EAAE;aACf,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,sBAAS,CAAC,eAAe,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9G,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,KAAa;QACrC,IAAI;YACA,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,UAAU,EAAE,CAAC,MAAM,CAAC;gBACpB,GAAG,EAAE,IAAI;gBACT,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;aACxB,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,IAAI,EAAE;gBAC7C,OAAO,IAAI,CAAC;aACf;YAED,OAAO,YAAY,CAAC,IAAI,CAAC;SAC5B;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,6BAAY,CAAC,qCAAqC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;SACpG;IACL,CAAC;CACJ,CAAA;iCA9BY,sBAAsB;IADlC,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IAAiC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GALhG,sBAAsB,CA8BlC"}

package/dist/output-gateway/ropid-gtfs/data-access/redis/RunTripsRedisRepository.d.ts

@@ -0,0 +1,10 @@
+import { IRunTripsRedisRepository } from "../../domain/repository/IRunTripsRedisRepository";
+import { IGtfsRunTripCacheDto } from "../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
+import { IoRedisConnector } from "@golemio/core/dist/helpers/data-access/redis/IoRedisConnector";
+import { ILogger } from "@golemio/core/dist/helpers/logger/LoggerProvider";
+export declare class RunTripsRedisRepository implements IRunTripsRedisRepository {
+    private redisConnector;
+    private log;
+    constructor(redisConnector: IoRedisConnector, log: ILogger);
+    getMultipleSchedule(runTuples: string[]): Promise<Array<IGtfsRunTripCacheDto | null>>;
+}

package/dist/output-gateway/ropid-gtfs/data-access/redis/RunTripsRedisRepository.js

@@ -0,0 +1,65 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunTripsRedisRepository = void 0;
+const const_1 = require("../../../../schema-definitions/ropid-gtfs/redis/const");
+const IoRedisConnector_1 = require("@golemio/core/dist/helpers/data-access/redis/IoRedisConnector");
+const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
+const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+let RunTripsRedisRepository = exports.RunTripsRedisRepository = class RunTripsRedisRepository {
+    constructor(redisConnector, log) {
+        this.redisConnector = redisConnector;
+        this.log = log;
+    }
+    async getMultipleSchedule(runTuples) {
+        if (!runTuples.length) {
+            return [];
+        }
+        if (!this.redisConnector.isConnected()) {
+            await this.redisConnector.connect();
+        }
+        const connection = this.redisConnector.getConnection();
+        let runTripCache = [];
+        try {
+            runTripCache = await connection.mget(runTuples.map((runTuple) => `${const_1.GTFS_RUN_SCHEDULE_NAMESPACE_PREFIX}:${runTuple}`));
+        }
+        catch (error) {
+            throw new golemio_errors_1.GeneralError("Cannot get run trips from cache", this.constructor.name, error);
+        }
+        let gtfsRunTripDtos = [];
+        for (const cache of runTripCache) {
+            if (cache === null) {
+                this.log.info(`${this.constructor.name}: Cannot find run trip cache`);
+                gtfsRunTripDtos.push(null);
+                continue;
+            }
+            try {
+                gtfsRunTripDtos.push(JSON.parse(cache));
+            }
+            catch (error) {
+                throw new golemio_errors_1.GeneralError("Cannot parse run trip cache", this.constructor.name, error);
+            }
+        }
+        return gtfsRunTripDtos;
+    }
+};
+exports.RunTripsRedisRepository = RunTripsRedisRepository = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(ioc_1.ContainerToken.RedisConnector)),
+    __param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
+    __metadata("design:paramtypes", [IoRedisConnector_1.IoRedisConnector, Object])
+], RunTripsRedisRepository);
+//# sourceMappingURL=RunTripsRedisRepository.js.map

package/dist/output-gateway/ropid-gtfs/data-access/redis/RunTripsRedisRepository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RunTripsRedisRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/ropid-gtfs/data-access/redis/RunTripsRedisRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,iFAAiF;AAEjF,oGAAiG;AACjG,wEAAqE;AAErE,+DAAuE;AACvE,6EAAwE;AACxE,iEAAwE;AAGjE,IAAM,uBAAuB,qCAA7B,MAAM,uBAAuB;IAChC,YACmD,cAAgC,EAC7C,GAAY;QADC,mBAAc,GAAd,cAAc,CAAkB;QAC7C,QAAG,GAAH,GAAG,CAAS;IAC/C,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAAC,SAAmB;QAChD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACnB,OAAO,EAAE,CAAC;SACb;QAED,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE;YACpC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;SACvC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,YAAY,GAAyB,EAAE,CAAC;QAE5C,IAAI;YACA,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,CAChC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,0CAAkC,IAAI,QAAQ,EAAE,CAAC,CACnF,CAAC;SACL;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,6BAAY,CAAC,iCAAiC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC3F;QAED,IAAI,eAAe,GAAuC,EAAE,CAAC;QAC7D,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;YAC9B,IAAI,KAAK,KAAK,IAAI,EAAE;gBAChB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,8BAA8B,CAAC,CAAC;gBACtE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3B,SAAS;aACZ;YAED,IAAI;gBACA,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aAC3C;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACvF;SACJ;QAED,OAAO,eAAe,CAAC;IAC3B,CAAC;CACJ,CAAA;kCA3CY,uBAAuB;IADnC,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,oBAAc,CAAC,cAAc,CAAC,CAAA;IACrC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCADsC,mCAAgB;GAF1E,uBAAuB,CA2CnC"}

package/dist/output-gateway/ropid-gtfs/domain/repository/IRunTripsRedisRepository.d.ts

@@ -0,0 +1,4 @@
+import type { IGtfsRunTripCacheDto } from "../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
+export interface IRunTripsRedisRepository {
+    getMultipleSchedule(runTuples: string[]): Promise<Array<IGtfsRunTripCacheDto | null>>;
+}

package/dist/output-gateway/ropid-gtfs/domain/repository/IRunTripsRedisRepository.js

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

package/dist/output-gateway/ropid-gtfs/domain/repository/IRunTripsRedisRepository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IRunTripsRedisRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/ropid-gtfs/domain/repository/IRunTripsRedisRepository.ts"],"names":[],"mappings":""}

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -57,10 +48,10 @@ class GTFSCalendarModel extends output_gateway_1.SequelizeModel {
          * @param {number} [options.offset] Offset
          * @returns Array of the retrieved records
          */
-        this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
+        this.GetAll = async (options = {}) => {
             const { limit, offset, date } = options;
             try {
-                const data = yield this.sequelizeModel.scope({ method: ["forDate", date] }).findAll({
+                const data = await this.sequelizeModel.scope({ method: ["forDate", date] }).findAll({
                     limit,
                     offset,
                     order: [["service_id", "asc"]],
@@ -70,7 +61,7 @@ class GTFSCalendarModel extends output_gateway_1.SequelizeModel {
             catch (err) {
                 throw new golemio_errors_1.GeneralError("Database error", "GTFSCalendar", err, 500);
             }
-        });
+        };
         this.GetOne = (id) => {
             throw new golemio_errors_1.FatalError("Method not implemented");
         };

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

@@ -1 +1 @@
-{"version":3,"file":"GTFSCalendarModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSCalendarModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,2FAAiE;AACjE,sEAAmE;AACnE,6EAAoF;AACpF,gGAA+D;AAC/D,oFAA4D;AAC5D,wBAA8C;AAE9C,MAAa,iBAAkB,SAAQ,+BAAc;IAWjD;QACI,KAAK,CAAC,sBAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,sBAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,yBAAW,CAAC,cAAc,EAAE;YACvF,MAAM,EAAE,iBAAS;YACjB,MAAM,EAAE;gBACJ,OAAO,CAAC,IAAa;oBACjB,IAAI,CAAC,IAAI,EAAE;wBACP,OAAO,EAAE,CAAC;qBACb;oBACD,MAAM,GAAG,GAAG,IAAA,yBAAM,EAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;oBAC/B,MAAM,KAAK,GAAQ;wBACf,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;4BAChB,mBAAS,CAAC,OAAO,CACb,SAAS,IAAI,KAAK,GAAG,2EAA2E,CACnG;4BACD,EAAE,CAAC,SAAe,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE;yBAC7D;qBACJ,CAAC;oBACF,OAAO,EAAE,KAAK,EAAE,CAAC;gBACrB,CAAC;aACJ;SACJ,CAAC,CAAC;QA9BA,eAAU,GAA8B;YAC3C,CAAC,EAAE,QAAQ;YACX,CAAC,EAAE,SAAS;YACZ,CAAC,EAAE,WAAW;YACd,CAAC,EAAE,UAAU;YACb,CAAC,EAAE,QAAQ;YACX,CAAC,EAAE,UAAU;YACb,CAAC,EAAE,QAAQ;SACd,CAAC;QAyBF;;;;;;WAMG;QACI,WAAM,GAAG,CACZ,UAII,EAAE,EACM,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACxC,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;oBAChF,KAAK;oBACL,MAAM;oBACN,KAAK,EAAE,CAAC,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;iBACjC,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACtE;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAC,EAAO,EAAgB,EAAE;YACtC,MAAM,IAAI,2BAAU,CAAC,wBAAwB,CAAC,CAAC;QACnD,CAAC,CAAC;IA/BF,CAAC;CAgCJ;AAhED,8CAgEC"}
+{"version":3,"file":"GTFSCalendarModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSCalendarModel.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,2FAAiE;AACjE,sEAAmE;AACnE,6EAAoF;AACpF,gGAA+D;AAC/D,oFAA4D;AAC5D,wBAA8C;AAE9C,MAAa,iBAAkB,SAAQ,+BAAc;IAWjD;QACI,KAAK,CAAC,sBAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,sBAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,yBAAW,CAAC,cAAc,EAAE;YACvF,MAAM,EAAE,iBAAS;YACjB,MAAM,EAAE;gBACJ,OAAO,CAAC,IAAa;oBACjB,IAAI,CAAC,IAAI,EAAE;wBACP,OAAO,EAAE,CAAC;qBACb;oBACD,MAAM,GAAG,GAAG,IAAA,yBAAM,EAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;oBAC/B,MAAM,KAAK,GAAQ;wBACf,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;4BAChB,mBAAS,CAAC,OAAO,CACb,SAAS,IAAI,KAAK,GAAG,2EAA2E,CACnG;4BACD,EAAE,CAAC,SAAe,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE;yBAC7D;qBACJ,CAAC;oBACF,OAAO,EAAE,KAAK,EAAE,CAAC;gBACrB,CAAC;aACJ;SACJ,CAAC,CAAC;QA9BA,eAAU,GAA8B;YAC3C,CAAC,EAAE,QAAQ;YACX,CAAC,EAAE,SAAS;YACZ,CAAC,EAAE,WAAW;YACd,CAAC,EAAE,UAAU;YACb,CAAC,EAAE,QAAQ;YACX,CAAC,EAAE,UAAU;YACb,CAAC,EAAE,QAAQ;SACd,CAAC;QAyBF;;;;;;WAMG;QACI,WAAM,GAAG,KAAK,EACjB,UAII,EAAE,EACM,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACxC,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;oBAChF,KAAK;oBACL,MAAM;oBACN,KAAK,EAAE,CAAC,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;iBACjC,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACtE;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,CAAC,EAAO,EAAgB,EAAE;YACtC,MAAM,IAAI,2BAAU,CAAC,wBAAwB,CAAC,CAAC;QACnD,CAAC,CAAC;IA/BF,CAAC;CAgCJ;AAhED,8CAgEC"}

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GTFSRoutesModel = void 0;
 const const_1 = require("../../../schema-definitions/const");
@@ -26,12 +17,12 @@ class GTFSRoutesModel extends output_gateway_1.SequelizeModel {
          * @param {number} [options.offset] Offset
          * @returns Array of the retrieved records
          */
-        this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
+        this.GetAll = async (options = {}) => {
             const { limit, offset } = options;
             try {
                 const order = [];
                 order.push([["route_id", "asc"]]);
-                const data = yield this.sequelizeModel.findAll({
+                const data = await this.sequelizeModel.findAll({
                     limit,
                     offset,
                     order,
@@ -41,12 +32,12 @@ class GTFSRoutesModel extends output_gateway_1.SequelizeModel {
             catch (err) {
                 throw new golemio_errors_1.GeneralError("Database error", "GTFSRoutesModel", err, 500);
             }
-        });
+        };
         /** Retrieves specific gtfs routes
          * @param {string} id Id of the route
          * @returns Object of the retrieved record or null
          */
-        this.GetOne = (id) => __awaiter(this, void 0, void 0, function* () { return this.ConvertItem(yield this.sequelizeModel.findByPk(id)); });
+        this.GetOne = async (id) => this.ConvertItem(await this.sequelizeModel.findByPk(id));
         /**
          * Convert a single db result to proper output format with all tranformation
          * @param {object} route Route object

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

@@ -1 +1 @@
-{"version":3,"file":"GTFSRoutesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSRoutesModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,qFAA2D;AAC3D,sEAAmE;AACnE,6EAAwE;AAExE,MAAa,eAAgB,SAAQ,+BAAc;IAC/C;QACI,KAAK,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAS,CAAC,MAAM,CAAC,WAAW,EAAE,mBAAQ,CAAC,cAAc,EAAE;YAChF,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QAGP;;;;;WAKG;QACI,WAAM,GAAG,CACZ,UAGI,EAAE,EACM,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAClC,IAAI;gBACA,MAAM,KAAK,GAAQ,EAAE,CAAC;gBACtB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC3C,KAAK;oBACL,MAAM;oBACN,KAAK;iBACR,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;aACrD;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACzE;QACL,CAAC,CAAA,CAAC;QAEF;;;WAGG;QACI,WAAM,GAAG,CAAO,EAAU,EAAgB,EAAE,gDAAC,OAAA,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC;QAE7G;;;;WAIG;QACK,gBAAW,GAAG,CAAC,KAAU,EAAE,EAAE;YACjC,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;YAEhC,0CAA0C;YAC1C,IAAI,KAAK,CAAC,MAAM;gBAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAEzC,sBAAsB;YACtB,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,KAAK,GAAG,CAAC;YACxC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,KAAK,GAAG,CAAC;YAC9C,KAAK,CAAC,uBAAuB,GAAG,KAAK,CAAC,uBAAuB,KAAK,GAAG,CAAC;YAEtE,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;IApDF,CAAC;CAqDJ;AA1DD,0CA0DC"}
+{"version":3,"file":"GTFSRoutesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSRoutesModel.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,qFAA2D;AAC3D,sEAAmE;AACnE,6EAAwE;AAExE,MAAa,eAAgB,SAAQ,+BAAc;IAC/C;QACI,KAAK,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAS,CAAC,MAAM,CAAC,WAAW,EAAE,mBAAQ,CAAC,cAAc,EAAE;YAChF,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QAGP;;;;;WAKG;QACI,WAAM,GAAG,KAAK,EACjB,UAGI,EAAE,EACM,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAClC,IAAI;gBACA,MAAM,KAAK,GAAQ,EAAE,CAAC;gBACtB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC3C,KAAK;oBACL,MAAM;oBACN,KAAK;iBACR,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;aACrD;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACzE;QACL,CAAC,CAAC;QAEF;;;WAGG;QACI,WAAM,GAAG,KAAK,EAAE,EAAU,EAAgB,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QAE7G;;;;WAIG;QACK,gBAAW,GAAG,CAAC,KAAU,EAAE,EAAE;YACjC,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;YAEhC,0CAA0C;YAC1C,IAAI,KAAK,CAAC,MAAM;gBAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAEzC,sBAAsB;YACtB,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,KAAK,GAAG,CAAC;YACxC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,KAAK,GAAG,CAAC;YAC9C,KAAK,CAAC,uBAAuB,GAAG,KAAK,CAAC,uBAAuB,KAAK,GAAG,CAAC;YAEtE,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;IApDF,CAAC;CAqDJ;AA1DD,0CA0DC"}

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GTFSShapesModel = void 0;
 const const_1 = require("../../../schema-definitions/const");
@@ -32,12 +23,12 @@ class GTFSShapesModel extends output_gateway_1.SequelizeModel {
          * @param {number} [options.offset] Offset
          * @returns Array of the retrieved records
          */
-        this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
+        this.GetAll = async (options = {}) => {
             const { limit, offset, id } = options;
             try {
                 const order = [];
                 order.push([["shape_id", "asc"]]);
-                const data = yield this.sequelizeModel.findAll({
+                const data = await this.sequelizeModel.findAll({
                     limit,
                     offset,
                     order,
@@ -51,10 +42,10 @@ class GTFSShapesModel extends output_gateway_1.SequelizeModel {
             catch (err) {
                 throw new golemio_errors_1.GeneralError("Database error ~ GetAll", "GTFSShapesModel", err, 500);
             }
-        });
-        this.GetOne = (id) => __awaiter(this, void 0, void 0, function* () {
+        };
+        this.GetOne = async (id) => {
             return null;
-        });
+        };
         this.outputAttributes = Object.keys(ShapeDto_1.ShapeDto.attributeModel);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"GTFSShapesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSShapesModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAE5C,qFAA2D;AAC3D,sEAAkG;AAClG,6EAAwE;AAGxE,MAAa,eAAgB,SAAQ,+BAAc;IAG/C;QACI,KAAK,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAS,CAAC,MAAM,CAAC,WAAW,EAAE,mBAAQ,CAAC,cAAc,EAAE;YAChF,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QALG,qBAAgB,GAAa,EAAE,CAAC;QAUnC,cAAS,GAAG,CAAC,MAAmB,EAAE,EAAE;YACvC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE;gBAC9D,UAAU,EAAE,SAAS;aACxB,CAAC,CAAC;QACP,CAAC,CAAC;QAEF;;;;;WAKG;QACI,WAAM,GAAG,CACZ,UAII,EAAE,EACM,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;YACtC,IAAI;gBACA,MAAM,KAAK,GAAQ,EAAE,CAAC;gBAEtB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC3C,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;iBAC1B,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;oBACnB,OAAO;iBACV;gBACD,OAAO,IAAA,8CAA6B,EAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;aACpF;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,yBAAyB,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAClF;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAO,EAAU,EAA0B,EAAE;YACzD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAA,CAAC;QA5CE,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAQ,CAAC,cAAc,CAAC,CAAC;IACjE,CAAC;CA4CJ;AArDD,0CAqDC"}
+{"version":3,"file":"GTFSShapesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSShapesModel.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,uEAA4C;AAE5C,qFAA2D;AAC3D,sEAAkG;AAClG,6EAAwE;AAGxE,MAAa,eAAgB,SAAQ,+BAAc;IAG/C;QACI,KAAK,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAS,CAAC,MAAM,CAAC,WAAW,EAAE,mBAAQ,CAAC,cAAc,EAAE;YAChF,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QALG,qBAAgB,GAAa,EAAE,CAAC;QAUnC,cAAS,GAAG,CAAC,MAAmB,EAAE,EAAE;YACvC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE;gBAC9D,UAAU,EAAE,SAAS;aACxB,CAAC,CAAC;QACP,CAAC,CAAC;QAEF;;;;;WAKG;QACI,WAAM,GAAG,KAAK,EACjB,UAII,EAAE,EACM,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;YACtC,IAAI;gBACA,MAAM,KAAK,GAAQ,EAAE,CAAC;gBAEtB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC3C,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;iBAC1B,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;oBACnB,OAAO;iBACV;gBACD,OAAO,IAAA,8CAA6B,EAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;aACpF;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,yBAAyB,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAClF;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,EAAU,EAA0B,EAAE;YACzD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;QA5CE,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAQ,CAAC,cAAc,CAAC,CAAC;IACjE,CAAC;CA4CJ;AArDD,0CAqDC"}

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -39,9 +30,9 @@ class GTFSStopModel extends models_1.SequelizeModel {
         /**
          *  Retrieve multiple GTFS stop ids by ASW node id
          */
-        this.getMultipleIdsByAswNode = (aswNodeId) => __awaiter(this, void 0, void 0, function* () {
+        this.getMultipleIdsByAswNode = async (aswNodeId) => {
             try {
-                const stops = yield this.sequelizeModel.findAll({
+                const stops = await this.sequelizeModel.findAll({
                     attributes: ["stop_id"],
                     raw: true,
                     where: {
@@ -57,20 +48,20 @@ class GTFSStopModel extends models_1.SequelizeModel {
             catch (error) {
                 throw new golemio_errors_1.GeneralError("Error while getting GTFS stop ids", this.constructor.name, error, 500);
             }
-        });
+        };
         /**
          * Retrieve specific gtfs stop
          */
-        this.GetOne = (id) => __awaiter(this, void 0, void 0, function* () {
+        this.GetOne = async (id) => {
             return this.sequelizeModel.findByPk(id).then((data) => {
                 if (data) {
                     return (0, Geo_1.buildGeojsonFeature)(data, "stop_lon", "stop_lat", true);
                 }
                 return null;
             });
-        });
-        this.prepareCisStops = (cisIds) => __awaiter(this, void 0, void 0, function* () {
-            const stops = yield this.cisStopsModel.findAll({
+        };
+        this.prepareCisStops = async (cisIds) => {
+            const stops = await this.cisStopsModel.findAll({
                 raw: true,
                 where: {
                     [sequelize_1.default.Op.or]: {
@@ -79,7 +70,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
                 },
             });
             return stops;
-        });
+        };
         const connector = ioc_1.OutputGatewayContainer.resolve(CoreToken_1.CoreToken.PostgresConnector);
         this.outputAttributes = Object.keys(StopDto_1.StopDto.attributeModel);
         const notUsedColumns = [
@@ -101,97 +92,94 @@ class GTFSStopModel extends models_1.SequelizeModel {
             schema: const_1.PG_SCHEMA,
         });
     }
-    GetAll(options) {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            let attributes = [...this.outputAttributes];
-            let order = [];
-            let where = {};
-            let allGtfsIds = [];
-            if (options.aswIds && options.aswIds.length > 0) {
-                where[sequelize_1.default.Op.or] = this.prepareAswWhereOptions(options.aswIds);
+    async GetAll(options) {
+        let attributes = [...this.outputAttributes];
+        let order = [];
+        let where = {};
+        let allGtfsIds = [];
+        if (options.aswIds && options.aswIds.length > 0) {
+            where[sequelize_1.default.Op.or] = this.prepareAswWhereOptions(options.aswIds);
+        }
+        if (options.cisIds && options.cisIds.length > 0) {
+            let stops;
+            try {
+                stops = await this.prepareCisStops(options.cisIds);
             }
-            if (options.cisIds && options.cisIds.length > 0) {
-                let stops;
-                try {
-                    stops = yield this.prepareCisStops(options.cisIds);
-                }
-                catch (err) {
-                    throw new golemio_errors_1.GeneralError("Database error", "GTFSStopModel", err, 500);
-                }
-                // after all stops by other than GTFS ids are collected, we create proper GTFS ids with % like sign.
-                // GTFS stops must be split into more ids due to more tarriff zones even if it is one physical stop.
-                for (const stop of stops) {
-                    allGtfsIds.push("(^U" + stop.id.replace("/", "Z") + "(P|N)?(_\\d+)?$)");
-                }
-                // If aswIds and cisIds are not belong to any GTFS ids and no other gtfsIds or names are given,
-                // then return empty stops array
-                if (allGtfsIds.length === 0 &&
-                    (options.gtfsIds === undefined || ((_a = options.gtfsIds) === null || _a === void 0 ? void 0 : _a.length) === 0) &&
-                    (options.names === undefined || options.names.length === 0)) {
-                    return options.returnRaw ? [] : (0, Geo_1.buildGeojsonFeatureCollection)([], "stop_lon", "stop_lat", true);
-                }
+            catch (err) {
+                throw new golemio_errors_1.GeneralError("Database error", "GTFSStopModel", err, 500);
             }
-            if (options.lng && options.lat) {
-                const location = sequelize_1.default.literal(`ST_GeomFromText('POINT(${options.lng} ${options.lat})')`);
-                const distance = sequelize_1.default.fn("ST_DistanceSphere", sequelize_1.default.literal("ST_MakePoint(stop_lon, stop_lat)"), location);
-                attributes.push([distance, "distance"]);
-                order.push(["distance", "ASC"]);
-                if (options.range) {
-                    where.distance = {
-                        [sequelize_1.default.Op.lte]: options.range,
-                    };
-                }
+            // after all stops by other than GTFS ids are collected, we create proper GTFS ids with % like sign.
+            // GTFS stops must be split into more ids due to more tarriff zones even if it is one physical stop.
+            for (const stop of stops) {
+                allGtfsIds.push("(^U" + stop.id.replace("/", "Z") + "(P|N)?(_\\d+)?$)");
             }
-            order.push(["stop_id", "ASC"]);
-            for (const stop of (_b = options.gtfsIds) !== null && _b !== void 0 ? _b : []) {
-                allGtfsIds.push("(^" + stop + "$)");
+            // If aswIds and cisIds are not belong to any GTFS ids and no other gtfsIds or names are given,
+            // then return empty stops array
+            if (allGtfsIds.length === 0 &&
+                (options.gtfsIds === undefined || options.gtfsIds?.length === 0) &&
+                (options.names === undefined || options.names.length === 0)) {
+                return options.returnRaw ? [] : (0, Geo_1.buildGeojsonFeatureCollection)([], "stop_lon", "stop_lat", true);
             }
-            if (allGtfsIds.length > 0) {
-                where.stop_id = {
-                    [sequelize_1.default.Op.regexp]: allGtfsIds.join("|"),
+        }
+        if (options.lng && options.lat) {
+            const location = sequelize_1.default.literal(`ST_GeomFromText('POINT(${options.lng} ${options.lat})')`);
+            const distance = sequelize_1.default.fn("ST_DistanceSphere", sequelize_1.default.literal("ST_MakePoint(stop_lon, stop_lat)"), location);
+            attributes.push([distance, "distance"]);
+            order.push(["distance", "ASC"]);
+            if (options.range) {
+                where.distance = {
+                    [sequelize_1.default.Op.lte]: options.range,
                 };
             }
-            if (options.names && ((_c = options.names) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-                where.stop_name = options.names;
-            }
-            if (options.locationType !== undefined) {
-                where.location_type = options.locationType;
-            }
-            if (options.appendAswId) {
-                const aswId = sequelize_1.default.fn("json_build_object", "node", sequelize_1.default.col(`${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.asw_node_id`), "stop", sequelize_1.default.col(`${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.asw_stop_id`));
-                attributes.push([aswId, "asw_id"]);
-            }
-            let include = undefined;
-            if (options.includeMetroTrains) {
-                // Workaround for distinct selection
-                // https://github.com/sequelize/sequelize/issues/2996
-                attributes[0] = [
-                    sequelize_1.default.literal(`DISTINCT ON(${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.stop_id) ${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.${attributes[0]}`),
-                    attributes[0],
-                ];
-                const findOptions = this.prepareFindOptionsForMetro(where);
-                include = findOptions.include;
-                where = findOptions.where;
-            }
-            let data = [];
-            try {
-                data = yield this.sequelizeModel.findAll({
-                    attributes,
-                    include,
-                    where,
-                    order,
-                    limit: options.limit,
-                    offset: options.offset,
-                    raw: true,
-                    subQuery: false,
-                });
-            }
-            catch (err) {
-                throw new golemio_errors_1.GeneralError("Database error", "GTFSStopModel", err, 500);
-            }
-            return options.returnRaw ? data : (0, Geo_1.buildGeojsonFeatureCollection)(data, "stop_lon", "stop_lat", true);
-        });
+        }
+        order.push(["stop_id", "ASC"]);
+        for (const stop of options.gtfsIds ?? []) {
+            allGtfsIds.push("(^" + stop + "$)");
+        }
+        if (allGtfsIds.length > 0) {
+            where.stop_id = {
+                [sequelize_1.default.Op.regexp]: allGtfsIds.join("|"),
+            };
+        }
+        if (options.names && options.names?.length > 0) {
+            where.stop_name = options.names;
+        }
+        if (options.locationType !== undefined) {
+            where.location_type = options.locationType;
+        }
+        if (options.appendAswId) {
+            const aswId = sequelize_1.default.fn("json_build_object", "node", sequelize_1.default.col(`${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.asw_node_id`), "stop", sequelize_1.default.col(`${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.asw_stop_id`));
+            attributes.push([aswId, "asw_id"]);
+        }
+        let include = undefined;
+        if (options.includeMetroTrains) {
+            // Workaround for distinct selection
+            // https://github.com/sequelize/sequelize/issues/2996
+            attributes[0] = [
+                sequelize_1.default.literal(`DISTINCT ON(${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.stop_id) ${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.${attributes[0]}`),
+                attributes[0],
+            ];
+            const findOptions = this.prepareFindOptionsForMetro(where);
+            include = findOptions.include;
+            where = findOptions.where;
+        }
+        let data = [];
+        try {
+            data = await this.sequelizeModel.findAll({
+                attributes,
+                include,
+                where,
+                order,
+                limit: options.limit,
+                offset: options.offset,
+                raw: true,
+                subQuery: false,
+            });
+        }
+        catch (err) {
+            throw new golemio_errors_1.GeneralError("Database error", "GTFSStopModel", err, 500);
+        }
+        return options.returnRaw ? data : (0, Geo_1.buildGeojsonFeatureCollection)(data, "stop_lon", "stop_lat", true);
     }
     prepareAswWhereOptions(aswIds) {
         let aswWhereOptions = [];

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

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