@golemio/pid 2.11.1-dev.1127019328 → 2.11.1-dev.1130791659
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.
- package/db/example/12_metro_line_A_gtfs_trips.sql +4 -4
- package/db/example/13_http-propagate-delay.sql +8 -8
- package/dist/helpers/geo/GeoMeasurementHelper.d.ts +17 -0
- package/dist/helpers/geo/GeoMeasurementHelper.js +65 -0
- package/dist/helpers/geo/GeoMeasurementHelper.js.map +1 -0
- package/dist/helpers/geo/interfaces/IGeoMeasurementHelper.d.ts +8 -0
- package/dist/helpers/geo/interfaces/IGeoMeasurementHelper.js +3 -0
- package/dist/helpers/geo/interfaces/IGeoMeasurementHelper.js.map +1 -0
- package/dist/integration-engine/ioc/Di.d.ts +1 -2
- package/dist/integration-engine/ioc/Di.js +7 -5
- package/dist/integration-engine/ioc/Di.js.map +1 -1
- package/dist/integration-engine/ioc/ModuleContainerToken.d.ts +1 -0
- package/dist/integration-engine/ioc/ModuleContainerToken.js +1 -0
- package/dist/integration-engine/ioc/ModuleContainerToken.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js +4 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionCalculator.d.ts +9 -11
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionCalculator.js +33 -97
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionCalculator.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js +28 -23
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/ValidToCalculator.js +4 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/ValidToCalculator.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/anchor-points/AnchorPointSegmenter.d.ts +17 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/anchor-points/AnchorPointSegmenter.js +76 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/anchor-points/AnchorPointSegmenter.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/RegionalBusPositionsManager.js +24 -22
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/RegionalBusPositionsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/VPInterfaces.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js +0 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js.map +1 -1
- package/dist/output-gateway/public/ioc/Di.js +5 -1
- package/dist/output-gateway/public/ioc/Di.js.map +1 -1
- package/dist/output-gateway/public/ioc/OgModuleToken.d.ts +2 -0
- package/dist/output-gateway/public/ioc/OgModuleToken.js +2 -0
- package/dist/output-gateway/public/ioc/OgModuleToken.js.map +1 -1
- package/dist/output-gateway/public/service/facade/VehiclePositionsFacade.d.ts +3 -1
- package/dist/output-gateway/public/service/facade/VehiclePositionsFacade.js +3 -3
- package/dist/output-gateway/public/service/facade/VehiclePositionsFacade.js.map +1 -1
- package/dist/output-gateway/public/service/helpers/BoundingBoxHelper.d.ts +6 -3
- package/dist/output-gateway/public/service/helpers/BoundingBoxHelper.js +26 -10
- package/dist/output-gateway/public/service/helpers/BoundingBoxHelper.js.map +1 -1
- package/dist/output-gateway/public/service/helpers/interfaces/IBoundingBoxHelper.d.ts +4 -0
- package/dist/output-gateway/public/service/helpers/interfaces/IBoundingBoxHelper.js +3 -0
- package/dist/output-gateway/public/service/helpers/interfaces/IBoundingBoxHelper.js.map +1 -0
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js +11 -3
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/VPTripsLastPositionInterfaces.d.ts +2 -1
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IPublicApiCacheDto.d.ts +0 -2
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js +0 -24
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js.map +1 -1
- package/docs/openapi-output.yaml +2 -10
- package/package.json +2 -2
|
@@ -3,11 +3,13 @@ import { IBoundingBox } from "../../domain/IBoudingBox";
|
|
|
3
3
|
import { IVehiclePositionsRepository } from "../../domain/repository/IVehiclePositionsRepository";
|
|
4
4
|
import { ILogger } from "@golemio/core/dist/helpers/logger/LoggerProvider";
|
|
5
5
|
import { IGeoJSONFeatureCollection } from "@golemio/core/dist/output-gateway";
|
|
6
|
+
import { IBoundingBoxHelper } from "../helpers/interfaces/IBoundingBoxHelper";
|
|
6
7
|
export declare class PublicVehiclePositionsFacade {
|
|
7
8
|
private repository;
|
|
9
|
+
private boundingBoxHelper;
|
|
8
10
|
private log;
|
|
9
11
|
private transformation;
|
|
10
|
-
constructor(repository: IVehiclePositionsRepository, log: ILogger);
|
|
12
|
+
constructor(repository: IVehiclePositionsRepository, boundingBoxHelper: IBoundingBoxHelper, log: ILogger);
|
|
11
13
|
getAll(boundingBox: IBoundingBox, routeShortName: string | undefined, type: GTFSRouteTypeEnum[] | undefined): Promise<IGeoJSONFeatureCollection>;
|
|
12
14
|
private filterClientSide;
|
|
13
15
|
}
|
|
@@ -11,17 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.PublicVehiclePositionsFacade = void 0;
|
|
13
13
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
14
|
-
const BoundingBoxHelper_1 = require("../helpers/BoundingBoxHelper");
|
|
15
14
|
const PublicVehiclePositionsTransformation_1 = require("../transformations/PublicVehiclePositionsTransformation");
|
|
16
15
|
class PublicVehiclePositionsFacade {
|
|
17
|
-
constructor(repository, log) {
|
|
16
|
+
constructor(repository, boundingBoxHelper, log) {
|
|
18
17
|
this.repository = repository;
|
|
18
|
+
this.boundingBoxHelper = boundingBoxHelper;
|
|
19
19
|
this.log = log;
|
|
20
20
|
this.transformation = new PublicVehiclePositionsTransformation_1.PublicVehiclePositionsTransformation();
|
|
21
21
|
}
|
|
22
22
|
getAll(boundingBox, routeShortName, type) {
|
|
23
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const boundingBoxWithCenter =
|
|
24
|
+
const boundingBoxWithCenter = this.boundingBoxHelper.mapToCenterFormat(boundingBox);
|
|
25
25
|
this.log.debug(`width: ${boundingBoxWithCenter.width}m, height: ${boundingBoxWithCenter.height}m`);
|
|
26
26
|
const vehiclePositions = yield this.repository.getAllVehiclePositions(boundingBoxWithCenter);
|
|
27
27
|
const filteredResults = vehiclePositions.filter((el) => this.filterClientSide(el, routeShortName, type));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VehiclePositionsFacade.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/service/facade/VehiclePositionsFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,sEAA6G;
|
|
1
|
+
{"version":3,"file":"VehiclePositionsFacade.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/service/facade/VehiclePositionsFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,sEAA6G;AAE7G,kHAA+G;AAE/G,MAAa,4BAA4B;IAGrC,YACY,UAAuC,EACvC,iBAAqC,EACrC,GAAY;QAFZ,eAAU,GAAV,UAAU,CAA6B;QACvC,sBAAiB,GAAjB,iBAAiB,CAAoB;QACrC,QAAG,GAAH,GAAG,CAAS;QAEpB,IAAI,CAAC,cAAc,GAAG,IAAI,2EAAoC,EAAE,CAAC;IACrE,CAAC;IAEY,MAAM,CACf,WAAyB,EACzB,cAAkC,EAClC,IAAqC;;YAErC,MAAM,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACpF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,qBAAqB,CAAC,KAAK,cAAc,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC;YAEnG,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,CAAC;YAC7F,MAAM,eAAe,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;YAEzG,OAAO,IAAA,8CAA6B,EAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC;QAC9F,CAAC;KAAA;IAEO,gBAAgB,CACpB,EAAsB,EACtB,cAAkC,EAClC,KAAsC;QAEtC,IAAI,cAAc,IAAI,EAAE,CAAC,qBAAqB,KAAK,cAAc,EAAE;YAC/D,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE;YACxD,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAxCD,oEAwCC"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
import { IGeoMeasurementHelper } from "../../../../helpers/geo/interfaces/IGeoMeasurementHelper";
|
|
1
2
|
import { IBoundingBox, IBoundingBoxWithCenter } from "../../domain/IBoudingBox";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { IBoundingBoxHelper } from "./interfaces/IBoundingBoxHelper";
|
|
4
|
+
export declare class BoundingBoxHelper implements IBoundingBoxHelper {
|
|
5
|
+
private geoHelper;
|
|
6
|
+
constructor(geoHelper: IGeoMeasurementHelper);
|
|
7
|
+
mapToCenterFormat(boundingBox: IBoundingBox): IBoundingBoxWithCenter;
|
|
5
8
|
}
|
|
@@ -1,22 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
4
13
|
};
|
|
5
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
15
|
exports.BoundingBoxHelper = void 0;
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
16
|
+
const OgModuleToken_1 = require("../../ioc/OgModuleToken");
|
|
17
|
+
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
18
|
+
let BoundingBoxHelper = exports.BoundingBoxHelper = class BoundingBoxHelper {
|
|
19
|
+
constructor(geoHelper) {
|
|
20
|
+
this.geoHelper = geoHelper;
|
|
21
|
+
}
|
|
22
|
+
mapToCenterFormat(boundingBox) {
|
|
10
23
|
const centerPoint = {
|
|
11
24
|
longitude: (boundingBox.bottomRightLongitude + boundingBox.topLeftLongitude) / 2,
|
|
12
25
|
latitude: (boundingBox.bottomRightLatitude + boundingBox.topLeftLatitude) / 2,
|
|
13
26
|
};
|
|
14
27
|
// Calculate the width and height in meters
|
|
15
|
-
const width = this.
|
|
16
|
-
const height = this.
|
|
28
|
+
const width = this.geoHelper.getDistanceInMeters([boundingBox.topLeftLongitude, boundingBox.topLeftLatitude], [boundingBox.bottomRightLongitude, boundingBox.topLeftLatitude]);
|
|
29
|
+
const height = this.geoHelper.getDistanceInMeters([boundingBox.topLeftLongitude, boundingBox.topLeftLatitude], [boundingBox.topLeftLongitude, boundingBox.bottomRightLatitude]);
|
|
17
30
|
return { centerPoint, width, height };
|
|
18
31
|
}
|
|
19
|
-
}
|
|
20
|
-
exports.BoundingBoxHelper = BoundingBoxHelper
|
|
21
|
-
|
|
32
|
+
};
|
|
33
|
+
exports.BoundingBoxHelper = BoundingBoxHelper = __decorate([
|
|
34
|
+
(0, tsyringe_1.injectable)(),
|
|
35
|
+
__param(0, (0, tsyringe_1.inject)(OgModuleToken_1.OgModuleToken.GeoMeasurementHelper)),
|
|
36
|
+
__metadata("design:paramtypes", [Object])
|
|
37
|
+
], BoundingBoxHelper);
|
|
22
38
|
//# sourceMappingURL=BoundingBoxHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BoundingBoxHelper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/service/helpers/BoundingBoxHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BoundingBoxHelper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/service/helpers/BoundingBoxHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,2DAA6D;AAC7D,iEAAwE;AAIjE,IAAM,iBAAiB,+BAAvB,MAAM,iBAAiB;IAC1B,YAAgE,SAAgC;QAAhC,cAAS,GAAT,SAAS,CAAuB;IAAG,CAAC;IAE7F,iBAAiB,CAAC,WAAyB;QAC9C,MAAM,WAAW,GAAG;YAChB,SAAS,EAAE,CAAC,WAAW,CAAC,oBAAoB,GAAG,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC;YAChF,QAAQ,EAAE,CAAC,WAAW,CAAC,mBAAmB,GAAG,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC;SAChF,CAAC;QACF,2CAA2C;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAC5C,CAAC,WAAW,CAAC,gBAAgB,EAAE,WAAW,CAAC,eAAe,CAAC,EAC3D,CAAC,WAAW,CAAC,oBAAoB,EAAE,WAAW,CAAC,eAAe,CAAC,CAClE,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAC7C,CAAC,WAAW,CAAC,gBAAgB,EAAE,WAAW,CAAC,eAAe,CAAC,EAC3D,CAAC,WAAW,CAAC,gBAAgB,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAClE,CAAC;QAEF,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC1C,CAAC;CACJ,CAAA;4BApBY,iBAAiB;IAD7B,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,6BAAa,CAAC,oBAAoB,CAAC,CAAA;;GAD9C,iBAAiB,CAoB7B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IBoundingBoxHelper.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/service/helpers/interfaces/IBoundingBoxHelper.ts"],"names":[],"mappings":""}
|
|
@@ -290,14 +290,22 @@ VPTripsModel.jsonSchema = {
|
|
|
290
290
|
},
|
|
291
291
|
],
|
|
292
292
|
},
|
|
293
|
-
|
|
294
|
-
|
|
293
|
+
lastPositionState: {
|
|
294
|
+
oneOf: [
|
|
295
|
+
{
|
|
296
|
+
type: "string",
|
|
297
|
+
},
|
|
298
|
+
{
|
|
299
|
+
type: "null",
|
|
300
|
+
nullable: true,
|
|
301
|
+
},
|
|
302
|
+
],
|
|
295
303
|
},
|
|
296
304
|
tripId: {
|
|
297
305
|
type: "string",
|
|
298
306
|
},
|
|
299
307
|
},
|
|
300
|
-
required: ["lastPositionLastStop", "atStopStreak", "
|
|
308
|
+
required: ["lastPositionLastStop", "atStopStreak", "tripId"],
|
|
301
309
|
},
|
|
302
310
|
},
|
|
303
311
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VPTripsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/VPTripsModel.ts"],"names":[],"mappings":";;;AAAA,8EAA6E;AAE7E,mEAA6G;AAK7G,MAAa,YAAa,SAAQ,iBAAmB;;AAArD,
|
|
1
|
+
{"version":3,"file":"VPTripsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/VPTripsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Feature, Point } from "@turf/turf";
|
|
2
2
|
import { IVPTripsPositionAttributes } from "./IVPTripsPositionAttributes";
|
|
3
|
+
import { StatePositionEnum } from "../../../../const";
|
|
3
4
|
export interface IVPTripsComputedPositionAtStopStreak {
|
|
4
5
|
firstPositionTimestamp: number | null;
|
|
5
6
|
firstPositionDelay: number | null;
|
|
@@ -24,6 +25,6 @@ export interface IVPTripsLastPositionContext {
|
|
|
24
25
|
delay: number | null;
|
|
25
26
|
origin_timestamp: Date;
|
|
26
27
|
} | null;
|
|
27
|
-
|
|
28
|
+
lastPositionState: StatePositionEnum | null;
|
|
28
29
|
tripId: string;
|
|
29
30
|
}
|
|
@@ -21,28 +21,6 @@ const publicApiCacheDtoSchema = {
|
|
|
21
21
|
type: "string",
|
|
22
22
|
},
|
|
23
23
|
state_position: { type: "string" },
|
|
24
|
-
run_number: {
|
|
25
|
-
oneOf: [
|
|
26
|
-
{
|
|
27
|
-
type: "number",
|
|
28
|
-
},
|
|
29
|
-
{
|
|
30
|
-
type: "null",
|
|
31
|
-
nullable: true,
|
|
32
|
-
},
|
|
33
|
-
],
|
|
34
|
-
},
|
|
35
|
-
vehicle_registration_number: {
|
|
36
|
-
oneOf: [
|
|
37
|
-
{
|
|
38
|
-
type: "number",
|
|
39
|
-
},
|
|
40
|
-
{
|
|
41
|
-
type: "null",
|
|
42
|
-
nullable: true,
|
|
43
|
-
},
|
|
44
|
-
],
|
|
45
|
-
},
|
|
46
24
|
lat: {
|
|
47
25
|
type: "number",
|
|
48
26
|
},
|
|
@@ -77,8 +55,6 @@ const publicApiCacheDtoSchema = {
|
|
|
77
55
|
"gtfs_trip_id",
|
|
78
56
|
"route_type",
|
|
79
57
|
"gtfs_route_short_name",
|
|
80
|
-
"run_number",
|
|
81
|
-
"vehicle_registration_number",
|
|
82
58
|
"lat",
|
|
83
59
|
"lng",
|
|
84
60
|
"bearing",
|
package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicApiCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.ts"],"names":[],"mappings":";;;AAGA,MAAM,uBAAuB,GAAyC;IAClE,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,YAAY,EAAE;gBACV,IAAI,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE;gBACR,IAAI,EAAE,QAAQ;aACjB;YACD,qBAAqB,EAAE;gBACnB,IAAI,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE;gBACR,IAAI,EAAE,QAAQ;aACjB;YACD,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,
|
|
1
|
+
{"version":3,"file":"PublicApiCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.ts"],"names":[],"mappings":";;;AAGA,MAAM,uBAAuB,GAAyC;IAClE,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,YAAY,EAAE;gBACV,IAAI,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE;gBACR,IAAI,EAAE,QAAQ;aACjB;YACD,qBAAqB,EAAE;gBACnB,IAAI,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE;gBACR,IAAI,EAAE,QAAQ;aACjB;YACD,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,GAAG,EAAE;gBACD,IAAI,EAAE,QAAQ;aACjB;YACD,GAAG,EAAE;gBACD,IAAI,EAAE,QAAQ;aACjB;YACD,OAAO,EAAE;gBACL,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,KAAK,EAAE;gBACH,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;SACJ;QACD,QAAQ,EAAE;YACN,YAAY;YACZ,cAAc;YACd,YAAY;YACZ,uBAAuB;YACvB,KAAK;YACL,KAAK;YACL,SAAS;YACT,OAAO;YACP,gBAAgB;SACnB;KACJ;CACJ,CAAC;AACkC,0DAAuB"}
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -1988,21 +1988,13 @@ components:
|
|
|
1988
1988
|
properties:
|
|
1989
1989
|
gtfs_trip_id:
|
|
1990
1990
|
type: string
|
|
1991
|
-
example: 705_735_231002
|
|
1991
|
+
example: "705_735_231002"
|
|
1992
1992
|
route_type:
|
|
1993
1993
|
type: string
|
|
1994
1994
|
example: bus
|
|
1995
1995
|
gtfs_route_short_name:
|
|
1996
1996
|
type: string
|
|
1997
1997
|
example: '705'
|
|
1998
|
-
run_number:
|
|
1999
|
-
type: number
|
|
2000
|
-
nullable: true
|
|
2001
|
-
example: 29
|
|
2002
|
-
vehicle_registration_number:
|
|
2003
|
-
type: number
|
|
2004
|
-
nullable: true
|
|
2005
|
-
example: 8585
|
|
2006
1998
|
bearing:
|
|
2007
1999
|
type: number
|
|
2008
2000
|
nullable: true
|
|
@@ -2013,7 +2005,7 @@ components:
|
|
|
2013
2005
|
example: 20
|
|
2014
2006
|
vehicle_id:
|
|
2015
2007
|
type: string
|
|
2016
|
-
example: "
|
|
2008
|
+
example: "service-3-8585"
|
|
2017
2009
|
state_position:
|
|
2018
2010
|
type: string
|
|
2019
2011
|
example: "at_stop"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.11.1-dev.
|
|
3
|
+
"version": "2.11.1-dev.1130791659",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"dependencies": {
|
|
80
80
|
"@golemio/ovapi-gtfs-realtime-bindings": "1.2.1-dev.943774882",
|
|
81
81
|
"@turf/turf": "^6.5.0",
|
|
82
|
-
"cheap-ruler": "^
|
|
82
|
+
"cheap-ruler": "^3.0.2",
|
|
83
83
|
"csv-parser": "^3.0.0",
|
|
84
84
|
"csv-stringify": "^5.6.2",
|
|
85
85
|
"html-entities": "^2.3.3",
|