Skip to content

Commit 7ec1529

Browse files
miles-grant-ibigroupmiles-grant-ibigroup
committed
Merge branch 'dev' into dev-flex-2024
2 parents 535730c + f044bbb commit 7ec1529

File tree

13 files changed

+38
-702
lines changed

13 files changed

+38
-702
lines changed

‎.github/workflows/node-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ jobs:
7474
- name: Run e2e tests
7575
if: inputs.e2e
7676
run: |
77-
(echo "E2E Test Attempt 1" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
78-
(echo "E2E Test Attempt 2" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
79-
(echo "E2E Test Attempt 3" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
77+
(echo "E2E Test Attempt 1" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
78+
(echo "E2E Test Attempt 2" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
79+
(echo "E2E Test Attempt 3" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
8080
(echo "E2E Tests Failed" && exit 1)
8181
# At this point, the build is successful.
8282
- name: Semantic Release

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ A pre-configured datatools instance can be lauched via Docker by running
1111
```bash
1212
cd docker
1313
cp ../configurations/default/env.yml.tmp ../configurations/default/env.yml
14-
docker-compose up
14+
docker compose up
1515
```
1616

1717
from the datatools-ui directory. Datatools will then be running on port `9966`.

‎docs/dev/development.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ yarn start -- --config /path/to/config
4747

4848
## E2E tests
4949

50-
The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker-compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker-compose` will alert you as to which variables must be present.
50+
The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker compose` will alert you as to which variables must be present.
5151

52-
To run the tests, run `docker-compose -f docker-compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.
52+
To run the tests, run `docker compose -f docker compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.

‎i18n/english.yml

+1-104
Original file line numberDiff line numberDiff line change
@@ -142,49 +142,6 @@ components:
142142
danger: Danger!
143143
success: Success!
144144
warning: Warning!
145-
DeploymentSettings:
146-
boundsPlaceholder: 'min_lon, min_lat, max_lon, max_lat'
147-
buildConfig:
148-
elevationBucket:
149-
accessKey: Access Key
150-
bucketName: S3 Bucket Name
151-
secretKey: Secret Key
152-
fares: Fares
153-
fetchElevationUS: Fetch Elevation
154-
save: Save
155-
stationTransfers: Sta. Transfers
156-
subwayAccessTime: Subway Access Time
157-
title: Build Config
158-
clear: Clear
159-
manageServers: Manage deployment servers
160-
osm:
161-
bounds: Custom Extract Bounds
162-
custom: Use Custom Extract Bounds
163-
gtfs: Use GTFS-Derived Extract Bounds
164-
title: OSM Extract
165-
routerConfig:
166-
brandingUrlRoot: Branding URL Root
167-
carDropoffTime: Car Dropoff Time
168-
driveDistanceReluctance: Drive Distance Reluctance
169-
numItineraries: '# of itineraries'
170-
requestLogFile: Request log file
171-
stairsReluctance: Stairs Reluctance
172-
title: Router Config
173-
itineraryFilters:
174-
nonTransitGeneralizedCostLimit: Non-Transit Generalized Cost Limit
175-
updaters:
176-
$index:
177-
feedId: Feed ID
178-
frequencySec: Frequency (in seconds)
179-
sourceType: Source type
180-
type: Type
181-
url: URL
182-
new: Add updater
183-
title: Real-time updaters
184-
placeholder: Updater name
185-
walkSpeed: Walk Speed
186-
save: Save
187-
title: Deployment
188145
DeploymentVersionsTable:
189146
dateRetrieved: Date Retrieved
190147
errorCount: Error Count
@@ -588,7 +545,6 @@ components:
588545
custom: Use Custom Extract Bounds
589546
gtfs: Use GTFS-Derived Extract Bounds
590547
title: OSM Extract
591-
title: Deployment
592548
routerConfig:
593549
brandingUrlRoot: Branding URL Root
594550
carDropoffTime: Car Dropoff Time
@@ -947,66 +903,6 @@ components:
947903
noAccess: No Access
948904
permissions: Permissions
949905
title: Project Settings for
950-
ProjectSettings:
951-
deployment:
952-
buildConfig:
953-
elevationBucket:
954-
accessKey: Access Key
955-
bucketName: S3 Bucket Name
956-
secretKey: Secret Key
957-
fares: Fares
958-
fetchElevationUS: Fetch Elevation
959-
stationTransfers: Sta. Transfers
960-
subwayAccessTime: Subway Access Time
961-
title: Build Config
962-
osm:
963-
bounds: Custom Extract Bounds
964-
custom: Use Custom Extract Bounds
965-
gtfs: Use GTFS-Derived Extract Bounds
966-
title: OSM Extract
967-
otpServers:
968-
$index:
969-
admin: Admin access only?
970-
delete: Remove
971-
internalUrl: Internal URLs
972-
name: Name
973-
namePlaceholder: Production
974-
publicUrl: Public URL
975-
r5: R5 Server?
976-
s3Bucket: S3 bucket name
977-
targetGroupArn: Target Group ARN
978-
new: Add server
979-
serverPlaceholder: Server name
980-
title: Servers
981-
routerConfig:
982-
brandingUrlRoot: Branding URL Root
983-
carDropoffTime: Car Dropoff Time
984-
driveDistanceReluctance: Drive Distance Reluctance
985-
numItineraries: '# of itineraries'
986-
requestLogFile: Request log file
987-
stairsReluctance: Stairs Reluctance
988-
title: Router Config
989-
itineraryFilters:
990-
nonTransitGeneralizedCostLimit: Non-Transit Generalized Cost Limit
991-
updaters:
992-
$index:
993-
feedId: Feed ID
994-
frequencySec: Frequency (in seconds)
995-
sourceType: Source type
996-
type: Type
997-
url: URL
998-
new: Add updater
999-
title: Real-time updaters
1000-
placeholder: Updater name
1001-
walkSpeed: Walk Speed
1002-
title: Deployment
1003-
project:
1004-
cannotFetchFeeds: Cannot fetch feeds
1005-
feeds: Feeds
1006-
permissions: Permissions
1007-
rename: Rename
1008-
save: Save
1009-
title: Settings
1010906
ProjectSettingsForm:
1011907
cancel: Cancel
1012908
confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
@@ -1411,6 +1307,7 @@ components:
14111307
- New trip
14121308
- Clone selected trip(s)
14131309
- Copy time value from adjacent cell (the cell immediately to the left)
1310+
- Copy time value from adjacent cell (the cell immediately to the right)
14141311
- Copy value from cell directly above
14151312
title: Timetable editor keyboard shortcuts
14161313
TimezoneSelect:

‎i18n/german.yml

-97
Original file line numberDiff line numberDiff line change
@@ -143,46 +143,6 @@ components:
143143
danger: Gefahr!
144144
success: Erfolg!
145145
warning: Warnung!
146-
DeploymentSettings:
147-
boundsPlaceholder: min_lon, min_lat, max_lon, max_lat
148-
buildConfig:
149-
elevationBucket:
150-
accessKey: Zugangs-Schlüssel
151-
bucketName: S3 Bucket Name
152-
secretKey: Secret Key
153-
fares: Tarife
154-
fetchElevationUS: Höhenmodell abrufen
155-
save: Speichern
156-
stationTransfers: Umstiege
157-
subwayAccessTime: U-Bahn-Zugangszeiten
158-
title: Build-Konfiguration
159-
clear: Zurücksetzen
160-
manageServers: Deployment-Server verwalten
161-
osm:
162-
bounds: Selbst-definierte Extrakt-Grenzen
163-
custom: Benutze selbst-definierte Extrakt-Grenzen
164-
gtfs: Grenzen aus GTFS ableiten
165-
title: OSM-Extrakt
166-
routerConfig:
167-
brandingUrlRoot: Branding-URL Wurzel
168-
carDropoffTime: PKW-Rückgabe-Zeit
169-
numItineraries: '# of Reisevorschläge'
170-
requestLogFile: Log-Datei anfordern
171-
stairsReluctance: Treppen-Abneigung
172-
title: Router Konfiguration
173-
updaters:
174-
$index:
175-
defaultAgencyId: Standard-Betreiber ID
176-
frequencySec: Frequenz (in Sekunden)
177-
sourceType: Quellen-Typ
178-
type: Typ
179-
url: URL
180-
new: Aktualisierer hinzufügen
181-
placeholder: Aktualisierer-Name
182-
title: Echtzeit-Aktualisierungs-Updater
183-
walkSpeed: Geh-Geschwindigkeit
184-
save: Speichern
185-
title: Deployment
186146
DeploymentVersionsTable:
187147
dateRetrieved: Abrufdatum
188148
errorCount: Fehlerzahl
@@ -1030,63 +990,6 @@ components:
1030990
transitland: Sync von transit.land
1031991
url: Feed-Abruf URL
1032992
version: Version
1033-
ProjectSettings:
1034-
deployment:
1035-
buildConfig:
1036-
elevationBucket:
1037-
accessKey: Zugriffs-Schlüssel (access)
1038-
bucketName: S3 Bucket Name
1039-
secretKey: Geheim-Schlüssel (secret)
1040-
fares: Tarife
1041-
fetchElevationUS: Rufe Geländemodell ab
1042-
stationTransfers: Umstiege
1043-
subwayAccessTime: U-Bahn-Zugangszeiten
1044-
title: Build Konfiguration
1045-
osm:
1046-
bounds: Benutzerdefinierte Extraktions-Grenzen
1047-
custom: Benutzerdefinierte Extraktions-Grenzen verwenden
1048-
gtfs: Benutzerdefinierte Extraktions-Grenzen verwenden
1049-
title: OSM Extrakt
1050-
otpServers:
1051-
$index:
1052-
admin: Nur Admin-Zugriff?
1053-
delete: Entfernen
1054-
internalUrl: Interne URLs
1055-
name: Name
1056-
namePlaceholder: Produktion
1057-
publicUrl: Öffentliche URL
1058-
r5: R5 Server?
1059-
s3Bucket: S3 Bucket Name
1060-
targetGroupArn: Zielgruppen ARN
1061-
new: Server hinzufügen
1062-
serverPlaceholder: Server-Name
1063-
title: Server
1064-
routerConfig:
1065-
brandingUrlRoot: Branding-URL Wurzel
1066-
carDropoffTime: PKW-Abstell-Zeit
1067-
numItineraries: '# Reisevorschläge'
1068-
requestLogFile: Log-Datei anfordern
1069-
stairsReluctance: Treppen-Vermeidung
1070-
title: Router Konfiguration
1071-
updaters:
1072-
$index:
1073-
defaultAgencyId: Default Betreiber-ID
1074-
frequencySec: Frequenz (in Sekunden)
1075-
sourceType: Quellen-Typ
1076-
type: Typ
1077-
url: URL
1078-
new: Updater hinzufügen
1079-
placeholder: Updater-Name
1080-
title: Real-time Updater
1081-
walkSpeed: Lauf-Geschwindigkeit
1082-
title: Deployment
1083-
project:
1084-
cannotFetchFeeds: Feeds können nicht abgerufen werden
1085-
feeds: Feeds
1086-
permissions: Berechtigungen
1087-
rename: Umbennenen
1088-
save: Speichern
1089-
title: Einstellungen
1090993
ProjectSettingsForm:
1091994
cancel: Abbrechen
1092995
confirmDelete: Sind Sie sicher, dass Sie dieses Projekt löschen möchten? Diese

‎i18n/polish.yml

-97
Original file line numberDiff line numberDiff line change
@@ -139,46 +139,6 @@ components:
139139
danger: Uwaga!
140140
success: Sukces!
141141
warning: Ostrzeżenie!
142-
DeploymentSettings:
143-
boundsPlaceholder: min_lon, min_lat, max_lon, max_lat
144-
buildConfig:
145-
elevationBucket:
146-
accessKey: Access Key
147-
bucketName: S3 Bucket Name
148-
secretKey: Secret Key
149-
fares: Taryfy
150-
fetchElevationUS: Fetch Elevation
151-
save: Zapisz
152-
stationTransfers: Transfery na stacji
153-
subwayAccessTime: Godziny otwarcia metra
154-
title: Build Config
155-
clear: Wyczyść
156-
manageServers: Manage deployment servers
157-
osm:
158-
bounds: Custom Extract Bounds
159-
custom: Use Custom Extract Bounds
160-
gtfs: Use GTFS-Derived Extract Bounds
161-
title: Wyciąg z OSM
162-
routerConfig:
163-
brandingUrlRoot: Branding URL Root
164-
carDropoffTime: Car Dropoff Time
165-
numItineraries: '# of itineraries'
166-
requestLogFile: Request log file
167-
stairsReluctance: Stairs Reluctance
168-
title: Router Config
169-
updaters:
170-
$index:
171-
defaultAgencyId: Domyślny ID przewoźnika
172-
frequencySec: Częstotliwość (w sekundach)
173-
sourceType: Rodzaj źródła
174-
type: Typ
175-
url: URL
176-
new: Add updater
177-
placeholder: Updater name
178-
title: Real-time updaters
179-
walkSpeed: Walk Speed
180-
save: Zapisz
181-
title: Wdrożenie
182142
DeploymentVersionsTable:
183143
dateRetrieved: Data pozyskania
184144
errorCount: Licznik błędów
@@ -1010,63 +970,6 @@ components:
1010970
transitland: Sync from transit.land
1011971
url: Feed download URL
1012972
version: version
1013-
ProjectSettings:
1014-
deployment:
1015-
buildConfig:
1016-
elevationBucket:
1017-
accessKey: Access Key
1018-
bucketName: S3 Bucket Name
1019-
secretKey: Secret Key
1020-
fares: Fares
1021-
fetchElevationUS: Fetch Elevation
1022-
stationTransfers: Sta. Transfers
1023-
subwayAccessTime: Subway Access Time
1024-
title: Build Config
1025-
osm:
1026-
bounds: Custom Extract Bounds
1027-
custom: Use Custom Extract Bounds
1028-
gtfs: Use GTFS-Derived Extract Bounds
1029-
title: OSM Extract
1030-
otpServers:
1031-
$index:
1032-
admin: Admin access only?
1033-
delete: Remove
1034-
internalUrl: Internal URLs
1035-
name: Name
1036-
namePlaceholder: Production
1037-
publicUrl: Public URL
1038-
r5: R5 Server?
1039-
s3Bucket: S3 bucket name
1040-
targetGroupArn: Target Group ARN
1041-
new: Add server
1042-
serverPlaceholder: Server name
1043-
title: Servers
1044-
routerConfig:
1045-
brandingUrlRoot: Branding URL Root
1046-
carDropoffTime: Car Dropoff Time
1047-
numItineraries: '# of itineraries'
1048-
requestLogFile: Request log file
1049-
stairsReluctance: Stairs Reluctance
1050-
title: Router Config
1051-
updaters:
1052-
$index:
1053-
defaultAgencyId: Default agency ID
1054-
frequencySec: Frequency (in seconds)
1055-
sourceType: Source type
1056-
type: Type
1057-
url: URL
1058-
new: Add updater
1059-
placeholder: Updater name
1060-
title: Real-time updaters
1061-
walkSpeed: Walk Speed
1062-
title: Deployment
1063-
project:
1064-
cannotFetchFeeds: Cannot fetch feeds
1065-
feeds: Feeds
1066-
permissions: Permissions
1067-
rename: Rename
1068-
save: Save
1069-
title: Settings
1070973
ProjectSettingsForm:
1071974
cancel: Cancel
1072975
confirmDelete: Are you sure you want to delete this project? This action cannot

0 commit comments

Comments
 (0)