npm - @golemio/public-transport - Versions diffs - 0.1.0-dev.2922113447 → 0.1.0-dev.2927028941 - Mend

@golemio/public-transport 0.1.0-dev.2922113447 → 0.1.0-dev.2927028941

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.

Files changed (32) hide show

package/db/migrations/postgresql/20261008120000-add-get-feed-departures.js ADDED Viewed

@@ -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', '20261008120000-add-get-feed-departures-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', '20261008120000-add-get-feed-departures-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/sqls/20261008120000-add-get-feed-departures-down.sql ADDED Viewed

@@ -0,0 +1,76 @@
+DROP FUNCTION public_transport.get_feed_departures(integer, character varying, integer, timestamp with time zone, timestamp with time zone, integer, timestamp with time zone, timestamp with time zone, integer);
+-- CREATE OR REPLACE VIEW cannot drop a column
+DROP VIEW public_transport.v_vehiclepositions_trip_position_vehicle_info;
+CREATE VIEW public_transport.v_vehiclepositions_trip_position_vehicle_info AS
+ SELECT "trip->last_position".delay AS delay_seconds,
+    trip.wheelchair_accessible AS real_wheelchair_accessible,
+    "trip->last_position".is_canceled,
+    trip.agency_name_real AS "trip.agency_name_real",
+    trip.agency_name_scheduled AS "trip.agency_name_scheduled",
+    trip.cis_line_id AS "trip.cis_line_id",
+    trip.cis_line_short_name AS "trip.cis_line_short_name",
+    trip.cis_trip_number AS "trip.cis_trip_number",
+    trip.gtfs_block_id AS "trip.gtfs_block_id",
+    trip.gtfs_route_id AS "trip.gtfs_route_id",
+    trip.gtfs_route_short_name AS "trip.gtfs_route_short_name",
+    trip.gtfs_route_type AS "trip.gtfs_route_type",
+    trip.gtfs_trip_headsign AS "trip.gtfs_trip_headsign",
+    trip.gtfs_trip_short_name AS "trip.gtfs_trip_short_name",
+    trip.gtfs_trip_id AS "trip.gtfs_trip_id",
+    trip.gtfs_date AS "trip.gtfs_date",
+    trip.id AS "trip.id",
+    trip.is_canceled AS "trip.is_canceled",
+    trip.last_position_id AS "trip.last_position_id",
+    trip.origin_route_name AS "trip.origin_route_name",
+    trip.run_number AS "trip.run_number",
+    trip.start_asw_stop_id AS "trip.start_asw_stop_id",
+    trip.start_cis_stop_id AS "trip.start_cis_stop_id",
+    trip.start_cis_stop_platform_code AS "trip.start_cis_stop_platform_code",
+    trip.start_time AS "trip.start_time",
+    trip.start_timestamp AS "trip.start_timestamp",
+    trip.end_timestamp AS "trip.end_timestamp",
+    trip.vehicle_registration_number AS "trip.vehicle_registration_number",
+    trip.vehicle_type_id AS "trip.vehicle_type_id",
+    trip.wheelchair_accessible AS "trip.wheelchair_accessible",
+    trip.internal_route_name AS "trip.internal_route_name",
+    trip.internal_run_number AS "trip.internal_run_number",
+    "trip->last_position".asw_last_stop_id AS "trip.last_position.asw_last_stop_id",
+    "trip->last_position".bearing AS "trip.last_position.bearing",
+    "trip->last_position".cis_last_stop_id AS "trip.last_position.cis_last_stop_id",
+    "trip->last_position".cis_last_stop_sequence AS "trip.last_position.cis_last_stop_sequence",
+    "trip->last_position".delay AS "trip.last_position.delay",
+    "trip->last_position".delay_stop_arrival AS "trip.last_position.delay_stop_arrival",
+    "trip->last_position".delay_stop_departure AS "trip.last_position.delay_stop_departure",
+    "trip->last_position".id AS "trip.last_position.id",
+    "trip->last_position".is_canceled AS "trip.last_position.is_canceled",
+    "trip->last_position".last_stop_arrival_time AS "trip.last_position.last_stop_arrival_time",
+    "trip->last_position".last_stop_departure_time AS "trip.last_position.last_stop_departure_time",
+    "trip->last_position".last_stop_id AS "trip.last_position.last_stop_id",
+    "trip->last_position".last_stop_sequence AS "trip.last_position.last_stop_sequence",
+    "trip->last_position".lat AS "trip.last_position.lat",
+    "trip->last_position".lng AS "trip.last_position.lng",
+    "trip->last_position".next_stop_arrival_time AS "trip.last_position.next_stop_arrival_time",
+    "trip->last_position".next_stop_departure_time AS "trip.last_position.next_stop_departure_time",
+    "trip->last_position".next_stop_id AS "trip.last_position.next_stop_id",
+    "trip->last_position".next_stop_sequence AS "trip.last_position.next_stop_sequence",
+    "trip->last_position".origin_time AS "trip.last_position.origin_time",
+    "trip->last_position".origin_timestamp AS "trip.last_position.origin_timestamp",
+    "trip->last_position".shape_dist_traveled AS "trip.last_position.shape_dist_traveled",
+    "trip->last_position".speed AS "trip.last_position.speed",
+    "trip->last_position".state_position AS "trip.last_position.state_position",
+    "trip->last_position".state_process AS "trip.last_position.state_process",
+    "trip->last_position".this_stop_id AS "trip.last_position.this_stop_id",
+    "trip->last_position".this_stop_sequence AS "trip.last_position.this_stop_sequence",
+    "trip->last_position".is_tracked AS "trip.last_position.is_tracked",
+    "trip->last_position".trips_id AS "trip.last_position.trips_id",
+    "trip->last_position".tcp_event AS "trip.last_position.tcp_event",
+    "trip->last_position".last_stop_headsign AS "trip.last_position.last_stop_headsign",
+    "trip->last_position".last_stop_name AS "trip.last_position.last_stop_name",
+    "trip->last_position".valid_to AS "trip.last_position.valid_to",
+    "trip->last_position".scheduled_timestamp AS "trip.last_position.scheduled_timestamp",
+    "trip->vehicle_descriptor".id AS "trip.vehicle_descriptor.id",
+    "trip->vehicle_descriptor".is_air_conditioned AS "trip.vehicle_descriptor.is_air_conditioned"
+   FROM ((public_transport.vehiclepositions_trips trip
+     JOIN public_transport.vehiclepositions_positions "trip->last_position" ON (((trip.last_position_id = "trip->last_position".id) AND (("trip->last_position".valid_to IS NULL) OR ("trip->last_position".valid_to >= CURRENT_TIMESTAMP) OR (("trip->last_position".state_position)::text = ANY ((ARRAY['after_track'::character varying, 'after_track_delayed'::character varying])::text[]))) AND (("trip->last_position".state_position)::text = ANY ((ARRAY['at_stop'::character varying, 'before_track'::character varying, 'before_track_delayed'::character varying, 'canceled'::character varying, 'off_track'::character varying, 'on_track'::character varying, 'after_track'::character varying, 'after_track_delayed'::character varying])::text[])))))
+     LEFT JOIN public_transport.vehiclepositions_vehicle_descriptors "trip->vehicle_descriptor" ON (((trip.vehicle_registration_number = "trip->vehicle_descriptor".registration_number) AND (trip.gtfs_route_type = "trip->vehicle_descriptor".gtfs_route_type))));

package/db/migrations/postgresql/sqls/20261008120000-add-get-feed-departures-up.sql ADDED Viewed

@@ -0,0 +1,236 @@
+-- trip.feed_id lets feed-scoped functions join vehicle positions without matching a same-named trip of another feed
+CREATE OR REPLACE VIEW public_transport.v_vehiclepositions_trip_position_vehicle_info AS
+ SELECT "trip->last_position".delay AS delay_seconds,
+    trip.wheelchair_accessible AS real_wheelchair_accessible,
+    "trip->last_position".is_canceled,
+    trip.agency_name_real AS "trip.agency_name_real",
+    trip.agency_name_scheduled AS "trip.agency_name_scheduled",
+    trip.cis_line_id AS "trip.cis_line_id",
+    trip.cis_line_short_name AS "trip.cis_line_short_name",
+    trip.cis_trip_number AS "trip.cis_trip_number",
+    trip.gtfs_block_id AS "trip.gtfs_block_id",
+    trip.gtfs_route_id AS "trip.gtfs_route_id",
+    trip.gtfs_route_short_name AS "trip.gtfs_route_short_name",
+    trip.gtfs_route_type AS "trip.gtfs_route_type",
+    trip.gtfs_trip_headsign AS "trip.gtfs_trip_headsign",
+    trip.gtfs_trip_short_name AS "trip.gtfs_trip_short_name",
+    trip.gtfs_trip_id AS "trip.gtfs_trip_id",
+    trip.gtfs_date AS "trip.gtfs_date",
+    trip.id AS "trip.id",
+    trip.is_canceled AS "trip.is_canceled",
+    trip.last_position_id AS "trip.last_position_id",
+    trip.origin_route_name AS "trip.origin_route_name",
+    trip.run_number AS "trip.run_number",
+    trip.start_asw_stop_id AS "trip.start_asw_stop_id",
+    trip.start_cis_stop_id AS "trip.start_cis_stop_id",
+    trip.start_cis_stop_platform_code AS "trip.start_cis_stop_platform_code",
+    trip.start_time AS "trip.start_time",
+    trip.start_timestamp AS "trip.start_timestamp",
+    trip.end_timestamp AS "trip.end_timestamp",
+    trip.vehicle_registration_number AS "trip.vehicle_registration_number",
+    trip.vehicle_type_id AS "trip.vehicle_type_id",
+    trip.wheelchair_accessible AS "trip.wheelchair_accessible",
+    trip.internal_route_name AS "trip.internal_route_name",
+    trip.internal_run_number AS "trip.internal_run_number",
+    "trip->last_position".asw_last_stop_id AS "trip.last_position.asw_last_stop_id",
+    "trip->last_position".bearing AS "trip.last_position.bearing",
+    "trip->last_position".cis_last_stop_id AS "trip.last_position.cis_last_stop_id",
+    "trip->last_position".cis_last_stop_sequence AS "trip.last_position.cis_last_stop_sequence",
+    "trip->last_position".delay AS "trip.last_position.delay",
+    "trip->last_position".delay_stop_arrival AS "trip.last_position.delay_stop_arrival",
+    "trip->last_position".delay_stop_departure AS "trip.last_position.delay_stop_departure",
+    "trip->last_position".id AS "trip.last_position.id",
+    "trip->last_position".is_canceled AS "trip.last_position.is_canceled",
+    "trip->last_position".last_stop_arrival_time AS "trip.last_position.last_stop_arrival_time",
+    "trip->last_position".last_stop_departure_time AS "trip.last_position.last_stop_departure_time",
+    "trip->last_position".last_stop_id AS "trip.last_position.last_stop_id",
+    "trip->last_position".last_stop_sequence AS "trip.last_position.last_stop_sequence",
+    "trip->last_position".lat AS "trip.last_position.lat",
+    "trip->last_position".lng AS "trip.last_position.lng",
+    "trip->last_position".next_stop_arrival_time AS "trip.last_position.next_stop_arrival_time",
+    "trip->last_position".next_stop_departure_time AS "trip.last_position.next_stop_departure_time",
+    "trip->last_position".next_stop_id AS "trip.last_position.next_stop_id",
+    "trip->last_position".next_stop_sequence AS "trip.last_position.next_stop_sequence",
+    "trip->last_position".origin_time AS "trip.last_position.origin_time",
+    "trip->last_position".origin_timestamp AS "trip.last_position.origin_timestamp",
+    "trip->last_position".shape_dist_traveled AS "trip.last_position.shape_dist_traveled",
+    "trip->last_position".speed AS "trip.last_position.speed",
+    "trip->last_position".state_position AS "trip.last_position.state_position",
+    "trip->last_position".state_process AS "trip.last_position.state_process",
+    "trip->last_position".this_stop_id AS "trip.last_position.this_stop_id",
+    "trip->last_position".this_stop_sequence AS "trip.last_position.this_stop_sequence",
+    "trip->last_position".is_tracked AS "trip.last_position.is_tracked",
+    "trip->last_position".trips_id AS "trip.last_position.trips_id",
+    "trip->last_position".tcp_event AS "trip.last_position.tcp_event",
+    "trip->last_position".last_stop_headsign AS "trip.last_position.last_stop_headsign",
+    "trip->last_position".last_stop_name AS "trip.last_position.last_stop_name",
+    "trip->last_position".valid_to AS "trip.last_position.valid_to",
+    "trip->last_position".scheduled_timestamp AS "trip.last_position.scheduled_timestamp",
+    "trip->vehicle_descriptor".id AS "trip.vehicle_descriptor.id",
+    "trip->vehicle_descriptor".is_air_conditioned AS "trip.vehicle_descriptor.is_air_conditioned",
+    trip.feed_id AS "trip.feed_id"
+   FROM ((public_transport.vehiclepositions_trips trip
+     JOIN public_transport.vehiclepositions_positions "trip->last_position" ON (((trip.last_position_id = "trip->last_position".id) AND (("trip->last_position".valid_to IS NULL) OR ("trip->last_position".valid_to >= CURRENT_TIMESTAMP) OR (("trip->last_position".state_position)::text = ANY ((ARRAY['after_track'::character varying, 'after_track_delayed'::character varying])::text[]))) AND (("trip->last_position".state_position)::text = ANY ((ARRAY['at_stop'::character varying, 'before_track'::character varying, 'before_track_delayed'::character varying, 'canceled'::character varying, 'off_track'::character varying, 'on_track'::character varying, 'after_track'::character varying, 'after_track_delayed'::character varying])::text[])))))
+     LEFT JOIN public_transport.vehiclepositions_vehicle_descriptors "trip->vehicle_descriptor" ON (((trip.vehicle_registration_number = "trip->vehicle_descriptor".registration_number) AND (trip.gtfs_route_type = "trip->vehicle_descriptor".gtfs_route_type))));
+-- Feed-scoped variant of get_departures: trip_id and stop_id are unique only within a feed, and an empty
+-- (NULL) pickup_type/drop_off_type means regular pickup/drop off per the GTFS spec
+CREATE FUNCTION public_transport.get_feed_departures(feedid integer, stopsids character varying, mode integer, datedeparturebetweenstart timestamp with time zone, datedeparturebetweenend timestamp with time zone, isnegativeminutesbefore integer, datecanceleddeparturebetweenstart timestamp with time zone, datecanceleddeparturebetweenend timestamp with time zone, airconditioninfoenabled integer) RETURNS TABLE(departure_datetime_real timestamp with time zone, arrival_datetime_real timestamp with time zone, stop_sequence smallint, stop_headsign character varying, arrival_datetime timestamp with time zone, departure_datetime timestamp with time zone, stop_id character varying, platform_code character varying, wheelchair_boarding smallint, min_stop_sequence smallint, max_stop_sequence smallint, trip_id character varying, trip_headsign character varying, trip_short_name character varying, wheelchair_accessible smallint, route_short_name character varying, route_type smallint, route_id character varying, is_night character, is_regional character, is_substitute_transport character, next_stop_id character varying, next_route_short_name text, next_trip_headsign text, max_stop_sequence_with_stop_headsign integer, delay_seconds integer, real_wheelchair_accessible boolean, is_canceled boolean, "trip.gtfs_trip_short_name" character varying, "trip.gtfs_date" date, "trip.internal_route_name" character varying, "trip.internal_run_number" integer, "trip.start_timestamp" timestamp with time zone, "trip.last_position.state_position" character varying, "trip.last_position.last_stop_id" character varying, "trip.last_position.last_stop_sequence" integer, "trip.last_position.last_stop_name" character varying, "trip.last_position.this_stop_sequence" integer, "trip.cis_stop_platform_code" character varying, "trip.vehicle_descriptor.is_air_conditioned" boolean, delay_minutes integer, is_delay_available boolean, run_number integer, planned_start_timestamp timestamp with time zone)
+    LANGUAGE sql
+    SET search_path TO 'public_transport', 'public'
+    AS $$
+	select
+		departure_boards_detailed."computed.departure_datetime_real",
+		departure_boards_detailed."computed.arrival_datetime_real",
+		departure_boards_detailed."gtfs_precomputed_departures.stop_sequence",
+		departure_boards_detailed."gtfs_precomputed_departures.stop_headsign",
+		departure_boards_detailed."gtfs_precomputed_departures.arrival_datetime",
+		departure_boards_detailed."gtfs_precomputed_departures.departure_datetime",
+		departure_boards_detailed."gtfs_precomputed_departures.stop_id",
+		departure_boards_detailed."gtfs_precomputed_departures.platform_code",
+		departure_boards_detailed."gtfs_precomputed_departures.wheelchair_boarding",
+		departure_boards_detailed."gtfs_precomputed_departures.min_stop_sequence",
+		departure_boards_detailed."gtfs_precomputed_departures.max_stop_sequence",
+		departure_boards_detailed."gtfs_precomputed_departures.trip_id",
+		departure_boards_detailed."gtfs_precomputed_departures.trip_headsign",
+		departure_boards_detailed."gtfs_precomputed_departures.trip_short_name",
+		departure_boards_detailed."gtfs_precomputed_departures.wheelchair_accessible",
+		departure_boards_detailed."gtfs_precomputed_departures.route_short_name",
+		departure_boards_detailed."gtfs_precomputed_departures.route_type",
+		departure_boards_detailed."gtfs_precomputed_departures.route_id",
+		departure_boards_detailed."gtfs_precomputed_departures.is_night",
+		departure_boards_detailed."gtfs_precomputed_departures.is_regional",
+		departure_boards_detailed."gtfs_precomputed_departures.is_substitute_transport",
+		departure_boards_detailed."gtfs_precomputed_departures.next_stop_id",
+		departure_boards_detailed."gtfs_precomputed_departures.next_route_short_name",
+		departure_boards_detailed."gtfs_precomputed_departures.next_trip_headsign",
+		departure_boards_detailed."gtfs_precomputed_departures.max_stop_sequence_with_stop_headsign",
+		departure_boards_detailed."delay_seconds",
+		departure_boards_detailed."real_wheelchair_accessible",
+		departure_boards_detailed."is_canceled",
+		departure_boards_detailed."trip.gtfs_trip_short_name",
+		departure_boards_detailed."trip.gtfs_date",
+		departure_boards_detailed."trip.internal_route_name",
+		departure_boards_detailed."trip.internal_run_number",
+        departure_boards_detailed."trip.start_timestamp",
+        departure_boards_detailed."trip.last_position.state_position",
+		departure_boards_detailed."trip.last_position.last_stop_id",
+		departure_boards_detailed."trip.last_position.last_stop_sequence",
+		departure_boards_detailed."trip.last_position.last_stop_name",
+		departure_boards_detailed."trip.last_position.this_stop_sequence",
+        departure_boards_detailed.cis_stop_platform_code as "trip.cis_stop_platform_code",
+		case when airconditioninfoenabled = 1 then departure_boards_detailed."trip.vehicle_descriptor.is_air_conditioned" else NULL end,
+		TRUNC(departure_boards_detailed."trip.last_position.delay"::DECIMAL / 60,	0)::int as "delay_minutes",
+		case when departure_boards_detailed."trip.last_position.delay" is null then false else true end as "is_delay_available",
+		departure_boards_detailed."run.run_number",
+        departure_boards_detailed.planned_start_timestamp
+	from (
+		select
+			("departure_datetime"
+				+ MAKE_INTERVAL(secs => (case when "trip.last_position.delay" is null then 0 else "trip.last_position.delay" end))
+				- case when (MAKE_INTERVAL(secs => (case when "trip.last_position.delay" is null then 0 else "trip.last_position.delay" end)) > MAKE_INTERVAL())
+					then least (
+						MAKE_INTERVAL(secs => (case when "trip.last_position.delay" is null then 0 else "trip.last_position.delay" end)),
+						("departure_datetime" - "arrival_datetime")::interval
+					)
+					else MAKE_INTERVAL()
+					end
+			) "computed.departure_datetime_real",
+			"arrival_datetime" + MAKE_INTERVAL(secs => (
+				CASE WHEN "trip.last_position.delay" IS NULL THEN 0 ELSE "trip.last_position.delay" end
+			))  "computed.arrival_datetime_real",
+			"gtfs_precomputed_departures"."stop_sequence" as "gtfs_precomputed_departures.stop_sequence",
+			"gtfs_precomputed_departures"."stop_headsign" as "gtfs_precomputed_departures.stop_headsign",
+			"gtfs_precomputed_departures"."pickup_type" as "gtfs_precomputed_departures.pickup_type",
+			"gtfs_precomputed_departures"."drop_off_type" as "gtfs_precomputed_departures.drop_off_type",
+			"gtfs_precomputed_departures"."arrival_time" as "gtfs_precomputed_departures.arrival_time",
+			"gtfs_precomputed_departures"."arrival_datetime" as "gtfs_precomputed_departures.arrival_datetime",
+			"gtfs_precomputed_departures"."departure_time" as "gtfs_precomputed_departures.departure_time",
+			"gtfs_precomputed_departures"."departure_datetime" as "gtfs_precomputed_departures.departure_datetime",
+			"gtfs_precomputed_departures"."stop_id" as "gtfs_precomputed_departures.stop_id",
+			"gtfs_precomputed_departures"."stop_name" as "gtfs_precomputed_departures.stop_name",
+			"gtfs_precomputed_departures"."platform_code" as "gtfs_precomputed_departures.platform_code",
+			"gtfs_precomputed_departures"."wheelchair_boarding" as "gtfs_precomputed_departures.wheelchair_boarding",
+			"gtfs_precomputed_departures"."min_stop_sequence" as "gtfs_precomputed_departures.min_stop_sequence",
+			"gtfs_precomputed_departures"."max_stop_sequence" as "gtfs_precomputed_departures.max_stop_sequence",
+			"gtfs_precomputed_departures"."trip_id" as "gtfs_precomputed_departures.trip_id",
+			"gtfs_precomputed_departures"."trip_headsign" as "gtfs_precomputed_departures.trip_headsign",
+			"gtfs_precomputed_departures"."trip_short_name" as "gtfs_precomputed_departures.trip_short_name",
+			"gtfs_precomputed_departures"."wheelchair_accessible" as "gtfs_precomputed_departures.wheelchair_accessible",
+			"gtfs_precomputed_departures"."service_id" as "gtfs_precomputed_departures.service_id",
+			"gtfs_precomputed_departures"."date" as "gtfs_precomputed_departures.date",
+			"gtfs_precomputed_departures"."route_short_name" as "gtfs_precomputed_departures.route_short_name",
+			"gtfs_precomputed_departures"."route_type" as "gtfs_precomputed_departures.route_type",
+			"gtfs_precomputed_departures"."route_id" as "gtfs_precomputed_departures.route_id",
+			"gtfs_precomputed_departures"."is_night" as "gtfs_precomputed_departures.is_night",
+			"gtfs_precomputed_departures"."is_regional" as "gtfs_precomputed_departures.is_regional",
+			"gtfs_precomputed_departures"."is_substitute_transport" as "gtfs_precomputed_departures.is_substitute_transport",
+			"gtfs_precomputed_departures"."next_stop_sequence" as "gtfs_precomputed_departures.next_stop_sequence",
+			"gtfs_precomputed_departures"."next_stop_id" as "gtfs_precomputed_departures.next_stop_id",
+			"gtfs_precomputed_departures"."last_stop_sequence" as "gtfs_precomputed_departures.last_stop_sequence",
+			"gtfs_precomputed_departures"."last_stop_id" as "gtfs_precomputed_departures.last_stop_id",
+            "gtfs_precomputed_departures"."next_route_short_name" as  "gtfs_precomputed_departures.next_route_short_name",
+            "gtfs_precomputed_departures"."next_trip_headsign" as  "gtfs_precomputed_departures.next_trip_headsign",
+            "gtfs_precomputed_departures"."max_stop_sequence_with_stop_headsign" as  "gtfs_precomputed_departures.max_stop_sequence_with_stop_headsign",
+            plan_start.planned_departure AS planned_start_timestamp,
+			x.*,
+            cis_stop.cis_stop_platform_code as "cis_stop_platform_code",
+			run.run_number as "run.run_number"
+		from
+			"gtfs_precomputed_departures" as "gtfs_precomputed_departures"
+		left join "gtfs_run_numbers" as run on
+			"gtfs_precomputed_departures"."trip_id" = run.trip_id
+			and "gtfs_precomputed_departures"."service_id" = run.service_id
+			and run.feed_id = feedid
+		left outer join v_vehiclepositions_trip_position_vehicle_info as x on
+			"gtfs_precomputed_departures"."trip_id" = x."trip.gtfs_trip_id"
+			and x."trip.feed_id" = feedid
+        left join lateral (
+            select pd.departure_datetime as planned_departure
+            from gtfs_precomputed_departures pd
+            where pd.trip_id = "gtfs_precomputed_departures".trip_id
+            and pd.date = "gtfs_precomputed_departures".date
+            and pd.stop_sequence = 1
+            and pd.feed_id = feedid
+            limit 1
+        ) as plan_start on true
+        left join vehiclepositions_cis_stops as cis_stop on
+            cis_stop.rt_trip_id = x."trip.id"
+            and cis_stop.cis_stop_group_id = "gtfs_precomputed_departures"."cis_stop_group_id"
+		where "gtfs_precomputed_departures".feed_id = feedid
+	) departure_boards_detailed
+	where
+		departure_boards_detailed."gtfs_precomputed_departures.stop_id" = ANY(STRING_TO_ARRAY(stopsIds,','))
+		and (
+			(
+				(
+					(mode = 1 and departure_boards_detailed."computed.arrival_datetime_real" between dateDepartureBetweenStart and dateDepartureBetweenEnd)
+					or (mode != 1 and departure_boards_detailed."computed.departure_datetime_real" between dateDepartureBetweenStart and dateDepartureBetweenEnd)
+				)
+				and
+				(
+					0 = isNegativeMinutesBefore
+					or ( -- pro záporné minutes before
+						departure_boards_detailed."gtfs_precomputed_departures.stop_sequence" >= departure_boards_detailed."trip.last_position.last_stop_sequence"
+						or departure_boards_detailed."trip.last_position.last_stop_sequence" IS null
+					)
+				)
+			)
+			or (
+				departure_boards_detailed."trip.is_canceled" = true
+				and
+				(
+					(mode = 1 and departure_boards_detailed."computed.arrival_datetime_real" between dateCanceledDepartureBetweenStart and dateCanceledDepartureBetweenEnd)
+					or (mode != 1 and departure_boards_detailed."computed.departure_datetime_real" between dateCanceledDepartureBetweenStart and dateCanceledDepartureBetweenEnd)
+				)
+			)
+		) and
+		(
+			(mode = 1 and (coalesce(departure_boards_detailed."gtfs_precomputed_departures.pickup_type", '0') != '1' and departure_boards_detailed."gtfs_precomputed_departures.stop_sequence" != departure_boards_detailed."gtfs_precomputed_departures.max_stop_sequence"))  -- mode default/departures
+			or (mode=2 and (coalesce(departure_boards_detailed."gtfs_precomputed_departures.drop_off_type", '0') != '1' and departure_boards_detailed."gtfs_precomputed_departures.stop_sequence" != departure_boards_detailed."gtfs_precomputed_departures.min_stop_sequence")) -- mode arrivals
+			or (mode=3 and (coalesce(departure_boards_detailed."gtfs_precomputed_departures.pickup_type", '0') != '1')) -- mode mixed
+		);
+$$;

package/dist/output-gateway/gtfs/data-access/redis/RunTripsRedisRepository.d.ts CHANGED Viewed

@@ -6,5 +6,5 @@ export declare class RunTripsRedisRepository implements IRunTripsRedisRepository
     private redisConnector;
     private log;
     constructor(redisConnector: IoRedisConnector, log: ILogger);
-    getMultipleSchedule(runTuples: string[]): Promise<Array<IGtfsRunTripCacheDto | null>>;
+    getMultipleSchedule(feedId: number, runTuples: string[]): Promise<Array<IGtfsRunTripCacheDto | null>>;
 }

package/dist/output-gateway/gtfs/data-access/redis/RunTripsRedisRepository.js CHANGED Viewed

@@ -13,7 +13,6 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunTripsRedisRepository = void 0;
-const constants_1 = require("../../../shared/constants");
 const const_1 = require("../../../../schema-definitions/gtfs/redis/const");
 const IoRedisConnector_1 = require("@golemio/core/dist/helpers/data-access/redis/IoRedisConnector");
 const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
@@ -25,7 +24,7 @@ let RunTripsRedisRepository = class RunTripsRedisRepository {
         this.redisConnector = redisConnector;
         this.log = log;
     }
-    async getMultipleSchedule(runTuples) {
+    async getMultipleSchedule(feedId, runTuples) {
         if (!runTuples.length) {
             return [];
         }
@@ -35,9 +34,8 @@ let RunTripsRedisRepository = class RunTripsRedisRepository {
         const connection = this.redisConnector.getConnection();
         let runTripCache = [];
         try {
-            // IE writes run schedules under feed-namespaced keys (`<prefix>:<feedId>_<route>_<run>`);
-            // OG serves PID only, so read the PID feed's entries
-            runTripCache = await connection.mget(runTuples.map((runTuple) => `${const_1.GTFS_RUN_SCHEDULE_NAMESPACE_PREFIX}:${constants_1.PID_FEED_ID}_${runTuple}`));
+            // IE writes run schedules under feed-namespaced keys (`<prefix>:<feedId>_<route>_<run>`)
+            runTripCache = await connection.mget(runTuples.map((runTuple) => `${const_1.GTFS_RUN_SCHEDULE_NAMESPACE_PREFIX}:${feedId}_${runTuple}`));
         }
         catch (error) {
             throw new golemio_errors_1.GeneralError("Cannot get run trips from cache", this.constructor.name, error);

package/dist/output-gateway/gtfs/data-access/redis/RunTripsRedisRepository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RunTripsRedisRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/gtfs/data-access/redis/RunTripsRedisRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,~~yDAAmD;AACnD,~~2EAA2E;AAE3E,oGAAiG;AACjG,wEAAqE;AAErE,+DAAuE;AACvE,6EAAwE;AACxE,iEAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAChC,YACmD,cAAgC,EAC7C,GAAY;QADC,mBAAc,GAAd,cAAc,CAAkB;QAC7C,QAAG,GAAH,GAAG,CAAS;IAC/C,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAAC,SAAmB;~~QAChD~~,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC;QACd,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QACxC,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,YAAY,GAAyB,EAAE,CAAC;QAE5C,IAAI,CAAC;YACD,~~0FAA0F~~;~~YAC1F~~,~~qDAAqD;YACrD,~~YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,CAChC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,0CAAkC,IAAI,~~uBAAW~~,IAAI,QAAQ,EAAE,CAAC,~~CAClG~~,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,6BAAY,CAAC,iCAAiC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC5F,CAAC;QAED,IAAI,eAAe,GAAuC,EAAE,CAAC;QAC7D,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YAC/B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,8BAA8B,CAAC,CAAC;gBACtE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3B,SAAS;YACb,CAAC;YAED,IAAI,CAAC;gBACD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,IAAI,6BAAY,CAAC,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACxF,CAAC;QACL,CAAC;QAED,OAAO,eAAe,CAAC;IAC3B,CAAC;CACJ,CAAA;~~AA7CY~~,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,oBAAc,CAAC,cAAc,CAAC,CAAA;IACrC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCADsC,mCAAgB;GAF1E,uBAAuB,~~CA6CnC~~"}
1	+ {"version":3,"file":"RunTripsRedisRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/gtfs/data-access/redis/RunTripsRedisRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2EAA2E;AAE3E,oGAAiG;AACjG,wEAAqE;AAErE,+DAAuE;AACvE,6EAAwE;AACxE,iEAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAChC,YACmD,cAAgC,EAC7C,GAAY;QADC,mBAAc,GAAd,cAAc,CAAkB;QAC7C,QAAG,GAAH,GAAG,CAAS;IAC/C,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAAC,MAAc,EAAE,SAAmB;QAChE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC;QACd,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QACxC,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,YAAY,GAAyB,EAAE,CAAC;QAE5C,IAAI,CAAC;YACD,yFAAyF;YACzF,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,CAChC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,0CAAkC,IAAI,MAAM,IAAI,QAAQ,EAAE,CAAC,CAC7F,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,6BAAY,CAAC,iCAAiC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC5F,CAAC;QAED,IAAI,eAAe,GAAuC,EAAE,CAAC;QAC7D,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YAC/B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,8BAA8B,CAAC,CAAC;gBACtE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3B,SAAS;YACb,CAAC;YAED,IAAI,CAAC;gBACD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,IAAI,6BAAY,CAAC,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACxF,CAAC;QACL,CAAC;QAED,OAAO,eAAe,CAAC;IAC3B,CAAC;CACJ,CAAA;AA5CY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,oBAAc,CAAC,cAAc,CAAC,CAAA;IACrC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCADsC,mCAAgB;GAF1E,uBAAuB,CA4CnC"}

package/dist/output-gateway/gtfs/domain/repository/IRunTripsRedisRepository.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { IGtfsRunTripCacheDto } from "../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
 export interface IRunTripsRedisRepository {
-    getMultipleSchedule(runTuples: string[]): Promise<Array<IGtfsRunTripCacheDto | null>>;
+    getMultipleSchedule(feedId: number, runTuples: string[]): Promise<Array<IGtfsRunTripCacheDto | null>>;
 }

package/dist/output-gateway/gtfs/models/GTFSStopTimesModel.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { IStopTime } from "../../../schema-definitions/gtfs/redis/interfaces/IDelayComputationDto";
 import { SequelizeModel } from "@golemio/core/dist/output-gateway";
 import { IGTFSModels } from "./interfaces/IGTFSModels";
 export declare class GTFSStopTimesModel extends SequelizeModel {
@@ -24,6 +25,11 @@ export declare class GTFSStopTimesModel extends SequelizeModel {
         stop?: boolean;
         feedId?: number;
     }) => Promise<any>;
+    /**
+     * Stop times of one trip with their stops, in the shape of the delay computation cache.
+     * Trip and stop ids are only unique per feed, so both are scoped to the feed.
+     */
+    getTripStopTimesWithStops: (tripId: string, feedId: number) => Promise<IStopTime[]>;
     GetOne: (id: any) => Promise<any>;
     private static arrivalTimeComparison;
 }

package/dist/output-gateway/gtfs/models/GTFSStopTimesModel.js CHANGED Viewed

@@ -101,6 +101,46 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
                 throw new golemio_errors_1.GeneralError("Database error", "GTFSStopTimesModel", err, 500);
             }
         };
+        /**
+         * Stop times of one trip with their stops, in the shape of the delay computation cache.
+         * Trip and stop ids are only unique per feed, so both are scoped to the feed.
+         */
+        this.getTripStopTimesWithStops = async (tripId, feedId) => {
+            try {
+                const stopTimes = await this.sequelizeModel.findAll({
+                    attributes: [
+                        "arrival_time",
+                        "departure_time",
+                        "shape_dist_traveled",
+                        "stop_headsign",
+                        "stop_id",
+                        "stop_sequence",
+                        [sequelize_1.default.literal(`EXTRACT(EPOCH FROM "arrival_time"::INTERVAL)::int`), "arrival_time_seconds"],
+                        [sequelize_1.default.literal(`EXTRACT(EPOCH FROM "departure_time"::INTERVAL)::int`), "departure_time_seconds"],
+                        [
+                            sequelize_1.default.literal(`CASE when drop_off_type = '1' and pickup_type = '1' then true else false END`),
+                            "is_no_stop_waypoint",
+                        ],
+                        "stop_icons",
+                    ],
+                    include: [
+                        {
+                            as: "stop",
+                            attributes: ["stop_id", "stop_lat", "stop_lon", "stop_name", "zone_id", "wheelchair_boarding"],
+                            model: this.dbConnector.getConnection().models[gtfs_1.Gtfs.stops.pgTableName],
+                            where: { feed_id: feedId },
+                            required: true,
+                        },
+                    ],
+                    where: { trip_id: tripId, feed_id: feedId },
+                    order: [["stop_sequence", "ASC"]],
+                });
+                return stopTimes.map((stopTime) => stopTime.get({ plain: true }));
+            }
+            catch (err) {
+                throw new golemio_errors_1.GeneralError("Database error ~ getTripStopTimesWithStops", "GTFSStopTimesModel", err, 500);
+            }
+        };
         this.GetOne = (id) => {
             throw new golemio_errors_1.FatalError("Method not implemented");
         };

package/dist/output-gateway/gtfs/models/GTFSStopTimesModel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"GTFSStopTimesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/gtfs/models/GTFSStopTimesModel.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAuC;AACvC,2DAAiC;AACjC,uFAA6D;~~AAE7D~~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~~QA3GE~~,IAAI,CAAC,WAAW,GAAG,4BAAsB,CAAC,OAAO,CAAqB,oBAAc,CAAC,gBAAgB,CAAC,CAAC;IAC3G,CAAC;;AARL,~~gDAwHC~~;AAJkB,wCAAqB,GAAG,CAAC,IAAY,EAAE,QAAqB,EAA2B,EAAE;IACpG,oCAAoC;IACpC,OAAO,mBAAS,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,QAAQ,uCAAuC,CAAC,CAAC;AACjG,CAAC,AAHmC,CAGlC"}
1	+ {"version":3,"file":"GTFSStopTimesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/gtfs/models/GTFSStopTimesModel.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 export * as PID from "./pid";
 export * as Gtfs from "./gtfs";
 export * as VehiclePositions from "./vehicle-positions";
-export declare const routers: import("@golemio/core/dist/helpers/routing/AbstractRouter").AbstractRouter[];
+export declare const routers: (import("@golemio/core/dist/helpers/routing/AbstractRouter").AbstractRouter | import("./public/routers/v1/V1DepartureBoardsRouter").V1DepartureBoardsRouter)[];

package/dist/output-gateway/index.js CHANGED Viewed

@@ -39,6 +39,7 @@ exports.routers = exports.VehiclePositions = exports.Gtfs = exports.PID = void 0
 // import { v2PublicDeparturesRouter, v2PublicGtfsRouter } from "#og/public";
 // imported from its own file: the #og/public barrel would also construct the disabled departures/GTFS routers
 const V2PublicVehiclePositionsRouter_1 = require("./public/routers/v2/V2PublicVehiclePositionsRouter");
+const V1DepartureBoardsRouter_1 = require("./public/routers/v1/V1DepartureBoardsRouter");
 const gtfs_1 = require("./gtfs");
 const vehicle_positions_1 = require("./vehicle-positions");
 // import { v1JisRouter } from "./jis/routers/v1";
@@ -54,6 +55,9 @@ exports.routers = [
     // multi-feed live positions from the public trip cache
     V2PublicVehiclePositionsRouter_1.v2PublicVPRouter,
     //#endregion
+    //#region Departure boards of any feed (?feed=<feedCode>)
+    V1DepartureBoardsRouter_1.v1DepartureBoardsRouter,
+    //#endregion
     //#region PID Departure boards — out of scope for public-transport
     // v2PidRouter,
     // v3PidRouter,

package/dist/output-gateway/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/output-gateway/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mHAAmH;AACnH,mEAAmE;AACnE,6EAA6E;AAC7E,8GAA8G;AAC9G,uGAAwF;AACxF,iCAAwC;AACxC,2DAAiE;AACjE,kDAAkD;AAElD,6CAA6B;AAC7B,+CAA+B;AAC/B,wEAAwD;AAE3C,QAAA,OAAO,GAAG;IACnB,cAAc;IACd,mBAAY;IACZ,YAAY;IAEZ,uDAAuD;IACvD,4CAAwB;IACxB,uDAAuD;IACvD,iDAAgB;IAChB,YAAY;IAEZ,kEAAkE;IAClE,eAAe;IACf,eAAe;IACf,eAAe;IACf,YAAY;IAEZ,8DAA8D;IAC9D,4BAA4B;IAC5B,sBAAsB;IACtB,YAAY;IAEZ,2DAA2D;IAC3D,eAAe;IACf,YAAY;CACf,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/output-gateway/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mHAAmH;AACnH,mEAAmE;AACnE,6EAA6E;AAC7E,8GAA8G;AAC9G,uGAAwF;AACxF,yFAAwF;AACxF,iCAAwC;AACxC,2DAAiE;AACjE,kDAAkD;AAElD,6CAA6B;AAC7B,+CAA+B;AAC/B,wEAAwD;AAE3C,QAAA,OAAO,GAAG;IACnB,cAAc;IACd,mBAAY;IACZ,YAAY;IAEZ,uDAAuD;IACvD,4CAAwB;IACxB,uDAAuD;IACvD,iDAAgB;IAChB,YAAY;IAEZ,yDAAyD;IACzD,iDAAuB;IACvB,YAAY;IAEZ,kEAAkE;IAClE,eAAe;IACf,eAAe;IACf,eAAe;IACf,YAAY;IAEZ,8DAA8D;IAC9D,4BAA4B;IAC5B,sBAAsB;IACtB,YAAY;IAEZ,2DAA2D;IAC3D,eAAe;IACf,YAAY;CACf,CAAC"}

package/dist/output-gateway/pid/controllers/v2/V2DepartureBoardsController.d.ts CHANGED Viewed

@@ -1,8 +1,13 @@
 import { RequestHandler } from "@golemio/core/dist/shared/express";
 export declare class V2DepartureBoardsController {
     private departureBoardsModel;
+    private feedRepository;
     constructor();
     getDepartureBoard: RequestHandler;
+    /**
+     * Departure board of the feed given by the `feed` query param (a gtfs_feeds.code value), stops by GTFS ids or names
+     */
+    getFeedDepartureBoard: RequestHandler;
     getDepartureBoardXml: RequestHandler;
     private parseQuery;
     private computeTimeFrom;

package/dist/output-gateway/pid/controllers/v2/V2DepartureBoardsController.js CHANGED Viewed

@@ -8,6 +8,8 @@ const dto_1 = require("../../dto");
 const MpvnetXmlSerializer_1 = require("../../helpers/MpvnetXmlSerializer");
 const PIDDepartureBoardsModel_1 = require("../../models/PIDDepartureBoardsModel");
 const shared_1 = require("../../../shared");
+const constants_1 = require("../../../shared/constants");
+const GtfsFeedRepository_1 = require("../../../shared/data-access/GtfsFeedRepository");
 const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
@@ -20,7 +22,26 @@ class V2DepartureBoardsController {
             const timeFrom = this.computeTimeFrom(query, preferredTimezone);
             const span = (0, trace_provider_1.createChildSpan)("V2DepartureBoardsController.getDepartureBoard");
             try {
-                const dto = await this.fetchBoard(query, preferredTimezone, timeFrom);
+                const dto = await this.fetchBoard(constants_1.PID_FEED_ID, query, preferredTimezone, timeFrom);
+                res.status(200).send(dto);
+            }
+            catch (err) {
+                next(err);
+            }
+            finally {
+                span?.end();
+            }
+        };
+        /**
+         * Departure board of the feed given by the `feed` query param (a gtfs_feeds.code value), stops by GTFS ids or names
+         */
+        this.getFeedDepartureBoard = async (req, res, next) => {
+            const { query, preferredTimezone } = this.parseQuery(req);
+            const timeFrom = this.computeTimeFrom(query, preferredTimezone);
+            const span = (0, trace_provider_1.createChildSpan)("V2DepartureBoardsController.getFeedDepartureBoard");
+            try {
+                const feedId = await this.feedRepository.getFeedIdByCode((0, express_validator_1.matchedData)(req).feed);
+                const dto = await this.fetchBoard(feedId, query, preferredTimezone, timeFrom);
                 res.status(200).send(dto);
             }
             catch (err) {
@@ -39,7 +60,7 @@ class V2DepartureBoardsController {
             const timeFrom = this.computeTimeFrom(query, preferredTimezone);
             const span = (0, trace_provider_1.createChildSpan)("V2DepartureBoardsController.getDepartureBoardXml");
             try {
-                const dto = await this.fetchBoard(query, preferredTimezone, timeFrom);
+                const dto = await this.fetchBoard(constants_1.PID_FEED_ID, query, preferredTimezone, timeFrom);
                 res.set("Content-Type", "text/xml; charset=utf-8").status(200).send(MpvnetXmlSerializer_1.MpvnetXmlSerializer.serialize(dto));
             }
             catch (err) {
@@ -50,6 +71,7 @@ class V2DepartureBoardsController {
             }
         };
         this.departureBoardsModel = new PIDDepartureBoardsModel_1.PIDDepartureBoardsModel();
+        this.feedRepository = new GtfsFeedRepository_1.GtfsFeedRepository();
     }
     parseQuery(req) {
         const queryData = (0, express_validator_1.matchedData)(req);
@@ -72,8 +94,9 @@ class V2DepartureBoardsController {
                 : moment_timezone_1.default.tz(query.timeFrom, preferredTimezone)
             : undefined;
     }
-    async fetchBoard(query, preferredTimezone, timeFrom) {
+    async fetchBoard(feedId, query, preferredTimezone, timeFrom) {
         const data = await this.departureBoardsModel.getAll({
+            feedId,
             aswIds: query.aswIds,
             cisIds: query.cisIds,
             gtfsIds: query.ids,

package/dist/output-gateway/pid/controllers/v2/V2DepartureBoardsController.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V2DepartureBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v2/V2DepartureBoardsController.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAkF;AAClF,2EAA0E;AAC1E,kFAAiF;AACjF,4CAA8C;AAC9C,+FAA6F;AAE7F,mFAA0E;AAC1E,6EAAwE;AACxE,gGAA2E;AAE3E,MAAa,2BAA2B;~~IAGpC~~;~~QAIO~~,sBAAiB,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC1D,GAAG,CAAC,SAAS,CAAC,2BAA2B,EAAE,wBAAwB,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjG,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YAEhE,MAAM,IAAI,GAAG,IAAA,gCAAe,EAAC,+CAA+C,CAAC,CAAC;YAC9E,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;~~gBACtE~~,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;oBAAS,CAAC;gBACP,IAAI,EAAE,GAAG,EAAE,CAAC;YAChB,CAAC;QACL,CAAC,CAAC;QAEK,yBAAoB,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACnE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAE1D,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC1D,IAAI,CACA,IAAI,6BAAY,CACZ,yDAAyD,EACzD,6BAA6B,EAC7B,SAAS,EACT,GAAG,CACN,CACJ,CAAC;gBACF,OAAO;YACX,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YAEhE,MAAM,IAAI,GAAG,IAAA,gCAAe,EAAC,kDAAkD,CAAC,CAAC;YACjF,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;~~gBACtE~~,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yCAAmB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5G,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;oBAAS,CAAC;gBACP,IAAI,EAAE,GAAG,EAAE,CAAC;YAChB,CAAC;QACL,CAAC,CAAC;~~QA7CE~~,IAAI,CAAC,oBAAoB,GAAG,IAAI,iDAAuB,EAAE,CAAC;~~IAC9D~~,CAAC;~~IA8CO~~,UAAU,CAAC,GAAY;QAC3B,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,yBAAgB,CAAC,sBAAsB,CAAC,6BAAuB,EAAE,SAAS,CAAC,CAAC;QAC1F,MAAM,iBAAiB,GAAG,yBAAgB,CAAC,oBAAoB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzF,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;IACxC,CAAC;IAEO,eAAe,CAAC,KAA8B,EAAE,iBAAyB;QAC7E,oDAAoD;QACpD,cAAc;QACd,uBAAuB;QACvB,0BAA0B;QAC1B,yBAAyB;QACzB,4BAA4B;QAC5B,MAAM,qBAAqB,GAAW,qDAAqD,CAAC;QAC5F,+DAA+D;QAC/D,OAAO,KAAK,CAAC,QAAQ;YACjB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC;gBACzC,CAAC,CAAC,IAAA,yBAAM,EAAC,KAAK,CAAC,QAAQ,CAAC;gBACxB,CAAC,CAAC,yBAAM,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,iBAAiB,CAAC;YAClD,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,UAAU,CACpB,KAA8B,EAC9B,iBAAyB,EACzB,QAA4B;QAE5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAChD,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE,KAAK,CAAC,GAAG;YAClB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,QAAQ;YACR,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK;YACjC,QAAQ,EAAE,iBAAiB;YAC3B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;YAChD,MAAM,EAAE,KAAK,CAAC,MAAM;SACvB,CAAC,CAAC;QACH,OAAO,yBAAgB,CAAC,sBAAsB,CAAC,gCAA0B,EAAE,IAAI,CAAC,CAAC;IACrF,CAAC;CACJ;~~AAtGD~~,~~kEAsGC~~"}
1	+ {"version":3,"file":"V2DepartureBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v2/V2DepartureBoardsController.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/pid/data-access/DeparturesRepository.js CHANGED Viewed

@@ -37,7 +37,8 @@ let DeparturesRepository = class DeparturesRepository {
     async GetAll(options) {
         const { start, end, canceledStart, canceledEnd } = this.getDepartureTimestamps(options);
         const result = await this.connector.getConnection().query(`
-            SELECT * from ${this.schema}.get_departures(
+            SELECT * from ${this.schema}.get_feed_departures(
+                $feedid,
                 $stopsids,
                 $mode,
                 $datedeparturebetweenstart,
@@ -48,6 +49,7 @@ let DeparturesRepository = class DeparturesRepository {
                 $airconditioninfoenabled);`, {
             type: sequelize_1.QueryTypes.SELECT,
             bind: {
+                feedid: options.feedId,
                 stopsids: options.stopsIds.join(","),
                 mode: options.mode === DepartureMode_1.DepartureMode.ARRIVALS ? 2 : options.mode === DepartureMode_1.DepartureMode.MIXED ? 3 : 1,
                 datedeparturebetweenstart: start,

package/dist/output-gateway/pid/data-access/DeparturesRepository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AAGvC,wEAAqE;AACrE,6EAAwE;AACxE,mEAAiE;AACjE,iEAAwE;AACxE,kEAA+D;AAK/D,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAG5B,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAI7B,YACiD,SAA6B,EAC1C,MAAqB;QADR,cAAS,GAAT,SAAS,CAAoB;QAG1E,IAAI,CAAC,MAAM,GAAG,iBAAS,CAAC;QACxB,IAAI,CAAC,+BAA+B,GAAG,MAAM,CAAC,UAAU,CAAC,+CAA+C,EAAE,IAAI,CAAC,CAAC;IACpH,CAAC;IAED,MAAM,CAAC,EAAO;QACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,OAA+B;QACxC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACxF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,KAAK,CACrD;4BACgB,IAAI,CAAC,MAAM~~;;;;;;;;2CAQI~~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~~AAvHY~~,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IACnC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;;GAN1B,oBAAoB,~~CAuHhC~~"}
1	+ {"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/pid/data-access/interfaces/DepartureInterfaces.d.ts CHANGED Viewed

@@ -7,6 +7,7 @@ export interface ITimestampOptions {
     minutesAfter: number;
 }
 export interface IDeparturesViewOptions extends ITimestampOptions {
+    feedId: number;
     stopsIds: string[];
     mode: DepartureMode;
     isAirCondition: boolean;

package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js CHANGED Viewed

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PIDDepartureBoardsModel = void 0;
-const constants_1 = require("../../shared/constants");
 const StopEnums_1 = require("../../../helpers/StopEnums");
 const data_access_1 = require("../data-access");
 const models_1 = require("../../gtfs/models");
@@ -54,9 +53,9 @@ class PIDDepartureBoardsModel {
                 }
                 runTuples.add(RunHelper_1.RunHelper.composeRunId(departure.route_id, departure.run_number));
             }
-            const { runSchedule, runTripIds } = await this.retrieveAndReturnRunTrips(runTuples);
+            const { runSchedule, runTripIds } = await this.retrieveAndReturnRunTrips(options.feedId, runTuples);
             runScheduleMap = runSchedule;
-            untrackedTrips = await this.retrieveAndReturnUntrackedTrips(runTripIds);
+            untrackedTrips = await this.retrieveAndReturnUntrackedTrips(options.feedId, runTripIds);
         }
         //#endregion
         //#region Processing and returning departures
@@ -102,6 +101,7 @@ class PIDDepartureBoardsModel {
             const stopsToInclude = await models_1.models.GTFSStopModel.GetAll({
                 includeMetroTrains: options.includeMetroTrains,
                 appendAswId: true,
+                feedId: options.feedId,
                 aswIds: options.aswIds,
                 cisIds: options.cisIds,
                 gtfsIds: options.gtfsIds,
@@ -165,6 +165,7 @@ class PIDDepartureBoardsModel {
         try {
             const minutesOffset = options.timeFrom ? options.timeFrom.diff(currentMoment, "minutes") : 0;
             return await this.departuresRepository.GetAll({
+                feedId: options.feedId,
                 currentMoment,
                 minutesAfter: options.minutesAfter,
                 minutesBefore: options.minutesBefore,
@@ -185,13 +186,13 @@ class PIDDepartureBoardsModel {
             spanDepartures?.end();
         }
     }
-    async retrieveAndReturnRunTrips(runTuples) {
+    async retrieveAndReturnRunTrips(feedId, runTuples) {
         const runScheduleMap = new Map();
         const tripIds = new Set();
         const spanRunTrips = (0, trace_provider_1.createChildSpan)("V2PIDRouter.Redis.runTrips");
         try {
             const runTuplesArray = Array.from(runTuples);
-            const runSchedule = await this.runTripsRedisRepository.getMultipleSchedule(runTuplesArray);
+            const runSchedule = await this.runTripsRedisRepository.getMultipleSchedule(feedId, runTuplesArray);
             for (let i = 0; i < runSchedule.length; i++) {
                 const runTrip = runSchedule[i];
                 if (runTrip) {
@@ -221,12 +222,12 @@ class PIDDepartureBoardsModel {
             spanRunTrips?.end();
         }
     }
-    async retrieveAndReturnUntrackedTrips(tripIds) {
+    async retrieveAndReturnUntrackedTrips(feedId, tripIds) {
         let untrackedTrips = new Set();
         const spanUntrackedTrips = (0, trace_provider_1.createChildSpan)("V2PIDRouter.Redis.untrackedTrips");
         try {
             const tripIdsArray = Array.from(tripIds);
-            untrackedTrips = await this.positionsRedisRepository.getTripsWithUntrackedVehicles(constants_1.PID_FEED_ID, tripIdsArray);
+            untrackedTrips = await this.positionsRedisRepository.getTripsWithUntrackedVehicles(feedId, tripIdsArray);
             return untrackedTrips;
         }
         catch (error) {

package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":";;;;;;AAAA,~~sDAAmD;AACnD,~~0DAA0D;AAC1D,gDAA2D;AAG3D,8CAAyC;AAOzC,wEAAqE;AACrE,+FAA6F;AAC7F,6EAA8F;AAC9F,gGAA2E;AAG3E,kEAA+D;AAE/D,kCAA2C;AAC3C,kDAA+C;AAE/C,oFAA6D;AAC7D,mDAAgD;AAEhD,2EAAwE;AAExE,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,0EAA0E;AAC1E,sEAAsE;AACtE,MAAM,uBAAuB;IAQzB;QACI,IAAI,CAAC,GAAG,GAAG,mBAAc,CAAC,OAAO,CAAU,qBAAS,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,CAAC,8BAA8B,GAAG,IAAI,qDAAyB,EAAE,CAAC;QACtE,IAAI,CAAC,oBAAoB,GAAG,IAAI,kCAAoB,CAChD,mBAAc,CAAC,OAAO,CAAqB,qBAAS,CAAC,iBAAiB,CAAC,EACvE,mBAAc,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAChE,CAAC;QACF,IAAI,CAAC,uBAAuB,GAAG,mBAAc,CAAC,OAAO,CAA2B,uBAAU,CAAC,uBAAuB,CAAC,CAAC;QACpH,IAAI,CAAC,wBAAwB,GAAG,mBAAc,CAAC,OAAO,CAClD,uBAAU,CAAC,gCAAgC,CAC9C,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,mBAAc,CAAC,OAAO,CAAiB,uBAAU,CAAC,cAAc,CAAC,CAAC;IAC5F,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAA8B;QAC9C,MAAM,aAAa,GAAG,IAAA,yBAAM,GAAE,CAAC;QAE/B,gFAAgF;QAChF,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,CAAC,kBAAkB,EAAE,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnE,IAAI,CAAC,0BAA0B,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC;YAChE,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC;YACzC,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC;SACpE,CAAC,CAAC;QACH,YAAY;QAEZ,mEAAmE;QACnE,IAAI,cAAc,GAAG,IAAI,GAAG,EAA0B,CAAC;QACvD,IAAI,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QAEvC,MAAM,kBAAkB,GACpB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,6BAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,6BAAa,CAAC,SAAS,CAAC,CAAC;QAEpG,qHAAqH;QACrH,iFAAiF;QACjF,IAAI,kBAAkB,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;YAEpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACjC,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;oBAC/C,SAAS;gBACb,CAAC;gBAED,SAAS,CAAC,GAAG,CAAC,qBAAS,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;YACpF,CAAC;YAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;~~YAEpF~~,cAAc,GAAG,WAAW,CAAC;YAC7B,cAAc,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;~~QAC5E~~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~~CAAC~~,SAAsB;~~QAI1D~~,MAAM,cAAc,GAAG,IAAI,GAAG,EAA0B,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,MAAM,YAAY,GAAG,IAAA,gCAAe,EAAC,4BAA4B,CAAC,CAAC;QAEnE,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;~~YAE3F~~,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,OAAO,EAAE,CAAC;oBACV,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBAChC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAE5C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;wBAClC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC9B,CAAC;gBACL,CAAC;YACL,CAAC;YACD,OAAO;gBACH,WAAW,EAAE,cAAc;gBAC3B,UAAU,EAAE,OAAO;aACtB,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CACV,KAAK;YACL,mCAAmC;YACnC,mIAAmI,CACtI,CAAC;YACF,OAAO;gBACH,WAAW,EAAE,cAAc;gBAC3B,UAAU,EAAE,OAAO;aACtB,CAAC;QACN,CAAC;gBAAS,CAAC;YACP,YAAY,EAAE,GAAG,EAAE,CAAC;QACxB,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAAC,OAAoB;~~QAC9D~~,IAAI,cAAc,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC5C,MAAM,kBAAkB,GAAG,IAAA,gCAAe,EAAC,kCAAkC,CAAC,CAAC;QAE/E,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,cAAc,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,6BAA6B,CAAC,~~uBAAW~~,EAAE,YAAY,CAAC,CAAC;~~YAC9G~~,OAAO,cAAc,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,kBAAkB,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CACV,KAAK;YACL,mCAAmC;YACnC,sIAAsI,CACzI,CAAC;YACF,OAAO,cAAc,CAAC;QAC1B,CAAC;gBAAS,CAAC;YACP,kBAAkB,EAAE,GAAG,EAAE,CAAC;QAC9B,CAAC;IACL,CAAC;CACJ;AAEQ,0DAAuB"}
1	+ {"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/pid/models/interfaces/IGetDeparturesOptions.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import type { DepartureOrder } from "../../helpers/enums/DepartureOrder";
 import type { DepartureSkip } from "../../helpers/enums/DepartureSkip";
 import type { Moment } from "@golemio/core/dist/shared/moment-timezone";
 export interface IGetDeparturesOptions {
+    feedId: number;
     aswIds?: string[];
     cisIds?: string[];
     gtfsIds?: string[];

package/dist/output-gateway/public/routers/v1/V1DepartureBoardsRouter.d.ts ADDED Viewed

@@ -0,0 +1,16 @@
+import { PublicTransportRouter } from "../../../shared";
+import { Router } from "@golemio/core/dist/shared/express";
+/**
+ * Departure boards of any feed, selected by the required `feed` query param (a gtfs_feeds.code value).
+ * Stops are identified by GTFS ids or names only; ASW/CIS ids and presets are PID-specific.
+ * Mounted at /v1/public-transport/departureboards.
+ */
+export declare class V1DepartureBoardsRouter extends PublicTransportRouter {
+    readonly router: Router;
+    private cacheHeaderMiddleware;
+    private departureBoardsController;
+    constructor();
+    protected initRoutes: () => void;
+}
+declare const v1DepartureBoardsRouter: V1DepartureBoardsRouter;
+export { v1DepartureBoardsRouter };

package/dist/output-gateway/public/routers/v1/V1DepartureBoardsRouter.js ADDED Viewed

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.v1DepartureBoardsRouter = exports.V1DepartureBoardsRouter = void 0;
+const V2DepartureBoardsController_1 = require("../../../pid/controllers/v2/V2DepartureBoardsController");
+const ParamValidatorManager_1 = require("../../../pid/helpers/ParamValidatorManager");
+const shared_1 = require("../../../shared");
+const constants_1 = require("../../../shared/constants");
+const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
+const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
+const express_1 = require("@golemio/core/dist/shared/express");
+const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
+const const_1 = require("../../../../const");
+/**
+ * Departure boards of any feed, selected by the required `feed` query param (a gtfs_feeds.code value).
+ * Stops are identified by GTFS ids or names only; ASW/CIS ids and presets are PID-specific.
+ * Mounted at /v1/public-transport/departureboards.
+ */
+class V1DepartureBoardsRouter extends shared_1.PublicTransportRouter {
+    constructor() {
+        super(constants_1.RouteVersion.v1, "departureboards");
+        this.router = (0, express_1.Router)();
+        this.initRoutes = () => {
+            const { preferredTimezone, departureBoards: { departureMode, order, filter, skip }, } = constants_1.ValidationArrays;
+            this.router.get("/", [
+                (0, express_validator_1.query)("feed").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
+                (0, express_validator_1.query)("ids").optional(),
+                (0, express_validator_1.query)("names").optional(),
+                // at least one of ids or names is required
+                (0, express_validator_1.oneOf)([(0, express_validator_1.query)("ids").exists(), (0, express_validator_1.query)("names").exists()]),
+                (0, express_validator_1.query)("ids").optional().not().isEmpty({ ignore_whitespace: true }),
+                (0, express_validator_1.query)("names").optional().not().isEmpty({ ignore_whitespace: true }),
+                (0, express_validator_1.query)("minutesBefore")
+                    .optional()
+                    .isInt(process.env.NODE_ENV === "test"
+                    ? {}
+                    : { lt: const_1.DATA_RETENTION_IN_MINUTES + 1, gt: -1 * (const_1.GTFS_CALENDAR_LIMIT_IN_MINUTES + 1) })
+                    .not()
+                    .isArray(),
+                (0, express_validator_1.query)("minutesAfter")
+                    .optional()
+                    .isInt({
+                    lt: const_1.GTFS_CALENDAR_LIMIT_IN_MINUTES + 1,
+                    gt: -1 * (const_1.GTFS_CALENDAR_LIMIT_IN_MINUTES + const_1.DATA_RETENTION_IN_MINUTES + 1),
+                })
+                    .not()
+                    .isArray(),
+                (0, express_validator_1.query)("preferredTimezone").optional().isIn(preferredTimezone).not().isArray(),
+                (0, express_validator_1.query)("mode").optional().isIn(departureMode),
+                (0, express_validator_1.query)("order").optional().isIn(order).not().isArray(),
+                (0, express_validator_1.query)("filter").optional().isIn(filter).not().isArray(),
+                (0, express_validator_1.query)("skip").optional().isIn(skip),
+                (0, express_validator_1.query)("timeFrom").optional().isISO8601().custom(ParamValidatorManager_1.ParamValidatorManager.getTimeFromValidator()).not().isArray(),
+                (0, express_validator_1.query)("total").optional().isInt().not().isArray(),
+                (0, express_validator_1.query)("appendHeadsignsLimit").optional().isInt({ min: 0, max: 100 }).not().isArray(),
+            ], (0, Validation_1.paginationLimitMiddleware)("DepartureBoards"), Validation_1.checkErrors,
+            // max-age 5 seconds, stale-while-revalidate 5 seconds
+            this.cacheHeaderMiddleware.getMiddleware(5, 5), this.departureBoardsController.getFeedDepartureBoard);
+        };
+        this.cacheHeaderMiddleware = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
+        this.departureBoardsController = new V2DepartureBoardsController_1.V2DepartureBoardsController();
+        this.initRoutes();
+    }
+}
+exports.V1DepartureBoardsRouter = V1DepartureBoardsRouter;
+const v1DepartureBoardsRouter = new V1DepartureBoardsRouter();
+exports.v1DepartureBoardsRouter = v1DepartureBoardsRouter;
+//# sourceMappingURL=V1DepartureBoardsRouter.js.map

package/dist/output-gateway/public/routers/v1/V1DepartureBoardsRouter.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"V1DepartureBoardsRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/routers/v1/V1DepartureBoardsRouter.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { IPublicApiDetailedTrip } from "../../../../domain/PublicApiDetailedTripInterfaces";
+import { GTFSStopTimesModel } from "../../../../../gtfs/models/GTFSStopTimesModel";
 import { IDelayComputationRepository } from "../../../../domain/repository/IDelayComputationRepository";
 import { IStopTimeRepository } from "../../../../domain/repository/IStopTimeRepository";
 import { IPublicApiCacheDto } from "../../../../../../schema-definitions/vehicle-positions/redis/interfaces/IPublicApiCacheDto";
@@ -7,8 +8,10 @@ export declare class StopTimesTripScopeHandler extends AbstractDetailedTripScope
     private delayComputationRepository;
     private stopTimeRepository;
     private tripStopTimesTransformation;
+    protected stopTimesModel: GTFSStopTimesModel;
     constructor(delayComputationRepository: IDelayComputationRepository, stopTimeRepository: IStopTimeRepository);
     handle(output: IPublicApiDetailedTrip, vehiclePosition: IPublicApiCacheDto): Promise<IPublicApiDetailedTrip>;
+    private getScheduledStopTimes;
     private filterNoStopWaypoints;
     private checkStopTimesSequence;
 }

package/dist/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.js CHANGED Viewed

@@ -13,6 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StopTimesTripScopeHandler = void 0;
+const models_1 = require("../../../../../gtfs/models");
 const PublicCacheKeys_1 = require("../../../../../../schema-definitions/vehicle-positions/redis/PublicCacheKeys");
 const OgModuleToken_1 = require("../../../../ioc/OgModuleToken");
 const PublicVPTripStopTimesTransformation_1 = require("../../../transformations/scopes/PublicVPTripStopTimesTransformation");
@@ -26,20 +27,17 @@ let StopTimesTripScopeHandler = class StopTimesTripScopeHandler extends Abstract
         this.delayComputationRepository = delayComputationRepository;
         this.stopTimeRepository = stopTimeRepository;
         this.tripStopTimesTransformation = new PublicVPTripStopTimesTransformation_1.PublicVPTripStopTimesTransformation();
+        this.stopTimesModel = models_1.models.GTFSStopTimesModel;
     }
     async handle(output, vehiclePosition) {
         // same feed source as DetailedTripFacade: vehicle ids are <feedId>-<feedLocalId>
         const feedId = PublicCacheKeys_1.PublicCacheKeys.feedIdFromVehicleId(vehiclePosition.vehicle_id);
-        const delayComputationCache = feedId === null
-            ? null
-            : await this.delayComputationRepository.getDelayComputationCacheProperty(feedId, vehiclePosition.gtfs_trip_id, "stop_times");
-        // only CIS/MPV pipelines compute delays (UpdateDelayTask); polled GTFS-RT feeds have none, so the
-        // scope is empty instead of failing the whole detail response
-        if (!delayComputationCache) {
+        if (feedId === null) {
             output.stop_times = (0, Geo_1.buildGeojsonFeatureCollection)([]);
             return output;
         }
-        const filteredStopTimes = this.filterNoStopWaypoints(delayComputationCache.stop_times);
+        const scheduledStopTimes = await this.getScheduledStopTimes(feedId, vehiclePosition.gtfs_trip_id);
+        const filteredStopTimes = this.filterNoStopWaypoints(scheduledStopTimes);
         const vpAndFilteredStopTimes = filteredStopTimes.map((stopTime) => ({ stopTime, vehiclePosition }));
         const stopTimes = this.tripStopTimesTransformation.transformArray(vpAndFilteredStopTimes);
         const stopTimesWithDelay = await this.stopTimeRepository.getPublicStopTimeCache(vehiclePosition.vehicle_id, vehiclePosition.gtfs_trip_id);
@@ -73,6 +71,15 @@ let StopTimesTripScopeHandler = class StopTimesTripScopeHandler extends Abstract
         output.stop_times = (0, Geo_1.buildGeojsonFeatureCollection)(stopTimes);
         return output;
     }
+    async getScheduledStopTimes(feedId, gtfsTripId) {
+        const delayComputationCache = await this.delayComputationRepository.getDelayComputationCacheProperty(feedId, gtfsTripId, "stop_times");
+        if (delayComputationCache) {
+            return delayComputationCache.stop_times;
+        }
+        // only CIS/MPV pipelines compute delays (UpdateDelayTask); polled GTFS-RT feeds have none, so their
+        // stop times come straight from the feed's static GTFS
+        return this.stopTimesModel.getTripStopTimesWithStops(gtfsTripId, feedId);
+    }
     filterNoStopWaypoints(stopTimes) {
         return stopTimes.filter((stopTime) => !stopTime.is_no_stop_waypoint);
     }

package/dist/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StopTimesTripScopeHandler.js","sourceRoot":"","sources":["../../../../../../../src/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;~~AAKA~~,kHAA+E;AAE/E,iEAA6D;AAC7D,6HAAoI;AAGpI,+DAAsF;AAEtF,2DAA2D;AAC3D,iEAAwE;AACxE,yFAAsF;AAG/E,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,mEAAgC;~~IAG3E~~,YAC8D,0BAAuD,EACzD,kBAAuC;QAE/F,KAAK,EAAE,CAAC;QAHkD,+BAA0B,GAA1B,0BAA0B,CAA6B;QACzD,uBAAkB,GAAlB,kBAAkB,CAAqB;QAG/F,IAAI,CAAC,2BAA2B,GAAG,IAAI,yEAAmC,EAAE,CAAC;~~IACjF~~,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAA8B,EAAE,eAAmC;QACnF,iFAAiF;QACjF,MAAM,MAAM,GAAG,iCAAe,CAAC,mBAAmB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC/E,~~MAAM~~,~~qBAAqB,GACvB,~~MAAM,KAAK,IAAI~~;YACX~~,~~CAAC~~,CAAC~~,IAAI~~;~~YACN~~,~~CAAC,CAAC,~~MAAM,~~IAAI,~~CAAC,~~0BAA0B~~,~~CAAC~~,~~gCAAgC~~,~~CAClE~~,~~MAAM~~,~~EACN~~,~~eAAe~~,CAAC,~~YAAY~~,~~EAC5B~~,~~YAAY,CACf,~~CAAC;~~QAEZ~~,~~kGAAkG~~;~~QAClG~~,~~8DAA8D;QAC9D~~,IAAI,CAAC,qBAAqB,~~EAAE,~~CAAC~~;YACzB~~,MAAM,~~CAAC,UAAU,GAAG,IAAA,mCAA6B,EAAC,~~EAAE,~~CAAC~~,CAAC~~;YACtD~~,~~OAAO~~,~~MAAM,~~CAAC~~;QAClB~~,CAAC;~~QAED~~,MAAM,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,~~qBAAqB~~,CAAC,~~UAAU,~~CAAC~~,CAAC~~;~~QACvF~~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~~AA1GY~~,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,qBAAU,GAAE;~~IAKJ~~,WAAA,IAAA,iBAAM,EAAC,6BAAa,CAAC,0BAA0B,CAAC,CAAA;IAChD,WAAA,IAAA,iBAAM,EAAC,6BAAa,CAAC,wBAAwB,CAAC,CAAA;;~~GAL1C~~,yBAAyB,~~CA0GrC~~"}
1	+ {"version":3,"file":"StopTimesTripScopeHandler.js","sourceRoot":"","sources":["../../../../../../../src/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.ts"],"names":[],"mappings":"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"}

package/docs/follow-ups.md CHANGED Viewed

@@ -9,8 +9,8 @@ Resolved and removed so far: gtfs_metadata feed scoping; the OG active endpoints
 run numbers; the shapes.txt staging limit (stage ingests the full 193 MB fine; the local dev Redis
 still truncates such files — a local-environment quirk, not a code bug); the destructive-migration
 convention (schema changes now pair the squashed init edit with an incremental migration — see
-CLAUDE.md, first instance `20260820000000-widen-trip-number`); the empty public VP detail `shapes` scope for
-polled GTFS-RT feeds (now read from static GTFS, see #13).
+CLAUDE.md, first instance `20260820000000-widen-trip-number`); the empty public VP detail `shapes` and `stop_times`
+scopes for polled GTFS-RT feeds (now read from static GTFS, see #13).
 ---
@@ -202,13 +202,19 @@ own `refreshPublicTripCache {feedCode}` loop under a per-feed mutex; key format
 Vehicle ids are `<feedId>-<vehicle>` for every feed so they stay unique across feeds: the stop-time cache keys
 and the detail endpoint (which derives the feed from the id) rely on it. The detail
 `stop_times`/`shapes` scopes read the delay computation of the vehicle's own feed; only the CIS/MPV pipelines
-(`UpdateDelayTask`) write it. Without it, `shapes` falls back to the feed's static GTFS shape (by
-`(feed_id, shape_id)`, raw GTFS points instead of the resampled ones), but `stop_times` comes back empty for
-polled GTFS-RT feeds (fill it from static GTFS by `(feed_id, trip_id)` when a polled feed needs it). A
+(`UpdateDelayTask`) write it. Without it, both scopes fall back to the feed's static GTFS: `shapes` by
+`(feed_id, shape_id)` (raw GTFS points instead of the resampled ones), `stop_times` by `(feed_id, trip_id)`. A
 vehicle without identity in its feed (no registration or CIS number, e.g. polled GTFS-RT) is keyed by its VP
 trip, so it gets a new `vehicle_id` when its trip changes.
 Left as is:
+- **The static GTFS fallback is not cached**: each detail request of a polled-feed vehicle queries Postgres
+  for its shape and stop times (the map polls an open detail every 10 s; the route only sends a 5 s
+  `Cache-Control`). Fine at low traffic; when it grows, cache the per-`(feed_id, trip_id)` static data in Redis
+  next to the delay computation cache.
+- **Polled-feed `stop_times` carry no realtime times**: `realtime_arrival_time`/`realtime_departure_time` stay
+  NULL because the public stop-time cache has no per-stop delays for them (see #12). Projecting the vehicle's
+  current `delay` onto the upcoming stops would fill them.
 - **`vehicle_descriptor` scope** joins descriptors by registration number only (see #6).
 - **The public departures / PID departure and transfer boards** read the cache with `PID_FEED_ID`; they need a
   feed parameter before they serve other feeds.

package/docs/implementation_documentation.md CHANGED Viewed

@@ -1583,6 +1583,18 @@ Worker má na starost stahování VYMI (JIS) událostí a infotextů, jejich tra
 -   načtení souboru z Redis cache
     -   HGET files:ptGtfsRt alerts.pb
+### Departure Boards v1
+#### _/v1/public-transport/departureboards_
+-   odjezdové tabule libovolného feedu (IDS kraje), feed se volí povinným query parametrem `feed` (kód z `gtfs_feeds`); neznámý feed vrací 404
+-   zastávky se zadávají pouze GTFS `ids` nebo `names` (ASW/CIS id, presety a `airCondition` jsou specifické pro PID)
+-   zdrojová DB funkce `get_feed_departures(feed_id, ...)` – feedově omezená varianta `get_departures` (`trip_id` a `stop_id` jsou unikátní jen v rámci feedu); prázdné `pickup_type`/`drop_off_type` se dle GTFS bere jako běžný nástup/výstup
+-   zdrojové tabulky
+    -   `gtfs_precomputed_departures`, `gtfs_stops`, `gtfs_run_numbers`, `vehiclepositions_positions`, `vehiclepositions_trips`, `vehiclepositions_vehicle_descriptors`, `vehiclepositions_cis_stops`, `jis_infotexts`, `departures_directions`
+-   formát odpovědi je shodný s `/v2/pid/departureboards` (bez hlavičky `X-Golemio-Preset-Metadata`)
+-   cachováno na 5 sekund (stale-while-revalidate 5 sekund)
 ### PID Departure Boards v2
 > **Vypnuto** – endpoint není v rozsahu modulu public-transport, router je zakomentovaný v `src/output-gateway/index.ts`.

package/docs/openapi-output.yaml CHANGED Viewed

@@ -46,6 +46,9 @@ tags:
 #
     - name: 🕐 Public Vehicle Positions (v2)
       description: Multi-feed live vehicle positions served from cache
+    - name: 🚏 Departure Boards (v1)
+      description: <img src="https://img.shields.io/badge/stability-experimental-orange" alt="golemioapi-stability-badge" /> Departure boards of any GTFS feed (IDS region), computed from the feed's timetable and live vehicle positions.
 #
 #     - name: 🕒 Public Departures (v2)
 #       description: <img src="https://img.shields.io/badge/opendata-available-green" alt="golemioapi-opendata-badge" />
@@ -964,6 +967,64 @@ paths:
                 "404":
                     description: Not found
+    /v1/public-transport/departureboards:
+        get:
+            summary: GET Departure Boards
+            description: >-
+                Departures of the feed given by `feed` (a code from `/v1/public-transport/gtfs/feeds`).
+                You have to use query parameters `ids` or `names` in array format - eg. `ids[]=1&ids[]=3`.
+                **At least one of them is required.** The maximum is 100 stops combined in one request.
+            tags:
+                - 🚏 Departure Boards (v1)
+            parameters:
+                - name: feed
+                  in: query
+                  description: GTFS feed code (from the gtfs_feeds registry) whose stops and departures are returned.
+                  required: true
+                  schema:
+                      type: string
+                      example: "pid"
+                - $ref: "#/components/parameters/DepartureBoardsIds"
+                - $ref: "#/components/parameters/DepartureBoardsNames"
+                - $ref: "#/components/parameters/DepartureBoardsMinutesBefore"
+                - $ref: "#/components/parameters/DepartureBoardsMinutesAfter"
+                - $ref: "#/components/parameters/DepartureBoardsTimeFrom"
+                - $ref: "#/components/parameters/DepartureBoardsPreferredTimezone"
+                - name: mode
+                  in: query
+                  description: >-
+                      Valid entries: `departures` (default), `arrivals`, `mixed`. `departures` returns all connections that depart from selected stops (does not return connections for which it is the final stop). `arrivals` returns all connections that arrive into the stops (does not return connections for which it is the first stop). `mixed` returns everything.
+                  required: false
+                  schema:
+                      type: string
+                      example: "departures"
+                - $ref: "#/components/parameters/DepartureBoardsOrder"
+                - $ref: "#/components/parameters/DepartureBoardsFilter"
+                - $ref: "#/components/parameters/DepartureBoardsSkip"
+                - $ref: "#/components/parameters/DepartureBoardsLimit"
+                - $ref: "#/components/parameters/DepartureBoardsTotal"
+                - $ref: "#/components/parameters/DepartureBoardsOffset"
+                - $ref: "#/components/parameters/DepartureBoardsAppendHeadsignsLimit"
+            responses:
+                "200":
+                    description: Can return empty data in departures property (empty array []) if no departures were found
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=5, stale-while-revalidate=5
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/PIDDepartureBoard"
+                "400":
+                    description: Invalid query parameters
+                "401":
+                    $ref: "#/components/responses/UnauthorizedError"
+                "404":
+                    description: Unknown feed or no stops found
 #     /v2/pid/departureboards:
 #         get:
 #             summary: GET Departure Boards
@@ -3355,11 +3416,13 @@ components:
             properties:
                 node:
                     type: number
-                    description: ASW ID of node
+                    nullable: true
+                    description: ASW ID of node, null for stops without an ASW id (e.g. feeds other than PID)
                     example: 100
                 stop:
                     type: number
-                    description: Identification of the stop within the node.
+                    nullable: true
+                    description: Identification of the stop within the node, null for stops without an ASW id
                     example: 2
             required:
                 - node

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/public-transport",
-    "version": "0.1.0-dev.2922113447",
+    "version": "0.1.0-dev.2927028941",
     "description": "Golemio PID Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",