@golemio/pid 6.0.0-dev.2857220632 → 6.0.0-dev.2868128022

package/db/migrations/postgresql/20260908120000-vehiclepositions-logged-tables.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260908120000-vehiclepositions-logged-tables-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260908120000-vehiclepositions-logged-tables-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

package/db/migrations/postgresql/20260911161723-allow-null-position-before-track-delayed.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const fs = require('fs/promises');
+const path = require('path');
+
+const runSql = (db, name) =>
+  fs.readFile(path.join(__dirname, 'sqls', name), 'utf-8').then((sql) => {
+    console.log('received data: ' + sql);
+    return db.runSql(sql);
+  });
+
+exports.up = (db) => runSql(db, '20260911161723-allow-null-position-before-track-delayed-up.sql');
+
+exports.down = (db) => runSql(db, '20260911161723-allow-null-position-before-track-delayed-down.sql');
+
+exports._meta = { version: 1 };

package/db/migrations/postgresql/sqls/20260908120000-vehiclepositions-logged-tables-down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vehiclepositions_positions SET UNLOGGED;
+ALTER TABLE vehiclepositions_trips SET UNLOGGED;

package/db/migrations/postgresql/sqls/20260908120000-vehiclepositions-logged-tables-up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vehiclepositions_positions SET LOGGED;
+ALTER TABLE vehiclepositions_trips SET LOGGED;

package/db/migrations/postgresql/sqls/20260911161723-allow-null-position-before-track-delayed-down.sql

@@ -0,0 +1,55 @@
+drop view v_vehiclepositions_all_trips_with_last_position;
+create view v_vehiclepositions_all_trips_with_last_position as
+select
+    vt.id,
+	vt.agency_name_real,
+	vt.agency_name_scheduled,
+	vt.cis_line_id,
+	vt.cis_trip_number,
+	vt.gtfs_route_id,
+	vt.gtfs_route_short_name,
+	vt.gtfs_route_type,
+	vt.gtfs_trip_headsign,
+	vt.gtfs_trip_short_name,
+	vt.gtfs_trip_id,
+	vt.origin_route_name,
+	vt.run_number,
+	vt.vehicle_registration_number,
+    vt.vehicle_type_id,
+    vt.wheelchair_accessible,
+    vt.updated_at,
+	convert_timestamptz_to_iso_string(vt.start_timestamp) as start_timestamp_isostring,
+	vp.bearing,
+	vp.delay,
+	vp.delay_stop_arrival,
+	vp.delay_stop_departure,
+	vp.is_canceled,
+	vp.last_stop_id,
+	vp.last_stop_sequence,
+    vp.last_stop_headsign,
+    vp.lat,
+    vp.lng,
+	vp.next_stop_id,
+	vp.next_stop_sequence,
+	vp.shape_dist_traveled,
+	vp.speed,
+	vp.state_position,
+	vp.is_tracked,
+	convert_timestamptz_to_iso_string(vp.last_stop_arrival_time) as last_stop_arrival_time_isostring,
+	convert_timestamptz_to_iso_string(vp.last_stop_departure_time) as last_stop_departure_time_isostring,
+	convert_timestamptz_to_iso_string(vp.next_stop_arrival_time) as next_stop_arrival_time_isostring,
+	convert_timestamptz_to_iso_string(vp.next_stop_departure_time) as next_stop_departure_time_isostring,
+	convert_timestamptz_to_iso_string(vp.origin_timestamp) as origin_timestamp_isostring
+from
+	vehiclepositions_trips vt
+inner join vehiclepositions_positions vp on
+	vt.last_position_id = vp.id
+	and (vp.valid_to is null
+		or vp.valid_to >= now())
+	and vp.state_process = 'processed'
+    and (vp.lat != 0 and vp.lat is not null)
+    and (vp.lng != 0 and vp.lng is not null);
+
+comment on view v_vehiclepositions_all_trips_with_last_position is '
+View of all trips with last processed position. Used for serving data to the vehiclepositions output API.
+';

package/db/migrations/postgresql/sqls/20260911161723-allow-null-position-before-track-delayed-up.sql

@@ -0,0 +1,57 @@
+drop view v_vehiclepositions_all_trips_with_last_position;
+create view v_vehiclepositions_all_trips_with_last_position as
+select
+    vt.id,
+	vt.agency_name_real,
+	vt.agency_name_scheduled,
+	vt.cis_line_id,
+	vt.cis_trip_number,
+	vt.gtfs_route_id,
+	vt.gtfs_route_short_name,
+	vt.gtfs_route_type,
+	vt.gtfs_trip_headsign,
+	vt.gtfs_trip_short_name,
+	vt.gtfs_trip_id,
+	vt.origin_route_name,
+	vt.run_number,
+	vt.vehicle_registration_number,
+    vt.vehicle_type_id,
+    vt.wheelchair_accessible,
+    vt.updated_at,
+	convert_timestamptz_to_iso_string(vt.start_timestamp) as start_timestamp_isostring,
+	vp.bearing,
+	vp.delay,
+	vp.delay_stop_arrival,
+	vp.delay_stop_departure,
+	vp.is_canceled,
+	vp.last_stop_id,
+	vp.last_stop_sequence,
+    vp.last_stop_headsign,
+    vp.lat,
+    vp.lng,
+	vp.next_stop_id,
+	vp.next_stop_sequence,
+	vp.shape_dist_traveled,
+	vp.speed,
+	vp.state_position,
+	vp.is_tracked,
+	convert_timestamptz_to_iso_string(vp.last_stop_arrival_time) as last_stop_arrival_time_isostring,
+	convert_timestamptz_to_iso_string(vp.last_stop_departure_time) as last_stop_departure_time_isostring,
+	convert_timestamptz_to_iso_string(vp.next_stop_arrival_time) as next_stop_arrival_time_isostring,
+	convert_timestamptz_to_iso_string(vp.next_stop_departure_time) as next_stop_departure_time_isostring,
+	convert_timestamptz_to_iso_string(vp.origin_timestamp) as origin_timestamp_isostring
+from
+	vehiclepositions_trips vt
+inner join vehiclepositions_positions vp on
+	vt.last_position_id = vp.id
+	and (vp.valid_to is null
+		or vp.valid_to >= now())
+	and vp.state_process = 'processed'
+    and (
+        vp.state_position in ('before_track', 'before_track_delayed')
+        or (vp.lat != 0 and vp.lat is not null and vp.lng != 0 and vp.lng is not null)
+    );
+
+comment on view v_vehiclepositions_all_trips_with_last_position is '
+View of all trips with last processed position. Used for serving data to the vehiclepositions output API.
+';

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts

@@ -10,11 +10,14 @@ import { type IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/
 import { type ILogger } from "@golemio/core/dist/helpers/logger/index.js";
 import { type IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models/index.js";
 import Sequelize from "@golemio/core/dist/shared/sequelize.js";
+import { StatePositionEnum } from "../../../../../const.js";
 import { type IUpdateRunsGtfsTripInput } from "../interfaces/IUpdateRunsGtfsTripInput.js";
 import { type IPropagateDelay } from "../interfaces/VPInterfaces.js";
 import { PositionsRepository } from "./PositionsRepository.js";
 import { type IEnrichedTripForPublicApi, type IUpdateDelayRunTripsData, type IUpdateDelayTripsIdsData, type IUpdateGTFSTripIdData } from "./interfaces/TripRepositoryInterfaces.js";
 export declare class TripsRepository extends PostgresModel implements IModel {
+    static readonly BEFORE_TRACK_STATES: StatePositionEnum[];
+    static readonly TRACKED_STATES_REQUIRING_COORDINATES: StatePositionEnum[];
     private logger;
     private connector;
     private positionsRepository;

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js

@@ -10,6 +10,7 @@ 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 TripsRepository_1;
 import { DateTimeUtils } from "#helpers/DateTimeUtils";
 import { RopidGTFSTripsModel } from "#ie/ropid-gtfs/RopidGTFSTripsModel";
 import { VPContainerToken } from "#ie/vehicle-positions/ioc/VPContainerToken";
@@ -30,7 +31,7 @@ import { StatePositionEnum } from "../../../../../const.js";
 import { PositionsRepository } from "./PositionsRepository.js";
 import { RawQueryProvider } from "./helpers/RawQueryProvider.js";
 import TripsMapper from "./helpers/TripsMapper.js";
-let TripsRepository = class TripsRepository extends PostgresModel {
+let TripsRepository = TripsRepository_1 = class TripsRepository extends PostgresModel {
     constructor(logger, connector, positionsRepository, descriptorRepository, ropidGtfsTripsModel) {
         super("VPTripsRepository", {
             pgTableName: VPTripsModel.TABLE_NAME,
@@ -372,22 +373,15 @@ let TripsRepository = class TripsRepository extends PostgresModel {
                             attributes: [],
                             required: true,
                             where: {
-                                state_position: {
-                                    [Sequelize.Op.in]: [
-                                        StatePositionEnum.ON_TRACK,
-                                        StatePositionEnum.AT_STOP,
-                                        StatePositionEnum.CANCELED,
-                                        StatePositionEnum.OFF_TRACK,
-                                        StatePositionEnum.BEFORE_TRACK,
-                                        StatePositionEnum.BEFORE_TRACK_DELAYED,
-                                    ],
-                                },
-                                lat: {
-                                    [Sequelize.Op.ne]: null,
-                                },
-                                lng: {
-                                    [Sequelize.Op.ne]: null,
-                                },
+                                [Sequelize.Op.or]: [
+                                    // before_track(_delayed): a placeholder position without a real GPS fix yet, lat/lng may be null
+                                    { state_position: { [Sequelize.Op.in]: TripsRepository_1.BEFORE_TRACK_STATES } },
+                                    {
+                                        state_position: { [Sequelize.Op.in]: TripsRepository_1.TRACKED_STATES_REQUIRING_COORDINATES },
+                                        lat: { [Sequelize.Op.ne]: null },
+                                        lng: { [Sequelize.Op.ne]: null },
+                                    },
+                                ],
                                 valid_to: {
                                     [Sequelize.Op.or]: [null, { [Sequelize.Op.gte]: minValidToDateTime }],
                                 },
@@ -467,7 +461,14 @@ let TripsRepository = class TripsRepository extends PostgresModel {
         });
     }
 };
-TripsRepository = __decorate([
+TripsRepository.BEFORE_TRACK_STATES = [StatePositionEnum.BEFORE_TRACK, StatePositionEnum.BEFORE_TRACK_DELAYED];
+TripsRepository.TRACKED_STATES_REQUIRING_COORDINATES = [
+    StatePositionEnum.ON_TRACK,
+    StatePositionEnum.AT_STOP,
+    StatePositionEnum.CANCELED,
+    StatePositionEnum.OFF_TRACK,
+];
+TripsRepository = TripsRepository_1 = __decorate([
     injectable(),
     __param(0, inject(CoreToken.Logger)),
     __param(1, inject(CoreToken.PostgresConnector)),

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicApiCacheRepository.js

@@ -36,8 +36,11 @@ let PublicApiCacheRepository = PublicApiCacheRepository_1 = class PublicApiCache
         try {
             const newSetKey = `${PublicApiCacheRepository_1.NAMESPACE_PREFIX}:${randomBytes(4).toString("hex")}`;
             for (const item of data) {
-                // geo sorted set with vehicle ids (for quick lookup of vehicle ids in given area)
-                pipeline.geoadd(newSetKey, item.lng, item.lat, item.vehicle_id);
+                // geoadd requires numeric coordinates
+                if (item.lat !== null && item.lng !== null) {
+                    // geo sorted set with vehicle ids (for quick lookup of vehicle ids in given area)
+                    pipeline.geoadd(newSetKey, item.lng, item.lat, item.vehicle_id);
+                }
                 // list with vehicle ids for each trip (for quick lookup of vehicle ids for each trip)
                 pipeline.rpush(`${newSetKey}:trip-${item.gtfs_trip_id}`, item.vehicle_id);
                 pipeline.expire(`${newSetKey}:trip-${item.gtfs_trip_id}`, this.CACHE_TTL);

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicApiCacheRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"PublicApiCacheRepository.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicApiCacheRepository.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,8DAA8D,CAAC;AACvG,OAAO,EAAE,UAAU,EAAE,MAAM,4DAA4D,CAAC;AACxF,OAAO,iBAAiB,MAAM,6CAA6C,CAAC;AAC5E,MAAM,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC;AACjE,OAAO,oBAAoB,MAAM,gDAAgD,CAAC;AAClF,MAAM,EAAE,mBAAmB,EAAE,GAAG,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAGnC,IAAM,wBAAwB,gCAA9B,MAAM,wBAAyB,SAAQ,UAAU;IAIpD;QACI,KAAK,CACD,0BAA0B,EAC1B;YACI,wBAAwB,EAAE,KAAK;YAC/B,MAAM,EAAE,0BAAwB,CAAC,gBAAgB;SACpD,EACD,IAAI,mBAAmB,CAAC,0BAA0B,EAAE,uBAAuB,CAAC,CAC/E,CAAC;QAVW,cAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW;IAWhD,CAAC;IAEM,KAAK,CAAC,MAAM,CACf,IAA0B,EAC1B,UAAgC,EAChC,YAAkC;QAElC,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,SAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,YAAY,CAClB,qDAAqD,GAAG,CAAC,OAAO,EAAE,EAClE,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,GAAG,CACN,CAAC;QACN,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QAE5C,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,GAAG,0BAAwB,CAAC,gBAAgB,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAEnG,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;gBACtB,kFAAkF;gBAClF,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;gBAEhE,sFAAsF;gBACtF,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,SAAS,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC1E,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,SAAS,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBAE1E,0FAA0F;gBAC1F,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,YAAY,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACxG,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC7D,CAAC;YAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YACjE,CAAC;YAED,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEtB,OAAO,SAAS,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEhB,IAAI,GAAG,YAAY,oBAAoB,EAAE,CAAC;gBACtC,MAAM,GAAG,CAAC;YACd,CAAC;YAED,MAAM,IAAI,YAAY,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,UAAgC,EAAE,SAAiB,EAAE,QAA4B;QACxG,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,SAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,YAAY,CAClB,4DAA4D,GAAG,CAAC,OAAO,EAAE,EACzE,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,GAAG,CACN,CAAC;QACN,CAAC;QAED,IAAI,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC5B,uGAAuG;gBACvG,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,gBAAgB,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;gBACjF,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,gBAAgB,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBAEjF,0FAA0F;gBAC1F,QAAQ,CAAC,GAAG,CACR,GAAG,SAAS,mBAAmB,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,YAAY,EAAE,EACrE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EACpB,IAAI,EACJ,IAAI,CAAC,SAAS,CACjB,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,YAAY,CAAC,+CAA+C,EAAE,GAAG,CAAC,CAAC;QACjF,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,YAAkC,EAClC,SAAiB,EACjB,QAA4B;QAE5B,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,SAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,YAAY,CAClB,4DAA4D,GAAG,CAAC,OAAO,EAAE,EACzE,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,GAAG,CACN,CAAC;QACN,CAAC;QACD,IAAI,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBAC9B,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,mBAAmB,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACjH,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,YAAY,CAAC,iDAAiD,EAAE,GAAG,CAAC,CAAC;QACnF,CAAC;IACL,CAAC;;AAxHa,yCAAgB,GAAG,6BAA6B,AAAhC,CAAiC;AADtD,wBAAwB;IADpC,UAAU,EAAE;;GACA,wBAAwB,CA0HpC"}
+{"version":3,"file":"PublicApiCacheRepository.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicApiCacheRepository.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/TripRepositoryInterfaces.d.ts

@@ -75,8 +75,8 @@ export interface IEnrichedTripForPublicApi {
     provider_source_type: ProviderSourceTypeEnum;
     gtfs_route_short_name: string;
     cis_trip_number: number | null;
-    lat: string;
-    lng: string;
+    lat: string | null;
+    lng: string | null;
     bearing: number | null;
     delay: number | null;
     state_position: StatePositionEnum;

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/public-api/PublicCacheTripsFilter.js

@@ -15,15 +15,17 @@ export class PublicCacheTripsFilter {
                 continue;
             }
             const vehicleId = VehicleIdGenerator.getVehicleId(trip.gtfs_trip_id, trip.gtfs_route_type, trip.provider_source_type, trip.gtfs_route_short_name, trip.cis_trip_number, trip.vehicle_registration_number, trip.run_number, trip.internal_run_number);
+            // before_track(_delayed): may have null lat/lng, must never enter tripsByVehicleId (feeds geoadd)
+            if (trip.state_position === StatePositionEnum.BEFORE_TRACK ||
+                trip.state_position === StatePositionEnum.BEFORE_TRACK_DELAYED) {
+                futureTripsByTripAndVehicle.set(trip.gtfs_trip_id + vehicleId, trip);
+                continue;
+            }
             const knownTrip = tripsByVehicleId.get(vehicleId);
             if (knownTrip) {
                 if (trip.created_at < knownTrip.created_at) {
                     tripsByVehicleId.set(vehicleId, trip);
                 }
-                else if (trip.state_position === StatePositionEnum.BEFORE_TRACK ||
-                    trip.state_position === StatePositionEnum.BEFORE_TRACK_DELAYED) {
-                    futureTripsByTripAndVehicle.set(trip.gtfs_trip_id + vehicleId, trip);
-                }
             }
             else {
                 tripsByVehicleId.set(vehicleId, trip);

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/public-api/PublicCacheTripsFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PublicCacheTripsFilter.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/public-api/PublicCacheTripsFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kEAAkE,CAAC;AAEtG,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,OAAO,sBAAsB;IACxB,MAAM,CAAC,sBAAsB,CAAC,KAAkC;QAKnE,MAAM,aAAa,GAAgC,EAAE,CAAC;QACtD,MAAM,aAAa,GAAgC,EAAE,CAAC;QACtD,MAAM,WAAW,GAAgC,EAAE,CAAC;QACpD,MAAM,gBAAgB,GAA2C,IAAI,GAAG,EAAE,CAAC;QAC3E,MAAM,2BAA2B,GAA2C,IAAI,GAAG,EAAE,CAAC;QACtF,MAAM,qBAAqB,GAA2C,IAAI,GAAG,EAAE,CAAC;QAEhF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,IAAI,CAAC,cAAc,KAAK,iBAAiB,CAAC,QAAQ,EAAE,CAAC;gBACrD,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBACnD,SAAS;YACb,CAAC;YACD,MAAM,SAAS,GAAG,kBAAkB,CAAC,YAAY,CAC7C,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,2BAA2B,EAChC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,mBAAmB,CAC3B,CAAC;YAEF,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;oBACzC,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC1C,CAAC;qBAAM,IACH,IAAI,CAAC,cAAc,KAAK,iBAAiB,CAAC,YAAY;oBACtD,IAAI,CAAC,cAAc,KAAK,iBAAiB,CAAC,oBAAoB,EAChE,CAAC;oBACC,2BAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,SAAS,EAAE,IAAI,CAAC,CAAC;gBACzE,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3E,KAAK,MAAM,MAAM,IAAI,2BAA2B,CAAC,MAAM,EAAE;YAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpF,KAAK,MAAM,MAAM,IAAI,qBAAqB,CAAC,MAAM,EAAE;YAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACzD,CAAC;CACJ"}
+{"version":3,"file":"PublicCacheTripsFilter.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/public-api/PublicCacheTripsFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kEAAkE,CAAC;AAEtG,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,OAAO,sBAAsB;IACxB,MAAM,CAAC,sBAAsB,CAAC,KAAkC;QAKnE,MAAM,aAAa,GAAgC,EAAE,CAAC;QACtD,MAAM,aAAa,GAAgC,EAAE,CAAC;QACtD,MAAM,WAAW,GAAgC,EAAE,CAAC;QACpD,MAAM,gBAAgB,GAA2C,IAAI,GAAG,EAAE,CAAC;QAC3E,MAAM,2BAA2B,GAA2C,IAAI,GAAG,EAAE,CAAC;QACtF,MAAM,qBAAqB,GAA2C,IAAI,GAAG,EAAE,CAAC;QAEhF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,IAAI,CAAC,cAAc,KAAK,iBAAiB,CAAC,QAAQ,EAAE,CAAC;gBACrD,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBACnD,SAAS;YACb,CAAC;YACD,MAAM,SAAS,GAAG,kBAAkB,CAAC,YAAY,CAC7C,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,2BAA2B,EAChC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,mBAAmB,CAC3B,CAAC;YAEF,kGAAkG;YAClG,IACI,IAAI,CAAC,cAAc,KAAK,iBAAiB,CAAC,YAAY;gBACtD,IAAI,CAAC,cAAc,KAAK,iBAAiB,CAAC,oBAAoB,EAChE,CAAC;gBACC,2BAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,SAAS,EAAE,IAAI,CAAC,CAAC;gBACrE,SAAS;YACb,CAAC;YAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;oBACzC,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC1C,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3E,KAAK,MAAM,MAAM,IAAI,2BAA2B,CAAC,MAAM,EAAE;YAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpF,KAAK,MAAM,MAAM,IAAI,qBAAqB,CAAC,MAAM,EAAE;YAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACzD,CAAC;CACJ"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/trip-context/TripContextHelper.d.ts

@@ -65,4 +65,4 @@ export declare function setLastPositionDelay(context: IVPTripsLastPositionContex
  * Force-restamps the context for a propagated delay (mutation site #12): coordinates, forced state
  * transition to BEFORE_TRACK_DELAYED and the sticky before-track-delayed snapshot.
  */
-export declare function recordPropagatedDelay(context: IVPTripsLastPositionContext, lat: number | string, lng: number | string, delay: number, originTimestamp: Date): void;
+export declare function recordPropagatedDelay(context: IVPTripsLastPositionContext, lat: number | string | null, lng: number | string | null, delay: number, originTimestamp: Date): void;

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/trip-context/TripContextHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"TripContextHelper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/trip-context/TripContextHelper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAM/D;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAc;IACxC,OAAO;QACH,YAAY,EAAE;YACV,aAAa,EAAE,IAAI;YACnB,sBAAsB,EAAE,IAAI;YAC5B,kBAAkB,EAAE,IAAI;SAC3B;QACD,oBAAoB,EAAE;YAClB,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;SACxB;QACD,iBAAiB,EAAE,IAAI;QACvB,cAAc,EAAE,IAAI;QACpB,eAAe,EAAE,IAAI;QACrB,eAAe,EAAE,IAAI;QACrB,2BAA2B,EAAE,IAAI;QACjC,oBAAoB,EAAE,IAAI;QAC1B,oBAAoB,EAAE,IAAI;QAC1B,8BAA8B,EAAE,IAAI;QACpC,iBAAiB,EAAE,IAAI;QACvB,gBAAgB,EAAE,IAAI;QACtB,uBAAuB,EAAE,IAAI;QAC7B,MAAM;KACT,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAC/B,OAAoC,EACpC,QAAoC,EACpC,gBAAmC,EACnC,QAAiB;IAEjB,OAAO,CAAC,cAAc,GAAG,QAAQ,CAAC,EAAE,CAAC;IACrC,OAAO,CAAC,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC;IACvC,OAAO,CAAC,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC;IACvC,OAAO,CAAC,oBAAoB,GAAG,QAAQ,CAAC;IACxC,OAAO,CAAC,2BAA2B,GAAG,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAC1E,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,IAAI,IAAI,CAAC;IAEnG,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;AAC9D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC3B,OAAoC,EACpC,KAAwB,EACxB,OAAiC;IAEjC,MAAM,cAAc,GAAG,OAAO,EAAE,cAAc,IAAI,KAAK,CAAC;IAExD,IAAI,cAAc,IAAI,OAAO,CAAC,iBAAiB,KAAK,KAAK,EAAE,CAAC;QACxD,OAAO,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAClC,OAAO,CAAC,uBAAuB,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC/D,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAC1B,OAAoC,EACpC,QAAoC,EACpC,gBAA0C;IAE1C,IACI,gBAAgB,EAAE,cAAc,KAAK,iBAAiB,CAAC,OAAO;QAC9D,gBAAgB,EAAE,cAAc,KAAK,iBAAiB,CAAC,QAAQ;QAC/D,QAAQ,CAAC,cAAc,KAAK,iBAAiB,CAAC,OAAO;QACrD,QAAQ,CAAC,cAAc,KAAK,iBAAiB,CAAC,QAAQ,EACxD,CAAC;QACC,MAAM,cAAc,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,gBAAgB,EAAgC,CAAC;QAE1F,wFAAwF;QACxF,0FAA0F;QAC1F,mFAAmF;QACnF,EAAE;QACF,0FAA0F;QAC1F,4DAA4D;QAC5D,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,EAAE;YAChF,OAAO,EAAE,cAAc,CAAC,OAAO,IAAI,IAAI;YACvC,mBAAmB,EAAE,cAAc,CAAC,mBAAmB,IAAI,IAAI;YAC/D,SAAS,EAAE,cAAc,CAAC,SAAS,IAAI,IAAI;YAC3C,kBAAkB,EAAE,cAAc,CAAC,kBAAkB,IAAI,IAAI;YAC7D,YAAY,EAAE,cAAc,CAAC,YAAY,IAAI,IAAI;YACjD,sBAAsB,EAAE,cAAc,CAAC,sBAAsB,IAAI,IAAI;YACrE,wBAAwB,EAAE,cAAc,CAAC,wBAAwB,IAAI,IAAI;SAC5E,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CACpC,OAAoC,EACpC,QAAoC,EACpC,gBAA0C;IAE1C,IAAI,QAAQ,CAAC,cAAc,KAAK,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;QACrE,OAAO,CAAC,8BAA8B,GAAG;YACrC,KAAK,EAAE,gBAAgB,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK;YAChD,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,IAAI,QAAQ,CAAC,gBAAgB;SACpF,CAAC;IACN,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAC9B,OAAoC,EACpC,QAAoC,EACpC,gBAA0C;IAE1C,MAAM,mBAAmB,GAAG,gBAAgB;QACxC,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,KAAK,gBAAgB,CAAC,kBAAkB;QACnH,CAAC,CAAC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,KAAK,QAAQ,CAAC,kBAAkB,CAAC;IAExG,IAAI,mBAAmB,EAAE,CAAC;QACtB,OAAO,CAAC,YAAY,CAAC,aAAa,GAAG,gBAAgB;YACjD,CAAC,CAAC,gBAAgB,CAAC,kBAAmB;YACtC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAClC,OAAO,CAAC,YAAY,CAAC,sBAAsB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAClF,OAAO,CAAC,YAAY,CAAC,kBAAkB,GAAG,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC1G,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAoC;IAClE,OAAO,CAAC,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAoC;IACnE,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,IAAI,CAAC;IAClD,OAAO,CAAC,oBAAoB,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC7C,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,IAAI,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CACzC,OAAoC,EACpC,gBAA0C,EAC1C,QAAgD;IAEhD,IAAI,OAAO,CAAC,oBAAoB,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QACjD,OAAO,CAAC,oBAAoB,CAAC,QAAQ,GAAG,gBAAgB,EAAE,kBAAkB,IAAI,QAAQ,EAAE,kBAAkB,IAAI,IAAI,CAAC;IACzH,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAoC,EAAE,KAAgC;IAC1G,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,KAAsB,CAAC;AACxE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAoC,EAAE,KAAgC;IAC5G,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,KAAsB,CAAC;AAC1E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAChC,OAAoC,EACpC,gBAA0C,EAC1C,QAAoC;IAEpC,OAAO,CAAC,iBAAiB,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAkB,CAAC;AAC9G,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACjC,OAAoC,EACpC,GAAoB,EACpB,GAAoB,EACpB,KAAa,EACb,eAAqB;IAErB,kDAAkD;IAClD,OAAO,CAAC,eAAe,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1E,OAAO,CAAC,eAAe,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1E,eAAe,CAAC,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3F,OAAO,CAAC,8BAA8B,GAAG;QACrC,KAAK;QACL,gBAAgB,EAAE,eAAe;KACpC,CAAC;AACN,CAAC"}
+{"version":3,"file":"TripContextHelper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/trip-context/TripContextHelper.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/ITripPositionTuple.d.ts

@@ -5,6 +5,8 @@ export interface ITripPositionTuple {
         originTimestamp: Date;
         bearing: number;
         originId: string | null;
+        lat: number | null;
+        lng: number | null;
     };
     trip: IUpdateDelayRunTripsData;
 }

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/VPInterfaces.d.ts

@@ -106,6 +106,8 @@ export interface IPropagateDelay {
     currentEndTime: string;
     currentBearing: number;
     originPositionId: string | null;
+    currentLat: number | null;
+    currentLng: number | null;
 }
 export interface IVehiclePositionsSchedule {
     route_id: string;

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js

@@ -49,6 +49,8 @@ let PropagateDelayTask = class PropagateDelayTask extends AbstractPropagateDelay
                             originTimestamp: new Date(originUnixTimestamp),
                             bearing: batch.context.lastPositionTracking?.properties.bearing,
                             originId: batch.context.lastPositionId,
+                            lat: batch.context.lastPositionLat,
+                            lng: batch.context.lastPositionLng,
                         },
                         trip: trip,
                     });
@@ -60,6 +62,8 @@ let PropagateDelayTask = class PropagateDelayTask extends AbstractPropagateDelay
                             originTimestamp: new Date(originUnixTimestamp),
                             bearing: batch.context.lastPositionTracking?.properties.bearing,
                             originId: batch.context.lastPositionId,
+                            lat: batch.context.lastPositionLat,
+                            lng: batch.context.lastPositionLng,
                         },
                         trip: trip,
                     });
@@ -111,6 +115,8 @@ let PropagateDelayTask = class PropagateDelayTask extends AbstractPropagateDelay
                     currentStartTime: gtfsCurrentTrip.start_timestamp,
                     currentEndTime: gtfsCurrentTrip.end_timestamp,
                     currentBearing: delayedPositions.position.bearing,
+                    currentLat: delayedPositions.position.lat,
+                    currentLng: delayedPositions.position.lng,
                     nextGtfsTrips: gtfsNextTrips.map((trip) => {
                         return {
                             trip_id: trip.trip_id,

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js.map

@@ -1 +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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"}
+{"version":3,"file":"PropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.js

@@ -62,6 +62,8 @@ let PropagateTrainDelayTask = class PropagateTrainDelayTask extends AbstractProp
                     currentStartTime: start_timestamp,
                     currentEndTime: end_timestamp,
                     currentBearing: delayedPositions.position.bearing,
+                    currentLat: delayedPositions.position.lat,
+                    currentLng: delayedPositions.position.lng,
                     nextGtfsTrips: nextGtfsTripId
                         ? [
                             {

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"PropagateTrainDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PropagateTrainDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/abstract/AbstractPropagateDelayTask.js

@@ -52,8 +52,15 @@ let AbstractPropagateDelayTask = class AbstractPropagateDelayTask extends Abstra
                     }
                     delayInSeconds = Math.max(0, delayInSeconds - turnTimeAcc);
                 }
+                // prefer the fresh outgoing-vehicle coordinate; fall back to whatever this placeholder
+                // already carries from an earlier propagation rather than regressing a known value to null.
+                // lastPosition.lat/lng come back as strings for Sequelize DECIMAL columns despite the type.
+                const fallbackLat = data.currentLat ?? lastPosition.lat;
+                const fallbackLng = data.currentLng ?? lastPosition.lng;
+                const propagatedLat = typeof fallbackLat === "string" ? parseFloat(fallbackLat) : fallbackLat;
+                const propagatedLng = typeof fallbackLng === "string" ? parseFloat(fallbackLng) : fallbackLng;
                 const context = { ...(trip.last_position_context ?? TripContextHelper.createInitial(trip.id)) };
-                TripContextHelper.recordPropagatedDelay(context, lastPosition.lat, lastPosition.lng, delayInSeconds, lastPosition.origin_timestamp);
+                TripContextHelper.recordPropagatedDelay(context, propagatedLat, propagatedLng, delayInSeconds, lastPosition.origin_timestamp);
                 tripsToUpdate.set(trip.id, {
                     id: trip.id,
                     last_position_id: lastPosition.id,
@@ -67,6 +74,10 @@ let AbstractPropagateDelayTask = class AbstractPropagateDelayTask extends Abstra
                     origin_timestamp: lastPosition.origin_timestamp,
                     bearing: data.currentBearing,
                     origin_position_id: data.originPositionId,
+                    // always set, never omitted: bulkSave's upsert derives its updated-column list from
+                    // records[0] alone, so a heterogeneous key set across the batch would drop writes
+                    lat: propagatedLat,
+                    lng: propagatedLng,
                 });
             }
             await this.positionsRepository.bulkSave(positionsToUpdate);

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/abstract/AbstractPropagateDelayTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/abstract/AbstractPropagateDelayTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractPropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/abstract/AbstractPropagateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAG9E,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAG/E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,iBAAiB,MAAM,iDAAiD,CAAC;AAErF,IAAsB,0BAA0B,GAAhD,MAAsB,0BAA6C,SAAQ,YAAe;IAGtF,YAC6C,eAAmD,EAC9C,mBAA2D;QAEzG,KAAK,CAAC,WAAW,CAAC,CAAC;QAHyC,oBAAe,GAAf,eAAe,CAAiB;QAC3B,wBAAmB,GAAnB,mBAAmB,CAAqB;QAJ7F,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QAStD;;WAEG;QACO,8BAAyB,GAAG,KAAK,EAAE,IAAqB,EAAE,EAAE;YAClE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mCAAmC,CAAC,IAAI,CAAC,CAAC;YACnF,IAAI,CAAC,KAAK,CAAC,MAAM;gBAAE,OAAO;YAE1B,IAAI,aAAa,GAAG,IAAI,GAAG,EAAkC,CAAC;YAC9D,IAAI,iBAAiB,GAAiC,EAAE,CAAC;YACzD,IAAI,WAAW,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAgB,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;YAEnH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;gBACxC,MAAM,yBAAyB,GAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,IAAI,CAAC,YAAY,CAAC,EAAE,yBAAyB,IAAI,CAAC,CAAC;gBAElH,IAAI,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC;gBAEvC,oHAAoH;gBACpH,2DAA2D;gBAC3D,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,kBAAkB,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;oBACpG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;wBACV,WAAW,IAAI,yBAAyB,CAAC;oBAC7C,CAAC;yBAAM,CAAC;wBACJ,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;wBAClC,MAAM,cAAc,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,eAAgB,CAAC,CAAC,OAAO,EAAE,CAAC;wBACjE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,aAAc,CAAC,CAAC,OAAO,EAAE,CAAC;wBAErE,WAAW,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,GAAG,IAAI,GAAG,yBAAyB,CAAC;oBACtF,CAAC;oBAED,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,GAAG,WAAW,CAAC,CAAC;gBAC/D,CAAC;gBAED,uFAAuF;gBACvF,4FAA4F;gBAC5F,4FAA4F;gBAC5F,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,IAAI,YAAY,CAAC,GAAG,CAAC;gBACxD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,IAAI,YAAY,CAAC,GAAG,CAAC;gBACxD,MAAM,aAAa,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;gBAC9F,MAAM,aAAa,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;gBAE9F,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,qBAAqB,IAAI,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAChG,iBAAiB,CAAC,qBAAqB,CACnC,OAAO,EACP,aAAa,EACb,aAAa,EACb,cAAc,EACd,YAAY,CAAC,gBAAgB,CAChC,CAAC;gBAEF,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;oBACvB,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,gBAAgB,EAAE,YAAY,CAAC,EAAE;oBACjC,qBAAqB,EAAE,OAAO;iBACjC,CAAC,CAAC;gBAEH,iBAAiB,CAAC,IAAI,CAAC;oBACnB,EAAE,EAAE,YAAY,CAAC,EAAE;oBACnB,KAAK,EAAE,cAAc;oBACrB,cAAc,EAAE,iBAAiB,CAAC,oBAAoB;oBACtD,aAAa,EAAE,gBAAgB,CAAC,SAAS;oBACzC,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;oBAC/C,OAAO,EAAE,IAAI,CAAC,cAAc;oBAC5B,kBAAkB,EAAE,IAAI,CAAC,gBAAgB;oBACzC,oFAAoF;oBACpF,kFAAkF;oBAClF,GAAG,EAAE,aAAa;oBAClB,GAAG,EAAE,aAAa;iBACrB,CAAC,CAAC;YACP,CAAC;YAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAC3D,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC;IA7EF,CAAC;CA8EJ,CAAA;AAtFqB,0BAA0B;IAIvC,WAAA,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAA;IACvC,WAAA,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAA;+CAAyC,mBAAmB;GAL3F,0BAA0B,CAsF/C"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js

@@ -16,8 +16,8 @@ let PublicApiTripTransformation = class PublicApiTripTransformation extends Abst
                 gtfs_trip_id: data.gtfs_trip_id,
                 route_type: data.gtfs_route_type,
                 gtfs_route_short_name: data.gtfs_route_short_name,
-                lat: Number.parseFloat(data.lat),
-                lng: Number.parseFloat(data.lng),
+                lat: data.lat == null ? null : Number.parseFloat(data.lat),
+                lng: data.lng == null ? null : Number.parseFloat(data.lng),
                 bearing: data.bearing,
                 delay: data.delay,
                 state_position: data.state_position,

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"PublicApiTripTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qEAAqE,CAAC;AAC7G,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAO1E,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,sBAAiD;IAA3F;;QACI,SAAI,GAAG,6BAA6B,CAAC;QAElC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,OAAO;gBACH,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,UAAU,EAAE,IAAI,CAAC,eAAe;gBAChC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;gBACjD,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;gBAChC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;gBAChC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,UAAU,EAAE,kBAAkB,CAAC,YAAY,CACvC,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,2BAA2B,EAChC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,mBAAmB,CAC3B;gBACD,aAAa,EAAE;oBACX,wBAAwB,EAAE,IAAI,CAAC,qBAAqB;oBACpD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;oBACzC,QAAQ,EAAE,IAAI,CAAC,aAAa;oBAC5B,WAAW,EAAE,IAAI,CAAC,eAAe;oBACjC,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,aAAa,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,kBAAkB;oBACjE,YAAY,EAAE,IAAI,CAAC,iBAAiB;oBACpC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC;oBAC3G,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;oBAC3C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;oBACrD,mBAAmB,EAAE,IAAI,CAAC,2BAA2B;oBACrD,QAAQ,EAAE,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,qBAAqB;iBAChE;aACJ,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AAvCY,2BAA2B;IADvC,UAAU,EAAE;GACA,2BAA2B,CAuCvC"}
+{"version":3,"file":"PublicApiTripTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qEAAqE,CAAC;AAC7G,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAO1E,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,sBAAiD;IAA3F;;QACI,SAAI,GAAG,6BAA6B,CAAC;QAElC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,OAAO;gBACH,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,UAAU,EAAE,IAAI,CAAC,eAAe;gBAChC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;gBACjD,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1D,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1D,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,UAAU,EAAE,kBAAkB,CAAC,YAAY,CACvC,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,2BAA2B,EAChC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,mBAAmB,CAC3B;gBACD,aAAa,EAAE;oBACX,wBAAwB,EAAE,IAAI,CAAC,qBAAqB;oBACpD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;oBACzC,QAAQ,EAAE,IAAI,CAAC,aAAa;oBAC5B,WAAW,EAAE,IAAI,CAAC,eAAe;oBACjC,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,aAAa,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,kBAAkB;oBACjE,YAAY,EAAE,IAAI,CAAC,iBAAiB;oBACpC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC;oBAC3G,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;oBAC3C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;oBACrD,mBAAmB,EAAE,IAAI,CAAC,2BAA2B;oBACrD,QAAQ,EAAE,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,qBAAqB;iBAChE;aACJ,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AAvCY,2BAA2B;IADvC,UAAU,EAAE;GACA,2BAA2B,CAuCvC"}

package/dist/output-gateway/public/service/transformations/scopes/PublicVPTripInfoTransformation.d.ts

@@ -14,7 +14,7 @@ export declare class PublicVPTripInfoTransformation extends AbstractTransformati
         trip_headsign: string | null;
         geometry: {
             type: GeoCoordinatesType.Point;
-            coordinates: number[];
+            coordinates: (number | null)[];
         };
         shape_dist_traveled: number | null;
         bearing: number | null;

package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.d.ts

@@ -1,10 +1,5 @@
-import { TripWithLastPositionModel } from "#sch/vehicle-positions/models/views/index";
+import { TripWithLastPositionModel } from "#sch/vehicle-positions/models/views/TripWithLastPositionModel";
 import { type IGeoJSONFeature } from "@golemio/core/dist/output-gateway/Geo.js";
-type TripWithLastPositionModelWithCoords = TripWithLastPositionModel & {
-    lat: NonNullable<TripWithLastPositionModel["lat"]>;
-    lng: NonNullable<TripWithLastPositionModel["lng"]>;
-};
 export declare class PositionOutputMapper {
-    static mapTripModelToDto: (data: TripWithLastPositionModelWithCoords) => IGeoJSONFeature;
+    static mapTripModelToDto: (data: TripWithLastPositionModel) => IGeoJSONFeature;
 }
-export {};

package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.js

@@ -1,4 +1,4 @@
-import { buildGeojsonFeatureCollection, buildGeojsonFeatureLatLng, } from "@golemio/core/dist/output-gateway/Geo.js";
+import { GeoCoordinatesType, buildGeojsonFeatureType } from "@golemio/core/dist/output-gateway/Geo.js";
 export class PositionOutputMapper {
 }
 PositionOutputMapper.mapTripModelToDto = (data) => {
@@ -57,8 +57,12 @@ PositionOutputMapper.mapTripModelToDto = (data) => {
             usb_chargers: vehicle_descriptor?.has_usb_chargers ?? null,
         },
         ...(all_positions.length && {
-            all_positions: buildGeojsonFeatureCollection(all_positions.map((position) => {
-                return {
+            all_positions: {
+                features: all_positions.map((position) => buildGeojsonFeatureType("geometry", {
+                    geometry: {
+                        type: GeoCoordinatesType.Point,
+                        coordinates: [position.lng, position.lat],
+                    },
                     bearing: position.bearing,
                     delay: {
                         actual: position.delay,
@@ -72,8 +76,6 @@ PositionOutputMapper.mapTripModelToDto = (data) => {
                         id: position.last_stop_id,
                         sequence: position.last_stop_sequence,
                     },
-                    lat: position.lat,
-                    lng: position.lng,
                     next_stop: {
                         arrival_time: position.next_stop_arrival_time_isostring,
                         departure_time: position.next_stop_departure_time_isostring,
@@ -83,10 +85,18 @@ PositionOutputMapper.mapTripModelToDto = (data) => {
                     origin_timestamp: position.origin_timestamp_isostring,
                     shape_dist_traveled: position.shape_dist_traveled,
                     speed: position.speed,
-                };
-            }), "lng", "lat", true),
+                })),
+                type: "FeatureCollection",
+            },
         }),
     };
-    return buildGeojsonFeatureLatLng(tripObject, tripWithPosition.lng, tripWithPosition.lat);
+    return {
+        geometry: {
+            type: GeoCoordinatesType.Point,
+            coordinates: [tripWithPosition.lng, tripWithPosition.lat],
+        },
+        properties: tripObject,
+        type: "Feature",
+    };
 };
 //# sourceMappingURL=PositionOutputMapper.js.map

package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"PositionOutputMapper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PositionOutputMapper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js

@@ -143,9 +143,6 @@ let TripWithLastPositionRepository = class TripWithLastPositionRepository extend
                 if (!data) {
                     return null;
                 }
-                if (data.lat === null || data.lng === null) {
-                    throw new GeneralError("Missing lat or lng", this.constructor.name, undefined, 500, "pid");
-                }
                 return PositionOutputMapper.mapTripModelToDto(data);
             }
             catch (err) {
@@ -233,8 +230,10 @@ let TripWithLastPositionRepository = class TripWithLastPositionRepository extend
             as: "all_positions",
             foreignKey: "trips_id",
             scope: {
-                lat: { [Op.not]: null },
-                lng: { [Op.not]: null },
+                [Op.or]: [
+                    { state_position: { [Op.in]: [StatePositionEnum.BEFORE_TRACK, StatePositionEnum.BEFORE_TRACK_DELAYED] } },
+                    { lat: { [Op.not]: null }, lng: { [Op.not]: null } },
+                ],
             },
         });
         this.sequelizeModel.belongsTo(this.vehicleTypeRepository.sequelizeModel, {

package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"TripWithLastPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TripWithLastPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.ts"],"names":[],"mappings":"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"}

package/dist/schema-definitions/vehicle-positions/redis/interfaces/IPublicApiCacheDto.d.ts

@@ -4,8 +4,8 @@ export interface IPublicApiCacheDto {
     gtfs_trip_id: string;
     route_type: GTFSRouteTypeEnum;
     gtfs_route_short_name: string;
-    lat: number;
-    lng: number;
+    lat: number | null;
+    lng: number | null;
     bearing: number | null;
     delay: number | null;
     vehicle_id: string;

package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js

@@ -19,10 +19,26 @@ const publicApiCacheDtoSchema = {
             },
             state_position: { type: "string" },
             lat: {
-                type: "number",
+                oneOf: [
+                    {
+                        type: "number",
+                    },
+                    {
+                        type: "null",
+                        nullable: true,
+                    },
+                ],
             },
             lng: {
-                type: "number",
+                oneOf: [
+                    {
+                        type: "number",
+                    },
+                    {
+                        type: "null",
+                        nullable: true,
+                    },
+                ],
             },
             bearing: {
                 oneOf: [

package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"PublicApiCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PublicApiCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.ts"],"names":[],"mappings":"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"}

package/docs/openapi-output.yaml

@@ -706,7 +706,7 @@ paths:
                                         type: array
                                         items:
                                             allOf:
-                                                - $ref: "#/components/schemas/FeaturePoint"
+                                                - $ref: "#/components/schemas/NullableFeaturePoint"
                                                 - type: object
                                                   properties:
                                                     properties:
@@ -774,7 +774,7 @@ paths:
                         application/json:
                             schema:
                                 allOf:
-                                    - $ref: "#/components/schemas/FeaturePoint"
+                                    - $ref: "#/components/schemas/NullableFeaturePoint"
                                     - type: object
                                       properties:
                                           properties:
@@ -2652,6 +2652,19 @@ components:
                 type:
                     type: string
                     example: "Feature"
+
+        NullableFeaturePoint:
+            title: Nullable Feature Point
+            description: A GeoJSON Feature whose coordinates may be [null, null] when the vehicle's exact position is not yet known (e.g. a not-yet-tracked connecting trip)
+            type: object
+            properties:
+                geometry:
+                    $ref: "#/components/schemas/NullableGeometryPoint"
+                properties:
+                    type: object
+                type:
+                    type: string
+                    example: "Feature"
             required:
                 - geometry
                 - properties
@@ -2678,7 +2691,7 @@ components:
                             type: array
                             items:
                                 allOf:
-                                    - $ref: "#/components/schemas/FeaturePoint"
+                                    - $ref: "#/components/schemas/NullableFeaturePoint"
                                     - type: object
                                       properties:
                                           properties:
@@ -3451,7 +3464,7 @@ components:
                     nullable: true
                     example: "Bílá Hora"
                 geometry:
-                    $ref: "#/components/schemas/GeometryPoint"
+                    $ref: "#/components/schemas/NullableGeometryPoint"
                 shape_dist_traveled:
                     type: number
                     nullable: true
@@ -3760,6 +3773,22 @@ components:
                     enum:
                         - Point
 
+        NullableGeometryPoint:
+            type: object
+            description: GeoJson point whose coordinates may be [null, null] when the vehicle's exact position is not yet known (e.g. a not-yet-tracked connecting trip)
+            properties:
+                coordinates:
+                    type: array
+                    items:
+                        type: number
+                        nullable: true
+                    example: [14.441252, 50.109318]
+                    description: Point
+                type:
+                    type: string
+                    enum:
+                        - Point
+
         PublicDepartureGroup:
             type: array
             items:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/pid",
-    "version": "6.0.0-dev.2857220632",
+    "version": "6.0.0-dev.2868128022",
     "description": "Golemio PID Module",
     "type": "module",
     "main": "dist/index.js",
@@ -84,10 +84,10 @@
         "@apideck/portman": "1.29.3",
         "@commitlint/cli": "^11.0.0",
         "@commitlint/config-conventional": "^11.0.0",
-        "@golemio/cli": "1.11.2",
+        "@golemio/cli": "^2.0.0",
         "@golemio/core": "4.0.1",
         "@golemio/db-common": "1.2.2",
-        "@golemio/eslint-config": "1.1.4",
+        "@golemio/eslint-config": "^1.2.0",
         "@swc-node/register": "^1.12.1",
         "@swc/core": "^1.15.10",
         "@types/chai": "^5.2.3",
@@ -99,18 +99,20 @@
         "@types/supertest": "^2.0.10",
         "body-parser": "^1.20.3",
         "body-parser-xml": "^2.0.5",
+        "c8": "^12.0.0",
         "chai": "^6.2.2",
         "chai-as-promised": "^8.0.2",
         "cross-env": "^7.0.3",
-        "dependency-cruiser": "^17.3.3",
+        "dependency-cruiser": "^18.3.1",
         "dotenv": "^8.2.0",
         "eslint": "^8.1.1",
+        "eslint-config-prettier": "^7.2.0",
+        "eslint-plugin-prettier": "^4.2.5",
         "husky": "^4.3.7",
         "mocha": "^11.7.5",
         "npm-run-all": "^4.1.5",
-        "c8": "^12.0.0",
-        "prettier": "^2.5.1",
-        "pretty-quick": "^3.1.0",
+        "prettier": "^2.8.8",
+        "pretty-quick": "^3.3.1",
         "rimraf": "^3.0.2",
         "sinon": "^21.0.1",
         "supertest": "^7.1.4",