Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correct connections->transfers naming for O/D matrix #365

Merged
merged 2 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions documentation/ORIGIN_DESTINATION_MATRIX.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
## Origin Destination Matrix
# Origin Destination Matrix

The Origin Destination Matrix shows the optimized travel time (total cost) between each pair of nodes.

The optimized travel time includes a fixed penalty (5 minutes) for each connection, but the Origin Destination Matrix also shows the corresponding effective travel time and number of connections.
The optimized travel time includes a fixed penalty (5 minutes) for each transfer, but the Origin Destination Matrix also shows the corresponding effective travel time and number of transfers.

### Filtering
## Filtering

If some nodes are selected, then the Origin Destination Matrix will only show results between these nodes (but other nodes may be used to compute paths).

The Origin Destination Matrix will only show results between visible nodes (but other nodes may be used to compute paths).

The Origin Destination Matrix will only use visible trainruns to compute paths.

### Caveats

Split trainruns are not supported at the moment: https://github.com/SchweizerischeBundesbahnen/netzgrafik-editor-frontend/issues/285.
As a simplification, we currently consider trains run at their frequency for a fixed schedule duration (16 hours).
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ export class EditorToolsViewComponent {
headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.origin:Origin`);
headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.destination:Destination`);
headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.travelTime:Travel time`);
headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.connections:Connections`);
headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.transfers:Transfers`);
headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.totalCost:Total cost`);

const metadata = this.dataService.getNetzgrafikDto().metadata;
Expand Down
10 changes: 5 additions & 5 deletions src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -490,11 +490,11 @@
"turnaroundTimeStart": "Wendezeit Startbahnhof",
"turnaroundTime": "Umlaufzeit",
"trainrunTimeCategory": "Verkehrt",
"origin": "Origin",
"destination": "Destination",
"travelTime": "Travel time",
"connections": "Connections",
"totalCost": "Total cost"
"origin": "Start",
"destination": "Ziel",
"travelTime": "Fahrzeit",
"transfers": "Transfers",
"totalCost": "Gesamtkosten"
}
},
"error-view": {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
"origin": "Origin",
"destination": "Destination",
"travelTime": "Travel time",
"connections": "Connections",
"transfers": "Transfers",
"totalCost": "Total cost"
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@
"origin": "Origine",
"destination": "Destination",
"travelTime": "Temps de parcours",
"connections": "Correspondances",
"transfers": "Changements",
"totalCost": "Coût total"
}
},
Expand Down
10 changes: 5 additions & 5 deletions src/assets/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -489,11 +489,11 @@
"turnaroundTimeStart": "Turnaround time at start station",
"turnaroundTime": "Turnaround time",
"trainrunTimeCategory": "Trainrun time category",
"origin": "Origin",
"destination": "Destination",
"travelTime": "Travel time",
"connections": "Connections",
"totalCost": "Total cost"
"origin": "Origine",
"destination": "Destinazione",
"travelTime": "Tempo di viaggio",
"transfers": "Cambiamenti",
"totalCost": "Costo totale"
}
},
"error-view": {
Expand Down