@golemio/pid 2.3.3-dev.676525380 → 2.3.3-dev.677483558

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 (5) hide show
  1. package/db/example/09_departureboards_testdata_nogapfilter.sql +2 -1
  2. package/dist/output-gateway/pid/models/helpers/FilterHelper.d.ts +1 -0
  3. package/dist/output-gateway/pid/models/helpers/FilterHelper.js +10 -2
  4. package/dist/output-gateway/pid/models/helpers/FilterHelper.js.map +1 -1
  5. package/package.json +1 -1
package/db/example/09_departureboards_testdata_nogapfilter.sql CHANGED
@@ -461,7 +461,7 @@ INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, dep
461
461
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:08:00', NULL, '7:08:00', NULL, '0', '0', 9.666878, NULL, 'U739Z1P', 23, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
462
462
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:09:00', NULL, '7:09:00', NULL, '0', '0', 9.870897, NULL, 'U237Z3P', 24, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
463
463
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:10:00', NULL, '7:10:00', NULL, '0', '0', 10.064458, NULL, 'U237Z13P', 25, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
464
- INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:13:00', NULL, '7:13:00', NULL, '0', '0', 10.538996, NULL, 'U539Z2P', 26, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
464
+ INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:13:00', NULL, '7:13:00', NULL, '0', '0', 10.538996, NULL, 'U539Z1P', 26, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
465
465
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:14:00', NULL, '7:14:00', NULL, '0', '0', 11.013035, NULL, 'U483Z2P', 27, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
466
466
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:16:00', NULL, '7:16:00', NULL, '0', '0', 11.62471, NULL, 'U809Z4P', 28, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
467
467
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:17:00', NULL, '7:17:00', NULL, '0', '0', 11.998445, NULL, 'U138Z2P', 29, '22_7028_220516', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
@@ -1492,6 +1492,7 @@ INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, dep
1492
1492
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:40:00', NULL, '7:40:00', NULL, '0', '0', 17.070948, NULL, 'U47Z2P', 37, '9_7027_220502', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
1493
1493
  INSERT INTO ropidgtfs_stop_times_actual (arrival_time, arrival_time_seconds, departure_time, departure_time_seconds, drop_off_type, pickup_type, shape_dist_traveled, stop_headsign, stop_id, stop_sequence, trip_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, timepoint) VALUES('7:42:00', NULL, '7:42:00', NULL, '0', '0', 17.380799, NULL, 'U612Z12P', 38, '9_7027_220502', -1, '2022-05-23 05:35:26.726', NULL, -1, '2022-05-23 05:35:26.726', NULL, NULL);
1494
1494
 
1495
+ INSERT INTO ropidgtfs_stops_actual (level_id, location_type, parent_station, platform_code, stop_code, stop_desc, stop_id, stop_lat, stop_lon, stop_name, stop_timezone, stop_url, wheelchair_boarding, zone_id, asw_node_id, asw_stop_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by) VALUES(NULL, 0, NULL, 'A', NULL, NULL, 'U539Z1P', 50.081158, 14.419593, 'Národní třída', NULL, NULL, 1, 'P', 539, 1, -1, '2022-10-06 05:48:40.317', NULL, -1, '2022-10-06 05:48:40.317', NULL);
1495
1496
  INSERT INTO ropidgtfs_stops_actual (location_type, parent_station, platform_code, stop_id, stop_lat, stop_lon, stop_name, stop_url, wheelchair_boarding, zone_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, level_id, stop_code, stop_desc, stop_timezone) VALUES(0, NULL, 'B', 'U539Z2P', 50.081688, 14.419497, 'Národní třída', NULL, 1, 'P', -1, '2022-05-23 05:35:25.596', NULL, -1, '2022-05-23 05:35:25.596', NULL, NULL, NULL, NULL, NULL);
1496
1497
 
1497
1498
  INSERT INTO ropidgtfs_trips_actual (bikes_allowed, block_id, direction_id, exceptional, route_id, service_id, shape_id, trip_headsign, trip_id, wheelchair_accessible, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, trip_operation_type, trip_short_name) VALUES(0, NULL, 1, 0, 'L18', '1111111-1', 'L18V2', 'Nádraží Podbaba', '18_3621_220516', 2, -1, '2022-05-23 05:35:25.763', NULL, -1, '2022-05-23 05:35:25.763', NULL, NULL, NULL);
package/dist/output-gateway/pid/models/helpers/FilterHelper.d.ts CHANGED
@@ -17,5 +17,6 @@ export declare class FilterHelper {
17
17
  static isFillFilterType(filter: DepartureFilter): boolean;
18
18
  private static isInFillBucket;
19
19
  private static isInOnceBucketWithHeading;
20
+ private static isInOnceBucketWithHeadingWithStop;
20
21
  private static isInOnceBucket;
21
22
  }
package/dist/output-gateway/pid/models/helpers/FilterHelper.js CHANGED
@@ -18,14 +18,15 @@ FilterHelper.routeOnceHeadingCondition = (accumulator, currentDeparture) => {
18
18
  };
19
19
  FilterHelper.routeOnceHeadingNoGapCondition = (accumulator, currentDeparture) => {
20
20
  // extension of routeOnceHeading filter, when we skip some route_id afterwards it doesnt show up even different headings
21
- return (!_a.isInOnceBucketWithHeading(accumulator, currentDeparture) && !_a.isInFillBucket(accumulator, currentDeparture));
21
+ return (!_a.isInOnceBucketWithHeadingWithStop(accumulator, currentDeparture) &&
22
+ !_a.isInFillBucket(accumulator, currentDeparture));
22
23
  };
23
24
  FilterHelper.routeOnceCondition = (accumulator, currentDeparture) => {
24
25
  // only the first departure to respone for trips with same route_id
25
26
  return !_a.isInOnceBucket(accumulator, currentDeparture);
26
27
  };
27
28
  FilterHelper.isInFillBucket = (accumulator, currentDeparture) => {
28
- return accumulator.fill.findIndex((e) => e.route_id === currentDeparture.route_id) >= 0;
29
+ return (accumulator.fill.findIndex((e) => e.route_id === currentDeparture.route_id && e.stop_id === currentDeparture.stop_id) >= 0);
29
30
  };
30
31
  FilterHelper.isInOnceBucketWithHeading = (accumulator, currentDeparture) => {
31
32
  return (accumulator.once.findIndex((e) => e.route_id === currentDeparture.route_id &&
@@ -33,6 +34,13 @@ FilterHelper.isInOnceBucketWithHeading = (accumulator, currentDeparture) => {
33
34
  ? e.stop_headsign === currentDeparture.stop_headsign
34
35
  : e.trip_headsign === currentDeparture.trip_headsign)) >= 0);
35
36
  };
37
+ FilterHelper.isInOnceBucketWithHeadingWithStop = (accumulator, currentDeparture) => {
38
+ return (accumulator.once.findIndex((e) => e.route_id === currentDeparture.route_id &&
39
+ (currentDeparture.stop_headsign
40
+ ? e.stop_headsign === currentDeparture.stop_headsign
41
+ : e.trip_headsign === currentDeparture.trip_headsign) &&
42
+ e.stop_id === currentDeparture.stop_id) >= 0);
43
+ };
36
44
  FilterHelper.isInOnceBucket = (accumulator, currentDeparture) => {
37
45
  return accumulator.once.findIndex((e) => e.route_id === currentDeparture.route_id) >= 0;
38
46
  };
package/dist/output-gateway/pid/models/helpers/FilterHelper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FilterHelper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/models/helpers/FilterHelper.ts"],"names":[],"mappings":";;;;AAAA,+BAAyD;AAWzD,MAAa,YAAY;IAwBd,MAAM,CAAC,gBAAgB,CAAC,MAAuB;QAClD,OAAO,CACH,MAAM,KAAK,qBAAe,CAAC,eAAe;YAC1C,MAAM,KAAK,qBAAe,CAAC,uBAAuB;YAClD,MAAM,KAAK,qBAAe,CAAC,6BAA6B,CAC3D,CAAC;IACN,CAAC;;AA9BL,oCAsDC;;AArDiB,sCAAyB,GAAyB,CAC5D,WAA4B,EAC5B,gBAA+B,EACjC,EAAE;IACA,+EAA+E;IAC/E,OAAO,CAAC,EAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;AAC1E,CAAE,CAAA;AAEY,2CAA8B,GAAyB,CACjE,WAA4B,EAC5B,gBAA+B,EACjC,EAAE;IACA,wHAAwH;IACxH,OAAO,CACH,CAAC,EAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAAI,CAAC,cAAc,CAAC,WAAW,EAAE,gBAAgB,CAAC,CACxH,CAAC;AACN,CAAE,CAAA;AAEY,+BAAkB,GAAyB,CAAC,WAA4B,EAAE,gBAA+B,EAAE,EAAE;IACvH,mEAAmE;IACnE,OAAO,CAAC,EAAI,CAAC,cAAc,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;AAC/D,CAAE,CAAA;AAUa,2BAAc,GAAyB,CAAC,WAA4B,EAAE,gBAA+B,EAAE,EAAE;IACpH,OAAO,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC5F,CAAE,CAAA;AAEa,sCAAyB,GAAyB,CAC7D,WAA4B,EAC5B,gBAA+B,EACjC,EAAE;IACA,OAAO,CACH,WAAW,CAAC,IAAI,CAAC,SAAS,CACtB,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ;QACxC,CAAC,gBAAgB,CAAC,aAAa;YAC3B,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,gBAAgB,CAAC,aAAa;YACpD,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,gBAAgB,CAAC,aAAa,CAAC,CAChE,IAAI,CAAC,CACT,CAAC;AACN,CAAE,CAAA;AAEa,2BAAc,GAAyB,CAAC,WAA4B,EAAE,gBAA+B,EAAE,EAAE;IACpH,OAAO,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC5F,CAAE,CAAA"}
1
+ {"version":3,"file":"FilterHelper.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/models/helpers/FilterHelper.ts"],"names":[],"mappings":";;;;AAAA,+BAAyD;AAWzD,MAAa,YAAY;IAyBd,MAAM,CAAC,gBAAgB,CAAC,MAAuB;QAClD,OAAO,CACH,MAAM,KAAK,qBAAe,CAAC,eAAe;YAC1C,MAAM,KAAK,qBAAe,CAAC,uBAAuB;YAClD,MAAM,KAAK,qBAAe,CAAC,6BAA6B,CAC3D,CAAC;IACN,CAAC;;AA/BL,oCA2EC;;AA1EiB,sCAAyB,GAAyB,CAC5D,WAA4B,EAC5B,gBAA+B,EACjC,EAAE;IACA,+EAA+E;IAC/E,OAAO,CAAC,EAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;AAC1E,CAAE,CAAA;AAEY,2CAA8B,GAAyB,CACjE,WAA4B,EAC5B,gBAA+B,EACjC,EAAE;IACA,wHAAwH;IACxH,OAAO,CACH,CAAC,EAAI,CAAC,iCAAiC,CAAC,WAAW,EAAE,gBAAgB,CAAC;QACtE,CAAC,EAAI,CAAC,cAAc,CAAC,WAAW,EAAE,gBAAgB,CAAC,CACtD,CAAC;AACN,CAAE,CAAA;AAEY,+BAAkB,GAAyB,CAAC,WAA4B,EAAE,gBAA+B,EAAE,EAAE;IACvH,mEAAmE;IACnE,OAAO,CAAC,EAAI,CAAC,cAAc,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;AAC/D,CAAE,CAAA;AAUa,2BAAc,GAAyB,CAAC,WAA4B,EAAE,gBAA+B,EAAE,EAAE;IACpH,OAAO,CACH,WAAW,CAAC,IAAI,CAAC,SAAS,CACtB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,KAAK,gBAAgB,CAAC,OAAO,CAC5F,IAAI,CAAC,CACT,CAAC;AACN,CAAE,CAAA;AAEa,sCAAyB,GAAyB,CAC7D,WAA4B,EAC5B,gBAA+B,EACjC,EAAE;IACA,OAAO,CACH,WAAW,CAAC,IAAI,CAAC,SAAS,CACtB,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ;QACxC,CAAC,gBAAgB,CAAC,aAAa;YAC3B,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,gBAAgB,CAAC,aAAa;YACpD,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,gBAAgB,CAAC,aAAa,CAAC,CAChE,IAAI,CAAC,CACT,CAAC;AACN,CAAE,CAAA;AAEa,8CAAiC,GAAyB,CACrE,WAA4B,EAC5B,gBAA+B,EACjC,EAAE;IACA,OAAO,CACH,WAAW,CAAC,IAAI,CAAC,SAAS,CACtB,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ;QACxC,CAAC,gBAAgB,CAAC,aAAa;YAC3B,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,gBAAgB,CAAC,aAAa;YACpD,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,gBAAgB,CAAC,aAAa,CAAC;QACzD,CAAC,CAAC,OAAO,KAAK,gBAAgB,CAAC,OAAO,CAC7C,IAAI,CAAC,CACT,CAAC;AACN,CAAE,CAAA;AAEa,2BAAc,GAAyB,CAAC,WAA4B,EAAE,gBAA+B,EAAE,EAAE;IACpH,OAAO,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC5F,CAAE,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/pid",
3
- "version": "2.3.3-dev.676525380",
3
+ "version": "2.3.3-dev.677483558",
4
4
  "description": "Golemio PID Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",