@golemio/pid 3.9.5-dev.1738105452 → 3.9.5-dev.1740291889

package/db/migrations/postgresql/sqls/20250320145302-create-get-stops-by-asw-fnc-down.sql

@@ -1 +1 @@
-DROP function get_ropidgtfs_stops_by_asw(int, int)
+DROP function get_ropidgtfs_stops_by_asw(int, varchar)

package/db/migrations/postgresql/sqls/20250320145302-create-get-stops-by-asw-fnc-up.sql

@@ -1,4 +1,4 @@
-CREATE OR REPLACE FUNCTION get_ropidgtfs_stops_by_asw(aswnodeid INT, aswstopid INT)
+CREATE OR REPLACE FUNCTION get_ropidgtfs_stops_by_asw(aswnodeid INT, platformcode varchar)
 RETURNS TEXT AS $$
 DECLARE
     stop_ids TEXT;
@@ -6,7 +6,7 @@ BEGIN
     SELECT STRING_AGG(stop_id::TEXT, ', ') INTO stop_ids
     FROM ropidgtfs_stops
     WHERE asw_node_id = aswnodeid
-      AND asw_stop_id = aswstopid;
+      AND platform_code = platformcode;
     
     RETURN stop_ids;
 END;

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

@@ -50,7 +50,7 @@ class RawQueryProvider {
             LEFT JOIN ropidgtfs_precomputed_minmax_stop_sequences 
                 ON ropidgtfs_trips.trip_id = ropidgtfs_precomputed_minmax_stop_sequences.trip_id
             WHERE ropidgtfs_routes.route_short_name LIKE :cisLineShortName
-                AND ropidgtfs_stop_times.stop_id = ANY(STRING_TO_ARRAY(get_ropidgtfs_stops_by_asw(:startAswNodeID, :startAswStopId), ','))    
+                AND ropidgtfs_stop_times.stop_id = ANY(STRING_TO_ARRAY(get_ropidgtfs_stops_by_asw(:startAswNodeID, :startCisStopPlatformCode), ','))    
                 AND stop_sequence = '1'
                 AND normalize_departure_time(ropidgtfs_stop_times.departure_time) = TO_CHAR(
                     (:startDateFormatted at time zone 'Europe/Prague'), 'FMHH24:MI:SS'

package/dist/output-gateway/public/service/helpers/trip-scope/strategy/VehicleDescriptorTripScopeHandler.d.ts

@@ -7,4 +7,6 @@ export declare class VehicleDescriptorTripScopeHandler extends AbstractDetailedT
     private vehicleDescriptorTransformation;
     constructor(vehicleDescriptorRepository: VehicleDescriptorCachedRepository);
     handle(output: IPublicApiDetailedTrip, vehiclePosition: IPublicApiCacheDto): Promise<IPublicApiDetailedTrip>;
+    private getVehicleType;
+    private getAprilVehicleType;
 }

package/dist/output-gateway/public/service/helpers/trip-scope/strategy/VehicleDescriptorTripScopeHandler.js

@@ -13,6 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VehicleDescriptorTripScopeHandler = void 0;
+const RouteTypeEnums_1 = require("../../../../../../helpers/RouteTypeEnums");
 const VehicleDescriptorCachedRepository_1 = require("../../../../data-access/VehicleDescriptorCachedRepository");
 const OgModuleToken_1 = require("../../../../ioc/OgModuleToken");
 const PublicVPVehicleDescriptorTransformation_1 = require("../../../transformations/scopes/PublicVPVehicleDescriptorTransformation");
@@ -35,13 +36,84 @@ let VehicleDescriptorTripScopeHandler = exports.VehicleDescriptorTripScopeHandle
             }
             output.vehicle_descriptor = {
                 ...output.vehicle_descriptor,
-                vehicle_type: `${descriptor.manufacturer} ${descriptor.type}`,
+                vehicle_type: this.getVehicleType(descriptor, vehiclePosition),
                 is_air_conditioned: descriptor.is_air_conditioned,
                 has_usb_chargers: descriptor.has_usb_chargers,
             };
         }
         return output;
     }
+    getVehicleType(descriptor, vehiclePosition) {
+        const date = new Date();
+        // getMonth() returns 0-based index, unlike getDate()
+        if (date.getDate() === 1 && date.getMonth() === 3) {
+            return this.getAprilVehicleType(descriptor, vehiclePosition);
+        }
+        return `${descriptor.manufacturer} ${descriptor.type}`;
+    }
+    getAprilVehicleType(descriptor, vehiclePosition) {
+        switch (vehiclePosition.route_type) {
+            case RouteTypeEnums_1.GTFSRouteTypeEnum.TRAM:
+                switch (descriptor.type) {
+                    case "T3R.P":
+                    case "T3R.PLF":
+                    case "T3R.PV":
+                    case "T3M.2":
+                        return "Mašinka Tomáš";
+                    case "KT8D5.RN2P":
+                        return "Orient Express";
+                    case "14T":
+                        return "Polární expres";
+                    case "15T1":
+                    case "15T2":
+                    case "15T3":
+                    case "15T4":
+                    case "15T5":
+                    case "15T6":
+                    case "15T7":
+                        return "Snowpiercer";
+                    default:
+                        return "Trainy McTrainface";
+                }
+            case RouteTypeEnums_1.GTFSRouteTypeEnum.METRO:
+            case RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN:
+                return "Trainy McTrainface";
+            case RouteTypeEnums_1.GTFSRouteTypeEnum.BUS:
+                switch (descriptor.manufacturer) {
+                    case "Iveco":
+                        return "Batmobile";
+                    case "SOR":
+                        return "Ectomobile";
+                    case "Setra":
+                        return "KITT";
+                    case "Otokar":
+                        return "Formule";
+                    case "Irisbus":
+                        return "DeLorean time machine";
+                    case "Scania":
+                        return "Mr. Slowly";
+                    case "MAN":
+                        return "Tatra T815 aka The War Rig";
+                    case "Solaris":
+                        return "Citroën DS Fantomas";
+                    case "ROŠERO - P":
+                        return "The Mystery Machine";
+                    default:
+                        return "Bussy McBusface";
+                }
+            case RouteTypeEnums_1.GTFSRouteTypeEnum.FERRY:
+                return "RMS Titanic";
+            case RouteTypeEnums_1.GTFSRouteTypeEnum.TROLLEYBUS:
+                switch (descriptor.manufacturer) {
+                    case "Škoda-Solaris":
+                        return "Lightning McQueen";
+                    default:
+                        return "Bussy McBusface";
+                }
+            default:
+                return `${descriptor.manufacturer} ${descriptor.type}`;
+        }
+    }
 };
 exports.VehicleDescriptorTripScopeHandler = VehicleDescriptorTripScopeHandler = __decorate([
     (0, tsyringe_1.injectable)(),

package/dist/output-gateway/public/service/helpers/trip-scope/strategy/VehicleDescriptorTripScopeHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"VehicleDescriptorTripScopeHandler.js","sourceRoot":"","sources":["../../../../../../../src/output-gateway/public/service/helpers/trip-scope/strategy/VehicleDescriptorTripScopeHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iHAA6G;AAE7G,iEAA6D;AAC7D,qIAA4I;AAE5I,iEAAwE;AACxE,yFAAsF;AAG/E,IAAM,iCAAiC,+CAAvC,MAAM,iCAAkC,SAAQ,mEAAgC;IAGnF,YAEY,2BAA8D;QAEtE,KAAK,EAAE,CAAC;QAFA,gCAA2B,GAA3B,2BAA2B,CAAmC;QAGtE,IAAI,CAAC,+BAA+B,GAAG,IAAI,iFAAuC,EAAE,CAAC;IACzF,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAA8B,EAAE,eAAmC;QACnF,MAAM,CAAC,kBAAkB,GAAG,IAAI,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;QAEnG,MAAM,kBAAkB,GAAG,eAAe,CAAC,aAAa,CAAC,mBAAmB,CAAC;QAC7E,IAAI,kBAAkB,EAAE;YACpB,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC;YAC7C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;YAE3G,IAAI,CAAC,UAAU,EAAE;gBACb,OAAO,MAAM,CAAC;aACjB;YAED,MAAM,CAAC,kBAAkB,GAAG;gBACxB,GAAG,MAAM,CAAC,kBAAkB;gBAC5B,YAAY,EAAE,GAAG,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,IAAI,EAAE;gBAC7D,kBAAkB,EAAE,UAAU,CAAC,kBAAkB;gBACjD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;aAChD,CAAC;SACL;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;4CAjCY,iCAAiC;IAD7C,IAAA,qBAAU,GAAE;IAKJ,WAAA,IAAA,iBAAM,EAAC,6BAAa,CAAC,iCAAiC,CAAC,CAAA;qCACnB,qEAAiC;GALjE,iCAAiC,CAiC7C"}
+{"version":3,"file":"VehicleDescriptorTripScopeHandler.js","sourceRoot":"","sources":["../../../../../../../src/output-gateway/public/service/helpers/trip-scope/strategy/VehicleDescriptorTripScopeHandler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/pid",
-    "version": "3.9.5-dev.1738105452",
+    "version": "3.9.5-dev.1740291889",
     "description": "Golemio PID Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",