corequery 0.23.0 → 0.24.0

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 (31) hide show
  1. package/package.json +1 -1
  2. package/server/dist/server/api/handlers/departures/v0/index.js +1 -1
  3. package/server/dist/server/api/handlers/departures/v0/index.js.map +1 -1
  4. package/server/dist/server/api/handlers/service/v0/index.js +3 -3
  5. package/server/dist/server/api/handlers/service/v0/index.js.map +1 -1
  6. package/server/dist/server/data/service/connection/entire-vehicle-forms-service-connection.d.ts +14 -0
  7. package/server/dist/server/data/service/{service-connection.js → connection/entire-vehicle-forms-service-connection.js} +9 -9
  8. package/server/dist/server/data/service/connection/entire-vehicle-forms-service-connection.js.map +1 -0
  9. package/server/dist/server/data/service/connection/generic-connection.d.ts +18 -0
  10. package/server/dist/server/data/service/connection/generic-connection.js +23 -0
  11. package/server/dist/server/data/service/connection/generic-connection.js.map +1 -0
  12. package/server/dist/server/data/service/connection/service-connection.d.ts +3 -0
  13. package/server/dist/server/data/service/connection/service-connection.js +2 -0
  14. package/server/dist/server/data/service/connection/service-connection.js.map +1 -0
  15. package/server/dist/server/data/service/index.d.ts +3 -1
  16. package/server/dist/server/data/service/index.js +3 -1
  17. package/server/dist/server/data/service/index.js.map +1 -1
  18. package/server/dist/server/data/service/service-originating-movement.d.ts +2 -3
  19. package/server/dist/server/data/service/service-originating-movement.js +2 -5
  20. package/server/dist/server/data/service/service-originating-movement.js.map +1 -1
  21. package/server/dist/server/data/service/service-regular-movement.d.ts +2 -3
  22. package/server/dist/server/data/service/service-regular-movement.js +2 -5
  23. package/server/dist/server/data/service/service-regular-movement.js.map +1 -1
  24. package/server/dist/server/data/service/service-terminating-movement.d.ts +2 -3
  25. package/server/dist/server/data/service/service-terminating-movement.js +2 -5
  26. package/server/dist/server/data/service/service-terminating-movement.js.map +1 -1
  27. package/server/dist/server/data/service/service.d.ts +4 -3
  28. package/server/dist/server/data/service/service.js +2 -4
  29. package/server/dist/server/data/service/service.js.map +1 -1
  30. package/server/dist/server/data/service/service-connection.d.ts +0 -21
  31. package/server/dist/server/data/service/service-connection.js.map +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "corequery",
3
- "version": "0.23.0",
3
+ "version": "0.24.0",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "server/dist",
@@ -37,7 +37,7 @@ function toApiResult(app, dep) {
37
37
  isCancelled: dep.service.isCancelled,
38
38
  movement: {
39
39
  index: dep.movementIndex,
40
- positionId: dep.movement.positionId,
40
+ positionId: dep.movement.currentPositionId,
41
41
  time: dep.movement.timeRelevantToDeparturesAlgorithm.toString(),
42
42
  formerTime: dep.movement.formerTimeRelevantToDeparturesAlgorithm?.toString() ??
43
43
  null,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,GAAe,EACf,IAAkC;IAElC,4DAA4D;IAC5D,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE;QAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IAEjE,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IAEtC,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CACrD,IAAI,CAAC,MAAM,EACX,GAAG,EACH,UAAU,CACX,CAAC;IAEF,MAAM,OAAO,GAAgB,EAAE,CAAC;IAEhC,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACtE,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAED,OAAO;QACL,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;KACxD,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB;IAC9B,OAAO,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC;SACxC,KAAK,CAAC;QACL,YAAY,EAAE,QAAQ;QACtB,YAAY,EAAE,OAAO;KACtB,CAAC;SACD,SAAS,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,WAAW,CAAC,GAAc,EAAE,GAAc;IACjD,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAE5E,OAAO;QACL,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ;QAC9B,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;QAExC,wEAAwE;QACxE,wEAAwE;QACxE,2EAA2E;QAC3E,wBAAwB;QACxB,sBAAsB,EAAE,YAAY;QACpC,wBAAwB,EAAE,IAAI;QAE9B,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO;QAC5B,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE;QAErC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,WAAW;QAEpC,QAAQ,EAAE;YACR,KAAK,EAAE,GAAG,CAAC,aAAa;YACxB,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,UAAU;YACnC,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,iCAAiC,CAAC,QAAQ,EAAE;YAE/D,UAAU,EACR,GAAG,CAAC,QAAQ,CAAC,uCAAuC,EAAE,QAAQ,EAAE;gBAChE,IAAI;SACP;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,GAAe,EACf,IAAkC;IAElC,4DAA4D;IAC5D,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE;QAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IAEjE,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IAEtC,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CACrD,IAAI,CAAC,MAAM,EACX,GAAG,EACH,UAAU,CACX,CAAC;IAEF,MAAM,OAAO,GAAgB,EAAE,CAAC;IAEhC,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACtE,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAED,OAAO;QACL,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;KACxD,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB;IAC9B,OAAO,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC;SACxC,KAAK,CAAC;QACL,YAAY,EAAE,QAAQ;QACtB,YAAY,EAAE,OAAO;KACtB,CAAC;SACD,SAAS,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,WAAW,CAAC,GAAc,EAAE,GAAc;IACjD,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAE5E,OAAO;QACL,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ;QAC9B,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;QAExC,wEAAwE;QACxE,wEAAwE;QACxE,2EAA2E;QAC3E,wBAAwB;QACxB,sBAAsB,EAAE,YAAY;QACpC,wBAAwB,EAAE,IAAI;QAE9B,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO;QAC5B,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE;QAErC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,WAAW;QAEpC,QAAQ,EAAE;YACR,KAAK,EAAE,GAAG,CAAC,aAAa;YACxB,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,iBAAiB;YAC1C,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,iCAAiC,CAAC,QAAQ,EAAE;YAE/D,UAAU,EACR,GAAG,CAAC,QAAQ,CAAC,uCAAuC,EAAE,QAAQ,EAAE;gBAChE,IAAI;SACP;KACF,CAAC;AACJ,CAAC"}
@@ -20,7 +20,7 @@ function toApiMovement(x) {
20
20
  if (x.type === "originating") {
21
21
  return {
22
22
  stopId: x.stopId,
23
- positionId: x.positionId,
23
+ positionId: x.currentPositionId,
24
24
  arrivalTime: null,
25
25
  formerArrivalTime: null,
26
26
  departureTime: x.departureTime.toString(),
@@ -30,7 +30,7 @@ function toApiMovement(x) {
30
30
  else if (x.type === "regular") {
31
31
  return {
32
32
  stopId: x.stopId,
33
- positionId: x.positionId,
33
+ positionId: x.currentPositionId,
34
34
  arrivalTime: x.arrivalTime.toString(),
35
35
  formerArrivalTime: x.formerArrivalTime?.toString() ?? null,
36
36
  departureTime: x.departureTime.toString(),
@@ -40,7 +40,7 @@ function toApiMovement(x) {
40
40
  else if (x.type === "terminating") {
41
41
  return {
42
42
  stopId: x.stopId,
43
- positionId: x.positionId,
43
+ positionId: x.currentPositionId,
44
44
  arrivalTime: x.arrivalTime.toString(),
45
45
  formerArrivalTime: x.formerArrivalTime?.toString() ?? null,
46
46
  departureTime: null,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/service/v0/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAMlD,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,GAAe,EACf,IAA+B;IAE/B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAC/C,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,aAAa,CACnB,CAAC;IAEF,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAE9C,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAExE,OAAO;QACL,OAAO,EAAE;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;YAEpC,sBAAsB,EAAE,QAAQ;YAEhC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE,OAAO,CAAC,gBAAgB,EAAE;YAEjC,WAAW,EAAE,OAAO,CAAC,WAAW;YAEhC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,CAAkB;IACvC,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAC7B,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,IAAI;YACvB,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE;YACzC,mBAAmB,EAAE,CAAC,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,IAAI;SAC/D,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE;YACrC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,EAAE,QAAQ,EAAE,IAAI,IAAI;YAC1D,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE;YACzC,mBAAmB,EAAE,CAAC,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,IAAI;SAC/D,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACpC,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE;YACrC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,EAAE,QAAQ,EAAE,IAAI,IAAI;YAC1D,aAAa,EAAE,IAAI;YACnB,mBAAmB,EAAE,IAAI;SAC1B,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,IAAI;YACvB,aAAa,EAAE,IAAI;YACnB,mBAAmB,EAAE,IAAI;SAC1B,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/service/v0/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAMlD,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,GAAe,EACf,IAA+B;IAE/B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAC/C,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,aAAa,CACnB,CAAC;IAEF,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAE9C,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAExE,OAAO;QACL,OAAO,EAAE;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;YAEpC,sBAAsB,EAAE,QAAQ;YAEhC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE,OAAO,CAAC,gBAAgB,EAAE;YAEjC,WAAW,EAAE,OAAO,CAAC,WAAW;YAEhC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,CAAkB;IACvC,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAC7B,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,CAAC,CAAC,iBAAiB;YAC/B,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,IAAI;YACvB,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE;YACzC,mBAAmB,EAAE,CAAC,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,IAAI;SAC/D,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,CAAC,CAAC,iBAAiB;YAC/B,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE;YACrC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,EAAE,QAAQ,EAAE,IAAI,IAAI;YAC1D,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE;YACzC,mBAAmB,EAAE,CAAC,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,IAAI;SAC/D,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACpC,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,CAAC,CAAC,iBAAiB;YAC/B,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE;YACrC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,EAAE,QAAQ,EAAE,IAAI,IAAI;YAC1D,aAAa,EAAE,IAAI;YACnB,mBAAmB,EAAE,IAAI;SAC1B,CAAC;IACJ,CAAC;SAAM,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,IAAI;YACvB,aAAa,EAAE,IAAI;YACnB,mBAAmB,EAAE,IAAI;SAC1B,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;AACH,CAAC"}
@@ -0,0 +1,14 @@
1
+ type EntireVehicleFormsServiceConnectionFields = {
2
+ readonly direction: "from-other" | "to-other";
3
+ readonly otherServiceSourceId: string;
4
+ readonly otherServiceIntrasourceId: string;
5
+ };
6
+ export declare class EntireVehicleFormsServiceConnection {
7
+ readonly direction: "from-other" | "to-other";
8
+ readonly otherServiceSourceId: string;
9
+ readonly otherServiceIntrasourceId: string;
10
+ constructor(fields: EntireVehicleFormsServiceConnectionFields);
11
+ with(fields: Partial<EntireVehicleFormsServiceConnectionFields>): EntireVehicleFormsServiceConnection;
12
+ get type(): "entire-vehicle-forms-service";
13
+ }
14
+ export {};
@@ -1,5 +1,7 @@
1
- export class ServiceConnection {
2
- type;
1
+ // The connection type which indicates that CoreQuery should lookup the
2
+ // next/previous service repeatedly until it finds a serviced stop in common, so
3
+ // that it can show the full (useful) journey that the vehicle takes/took.
4
+ export class EntireVehicleFormsServiceConnection {
3
5
  direction;
4
6
  // Other service only given as foreign key, because it could theoretically be
5
7
  // quite a long/infinite chain, e.g. for City Circle trains that just go round
@@ -7,18 +9,16 @@ export class ServiceConnection {
7
9
  // to be "useful".
8
10
  otherServiceSourceId;
9
11
  otherServiceIntrasourceId;
10
- movementIndex;
11
- otherServiceMovementIndex;
12
12
  constructor(fields) {
13
- this.type = fields.type;
14
13
  this.direction = fields.direction;
15
14
  this.otherServiceSourceId = fields.otherServiceSourceId;
16
15
  this.otherServiceIntrasourceId = fields.otherServiceIntrasourceId;
17
- this.movementIndex = fields.movementIndex;
18
- this.otherServiceMovementIndex = fields.otherServiceMovementIndex;
19
16
  }
20
17
  with(fields) {
21
- return new ServiceConnection({ ...this, ...fields });
18
+ return new EntireVehicleFormsServiceConnection({ ...this, ...fields });
19
+ }
20
+ get type() {
21
+ return "entire-vehicle-forms-service";
22
22
  }
23
23
  }
24
- //# sourceMappingURL=service-connection.js.map
24
+ //# sourceMappingURL=entire-vehicle-forms-service-connection.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"entire-vehicle-forms-service-connection.js","sourceRoot":"","sources":["../../../../../data/service/connection/entire-vehicle-forms-service-connection.ts"],"names":[],"mappings":"AAMA,uEAAuE;AACvE,gFAAgF;AAChF,0EAA0E;AAC1E,MAAM,OAAO,mCAAmC;IACrC,SAAS,CAA4B;IAE9C,6EAA6E;IAC7E,8EAA8E;IAC9E,8EAA8E;IAC9E,kBAAkB;IACT,oBAAoB,CAAS;IAC7B,yBAAyB,CAAS;IAE3C,YAAY,MAAiD;QAC3D,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;QACxD,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;IACpE,CAAC;IAED,IAAI,CACF,MAA0D;QAE1D,OAAO,IAAI,mCAAmC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,8BAAuC,CAAC;IACjD,CAAC;CACF"}
@@ -0,0 +1,18 @@
1
+ type GenericConnectionFields = {
2
+ readonly direction: "from-other" | "to-other" | "bidirectional";
3
+ readonly otherServiceSourceId: string;
4
+ readonly otherServiceIntrasourceId: string;
5
+ readonly movementIndex: number;
6
+ readonly otherServiceMovementIndex: number;
7
+ };
8
+ export declare class GenericConnection {
9
+ readonly direction: "from-other" | "to-other" | "bidirectional";
10
+ readonly otherServiceSourceId: string;
11
+ readonly otherServiceIntrasourceId: string;
12
+ readonly movementIndex: number;
13
+ readonly otherServiceMovementIndex: number;
14
+ constructor(fields: GenericConnectionFields);
15
+ with(fields: Partial<GenericConnectionFields>): GenericConnection;
16
+ get type(): "other";
17
+ }
18
+ export {};
@@ -0,0 +1,23 @@
1
+ // Some other type of connection. CoreQuery probably just shows this on the
2
+ // service page as "Connects to XYZ", without any further special logic.
3
+ export class GenericConnection {
4
+ direction;
5
+ otherServiceSourceId;
6
+ otherServiceIntrasourceId;
7
+ movementIndex;
8
+ otherServiceMovementIndex;
9
+ constructor(fields) {
10
+ this.direction = fields.direction;
11
+ this.otherServiceSourceId = fields.otherServiceSourceId;
12
+ this.otherServiceIntrasourceId = fields.otherServiceIntrasourceId;
13
+ this.movementIndex = fields.movementIndex;
14
+ this.otherServiceMovementIndex = fields.otherServiceMovementIndex;
15
+ }
16
+ with(fields) {
17
+ return new GenericConnection({ ...this, ...fields });
18
+ }
19
+ get type() {
20
+ return "other";
21
+ }
22
+ }
23
+ //# sourceMappingURL=generic-connection.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generic-connection.js","sourceRoot":"","sources":["../../../../../data/service/connection/generic-connection.ts"],"names":[],"mappings":"AASA,2EAA2E;AAC3E,wEAAwE;AACxE,MAAM,OAAO,iBAAiB;IACnB,SAAS,CAA8C;IACvD,oBAAoB,CAAS;IAC7B,yBAAyB,CAAS;IAElC,aAAa,CAAS;IACtB,yBAAyB,CAAS;IAE3C,YAAY,MAA+B;QACzC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;QACxD,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;QAElE,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;IACpE,CAAC;IAED,IAAI,CAAC,MAAwC;QAC3C,OAAO,IAAI,iBAAiB,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,OAAgB,CAAC;IAC1B,CAAC;CACF"}
@@ -0,0 +1,3 @@
1
+ import type { EntireVehicleFormsServiceConnection } from "../../../../server/data/service/connection/entire-vehicle-forms-service-connection.js";
2
+ import type { GenericConnection } from "../../../../server/data/service/connection/generic-connection.js";
3
+ export type ServiceConnection = EntireVehicleFormsServiceConnection | GenericConnection;
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=service-connection.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"service-connection.js","sourceRoot":"","sources":["../../../../../data/service/connection/service-connection.ts"],"names":[],"mappings":""}
@@ -1,5 +1,7 @@
1
1
  export * from "./departure.js";
2
- export * from "./service-connection.js";
2
+ export * from "./connection/entire-vehicle-forms-service-connection.js";
3
+ export * from "./connection/generic-connection.js";
4
+ export * from "./connection/service-connection.js";
3
5
  export * from "./service-movement.js";
4
6
  export * from "./service-originating-movement.js";
5
7
  export * from "./service-passing-movement.js";
@@ -1,5 +1,7 @@
1
1
  export * from "./departure.js";
2
- export * from "./service-connection.js";
2
+ export * from "./connection/entire-vehicle-forms-service-connection.js";
3
+ export * from "./connection/generic-connection.js";
4
+ export * from "./connection/service-connection.js";
3
5
  export * from "./service-movement.js";
4
6
  export * from "./service-originating-movement.js";
5
7
  export * from "./service-passing-movement.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../data/service/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../data/service/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yDAAyD,CAAC;AACxE,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,uBAAuB,CAAC;AACtC,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC"}
@@ -2,7 +2,7 @@ import type { ServiceTimeType } from "../../../server/data/service/service-time-
2
2
  type ServiceOriginatingMovementFields = {
3
3
  readonly stopId: number;
4
4
  readonly originalPositionId: number | null;
5
- readonly updatedPositionId: number | null;
5
+ readonly currentPositionId: number | null;
6
6
  readonly departureTimeType: ServiceTimeType;
7
7
  readonly departureTime: Temporal.Instant;
8
8
  readonly formerDepartureTime: Temporal.Instant | null;
@@ -10,7 +10,7 @@ type ServiceOriginatingMovementFields = {
10
10
  export declare class ServiceOriginatingMovement {
11
11
  readonly stopId: number;
12
12
  readonly originalPositionId: number | null;
13
- readonly updatedPositionId: number | null;
13
+ readonly currentPositionId: number | null;
14
14
  readonly departureTimeType: ServiceTimeType;
15
15
  readonly departureTime: Temporal.Instant;
16
16
  readonly formerDepartureTime: Temporal.Instant | null;
@@ -22,6 +22,5 @@ export declare class ServiceOriginatingMovement {
22
22
  get timeTypeRelevantToDeparturesAlgorithm(): ServiceTimeType;
23
23
  get timeRelevantToDeparturesAlgorithm(): Temporal.Instant;
24
24
  get formerTimeRelevantToDeparturesAlgorithm(): Temporal.Instant | null;
25
- get positionId(): number | null;
26
25
  }
27
26
  export {};
@@ -1,14 +1,14 @@
1
1
  export class ServiceOriginatingMovement {
2
2
  stopId;
3
3
  originalPositionId;
4
- updatedPositionId;
4
+ currentPositionId;
5
5
  departureTimeType;
6
6
  departureTime;
7
7
  formerDepartureTime;
8
8
  constructor(fields) {
9
9
  this.stopId = fields.stopId;
10
10
  this.originalPositionId = fields.originalPositionId;
11
- this.updatedPositionId = fields.updatedPositionId;
11
+ this.currentPositionId = fields.currentPositionId;
12
12
  this.departureTimeType = fields.departureTimeType;
13
13
  this.departureTime = fields.departureTime;
14
14
  this.formerDepartureTime = fields.formerDepartureTime;
@@ -34,8 +34,5 @@ export class ServiceOriginatingMovement {
34
34
  get formerTimeRelevantToDeparturesAlgorithm() {
35
35
  return this.formerDepartureTime;
36
36
  }
37
- get positionId() {
38
- return this.updatedPositionId ?? this.originalPositionId;
39
- }
40
37
  }
41
38
  //# sourceMappingURL=service-originating-movement.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"service-originating-movement.js","sourceRoot":"","sources":["../../../../data/service/service-originating-movement.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,0BAA0B;IAC5B,MAAM,CAAS;IACf,kBAAkB,CAAgB;IAClC,iBAAiB,CAAgB;IAEjC,iBAAiB,CAAkB;IACnC,aAAa,CAAmB;IAChC,mBAAmB,CAA0B;IAEtD,YAAY,MAAwC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;IACxD,CAAC;IAED,IAAI,CACF,MAAiD;QAEjD,OAAO,IAAI,0BAA0B,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,aAAsB,CAAC;IAChC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,KAAc,CAAC;IACxB,CAAC;IAED,IAAI,qCAAqC;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,uCAAuC;QACzC,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,kBAAkB,CAAC;IAC3D,CAAC;CACF"}
1
+ {"version":3,"file":"service-originating-movement.js","sourceRoot":"","sources":["../../../../data/service/service-originating-movement.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,0BAA0B;IAC5B,MAAM,CAAS;IACf,kBAAkB,CAAgB;IAClC,iBAAiB,CAAgB;IAEjC,iBAAiB,CAAkB;IACnC,aAAa,CAAmB;IAChC,mBAAmB,CAA0B;IAEtD,YAAY,MAAwC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;IACxD,CAAC;IAED,IAAI,CACF,MAAiD;QAEjD,OAAO,IAAI,0BAA0B,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,aAAsB,CAAC;IAChC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,KAAc,CAAC;IACxB,CAAC;IAED,IAAI,qCAAqC;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,uCAAuC;QACzC,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;CACF"}
@@ -2,7 +2,7 @@ import type { ServiceTimeType } from "../../../server/data/service/service-time-
2
2
  type ServiceRegularMovementFields = {
3
3
  readonly stopId: number;
4
4
  readonly originalPositionId: number | null;
5
- readonly updatedPositionId: number | null;
5
+ readonly currentPositionId: number | null;
6
6
  readonly arrivalTimeType: ServiceTimeType;
7
7
  readonly arrivalTime: Temporal.Instant;
8
8
  readonly formerArrivalTime: Temporal.Instant | null;
@@ -15,7 +15,7 @@ type ServiceRegularMovementFields = {
15
15
  export declare class ServiceRegularMovement {
16
16
  readonly stopId: number;
17
17
  readonly originalPositionId: number | null;
18
- readonly updatedPositionId: number | null;
18
+ readonly currentPositionId: number | null;
19
19
  readonly arrivalTimeType: ServiceTimeType;
20
20
  readonly arrivalTime: Temporal.Instant;
21
21
  readonly formerArrivalTime: Temporal.Instant | null;
@@ -32,6 +32,5 @@ export declare class ServiceRegularMovement {
32
32
  get timeTypeRelevantToDeparturesAlgorithm(): ServiceTimeType;
33
33
  get timeRelevantToDeparturesAlgorithm(): Temporal.Instant;
34
34
  get formerTimeRelevantToDeparturesAlgorithm(): Temporal.Instant | null;
35
- get positionId(): number | null;
36
35
  }
37
36
  export {};
@@ -1,7 +1,7 @@
1
1
  export class ServiceRegularMovement {
2
2
  stopId;
3
3
  originalPositionId;
4
- updatedPositionId;
4
+ currentPositionId;
5
5
  arrivalTimeType;
6
6
  arrivalTime;
7
7
  formerArrivalTime;
@@ -13,7 +13,7 @@ export class ServiceRegularMovement {
13
13
  constructor(fields) {
14
14
  this.stopId = fields.stopId;
15
15
  this.originalPositionId = fields.originalPositionId;
16
- this.updatedPositionId = fields.updatedPositionId;
16
+ this.currentPositionId = fields.currentPositionId;
17
17
  this.arrivalTimeType = fields.arrivalTimeType;
18
18
  this.arrivalTime = fields.arrivalTime;
19
19
  this.formerArrivalTime = fields.formerArrivalTime;
@@ -44,8 +44,5 @@ export class ServiceRegularMovement {
44
44
  get formerTimeRelevantToDeparturesAlgorithm() {
45
45
  return this.formerDepartureTime;
46
46
  }
47
- get positionId() {
48
- return this.updatedPositionId ?? this.originalPositionId;
49
- }
50
47
  }
51
48
  //# sourceMappingURL=service-regular-movement.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"service-regular-movement.js","sourceRoot":"","sources":["../../../../data/service/service-regular-movement.ts"],"names":[],"mappings":"AAmBA,MAAM,OAAO,sBAAsB;IACxB,MAAM,CAAS;IACf,kBAAkB,CAAgB;IAClC,iBAAiB,CAAgB;IAEjC,eAAe,CAAkB;IACjC,WAAW,CAAmB;IAC9B,iBAAiB,CAA0B;IAE3C,iBAAiB,CAAkB;IACnC,aAAa,CAAmB;IAChC,mBAAmB,CAA0B;IAE7C,OAAO,CAAU;IACjB,QAAQ,CAAU;IAE3B,YAAY,MAAoC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;QAEtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,MAA6C;QAChD,OAAO,IAAI,sBAAsB,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,IAAI;QACN,OAAO,SAAkB,CAAC;IAC5B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,qCAAqC;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,uCAAuC;QACzC,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,kBAAkB,CAAC;IAC3D,CAAC;CACF"}
1
+ {"version":3,"file":"service-regular-movement.js","sourceRoot":"","sources":["../../../../data/service/service-regular-movement.ts"],"names":[],"mappings":"AAmBA,MAAM,OAAO,sBAAsB;IACxB,MAAM,CAAS;IACf,kBAAkB,CAAgB;IAClC,iBAAiB,CAAgB;IAEjC,eAAe,CAAkB;IACjC,WAAW,CAAmB;IAC9B,iBAAiB,CAA0B;IAE3C,iBAAiB,CAAkB;IACnC,aAAa,CAAmB;IAChC,mBAAmB,CAA0B;IAE7C,OAAO,CAAU;IACjB,QAAQ,CAAU;IAE3B,YAAY,MAAoC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;QAEtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,MAA6C;QAChD,OAAO,IAAI,sBAAsB,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,IAAI;QACN,OAAO,SAAkB,CAAC;IAC5B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,qCAAqC;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,uCAAuC;QACzC,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;CACF"}
@@ -2,7 +2,7 @@ import type { ServiceTimeType } from "../../../server/data/service/service-time-
2
2
  type ServiceTerminatingMovementFields = {
3
3
  readonly stopId: number;
4
4
  readonly originalPositionId: number | null;
5
- readonly updatedPositionId: number | null;
5
+ readonly currentPositionId: number | null;
6
6
  readonly arrivalTimeType: ServiceTimeType;
7
7
  readonly arrivalTime: Temporal.Instant;
8
8
  readonly formerArrivalTime: Temporal.Instant | null;
@@ -10,7 +10,7 @@ type ServiceTerminatingMovementFields = {
10
10
  export declare class ServiceTerminatingMovement {
11
11
  readonly stopId: number;
12
12
  readonly originalPositionId: number | null;
13
- readonly updatedPositionId: number | null;
13
+ readonly currentPositionId: number | null;
14
14
  readonly arrivalTimeType: ServiceTimeType;
15
15
  readonly arrivalTime: Temporal.Instant;
16
16
  readonly formerArrivalTime: Temporal.Instant | null;
@@ -22,6 +22,5 @@ export declare class ServiceTerminatingMovement {
22
22
  get timeTypeRelevantToDeparturesAlgorithm(): ServiceTimeType;
23
23
  get timeRelevantToDeparturesAlgorithm(): Temporal.Instant;
24
24
  get formerTimeRelevantToDeparturesAlgorithm(): Temporal.Instant | null;
25
- get positionId(): number | null;
26
25
  }
27
26
  export {};
@@ -1,14 +1,14 @@
1
1
  export class ServiceTerminatingMovement {
2
2
  stopId;
3
3
  originalPositionId;
4
- updatedPositionId;
4
+ currentPositionId;
5
5
  arrivalTimeType;
6
6
  arrivalTime;
7
7
  formerArrivalTime;
8
8
  constructor(fields) {
9
9
  this.stopId = fields.stopId;
10
10
  this.originalPositionId = fields.originalPositionId;
11
- this.updatedPositionId = fields.updatedPositionId;
11
+ this.currentPositionId = fields.currentPositionId;
12
12
  this.arrivalTimeType = fields.arrivalTimeType;
13
13
  this.arrivalTime = fields.arrivalTime;
14
14
  this.formerArrivalTime = fields.formerArrivalTime;
@@ -34,8 +34,5 @@ export class ServiceTerminatingMovement {
34
34
  get formerTimeRelevantToDeparturesAlgorithm() {
35
35
  return this.formerArrivalTime;
36
36
  }
37
- get positionId() {
38
- return this.updatedPositionId ?? this.originalPositionId;
39
- }
40
37
  }
41
38
  //# sourceMappingURL=service-terminating-movement.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"service-terminating-movement.js","sourceRoot":"","sources":["../../../../data/service/service-terminating-movement.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,0BAA0B;IAC5B,MAAM,CAAS;IACf,kBAAkB,CAAgB;IAClC,iBAAiB,CAAgB;IAEjC,eAAe,CAAkB;IACjC,WAAW,CAAmB;IAC9B,iBAAiB,CAA0B;IAEpD,YAAY,MAAwC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACpD,CAAC;IAED,IAAI,CACF,MAAiD;QAEjD,OAAO,IAAI,0BAA0B,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,aAAsB,CAAC;IAChC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,KAAc,CAAC;IACxB,CAAC;IAED,IAAI,qCAAqC;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,uCAAuC;QACzC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,kBAAkB,CAAC;IAC3D,CAAC;CACF"}
1
+ {"version":3,"file":"service-terminating-movement.js","sourceRoot":"","sources":["../../../../data/service/service-terminating-movement.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,0BAA0B;IAC5B,MAAM,CAAS;IACf,kBAAkB,CAAgB;IAClC,iBAAiB,CAAgB;IAEjC,eAAe,CAAkB;IACjC,WAAW,CAAmB;IAC9B,iBAAiB,CAA0B;IAEpD,YAAY,MAAwC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAElD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACpD,CAAC;IAED,IAAI,CACF,MAAiD;QAEjD,OAAO,IAAI,0BAA0B,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,aAAsB,CAAC;IAChC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAa,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,KAAc,CAAC;IACxB,CAAC;IAED,IAAI,qCAAqC;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,uCAAuC;QACzC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;CACF"}
@@ -1,6 +1,7 @@
1
1
  import type { Tags } from "../../../server/data/tags.js";
2
2
  import type { ServiceMovement } from "../../../server/data/service/service-movement.js";
3
- import type { ServiceConnection } from "../../../server/data/service/service-connection.js";
3
+ import type { ServiceConnection } from "../../../server/data/service/connection/service-connection.js";
4
+ import type { EntireVehicleFormsServiceConnection } from "../../../server/data/service/connection/entire-vehicle-forms-service-connection.js";
4
5
  import type { ServiceOriginatingMovement } from "../../../server/data/service/service-originating-movement.js";
5
6
  import type { ServiceTerminatingMovement } from "../../../server/data/service/service-terminating-movement.js";
6
7
  import { type Color } from "../../../server/data/color.js";
@@ -28,8 +29,8 @@ export declare class Service {
28
29
  readonly termination: ServiceTerminatingMovement;
29
30
  readonly isCancelled: boolean;
30
31
  readonly connections: readonly ServiceConnection[];
31
- readonly previousServiceOfEntireVehicle: ServiceConnection | null;
32
- readonly nextServiceOfEntireVehicle: ServiceConnection | null;
32
+ readonly previousServiceOfEntireVehicle: EntireVehicleFormsServiceConnection | null;
33
+ readonly nextServiceOfEntireVehicle: EntireVehicleFormsServiceConnection | null;
33
34
  constructor(fields: ServiceFields);
34
35
  with(fields: Partial<ServiceFields>): Service;
35
36
  getColorHexCodes(): {
@@ -41,12 +41,10 @@ export class Service {
41
41
  throw new Error("Some terminal movements in wrong places.");
42
42
  this.previousServiceOfEntireVehicle =
43
43
  this.connections.find((c) => c.type === "entire-vehicle-forms-service" &&
44
- c.direction === "from-other" &&
45
- c.movementIndex === 0) ?? null;
44
+ c.direction === "from-other") ?? null;
46
45
  this.nextServiceOfEntireVehicle =
47
46
  this.connections.find((c) => c.type === "entire-vehicle-forms-service" &&
48
- c.direction === "to-other" &&
49
- c.movementIndex === this.movements.length - 1) ?? null;
47
+ c.direction === "to-other") ?? null;
50
48
  }
51
49
  with(fields) {
52
50
  return new Service({ ...this, ...fields });
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../data/service/service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../data/service/service.ts"],"names":[],"mappings":"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"}
@@ -1,21 +0,0 @@
1
- type ServiceConnectionType = "entire-vehicle-forms-service" | "other";
2
- type ServiceConnectionDirection = "from-other" | "to-other" | "bidirectional";
3
- type ServiceConnectionFields = {
4
- readonly type: ServiceConnectionType;
5
- readonly direction: ServiceConnectionDirection;
6
- readonly otherServiceSourceId: string;
7
- readonly otherServiceIntrasourceId: string;
8
- readonly movementIndex: number;
9
- readonly otherServiceMovementIndex: number;
10
- };
11
- export declare class ServiceConnection {
12
- readonly type: ServiceConnectionType;
13
- readonly direction: ServiceConnectionDirection;
14
- readonly otherServiceSourceId: string;
15
- readonly otherServiceIntrasourceId: string;
16
- readonly movementIndex: number;
17
- readonly otherServiceMovementIndex: number;
18
- constructor(fields: ServiceConnectionFields);
19
- with(fields: Partial<ServiceConnectionFields>): ServiceConnection;
20
- }
21
- export {};
@@ -1 +0,0 @@
1
- {"version":3,"file":"service-connection.js","sourceRoot":"","sources":["../../../../data/service/service-connection.ts"],"names":[],"mappings":"AAiBA,MAAM,OAAO,iBAAiB;IACnB,IAAI,CAAwB;IAC5B,SAAS,CAA6B;IAE/C,6EAA6E;IAC7E,8EAA8E;IAC9E,8EAA8E;IAC9E,kBAAkB;IACT,oBAAoB,CAAS;IAC7B,yBAAyB,CAAS;IAElC,aAAa,CAAS;IACtB,yBAAyB,CAAS;IAE3C,YAAY,MAA+B;QACzC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;QACxD,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;QAElE,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;IACpE,CAAC;IAED,IAAI,CAAC,MAAwC;QAC3C,OAAO,IAAI,iBAAiB,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;CACF"}