@golemio/pid 2.8.9-dev.977094505 → 2.8.9-dev.983877473
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/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.d.ts +1 -8
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.js +2 -22
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/tasks/RefreshDescriptorsTask.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/tasks/RefreshDescriptorsTask.js +3 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/tasks/RefreshDescriptorsTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.d.ts +3 -11
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js +1 -32
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts +1 -75
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +6 -166
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.d.ts +3 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.js +40 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/PositionRepositoryInterfaces.d.ts +7 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/PositionRepositoryInterfaces.js +3 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/PositionRepositoryInterfaces.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/TripRepositoryInterfaces.d.ts +63 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/TripRepositoryInterfaces.js +3 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/TripRepositoryInterfaces.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/VPUtils.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/interfaces/IDelayMessage.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.js +41 -8
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/IPropagateDelayInput.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/IUpdateDelayInput.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/IUpdateGtfsTripIdInput.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/VPInterfaces.d.ts +6 -6
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/schema/PropagateDelaySchema.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/schema/SaveDataToDBSchema.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/schema/SaveDataToDBSchema.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/schema/UpdateDelaySchema.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/schema/UpdateGtfsTripIdSchema.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.d.ts +2 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.js +31 -11
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.d.ts +1 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +24 -20
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js +4 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js.map +1 -1
- package/dist/schema-definitions/vehicle-descriptors/models/DescriptorModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js +4 -16
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js +3 -3
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IPositionDto.d.ts +3 -3
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IVPTripsModel.d.ts +1 -1
- package/package.json +2 -2
|
@@ -2,10 +2,13 @@ import { IMetroRunInputForProcessing } from "../../../runs/interfaces/IMetroRunI
|
|
|
2
2
|
import { ICommonRunsModel } from "../../../../../../schema-definitions/vehicle-positions/models/interfaces/ICommonRunsModel";
|
|
3
3
|
import { IVPTripsModel } from "../../../../../../schema-definitions/vehicle-positions/models/interfaces/IVPTripsModel";
|
|
4
4
|
import { IScheduleDto } from "../../../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
|
|
5
|
+
import { IBulkUpsertOutput } from "../interfaces/TripRepositoryInterfaces";
|
|
6
|
+
import { BulkSaveResult } from "@golemio/core/dist/integration-engine";
|
|
5
7
|
export default class TripsMapper {
|
|
6
8
|
static mapCommonRunToDto(gtfsTrip: IScheduleDto, runInput: ICommonRunsModel): Partial<IVPTripsModel>;
|
|
7
9
|
static mapCommonRunNotPublicToDto(runInput: ICommonRunsModel, tripId: string, lastPositionId: string): Partial<IVPTripsModel>;
|
|
8
10
|
static mapMetroRunToDto(gtfsTrip: IScheduleDto, runInput: IMetroRunInputForProcessing): Partial<IVPTripsModel>;
|
|
11
|
+
static mapTripEntitiesToUpdateDto(tripEntities: BulkSaveResult<IVPTripsModel>, taskStartTimestamp: number): IBulkUpsertOutput;
|
|
9
12
|
private static getGTFSAttributes;
|
|
10
13
|
private static getVehicleTypeId;
|
|
11
14
|
}
|
|
@@ -26,12 +26,51 @@ class TripsMapper {
|
|
|
26
26
|
wheelchair_accessible: runInput.wheelchair_accessible,
|
|
27
27
|
provider_source_type: ProviderSourceTypeEnum_1.ProviderSourceTypeEnum.TcpCommon,
|
|
28
28
|
id: tripId,
|
|
29
|
-
last_position_id:
|
|
29
|
+
last_position_id: lastPositionId,
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
static mapMetroRunToDto(gtfsTrip, runInput) {
|
|
33
33
|
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), { id: TripsIdGenerator_1.default.generateFromMetroRun(gtfsTrip, runInput), origin_route_name: runInput.routeId, internal_route_name: runInput.routeId, run_number: runInput.runNumber, internal_run_number: runInput.runNumber, vehicle_type_id: RouteTypeEnums_1.MPVRouteTypesEnum.METRO, wheelchair_accessible: true, provider_source_type: ProviderSourceTypeEnum_1.ProviderSourceTypeEnum.TcpMetro });
|
|
34
34
|
}
|
|
35
|
+
static mapTripEntitiesToUpdateDto(tripEntities, taskStartTimestamp) {
|
|
36
|
+
var _a, _b;
|
|
37
|
+
const output = {
|
|
38
|
+
inserted: [],
|
|
39
|
+
updated: [],
|
|
40
|
+
};
|
|
41
|
+
for (const tripEntity of tripEntities) {
|
|
42
|
+
const tripCreatedTimestamp = new Date(tripEntity.get("created_at")).getTime();
|
|
43
|
+
if (tripCreatedTimestamp > taskStartTimestamp) {
|
|
44
|
+
output.inserted.push({
|
|
45
|
+
cis_line_short_name: tripEntity.cis_line_short_name,
|
|
46
|
+
id: tripEntity.id,
|
|
47
|
+
start_asw_stop_id: tripEntity.start_asw_stop_id,
|
|
48
|
+
start_cis_stop_id: tripEntity.start_cis_stop_id,
|
|
49
|
+
start_cis_stop_platform_code: tripEntity.start_cis_stop_platform_code,
|
|
50
|
+
start_timestamp: (_b = (_a = tripEntity.start_timestamp) === null || _a === void 0 ? void 0 : _a.toISOString()) !== null && _b !== void 0 ? _b : null,
|
|
51
|
+
agency_name_real: tripEntity.agency_name_real,
|
|
52
|
+
agency_name_scheduled: tripEntity.agency_name_scheduled,
|
|
53
|
+
cis_line_id: tripEntity.cis_line_id,
|
|
54
|
+
cis_trip_number: tripEntity.cis_trip_number,
|
|
55
|
+
origin_route_name: tripEntity.origin_route_name,
|
|
56
|
+
run_number: tripEntity.run_number,
|
|
57
|
+
start_time: tripEntity.start_time,
|
|
58
|
+
vehicle_registration_number: tripEntity.vehicle_registration_number,
|
|
59
|
+
vehicle_type_id: tripEntity.vehicle_type_id,
|
|
60
|
+
wheelchair_accessible: tripEntity.wheelchair_accessible,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
output.updated.push({
|
|
65
|
+
id: tripEntity.id,
|
|
66
|
+
origin_route_name: tripEntity.origin_route_name,
|
|
67
|
+
run_number: tripEntity.run_number,
|
|
68
|
+
start_timestamp: tripEntity.start_timestamp,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return output;
|
|
73
|
+
}
|
|
35
74
|
static getGTFSAttributes(gtfsTrip) {
|
|
36
75
|
return {
|
|
37
76
|
agency_name_real: DPPUtils_1.default.DPP_AGENCY_NAME,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripsMapper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.ts"],"names":[],"mappings":";;;;;AACA,sEAAwF;AACxF,+DAAsG;
|
|
1
|
+
{"version":3,"file":"TripsMapper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { VPTripsNonNullableModel } from "../../../../../../schema-definitions/vehicle-positions/models/interfaces/IVPTripsModel";
|
|
2
|
+
import { IVPTripsPositionAttributes } from "../../../../../../schema-definitions/vehicle-positions/models/interfaces/IVPTripsPositionAttributes";
|
|
3
|
+
export interface ITripAttributes extends Pick<VPTripsNonNullableModel, "id" | "gtfs_trip_id" | "gtfs_route_type" | "start_timestamp" | "end_timestamp" | "agency_name_scheduled" | "start_cis_stop_id" | "last_position_context"> {
|
|
4
|
+
}
|
|
5
|
+
export interface ITripPositions extends ITripAttributes {
|
|
6
|
+
positions: IVPTripsPositionAttributes[];
|
|
7
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PositionRepositoryInterfaces.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/PositionRepositoryInterfaces.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { IVPTripsModel } from "../../../../../../schema-definitions/vehicle-positions/models/interfaces/IVPTripsModel";
|
|
2
|
+
import { StatePositionEnum } from "../../../../../../const";
|
|
3
|
+
export interface IUpdateDelayTripsIdsData {
|
|
4
|
+
id: string;
|
|
5
|
+
gtfs_trip_id?: string;
|
|
6
|
+
gtfs_block_id?: string;
|
|
7
|
+
gtfs_route_type?: number;
|
|
8
|
+
start_timestamp: string;
|
|
9
|
+
end_timestamp?: string;
|
|
10
|
+
run_number?: number | null;
|
|
11
|
+
internal_run_number?: number | null;
|
|
12
|
+
origin_route_name?: string | null;
|
|
13
|
+
internal_route_name?: string | null;
|
|
14
|
+
vehicle_registration_number?: number | null;
|
|
15
|
+
}
|
|
16
|
+
export interface IUpdateDelayRunTripsData extends IUpdateDelayTripsIdsData {
|
|
17
|
+
gtfs_trip_id: string;
|
|
18
|
+
internal_route_name: string | null;
|
|
19
|
+
internal_run_number: number | null;
|
|
20
|
+
vehicle_registration_number: number;
|
|
21
|
+
}
|
|
22
|
+
export interface IUpdateGTFSTripIdData extends Omit<Partial<IVPTripsModel>, "start_timestamp"> {
|
|
23
|
+
id: string;
|
|
24
|
+
start_timestamp: string | null;
|
|
25
|
+
run_number: number | null;
|
|
26
|
+
origin_route_name: string | null;
|
|
27
|
+
vehicle_registration_number: number | null;
|
|
28
|
+
}
|
|
29
|
+
export interface IFoundGTFSTripData {
|
|
30
|
+
id?: string;
|
|
31
|
+
gtfs_trip_id: string;
|
|
32
|
+
gtfs_trip_headsign: string;
|
|
33
|
+
gtfs_route_id: string;
|
|
34
|
+
gtfs_route_short_name: string;
|
|
35
|
+
min_stop_time: string;
|
|
36
|
+
max_stop_time: string;
|
|
37
|
+
gtfs_block_id?: string;
|
|
38
|
+
gtfs_trip_short_name?: string;
|
|
39
|
+
gtfs_route_type?: number;
|
|
40
|
+
cis_trip_number?: number;
|
|
41
|
+
internal_run_number?: number;
|
|
42
|
+
internal_route_name?: string;
|
|
43
|
+
}
|
|
44
|
+
export interface IBulkUpsertOutput {
|
|
45
|
+
inserted: IUpdateGTFSTripIdData[];
|
|
46
|
+
updated: Array<{
|
|
47
|
+
id: string;
|
|
48
|
+
origin_route_name: string | null;
|
|
49
|
+
run_number: number | null;
|
|
50
|
+
start_timestamp: Date | null;
|
|
51
|
+
}>;
|
|
52
|
+
}
|
|
53
|
+
export interface IPropagatedDelayTripWithPosition {
|
|
54
|
+
position: {
|
|
55
|
+
id: string;
|
|
56
|
+
delay: number;
|
|
57
|
+
state_position: StatePositionEnum;
|
|
58
|
+
origin_timestamp: Date;
|
|
59
|
+
};
|
|
60
|
+
trip: {
|
|
61
|
+
id: string;
|
|
62
|
+
};
|
|
63
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TripRepositoryInterfaces.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/TripRepositoryInterfaces.ts"],"names":[],"mappings":""}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/VPUtils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PositionTrackingEnum } from "../../../../../const";
|
|
2
|
-
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/
|
|
2
|
+
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/interfaces/TripRepositoryInterfaces";
|
|
3
3
|
import { IPositionTransformationResult } from "../interfaces/TransformationInterfaces";
|
|
4
4
|
import { TripStopsSchedule } from "../interfaces/VPInterfaces";
|
|
5
5
|
export declare class VPUtils {
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { RunTripsRedisRepository } from "../../../../../ropid-gtfs/data-access/cache";
|
|
2
2
|
import { CommonRunsRepository } from "../../../runs/data-access/CommonRunsRepository";
|
|
3
3
|
import { IMetroRunInputForProcessing } from "../../../runs/interfaces/IMetroRunInputForProcessing";
|
|
4
|
-
import { PositionsRepository } from "../../data-access/PositionsRepository";
|
|
5
|
-
import { TripsRepository } from "../../data-access/TripsRepository";
|
|
6
4
|
import { IVehiclePositionsSchedule } from "../../interfaces/VPInterfaces";
|
|
5
|
+
import { IScheduleDto } from "../../../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
|
|
7
6
|
import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
|
|
8
7
|
import { Moment } from "@golemio/core/dist/shared/moment-timezone";
|
|
8
|
+
import { PositionsRepository } from "../../data-access/PositionsRepository";
|
|
9
|
+
import { TripsRepository } from "../../data-access/TripsRepository";
|
|
9
10
|
import { IUpdateRunsGtfsTripInput } from "../../interfaces/IUpdateRunsGtfsTripInput";
|
|
10
11
|
import { IDelayMessage } from "./interfaces/IDelayMessage";
|
|
11
|
-
import { IScheduleDto } from "../../../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
|
|
12
12
|
export declare abstract class AbstractGTFSTripRunManager {
|
|
13
13
|
protected readonly positionsRepository: PositionsRepository;
|
|
14
14
|
protected readonly tripsRepository: TripsRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractGTFSTripRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"AbstractGTFSTripRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IUpdateDelayRunTripsData } from "../../../data-access/TripsRepository";
|
|
2
1
|
import { IScheduleDto } from "../../../../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
|
|
2
|
+
import { IUpdateDelayRunTripsData } from "../../../data-access/interfaces/TripRepositoryInterfaces";
|
|
3
3
|
export interface IDelayMessage {
|
|
4
4
|
updatedTrips: IUpdateDelayRunTripsData[];
|
|
5
5
|
positions: any[];
|
|
@@ -40,15 +40,32 @@ let MetroShapePointsFixer = exports.MetroShapePointsFixer = class MetroShapePoin
|
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
41
|
try {
|
|
42
42
|
const clonedData = structuredClone(data);
|
|
43
|
-
clonedData.shapes_anchor_points =
|
|
43
|
+
clonedData.shapes_anchor_points = clonedData.shapes_anchor_points.map((shape) => {
|
|
44
44
|
return Object.assign(Object.assign({}, shape), { at_stop: false, this_stop_sequence: null });
|
|
45
45
|
});
|
|
46
46
|
// load metro obvody
|
|
47
47
|
const metroRailtrackLookup = yield this.cachedMetroRailTrackLookup.getAllByRouteName(MetroRouteHelper_1.MetroRouteHelper.getRouteName(data.trip_id));
|
|
48
|
-
|
|
48
|
+
let lastKnownStopSequence = null;
|
|
49
|
+
const maxStopSequence = clonedData.stop_times.length;
|
|
50
|
+
for (let index = 0; index < clonedData.shapes_anchor_points.length; index++) {
|
|
51
|
+
const shape = clonedData.shapes_anchor_points[index];
|
|
49
52
|
const closestMetroRailtrack = this.getClosestMetroRailtrack(shape, metroRailtrackLookup);
|
|
50
|
-
|
|
51
|
-
|
|
53
|
+
const thisStopSequence = this.getSequenceByStopId(closestMetroRailtrack.gtfs_stop_id, clonedData.stop_times);
|
|
54
|
+
if (thisStopSequence) {
|
|
55
|
+
lastKnownStopSequence = thisStopSequence;
|
|
56
|
+
}
|
|
57
|
+
shape.at_stop = closestMetroRailtrack.gtfs_stop_id ? true : false;
|
|
58
|
+
shape.this_stop_sequence = thisStopSequence;
|
|
59
|
+
shape.next_stop_sequence = lastKnownStopSequence ? Math.min(lastKnownStopSequence + 1, maxStopSequence) : 2;
|
|
60
|
+
shape.last_stop_sequence = lastKnownStopSequence && lastKnownStopSequence > 1 ? lastKnownStopSequence - 1 : 1;
|
|
61
|
+
if (shape.at_stop) {
|
|
62
|
+
shape.last_stop_sequence = shape.this_stop_sequence;
|
|
63
|
+
if (!shape.this_stop_sequence) {
|
|
64
|
+
console.log(`Unable to find stop sequence for stop ${closestMetroRailtrack.gtfs_stop_id}`);
|
|
65
|
+
console.log(closestMetroRailtrack);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
52
69
|
return clonedData;
|
|
53
70
|
}
|
|
54
71
|
catch (err) {
|
|
@@ -57,16 +74,32 @@ let MetroShapePointsFixer = exports.MetroShapePointsFixer = class MetroShapePoin
|
|
|
57
74
|
});
|
|
58
75
|
}
|
|
59
76
|
getSequenceByStopId(gtfs_stop_id, stop_times) {
|
|
60
|
-
var _a;
|
|
61
|
-
|
|
77
|
+
var _a, _b, _c;
|
|
78
|
+
const regex = /U(?<node>.*)Z/;
|
|
79
|
+
const node = (_b = (_a = regex.exec(gtfs_stop_id || "")) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.node;
|
|
80
|
+
if (node && node.length > 0) {
|
|
81
|
+
return ((_c = stop_times.find((stop_time) => { var _a, _b; return ((_b = (_a = regex.exec(stop_time.stop_id)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.node) === node; })) === null || _c === void 0 ? void 0 : _c.stop_sequence) || null;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
62
86
|
}
|
|
63
87
|
getClosestMetroRailtrack(shape, metroRailtrackLookup) {
|
|
64
88
|
// find closest metroRailtrack for shape.coordinates
|
|
65
|
-
|
|
89
|
+
const result = metroRailtrackLookup
|
|
66
90
|
.map((metroRailtrack) => {
|
|
67
91
|
return Object.assign(Object.assign({}, metroRailtrack), { distance: this.ruler.distance(shape.coordinates, metroRailtrack.coordinates.coordinates) });
|
|
68
92
|
})
|
|
69
|
-
.sort((a, b) => a.distance - b.distance)
|
|
93
|
+
.sort((a, b) => a.distance - b.distance);
|
|
94
|
+
if (result[0].gtfs_stop_id) {
|
|
95
|
+
return result[0];
|
|
96
|
+
}
|
|
97
|
+
else if (result[1].gtfs_stop_id) {
|
|
98
|
+
return result[1];
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
return result[0];
|
|
102
|
+
}
|
|
70
103
|
}
|
|
71
104
|
};
|
|
72
105
|
exports.MetroShapePointsFixer = MetroShapePointsFixer = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroShapePointsFixer.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uEAA8E;AAC9E,6EAA+F;AAE/F,iEAAwE;AACxE,8DAAqC;AACrC,mGAAgG;AAEhG,6EAAwE;AAGjE,IAAM,qBAAqB,mCAA3B,MAAM,qBAAqB;IAG9B,YACiE,0BAAsD;QAAtD,+BAA0B,GAA1B,0BAA0B,CAA4B;QAEnH,IAAI,CAAC,KAAK,GAAG,IAAA,qBAAU,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAEY,GAAG,CAAC,IAAsB;;YACnC,IAAI;gBACA,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;gBACzC,UAAU,CAAC,oBAAoB,GAAG,
|
|
1
|
+
{"version":3,"file":"MetroShapePointsFixer.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/
|
|
1
|
+
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/interfaces/TripRepositoryInterfaces";
|
|
2
2
|
import { IProcessedPositions } from "./VPInterfaces";
|
|
3
3
|
export interface IPropagateDelayInput {
|
|
4
4
|
processedPositions: IProcessedPositions[];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IScheduleDto } from "../../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
|
|
2
|
-
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/
|
|
2
|
+
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/interfaces/TripRepositoryInterfaces";
|
|
3
3
|
import { IPositionTransformationResult } from "../interfaces/TransformationInterfaces";
|
|
4
4
|
export interface IUpdateDelayInput {
|
|
5
5
|
updatedTrips: Array<IUpdateDelayTripsIdsData | IUpdateDelayRunTripsData>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUpdateGTFSTripIdData } from "../data-access/
|
|
1
|
+
import { IUpdateGTFSTripIdData } from "../data-access/interfaces/TripRepositoryInterfaces";
|
|
2
2
|
import { IPositionTransformationResult } from "../interfaces/TransformationInterfaces";
|
|
3
3
|
export interface IUpdateGtfsTripIdInput {
|
|
4
4
|
trips: IUpdateGTFSTripIdData[];
|
|
@@ -2,17 +2,17 @@ import { ITripStopsResult } from "../../../../ropid-gtfs/RopidGTFSStopTimesModel
|
|
|
2
2
|
import { IShape, IStopTime } from "../../../../ropid-gtfs/RopidGTFSTripsModel";
|
|
3
3
|
import { IVPTripsPositionAttributes } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IVPTripsPositionAttributes";
|
|
4
4
|
import { IVPTripsComputedPositionAtStopStreak, IVPTripsLastPositionContext } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/VPTripsLastPositionInterfaces";
|
|
5
|
-
import { StatePositionEnum } from "../../../../../const";
|
|
5
|
+
import { StatePositionEnum, StateProcessEnum, TCPEventEnum } from "../../../../../const";
|
|
6
6
|
import { GTFSRouteTypeEnum } from "../../../../../helpers/RouteTypeEnums";
|
|
7
7
|
export interface IPositionToUpdate {
|
|
8
8
|
bearing?: number;
|
|
9
|
-
state_process:
|
|
9
|
+
state_process: StateProcessEnum;
|
|
10
10
|
state_position: StatePositionEnum;
|
|
11
11
|
origin_timestamp?: Date;
|
|
12
12
|
id: string;
|
|
13
13
|
is_canceled?: boolean;
|
|
14
|
-
lat?:
|
|
15
|
-
lng?:
|
|
14
|
+
lat?: number;
|
|
15
|
+
lng?: number;
|
|
16
16
|
tracking?: number;
|
|
17
17
|
delay?: number | null;
|
|
18
18
|
origin_time?: string;
|
|
@@ -32,7 +32,7 @@ export interface IPositionToUpdate {
|
|
|
32
32
|
this_stop_id?: string;
|
|
33
33
|
this_stop_sequence?: number;
|
|
34
34
|
this_stop_name?: string;
|
|
35
|
-
tcp_event?:
|
|
35
|
+
tcp_event?: TCPEventEnum | null;
|
|
36
36
|
valid_to?: Date;
|
|
37
37
|
delay_stop_arrival?: number | null;
|
|
38
38
|
delay_stop_departure?: number | null;
|
|
@@ -97,7 +97,7 @@ export interface ICurrentPositionProperties {
|
|
|
97
97
|
origin_timestamp: Date;
|
|
98
98
|
scheduled_timestamp: Date | null;
|
|
99
99
|
this_stop_id: string | null;
|
|
100
|
-
tcp_event:
|
|
100
|
+
tcp_event: TCPEventEnum | null;
|
|
101
101
|
}
|
|
102
102
|
export interface ILastPositionProperties {
|
|
103
103
|
time_delay: number;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/
|
|
1
|
+
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/interfaces/TripRepositoryInterfaces";
|
|
2
2
|
import { IPropagateDelayInput } from "../interfaces/IPropagateDelayInput";
|
|
3
3
|
import { IProcessedPositions } from "../interfaces/VPInterfaces";
|
|
4
4
|
export declare class PropagateDelayValidationSchema implements IPropagateDelayInput {
|
|
@@ -193,7 +193,7 @@ __decorate([
|
|
|
193
193
|
], PositionContent.prototype, "$", void 0);
|
|
194
194
|
__decorate([
|
|
195
195
|
(0, class_validator_1.IsArray)(),
|
|
196
|
-
(0, class_validator_1.
|
|
196
|
+
(0, class_validator_1.ArrayMinSize)(1),
|
|
197
197
|
(0, class_validator_1.ValidateNested)(),
|
|
198
198
|
(0, class_transformer_1.Type)(() => StopContent),
|
|
199
199
|
__metadata("design:type", Array)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveDataToDBSchema.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/schema/SaveDataToDBSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mFAAmE;AACnE,+
|
|
1
|
+
{"version":3,"file":"SaveDataToDBSchema.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/schema/SaveDataToDBSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IScheduleDto } from "../../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
|
|
2
|
-
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/
|
|
2
|
+
import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "../data-access/interfaces/TripRepositoryInterfaces";
|
|
3
3
|
import { IUpdateDelayInput } from "../interfaces/IUpdateDelayInput";
|
|
4
4
|
import { IPositionTransformationResult } from "../interfaces/TransformationInterfaces";
|
|
5
5
|
export declare class UpdateDelayValidationSchema implements IUpdateDelayInput {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUpdateGTFSTripIdData } from "../data-access/
|
|
1
|
+
import { IUpdateGTFSTripIdData } from "../data-access/interfaces/TripRepositoryInterfaces";
|
|
2
2
|
import { IUpdateGtfsTripIdInput } from "../interfaces/IUpdateGtfsTripIdInput";
|
|
3
3
|
import { IPositionTransformationResult } from "../interfaces/TransformationInterfaces";
|
|
4
4
|
export declare class UpdateGtfsTripIdValidationSchema implements IUpdateGtfsTripIdInput {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA2E;AAG3E,2EAAoE;AACpE,2EAA6E;AAE7E,gDAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"PropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,4 +9,6 @@ export declare class SaveDataToDBTask extends AbstractTask<IMpvMessageInput> {
|
|
|
9
9
|
private readonly positionsTransformation;
|
|
10
10
|
constructor(queuePrefix: string);
|
|
11
11
|
protected execute(data: IMpvMessageInput): Promise<void>;
|
|
12
|
+
private sendDataToUpdateGtfsTripId;
|
|
13
|
+
private sendDataToUpdateDelay;
|
|
12
14
|
}
|
|
@@ -8,11 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.SaveDataToDBTask = void 0;
|
|
13
16
|
const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
|
|
14
17
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
15
18
|
const TripsRepository_1 = require("../data-access/TripsRepository");
|
|
19
|
+
const TripsMapper_1 = __importDefault(require("../data-access/helpers/TripsMapper"));
|
|
16
20
|
const SaveDataToDBSchema_1 = require("../schema/SaveDataToDBSchema");
|
|
17
21
|
const PositionsTransformation_1 = require("../transformations/PositionsTransformation");
|
|
18
22
|
class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
@@ -25,24 +29,41 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
25
29
|
this.positionsTransformation = new PositionsTransformation_1.PositionsTransformation();
|
|
26
30
|
}
|
|
27
31
|
execute(data) {
|
|
32
|
+
var _a;
|
|
28
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
+
const taskStartTimestamp = new Date().getTime();
|
|
29
35
|
const transformedData = yield this.positionsTransformation.transform(data.m.spoj);
|
|
30
|
-
const
|
|
36
|
+
const tripEntities = yield this.tripsRepository.bulkSave(transformedData.trips,
|
|
37
|
+
// Ignore incoming start_timestamp for existing trips to avoid overwriting existing computed timestamp
|
|
38
|
+
// TODO this is a workaround, dedicated column (gtfs_start_timestamp) will be added
|
|
39
|
+
Object.keys((_a = transformedData.trips[0]) !== null && _a !== void 0 ? _a : {})
|
|
40
|
+
.filter((key) => key !== "start_timestamp")
|
|
41
|
+
.concat("updated_at"), true);
|
|
42
|
+
const { inserted, updated } = TripsMapper_1.default.mapTripEntitiesToUpdateDto(tripEntities, taskStartTimestamp);
|
|
43
|
+
yield this.sendDataToUpdateGtfsTripId(inserted, transformedData.positions);
|
|
44
|
+
yield this.sendDataToUpdateDelay(updated, transformedData.positions);
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
sendDataToUpdateGtfsTripId(insertedTrips, positions) {
|
|
48
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
31
49
|
// send message for update GTFSTripIds
|
|
32
|
-
for (let i = 0, chunkSize = 50; i <
|
|
33
|
-
const
|
|
34
|
-
const insertedIds =
|
|
50
|
+
for (let i = 0, chunkSize = 50; i < insertedTrips.length; i += chunkSize) {
|
|
51
|
+
const insertedBatch = insertedTrips.slice(i, i + chunkSize);
|
|
52
|
+
const insertedIds = insertedBatch.map((ins) => {
|
|
35
53
|
return ins.id;
|
|
36
54
|
});
|
|
37
55
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateGTFSTripId", {
|
|
38
|
-
trips:
|
|
39
|
-
positions:
|
|
56
|
+
trips: insertedBatch,
|
|
57
|
+
positions: positions.filter((position) => insertedIds.includes(position.trips_id)),
|
|
40
58
|
});
|
|
41
59
|
}
|
|
42
|
-
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
sendDataToUpdateDelay(updatedTrips, positions) {
|
|
63
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
43
64
|
// aggregate runs by origin_route_name & run_number to keep related messages in same bulk
|
|
44
|
-
const runTripMap =
|
|
45
|
-
for (const trip of
|
|
65
|
+
const runTripMap = updatedTrips.length ? { unknown: [] } : {};
|
|
66
|
+
for (const trip of updatedTrips) {
|
|
46
67
|
if (!trip.origin_route_name || !trip.run_number) {
|
|
47
68
|
runTripMap.unknown.push(trip.id);
|
|
48
69
|
}
|
|
@@ -63,11 +84,10 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
63
84
|
}
|
|
64
85
|
}
|
|
65
86
|
for (const key in chunks) {
|
|
66
|
-
const positions = transformedData.positions.filter((position) => chunks[key].includes(position.trips_id));
|
|
67
87
|
const updatedTrips = yield this.tripsRepository.findAllAssocTripIds(chunks[key]);
|
|
68
88
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateDelay", {
|
|
69
|
-
positions,
|
|
70
89
|
updatedTrips,
|
|
90
|
+
positions: positions.filter((position) => chunks[key].includes(position.trips_id)),
|
|
71
91
|
});
|
|
72
92
|
}
|
|
73
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveDataToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SaveDataToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2FAAqF;AACrF,2EAA6E;AAC7E,oEAAiE;AACjE,qFAA6D;AAI7D,qEAA4E;AAC5E,wFAAqF;AAIrF,MAAa,gBAAiB,SAAQ,sBAA8B;IAQhE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,cAAc,CAAC;QAC3B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,iDAA4B,CAAC;QAOlD,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,uBAAuB,GAAG,IAAI,iDAAuB,EAAE,CAAC;IACjE,CAAC;IAEe,OAAO,CAAC,IAAsB;;;YAC1C,MAAM,kBAAkB,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAClF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CACpD,eAAe,CAAC,KAAK;YACrB,sGAAsG;YACtG,mFAAmF;YACnF,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC;iBACtC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,iBAAiB,CAAC;iBAC1C,MAAM,CAAC,YAAY,CAAC,EACzB,IAAI,CACP,CAAC;YAEF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,qBAAW,CAAC,0BAA0B,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;YACvG,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;YAC3E,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;;KACxE;IAEa,0BAA0B,CACpC,aAA4C,EAC5C,SAA0C;;YAE1C,sCAAsC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;gBACtE,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;gBAC5D,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC1C,OAAO,GAAG,CAAC,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;gBAEH,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE;oBAC3E,KAAK,EAAE,aAAa;oBACpB,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBACrF,CAAC,CAAC;aACN;QACL,CAAC;KAAA;IAEa,qBAAqB,CAAC,YAA0C,EAAE,SAA0C;;YACtH,yFAAyF;YACzF,MAAM,UAAU,GAA6B,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAExF,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBAC7C,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACpC;qBAAM;oBACH,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC3D,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;iBACnF;aACJ;YAED,MAAM,MAAM,GAAe,EAAE,CAAC;YAC9B,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;oBACd,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;iBACpB;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClD,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,GAAG,EAAE;oBAC1B,GAAG,EAAE,CAAC;iBACT;aACJ;YAED,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;gBACtB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACjF,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,EAAE;oBACtE,YAAY;oBACZ,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBACrF,CAAC,CAAC;aACN;QACL,CAAC;KAAA;CACJ;AAnFD,4CAmFC"}
|
|
@@ -16,8 +16,7 @@ export declare class UpdateDelayTask extends AbstractTask<IUpdateDelayInput> {
|
|
|
16
16
|
/**
|
|
17
17
|
* Take all newly computed positions and save it, then save the last ones to the trips
|
|
18
18
|
*
|
|
19
|
-
* @param
|
|
20
|
-
* @returns {Object[]} - Arrays of inserted/updated positions and array of (inserted)/updated trips
|
|
19
|
+
* @param processedPositions - Arrays of all newly computed positions
|
|
21
20
|
*/
|
|
22
21
|
private updateComputedPositionsAndTrips;
|
|
23
22
|
}
|