@golemio/fypr 1.8.1-dev.2638551106 → 1.8.1-dev.2640279443

package/db/example/06_information_panels_presets.sql

@@ -176,37 +176,38 @@ INSERT INTO fypr.information_panels_presets_routes (
     preset_id,
     stop_id,
     route_type,
-    route_short_name
+    route_short_name,
+    route_id
 ) VALUES
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '1'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '18'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '2'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '20'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '22'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '23'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '25'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '26'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '8'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '91'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '96'),
-    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '97'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '136'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '177'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '182'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '183'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '195'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '913'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '914'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '136'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '177'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '182'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '183'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '195'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '913'),
-    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '914'),
-    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z1P', 0, '16'),
-    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z1P', 0, '8'),
-    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z1P', 0, '94'),
-    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z2P', 0, '16'),
-    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z2P', 0, '8'),
-    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z2P', 0, '94');
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '1',   'L1'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '18',  'L18'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '2',   'L2'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '20',  'L20'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '22',  'L22'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '23',  'L23'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '25',  'L25'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '26',  'L26'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '8',   'L8'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '91',  'L91'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '96',  'L96'),
+    ('aaaaaaaa-0001-4000-8000-000000000001'::uuid, 'U163Z2P', 0, '97',  'L97'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '136', 'L136'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '177', 'L177'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '182', 'L182'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '183', 'L183'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '195', 'L195'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '913', 'L913'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z4P', 3, '914', 'L914'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '136', 'L136'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '177', 'L177'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '182', 'L182'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '183', 'L183'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '195', 'L195'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '913', 'L913'),
+    ('aaaaaaaa-0002-4000-8000-000000000002'::uuid, 'U134Z5P', 3, '914', 'L914'),
+    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z1P', 0, '16',  'L16'),
+    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z1P', 0, '8',   'L8'),
+    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z1P', 0, '94',  'L94'),
+    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z2P', 0, '16',  'L16'),
+    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z2P', 0, '8',   'L8'),
+    ('aaaaaaaa-0003-4000-8000-000000000003'::uuid, 'U134Z2P', 0, '94',  'L94');

package/db/migrations/postgresql/20260630135757-add-route-id-to-presets-routes.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, '20260630135757-add-route-id-to-presets-routes-up.sql');
+
+exports.down = (db) => runSql(db, '20260630135757-add-route-id-to-presets-routes-down.sql');
+
+exports._meta = { version: 1 };

package/db/migrations/postgresql/sqls/20260630135757-add-route-id-to-presets-routes-down.sql

@@ -0,0 +1,46 @@
+DROP VIEW IF EXISTS v_information_panels_for_mvt_with_routes;
+DROP VIEW IF EXISTS v_information_panels_presets_routes_agg;
+
+ALTER TABLE information_panels_presets_routes
+    DROP COLUMN route_id;
+
+CREATE OR REPLACE VIEW v_information_panels_presets_routes_agg AS
+    SELECT
+        p.information_panel_document_id,
+        p.route_name,
+        p.note,
+        COALESCE(
+            JSONB_AGG(
+                JSONB_BUILD_OBJECT(
+                    'stop_id',          r.stop_id,
+                    'route_type',       r.route_type,
+                    'route_short_name', r.route_short_name
+                )
+            ) FILTER (WHERE r.preset_id IS NOT NULL),
+            '[]'::jsonb
+        ) AS routes,
+        p.is_testing
+    FROM information_panels_presets p
+    INNER JOIN information_panels ip ON ip.document_id = p.information_panel_document_id
+    LEFT JOIN information_panels_presets_routes r ON r.preset_id = p.id
+    GROUP BY p.id;
+
+CREATE VIEW v_information_panels_for_mvt_with_routes AS
+SELECT
+    ip.id,
+    ip.preset,
+    ip.geometry,
+    concat_ws(' ', ip.name, ip.stop_name, STRING_AGG(p.note, ' ')) AS search_fields,
+    JSONB_AGG(JSONB_BUILD_OBJECT(
+        'route_name',       p.route_name,
+        'route_type',       r.route_type,
+        'route_short_name', r.route_short_name
+    )) AS routes
+FROM information_panels ip
+INNER JOIN information_panels_presets p
+    ON p.information_panel_document_id = ip.document_id AND NOT p.is_testing
+INNER JOIN information_panels_presets_routes r ON r.preset_id = p.id
+WHERE ip.state = 'Hotovo'
+  AND ip.geometry IS NOT NULL
+  AND ip.data_source = 'Golemio'
+GROUP BY ip.id;

package/db/migrations/postgresql/sqls/20260630135757-add-route-id-to-presets-routes-up.sql

@@ -0,0 +1,51 @@
+ALTER TABLE information_panels_presets_routes
+    ADD COLUMN route_id VARCHAR(50) NOT NULL DEFAULT '';
+
+ALTER TABLE information_panels_presets_routes
+    ALTER COLUMN route_id DROP DEFAULT;
+
+DROP VIEW IF EXISTS v_information_panels_for_mvt_with_routes;
+DROP VIEW IF EXISTS v_information_panels_presets_routes_agg;
+
+CREATE OR REPLACE VIEW v_information_panels_presets_routes_agg AS
+    SELECT
+        p.information_panel_document_id,
+        p.route_name,
+        p.note,
+        COALESCE(
+            JSONB_AGG(
+                JSONB_BUILD_OBJECT(
+                    'stop_id',          r.stop_id,
+                    'route_type',       r.route_type,
+                    'route_short_name', r.route_short_name,
+                    'route_id',         r.route_id
+                )
+            ) FILTER (WHERE r.preset_id IS NOT NULL),
+            '[]'::jsonb
+        ) AS routes,
+        p.is_testing
+    FROM information_panels_presets p
+    INNER JOIN information_panels ip ON ip.document_id = p.information_panel_document_id
+    LEFT JOIN information_panels_presets_routes r ON r.preset_id = p.id
+    GROUP BY p.id;
+
+CREATE VIEW v_information_panels_for_mvt_with_routes AS
+SELECT
+    ip.id,
+    ip.preset,
+    ip.geometry,
+    concat_ws(' ', ip.name, ip.stop_name, STRING_AGG(p.note, ' ')) AS search_fields,
+    JSONB_AGG(JSONB_BUILD_OBJECT(
+        'route_name',       p.route_name,
+        'route_type',       r.route_type,
+        'route_short_name', r.route_short_name,
+        'route_id',         r.route_id
+    )) AS routes
+FROM information_panels ip
+INNER JOIN information_panels_presets p
+    ON p.information_panel_document_id = ip.document_id AND NOT p.is_testing
+INNER JOIN information_panels_presets_routes r ON r.preset_id = p.id
+WHERE ip.state = 'Hotovo'
+  AND ip.geometry IS NOT NULL
+  AND ip.data_source = 'Golemio'
+GROUP BY ip.id;

package/dist/integration-engine/workers/tasks/UpdatePresetsTask.js

@@ -61,6 +61,7 @@ let UpdatePresetsTask = class UpdatePresetsTask extends integration_engine_1.Abs
                             stop_id: stopRoutes.stop_id,
                             route_type: route.type,
                             route_short_name: route.name,
+                            route_id: route.id,
                         });
                     }
                 }

package/dist/integration-engine/workers/tasks/UpdatePresetsTask.js.map

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

package/dist/schema-definitions/data-sources/GolemioPresetsJSONSchema.js

@@ -27,9 +27,9 @@ exports.golemioPresetsJSONSchema = {
                                 properties: {
                                     type: { type: "integer" },
                                     name: { type: "string" },
+                                    id: { type: "string" },
                                 },
-                                required: ["type", "name"],
-                                additionalProperties: false,
+                                required: ["type", "name", "id"],
                             },
                         },
                     },

package/dist/schema-definitions/data-sources/GolemioPresetsJSONSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"GolemioPresetsJSONSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/data-sources/GolemioPresetsJSONSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,wBAAwB,GAA8C;IAC/E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,KAAK,EAAE;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC5B;YACD,YAAY,EAAE;gBACV,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBAC3B,MAAM,EAAE;4BACJ,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE;gCACH,IAAI,EAAE,QAAQ;gCACd,UAAU,EAAE;oCACR,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oCACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iCAC3B;gCACD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gCAC1B,oBAAoB,EAAE,KAAK;6BAC9B;yBACJ;qBACJ;oBACD,QAAQ,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;oBAC/B,oBAAoB,EAAE,KAAK;iBAC9B;aACJ;SACJ;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC;QACvD,oBAAoB,EAAE,KAAK;KAC9B;CACJ,CAAC"}
+{"version":3,"file":"GolemioPresetsJSONSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/data-sources/GolemioPresetsJSONSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,wBAAwB,GAA8C;IAC/E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,KAAK,EAAE;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC5B;YACD,YAAY,EAAE;gBACV,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBAC3B,MAAM,EAAE;4BACJ,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE;gCACH,IAAI,EAAE,QAAQ;gCACd,UAAU,EAAE;oCACR,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oCACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oCACxB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iCACzB;gCACD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC;6BACnC;yBACJ;qBACJ;oBACD,QAAQ,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;oBAC/B,oBAAoB,EAAE,KAAK;iBAC9B;aACJ;SACJ;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC;QACvD,oBAAoB,EAAE,KAAK;KAC9B;CACJ,CAAC"}

package/dist/schema-definitions/data-sources/interfaces/IGolemioPresetsResponse.d.ts

@@ -1,6 +1,7 @@
 export interface IGolemioPresetsResponseRoute {
     type: number;
     name: string;
+    id: string;
 }
 export interface IGolemioPresetsResponseStopRoutes {
     stop_id: string;

package/dist/schema-definitions/models/InformationPanelPresetsRoutesModel.d.ts

@@ -7,6 +7,7 @@ export declare class InformationPanelPresetsRoutesModel extends Model<InferAttri
     stop_id: string;
     route_type: number;
     route_short_name: string;
+    route_id: string;
     created_at: CreationOptional<Date>;
     updated_at: CreationOptional<Date>;
     static readonly attributeModel: ModelAttributes<InformationPanelPresetsRoutesModel>;

package/dist/schema-definitions/models/InformationPanelPresetsRoutesModel.js

@@ -30,6 +30,10 @@ InformationPanelPresetsRoutesModel.attributeModel = {
         allowNull: false,
         type: sequelize_1.DataTypes.STRING(50),
     },
+    route_id: {
+        allowNull: false,
+        type: sequelize_1.DataTypes.STRING(50),
+    },
     created_at: { type: sequelize_1.DataTypes.DATE, allowNull: false },
     updated_at: { type: sequelize_1.DataTypes.DATE, allowNull: false },
 };
@@ -42,8 +46,9 @@ InformationPanelPresetsRoutesModel.jsonSchema = {
             stop_id: { type: "string" },
             route_type: { type: "number" },
             route_short_name: { type: "string" },
+            route_id: { type: "string" },
         },
-        required: ["preset_id", "stop_id", "route_type", "route_short_name"],
+        required: ["preset_id", "stop_id", "route_type", "route_short_name", "route_id"],
         additionalProperties: false,
     },
 };

package/dist/schema-definitions/models/InformationPanelPresetsRoutesModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"InformationPanelPresetsRoutesModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/InformationPanelPresetsRoutesModel.ts"],"names":[],"mappings":";;;AACA,mEAO6C;AAI7C,MAAa,kCACT,SAAQ,iBAGP;IAqCM,MAAM,CAAC,mBAAmB;QAC7B,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;;AA3CL,gFA2DC;AApD0B,4CAAS,GAAG,mCAAmC,CAAC;AAShD,iDAAc,GAAwD;IACzF,SAAS,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,OAAO,EAAE;QACL,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,UAAU,EAAE;QACR,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,QAAQ;KAC3B;IACD,gBAAgB,EAAE;QACd,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,UAAU,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE;IACtD,UAAU,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE;CACzD,CAAC;AAMqB,6CAAU,GAAmD;IAChF,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACvC;QACD,QAAQ,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,kBAAkB,CAAC;QACpE,oBAAoB,EAAE,KAAK;KAC9B;CACJ,CAAC"}
+{"version":3,"file":"InformationPanelPresetsRoutesModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/InformationPanelPresetsRoutesModel.ts"],"names":[],"mappings":";;;AACA,mEAO6C;AAI7C,MAAa,kCACT,SAAQ,iBAGP;IA0CM,MAAM,CAAC,mBAAmB;QAC7B,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;;AAhDL,gFAiEC;AA1D0B,4CAAS,GAAG,mCAAmC,CAAC;AAUhD,iDAAc,GAAwD;IACzF,SAAS,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,OAAO,EAAE;QACL,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,UAAU,EAAE;QACR,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,QAAQ;KAC3B;IACD,gBAAgB,EAAE;QACd,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,QAAQ,EAAE;QACN,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,UAAU,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE;IACtD,UAAU,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE;CACzD,CAAC;AAMqB,6CAAU,GAAmD;IAChF,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACpC,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC/B;QACD,QAAQ,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,kBAAkB,EAAE,UAAU,CAAC;QAChF,oBAAoB,EAAE,KAAK;KAC9B;CACJ,CAAC"}

package/dist/schema-definitions/models/interfaces/IInformationPanelPresetRoute.d.ts

@@ -3,4 +3,5 @@ export interface IInformationPanelPresetRoute {
     stop_id: string;
     route_type: number;
     route_short_name: string;
+    route_id: string;
 }

package/dist/schema-definitions/models/interfaces/IPresetRouteAgg.d.ts

@@ -2,4 +2,5 @@ export interface IPresetRouteAgg {
     stop_id: string;
     route_type: number;
     route_short_name: string;
+    route_id: string;
 }

package/docs/openapi-output.yaml

@@ -1170,6 +1170,7 @@ components:
                                         - stop_id
                                         - route_type
                                         - route_short_name
+                                        - route_id
                                     properties:
                                         stop_id:
                                             type: string
@@ -1185,6 +1186,12 @@ components:
                                             type: string
                                             example: "22"
                                             description: Short name of the route.
+                                        route_id:
+                                            type: string
+                                            example: "L22"
+                                            description: >-
+                                                GTFS route identifier (e.g. L22 for tram 22,
+                                                L991 for metro A, L992 for metro B).
 
         InformationPanelBase:
             description: >-

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/fypr",
-    "version": "1.8.1-dev.2638551106",
+    "version": "1.8.1-dev.2640279443",
     "description": "Golemio FYPR Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",