@golemio/pid 2.0.11-dev.372751592 → 2.0.11-dev.373518907
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -84,7 +84,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
|
|
|
84
84
|
// after all stops by other than GTFS ids are collected, we create proper GTFS ids with % like sign.
|
|
85
85
|
// GTFS stops must be split into more ids due to more tarriff zones even if it is one physical stop.
|
|
86
86
|
stops.forEach((stop) => {
|
|
87
|
-
allGtfsIds.push("^U" + stop.id.replace("/", "Z") + "(P|N)?(_\\d+)?$");
|
|
87
|
+
allGtfsIds.push("(^U" + stop.id.replace("/", "Z") + "(P|N)?(_\\d+)?$)");
|
|
88
88
|
});
|
|
89
89
|
// If aswIds and cisIds are not belong to any GTFS ids and no other gtfsIds or names are given,
|
|
90
90
|
// then return empty stops array
|
|
@@ -96,12 +96,10 @@ class GTFSStopModel extends models_1.SequelizeModel {
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
gtfsIds === null || gtfsIds === void 0 ? void 0 : gtfsIds.forEach((stop) => {
|
|
99
|
-
allGtfsIds.push(stop);
|
|
99
|
+
allGtfsIds.push("(^" + stop + "$)");
|
|
100
100
|
});
|
|
101
101
|
where.stop_id = {
|
|
102
|
-
[sequelize_1.default.Op.
|
|
103
|
-
return sequelize_1.default.where(sequelize_1.default.col("stop_id"), "~", id);
|
|
104
|
-
}),
|
|
102
|
+
[sequelize_1.default.Op.regexp]: allGtfsIds.join("|"),
|
|
105
103
|
};
|
|
106
104
|
if (names && (names === null || names === void 0 ? void 0 : names.length) > 0) {
|
|
107
105
|
where.stop_name = names;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSStopModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopModel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GTFSStopModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopModel.ts"],"names":[],"mappings":"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"}
|